Changeset 150

Timestamp:

05/07/06 06:45:49 (2 years ago)

Author:

jordi

Message:

When IDocument has not image of the page requested by PagePter?, PagePter? asks for an empty page and gives it to the IPageView. Then it requests to the IPageView to show the "Loading..." text to let know the user that the page is loading, instead of just showing nothing or the previously shown page. For now this empty page with the loading notice is also shown when the page is resized.

Files:

• trunk/src/DocumentPage.cxx (modified) (1 diff)
• trunk/src/IDocument.cxx (modified) (1 diff)
• trunk/src/IDocument.h (modified) (1 diff)
• trunk/src/IPageView.h (modified) (1 diff)
• trunk/src/PagePter.cxx (modified) (7 diffs)
• trunk/src/gtk/PageView.cxx (modified) (1 diff)
• trunk/src/gtk/PageView.h (modified) (1 diff)
• trunk/tests/DumbPageView.cxx (modified) (1 diff)
• trunk/tests/DumbPageView.h (modified) (1 diff)

trunk/src/DocumentPage.cxx

@@ -176 +176 @@
-    if ( NULL != m_Data )
-    {
-
+xff
-    }
-    

trunk/src/IDocument.cxx

@@ -870 +870 @@
-
-///
+/// @brief Gets an empty page of the same size than the current page.
+///
+/// This is used when the page is now ready on the cache and the presenter
+/// wants to show something to the user. This function just will create 
+/// an empty document (i.e., no text or image) using the size that the
+/// page would have it it was rendered.
+///
+/// @return An DocumentPage whose image is just a blank page. The caller
+///         must delete this DocumentPage object.
+///
+DocumentPage *
+IDocument::getEmptyPage ()
+{
+    gdouble pageWidth;
+    gdouble pageHeight;
+    getPageSizeForPage (getCurrentPageNum (), &pageWidth, &pageHeight);
+    gint width = MAX((gint) ((pageWidth * getZoom ()) + 0.5), 1);
+    gint height = MAX((gint) ((pageHeight * getZoom ()) + 0.5) , 1);
+    DocumentPage *emptyPage = new DocumentPage ();
+    emptyPage->newPage (width, height);
+
+    return emptyPage;
+}
+
+///
-/// @brief Get the document's current page number.
-///

trunk/src/IDocument.h

@@ -233 +233 @@
-            void setNumPages (gint numPages);
-            DocumentPage *getCurrentPage (void);
+            DocumentPage *getEmptyPage (void);
-            gint getCurrentPageNum (void);
-            DocumentOutline *getOutline (void);

trunk/src/IPageView.h

@@ -150 +150 @@
-            ///
-            virtual void showPage (DocumentPage *page, PageScroll scroll) = 0;
+
+            ///
+            /// @brief Shows text on the page.
+            ///
+            /// This is only used when the page is still loading but the
+            /// presenter wants to show something on the user. The presenter
+            /// passes a text string to show during the rendering of the
+            /// current page. The view should put this string at the middle
+            /// of the currently shown page.
+            ///
+            /// @param text The text to show on the middle of the page.
+            ///
+            virtual void showText (const gchar *text) = 0;
+            
-            
-        protected:

trunk/src/PagePter.cxx

@@ -192 +192 @@
-PagePter::notifyLoad ()
-{
+    g_WaitingForPage = FALSE;
-    refreshPage (PAGE_SCROLL_START);
-}
@@ -198 +199 @@
-PagePter::notifyPageChanged (gint pageNum)
-{
+    g_WaitingForPage = FALSE;
-    refreshPage (m_NextPageScroll);
-}
@@ -204 +206 @@
-PagePter::notifyPageRotated (gint rotation)
-{
+    g_WaitingForPage = FALSE;
-    refreshPage (PAGE_SCROLL_START);
-}
@@ -210 +213 @@
-PagePter::notifyPageZoomed (gdouble zoom)
-{
+    g_WaitingForPage = FALSE;
-    refreshPage (PAGE_SCROLL_NONE);
-}
@@ -216 +220 @@
-PagePter::notifyReload ()
-{
+    g_WaitingForPage = FALSE;
-    refreshPage (PAGE_SCROLL_NONE);
-}
@@ -252 +257 @@
-    if ( m_Document->isLoaded () )
-    {
+        IPageView &view = getView ();
-        DocumentPage *documentPage = m_Document->getCurrentPage ();
-        if ( NULL != documentPage )
-        {
-            g_WaitingForPage = FALSE;
-getView ()
+view
-        }
-        else
-        {
-#if defined DEBUG
-            // I just emulate as if the document has already the page,
-            // because during debug (i.e., test) we don't actually care
-            // about the page's content.
-            getView ().showPage ((DocumentPage *)0xdeadbeef, pageScroll);
-#else // !DEBUG
-            if ( !g_WaitingForPage )
-            {
+                documentPage = m_Document->getEmptyPage ();
+                view.showPage (documentPage, pageScroll);
+                delete documentPage;
+                view.showText (_("Loading..."));
+
-                g_WaitingForPage = TRUE;
-                PageNotAvailableData *data = new PageNotAvailableData;
@@ -274 +279 @@
-                g_idle_add (PagePter::pageNotAvailable, data);
-            }
-#endif // !DEBUG
-        }
-    }

trunk/src/gtk/PageView.cxx

@@ -205 +205 @@
-}
-
+void
+PageView::showText (const gchar *text)
+{
+    // I need to make the changes to the original Pixbuf that the GtkImage
+    // controls shows.
+    // Since a Pixbuf is a client-side buffer, it's not drawable and the
+    // gdk functions to draw using pango won't accept it.
+    // The solution I found is to render the pixbuf to a pixmap, which is
+    // server-side and therefore drawable, make the modifications
+    // and set the modified pixbuf again to the GtkImage control.
+    // 
+    GdkPixbuf *originalPage = gtk_image_get_pixbuf (GTK_IMAGE (m_PageImage));
+    if ( NULL != originalPage )
+    {
+        gint width = gdk_pixbuf_get_width (originalPage);
+        gint height = gdk_pixbuf_get_height (originalPage);
+       
+        PangoLayout *layout = 
+            gtk_widget_create_pango_layout (m_PageImage, text);
+
+        // I want the text to be half the page's width.
+        // Since I don't know the font's size I just set the font
+        // size to 1pt.
+        PangoFontDescription *fontDescription = pango_font_description_new ();
+        pango_font_description_set_size (fontDescription, PANGO_SCALE);
+        pango_layout_set_font_description (layout, fontDescription);
+        // The I get the logical rectangle that this text would
+        // extent to if it was rendered using 1pt and calculate the
+        // size in points it would take to make the width fill the
+        // page's half width.
+        PangoRectangle logicalRectangle;
+        pango_layout_get_pixel_extents (layout, NULL, &logicalRectangle);
+        gint targetWidth = MAX (width / 2, 1);
+        gdouble realSize = 
+            (gdouble)targetWidth / (gdouble)logicalRectangle.width;
+        pango_font_description_set_size (fontDescription,
+                                         (gint)realSize * PANGO_SCALE);        
+        pango_layout_set_font_description (layout, fontDescription);
+        pango_layout_get_pixel_extents (layout, NULL, &logicalRectangle);
+        
+        // Once the font are set up, I just need to render 
+        // the pixbuf to the pixmap (copying from client-side to 
+        // server size) and draw the layout.
+        GdkPixmap *pixmap;
+        GdkBitmap *mask;
+        gdk_pixbuf_render_pixmap_and_mask (originalPage,
+                                           &pixmap, &mask, 0);
+        gdk_draw_layout (pixmap, 
+                         m_PageImage->style->black_gc, 
+                         (width - logicalRectangle.width) / 2, 
+                         height / 4 - logicalRectangle.height / 2,
+                         layout);
+        pango_font_description_free (fontDescription);
+        g_object_unref (layout);
+        // Then I just copy back the image to a client-size pixbuf.
+        GdkPixbuf *modifiedPage = 
+            gdk_pixbuf_get_from_drawable (NULL,
+                                          pixmap,
+                                          NULL,
+                                          0, 0,
+                                          0, 0,
+                                          width, height);
+        g_object_unref (pixmap);
+        if ( NULL != mask )
+        {
+            g_object_unref (mask);
+        }
+        
+        gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageImage), modifiedPage);
+        gdk_pixbuf_unref (modifiedPage);
+    } 
+}
+
-////////////////////////////////////////////////////////////////
-// GTK+ Functions.

trunk/src/gtk/PageView.h

@@ -38 +38 @@
-            void setPresenter (PagePter *pter);
-            void showPage (DocumentPage *page, PageScroll scroll);
+            void showText (const gchar *text);
-
-        protected:

trunk/tests/DumbPageView.cxx

@@ -67 +67 @@
-{
-}
+
+void
+DumbPageView::showText (const gchar *text)
+{
+}

trunk/tests/DumbPageView.h

@@ -34 +34 @@
-            void setCursor (PageCursor cursorType);
-            void showPage (DocumentPage *page, PageScroll scroll);
+            void showText (const gchar *text);
-
-