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

Assume the compositor always exists

Browse Source 
At one point, it was supported to run mutter without a compositor,
but we don't allow that any longer. A lot of code already assumes
display->compositor exists and doesn't check for a NULL pointer,
so just kill the rest of the checks.
This commit is contained in:
Jasper St. Pierre
2014-03-18 17:06:42 -04:00
parent 4fdbb466e1
commit 8b2b65246a
6 changed files with 87 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/display.c
View File

@ -2621,7 +2621,7 @@ handle_other_xevent (MetaDisplay *display,
/* NB: override redirect windows wont cause a map request so we
* watch out for map notifies against any root windows too if a
* compositor is enabled: */
if (display->compositor && window == NULL
if (window == NULL
&& meta_display_screen_for_root (display, event->xmap.event))
{
window = meta_window_x11_new (display, event->xmap.window,
@ -3085,7 +3085,7 @@ meta_display_handle_xevent (MetaDisplay *display,
}
out:
if (display->compositor && !bypass_compositor)
if (!bypass_compositor)
{
MetaWindow *window = modified != None ? meta_display_lookup_x_window (display, modified) : NULL;