isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-23 18:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Kill off MetaCompScreen

Browse Source 
Compositors haven't been able to manage more than one screen for
quite a while. Merge MetaCompScreen into MetaCompositor, and update
the API to match.

We still keep MetaScreen in the public compositor API for compatibility
purposes.
This commit is contained in:
Jasper St. Pierre
2014-03-18 17:31:22 -04:00
parent 47aa583625
commit cd905a34fb
15 changed files with 222 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/keybindings.c
View File

@ -1660,7 +1660,7 @@ process_event (MetaDisplay *display,
/* If the compositor filtered out the keybindings, that
* means they don't want the binding to trigger, so we do
* the same thing as if the binding didn't exist. */
if (meta_compositor_filter_keybinding (display->compositor, screen, binding))
if (meta_compositor_filter_keybinding (display->compositor, binding))
goto not_found;
if (binding->handler == NULL)
@ -1745,7 +1745,7 @@ process_overlay_key (MetaDisplay *display,
display->overlay_key_combo.keycode,
display->grab_mask);
if (binding &&
meta_compositor_filter_keybinding (display->compositor, screen, binding))
meta_compositor_filter_keybinding (display->compositor, binding))
return TRUE;
meta_display_overlay_key_activate (display);
}