@@ -232,16 +232,19 @@ static void
232
232
widget_clear_all_children (GtkWidget * widget )
233
233
{
234
234
GdkWindow * w ;
235
+ GdkDisplay * display ;
235
236
236
237
gs_debug ("Clearing all child windows" );
238
+ display = gtk_widget_get_display (widget );
237
239
238
- gdk_error_trap_push ( );
240
+ gdk_x11_display_error_trap_push ( display );
239
241
240
242
w = gtk_widget_get_window (widget );
241
243
242
244
clear_children (GDK_WINDOW_XID (w ));
243
245
244
- gdk_error_trap_pop_ignored ();
246
+ gdk_x11_display_error_trap_pop_ignored (display );
247
+
245
248
}
246
249
247
250
void
@@ -267,6 +270,7 @@ gs_window_set_background_surface (GSWindow *window,
267
270
void
268
271
gs_window_clear (GSWindow * window )
269
272
{
273
+ GdkDisplay * display ;
270
274
g_return_if_fail (GS_IS_WINDOW (window ));
271
275
272
276
gs_debug ("Clearing widgets" );
@@ -285,7 +289,8 @@ gs_window_clear (GSWindow *window)
285
289
widget_clear_all_children (window -> priv -> drawing_area );
286
290
}
287
291
288
- gdk_flush ();
292
+ display = gtk_widget_get_display (GTK_WIDGET (window ));
293
+ gdk_display_flush (display );
289
294
}
290
295
291
296
static cairo_region_t *
@@ -764,16 +769,19 @@ select_popup_events (void)
764
769
{
765
770
XWindowAttributes attr ;
766
771
unsigned long events ;
772
+ GdkDisplay * display ;
767
773
768
- gdk_error_trap_push ();
774
+ display = gdk_display_get_default ();
775
+
776
+ gdk_x11_display_error_trap_push (display );
769
777
770
778
memset (& attr , 0 , sizeof (attr ));
771
- XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default () ), GDK_ROOT_WINDOW (), & attr );
779
+ XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (display ), GDK_ROOT_WINDOW (), & attr );
772
780
773
781
events = SubstructureNotifyMask | attr .your_event_mask ;
774
- XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default () ), GDK_ROOT_WINDOW (), events );
782
+ XSelectInput (GDK_DISPLAY_XDISPLAY (display ), GDK_ROOT_WINDOW (), events );
775
783
776
- gdk_error_trap_pop_ignored ( );
784
+ gdk_x11_display_error_trap_pop_ignored ( display );
777
785
}
778
786
779
787
static void
@@ -782,15 +790,18 @@ window_select_shape_events (GSWindow *window)
782
790
#ifdef HAVE_SHAPE_EXT
783
791
unsigned long events ;
784
792
int shape_error_base ;
793
+ GdkDisplay * display ;
794
+
795
+ display = gtk_widget_get_display (GTK_WIDGET (window ));
785
796
786
- gdk_error_trap_push ( );
797
+ gdk_x11_display_error_trap_push ( display );
787
798
788
- if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default () ), & window -> priv -> shape_event_base , & shape_error_base )) {
799
+ if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (display ), & window -> priv -> shape_event_base , & shape_error_base )) {
789
800
events = ShapeNotifyMask ;
790
- XShapeSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default () ), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window ))), events );
801
+ XShapeSelectInput (GDK_DISPLAY_XDISPLAY (display ), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window ))), events );
791
802
}
792
803
793
- gdk_error_trap_pop_ignored ( );
804
+ gdk_x11_display_error_trap_pop_ignored ( display );
794
805
#endif
795
806
}
796
807
0 commit comments