Attachment 2864 Details for Bug 4081 – update cairo-demo/path_paint/path_paint.c with cvs version of cairo and gtk

[patch] update cairo-demo/path_paint/path_paint.c with cvs version of cairo and gtk

zwnj--path_paint--path_paint.c--01.patch (text/plain), 3.73 KB, created by Behnam Esfahbod [:zwnj] on 2005-08-14 22:10:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Behnam Esfahbod [:zwnj]

Created: 2005-08-14 22:10:59 UTC

Size: 3.73 KB

patch

obsolete

>Index: path_paint/path_paint.c
>===================================================================
>RCS file: /cvs/cairo/cairo-demo/path_paint/path_paint.c,v
>retrieving revision 1.8
>diff -u -r1.8 path_paint.c
>--- path_paint/path_paint.c	8 Aug 2005 00:31:39 -0000	1.8
>+++ path_paint/path_paint.c	14 Aug 2005 12:55:17 -0000
>@@ -1,6 +1,6 @@
> #include <gtk/gtk.h>
>+#include <cairo.h>
> #include <math.h>
>-#include <gtkcairo.h>
> #include <gdk/gdkkeysyms.h>
> #include <string.h>
> 
>@@ -17,7 +17,7 @@
>  */
> #define USE_HINT
> 
>-GtkWidget *gtkcairo = NULL;
>+GtkWidget *canvas = NULL;
> 
> gboolean pen_color_is_black = TRUE;
> gint     pen_radius         = 8;
>@@ -116,22 +116,22 @@
> }
> 
> void
>-paint (GtkCairo *gtkcairo,
>-       cairo_t  *cr,
>+paint (GtkWidget *widget,
>        gpointer data)
> {
>+  cairo_t *cr;
>+  cr = gdk_cairo_create (widget->window);
>   drawapp_render (cr);
> }
> 
> void
> pen_motion (gdouble  x,
>-            gdouble  y,
>-            gboolean pen_is_down)
>+            gdouble  y)
> {
>   if (pen_is_down)
>     {
>       coords_add (x,y);
>-      gtk_widget_queue_draw (gtkcairo);
>+      gtk_widget_queue_draw (canvas);
>     }
> }
> 
>@@ -141,7 +141,7 @@
> {
>   pen_is_down = TRUE;
>   coords_add (x,y);
>-  gtk_widget_queue_draw (gtkcairo);
>+  gtk_widget_queue_draw (canvas);
> }
> 
> void
>@@ -151,7 +151,7 @@
>   pen_is_down = FALSE;
>   apply_coords (buffer);
>   coords_clear ();
>-  gtk_widget_queue_draw (gtkcairo);
>+  gtk_widget_queue_draw (canvas);
> }
> 
> 
>@@ -197,7 +197,7 @@
>               GdkEventMotion *mev,
>               gpointer        user_data)
> {
>-  pen_motion (mev->x, mev->y, pen_is_down);
>+  pen_motion (mev->x, mev->y);
>   gdk_window_get_pointer (widget->window, NULL, NULL, NULL);
> 
>   return TRUE;
>@@ -212,10 +212,7 @@
>     {
>       case GDK_x:
>       case GDK_X:
>-        if (pen_color_is_black)
>-          pen_color_is_black = FALSE;
>-        else
>-          pen_color_is_black = TRUE;
>+        pen_color_is_black = pen_color_is_black ? FALSE : TRUE;
>       default:
>         break;
>     }
>@@ -232,9 +229,9 @@
> 
>   mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
> 
>-  gtkcairo = gtk_cairo_new ();
>+  canvas = gtk_drawing_area_new ();
> 
>-  gtk_widget_set_events (gtkcairo,
>+  gtk_widget_set_events (canvas,
>                          GDK_EXPOSURE_MASK            |
> #ifdef USE_HINT
>                          GDK_POINTER_MOTION_HINT_MASK |
>@@ -243,21 +240,21 @@
>                          GDK_BUTTON_PRESS_MASK        |
>                          GDK_KEY_PRESS_MASK           |
>                          GDK_BUTTON_RELEASE_MASK);
>-  gtk_widget_set_size_request (gtkcairo, WIDTH, HEIGHT);
>+  gtk_widget_set_size_request (canvas, WIDTH, HEIGHT);
> 
>-  g_signal_connect (G_OBJECT (gtkcairo), "paint",
>+  g_signal_connect (G_OBJECT (canvas), "expose-event",
>                     G_CALLBACK (paint), NULL);
>-  g_signal_connect (G_OBJECT (gtkcairo), "motion_notify_event",
>+  g_signal_connect (G_OBJECT (canvas), "motion_notify_event",
>                     G_CALLBACK (event_motion), NULL);
>-  g_signal_connect (G_OBJECT (gtkcairo), "button_press_event",
>+  g_signal_connect (G_OBJECT (canvas), "button_press_event",
>                     G_CALLBACK (event_press), NULL);
>-  g_signal_connect (G_OBJECT (gtkcairo), "button_release_event",
>+  g_signal_connect (G_OBJECT (canvas), "button_release_event",
>                     G_CALLBACK (event_release), NULL);
>-  g_signal_connect (G_OBJECT (gtkcairo), "key_press_event",
>+  g_signal_connect (G_OBJECT (canvas), "key_press_event",
>                     G_CALLBACK (event_keypress), NULL);
>-  g_object_set (G_OBJECT (gtkcairo), "can_focus", 1, NULL);
>+  g_object_set (G_OBJECT (canvas), "can_focus", 1, NULL);
> 
>-  gtk_container_add (GTK_CONTAINER (mainwin), gtkcairo);
>+  gtk_container_add (GTK_CONTAINER (mainwin), canvas);
> 
>   init ();
>   gtk_widget_show_all (mainwin);

Actions: View | Splinter Review

Attachments on bug 4081: 2864

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.