X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=80773f6c45ed8af890dc9b003cee215dccbab291;hb=b4fa843575f2276b521ec6507d7f213e7ddb6c67;hp=ab7c80491e85dd8d0e83c44dfff8a94ff6667b24;hpb=c34ef4028e504b8ce862b9c2e47b284ab66717dd;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index ab7c8049..80773f6c 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,10 +1,29 @@ -#include "debug.h" +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + client.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #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" #include "prop.h" #include "extensions.h" #include "frame.h" @@ -13,11 +32,10 @@ #include "grab.h" #include "focus.h" #include "stacking.h" -#include "dispatch.h" #include "openbox.h" #include "group.h" #include "config.h" -#include "menu.h" +#include "menuframe.h" #include "keyboard.h" #include "mouse.h" #include "render/render.h" @@ -32,10 +50,12 @@ #define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ ButtonMotionMask) -GList *client_list = NULL; +GList *client_list = NULL; +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); @@ -48,14 +68,27 @@ static void client_change_state(ObClient *self); static void client_apply_startup_state(ObClient *self); static void client_restore_session_state(ObClient *self); static void client_restore_session_stacking(ObClient *self); +static void client_urgent_notify(ObClient *self); -void client_startup() +void client_startup(gboolean reconfig) { + if (reconfig) return; + client_set_list(); } -void client_shutdown() +void client_shutdown(gboolean reconfig) +{ +} + +void client_add_destructor(GDestroyNotify func) +{ + client_destructors = g_slist_prepend(client_destructors, (gpointer)func); +} + +void client_remove_destructor(GDestroyNotify func) { + client_destructors = g_slist_remove(client_destructors, (gpointer)func); } void client_set_list() @@ -150,36 +183,6 @@ 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); - } } void client_manage(Window window) @@ -237,9 +240,17 @@ 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->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) */ @@ -254,10 +265,10 @@ void client_manage(Window window) frame_grab_client(self->frame, self); - client_apply_startup_state(self); - grab_server(FALSE); + client_apply_startup_state(self); + /* update the focus lists */ focus_order_add_new(self); @@ -265,7 +276,10 @@ void client_manage(Window window) client_restore_session_stacking(self); /* focus the new window? */ - if (ob_state() != OB_STATE_STARTING && config_focus_new && + if (ob_state() != OB_STATE_STARTING && + (config_focus_new || (self->transient_for && + self->transient_for != OB_TRAN_GROUP && + client_focused(self->transient_for))) && /* note the check against Type_Normal/Dialog, not client_normal(self), which would also include other types. in this case we want more strict rules for focus */ @@ -306,11 +320,21 @@ void client_manage(Window window) #endif } - dispatch_client(Event_Client_New, self, 0, 0); + if (ob_state() == OB_STATE_RUNNING) { + int x = self->area.x, ox = x; + int y = self->area.y, oy = y; + + place_client(self, &x, &y); + + /* make sure the window is visible */ + client_find_onscreen(self, &x, &y, + self->frame->area.width, + self->frame->area.height, + client_normal(self)); - /* make sure the window is visible */ - if (ob_state() == OB_STATE_RUNNING) - client_move_onscreen(self, client_normal(self)); + if (x != ox || y != oy) + client_move(self, x, y); + } client_showhide(self); @@ -339,8 +363,6 @@ void client_manage(Window window) keyboard_grab_for_client(self, TRUE); mouse_grab_for_client(self, TRUE); - dispatch_client(Event_Client_Mapped, self, 0, 0); - ob_debug("Managed window 0x%lx (%s)\n", window, self->class); } @@ -357,7 +379,6 @@ void client_unmanage(ObClient *self) ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class); - dispatch_client(Event_Client_Destroy, self, 0, 0); g_assert(self != NULL); keyboard_grab_for_client(self, FALSE); @@ -403,11 +424,11 @@ void client_unmanage(ObClient *self) } } - if (moveresize_client == self) - moveresize_end(TRUE); - - /* XXX close any windows that are attached to this window */ - + for (it = client_destructors; it; it = g_slist_next(it)) { + GDestroyNotify func = (GDestroyNotify) it->data; + func(self); + } + if (focus_client == self) { XEvent e; @@ -423,10 +444,6 @@ void client_unmanage(ObClient *self) self->group = NULL; } - /* dispatch the unmapped event */ - dispatch_client(Event_Client_Unmapped, self, 0, 0); - g_assert(self != NULL); - /* give the client its border back */ client_toggle_border(self, TRUE); @@ -461,12 +478,21 @@ void client_unmanage(ObClient *self) g_free(self->name); g_free(self->class); g_free(self->role); + g_free(self->sm_client_id); g_free(self); /* update the list hints */ client_set_list(); } +static void client_urgent_notify(ObClient *self) +{ + if (self->urgent) + frame_flash_start(self->frame); + else + frame_flash_stop(self->frame); +} + static void client_restore_session_state(ObClient *self) { GList *it; @@ -527,9 +553,7 @@ void client_move_onscreen(ObClient *self, gboolean rude) if (client_find_onscreen(self, &x, &y, self->frame->area.width, self->frame->area.height, rude)) { - client_configure(self, OB_CORNER_TOPLEFT, x, y, - self->area.width, self->area.height, - TRUE, TRUE); + client_move(self, x, y); } } @@ -545,14 +569,16 @@ gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h, /* XXX watch for xinerama dead areas */ a = screen_area(self->desktop); - if (!self->strut.right && *x >= a->x + a->width - 1) - *x = a->x + a->width - self->frame->area.width; - if (!self->strut.bottom && *y >= a->y + a->height - 1) - *y = a->y + a->height - self->frame->area.height; - if (!self->strut.left && *x + self->frame->area.width - 1 < a->x) - *x = a->x; - if (!self->strut.top && *y + self->frame->area.height - 1 < a->y) - *y = a->y; + if (client_normal(self)) { + if (!self->strut.right && *x >= a->x + a->width - 1) + *x = a->x + a->width - self->frame->area.width; + if (!self->strut.bottom && *y >= a->y + a->height - 1) + *y = a->y + a->height - self->frame->area.height; + if (!self->strut.left && *x + self->frame->area.width - 1 < a->x) + *x = a->x; + if (!self->strut.top && *y + self->frame->area.height - 1 < a->y) + *y = a->y; + } if (rude) { /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good. @@ -646,15 +672,10 @@ 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); @@ -674,10 +695,19 @@ static void client_get_all(ObClient *self) client_update_title(self); client_update_class(self); + client_update_sm_client_id(self); client_update_strut(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; @@ -718,9 +748,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 */ @@ -733,36 +770,34 @@ 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) { - if (state[i] == prop_atoms.net_wm_state_modal) - self->modal = TRUE; - else if (state[i] == prop_atoms.net_wm_state_shaded) - self->shaded = TRUE; - else if (state[i] == prop_atoms.net_wm_state_hidden) - self->iconic = TRUE; - else if (state[i] == prop_atoms.net_wm_state_skip_taskbar) - self->skip_taskbar = TRUE; - else if (state[i] == prop_atoms.net_wm_state_skip_pager) - self->skip_pager = TRUE; - else if (state[i] == prop_atoms.net_wm_state_fullscreen) - self->fullscreen = TRUE; - else if (state[i] == prop_atoms.net_wm_state_maximized_vert) - self->max_vert = TRUE; - else if (state[i] == prop_atoms.net_wm_state_maximized_horz) - self->max_horz = TRUE; - else if (state[i] == prop_atoms.net_wm_state_above) - self->above = TRUE; - else if (state[i] == prop_atoms.net_wm_state_below) - self->below = TRUE; - } + gulong i; + for (i = 0; i < num; ++i) { + if (state[i] == prop_atoms.net_wm_state_modal) + self->modal = TRUE; + else if (state[i] == prop_atoms.net_wm_state_shaded) + self->shaded = TRUE; + else if (state[i] == prop_atoms.net_wm_state_hidden) + self->iconic = TRUE; + else if (state[i] == prop_atoms.net_wm_state_skip_taskbar) + self->skip_taskbar = TRUE; + else if (state[i] == prop_atoms.net_wm_state_skip_pager) + self->skip_pager = TRUE; + else if (state[i] == prop_atoms.net_wm_state_fullscreen) + self->fullscreen = TRUE; + else if (state[i] == prop_atoms.net_wm_state_maximized_vert) + self->max_vert = TRUE; + else if (state[i] == prop_atoms.net_wm_state_maximized_horz) + self->max_horz = TRUE; + else if (state[i] == prop_atoms.net_wm_state_above) + self->above = TRUE; + else if (state[i] == prop_atoms.net_wm_state_below) + self->below = TRUE; + else if (state[i] == prop_atoms.ob_wm_state_undecorated) + self->undecorated = TRUE; + } - g_free(state); + g_free(state); } } @@ -796,7 +831,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 @@ -1015,20 +1054,22 @@ void client_update_normal_hints(ObClient *self) void client_setup_decor_and_functions(ObClient *self) { /* start with everything (cept fullscreen) */ - self->decorations = (OB_FRAME_DECOR_TITLEBAR | - OB_FRAME_DECOR_HANDLE | - OB_FRAME_DECOR_GRIPS | - OB_FRAME_DECOR_BORDER | - OB_FRAME_DECOR_ICON | - OB_FRAME_DECOR_ALLDESKTOPS | - OB_FRAME_DECOR_ICONIFY | - OB_FRAME_DECOR_MAXIMIZE | - OB_FRAME_DECOR_SHADE); - self->functions = (OB_CLIENT_FUNC_RESIZE | - OB_CLIENT_FUNC_MOVE | - OB_CLIENT_FUNC_ICONIFY | - OB_CLIENT_FUNC_MAXIMIZE | - OB_CLIENT_FUNC_SHADE); + self->decorations = + (OB_FRAME_DECOR_TITLEBAR | + (ob_rr_theme->show_handle ? OB_FRAME_DECOR_HANDLE : 0) | + OB_FRAME_DECOR_GRIPS | + OB_FRAME_DECOR_BORDER | + OB_FRAME_DECOR_ICON | + OB_FRAME_DECOR_ALLDESKTOPS | + OB_FRAME_DECOR_ICONIFY | + OB_FRAME_DECOR_MAXIMIZE | + OB_FRAME_DECOR_SHADE); + self->functions = + (OB_CLIENT_FUNC_RESIZE | + OB_CLIENT_FUNC_MOVE | + OB_CLIENT_FUNC_ICONIFY | + OB_CLIENT_FUNC_MAXIMIZE | + OB_CLIENT_FUNC_SHADE); if (self->delete_window) { self->functions |= OB_CLIENT_FUNC_CLOSE; self->decorations |= OB_FRAME_DECOR_CLOSE; @@ -1117,7 +1158,7 @@ void client_setup_decor_and_functions(ObClient *self) /* finally, the user can have requested no decorations, which overrides everything */ - if (!self->decorate) + if (self->undecorated) self->decorations = OB_FRAME_DECOR_BORDER; /* if we don't have a titlebar, then we cannot shade! */ @@ -1279,7 +1320,7 @@ void client_update_wmhints(ObClient *self) /* fire the urgent callback if we're mapped, otherwise, wait until after we're mapped */ if (self->frame) - dispatch_client(Event_Client_Urgent, self, self->urgent, 0); + client_urgent_notify(self); } } @@ -1288,10 +1329,11 @@ void client_update_title(ObClient *self) GList *it; guint32 nums; guint i; - char *data = NULL; + gchar *data = NULL; gboolean read_title; + gchar *old_title; - g_free(self->title); + old_title = self->title; /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) @@ -1299,6 +1341,10 @@ void client_update_title(ObClient *self) if (!PROP_GETS(self->window, wm_name, locale, &data)) data = g_strdup("Unnamed Window"); + /* did the title change? then reset the title_count */ + if (old_title && 0 != strncmp(old_title, data, strlen(data))) + self->title_count = 1; + /* look for duplicates and append a number */ nums = 0; for (it = client_list; it; it = it->next) @@ -1316,12 +1362,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); @@ -1331,6 +1375,8 @@ void client_update_title(ObClient *self) if (self->frame) frame_adjust_title(self->frame); + g_free(old_title); + /* update the icon title */ data = NULL; g_free(self->icon_title); @@ -1380,7 +1426,7 @@ void client_update_class(ObClient *self) } if (PROP_GETS(self->window, wm_window_role, locale, &s)) - self->role = g_strdup(s); + self->role = s; if (self->name == NULL) self->name = g_strdup(""); if (self->class == NULL) self->class = g_strdup(""); @@ -1523,6 +1569,16 @@ void client_update_icons(ObClient *self) } } + if (!self->nicons) { + self->nicons++; + self->icons = g_new(ObClientIcon, self->nicons); + self->icons[self->nicons-1].width = 48; + self->icons[self->nicons-1].height = 48; + self->icons[self->nicons-1].data = g_memdup(ob_rr_theme->def_win_icon, + sizeof(RrPixel32) + * 48 * 48); + } + if (self->frame) frame_adjust_icon(self->frame); } @@ -1530,7 +1586,7 @@ void client_update_icons(ObClient *self) static void client_change_state(ObClient *self) { guint32 state[2]; - guint32 netstate[10]; + guint32 netstate[11]; guint num; state[0] = self->wmstate; @@ -1539,31 +1595,33 @@ static void client_change_state(ObClient *self) num = 0; if (self->modal) - netstate[num++] = prop_atoms.net_wm_state_modal; + netstate[num++] = prop_atoms.net_wm_state_modal; if (self->shaded) - netstate[num++] = prop_atoms.net_wm_state_shaded; + netstate[num++] = prop_atoms.net_wm_state_shaded; if (self->iconic) - netstate[num++] = prop_atoms.net_wm_state_hidden; + netstate[num++] = prop_atoms.net_wm_state_hidden; if (self->skip_taskbar) - netstate[num++] = prop_atoms.net_wm_state_skip_taskbar; + netstate[num++] = prop_atoms.net_wm_state_skip_taskbar; if (self->skip_pager) - netstate[num++] = prop_atoms.net_wm_state_skip_pager; + netstate[num++] = prop_atoms.net_wm_state_skip_pager; if (self->fullscreen) - netstate[num++] = prop_atoms.net_wm_state_fullscreen; + netstate[num++] = prop_atoms.net_wm_state_fullscreen; if (self->max_vert) - netstate[num++] = prop_atoms.net_wm_state_maximized_vert; + netstate[num++] = prop_atoms.net_wm_state_maximized_vert; if (self->max_horz) - netstate[num++] = prop_atoms.net_wm_state_maximized_horz; + netstate[num++] = prop_atoms.net_wm_state_maximized_horz; if (self->above) - netstate[num++] = prop_atoms.net_wm_state_above; + netstate[num++] = prop_atoms.net_wm_state_above; if (self->below) - netstate[num++] = prop_atoms.net_wm_state_below; + netstate[num++] = prop_atoms.net_wm_state_below; + if (self->undecorated) + netstate[num++] = prop_atoms.ob_wm_state_undecorated; PROP_SETA32(self->window, net_wm_state, atom, netstate, num); client_calc_layer(self); if (self->frame) - frame_adjust_state(self->frame); + frame_adjust_state(self->frame); } ObClient *client_search_focus_tree(ObClient *self) @@ -1691,29 +1749,33 @@ static void client_apply_startup_state(ObClient *self) /* these are in a carefully crafted order.. */ if (self->iconic) { - self->iconic = FALSE; - client_iconify(self, TRUE, FALSE); + self->iconic = FALSE; + client_iconify(self, TRUE, FALSE); } if (self->fullscreen) { - self->fullscreen = FALSE; - client_fullscreen(self, TRUE, FALSE); + self->fullscreen = FALSE; + client_fullscreen(self, TRUE, FALSE); + } + if (self->undecorated) { + self->undecorated = FALSE; + client_set_undecorated(self, TRUE); } if (self->shaded) { - self->shaded = FALSE; - client_shade(self, TRUE); + self->shaded = FALSE; + client_shade(self, TRUE); } if (self->urgent) - dispatch_client(Event_Client_Urgent, self, self->urgent, 0); + client_urgent_notify(self); if (self->max_vert && self->max_horz) { - self->max_vert = self->max_horz = FALSE; - client_maximize(self, TRUE, 0, FALSE); + self->max_vert = self->max_horz = FALSE; + client_maximize(self, TRUE, 0, FALSE); } else if (self->max_vert) { - self->max_vert = FALSE; - client_maximize(self, TRUE, 2, FALSE); + self->max_vert = FALSE; + client_maximize(self, TRUE, 2, FALSE); } else if (self->max_horz) { - self->max_horz = FALSE; - client_maximize(self, TRUE, 1, FALSE); + self->max_horz = FALSE; + client_maximize(self, TRUE, 1, FALSE); } /* nothing to do for the other states: @@ -1730,6 +1792,8 @@ void client_configure_full(ObClient *self, ObCorner anchor, gboolean user, gboolean final, gboolean force_reply) { + gint oldw, oldh; + gboolean send_resize_client; gboolean moved = FALSE, resized = FALSE; guint fdecor = self->frame->decorations; gboolean fhorz = self->frame->max_horz; @@ -1810,7 +1874,6 @@ void client_configure_full(ObClient *self, ObCorner anchor, if (!(w == self->area.width && h == self->area.height)) { int basew, baseh, minw, minh; - int mw, mh, aw, ah; /* base size is substituted with min size if not specified */ if (self->base_size.width || self->base_size.height) { @@ -1829,23 +1892,6 @@ void client_configure_full(ObClient *self, ObCorner anchor, minh = self->base_size.height; } - /* for interactive resizing. have to move half an increment in each - direction. */ - - /* how far we are towards the next size inc */ - mw = (w - basew) % self->size_inc.width; - mh = (h - baseh) % self->size_inc.height; - /* amount to add */ - aw = self->size_inc.width / 2; - ah = self->size_inc.height / 2; - /* don't let us move into a new size increment */ - if (mw + aw >= self->size_inc.width) - aw = self->size_inc.width - mw - 1; - if (mh + ah >= self->size_inc.height) - ah = self->size_inc.height - mh - 1; - w += aw; - h += ah; - /* if this is a user-requested resize, then check against min/max sizes */ @@ -1909,14 +1955,20 @@ void client_configure_full(ObClient *self, ObCorner anchor, moved = x != self->area.x || y != self->area.y; resized = w != self->area.width || h != self->area.height; + oldw = self->area.width; + oldh = self->area.height; RECT_SET(self->area, x, y, w, h); /* for app-requested resizes, always resize if 'resized' is true. for user-requested ones, only resize if final is true, or when resizing in redraw mode */ - if ((!user && resized) || - (user && (final || (resized && config_redraw_resize)))) - XResizeWindow(ob_display, self->window, w, h); + send_resize_client = ((!user && resized) || + (user && (final || + (resized && config_redraw_resize)))); + + /* if the client is enlarging, the resize the client before the frame */ + if (send_resize_client && user && (w > oldw || h > oldh)) + XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh)); /* move/resize the frame to match the request */ if (self->frame) { @@ -1946,8 +1998,14 @@ void client_configure_full(ObClient *self, ObCorner anchor, event.xconfigure.override_redirect = FALSE; XSendEvent(event.xconfigure.display, event.xconfigure.window, FALSE, StructureNotifyMask, &event); - } + } } + + /* if the client is shrinking, then resize the frame before the client */ + if (send_resize_client && (!user || (w <= oldw || h <= oldh))) + XResizeWindow(ob_display, self->window, w, h); + + XFlush(ob_display); } void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea) @@ -1962,47 +2020,36 @@ void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea) and adjust out layer/stacking */ if (fs) { - if (savearea) { - guint32 dimensions[4]; - dimensions[0] = self->area.x; - dimensions[1] = self->area.y; - dimensions[2] = self->area.width; - dimensions[3] = self->area.height; - - PROP_SETA32(self->window, openbox_premax, cardinal, - dimensions, 4); - } + if (savearea) + self->pre_fullscreen_area = self->area; /* these are not actually used cuz client_configure will set them as appropriate when the window is fullscreened */ x = y = w = h = 0; } else { - guint num; - gint32 *dimensions; Rect *a; - /* pick some fallbacks... */ - a = screen_area_monitor(self->desktop, 0); - x = a->x + a->width / 4; - y = a->y + a->height / 4; - w = a->width / 2; - h = a->height / 2; - - if (PROP_GETA32(self->window, openbox_premax, cardinal, - (guint32**)&dimensions, &num)) { - if (num == 4) { - x = dimensions[0]; - y = dimensions[1]; - w = dimensions[2]; - h = dimensions[3]; - } - g_free(dimensions); - } + if (self->pre_fullscreen_area.width > 0 && + self->pre_fullscreen_area.height > 0) + { + x = self->pre_fullscreen_area.x; + y = self->pre_fullscreen_area.y; + w = self->pre_fullscreen_area.width; + h = self->pre_fullscreen_area.height; + RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0); + } else { + /* pick some fallbacks... */ + a = screen_area_monitor(self->desktop, 0); + x = a->x + a->width / 4; + y = a->y + a->height / 4; + w = a->width / 2; + h = a->height / 2; + } } client_setup_decor_and_functions(self); - client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); + client_move_resize(self, x, y, w, h); /* try focus us when we go into fullscreen mode */ client_focus(self); @@ -2023,7 +2070,14 @@ static void client_iconify_recursive(ObClient *self, if (iconic) { if (self->functions & OB_CLIENT_FUNC_ICONIFY) { + long old; + + old = self->wmstate; self->wmstate = IconicState; + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); + self->ignore_unmaps++; /* we unmap the client itself so that we can get MapRequest events, and because the ICCCM tells us to! */ @@ -2037,9 +2091,17 @@ static void client_iconify_recursive(ObClient *self, changed = TRUE; } } else { + long old; + if (curdesk) client_set_desktop(self, screen_desktop, FALSE); + + old = self->wmstate; self->wmstate = self->shaded ? IconicState : NormalState; + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); + XMapWindow(ob_display, self->window); /* this puts it after the current focused window */ @@ -2060,9 +2122,6 @@ static void client_iconify_recursive(ObClient *self, client_change_state(self); client_showhide(self); screen_update_areas(); - - dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped, - self, 0, 0); } /* iconify all transients */ @@ -2089,99 +2148,67 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea) /* check if already done */ if (max) { - if (dir == 0 && self->max_horz && self->max_vert) return; - if (dir == 1 && self->max_horz) return; - if (dir == 2 && self->max_vert) return; + if (dir == 0 && self->max_horz && self->max_vert) return; + if (dir == 1 && self->max_horz) return; + if (dir == 2 && self->max_vert) return; } else { - if (dir == 0 && !self->max_horz && !self->max_vert) return; - if (dir == 1 && !self->max_horz) return; - if (dir == 2 && !self->max_vert) return; + if (dir == 0 && !self->max_horz && !self->max_vert) return; + if (dir == 1 && !self->max_horz) return; + if (dir == 2 && !self->max_vert) return; } - /* work with the frame's coords */ - x = self->frame->area.x; - y = self->frame->area.y; + /* we just tell it to configure in the same place and client_configure + worries about filling the screen with the window */ + x = self->area.x; + y = self->area.y; w = self->area.width; h = self->area.height; if (max) { - if (savearea) { - gint32 dimensions[4]; - gint32 *readdim; - guint num; - - dimensions[0] = x; - dimensions[1] = y; - dimensions[2] = w; - dimensions[3] = h; - - /* get the property off the window and use it for the dimensions - we are already maxed on */ - if (PROP_GETA32(self->window, openbox_premax, cardinal, - (guint32**)&readdim, &num)) { - if (num == 4) { - if (self->max_horz) { - dimensions[0] = readdim[0]; - dimensions[2] = readdim[2]; - } - if (self->max_vert) { - dimensions[1] = readdim[1]; - dimensions[3] = readdim[3]; - } - } - g_free(readdim); - } - - PROP_SETA32(self->window, openbox_premax, cardinal, - (guint32*)dimensions, 4); - } + if (savearea) + self->pre_max_area = self->area; } else { - guint num; - gint32 *dimensions; Rect *a; - /* pick some fallbacks... */ a = screen_area_monitor(self->desktop, 0); - if (dir == 0 || dir == 1) { /* horz */ - x = a->x + a->width / 4; - w = a->width / 2; - } - if (dir == 0 || dir == 2) { /* vert */ - y = a->y + a->height / 4; - h = a->height / 2; + if ((dir == 0 || dir == 1) && self->max_horz) { /* horz */ + if (self->pre_max_area.width > 0) { + x = self->pre_max_area.x; + w = self->pre_max_area.width; + + RECT_SET(self->pre_max_area, 0, self->pre_max_area.y, + 0, self->pre_max_area.height); + } else { + /* pick some fallbacks... */ + x = a->x + a->width / 4; + w = a->width / 2; + } } + if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */ + if (self->pre_max_area.width > 0) { + y = self->pre_max_area.y; + h = self->pre_max_area.height; - if (PROP_GETA32(self->window, openbox_premax, cardinal, - (guint32**)&dimensions, &num)) { - if (num == 4) { - if (dir == 0 || dir == 1) { /* horz */ - x = dimensions[0]; - w = dimensions[2]; - } - if (dir == 0 || dir == 2) { /* vert */ - y = dimensions[1]; - h = dimensions[3]; - } + RECT_SET(self->pre_max_area, self->pre_max_area.x, 0, + self->pre_max_area.width, 0); + } else { + /* pick some fallbacks... */ + y = a->y + a->height / 4; + h = a->height / 2; } - g_free(dimensions); - } + } } if (dir == 0 || dir == 1) /* horz */ - self->max_horz = max; + self->max_horz = max; if (dir == 0 || dir == 2) /* vert */ - self->max_vert = max; - - if (!self->max_horz && !self->max_vert) - PROP_ERASE(self->window, openbox_premax); + self->max_vert = max; client_change_state(self); /* change the state hints on the client */ client_setup_decor_and_functions(self); - /* figure out where the client should be going */ - frame_frame_gravity(self->frame, &x, &y); - client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); + client_move_resize(self, x, y, w, h); } void client_shade(ObClient *self, gboolean shade) @@ -2191,8 +2218,16 @@ void client_shade(ObClient *self, gboolean shade) self->shaded == shade) return; /* already done */ /* when we're iconic, don't change the wmstate */ - if (!self->iconic) - self->wmstate = shade ? IconicState : NormalState; + if (!self->iconic) { + long old; + + old = self->wmstate; + self->wmstate = shade ? IconicState : NormalState; + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); + } + self->shaded = shade; client_change_state(self); /* resize the frame to just the titlebar */ @@ -2264,8 +2299,6 @@ void client_set_desktop_recursive(ObClient *self, focus_order_to_top(self); else focus_order_to_bottom(self); - - dispatch_client(Event_Client_Desktop, self, target, old); } /* move all transients */ @@ -2326,122 +2359,132 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2) { gboolean shaded = self->shaded; gboolean fullscreen = self->fullscreen; + gboolean undecorated = self->undecorated; gboolean max_horz = self->max_horz; gboolean max_vert = self->max_vert; int i; if (!(action == prop_atoms.net_wm_state_add || - action == prop_atoms.net_wm_state_remove || - action == prop_atoms.net_wm_state_toggle)) - /* an invalid action was passed to the client message, ignore it */ - return; + action == prop_atoms.net_wm_state_remove || + action == prop_atoms.net_wm_state_toggle)) + /* an invalid action was passed to the client message, ignore it */ + return; for (i = 0; i < 2; ++i) { - Atom state = i == 0 ? data1 : data2; + Atom state = i == 0 ? data1 : data2; - if (!state) continue; - - /* if toggling, then pick whether we're adding or removing */ - if (action == prop_atoms.net_wm_state_toggle) { - if (state == prop_atoms.net_wm_state_modal) - action = self->modal ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_maximized_vert) - action = self->max_vert ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_maximized_horz) - action = self->max_horz ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_shaded) - action = self->shaded ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_skip_taskbar) - action = self->skip_taskbar ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_skip_pager) - action = self->skip_pager ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_fullscreen) - action = self->fullscreen ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_above) - action = self->above ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_below) - action = self->below ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - } + if (!state) continue; + + /* if toggling, then pick whether we're adding or removing */ + if (action == prop_atoms.net_wm_state_toggle) { + if (state == prop_atoms.net_wm_state_modal) + action = self->modal ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_maximized_vert) + action = self->max_vert ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_maximized_horz) + action = self->max_horz ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_shaded) + action = shaded ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_skip_taskbar) + action = self->skip_taskbar ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_skip_pager) + action = self->skip_pager ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_fullscreen) + action = fullscreen ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_above) + action = self->above ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_below) + action = self->below ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.ob_wm_state_undecorated) + action = undecorated ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + } - if (action == prop_atoms.net_wm_state_add) { - if (state == prop_atoms.net_wm_state_modal) { - /* XXX raise here or something? */ - self->modal = TRUE; - } else if (state == prop_atoms.net_wm_state_maximized_vert) { - max_vert = TRUE; - } else if (state == prop_atoms.net_wm_state_maximized_horz) { - max_horz = TRUE; - } else if (state == prop_atoms.net_wm_state_shaded) { - shaded = TRUE; - } else if (state == prop_atoms.net_wm_state_skip_taskbar) { - self->skip_taskbar = TRUE; - } else if (state == prop_atoms.net_wm_state_skip_pager) { - self->skip_pager = TRUE; - } else if (state == prop_atoms.net_wm_state_fullscreen) { - fullscreen = TRUE; - } else if (state == prop_atoms.net_wm_state_above) { - self->above = TRUE; - } else if (state == prop_atoms.net_wm_state_below) { - self->below = TRUE; - } + if (action == prop_atoms.net_wm_state_add) { + if (state == prop_atoms.net_wm_state_modal) { + /* XXX raise here or something? */ + self->modal = TRUE; + } else if (state == prop_atoms.net_wm_state_maximized_vert) { + max_vert = TRUE; + } else if (state == prop_atoms.net_wm_state_maximized_horz) { + max_horz = TRUE; + } else if (state == prop_atoms.net_wm_state_shaded) { + shaded = TRUE; + } else if (state == prop_atoms.net_wm_state_skip_taskbar) { + self->skip_taskbar = TRUE; + } else if (state == prop_atoms.net_wm_state_skip_pager) { + self->skip_pager = TRUE; + } else if (state == prop_atoms.net_wm_state_fullscreen) { + fullscreen = TRUE; + } else if (state == prop_atoms.net_wm_state_above) { + self->above = TRUE; + } else if (state == prop_atoms.net_wm_state_below) { + self->below = TRUE; + } else if (state == prop_atoms.ob_wm_state_undecorated) { + undecorated = TRUE; + } - } else { /* action == prop_atoms.net_wm_state_remove */ - if (state == prop_atoms.net_wm_state_modal) { - self->modal = FALSE; - } else if (state == prop_atoms.net_wm_state_maximized_vert) { - max_vert = FALSE; - } else if (state == prop_atoms.net_wm_state_maximized_horz) { - max_horz = FALSE; - } else if (state == prop_atoms.net_wm_state_shaded) { - shaded = FALSE; - } else if (state == prop_atoms.net_wm_state_skip_taskbar) { - self->skip_taskbar = FALSE; - } else if (state == prop_atoms.net_wm_state_skip_pager) { - self->skip_pager = FALSE; - } else if (state == prop_atoms.net_wm_state_fullscreen) { - fullscreen = FALSE; - } else if (state == prop_atoms.net_wm_state_above) { - self->above = FALSE; - } else if (state == prop_atoms.net_wm_state_below) { - self->below = FALSE; - } - } + } else { /* action == prop_atoms.net_wm_state_remove */ + if (state == prop_atoms.net_wm_state_modal) { + self->modal = FALSE; + } else if (state == prop_atoms.net_wm_state_maximized_vert) { + max_vert = FALSE; + } else if (state == prop_atoms.net_wm_state_maximized_horz) { + max_horz = FALSE; + } else if (state == prop_atoms.net_wm_state_shaded) { + shaded = FALSE; + } else if (state == prop_atoms.net_wm_state_skip_taskbar) { + self->skip_taskbar = FALSE; + } else if (state == prop_atoms.net_wm_state_skip_pager) { + self->skip_pager = FALSE; + } else if (state == prop_atoms.net_wm_state_fullscreen) { + fullscreen = FALSE; + } else if (state == prop_atoms.net_wm_state_above) { + self->above = FALSE; + } else if (state == prop_atoms.net_wm_state_below) { + self->below = FALSE; + } else if (state == prop_atoms.ob_wm_state_undecorated) { + undecorated = FALSE; + } + } } if (max_horz != self->max_horz || max_vert != self->max_vert) { - if (max_horz != self->max_horz && max_vert != self->max_vert) { - /* toggling both */ - if (max_horz == max_vert) { /* both going the same way */ - client_maximize(self, max_horz, 0, TRUE); - } else { - client_maximize(self, max_horz, 1, TRUE); - client_maximize(self, max_vert, 2, TRUE); - } - } else { - /* toggling one */ - if (max_horz != self->max_horz) - client_maximize(self, max_horz, 1, TRUE); - else - client_maximize(self, max_vert, 2, TRUE); - } + if (max_horz != self->max_horz && max_vert != self->max_vert) { + /* toggling both */ + if (max_horz == max_vert) { /* both going the same way */ + client_maximize(self, max_horz, 0, TRUE); + } else { + client_maximize(self, max_horz, 1, TRUE); + client_maximize(self, max_vert, 2, TRUE); + } + } else { + /* toggling one */ + if (max_horz != self->max_horz) + client_maximize(self, max_horz, 1, TRUE); + else + client_maximize(self, max_vert, 2, TRUE); + } } /* change fullscreen state before shading, as it will affect if the window can shade or not */ if (fullscreen != self->fullscreen) - client_fullscreen(self, fullscreen, TRUE); + client_fullscreen(self, fullscreen, TRUE); if (shaded != self->shaded) - client_shade(self, shaded); + client_shade(self, shaded); + if (undecorated != self->undecorated) + client_set_undecorated(self, undecorated); client_calc_layer(self); client_change_state(self); /* change the hint to reflect these changes */ } @@ -2506,12 +2549,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; @@ -2543,11 +2591,12 @@ gboolean client_focus(ObClient *self) void client_unfocus(ObClient *self) { - g_assert(focus_client == self); + if (focus_client == self) { #ifdef DEBUG_FOCUS - ob_debug("client_unfocus for %lx\n", self->window); + ob_debug("client_unfocus for %lx\n", self->window); #endif - focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); + focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); + } } void client_activate(ObClient *self, gboolean here) @@ -2584,8 +2633,6 @@ ObClientIcon *client_icon(ObClient *self, int w, int h) /* li is the largest image < req */ unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0; - if (!self->nicons) return NULL; - for (i = 0; i < self->nicons; ++i) { size = self->icons[i].width * self->icons[i].height; if (size < smallest && size >= (unsigned)(w * h)) { @@ -2715,6 +2762,15 @@ void client_set_layer(ObClient *self, int layer) client_change_state(self); /* reflect this in the state hints */ } +void client_set_undecorated(ObClient *self, gboolean undecorated) +{ + if (self->undecorated != undecorated) { + self->undecorated = undecorated; + client_setup_decor_and_functions(self); + client_change_state(self); /* reflect this in the state hints */ + } +} + guint client_monitor(ObClient *self) { guint i; @@ -2766,13 +2822,15 @@ ObClient *client_search_transient(ObClient *self, ObClient *search) return NULL; } -gchar* client_get_sm_client_id(ObClient *self) +void client_update_sm_client_id(ObClient *self) { - gchar *id = NULL; + g_free(self->sm_client_id); + self->sm_client_id = NULL; - if (!PROP_GETS(self->window, sm_client_id, locale, &id) && self->group) - PROP_GETS(self->group->leader, sm_client_id, locale, &id); - return id; + if (!PROP_GETS(self->window, sm_client_id, locale, &self->sm_client_id) && + self->group) + PROP_GETS(self->group->leader, sm_client_id, locale, + &self->sm_client_id); } /* finds the nearest edge in the given direction from the current client @@ -2959,9 +3017,29 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) case OB_DIRECTION_NORTHWEST: case OB_DIRECTION_SOUTHWEST: /* not implemented */ - break; default: - g_assert_not_reached(); + g_assert_not_reached(); } return dest; } + +ObClient* client_under_pointer() +{ + int x, y; + GList *it; + ObClient *ret = NULL; + + if (screen_pointer_pos(&x, &y)) { + for (it = stacking_list; it != NULL; it = it->next) { + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *c = WINDOW_AS_CLIENT(it->data); + if (c->desktop == screen_desktop && + RECT_CONTAINS(c->frame->area, x, y)) { + ret = c; + break; + } + } + } + } + return ret; +}