isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-28 12:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Adapt to new clutter event filter API

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-11-14 12:58:52 -05:00
parent 63b9110f93
commit cf181fe109
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,8 @@ struct _MetaDisplay
char *name; char *name;
Display *xdisplay; Display *xdisplay;
int clutter_event_filter;
Window leader_window; Window leader_window;
Window timestamp_pinging_window; Window timestamp_pinging_window;

8
src/core/display.c
View File

@ -592,7 +592,10 @@ meta_display_open (void)
meta_ui_add_event_func (the_display->xdisplay, meta_ui_add_event_func (the_display->xdisplay,
xevent_callback, xevent_callback,
the_display); the_display);
clutter_event_add_filter (event_callback, the_display); the_display->clutter_event_filter = clutter_event_add_filter (NULL,
event_callback,
NULL,
the_display);
the_display->xids = g_hash_table_new (meta_unsigned_long_hash, the_display->xids = g_hash_table_new (meta_unsigned_long_hash,
meta_unsigned_long_equal); meta_unsigned_long_equal);
@ -1124,7 +1127,8 @@ meta_display_close (MetaDisplay *display,
meta_ui_remove_event_func (display->xdisplay, meta_ui_remove_event_func (display->xdisplay,
xevent_callback, xevent_callback,
display); display);
clutter_event_remove_filter (event_callback, display); clutter_event_remove_filter (display->clutter_event_filter);
display->clutter_event_filter = 0;
/* Free all screens */ /* Free all screens */
tmp = display->screens; tmp = display->screens;