Changeset 52 for branches

Timestamp:

02/01/09 22:06:39 (3 years ago)

Author:

mirko

Message:

Added a check target in the makefile to allow emacs flymake-mode.

Started the app class. It now loads the pdf and renders all pages in
low resolution while displaying a progress indicator.

There is little more to do to reach an usable stage. The bigger step
is to link the app class to the animator interface (and to implement
a couple of animators).

The pdfcube::page class now simply renders pages to GdkPixbuf?
removing the dependency from Clutter in the page class.

Location:

branches/clutter-experiments

Files:

• Makefile (modified) (2 diffs)
• main.cc (modified) (9 diffs)
• page.hh (modified) (9 diffs)

branches/clutter-experiments/Makefile

@@ -1 @@
-LIBS=`pkg-config --libs clutter-0.8 poppler-glib`
-INCS=`pkg-config --cflags clutter-0.8 poppler-glib`
+CXXFLAGS=-O3 -g -Wall -Weffc++
+LIBS=`pkg-config --libs clutter-0.9 poppler-glib`
+INCS=`pkg-config --cflags clutter-0.9 poppler-glib`
 
 .c.o:
-        $(CC) -g -Wall $(CFLAGS) $(INCS) -c $*.c
+        $(CC) $(CFLAGS) $(INCS) -c $*.c
 .cc.o:
-        $(CXX) -g -Wall -Weffc++ $(CXXFLAGS) $(INCS) -c $*.cc
+        $(CXX) $(CXXFLAGS) $(INCS) -c $*.cc
 
 all: pdfcube
@@ -12 +13 @@
 
 pdfcube: main.o
-        $(CXX) -g -Wall $(CXXFLAGS) -o $@ main.o $(LIBS)
+        $(CXX) $(CXXFLAGS) -o $@ main.o $(LIBS)
 
 clean:
         rm -fr *.o pdfcube
+
+.PHONY: check-syntax
+check-syntax:
+        $(CXX) -Wall -Wextra -Weffc++ -pedantic -fsyntax-only $(INCS) $(CHK_SOURCES)

branches/clutter-experiments/main.cc

@@ -3 +3 @@
 // C++ interface (or binding) for Poppler and Clutter or to code the
 // whole thing in C using GObjects.
+#include <iostream>
+#include <sstream>
 #include <cmath>
-#include <iostream>
 #include <cstdlib>
+#include <cstring>
 #include <clutter/clutter.h>
 #include <poppler.h>
@@ -16 +18 @@
 using namespace std;
 
+namespace pdfcube {
+  
+  class app
+  {
+  public:
+    
+    app(const app&);
+    app& operator=(const app&);
+
+    /** @brief */
+    app()
+      : the_doc_m(),
+        the_stage_m(),
+        filename_m(),
+        progress_m(),
+        progress_label_m(),
+        current_page_m(),
+        next_page_m(),
+        current_page_no_m(0)
+    { }
+
+    bool init(int* argc, char** argv[])
+    {
+      gchar **file_array;
+      GOptionEntry options[] = {
+        // TODO: add stage color/image and cube top color/image options
+        { G_OPTION_REMAINING, 
+          0, 
+          0, 
+          G_OPTION_ARG_FILENAME_ARRAY, 
+          &file_array, 
+          "Presentation PDF file to load", 
+          "FILE" },
+        { 0, 0, 0, (GOptionArg)0, 0, 0, 0 }
+      };
+      g_thread_init(NULL);
+      clutter_threads_init();
+      clutter_init_with_args (argc, argv, "PDFCube 0.1.0",
+                              options, NULL, NULL);
+      
+      // FIXME
+      if(file_array[0] == 0 || file_array[1] != 0) 
+        return false;
+      filename_m = file_array[0];
+      g_print(_("File is: %s\n"), filename_m);
+
+      ClutterColor stage_color;
+      the_stage_m = clutter_stage_get_default();
+      clutter_color_parse("Black", &stage_color);
+      clutter_stage_set_color(CLUTTER_STAGE(the_stage_m), &stage_color);
+      return true;
+    }
+
+    /** @brief Loads the PDF document. */
+    bool load()
+    {
+      // poppler needs an URI (e.g. file:///....)
+      g_print(_("Loading %s...\n"), filename_m);
+      PopplerDocument* active_document = 
+        poppler_document_new_from_file(filename_m, NULL, NULL);
+      if(active_document == NULL)
+        {
+          g_print(_("PDF file %s cannot be opened, check it exists, permissions"
+                    " and that is \nnot encrypted.\n"), filename_m);
+          return false;
+        }
+      g_print(_("Done.\n"));
+      if(the_doc_m) delete the_doc_m;
+      the_doc_m = new pdfcube::document(active_document);
+      return true;
+    }
+
+    /** @brief Main application loop. */
+    void
+    main_loop()
+    {
+      //clutter_stage_hide_cursor (CLUTTER_STAGE (stage));
+      ClutterColor label_color = { 0xff, 0xff, 0xff, 0x99 };
+      progress_label_m = 
+        clutter_text_new_full("Mono 36", "0%", &label_color);
+      guint screen_w, screen_h;
+      clutter_actor_get_size(CLUTTER_ACTOR(the_stage_m), &screen_w, &screen_h);
+      clutter_actor_set_position(progress_label_m, screen_w>>1, screen_h>>1);
+      clutter_actor_set_anchor_point_from_gravity(progress_label_m, 
+                                                  CLUTTER_GRAVITY_CENTER);
+      clutter_group_add_many(CLUTTER_GROUP(the_stage_m), 
+                             progress_label_m, NULL);
+      clutter_actor_show(the_stage_m);
+      g_thread_create(render_thread, this, FALSE, NULL);
+
+      clutter_threads_enter();
+      clutter_main();
+      clutter_threads_leave();
+    }
+
+    /** @brief The document. */
+    document* the_doc_m;
+    
+  protected:
+    ClutterActor* the_stage_m;
+    gchar *filename_m;
+    std::string progress_m;
+    ClutterActor* progress_label_m;
+    ClutterActor* current_page_m;
+    ClutterActor* next_page_m;
+    int current_page_no_m;
+
+    static gboolean 
+    progress_indicator_update(gpointer data)
+    {
+      app* me = static_cast<app*>(data);
+      guint screen_w, screen_h;
+      clutter_actor_get_size(CLUTTER_ACTOR(me->the_stage_m), 
+                             &screen_w, &screen_h);
+      clutter_text_set_text(CLUTTER_TEXT(me->progress_label_m), 
+                            me->progress_m.c_str());
+      clutter_actor_set_anchor_point_from_gravity(me->progress_label_m, 
+                                                  CLUTTER_GRAVITY_CENTER);
+      clutter_actor_set_position(me->progress_label_m, 
+                                 screen_w>>1, screen_h>>1);
+      return FALSE;
+    }
+
+    static gboolean
+    progress_indicator_end(gpointer data)
+    {
+      app* me = static_cast<app*>(data);
+      clutter_group_remove(CLUTTER_GROUP(me->the_stage_m), 
+                                         me->progress_label_m);
+      g_object_unref(me->progress_label_m);
+
+      GError* error = 0;
+      GdkPixbuf* buffer = me->the_doc_m->page(0).pixbuf(pdfcube::page::HI_RES);
+      me->current_page_m = clutter_texture_new();
+      clutter_texture_set_from_rgb_data 
+        (CLUTTER_TEXTURE(me->current_page_m),
+         gdk_pixbuf_get_pixels(buffer),
+         gdk_pixbuf_get_has_alpha(buffer),
+         gdk_pixbuf_get_width(buffer),
+         gdk_pixbuf_get_height(buffer),
+         gdk_pixbuf_get_rowstride(buffer),
+         4, (ClutterTextureFlags)0,
+         &error);
+      guint screen_w, screen_h;
+      clutter_actor_get_size(CLUTTER_ACTOR(me->the_stage_m), 
+                             &screen_w, &screen_h);
+      clutter_actor_set_size(me->current_page_m, screen_w, screen_h);
+      clutter_group_add_many(CLUTTER_GROUP(me->the_stage_m), 
+                             me->current_page_m, NULL);
+      return FALSE;
+    }
+
+    static gpointer 
+    render_thread(gpointer data)
+    {
+      app* me = static_cast<app*>(data);
+      std::cerr << me->filename_m << std::endl;
+      me->load();
+      // ----------------------------------------------
+      // render low res version of all pages
+      // ----------------------------------------------
+      for(int ii(0); ii != me->the_doc_m->n_pages(); ++ii)
+        {
+          me->the_doc_m->page(ii).render(pdfcube::page::LOW_RES);
+          int percent = (100*(ii-1))/(me->the_doc_m->n_pages());
+          std::ostringstream pt;
+          pt << percent << "%"; 
+          me->progress_m = pt.str();
+          clutter_threads_add_timeout(0, progress_indicator_update, data);
+        }
+      me->the_doc_m->page(0).render(pdfcube::page::HI_RES);
+      int percent = (100*(me->the_doc_m->n_pages()-1)) /
+        (me->the_doc_m->n_pages());
+      std::ostringstream pt;
+      pt << percent << "%"; 
+      me->progress_m = pt.str();
+      clutter_threads_add_timeout(0, progress_indicator_update, data);
+      
+      me->the_doc_m->page(1).render(pdfcube::page::HI_RES);
+      me->progress_m = "100%";
+      clutter_threads_add_timeout(0, progress_indicator_update, data);
+      clutter_threads_add_timeout(250, progress_indicator_end, data);
+      return 0;
+    }
+
+  };
+}
+
 void usage()
 {
-  cerr << "pdfcube filename.pdf" << endl;
+  cerr << _("pdfcube filename.pdf") << endl;
   exit(1);
 }
 
 
+/*
 static gboolean
 on_page_enter(ClutterActor* actor, ClutterEvent *event, gpointer data)
 {
+  double sx, sy;
+  clutter_actor_get_scale(actor, &sx, &sy);
+  if(sx > 1.0 || sy > 1.0) return FALSE;
   // Code snippet for a static member of the index class,
   // data should point to the index instance, so one can 
@@ -35 +229 @@
   ClutterEffectTemplate *effect_template = 
     clutter_effect_template_new(timeline,
-                                CLUTTER_ALPHA_SINE_HALF);
-  gint x, y;
-  clutter_actor_get_position(actor, &x, &y);
+                                clutter_sine_half_func);
   clutter_effect_scale(effect_template, actor, 1.12, 1.12, NULL, NULL);
   g_object_unref(effect_template);
@@ -49 +241 @@
   return TRUE;
 }
-
+*/
 static gboolean
 on_stage_button_press (ClutterStage *stage, ClutterEvent *event, gpointer data)
@@ -91 +283 @@
 
   void
-  prepare() = 0;
+  setup() = 0;
   
   void
   render(int frame) = 0;
-
+  
   void
-  unprepare() = 0;
+  tear_down() = 0;
 };
 
@@ -108 +300 @@
 class cube_animator : public animator
 {
-  replace_animator(pdfcube::document& doc, int page_no);
+  cube_animator(pdfcube::document& doc, int page_no);
   // ...
 }
@@ -140 +332 @@
   // --------------
 
-  PopplerDocument* pdoc;
-  GError        *error = NULL; 
-  ClutterActor  *stage;
-  gchar        **pdfcube_filename = NULL;
-
-  // Clutter options parsing
-  GOptionEntry options[] = {
-    { G_OPTION_REMAINING, 
-      0, 
-      0, 
-      G_OPTION_ARG_FILENAME_ARRAY, 
-      &pdfcube_filename, 
-      "Presentation PDF file to load", 
-      "FILE" },
-    { NULL }
-  };
-  
-  if (argc == 1)
-    usage();
-  
-  clutter_init_with_args (&argc, &argv, "PDFCube 0.1.0",
-                          options, NULL,
-                          NULL);
-  
-  stage = clutter_stage_get_default();
-
-  ClutterColor stage_color;
-  // parse from command line (init to black first)
-  clutter_color_parse("DarkRed", &stage_color);
-  clutter_stage_set_color(CLUTTER_STAGE(stage), &stage_color);
-  
-  // poppler needs an URI (e.g. file:///....)
-  pdoc = poppler_document_new_from_file(*pdfcube_filename, NULL, NULL);
-  if(pdoc == NULL)
-    {
-      g_print(_("PDF file %s cannot be opened, check it exists, permissions"
-                " and that is \nnot encrypted.\n"), argv[1]);
-      return -1;
-    }
-  pdfcube::document doc(pdoc);
-  
+  pdfcube::app the_app;
+
+  the_app.init(&argc, &argv);
+
+  the_app.main_loop();
+
+  /*
   // ----------------------------------------------
   // render low res version of all pages
@@ -253 +411 @@
   // -------------------------
 
-  /* Connect a signal handler to handle mouse clicks and key presses
-     on the stage: */
+  // Connect a signal handler to handle mouse clicks and key presses
+  //   on the stage: 
   g_signal_connect (stage, "button-press-event",
                     G_CALLBACK (on_stage_button_press), NULL);
@@ -262 +420 @@
   clutter_actor_show (stage);
   clutter_main ();
-  
+*/  
   return 0;
 }

branches/clutter-experiments/page.hh

@@ -7 +7 @@
 #include <glib.h>
 #include <poppler.h>
-#include <clutter/clutter.h>
+//#include <clutter/clutter.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -91 +91 @@
               }
 
-            GdkPixbuf* buffer = NULL;
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+            // GdkPixbuf* low_res_m = NULL;
+            if(!low_res_m)
+              low_res_m = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
@@ -100 +101 @@
                                           ((double)h)/size().second, 
                                           0, 
-                                          buffer);
-            GError* error;
-            if(!low_res_m) low_res_m = clutter_texture_new();
-            clutter_texture_set_from_rgb_data 
-               (CLUTTER_TEXTURE(low_res_m),
-                gdk_pixbuf_get_pixels(buffer),
-                gdk_pixbuf_get_has_alpha(buffer),
-                gdk_pixbuf_get_width(buffer),
-                gdk_pixbuf_get_height(buffer),
-                gdk_pixbuf_get_rowstride(buffer),
-                4, (ClutterTextureFlags)0,
-                &error);
-            g_object_unref(buffer);
+                                          low_res_m);
             break;
           }
@@ -133 +122 @@
                 w = h*aspect;
               }
-            GdkPixbuf* buffer = NULL;
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+            if(!hi_res_m)
+              hi_res_m = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
@@ -142 +131 @@
                                           ((double)h)/size().second, 
                                           0, 
-                                          buffer);
-            GError* error;
+                                          hi_res_m);
+            GError* error = 0;
+            
+            /*
             if(!hi_res_m) hi_res_m = clutter_texture_new();
             clutter_texture_set_from_rgb_data 
@@ -155 +146 @@
                 &error);
             g_object_unref(buffer);
+            */
             break;
           }
@@ -198 +190 @@
      * @brief Returns the desired actor (on NULL if not present).
      */
-    ClutterActor* 
-    actor(rendering_mode mode)
+    GdkPixbuf* 
+    pixbuf(rendering_mode mode)
     {
       switch(mode)
@@ -210 +202 @@
       return NULL;
     }
-
+    
   protected:
 
@@ -227 +219 @@
 
     PopplerPage* poppler_page_m;
-    ClutterActor* low_res_m;
-    ClutterActor* hi_res_m;
+    GdkPixbuf* low_res_m;
+    GdkPixbuf* hi_res_m;
   };