diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-21 18:37:49 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-21 20:25:20 -0400 |
| commit | f3ee9be4cbb5cada9a125eaddb533847d90c4595 (patch) | |
| tree | d5ac780ea9a6a22b966d2a8da77d323e0db256d7 /src/backends/meta-idle-monitor.c | |
| parent | 2d6bcf38851cd5af7945180657f80ec411687d1e (diff) | |
| download | mutter-f3ee9be4cbb5cada9a125eaddb533847d90c4595.tar.gz | |
idle-monitor: Use the XSync idle monitor under X11 nested
Diffstat (limited to 'src/backends/meta-idle-monitor.c')
| -rw-r--r-- | src/backends/meta-idle-monitor.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c index 4c4357af6..5e18f1b1d 100644 --- a/src/backends/meta-idle-monitor.c +++ b/src/backends/meta-idle-monitor.c @@ -163,10 +163,12 @@ meta_idle_monitor_init (MetaIdleMonitor *monitor) static GType get_idle_monitor_type (void) { - if (meta_is_wayland_compositor ()) - return META_TYPE_IDLE_MONITOR_NATIVE; - else +#if defined(CLUTTER_WINDOWING_X11) + if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) return META_TYPE_IDLE_MONITOR_XSYNC; +#endif + + return META_TYPE_IDLE_MONITOR_NATIVE; } static void @@ -358,10 +360,14 @@ meta_idle_monitor_xsync_handle_xevent_all (XEvent *xevent) { int i; - if (meta_is_wayland_compositor ()) - return; - for (i = 0; i <= device_id_max; i++) - if (device_monitors[i]) - meta_idle_monitor_xsync_handle_xevent (device_monitors[i], (XSyncAlarmNotifyEvent*)xevent); + { + if (device_monitors[i]) + { + if (!META_IS_IDLE_MONITOR_XSYNC (device_monitors[i])) + return; + + meta_idle_monitor_xsync_handle_xevent (device_monitors[i], (XSyncAlarmNotifyEvent*)xevent); + } + } } |