zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

GTK 3 port: provide a 'draw' handler.

Browse Source 
This is what GTK 3 uses in place of 'expose_event'. Also I've arranged
here for my internal USE_CAIRO_WITHOUT_PIXMAP setting to be enabled in
GTK3, as well as in GTK2 with deprecated functions disabled.
This commit is contained in:
Simon Tatham
2015-10-03 12:28:11 +01:00
parent 62c6312982
commit 37232c3c30
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk.c
View File

@ -39,7 +39,7 @@
#endif #endif
#if GTK_CHECK_VERSION(2,8,0) #if GTK_CHECK_VERSION(2,8,0)
# define USE_CAIRO # define USE_CAIRO
# if defined(GDK_DISABLE_DEPRECATED) # if GTK_CHECK_VERSION(3,0,0) || defined(GDK_DISABLE_DEPRECATED)
# define USE_CAIRO_WITHOUT_PIXMAP # define USE_CAIRO_WITHOUT_PIXMAP
# endif # endif
#endif #endif
@ -1198,6 +1198,21 @@ static gint motion_event(GtkWidget *widget, GdkEventMotion *event,
return TRUE; return TRUE;
} }
#if GTK_CHECK_VERSION(3,0,0)
static gint draw_area(GtkWidget *widget, cairo_t *cr, gpointer data)
{
frontend *fe = (frontend *)data;
GdkRectangle dirtyrect;
gdk_cairo_get_clip_rectangle(cr, &dirtyrect);
cairo_set_source_surface(cr, fe->image, fe->ox, fe->oy);
cairo_rectangle(cr, dirtyrect.x, dirtyrect.y,
dirtyrect.width, dirtyrect.height);
cairo_fill(cr);
return TRUE;
}
#else
static gint expose_area(GtkWidget *widget, GdkEventExpose *event, static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
gpointer data) gpointer data)
{ {
@ -1219,6 +1234,7 @@ static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
} }
return TRUE; return TRUE;
} }
#endif
static gint map_window(GtkWidget *widget, GdkEvent *event, static gint map_window(GtkWidget *widget, GdkEvent *event,
gpointer data) gpointer data)
@ -2527,8 +2543,13 @@ static frontend *new_window(char *arg, int argtype, char **error)
G_CALLBACK(selection_get), fe); G_CALLBACK(selection_get), fe);
g_signal_connect(G_OBJECT(fe->area), "selection_clear_event", g_signal_connect(G_OBJECT(fe->area), "selection_clear_event",
G_CALLBACK(selection_clear), fe); G_CALLBACK(selection_clear), fe);
#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(fe->area), "draw",
G_CALLBACK(draw_area), fe);
#else
g_signal_connect(G_OBJECT(fe->area), "expose_event", g_signal_connect(G_OBJECT(fe->area), "expose_event",
G_CALLBACK(expose_area), fe); G_CALLBACK(expose_area), fe);
#endif
g_signal_connect(G_OBJECT(fe->window), "map_event", g_signal_connect(G_OBJECT(fe->window), "map_event",
G_CALLBACK(map_window), fe); G_CALLBACK(map_window), fe);
g_signal_connect(G_OBJECT(fe->area), "configure_event", g_signal_connect(G_OBJECT(fe->area), "configure_event",