callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget: Store the expose event in the cairo_t, not just the window

Browse Source 
This way we can grab it for propagating expose events. Not sure if we
need to do this once we're all Cairo, but for now we do.
This commit is contained in:
Benjamin Otte
2010-09-06 11:33:21 +02:00
parent fb4ba51d44
commit 90379ed68a
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkwidget.c
View File

@ -5070,14 +5070,21 @@ gtk_widget_real_mnemonic_activate (GtkWidget *widget,
return TRUE; return TRUE;
} }
static const cairo_user_data_key_t window_key; static const cairo_user_data_key_t event_key;
static GdkWindow * GdkEventExpose *
gtk_cairo_get_window (cairo_t *cr) _gtk_cairo_get_event (cairo_t *cr)
{ {
g_return_val_if_fail (cr != NULL, NULL); g_return_val_if_fail (cr != NULL, NULL);
return cairo_get_user_data (cr, &window_key); return cairo_get_user_data (cr, &event_key);
}
static void
gtk_cairo_set_event (cairo_t *cr,
GdkEventExpose *event)
{
cairo_set_user_data (cr, &event_key, event, NULL);
} }
/** /**
@ -5101,23 +5108,17 @@ gboolean
gtk_cairo_should_draw_window (cairo_t *cr, gtk_cairo_should_draw_window (cairo_t *cr,
GdkWindow *window) GdkWindow *window)
{ {
GdkWindow *cairo_window; GdkEventExpose *event;
g_return_val_if_fail (cr != NULL, FALSE); g_return_val_if_fail (cr != NULL, FALSE);
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
cairo_window = gtk_cairo_get_window (cr); event = _gtk_cairo_get_event (cr);
return cairo_window == NULL || return event == NULL ||
cairo_window == window; event->window == window;
} }
static void
gtk_cairo_set_window (cairo_t *cr,
GdkWindow *window)
{
cairo_set_user_data (cr, &window_key, window, NULL);
}
static gboolean static gboolean
gtk_widget_real_expose_event (GtkWidget *widget, gtk_widget_real_expose_event (GtkWidget *widget,
GdkEventExpose *expose) GdkEventExpose *expose)
@ -5130,7 +5131,7 @@ gtk_widget_real_expose_event (GtkWidget *widget,
return FALSE; return FALSE;
cr = gdk_cairo_create (expose->window); cr = gdk_cairo_create (expose->window);
gtk_cairo_set_window (cr, expose->window); gtk_cairo_set_event (cr, expose);
gdk_cairo_region (cr, expose->region); gdk_cairo_region (cr, expose->region);
cairo_clip (cr); cairo_clip (cr);
@ -5171,7 +5172,7 @@ gtk_widget_real_expose_event (GtkWidget *widget,
/* unset here, so if someone keeps a reference to cr we /* unset here, so if someone keeps a reference to cr we
* don't leak the window. */ * don't leak the window. */
gtk_cairo_set_window (cr, NULL); gtk_cairo_set_event (cr, NULL);
cairo_destroy (cr); cairo_destroy (cr);
return result; return result;

2
gtk/gtkwidget.h
View File

@ -947,6 +947,8 @@ GtkRequisition *gtk_requisition_new (void) G_GNUC_MALLOC;
GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition); GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition);
void gtk_requisition_free (GtkRequisition *requisition); void gtk_requisition_free (GtkRequisition *requisition);
GdkEventExpose * _gtk_cairo_get_event (cairo_t *cr);
void _gtk_widget_set_has_default (GtkWidget *widget, void _gtk_widget_set_has_default (GtkWidget *widget,
gboolean has_default); gboolean has_default);
void _gtk_widget_set_has_grab (GtkWidget *widget, void _gtk_widget_set_has_grab (GtkWidget *widget,