nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watch for reverttoparent reverting to the root window, which will create a DetailInferior focusin event on root.

Browse source 
adding some debug messages also which I am using..
This commit is contained in:
Dana Jansens 2007-03-24 23:19:45 +00:00
parent 4aa8d64f76
commit eb2a0feb01
4 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
openbox/client.c
View file

@ -220,13 +220,14 @@ void client_manage(Window window)
grab_server(TRUE);
/* check if it has already been unmapped by the time we started mapping
/* check if it has already been unmapped by the time we started mapping.
the grab does a sync so we don't have to here */
if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e))
{
XPutBackEvent(ob_display, &e);
ob_debug("Trying to manage unmapped window. Aborting that.\n");
grab_server(FALSE);
return; /* don't manage it */
}
@ -393,6 +394,8 @@ void client_manage(Window window)
won't be all wacko!!
also, this moves the window to the position where it has been placed
*/
ob_debug("placing window 0x%x at %d, %d with size %d x %d\n",
self->window, newx, newy, self->area.width, self->area.height);
client_apply_startup_state(self, newx, newy);
keyboard_grab_for_client(self, TRUE);

12
openbox/event.c
View file

@ -329,7 +329,8 @@ static gboolean wanted_focusevent(XEvent *e)
if (win == RootWindow(ob_display, ob_screen)) {
/* This means focus reverted off of a client */
if (detail == NotifyPointerRoot || detail == NotifyDetailNone)
if (detail == NotifyPointerRoot || detail == NotifyDetailNone ||
detail == NotifyInferior)
return TRUE;
else
return FALSE;
@ -688,7 +689,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
} else if (ce.xfocus.detail == NotifyInferior) {
ob_debug("Focus went to parent\n");
/* Focus has been reverted to parent, which is our frame window,
so fall back to something other than the window which had it. */
or the root window, so fall back to something other than the
window which had it. */
focus_fallback(FALSE);
} else {
/* Focus did move, so process the FocusIn event */
@ -906,7 +908,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
}
break;
case UnmapNotify:
ob_debug("UnmapNotify for window 0x%x\n", client->window);
ob_debug("UnmapNotify for window 0x%x eventwin 0x%x sendevent %d "
"ignores left %d\n",
client->window, e->xunmap.event, e->xunmap.from_configure,
client->ignore_unmaps);
if (client->ignore_unmaps) {
client->ignore_unmaps--;
break;
@ -932,6 +937,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
X server to deal with after we unmanage the window */
XPutBackEvent(ob_display, e);
ob_debug("ReparentNotify for window 0x%x\n", client->window);
client_unmanage(client);
break;
case MapRequest:

14
openbox/frame.c
View file

@ -234,17 +234,19 @@ static void frame_free(ObFrame *self)
void frame_show(ObFrame *self)
{
ob_debug("frame_show for window 0x%x : %d\n", self->client->window,
self->visible);
if (!self->visible) {
self->visible = TRUE;
XMapWindow(ob_display, self->client->window);
XMapWindow(ob_display, self->window);
self->firstmap = TRUE;
}
}
void frame_hide(ObFrame *self)
{
if (self->visible || self->firstmap == FALSE) {
ob_debug("frame_hide for window 0x%x : %d\n", self->client->window,
self->visible);
if (self->visible) {
self->visible = FALSE;
self->client->ignore_unmaps += 1;
@ -252,14 +254,6 @@ void frame_hide(ObFrame *self)
events, and because the ICCCM tells us to! */
XUnmapWindow(ob_display, self->window);
XUnmapWindow(ob_display, self->client->window);
} else {
/* the frame wasn't visible, but the frame is being hidden now.
so we don't need to unmap the frame, but we do need to unmap
the client. */
self->client->ignore_unmaps += 1;
XUnmapWindow(ob_display, self->client->window);
}
self->firstmap = TRUE;
}
}

1
openbox/frame.h
View file

@ -76,7 +76,6 @@ struct _ObFrame
Strut size;
Rect area;
gboolean visible;
gboolean firstmap;
/*! Whether the window is obscured at all or fully visible. */
gboolean obscured;