From: Mikael Magnusson Date: Sat, 15 Nov 2008 21:53:02 +0000 (+0100) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=a1746ab2158da2324aefb7ce81e7b5edc9c41e79;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/event.c --- a1746ab2158da2324aefb7ce81e7b5edc9c41e79 diff --cc openbox/client.c index 5686a939,03bbfe48..a8a15673 --- a/openbox/client.c +++ b/openbox/client.c @@@ -202,9 -247,44 +202,9 @@@ void client_manage(Window window, ObPro gboolean transient = FALSE; Rect place, *monitor; Time launch_time, map_time; - gint user_time; + guint32 user_time; - grab_server(TRUE); - - /* 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 */ - } - - /* make sure it isn't an override-redirect window */ - if (!XGetWindowAttributes(ob_display, window, &attrib) || - attrib.override_redirect) - { - grab_server(FALSE); - return; /* don't manage it */ - } - - /* is the window a docking app */ - if ((wmhint = XGetWMHints(ob_display, window))) { - if ((wmhint->flags & StateHint) && - wmhint->initial_state == WithdrawnState) - { - dock_add(window, wmhint); - grab_server(FALSE); - XFree(wmhint); - return; - } - XFree(wmhint); - } - - ob_debug("Managing window: 0x%lx\n", window); + ob_debug("Managing window: 0x%lx", window); map_time = event_get_server_time(); diff --cc openbox/event.c index 44b6eb70,467af11c..30bc656f --- a/openbox/event.c +++ b/openbox/event.c @@@ -1344,7 -1334,7 +1344,7 @@@ static void event_handle_client(ObClien } else ob_debug_type(OB_DEBUG_APP_BUGS, "_NET_ACTIVE_WINDOW message for window %s is " - "missing source indication"); - "missing source indication\n", client->title); ++ "missing source indication", client->title); client_activate(client, TRUE, TRUE, TRUE, (e->xclient.data.l[0] == 0 || e->xclient.data.l[0] == 2));