isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Rename meta_display_handle_event to meta_display_handle_xevent

Browse Source 
The plan is to make a new version of meta_display_handle_event that
will accept Clutter events instead of X events and then gradually move
over the events to the new function and finally remove the X version.
This commit is contained in:
Neil Roberts 2013-08-29 14:07:50 +01:00 committed by Jasper St. Pierre
parent 93ae868987
commit 429583ae8b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/display-private.h
View File

@ -482,8 +482,8 @@ gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
/* In above-tab-keycode.c */ /* In above-tab-keycode.c */
guint meta_display_get_above_tab_keycode (MetaDisplay *display); guint meta_display_get_above_tab_keycode (MetaDisplay *display);
gboolean meta_display_handle_event (MetaDisplay *display, gboolean meta_display_handle_xevent (MetaDisplay *display,
XEvent *event); XEvent *event);
#ifdef HAVE_XI23 #ifdef HAVE_XI23
gboolean meta_display_process_barrier_event (MetaDisplay *display, gboolean meta_display_process_barrier_event (MetaDisplay *display,

8
src/core/display.c
View File

@ -2226,7 +2226,7 @@ reload_xkb_rules (MetaScreen *screen)
} }
/** /**
* meta_display_handle_event: * meta_display_handle_xevent:
* @display: The MetaDisplay that events are coming from * @display: The MetaDisplay that events are coming from
* @event: The event that just happened * @event: The event that just happened
* *
@ -2239,8 +2239,8 @@ reload_xkb_rules (MetaScreen *screen)
* dealing with all the kinds of events that might turn up. * dealing with all the kinds of events that might turn up.
*/ */
gboolean gboolean
meta_display_handle_event (MetaDisplay *display, meta_display_handle_xevent (MetaDisplay *display,
XEvent *event) XEvent *event)
{ {
MetaWindow *window; MetaWindow *window;
MetaWindow *property_for_window; MetaWindow *property_for_window;
@ -3240,7 +3240,7 @@ event_callback (XEvent *event,
event->xcookie.evtype == XI_Motion) event->xcookie.evtype == XI_Motion)
return FALSE; return FALSE;
return meta_display_handle_event (display, event); return meta_display_handle_xevent (display, event);
} }
/* Return the window this has to do with, if any, rather /* Return the window this has to do with, if any, rather

2
src/wayland/meta-wayland.c
View File

@ -643,7 +643,7 @@ synthesize_motion_event (MetaWaylandCompositor *compositor,
device_event.valuators.mask = NULL; device_event.valuators.mask = NULL;
device_event.valuators.values = NULL; device_event.valuators.values = NULL;
meta_display_handle_event (display, (XEvent *) &generic_event); meta_display_handle_xevent (display, (XEvent *) &generic_event);
} }
static void static void