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

change to track all children of the root window, not only mapped children;

Browse Source 
2003-12-25  Havoc Pennington  <hp@redhat.com>

	* src/compositor.c (meta_compositor_process_event): change to
	track all children of the root window, not only mapped children;
	this keeps us from losing track of the stacking order

	* src/display.c (event_callback): don't do any of the compositor
	event handling inline, do it all in compositor.c
This commit is contained in:
Havoc Pennington 2003-12-26 00:05:26 +00:00 committed by Havoc Pennington
parent daf93c5ed0
commit 35c64b45dd
6 changed files with 209 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-12-25 Havoc Pennington <hp@redhat.com>
* src/compositor.c (meta_compositor_process_event): change to
track all children of the root window, not only mapped children;
this keeps us from losing track of the stacking order
* src/display.c (event_callback): don't do any of the compositor
event handling inline, do it all in compositor.c
2003-12-21 Rob Adams <readams@readams.net 2003-12-21 Rob Adams <readams@readams.net
* src/main.c (main): fix minor punctuation error in a string. Fix * src/main.c (main): fix minor punctuation error in a string. Fix

185
src/compositor.c
View File

@ -65,6 +65,7 @@ typedef struct
unsigned int managed : 1; unsigned int managed : 1;
unsigned int damaged : 1; unsigned int damaged : 1;
unsigned int viewable : 1;
unsigned int screen_index : 8; unsigned int screen_index : 8;
@ -144,7 +145,7 @@ meta_compositor_new (MetaDisplay *display)
else else
compositor->have_composite = TRUE; compositor->have_composite = TRUE;
meta_verbose ("Composite extension event base %d error base %d\n", meta_topic (META_DEBUG_COMPOSITOR, "Composite extension event base %d error base %d\n",
compositor->composite_event_base, compositor->composite_event_base,
compositor->composite_error_base); compositor->composite_error_base);
@ -158,7 +159,7 @@ meta_compositor_new (MetaDisplay *display)
else else
compositor->have_damage = TRUE; compositor->have_damage = TRUE;
meta_verbose ("Damage extension event base %d error base %d\n", meta_topic (META_DEBUG_COMPOSITOR, "Damage extension event base %d error base %d\n",
compositor->damage_event_base, compositor->damage_event_base,
compositor->damage_error_base); compositor->damage_error_base);
@ -172,7 +173,7 @@ meta_compositor_new (MetaDisplay *display)
else else
compositor->have_fixes = TRUE; compositor->have_fixes = TRUE;
meta_verbose ("Fixes extension event base %d error base %d\n", meta_topic (META_DEBUG_COMPOSITOR, "Fixes extension event base %d error base %d\n",
compositor->fixes_event_base, compositor->fixes_event_base,
compositor->fixes_error_base); compositor->fixes_error_base);
@ -186,7 +187,7 @@ meta_compositor_new (MetaDisplay *display)
else else
compositor->have_render = TRUE; compositor->have_render = TRUE;
meta_verbose ("Render extension event base %d error base %d\n", meta_topic (META_DEBUG_COMPOSITOR, "Render extension event base %d error base %d\n",
compositor->render_event_base, compositor->render_event_base,
compositor->render_error_base); compositor->render_error_base);
@ -195,7 +196,7 @@ meta_compositor_new (MetaDisplay *display)
compositor->have_render && compositor->have_render &&
compositor->have_damage)) compositor->have_damage))
{ {
meta_verbose ("Failed to find all extensions needed for compositing manager, disabling compositing manager\n"); meta_topic (META_DEBUG_COMPOSITOR, "Failed to find all extensions needed for compositing manager, disabling compositing manager\n");
g_assert (!compositor->enabled); g_assert (!compositor->enabled);
return compositor; return compositor;
} }
@ -279,7 +280,7 @@ paint_screen (MetaCompositor *compositor,
GList *tmp; GList *tmp;
GC gc; GC gc;
meta_verbose ("Repainting screen %d root 0x%lx\n", meta_topic (META_DEBUG_COMPOSITOR, "Repainting screen %d root 0x%lx\n",
screen->number, screen->xroot); screen->number, screen->xroot);
meta_display_grab (screen->display); meta_display_grab (screen->display);
@ -350,6 +351,9 @@ paint_screen (MetaCompositor *compositor,
if (cwindow->picture == None) /* InputOnly */ if (cwindow->picture == None) /* InputOnly */
goto next; goto next;
if (!cwindow->viewable)
goto next; /* not viewable */
if (cwindow->last_painted_extents) if (cwindow->last_painted_extents)
XFixesDestroyRegion (xdisplay, XFixesDestroyRegion (xdisplay,
cwindow->last_painted_extents); cwindow->last_painted_extents);
@ -358,7 +362,7 @@ paint_screen (MetaCompositor *compositor,
/* XFixesSubtractRegion (dpy, region, region, 0, 0, w->borderSize, 0, 0); */ /* XFixesSubtractRegion (dpy, region, region, 0, 0, w->borderSize, 0, 0); */
meta_verbose (" Compositing window 0x%lx %d,%d %dx%d\n", meta_topic (META_DEBUG_COMPOSITOR, " Compositing window 0x%lx %d,%d %dx%d\n",
cwindow->xwindow, cwindow->xwindow,
cwindow->x, cwindow->y, cwindow->x, cwindow->y,
cwindow->width, cwindow->height); cwindow->width, cwindow->height);
@ -412,7 +416,7 @@ paint_screen (MetaCompositor *compositor,
meta_error_trap_pop (compositor->display, FALSE); meta_error_trap_pop (compositor->display, FALSE);
/* Copy buffer to root window */ /* Copy buffer to root window */
meta_verbose ("Copying buffer to root window 0x%lx picture 0x%lx\n", meta_topic (META_DEBUG_COMPOSITOR, "Copying buffer to root window 0x%lx picture 0x%lx\n",
screen->xroot, screen->root_picture); screen->xroot, screen->root_picture);
#if 1 #if 1
@ -720,6 +724,131 @@ process_expose (MetaCompositor *compositor,
} }
#endif /* HAVE_COMPOSITE_EXTENSIONS */ #endif /* HAVE_COMPOSITE_EXTENSIONS */
#ifdef HAVE_COMPOSITE_EXTENSIONS
static void
process_map (MetaCompositor *compositor,
XMapEvent *event)
{
MetaCompositorWindow *cwindow;
MetaScreen *screen;
/* See if window was mapped as child of root */
screen = meta_display_screen_for_root (compositor->display,
event->event);
if (screen == NULL || screen->root_picture == None)
return; /* MapNotify wasn't for a child of the root */
cwindow = g_hash_table_lookup (compositor->window_hash,
&event->window);
if (cwindow == NULL)
{
XWindowAttributes attrs;
meta_error_trap_push_with_return (compositor->display);
XGetWindowAttributes (compositor->display->xdisplay,
event->window, &attrs);
if (meta_error_trap_pop_with_return (compositor->display, TRUE) != Success)
{
meta_topic (META_DEBUG_COMPOSITOR, "Failed to get attributes for window 0x%lx\n",
event->window);
}
else
{
meta_compositor_add_window (compositor,
event->window, &attrs);
}
}
else
{
cwindow->viewable = TRUE;
}
}
#endif /* HAVE_COMPOSITE_EXTENSIONS */
#ifdef HAVE_COMPOSITE_EXTENSIONS
static void
process_unmap (MetaCompositor *compositor,
XUnmapEvent *event)
{
MetaCompositorWindow *cwindow;
MetaScreen *screen;
/* See if window was unmapped as child of root */
screen = meta_display_screen_for_root (compositor->display,
event->event);
if (screen == NULL || screen->root_picture == None)
return; /* UnmapNotify wasn't for a child of the root */
cwindow = g_hash_table_lookup (compositor->window_hash,
&event->window);
if (cwindow != NULL)
{
cwindow->viewable = FALSE;
if (cwindow->last_painted_extents)
{
merge_and_destroy_damage_region (compositor,
screen,
cwindow->last_painted_extents);
cwindow->last_painted_extents = None;
}
}
}
#endif /* HAVE_COMPOSITE_EXTENSIONS */
#ifdef HAVE_COMPOSITE_EXTENSIONS
static void
process_create (MetaCompositor *compositor,
XCreateWindowEvent *event)
{
MetaScreen *screen;
XWindowAttributes attrs;
screen = meta_display_screen_for_root (compositor->display,
event->parent);
if (screen == NULL || screen->root_picture == None)
return;
meta_error_trap_push_with_return (compositor->display);
XGetWindowAttributes (compositor->display->xdisplay,
event->window, &attrs);
if (meta_error_trap_pop_with_return (compositor->display, TRUE) != Success)
{
meta_topic (META_DEBUG_COMPOSITOR, "Failed to get attributes for window 0x%lx\n",
event->window);
}
else
{
meta_compositor_add_window (compositor,
event->window, &attrs);
}
}
#endif /* HAVE_COMPOSITE_EXTENSIONS */
#ifdef HAVE_COMPOSITE_EXTENSIONS
static void
process_destroy (MetaCompositor *compositor,
XDestroyWindowEvent *event)
{
MetaScreen *screen;
screen = meta_display_screen_for_root (compositor->display,
event->event);
if (screen == NULL || screen->root_picture == None)
return;
meta_compositor_remove_window (compositor, event->window);
}
#endif /* HAVE_COMPOSITE_EXTENSIONS */
void void
meta_compositor_process_event (MetaCompositor *compositor, meta_compositor_process_event (MetaCompositor *compositor,
XEvent *event, XEvent *event,
@ -744,6 +873,27 @@ meta_compositor_process_event (MetaCompositor *compositor,
process_expose (compositor, process_expose (compositor,
(XExposeEvent*) event); (XExposeEvent*) event);
} }
else if (event->type == UnmapNotify)
{
process_unmap (compositor,
(XUnmapEvent*) event);
}
else if (event->type == MapNotify)
{
process_map (compositor,
(XMapEvent*) event);
}
else if (event->type == CreateNotify)
{
process_create (compositor,
(XCreateWindowEvent*) event);
}
else if (event->type == DestroyNotify)
{
process_destroy (compositor,
(XDestroyWindowEvent*) event);
}
#endif /* HAVE_COMPOSITE_EXTENSIONS */ #endif /* HAVE_COMPOSITE_EXTENSIONS */
} }
@ -775,6 +925,10 @@ meta_compositor_add_window (MetaCompositor *compositor,
if (cwindow != NULL) if (cwindow != NULL)
return; return;
meta_topic (META_DEBUG_COMPOSITOR,
"Adding window 0x%lx to compositor\n",
xwindow);
/* Create Damage object to monitor window damage */ /* Create Damage object to monitor window damage */
meta_error_trap_push (compositor->display); meta_error_trap_push (compositor->display);
damage = XDamageCreate (compositor->display->xdisplay, damage = XDamageCreate (compositor->display->xdisplay,
@ -796,6 +950,10 @@ meta_compositor_add_window (MetaCompositor *compositor,
cwindow->height = attrs->height; cwindow->height = attrs->height;
cwindow->border_width = attrs->border_width; cwindow->border_width = attrs->border_width;
/* viewable == mapped for the root window, since root can't be unmapped */
cwindow->viewable = (attrs->map_state == IsViewable);
g_assert (attrs->map_state != IsUnviewable);
pa.subwindow_mode = IncludeInferiors; pa.subwindow_mode = IncludeInferiors;
if (attrs->class != InputOnly) if (attrs->class != InputOnly)
@ -816,9 +974,8 @@ meta_compositor_add_window (MetaCompositor *compositor,
g_hash_table_insert (compositor->window_hash, g_hash_table_insert (compositor->window_hash,
&cwindow->xwindow, cwindow); &cwindow->xwindow, cwindow);
/* assume cwindow is at the top of the stack */ /* assume cwindow is at the top of the stack as it was either just
/* FIXME this is wrong, switch workspaces to see an example; * created or just reparented to the root window
* in fact we map windows up from the bottom
*/ */
screen->compositor_windows = g_list_prepend (screen->compositor_windows, screen->compositor_windows = g_list_prepend (screen->compositor_windows,
cwindow); cwindow);
@ -846,6 +1003,10 @@ meta_compositor_remove_window (MetaCompositor *compositor,
if (cwindow == NULL) if (cwindow == NULL)
return; return;
meta_topic (META_DEBUG_COMPOSITOR,
"Removing window 0x%lx from compositor\n",
xwindow);
screen = meta_compositor_window_get_screen (cwindow); screen = meta_compositor_window_get_screen (cwindow);
if (cwindow->last_painted_extents) if (cwindow->last_painted_extents)
@ -890,7 +1051,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
XCompositeRedirectSubwindows (screen->display->xdisplay, XCompositeRedirectSubwindows (screen->display->xdisplay,
screen->xroot, screen->xroot,
CompositeRedirectManual); CompositeRedirectManual);
meta_verbose ("Subwindows redirected, we are now the compositing manager\n"); meta_topic (META_DEBUG_COMPOSITOR, "Subwindows redirected, we are now the compositing manager\n");
pa.subwindow_mode = IncludeInferiors; pa.subwindow_mode = IncludeInferiors;

46
src/display.c
View File

@ -1319,10 +1319,6 @@ event_callback (XEvent *event,
} }
#endif /* HAVE_SHAPE */ #endif /* HAVE_SHAPE */
meta_compositor_process_event (display->compositor,
event,
window);
switch (event->type) switch (event->type)
{ {
case KeyPress: case KeyPress:
@ -1675,10 +1671,8 @@ event_callback (XEvent *event,
break; break;
case CreateNotify: case CreateNotify:
break; break;
case DestroyNotify:
meta_compositor_remove_window (display->compositor,
modified);
case DestroyNotify:
if (window) if (window)
{ {
if (display->grab_op != META_GRAB_OP_NONE && if (display->grab_op != META_GRAB_OP_NONE &&
@ -1696,13 +1690,11 @@ event_callback (XEvent *event,
else else
{ {
meta_window_free (window); /* Unmanage destroyed window */ meta_window_free (window); /* Unmanage destroyed window */
window = NULL;
} }
} }
break; break;
case UnmapNotify: case UnmapNotify:
meta_compositor_remove_window (display->compositor,
modified);
if (window) if (window)
{ {
if (display->grab_op != META_GRAB_OP_NONE && if (display->grab_op != META_GRAB_OP_NONE &&
@ -1738,36 +1730,6 @@ event_callback (XEvent *event,
} }
break; break;
case MapNotify: case MapNotify:
{
/* If a window becomes viewable and is a child of the root,
* then we need to add it to the compositor. If the window
* has a frame we definitely don't want to add it, it's
* just being mapped inside the frame.
*/
if (window == NULL ||
(window && window->frame == NULL) ||
frame_was_receiver)
{
XWindowAttributes attrs;
meta_error_trap_push_with_return (display);
XGetWindowAttributes (display->xdisplay,
modified, &attrs);
if (meta_error_trap_pop_with_return (display, TRUE) != Success)
{
meta_verbose ("Failed to get attributes for window 0x%lx\n",
modified);
}
else
{
if (attrs.map_state == IsViewable)
meta_compositor_add_window (display->compositor,
modified, &attrs);
}
}
}
break; break;
case MapRequest: case MapRequest:
if (window == NULL) if (window == NULL)
@ -2077,6 +2039,10 @@ event_callback (XEvent *event,
break; break;
} }
meta_compositor_process_event (display->compositor,
event,
window);
display->current_time = CurrentTime; display->current_time = CurrentTime;
return filter_out_event; return filter_out_event;
} }

1
src/screen.c
View File

@ -762,7 +762,6 @@ meta_screen_manage_all_windows (MetaScreen *screen)
meta_window_new_with_attrs (screen->display, children[i], TRUE, meta_window_new_with_attrs (screen->display, children[i], TRUE,
&attrs); &attrs);
if (attrs.map_state == IsViewable)
meta_compositor_add_window (screen->display->compositor, meta_compositor_add_window (screen->display->compositor,
children[i], &attrs); children[i], &attrs);
} }

2
src/util.c
View File

@ -284,6 +284,8 @@ topic_name (MetaDebugTopic topic)
return "RESIZING"; return "RESIZING";
case META_DEBUG_SHAPES: case META_DEBUG_SHAPES:
return "SHAPES"; return "SHAPES";
case META_DEBUG_COMPOSITOR:
return "COMPOSITOR";
} }
return "WM"; return "WM";

3
src/util.h
View File

@ -66,7 +66,8 @@ typedef enum
META_DEBUG_PREFS = 1 << 16, META_DEBUG_PREFS = 1 << 16,
META_DEBUG_GROUPS = 1 << 17, META_DEBUG_GROUPS = 1 << 17,
META_DEBUG_RESIZING = 1 << 18, META_DEBUG_RESIZING = 1 << 18,
META_DEBUG_SHAPES = 1 << 19 META_DEBUG_SHAPES = 1 << 19,
META_DEBUG_COMPOSITOR = 1 << 20
} MetaDebugTopic; } MetaDebugTopic;