brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Rename filter_out_event to bypass_gtk

Browse Source 
This clarifies the intent of the variable and makes it match bypass_compositor
This commit is contained in:
Jasper St. Pierre 2013-10-03 16:56:24 -04:00
parent 84d26e31f1
commit 9c0cc664d1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/display.c
View File

@ -2246,8 +2246,7 @@ meta_display_handle_xevent (MetaDisplay *display,
MetaWindow *property_for_window; MetaWindow *property_for_window;
Window modified; Window modified;
gboolean frame_was_receiver; gboolean frame_was_receiver;
gboolean bypass_compositor; gboolean bypass_compositor = FALSE, bypass_gtk = FALSE;
gboolean filter_out_event;
XIEvent *input_event; XIEvent *input_event;
MetaMonitorManager *monitor; MetaMonitorManager *monitor;
MetaScreen *screen; MetaScreen *screen;
@ -2261,9 +2260,6 @@ meta_display_handle_xevent (MetaDisplay *display,
sn_display_process_event (display->sn_display, event); sn_display_process_event (display->sn_display, event);
#endif #endif
bypass_compositor = FALSE;
filter_out_event = FALSE;
/* Intercept XRandR events early and don't attempt any /* Intercept XRandR events early and don't attempt any
processing for them. We still let them through to Gdk though, processing for them. We still let them through to Gdk though,
so it can update its own internal state. so it can update its own internal state.
@ -2296,7 +2292,7 @@ meta_display_handle_xevent (MetaDisplay *display,
{ {
if (meta_screen_handle_xevent (screen, event)) if (meta_screen_handle_xevent (screen, event))
{ {
bypass_compositor = filter_out_event = TRUE; bypass_gtk = bypass_compositor = TRUE;
goto out; goto out;
} }
} }
@ -2371,7 +2367,7 @@ meta_display_handle_xevent (MetaDisplay *display,
gint64 new_counter_value; gint64 new_counter_value;
new_counter_value = XSyncValueLow32 (value) + ((gint64)XSyncValueHigh32 (value) << 32); new_counter_value = XSyncValueLow32 (value) + ((gint64)XSyncValueHigh32 (value) << 32);
meta_window_update_sync_request_counter (alarm_window, new_counter_value); meta_window_update_sync_request_counter (alarm_window, new_counter_value);
filter_out_event = TRUE; /* GTK doesn't want to see this really */ bypass_gtk = TRUE; /* GTK doesn't want to see this really */
} }
else else
meta_idle_monitor_handle_xevent_all (event); meta_idle_monitor_handle_xevent_all (event);
@ -2384,7 +2380,7 @@ meta_display_handle_xevent (MetaDisplay *display,
if (META_DISPLAY_HAS_SHAPE (display) && if (META_DISPLAY_HAS_SHAPE (display) &&
event->type == (display->shape_event_base + ShapeNotify)) event->type == (display->shape_event_base + ShapeNotify))
{ {
filter_out_event = TRUE; /* GTK doesn't want to see this really */ bypass_gtk = TRUE; /* GTK doesn't want to see this really */
if (window && !frame_was_receiver) if (window && !frame_was_receiver)
{ {
@ -2410,7 +2406,7 @@ meta_display_handle_xevent (MetaDisplay *display,
#ifdef HAVE_XI23 #ifdef HAVE_XI23
if (meta_display_process_barrier_event (display, input_event)) if (meta_display_process_barrier_event (display, input_event))
{ {
filter_out_event = bypass_compositor = TRUE; bypass_gtk = bypass_compositor = TRUE;
goto out; goto out;
} }
#endif /* HAVE_XI23 */ #endif /* HAVE_XI23 */
@ -2452,7 +2448,7 @@ meta_display_handle_xevent (MetaDisplay *display,
* want to pass the key event to the compositor or GTK+ at all. * want to pass the key event to the compositor or GTK+ at all.
*/ */
if (meta_display_process_key_event (display, window, (XIDeviceEvent *) input_event)) if (meta_display_process_key_event (display, window, (XIDeviceEvent *) input_event))
filter_out_event = bypass_compositor = TRUE; bypass_gtk = bypass_compositor = TRUE;
break; break;
case XI_ButtonPress: case XI_ButtonPress:
if (display->grab_op == META_GRAB_OP_COMPOSITOR) if (display->grab_op == META_GRAB_OP_COMPOSITOR)
@ -3148,7 +3144,7 @@ meta_display_handle_xevent (MetaDisplay *display,
* the GTK+ event loop because gtk+ will treat * the GTK+ event loop because gtk+ will treat
* them as ping requests and send more replies. * them as ping requests and send more replies.
*/ */
filter_out_event = TRUE; bypass_gtk = TRUE;
} }
} }
} }
@ -3225,11 +3221,11 @@ meta_display_handle_xevent (MetaDisplay *display,
if (meta_compositor_process_event (display->compositor, if (meta_compositor_process_event (display->compositor,
event, event,
window)) window))
filter_out_event = TRUE; bypass_gtk = TRUE;
} }
display->current_time = CurrentTime; display->current_time = CurrentTime;
return filter_out_event; return bypass_gtk;
} }
static gboolean static gboolean