X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=c5934dedbe6159d6d053247dd10e246cd30582ea;hb=e9d878f47dfd70e495754459dbef24c37ea96de1;hp=0d08f0f4693748b8e9d898a7e4768f2d89e84a54;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 0d08f0f4..c5934ded 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,8 +1,8 @@ -#include "debug.h" #include "client.h" +#include "debug.h" +#include "startupnotify.h" #include "dock.h" #include "xerror.h" -#include "startup.h" #include "screen.h" #include "moveresize.h" #include "place.h" @@ -37,6 +37,7 @@ GSList *client_destructors = NULL; static void client_get_all(ObClient *self); static void client_toggle_border(ObClient *self, gboolean show); +static void client_get_startup_id(ObClient *self); static void client_get_area(ObClient *self); static void client_get_desktop(ObClient *self); static void client_get_state(ObClient *self); @@ -165,35 +166,8 @@ void client_manage_all() } XFree(children); - /* stack them as they were on startup! - why with stacking_lower? Why, because then windows who aren't in the - stacking list are on the top where you can see them instead of buried - at the bottom! */ - for (i = startup_stack_size; i > 0; --i) { - ObWindow *obw; - - w = startup_stack_order[i-1]; - obw = g_hash_table_lookup(window_map, &w); - if (obw) { - g_assert(WINDOW_IS_CLIENT(obw)); - stacking_lower(CLIENT_AS_WINDOW(obw)); - } - } - g_free(startup_stack_order); - startup_stack_order = NULL; - startup_stack_size = 0; - - if (config_focus_new) { - ObWindow *active; - - active = g_hash_table_lookup(window_map, &startup_active); - if (active) { - g_assert(WINDOW_IS_CLIENT(active)); - if (!client_focus(WINDOW_AS_CLIENT(active))) - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); - } else - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); - } + if (config_focus_new) + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } void client_manage(Window window) @@ -251,9 +225,18 @@ void client_manage(Window window) self->obwin.type = Window_Client; self->window = window; + /* non-zero defaults */ + self->title_count = 1; + self->wmstate = NormalState; + self->layer = -1; + self->decorate = TRUE; + self->desktop = screen_num_desktops; /* always an invalid value */ + client_get_all(self); client_restore_session_state(self); + sn_app_started(self->class); + client_change_state(self); /* remove the client's border (and adjust re gravity) */ @@ -669,19 +652,16 @@ static void client_toggle_border(ObClient *self, gboolean show) static void client_get_all(ObClient *self) { - /* non-zero defaults */ - self->title_count = 1; - self->wmstate = NormalState; - self->layer = -1; - self->decorate = TRUE; - client_get_area(self); client_update_transient_for(self); client_update_wmhints(self); + client_get_startup_id(self); client_get_desktop(self); client_get_state(self); client_get_shaped(self); + g_message("self->iconic %d", self->iconic); + client_get_mwm_hints(self); client_get_type(self);/* this can change the mwmhints for special cases */ @@ -701,6 +681,14 @@ static void client_get_all(ObClient *self) client_update_icons(self); } +static void client_get_startup_id(ObClient *self) +{ + if (!(PROP_GETS(self->window, net_startup_id, utf8, &self->startup_id))) + if (self->group) + PROP_GETS(self->group->leader, + net_startup_id, utf8, &self->startup_id); +} + static void client_get_area(ObClient *self) { XWindowAttributes wattrib; @@ -741,9 +729,16 @@ static void client_get_desktop(ObClient *self) } } } - if (!trdesk) - /* defaults to the current desktop */ - self->desktop = screen_desktop; + if (!trdesk) { + /* try get from the startup-notification protocol */ + if (sn_get_desktop(self->startup_id, &self->desktop)) { + if (self->desktop >= screen_num_desktops && + self->desktop != DESKTOP_ALL) + self->desktop = screen_num_desktops - 1; + } else + /* defaults to the current desktop */ + self->desktop = screen_desktop; + } } if (self->desktop != d) { /* set the desktop hint, to make sure that it always exists */ @@ -756,10 +751,6 @@ static void client_get_state(ObClient *self) guint32 *state; guint num; - self->modal = self->shaded = self->max_horz = self->max_vert = - self->fullscreen = self->above = self->below = self->iconic = - self->skip_taskbar = self->skip_pager = FALSE; - if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) { gulong i; for (i = 0; i < num; ++i) { @@ -819,7 +810,11 @@ void client_update_transient_for(ObClient *self) target = g_hash_table_lookup(window_map, &t); /* if this happens then we need to check for it*/ g_assert(target != self); - g_assert(!target || WINDOW_IS_CLIENT(target)); + if (target && !WINDOW_IS_CLIENT(target)) { + /* this can happen when a dialog is a child of + a dockapp, for example */ + target = NULL; + } if (!target && self->group) { /* not transient to a client, see if it is transient for a @@ -1341,12 +1336,10 @@ void client_update_title(ObClient *self) } /* dont display the number for the first window */ if (self->title_count > 1) { - char *vdata, *ndata; - ndata = g_strdup_printf(" - [%u]", self->title_count); - vdata = g_strconcat(data, ndata, NULL); - g_free(ndata); + char *ndata; + ndata = g_strdup_printf("%s - [%u]", data, self->title_count); g_free(data); - data = vdata; + data = ndata; } PROP_SETS(self->window, net_wm_visible_name, data); @@ -1715,6 +1708,7 @@ static void client_apply_startup_state(ObClient *self) { /* these are in a carefully crafted order.. */ + g_message("self->iconic %d", self->iconic); if (self->iconic) { self->iconic = FALSE; client_iconify(self, TRUE, FALSE); @@ -2508,12 +2502,17 @@ gboolean client_focus(ObClient *self) return FALSE; } - if (self->can_focus) + if (self->can_focus) { /* RevertToPointerRoot causes much more headache than RevertToNone, so I choose to use it always, hopefully to find errors quicker, if any - are left. (I hate X. I hate focus events.) */ - XSetInputFocus(ob_display, self->window, RevertToPointerRoot, + are left. (I hate X. I hate focus events.) + + Update: Changing this to RevertToNone fixed a bug with mozilla (bug + #799. So now it is RevertToNone again. + */ + XSetInputFocus(ob_display, self->window, RevertToNone, event_lasttime); + } if (self->focus_notify) { XEvent ce;