Changeset 59 for branches

Timestamp:

10/23/09 17:58:55 (2 years ago)

Author:

mirko

Message:

Keybindings core.

Location:

branches/clutter-experiments

Files:

• main.cc (modified) (2 diffs)
• page.hh (modified) (2 diffs)
• pdfcube.hh (modified) (4 diffs)

branches/clutter-experiments/main.cc

@@ -61 +61 @@
   gfloat x, y;
   clutter_event_get_coords (event, &x, &y);
-  g_print ("Stage clicked at (%d, %d)\n", x, y);
+  g_print ("Stage clicked at (%f, %f)\n", x, y);
   // clutter cluttered my first draw, so redraw on click to allow testing.
-  clutter_actor_queue_redraw(CLUTTER_ACTOR(stage));
+  // clutter_actor_queue_redraw(CLUTTER_ACTOR(stage));
   return TRUE; /* Stop further handling of this event. */
 }
@@ -169 +169 @@
 
   /*
-  // ----------------------------------------------
-  // render low res version of all pages
-  // TODO: show fancy progress bar in the meantime.
-  // ----------------------------------------------
-  for(int ii(0); ii != doc.n_pages(); ++ii)
-    doc.page(ii).render(pdfcube::page::LOW_RES);
-
-
   // --------------------------
   // arrange pages in an index

branches/clutter-experiments/page.hh

@@ -21 +21 @@
    * Usually, on start, all the pages will be rendered in a low res
    * version, while higher res versions will be rendered on demand by
-   * the animations. We need to program the animations in advance so
-   * that we can pre-render hi-res versions of the pages before the
-   * animations begins. One way can be to read animations from the
-   * PDF.
+   * the animations. 
+   *
+   * While displaying one page the following page is rendered in high
+   * resolution. No forward animation is possible until the rendering
+   * finishes.
    *
    */
@@ -105 +106 @@
           {
             int w, h;
-            // we assume 4/3 aspect monitor can be done better
+            // FIXME: we assume 4/3 aspect monitor. 
             double box_w = 1600;
             double box_h = 1200;

branches/clutter-experiments/pdfcube.hh

@@ -1 +1 @@
 #pragma once
+
+#include <cassert>
 
 namespace pdfcube {
@@ -95 +97 @@
       g_thread_create(render_thread, this, FALSE, NULL);
       
+      clutter_actor_set_reactive(the_stage_m, TRUE);
+      g_signal_connect(the_stage_m, 
+                       "key-press-event",
+                       G_CALLBACK (pdfcube::app::keypress_event), 
+                       NULL);
       clutter_threads_enter();
       clutter_main();
@@ -174 +181 @@
       clutter_actor_set_size(me->current_page_m, w, h);
       clutter_container_add_actor(CLUTTER_CONTAINER(me->the_stage_m), 
-                            me->current_page_m);
+                                  me->current_page_m);
+
+      ClutterBindingPool *binding_pool;
+      std::cerr << G_OBJECT_TYPE_NAME(me->the_stage_m) << std::endl;
+      binding_pool = clutter_binding_pool_new(G_OBJECT_TYPE_NAME(me->the_stage_m));
+
+      clutter_binding_pool_install_action(binding_pool, 
+                                          "move-up",
+                                          CLUTTER_Up, (ClutterModifierType)0,
+                                          G_CALLBACK(pdfcube::app::action_move_up),
+                                          me, 
+                                          NULL);
+
+      clutter_binding_pool_install_action(binding_pool, 
+                                          "move-up",
+                                          CLUTTER_KP_Up, (ClutterModifierType)0,
+                                          G_CALLBACK(pdfcube::app::action_move_up),
+                                          me, 
+                                          NULL);
+
       return FALSE;
     }
@@ -211 +237 @@
     }
 
+    //////////////////////////////////////////////////////////////////////
+    //
+    // Callbacks
+    //
+    static gboolean keypress_event(ClutterActor* actor,
+                                   ClutterEvent* evt,
+                                   gpointer data)
+    {
+      pdfcube::app* self = (pdfcube::app*)data;
+      ClutterKeyEvent* key_evt = (ClutterKeyEvent*)evt;
+      ClutterBindingPool *pool = NULL;
+      
+      std::cerr << " * " << G_OBJECT_TYPE_NAME(actor) << std::endl;
+      /* retrieve the binding pool for the type of the actor */
+      pool = clutter_binding_pool_find(G_OBJECT_TYPE_NAME(actor));
+      
+      assert(pool);
+      /* activate any callback matching the key symbol and modifiers
+       * mask of the key event. the returned value can be directly
+       * used to signal that the actor has handled the event.
+       */
+      return clutter_binding_pool_activate (pool, 
+                                            (guint)key_evt->keyval,
+                                            (ClutterModifierType)key_evt->modifier_state,
+                                            G_OBJECT(actor));
+      
+    }
+
+    static gboolean action_move_up(GObject             *instance,
+                                   const gchar         *action_name,
+                                   guint                key_val,
+                                   ClutterModifierType  modifiers,
+                                   gpointer             user_data)
+    {
+      std::cerr << "move-up" << std::endl;
+    }
+
+
+
   };
 }