pinpoint: when file changes, move to first changed slide.

Author: Øyvind Kolås

pinpoint/pinpoint.c

@@ -30,6 +30,9 @@
 
 #include "pinpoint.h"
 
+GList *pp_slides      = NULL; /* list of slide texts */
+GList *pp_slidep      = NULL; /* current slide */
+
 typedef struct
 {
   const char *name;
@@ -163,19 +166,17 @@ main (int    argc,
 
   renderer->run (renderer);
   renderer->finalize (renderer);
+  if (renderer->source)
+    g_free (renderer->source);
 
   g_list_free (pp_slides);
 
   return 0;
 }
 
-
 /*********************/
 
 
-GList *pp_slides      = NULL; /* list of slide texts */
-GList *pp_slidep      = NULL; /* current slide */
-
 /*
  * Cross-renderers helpers
  */
@@ -442,10 +443,33 @@ pp_parse_slides (PinPointRenderer *renderer,
   GList      *s;
   PinPointPoint *point, *next_point;
 
-  /* store current slideno */
-  if (pp_slidep)
-  for (;pp_slidep->prev; pp_slidep = pp_slidep->prev)
-    slideno++;
+  if (renderer->source)
+    {
+      gboolean start_of_line = TRUE;
+      int pos;
+      int lineno=0;
+      /* compute slide no that has changed */
+      for (pos = 0, slideno = 0;
+           slide_src[pos] && renderer->source[pos] && slide_src[pos]==renderer->source[pos]
+           ; pos ++)
+        {
+          switch (slide_src[pos])
+            {
+              case '\n':
+                start_of_line = TRUE;
+                lineno++;
+                break;
+              case '-':
+                if (start_of_line)
+                  slideno++;
+              default:
+                start_of_line = FALSE;
+            }
+        }
+      slideno--;
+      g_free (renderer->source);
+    }
+  renderer->source = g_strdup (slide_src);
 
   for (s = pp_slides; s; s = s->next)
     pin_point_free (renderer, s->data);

pinpoint/pinpoint.h

@@ -68,6 +68,7 @@ struct _PinPointRenderer
   void *    (*allocate_data) (PinPointRenderer *renderer);
   void      (*free_data)     (PinPointRenderer *renderer,
                               void             *datap);
+  char *      source;
 };
 
 struct _PinPointPoint

pinpoint/pp-clutter.c

@@ -962,7 +962,8 @@ show_slide (ClutterRenderer *renderer, gboolean backwards)
                   NULL);
          }
        else /* no text, fade out shading */
-         g_object_set (data->shading, "opacity", 0, NULL);
+         if (data->shading)
+           g_object_set (data->shading, "opacity", 0, NULL);
        if (data->foreground)
          {
            clutter_actor_reparent (data->text, data->foreground);
@@ -1023,20 +1024,33 @@ stage_resized (ClutterActor    *actor,
   show_slide (renderer, FALSE); /* redisplay the current slide */
 }
 
-static void
-file_changed (GFileMonitor      *monitor,
-              GFile             *file,
-              GFile             *other_file,
-              GFileMonitorEvent  event_type,
-              ClutterRenderer   *renderer)
+static guint reload_tag = 0;
+
+static gboolean
+reload (gpointer data)
 {
+  ClutterRenderer *renderer = data;
   char   *text = NULL;
   if (!g_file_get_contents (renderer->path, &text, NULL, NULL))
     g_error ("failed to load slides from %s\n", renderer->path);
   renderer->rest_y = STARTPOS;
   pp_parse_slides (PINPOINT_RENDERER (renderer), text);
   g_free (text);
   show_slide(renderer, FALSE);
+  reload_tag = 0;
+  return FALSE;
+}
+
+static void
+file_changed (GFileMonitor      *monitor,
+              GFile             *file,
+              GFile             *other_file,
+              GFileMonitorEvent  event_type,
+              ClutterRenderer   *renderer)
+{
+  if (reload_tag)
+    g_source_remove (reload_tag);
+  reload_tag = g_timeout_add (200, reload, renderer);
 }
 
 static ClutterRenderer clutter_renderer_vtable =

pinpoint/sample.txt

@@ -1,6 +1,6 @@
 #!/usr/bin/env pinpoint
 [font=Sans 50px]
-[bg.jpg][black]
+[bg.jpg]
 - The bits above are slide defaults
 pinpoint
 - [wth.jpg] lines starting with - are slide seperators with per-slide properties

pinpoint/transitions/fade.json

@@ -12,7 +12,6 @@
      },
      {
        "type":"ClutterGroup",
-       "depth":20.0,
        "children":[
      {
        "id":"midground",
@@ -22,7 +21,6 @@
      }]},
      {
        "id":"foreground",
-       "depth":30.0,
        "type":"ClutterGroup",
        "rotation-center-z-gravity":"center",
        "scale-gravity":"center"