[cairo-commit] cairo-5c ChangeLog, 1.21, 1.22 cairo.5c, 1.11, 1.12 gtk.c, 1.9, 1.10

[Keith Packard]

Committed by: keithp

Update of /cvs/cairo/cairo-5c
In directory evo:/home/keithp/src/cairo/cairo-5c

Modified Files:
	ChangeLog cairo.5c gtk.c 
Log Message:
2005-06-06  Keith Packard  <keithp at keithp.com>

	* cairo.5c:
	* examples/animate.5c:
	* gtk.c: (gtk_repaint_timeout), (gtk_thread_main),
	(cairo_5c_tool_dirty):
	Some locking changes.  Still locks up from time to time.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-5c/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	18 May 2005 06:21:15 -0000	1.21
+++ ChangeLog	7 Jun 2005 03:27:17 -0000	1.22
@@ -1,3 +1,11 @@
+2005-06-06  Keith Packard  <keithp at keithp.com>
+
+	* cairo.5c:
+	* examples/animate.5c:
+	* gtk.c: (gtk_repaint_timeout), (gtk_thread_main),
+	(cairo_5c_tool_dirty):
+	Some locking changes.  Still locks up from time to time.
+
 2005-05-17  Keith Packard  <keithp at keithp.com>
 
 	* cairo-5c.h:

Index: cairo.5c
===================================================================
RCS file: /cvs/cairo/cairo-5c/cairo.5c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cairo.5c	18 May 2005 06:21:15 -0000	1.11
+++ cairo.5c	7 Jun 2005 03:27:17 -0000	1.12
@@ -112,7 +112,7 @@
     
     public cairo_t dup (cairo_t cr)
     {
-	return cr;
+	return create (get_target (cr));
     }
 
     real[3] to_hsv(real r, real g, real b)

Index: gtk.c
===================================================================
RCS file: /cvs/cairo/cairo-5c/gtk.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtk.c	18 May 2005 06:21:15 -0000	1.9
+++ gtk.c	7 Jun 2005 03:27:17 -0000	1.10
@@ -241,27 +241,30 @@
 static gboolean
 gtk_repaint_timeout (gpointer data)
 {
-    gdk_threads_enter ();
+/*    printf ("repaint\n"); */
+/*    gdk_threads_enter (); */
     {
 	cairo_5c_surface_t	*c5s = data;
 	cairo_5c_tool_t	*tool = c5s->u.window.tool;
     
+/*	printf ("disable %d\n", tool->disable); */
 	if (tool->disable == 0)
 	{
 	    tool->dirty = 0;
 	    gtk_repaint (c5s, 0, 0, 0, 0);
 	}
     }
-    gdk_threads_leave ();
+/*    gdk_threads_leave (); */
+/*    printf ("repaint done\n"); */
     return FALSE;
 }
 
 static void *
 gtk_thread_main (void *closure)
 {
-    gdk_threads_enter ();
+/*    gdk_threads_enter (); */
     gtk_main ();
-    gdk_threads_leave ();
+/*    gdk_threads_leave (); */
     return 0;
 }
 
@@ -474,6 +477,7 @@
 {
     cairo_5c_tool_t *tool = c5s->u.window.tool;
     
+/*    printf ("dirty %d\n", tool->dirty); */
     if (!tool->dirty)
     {
 	tool->dirty = 1;