xwrits: Adapt to new Gif_XNextImage interface.

Requires some data structure refactoring; appears to work.

Author: kohler

clock.c

@@ -47,16 +47,16 @@ static void
 draw_1_clock(Hand *hand, int seconds)
 {
   Port *port = hand->port;
-  Picture *p;
+  PictureList *pl;
   int x, y;
   int hour, min;
 
   if (!hand->slideshow)
     return;
 
-  p = (Picture *)(hand->slideshow->images[hand->slide]->user_data);
-  x = p->clock_x_off;
-  y = p->clock_y_off;
+  pl = (PictureList *)(hand->slideshow->images[hand->slide]->user_data);
+  x = pl->clock_x_off;
+  y = pl->clock_y_off;
 
   XFillArc(port->display, hand->w, port->white_gc,
 	   x, y, ClockWidth, ClockHeight, 0, 23040);
@@ -122,18 +122,19 @@ void
 erase_clock(Hand *hand)
 {
   Port *port = hand->port;
-  Picture *p;
+  PictureList *pl;
 
   if (!hand->slideshow)
     return;
 
-  p = (Picture *)(hand->slideshow->images[hand->slide]->user_data);
+  pl = (PictureList *)(hand->slideshow->images[hand->slide]->user_data);
 
-  XCopyArea(port->display, p->pix[port->port_number], hand->w,
+  XCopyArea(port->display, pl->frames[port->port_number][hand->slide].pixmap,
+	    hand->w,
 	    port->clock_fore_gc,
-	    p->clock_x_off - 2, p->clock_y_off - 2,
+	    pl->clock_x_off - 2, pl->clock_y_off - 2,
 	    ClockWidth + 4, ClockHeight + 4,
-	    p->clock_x_off - 2, p->clock_y_off - 2);
+	    pl->clock_x_off - 2, pl->clock_y_off - 2);
   hand->clock = 0;
 }
 

hands.c

@@ -288,6 +288,7 @@ new_hand(Port *slave_port, int x, int y)
   nh_icon->port = port;
   nh_icon->icon = nh;
   nh_icon->root_child = nh->w;
+  nh_icon->width = nh_icon->height = 0;
   nh_icon->is_icon = 1;
   nh_icon->mapped = 0;
   nh_icon->withdrawn = 0;
@@ -461,59 +462,27 @@ window_to_hand(Port *port, Window w, int allow_icons)
 
 /* draw a picture on a hand */
 
-static void
-ensure_picture(Port *port, Gif_Stream *gfs, int n)
-{
-  Gif_Image *gfi = gfs->images[n];
-  Picture *p, *last_p, *last_last_p;
-  int i;
-  int picn = port->port_number;
-
-  for (i = 0; i < n; i++) {
-    p = (Picture *)gfs->images[i]->user_data;
-    if (!p->pix[picn])		/* no picture cached for earlier image */
-      ensure_picture(port, gfs, i);
-  }
-
-  p = (Picture *)gfi->user_data;
-  last_p = (n > 0 ? (Picture *)gfs->images[n-1]->user_data : 0);
-  last_last_p = (n > 1 ? (Picture *)gfs->images[n-2]->user_data : 0);
-
-  /* reuse pixmaps from other streams */
-  if (p->canonical && gfi->transparent < 0 && gfi->left == 0 && gfi->top == 0
-      && gfi->width == gfs->screen_width && gfi->height == gfs->screen_height
-      && ((Picture *)p->canonical->user_data)->pix[picn]) {
-    p->pix[picn] = ((Picture *)p->canonical->user_data)->pix[picn];
-    return;
-  } else if (p->canonical)
-    p->canonical = 0;
-
-  p->pix[picn] = Gif_XNextImage
-    (port->gfx, (last_last_p ? last_last_p->pix[picn] : None),
-     (last_p ? last_p->pix[picn] : None),
-     gfs, n);
-}
-
 void
 draw_slide(Hand *h)
 {
   Gif_Stream *gfs;
   Gif_Image *gfi;
   Port *port;
-  Picture *p;
+  PictureList *pl;
 
   if (!h || !h->slideshow)
     return;
 
   gfs = h->slideshow;
   gfi = gfs->images[h->slide];
-  p = (Picture *)gfi->user_data;
+  pl = (PictureList *)gfi->user_data;
   port = h->port;
 
-  if (!p->pix[port->port_number])
-    ensure_picture(port, gfs, h->slide);
+  if (!pl->frames[port->port_number][h->slide].pixmap)
+    (void) Gif_XNextImage(port->gfx, gfs, h->slide,
+			  pl->frames[port->port_number]);
 
-  XSetWindowBackgroundPixmap(port->display, h->w, p->pix[port->port_number]);
+  XSetWindowBackgroundPixmap(port->display, h->w, pl->frames[port->port_number][h->slide].pixmap);
   XClearWindow(port->display, h->w);
 
   if (h->clock)

pictures.c

@@ -51,37 +51,43 @@ struct named_record built_in_pictures[] = {
 
 
 static void
-free_picture(void *v)
+free_picturelist(void *v)
 {
-  Picture *p = (Picture *)v;
+  PictureList *pl = (PictureList *)v;
   int i;
-  if (p->canonical)
-    Gif_DeleteImage(p->canonical);
-  else
+  if (--pl->refcount == 0) {
     for (i = 0; i < nports; i++)
-      if (p->pix[i])
-	XFreePixmap(ports[i]->display, p->pix[i]);
-  xfree(p);
+      Gif_DeleteXFrames(ports[i]->gfx, pl->gfs, pl->frames[i]);
+    xfree(pl);
+  }
 }
 
-static void
-add_picture(Gif_Image *gfi, int clock_x_off, int clock_y_off)
+static int
+add_picturelist(Gif_Stream *gfs, int clock_x_off, int clock_y_off)
 {
-  Picture *p = (Picture *)
-    xmalloc(sizeof(Picture) + (nports-1)*sizeof(Pixmap));
   int i;
-  p->clock_x_off = clock_x_off;
-  p->clock_y_off = clock_y_off;
-  p->canonical = 0;
+  PictureList *pl = (PictureList *)
+    xmalloc(sizeof(PictureList) + (nports-1) * sizeof(Gif_XFrame *));
+  if (!pl)
+    return -1;
+
+  pl->clock_x_off = clock_x_off;
+  pl->clock_y_off = clock_y_off;
+  pl->gfs = gfs;
+  pl->refcount = 0;
   for (i = 0; i < nports; i++)
-    p->pix[i] = None;
-
-  gfi->user_data = p;
-  gfi->free_user_data = free_picture;
+    if (!(pl->frames[i] = Gif_NewXFrames(gfs)))
+      return 0;
+  for (i = 0; i < gfs->nimages; ++i) {
+    gfs->images[i]->user_data = pl;
+    gfs->images[i]->free_user_data = free_picturelist;
+    ++pl->refcount;
+  }
+  return 0;
 }
 
 
-Gif_Stream *
+static Gif_Stream *
 get_built_in_image(const char *name)
 {
   struct named_record *nr;
@@ -107,14 +113,13 @@ get_built_in_image(const char *name)
   if (!gfs)
     return 0;
 
-  xoff = (strncmp(name, "locked", 6) == 0 ? 65 : 10);
-  for (i = 0; i < gfs->nimages; i++)
-    add_picture(gfs->images[i], xoff, 10);
-
   /* built-in images are all loop-forever. don't change the GIFs because it
      makes the executable bigger */
   if (gfs->loopcount < 0) gfs->loopcount = 0;
 
+  for (i = 0; i < gfs->nimages; ++i)
+    gfs->images[i]->user_data = (void *) gfs;
+
   return gfs;
 }
 
@@ -125,8 +130,7 @@ static Gif_Image *
 clone_image_skeleton(Gif_Image *gfi)
 {
   Gif_Image *ngfi = Gif_NewImage();
-  Picture *p = (Picture *)gfi->user_data;
-  assert(!gfi->image_data && gfi->compressed && p);
+  assert(!gfi->image_data && gfi->compressed);
   ngfi->local = gfi->local;
   if (ngfi->local) ngfi->local->refcount++;
   ngfi->transparent = gfi->transparent;
@@ -138,8 +142,6 @@ clone_image_skeleton(Gif_Image *gfi)
   ngfi->compressed_len = gfi->compressed_len;
   ngfi->free_compressed = 0;
   ngfi->delay = gfi->delay;
-  add_picture(ngfi, p->clock_x_off, p->clock_y_off);
-  ((Picture *)ngfi->user_data)->canonical = gfi;
   gfi->refcount++;
   return ngfi;
 }
@@ -149,7 +151,7 @@ add_stream_to_slideshow(Gif_Stream *add, Gif_Stream *gfs,
 			double flash_rate_ratio)
 {
   Gif_Image *gfi;
-  int i;
+  int i, duplicate;
   double d;
 
   /* adapt delays for 1-frame images */
@@ -178,8 +180,6 @@ add_stream_to_slideshow(Gif_Stream *add, Gif_Stream *gfs,
     /* don't use an image directly if it is shared */
     if (gfi->user_data)
       gfi = clone_image_skeleton(gfi);
-    else
-      add_picture(gfi, 10, 10);
     /* ensure local colormap */
     if (!gfi->local && add->global) {
       gfi->local = add->global;
@@ -220,7 +220,7 @@ parse_slideshow(const char *slideshowtext, double flash_rate_ratio, int mono)
   char *s;
   Gif_Stream *gfs, *add;
   Gif_Image *gfi;
-  int i;
+  int i, clock_xoff = -1;
 
   if (strlen(slideshowtext) >= BUFSIZ) return 0;
   strcpy(buf, slideshowtext);
@@ -256,7 +256,11 @@ parse_slideshow(const char *slideshowtext, double flash_rate_ratio, int mono)
 	  warning("no monochrome version of built-in picture '%s'", name);
 	name[i-4] = 'm';
       }
-      if (add) {		/* add images */
+      /* set clock X offset */
+      if (clock_xoff < 0)
+	  clock_xoff = (strncmp(name, "locked", 6) == 0 ? 65 : 10);
+      /* add images */
+      if (add) {
 	  add_stream_to_slideshow(add, gfs, flash_rate_ratio);
 	  goto done;
       } else if (n[0] == '*')
@@ -297,6 +301,11 @@ parse_slideshow(const char *slideshowtext, double flash_rate_ratio, int mono)
     }
   }
 
+  /* create picture list */
+  if (gfs->nimages > 0
+      && add_picturelist(gfs, (clock_xoff < 0 ? 10 : clock_xoff), 10) < 0)
+    return 0;
+
   return gfs;
 }
 

xwrits.h

@@ -15,7 +15,7 @@
 typedef struct Port Port;
 typedef struct Options Options;
 typedef struct Hand Hand;
-typedef struct Picture Picture;
+typedef struct PictureList PictureList;
 typedef struct Alarm Alarm;
 
 #ifdef __cplusplus
@@ -280,7 +280,6 @@ extern Gif_Stream *ready_slideshow, *ready_icon_slideshow;
 extern Gif_Stream *locked_slideshow, *bars_slideshow;
 #define DEFAULT_FLASH_DELAY_SEC 2
 
-Gif_Stream *get_built_in_image(const char *);
 Gif_Stream *parse_slideshow(const char *, double, int mono);
 void set_slideshow(Hand *, Gif_Stream *, const struct timeval *);
 void set_all_slideshows(Hand *, Gif_Stream *);
@@ -289,13 +288,12 @@ void set_all_slideshows(Hand *, Gif_Stream *);
 /*****************************************************************************/
 /*  Pictures								     */
 
-struct Picture {
-
+struct PictureList {
   int clock_x_off;
   int clock_y_off;
-  Gif_Image *canonical;
-  Pixmap pix[1];
-
+  Gif_Stream *gfs;
+  int refcount;
+  Gif_XFrame *frames[1];
 };
 
 void default_pictures(void);