[Commit] twin ChangeLog, 1.26, 1.27 twin_box.c, 1.2, 1.3 twin_clock.c, 1.2, 1.3 twin_clock.h, 1.1, 1.2 twin_widget.c, 1.4, 1.5 xtwin.c, 1.23, 1.24

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/twin
In directory home.keithp.com:/tmp/cvs-serv10432

Modified Files:
	ChangeLog twin_box.c twin_clock.c twin_clock.h twin_widget.c 
	xtwin.c 
Log Message:
2004-10-27  Keith Packard  <keithp at keithp.com>

	* twin_box.c: (_twin_box_dispatch):
	Boxes have no paint
	
	* twin_clock.c: (twin_clock_set_transform), (twin_clock_hand),
	(_twin_clock_face), (_twin_clock_interval), (_twin_clock_paint),
	(_twin_clock_timeout), (_twin_clock_dispatch), (_twin_clock_init),
	(twin_clock_create), (twin_clock_start):
	* twin_clock.h:
	Convert to a widget
	
	* twin_widget.c: (_twin_widget_paint):
	Always paint background, even if transparent
	
	* xtwin.c: (main):
	show clock widget


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/twin/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	27 Oct 2004 20:09:36 -0000	1.26
+++ ChangeLog	27 Oct 2004 20:34:55 -0000	1.27
@@ -1,5 +1,23 @@
 2004-10-27  Keith Packard  <keithp at keithp.com>
 
+	* twin_box.c: (_twin_box_dispatch):
+	Boxes have no paint
+	
+	* twin_clock.c: (twin_clock_set_transform), (twin_clock_hand),
+	(_twin_clock_face), (_twin_clock_interval), (_twin_clock_paint),
+	(_twin_clock_timeout), (_twin_clock_dispatch), (_twin_clock_init),
+	(twin_clock_create), (twin_clock_start):
+	* twin_clock.h:
+	Convert to a widget
+	
+	* twin_widget.c: (_twin_widget_paint):
+	Always paint background, even if transparent
+	
+	* xtwin.c: (main):
+	show clock widget
+
+2004-10-27  Keith Packard  <keithp at keithp.com>
+
 	* Makefile.am:
 	Add calculator and missing header files
 	

Index: twin_box.c
===================================================================
RCS file: /local/src/CVS/twin/twin_box.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- twin_box.c	27 Oct 2004 20:09:36 -0000	1.2
+++ twin_box.c	27 Oct 2004 20:34:55 -0000	1.3
@@ -196,7 +196,8 @@
     twin_event_t    ev;
     twin_widget_t   *child;
 
-    if (_twin_widget_dispatch (widget, event) == TwinDispatchDone)
+    if (event->kind != TwinEventPaint &&
+	_twin_widget_dispatch (widget, event) == TwinDispatchDone)
 	return TwinDispatchDone;
     switch (event->kind) {
     case TwinEventQueryGeometry:

Index: twin_clock.c
===================================================================
RCS file: /local/src/CVS/twin/twin_clock.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- twin_clock.c	26 Oct 2004 06:15:42 -0000	1.2
+++ twin_clock.c	27 Oct 2004 20:34:55 -0000	1.3
@@ -23,6 +23,7 @@
  */
 
 #include <twin_clock.h>
+#include <twinint.h>
 #include <stdio.h>
 #include <sys/time.h>
 #include <time.h>
@@ -44,16 +45,17 @@
 #define TWIN_CLOCK_BORDER	0xffbababa
 #define TWIN_CLOCK_BORDER_WIDTH	D(0.01)
 
+#define _twin_clock_pixmap(clock)   ((clock)->widget.window->pixmap)
+
 static void
-twin_clock_set_transform (twin_window_t	*clock,
+twin_clock_set_transform (twin_clock_t	*clock,
 			  twin_path_t	*path)
 {
     twin_fixed_t    scale;
 
     scale = (TWIN_FIXED_ONE - TWIN_CLOCK_BORDER_WIDTH * 3) / 2;
-    twin_path_scale (path,
-		     (clock->client.right - clock->client.left) * scale,
-		     (clock->client.bottom - clock->client.top) * scale);
+    twin_path_scale (path, _twin_widget_width (clock) * scale,
+		     _twin_widget_height (clock) * scale);
 
     twin_path_translate (path, 
 			 TWIN_FIXED_ONE + TWIN_CLOCK_BORDER_WIDTH * 3,
@@ -63,7 +65,7 @@
 }
 
 static void
-twin_clock_hand (twin_window_t	*clock, 
+twin_clock_hand (twin_clock_t	*clock, 
 		 twin_angle_t	angle, 
 		 twin_fixed_t	len,
 		 twin_fixed_t	fill_width,
@@ -90,9 +92,9 @@
     twin_path_circle (pen, fill_width);
     twin_path_convolve (path, stroke, pen);
 
-    twin_paint_path (clock->pixmap, fill_pixel, path);
+    twin_paint_path (_twin_clock_pixmap(clock), fill_pixel, path);
 
-    twin_paint_stroke (clock->pixmap, out_pixel, path, out_width);
+    twin_paint_stroke (_twin_clock_pixmap(clock), out_pixel, path, out_width);
     
     twin_path_destroy (path);
     twin_path_destroy (pen);
@@ -106,7 +108,7 @@
 }
 
 static void
-twin_clock_face (twin_window_t *clock)
+_twin_clock_face (twin_clock_t *clock)
 {
     twin_path_t	    *path = twin_path_create ();
     int		    m;
@@ -116,9 +118,9 @@
     twin_path_move (path, 0, 0);
     twin_path_circle (path, TWIN_FIXED_ONE);
     
-    twin_paint_path (clock->pixmap, TWIN_CLOCK_BACKGROUND, path);
+    twin_paint_path (_twin_clock_pixmap(clock), TWIN_CLOCK_BACKGROUND, path);
 
-    twin_paint_stroke (clock->pixmap, TWIN_CLOCK_BORDER, path, TWIN_CLOCK_BORDER_WIDTH);
+    twin_paint_stroke (_twin_clock_pixmap(clock), TWIN_CLOCK_BORDER, path, TWIN_CLOCK_BORDER_WIDTH);
 
     {
 	twin_state_t	    state = twin_path_save (path);
@@ -136,12 +138,12 @@
 	
 	twin_path_move (path, -width / 2, metrics.ascent - height/2 + D(0.01));
 	twin_path_draw (path, width / 2, metrics.ascent - height/2 + D(0.01));
-	twin_paint_stroke (clock->pixmap, TWIN_CLOCK_WATER_UNDER, path, D(0.02));
+	twin_paint_stroke (_twin_clock_pixmap(clock), TWIN_CLOCK_WATER_UNDER, path, D(0.02));
 	twin_path_empty (path);
 	
 	twin_path_move (path, -width / 2 - metrics.left_side_bearing, metrics.ascent - height/2);
 	twin_path_utf8 (path, label);
-	twin_paint_path (clock->pixmap, TWIN_CLOCK_WATER, path);
+	twin_paint_path (_twin_clock_pixmap(clock), TWIN_CLOCK_WATER, path);
 	twin_path_restore (path, &state);
     }
 
@@ -157,7 +159,7 @@
 	{
 	    twin_path_move (path, 0, -TWIN_FIXED_ONE);
 	    twin_path_draw (path, 0, -D(0.9));
-	    twin_paint_stroke (clock->pixmap, TWIN_CLOCK_TIC, path, D(0.01));
+	    twin_paint_stroke (_twin_clock_pixmap(clock), TWIN_CLOCK_TIC, path, D(0.01));
 	}
 	else
 	{
@@ -172,7 +174,7 @@
 	    left = -width / 2 - metrics.left_side_bearing;
 	    twin_path_move (path, left, -D(0.98) + metrics.ascent);
 	    twin_path_utf8 (path, hour);
-	    twin_paint_path (clock->pixmap, TWIN_CLOCK_NUMBERS, path);
+	    twin_paint_path (_twin_clock_pixmap(clock), TWIN_CLOCK_NUMBERS, path);
 	}
         twin_path_restore (path, &state);
     }
@@ -181,9 +183,17 @@
 }
 
 static twin_time_t
-twin_clock_timeout (twin_time_t now, void *closure)
+_twin_clock_interval (void)
+{
+    struct timeval  tv;
+    gettimeofday (&tv, NULL);
+
+    return 1000 - (tv.tv_usec / 1000);
+}
+
+void
+_twin_clock_paint (twin_clock_t *clock)
 {
-    twin_window_t   *clock = closure;
     struct timeval  tv;
     twin_angle_t    second_angle, minute_angle, hour_angle;
     struct tm	    t;
@@ -192,12 +202,7 @@
 
     localtime_r(&tv.tv_sec, &t);
 
-    twin_pixmap_disable_update (clock->pixmap);
-    twin_fill (clock->pixmap, 0x00000000, TWIN_SOURCE,
-	       clock->client.left, clock->client.top,
-	       clock->client.right, clock->client.bottom);
-    
-    twin_clock_face (clock);
+    _twin_clock_face (clock);
 
     second_angle = ((t.tm_sec * 100 + tv.tv_usec / 10000) * 
 		    TWIN_ANGLE_360) / 6000;
@@ -209,30 +214,61 @@
 		     TWIN_CLOCK_MINUTE, TWIN_CLOCK_MINUTE_OUT);
     twin_clock_hand (clock, second_angle, D(0.9), D(0.01), D(0.01),
 		     TWIN_CLOCK_SECOND, TWIN_CLOCK_SECOND_OUT);
+}
 
-    twin_pixmap_enable_update (clock->pixmap);
-    
-    gettimeofday (&tv, NULL);
+static twin_time_t
+_twin_clock_timeout (twin_time_t now, void *closure)
+{
+    twin_clock_t   *clock = closure;
+    _twin_widget_queue_paint (&clock->widget);
+    return _twin_clock_interval ();
+}
 
-    return 1000 - (tv.tv_usec / 1000);
+twin_dispatch_result_t
+_twin_clock_dispatch (twin_widget_t *widget, twin_event_t *event)
+{
+    twin_clock_t    *clock = (twin_clock_t *) widget;
+
+    if (_twin_widget_dispatch (widget, event) == TwinDispatchDone)
+	return TwinDispatchDone;
+    switch (event->kind) {
+    case TwinEventPaint:
+	_twin_clock_paint (clock);
+	break;
+    default:
+	break;
+    }
+    return TwinDispatchContinue;
 }
 
 void
-twin_clock_start (twin_screen_t *screen, const char *name, int x, int y, int w, int h)
+_twin_clock_init (twin_clock_t		*clock, 
+		  twin_box_t		*parent,
+		  twin_dispatch_proc_t	dispatch)
 {
-    struct timeval  tv;
-    twin_time_t  to;
-    twin_window_t   *clock = twin_window_create (screen, TWIN_ARGB32,
-						 TwinWindowApplication,
-						 x, y, w, h);
-    twin_window_set_name (clock, name);
-    twin_clock_timeout (0, clock);
-    twin_window_show (clock);
+    static const twin_widget_layout_t	preferred = { 0, 0, 1, 1 };
+    _twin_widget_init (&clock->widget, parent, 0, preferred, dispatch);
+    clock->timeout = twin_set_timeout (_twin_clock_timeout,
+				       _twin_clock_interval(),
+				       clock);
+}
     
-    gettimeofday (&tv, NULL);
+twin_clock_t *
+twin_clock_create (twin_box_t *parent)
+{
+    twin_clock_t    *clock = malloc (sizeof (twin_clock_t));
+    
+    _twin_clock_init(clock, parent, _twin_clock_dispatch);
+    return clock;
+}
 
-    to = 1000 - (tv.tv_usec / 1000);
-    (void) twin_set_timeout (twin_clock_timeout,
-				to,
-				clock);
+void
+twin_clock_start (twin_screen_t *screen, const char *name, int x, int y, int w, int h)
+{
+    twin_toplevel_t *toplevel = twin_toplevel_create (screen, TWIN_ARGB32,
+						      TwinWindowApplication,
+						      x, y, w, h, name);
+    twin_clock_t    *clock = twin_clock_create (&toplevel->box);
+    (void) clock;
+    twin_toplevel_show (toplevel);
 }

Index: twin_clock.h
===================================================================
RCS file: /local/src/CVS/twin/twin_clock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- twin_clock.h	25 Oct 2004 19:09:35 -0000	1.1
+++ twin_clock.h	27 Oct 2004 20:34:55 -0000	1.2
@@ -27,6 +27,25 @@
 
 #include <twin.h>
 
+typedef struct _twin_clock {
+    twin_widget_t   widget;
+    twin_timeout_t  *timeout;
+} twin_clock_t;
+
+void
+_twin_clock_paint (twin_clock_t *clock);
+
+twin_dispatch_result_t
+_twin_clock_dispatch (twin_widget_t *widget, twin_event_t *event);
+    
+void
+_twin_clock_init (twin_clock_t		*clock, 
+		  twin_box_t		*parent,
+		  twin_dispatch_proc_t	dispatch);
+
+twin_clock_t *
+twin_clock_create (twin_box_t *parent);
+
 void
 twin_clock_start (twin_screen_t *screen, const char *name, int x, int y, int w, int h);
 

Index: twin_widget.c
===================================================================
RCS file: /local/src/CVS/twin/twin_widget.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- twin_widget.c	27 Oct 2004 20:09:36 -0000	1.4
+++ twin_widget.c	27 Oct 2004 20:34:55 -0000	1.5
@@ -27,14 +27,11 @@
 static void
 _twin_widget_paint (twin_widget_t *widget)
 {
-    if (widget->background)
-    {
-	twin_pixmap_t	*pixmap = widget->window->pixmap;
-	twin_coord_t	w = widget->extents.right - widget->extents.left;
-	twin_coord_t	h = widget->extents.bottom - widget->extents.top;
-	
-	twin_fill (pixmap, widget->background, TWIN_SOURCE, 0, 0, w, h);
-    }
+    twin_pixmap_t	*pixmap = widget->window->pixmap;
+    twin_coord_t	w = widget->extents.right - widget->extents.left;
+    twin_coord_t	h = widget->extents.bottom - widget->extents.top;
+    
+    twin_fill (pixmap, widget->background, TWIN_SOURCE, 0, 0, w, h);
 }
 
 twin_dispatch_result_t

Index: xtwin.c
===================================================================
RCS file: /local/src/CVS/twin/xtwin.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- xtwin.c	27 Oct 2004 20:09:36 -0000	1.23
+++ xtwin.c	27 Oct 2004 20:34:55 -0000	1.24
@@ -47,12 +47,12 @@
     twin_screen_set_background (x11->screen, twin_make_pattern ());
 #if 0
     twin_demo_start (x11->screen, "Demo", 100, 100, 400, 400);
-    twin_clock_start (x11->screen, "Clock", 10, 10, 200, 200);
     twin_text_start (x11->screen,  "Gettysburg Address",
 		     0, 0, 300, 300);
     twin_hello_start (x11->screen, "Hello, World",
 		      0, 0, 200, 200);
 #endif
+    twin_clock_start (x11->screen, "Clock", 10, 10, 200, 200);
     twin_calc_start (x11->screen, "Calculator",
 		     100, 100, 200, 200);
     twin_dispatch ();