X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=f17e9724fc228afa338b83c6604d875c4f339acb;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=0fe7881f617ff1c0448a84ff2d7e72383f0c03df;hpb=ac4e6784ddd59635df0e51210257c506cff4dc25;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 0fe7881f..f17e9724 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "client.h" #include "dock.h" #include "xerror.h" @@ -7,6 +8,7 @@ #include "prop.h" #include "extensions.h" #include "frame.h" +#include "session.h" #include "event.h" #include "grab.h" #include "focus.h" @@ -15,7 +17,9 @@ #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" #include @@ -30,18 +34,20 @@ GList *client_list = NULL; -static void client_get_all(Client *self); -static void client_toggle_border(Client *self, gboolean show); -static void client_get_area(Client *self); -static void client_get_desktop(Client *self); -static void client_get_state(Client *self); -static void client_get_shaped(Client *self); -static void client_get_mwm_hints(Client *self); -static void client_get_gravity(Client *self); -static void client_showhide(Client *self); -static void client_change_allowed_actions(Client *self); -static void client_change_state(Client *self); -static void client_apply_startup_state(Client *self); +static void client_get_all(ObClient *self); +static void client_toggle_border(ObClient *self, gboolean show); +static void client_get_area(ObClient *self); +static void client_get_desktop(ObClient *self); +static void client_get_state(ObClient *self); +static void client_get_shaped(ObClient *self); +static void client_get_mwm_hints(ObClient *self); +static void client_get_gravity(ObClient *self); +static void client_showhide(ObClient *self); +static void client_change_allowed_actions(ObClient *self); +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); void client_startup() { @@ -63,11 +69,12 @@ void client_set_list() windows = g_new(Window, size); win_it = windows; for (it = client_list; it != NULL; it = it->next, ++win_it) - *win_it = ((Client*)it->data)->window; + *win_it = ((ObClient*)it->data)->window; } else windows = NULL; - PROP_SETA32(ob_root, net_client_list, window, (guint32*)windows, size); + PROP_SETA32(RootWindow(ob_display, ob_screen), + net_client_list, window, (guint32*)windows, size); if (windows) g_free(windows); @@ -76,7 +83,7 @@ void client_set_list() } /* -void client_foreach_transient(Client *self, ClientForeachFunc func, void *data) +void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data) { GSList *it; @@ -86,10 +93,10 @@ void client_foreach_transient(Client *self, ClientForeachFunc func, void *data) } } -void client_foreach_ancestor(Client *self, ClientForeachFunc func, void *data) +void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data) { if (self->transient_for) { - if (self->transient_for != TRAN_GROUP) { + if (self->transient_for != OB_TRAN_GROUP) { if (!func(self->transient_for, data)) return; client_foreach_ancestor(self->transient_for, func, data); } else { @@ -97,7 +104,7 @@ void client_foreach_ancestor(Client *self, ClientForeachFunc func, void *data) for (it = self->group->members; it; it = it->next) if (it->data != self && - !((Client*)it->data)->transient_for) { + !((ObClient*)it->data)->transient_for) { if (!func(it->data, data)) return; client_foreach_ancestor(it->data, func, data); } @@ -113,7 +120,8 @@ void client_manage_all() XWMHints *wmhints; XWindowAttributes attrib; - XQueryTree(ob_display, ob_root, &w, &w, &children, &nchild); + XQueryTree(ob_display, RootWindow(ob_display, ob_screen), + &w, &w, &children, &nchild); /* remove all icon windows from the list */ for (i = 0; i < nchild; i++) { @@ -168,15 +176,15 @@ void client_manage_all() if (active) { g_assert(WINDOW_IS_CLIENT(active)); if (!client_focus(WINDOW_AS_CLIENT(active))) - focus_fallback(Fallback_NoFocus); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } else - focus_fallback(Fallback_NoFocus); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } } void client_manage(Window window) { - Client *self; + ObClient *self; XEvent e; XWindowAttributes attrib; XSetWindowAttributes attrib_set; @@ -214,7 +222,7 @@ void client_manage(Window window) XFree(wmhint); } - g_message("Managing window: %lx", window); + ob_debug("Managing window: %lx\n", window); /* choose the events we want to receive on the CLIENT window */ attrib_set.event_mask = CLIENT_EVENTMASK; @@ -223,12 +231,16 @@ void client_manage(Window window) CWEventMask|CWDontPropagate, &attrib_set); - /* create the Client struct, and populate it from the hints on the + /* create the ObClient struct, and populate it from the hints on the window */ - self = g_new(Client, 1); + self = g_new0(ObClient, 1); self->obwin.type = Window_Client; self->window = window; + client_get_all(self); + client_restore_session_state(self); + + client_change_state(self); /* remove the client's border (and adjust re gravity) */ client_toggle_border(self, FALSE); @@ -246,65 +258,90 @@ void client_manage(Window window) grab_server(FALSE); - /* add to client list/map */ - client_list = g_list_append(client_list, self); - g_hash_table_insert(window_map, &self->window, self); - /* update the focus lists */ focus_order_add_new(self); - /* focus the new window? */ - if (ob_state != State_Starting && config_focus_new && - (self->type == Type_Normal || self->type == Type_Dialog)) { - gboolean group_foc = FALSE; - - if (self->group) { - GSList *it; + stacking_add(CLIENT_AS_WINDOW(self)); + client_restore_session_stacking(self); - for (it = self->group->members; it; it = it->next) { - if (client_focused(it->data)) { - group_foc = TRUE; - break; - } - } - } + /* focus the new window? */ + if (ob_state() != OB_STATE_STARTING && config_focus_new && /* 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 */ - if ((group_foc || - (!self->transient_for && (!self->group || - !self->group->members->next))) || - client_search_focus_tree_full(self) || - !focus_client || - !client_normal(focus_client)) { + (self->type == OB_CLIENT_TYPE_NORMAL || + self->type == OB_CLIENT_TYPE_DIALOG)) + { + activate = TRUE; +#if 0 + if (self->desktop != screen_desktop) { /* activate the window */ - stacking_add(CLIENT_AS_WINDOW(self)); activate = TRUE; } else { - /* try to not get in the way */ - stacking_add_nonintrusive(CLIENT_AS_WINDOW(self)); + gboolean group_foc = FALSE; + + if (self->group) { + GSList *it; + + for (it = self->group->members; it; it = it->next) + { + if (client_focused(it->data)) + { + group_foc = TRUE; + break; + } + } + } + if ((group_foc || + (!self->transient_for && (!self->group || + !self->group->members->next))) || + client_search_focus_tree_full(self) || + !focus_client || + !client_normal(focus_client)) + { + /* activate the window */ + activate = TRUE; + } } - } else { - stacking_add(CLIENT_AS_WINDOW(self)); +#endif } - screen_update_struts(); + dispatch_client(Event_Client_New, self, 0, 0); /* make sure the window is visible */ - client_move_onscreen(self); - - dispatch_client(Event_Client_New, self, 0, 0); + if (ob_state() == OB_STATE_RUNNING) + client_move_onscreen(self, client_normal(self)); client_showhide(self); - if (activate) client_activate(self); + /* use client_focus instead of client_activate cuz client_activate does + stuff like switch desktops etc and I'm not interested in all that when + a window maps since its not based on an action from the user like + clicking a window to activate is. so keep the new window out of the way + but do focus it. */ + if (activate) client_focus(self); + + /* client_activate does this but we aret using it so we have to do it + here as well */ + if (screen_showing_desktop) + screen_show_desktop(FALSE); + + /* add to client list/map */ + client_list = g_list_append(client_list, self); + g_hash_table_insert(window_map, &self->window, self); + + /* this has to happen after we're in the client_list */ + screen_update_areas(); /* update the list hints */ client_set_list(); + keyboard_grab_for_client(self, TRUE); + mouse_grab_for_client(self, TRUE); + dispatch_client(Event_Client_Mapped, self, 0, 0); - g_message("Managed window 0x%lx (%s)", window, self->class); + ob_debug("Managed window 0x%lx (%s)\n", window, self->class); } void client_unmanage_all() @@ -313,23 +350,19 @@ void client_unmanage_all() client_unmanage(client_list->data); } -/* called by client_unmanage() to close any menus referencing this client */ -void client_close_menus(gpointer key, gpointer value, gpointer self) +void client_unmanage(ObClient *self) { - if (((Menu *)value)->client == (Client *)self) - menu_hide((Menu *)value); -} - -void client_unmanage(Client *self) -{ - int j; + guint j; GSList *it; - g_message("Unmanaging window: %lx (%s)", self->window, self->class); + 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); + mouse_grab_for_client(self, FALSE); + /* remove the window from our save set */ XChangeSaveSet(ob_display, self->window, SetModeDelete); @@ -347,16 +380,16 @@ void client_unmanage(Client *self) /* once the client is out of the list, update the struts to remove it's influence */ - screen_update_struts(); + screen_update_areas(); /* tell our parent(s) that we're gone */ - if (self->transient_for == TRAN_GROUP) { /* transient of group */ + if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; for (it = self->group->members; it; it = it->next) if (it->data != self) - ((Client*)it->data)->transients = - g_slist_remove(((Client*)it->data)->transients, self); + ((ObClient*)it->data)->transients = + g_slist_remove(((ObClient*)it->data)->transients, self); } else if (self->transient_for) { /* transient of window */ self->transient_for->transients = g_slist_remove(self->transient_for->transients, self); @@ -364,8 +397,8 @@ void client_unmanage(Client *self) /* tell our transients that we're gone */ for (it = self->transients; it != NULL; it = it->next) { - if (((Client*)it->data)->transient_for != TRAN_GROUP) { - ((Client*)it->data)->transient_for = NULL; + if (((ObClient*)it->data)->transient_for != OB_TRAN_GROUP) { + ((ObClient*)it->data)->transient_for = NULL; client_calc_layer(it->data); } } @@ -373,9 +406,9 @@ void client_unmanage(Client *self) if (moveresize_client == self) moveresize_end(TRUE); - /* close any windows that are attached to this window */ - g_hash_table_foreach(menu_hash, client_close_menus, self); - + /* menus can be associated with a client, so close any that are since + we are disappearing now */ + menu_frame_hide_all_client(self); if (focus_client == self) { XEvent e; @@ -403,11 +436,12 @@ void client_unmanage(Client *self) frame_release_client(self->frame, self); self->frame = NULL; - if (ob_state != State_Exiting) { + if (ob_state() != OB_STATE_EXITING) { /* these values should not be persisted across a window unmapping/mapping */ - prop_erase(self->window, prop_atoms.net_wm_desktop); - prop_erase(self->window, prop_atoms.net_wm_state); + PROP_ERASE(self->window, net_wm_desktop); + PROP_ERASE(self->window, net_wm_state); + PROP_ERASE(self->window, wm_state); } else { /* if we're left in an iconic state, the client wont be mapped. this is bad, since we will no longer be managing the window on restart */ @@ -416,7 +450,7 @@ void client_unmanage(Client *self) } - g_message("Unmanaged window 0x%lx", self->window); + ob_debug("Unmanaged window 0x%lx\n", self->window); /* free all data allocated in the client struct */ g_slist_free(self->transients); @@ -435,29 +469,118 @@ void client_unmanage(Client *self) client_set_list(); } -void client_move_onscreen(Client *self) +static void client_restore_session_state(ObClient *self) +{ + GList *it; + + if (!(it = session_state_find(self))) + return; + + self->session = it->data; + + RECT_SET(self->area, self->session->x, self->session->y, + self->session->w, self->session->h); + self->positioned = TRUE; + XResizeWindow(ob_display, self->window, + self->session->w, self->session->h); + + self->desktop = (self->session->desktop == DESKTOP_ALL ? + self->session->desktop : + MIN(screen_num_desktops - 1, self->session->desktop)); + PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); + + self->shaded = self->session->shaded; + self->iconic = self->session->iconic; + self->skip_pager = self->session->skip_pager; + self->skip_taskbar = self->session->skip_taskbar; + self->fullscreen = self->session->fullscreen; + self->above = self->session->above; + self->below = self->session->below; + self->max_horz = self->session->max_horz; + self->max_vert = self->session->max_vert; +} + +static void client_restore_session_stacking(ObClient *self) +{ + GList *it; + + if (!self->session) return; + + it = g_list_find(session_saved_state, self->session); + for (it = g_list_previous(it); it; it = g_list_previous(it)) { + GList *cit; + + for (cit = client_list; cit; cit = g_list_next(cit)) + if (session_state_cmp(it->data, cit->data)) + break; + if (cit) { + client_calc_layer(self); + stacking_below(CLIENT_AS_WINDOW(self), + CLIENT_AS_WINDOW(cit->data)); + break; + } + } +} + +void client_move_onscreen(ObClient *self, gboolean rude) +{ + int x = self->area.x; + int y = self->area.y; + 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); + } +} + +gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h, + gboolean rude) { Rect *a; - int x = self->frame->area.x, y = self->frame->area.y; + int ox = *x, oy = *y; + + frame_client_gravity(self->frame, x, y); /* get where the frame + would be */ + + /* XXX watch for xinerama dead areas */ a = screen_area(self->desktop); - if (x >= a->x + a->width - 1) - x = a->x + a->width - self->frame->area.width; - if (y >= a->y + a->height - 1) - y = a->y + a->height - self->frame->area.height; - if (x + self->frame->area.width - 1 < a->x) - x = a->x; - if (y + self->frame->area.height - 1< a->y) - y = a->y; + 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. + Java can suck it too. */ + + /* dont let windows map/move into the strut unless they + are bigger than the available area */ + if (w <= a->width) { + if (!self->strut.left && *x < a->x) *x = a->x; + if (!self->strut.right && *x + w > a->x + a->width) + *x = a->x + a->width - w; + } + if (h <= a->height) { + if (!self->strut.top && *y < a->y) *y = a->y; + if (!self->strut.bottom && *y + h > a->y + a->height) + *y = a->y + a->height - h; + } + } + + frame_frame_gravity(self->frame, x, y); /* get where the client + should be */ - frame_frame_gravity(self->frame, &x, &y); /* get where the client - should be */ - client_configure(self , Corner_TopLeft, x, y, - self->area.width, self->area.height, - TRUE, TRUE); + return ox != *x || oy != *y; } -static void client_toggle_border(Client *self, gboolean show) +static void client_toggle_border(ObClient *self, gboolean show) { /* adjust our idea of where the client is, based on its border. When the border is removed, the client should now be considered to be in a @@ -523,27 +646,13 @@ static void client_toggle_border(Client *self, gboolean show) } -static void client_get_all(Client *self) +static void client_get_all(ObClient *self) { - /* update EVERYTHING!! */ - - self->ignore_unmaps = 0; - - /* defaults */ - self->frame = NULL; - self->title = self->icon_title = NULL; + /* non-zero defaults */ self->title_count = 1; - self->name = self->class = self->role = NULL; self->wmstate = NormalState; - self->transient = FALSE; - self->transients = NULL; - self->transient_for = NULL; self->layer = -1; - self->urgent = FALSE; - self->positioned = FALSE; - self->disabled_decorations = 0; - self->group = NULL; - self->nicons = 0; + self->decorate = TRUE; client_get_area(self); client_update_transient_for(self); @@ -569,11 +678,9 @@ static void client_get_all(Client *self) client_update_class(self); client_update_strut(self); client_update_icons(self); - - client_change_state(self); } -static void client_get_area(Client *self) +static void client_get_area(ObClient *self) { XWindowAttributes wattrib; Status ret; @@ -585,19 +692,20 @@ static void client_get_area(Client *self) self->border_width = wattrib.border_width; } -static void client_get_desktop(Client *self) +static void client_get_desktop(ObClient *self) { - guint32 d; + guint32 d = screen_num_desktops; /* an always-invalid value */ if (PROP_GET32(self->window, net_wm_desktop, cardinal, &d)) { if (d >= screen_num_desktops && d != DESKTOP_ALL) - d = screen_num_desktops - 1; - self->desktop = d; - } else { + self->desktop = screen_num_desktops - 1; + else + self->desktop = d; + } else { gboolean trdesk = FALSE; if (self->transient_for) { - if (self->transient_for != TRAN_GROUP) { + if (self->transient_for != OB_TRAN_GROUP) { self->desktop = self->transient_for->desktop; trdesk = TRUE; } else { @@ -605,8 +713,8 @@ static void client_get_desktop(Client *self) for (it = self->group->members; it; it = it->next) if (it->data != self && - !((Client*)it->data)->transient_for) { - self->desktop = ((Client*)it->data)->desktop; + !((ObClient*)it->data)->transient_for) { + self->desktop = ((ObClient*)it->data)->desktop; trdesk = TRUE; break; } @@ -615,13 +723,14 @@ static void client_get_desktop(Client *self) if (!trdesk) /* defaults to the current desktop */ self->desktop = screen_desktop; - + } + if (self->desktop != d) { /* set the desktop hint, to make sure that it always exists */ PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); } } -static void client_get_state(Client *self) +static void client_get_state(ObClient *self) { guint32 *state; guint num; @@ -659,7 +768,7 @@ static void client_get_state(Client *self) } } -static void client_get_shaped(Client *self) +static void client_get_shaped(ObClient *self) { self->shaped = FALSE; #ifdef SHAPE @@ -678,27 +787,27 @@ static void client_get_shaped(Client *self) #endif } -void client_update_transient_for(Client *self) +void client_update_transient_for(ObClient *self) { Window t = None; - Client *c = NULL; + ObClient *target = NULL; if (XGetTransientForHint(ob_display, self->window, &t)) { self->transient = TRUE; if (t != self->window) { /* cant be transient to itself! */ - c = g_hash_table_lookup(window_map, &t); + target = g_hash_table_lookup(window_map, &t); /* if this happens then we need to check for it*/ - g_assert(c != self); - g_assert(!c || WINDOW_IS_CLIENT(c)); + g_assert(target != self); + g_assert(!target || WINDOW_IS_CLIENT(target)); - if (!c && self->group) { + if (!target && self->group) { /* not transient to a client, see if it is transient for a group */ if (t == self->group->leader || t == None || - t == ob_root) { + t == RootWindow(ob_display, ob_screen)) { /* window is a transient for its group! */ - c = TRAN_GROUP; + target = OB_TRAN_GROUP; } } } @@ -706,41 +815,41 @@ void client_update_transient_for(Client *self) self->transient = FALSE; /* if anything has changed... */ - if (c != self->transient_for) { - if (self->transient_for == TRAN_GROUP) { /* transient of group */ + if (target != self->transient_for) { + if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; /* remove from old parents */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - !((Client*)it->data)->transient_for) - ((Client*)it->data)->transients = - g_slist_remove(((Client*)it->data)->transients, self); + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) + c->transients = g_slist_remove(c->transients, self); + } } else if (self->transient_for != NULL) { /* transient of window */ /* remove from old parent */ self->transient_for->transients = g_slist_remove(self->transient_for->transients, self); } - self->transient_for = c; - if (self->transient_for == TRAN_GROUP) { /* transient of group */ + self->transient_for = target; + if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; /* add to new parents */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - !((Client*)it->data)->transient_for) - ((Client*)it->data)->transients = - g_slist_append(((Client*)it->data)->transients, self); + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) + c->transients = g_slist_append(c->transients, self); + } /* remove all transients which are in the group, that causes circlular pointer hell of doom */ - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; it = g_slist_next(it)) { GSList *sit, *next; for (sit = self->transients; sit; sit = next) { - next = sit->next; + next = g_slist_next(sit); if (sit->data == it->data) - self->transients = g_slist_remove(self->transients, - sit->data); + self->transients = + g_slist_delete_link(self->transients, sit); } } } else if (self->transient_for != NULL) { /* transient of window */ @@ -751,7 +860,7 @@ void client_update_transient_for(Client *self) } } -static void client_get_mwm_hints(Client *self) +static void client_get_mwm_hints(ObClient *self) { guint num; guint32 *hints; @@ -760,7 +869,7 @@ static void client_get_mwm_hints(Client *self) if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints, &hints, &num)) { - if (num >= MWM_ELEMENTS) { + if (num >= OB_MWM_ELEMENTS) { self->mwmhints.flags = hints[0]; self->mwmhints.functions = hints[1]; self->mwmhints.decorations = hints[2]; @@ -769,7 +878,7 @@ static void client_get_mwm_hints(Client *self) } } -void client_get_type(Client *self) +void client_get_type(ObClient *self) { guint num, i; guint32 *val; @@ -780,47 +889,47 @@ void client_get_type(Client *self) /* use the first value that we know about in the array */ for (i = 0; i < num; ++i) { if (val[i] == prop_atoms.net_wm_window_type_desktop) - self->type = Type_Desktop; + self->type = OB_CLIENT_TYPE_DESKTOP; else if (val[i] == prop_atoms.net_wm_window_type_dock) - self->type = Type_Dock; + self->type = OB_CLIENT_TYPE_DOCK; else if (val[i] == prop_atoms.net_wm_window_type_toolbar) - self->type = Type_Toolbar; + self->type = OB_CLIENT_TYPE_TOOLBAR; else if (val[i] == prop_atoms.net_wm_window_type_menu) - self->type = Type_Menu; + self->type = OB_CLIENT_TYPE_MENU; else if (val[i] == prop_atoms.net_wm_window_type_utility) - self->type = Type_Utility; + self->type = OB_CLIENT_TYPE_UTILITY; else if (val[i] == prop_atoms.net_wm_window_type_splash) - self->type = Type_Splash; + self->type = OB_CLIENT_TYPE_SPLASH; else if (val[i] == prop_atoms.net_wm_window_type_dialog) - self->type = Type_Dialog; + self->type = OB_CLIENT_TYPE_DIALOG; else if (val[i] == prop_atoms.net_wm_window_type_normal) - self->type = Type_Normal; + self->type = OB_CLIENT_TYPE_NORMAL; else if (val[i] == prop_atoms.kde_net_wm_window_type_override) { /* prevent this window from getting any decor or functionality */ - self->mwmhints.flags &= (MwmFlag_Functions | - MwmFlag_Decorations); + self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS | + OB_MWM_FLAG_DECORATIONS); self->mwmhints.decorations = 0; self->mwmhints.functions = 0; } - if (self->type != (WindowType) -1) + if (self->type != (ObClientType) -1) break; /* grab the first legit type */ } g_free(val); } - if (self->type == (WindowType) -1) { + if (self->type == (ObClientType) -1) { /*the window type hint was not set, which means we either classify ourself as a normal window or a dialog, depending on if we are a transient. */ if (self->transient) - self->type = Type_Dialog; + self->type = OB_CLIENT_TYPE_DIALOG; else - self->type = Type_Normal; + self->type = OB_CLIENT_TYPE_NORMAL; } } -void client_update_protocols(Client *self) +void client_update_protocols(ObClient *self) { guint32 *proto; guint num_return, i; @@ -842,7 +951,7 @@ void client_update_protocols(Client *self) } } -static void client_get_gravity(Client *self) +static void client_get_gravity(ObClient *self) { XWindowAttributes wattrib; Status ret; @@ -852,7 +961,7 @@ static void client_get_gravity(Client *self) self->gravity = wattrib.win_gravity; } -void client_update_normal_hints(Client *self) +void client_update_normal_hints(ObClient *self) { XSizeHints size; long ret; @@ -868,7 +977,7 @@ void client_update_normal_hints(Client *self) /* get the hints from the window */ if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) { - self->positioned = !!(size.flags & (PPosition|USPosition)); + self->positioned = !!(size.flags & (PPosition|USPosition)); if (size.flags & PWinGravity) { self->gravity = size.win_gravity; @@ -905,49 +1014,54 @@ void client_update_normal_hints(Client *self) } } -void client_setup_decor_and_functions(Client *self) +void client_setup_decor_and_functions(ObClient *self) { /* start with everything (cept fullscreen) */ - self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize | - Decor_Shade; - self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize | - Func_Shade; + 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); if (self->delete_window) { - self->decorations |= Decor_Close; - self->functions |= Func_Close; + self->functions |= OB_CLIENT_FUNC_CLOSE; + self->decorations |= OB_FRAME_DECOR_CLOSE; } if (!(self->min_size.width < self->max_size.width || - self->min_size.height < self->max_size.height)) { - self->decorations &= ~(Decor_Maximize | Decor_Handle); - self->functions &= ~(Func_Resize | Func_Maximize); - } + self->min_size.height < self->max_size.height)) + self->functions &= ~OB_CLIENT_FUNC_RESIZE; switch (self->type) { - case Type_Normal: + case OB_CLIENT_TYPE_NORMAL: /* normal windows retain all of the possible decorations and functionality, and are the only windows that you can fullscreen */ - self->functions |= Func_Fullscreen; + self->functions |= OB_CLIENT_FUNC_FULLSCREEN; break; - case Type_Dialog: - case Type_Utility: + case OB_CLIENT_TYPE_DIALOG: + case OB_CLIENT_TYPE_UTILITY: /* these windows cannot be maximized */ - self->decorations &= ~Decor_Maximize; - self->functions &= ~Func_Maximize; + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; break; - case Type_Menu: - case Type_Toolbar: + case OB_CLIENT_TYPE_MENU: + case OB_CLIENT_TYPE_TOOLBAR: /* these windows get less functionality */ - self->decorations &= ~(Decor_Iconify | Decor_Handle); - self->functions &= ~(Func_Iconify | Func_Resize); + self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE); break; - case Type_Desktop: - case Type_Dock: - case Type_Splash: + case OB_CLIENT_TYPE_DESKTOP: + case OB_CLIENT_TYPE_DOCK: + case OB_CLIENT_TYPE_SPLASH: /* none of these windows are manipulated by the window manager */ self->decorations = 0; self->functions = 0; @@ -956,111 +1070,107 @@ void client_setup_decor_and_functions(Client *self) /* Mwm Hints are applied subtractively to what has already been chosen for decor and functionality */ - if (self->mwmhints.flags & MwmFlag_Decorations) { - if (! (self->mwmhints.decorations & MwmDecor_All)) { - if (! (self->mwmhints.decorations & MwmDecor_Border)) - self->decorations &= ~Decor_Border; - if (! (self->mwmhints.decorations & MwmDecor_Handle)) - self->decorations &= ~Decor_Handle; - if (! (self->mwmhints.decorations & MwmDecor_Title)) - self->decorations &= ~Decor_Titlebar; - if (! (self->mwmhints.decorations & MwmDecor_Iconify)) - self->decorations &= ~Decor_Iconify; - if (! (self->mwmhints.decorations & MwmDecor_Maximize)) - self->decorations &= ~Decor_Maximize; + if (self->mwmhints.flags & OB_MWM_FLAG_DECORATIONS) { + if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) { + if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) || + (self->mwmhints.decorations & OB_MWM_DECOR_TITLE))) + /* if the mwm hints request no handle or title, then all + decorations are disabled */ + self->decorations = 0; } } - if (self->mwmhints.flags & MwmFlag_Functions) { - if (! (self->mwmhints.functions & MwmFunc_All)) { - if (! (self->mwmhints.functions & MwmFunc_Resize)) - self->functions &= ~Func_Resize; - if (! (self->mwmhints.functions & MwmFunc_Move)) - self->functions &= ~Func_Move; - if (! (self->mwmhints.functions & MwmFunc_Iconify)) - self->functions &= ~Func_Iconify; - if (! (self->mwmhints.functions & MwmFunc_Maximize)) - self->functions &= ~Func_Maximize; + if (self->mwmhints.flags & OB_MWM_FLAG_FUNCTIONS) { + if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) { + if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE)) + self->functions &= ~OB_CLIENT_FUNC_RESIZE; + if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE)) + self->functions &= ~OB_CLIENT_FUNC_MOVE; + /* dont let mwm hints kill any buttons + if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY)) + self->functions &= ~OB_CLIENT_FUNC_ICONIFY; + if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE)) + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; + */ /* dont let mwm hints kill the close button if (! (self->mwmhints.functions & MwmFunc_Close)) - self->functions &= ~Func_Close; */ + self->functions &= ~OB_CLIENT_FUNC_CLOSE; */ } } + if (!(self->functions & OB_CLIENT_FUNC_SHADE)) + self->decorations &= ~OB_FRAME_DECOR_SHADE; + if (!(self->functions & OB_CLIENT_FUNC_ICONIFY)) + self->decorations &= ~OB_FRAME_DECOR_ICONIFY; + if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) + self->decorations &= ~OB_FRAME_DECOR_GRIPS; + /* can't maximize without moving/resizing */ - if (!((self->functions & Func_Move) && (self->functions & Func_Resize))) - self->functions &= ~(Func_Maximize | Func_Fullscreen); - - /* finally, user specified disabled decorations are applied to subtract - decorations */ - if (self->disabled_decorations & Decor_Titlebar) - self->decorations &= ~Decor_Titlebar; - if (self->disabled_decorations & Decor_Handle) - self->decorations &= ~Decor_Handle; - if (self->disabled_decorations & Decor_Border) - self->decorations &= ~Decor_Border; - if (self->disabled_decorations & Decor_Iconify) - self->decorations &= ~Decor_Iconify; - if (self->disabled_decorations & Decor_Maximize) - self->decorations &= ~Decor_Maximize; - if (self->disabled_decorations & Decor_AllDesktops) - self->decorations &= ~Decor_AllDesktops; - if (self->disabled_decorations & Decor_Shade) - self->decorations &= ~Decor_Shade; - if (self->disabled_decorations & Decor_Close) - self->decorations &= ~Decor_Close; + if (!((self->functions & OB_CLIENT_FUNC_MAXIMIZE) && + (self->functions & OB_CLIENT_FUNC_MOVE) && + (self->functions & OB_CLIENT_FUNC_RESIZE))) { + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; + self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE; + } + + /* kill the handle on fully maxed windows */ + if (self->max_vert && self->max_horz) + self->decorations &= ~OB_FRAME_DECOR_HANDLE; + + /* finally, the user can have requested no decorations, which overrides + everything */ + if (!self->decorate) + self->decorations = OB_FRAME_DECOR_BORDER; /* if we don't have a titlebar, then we cannot shade! */ - if (!(self->decorations & Decor_Titlebar)) - self->functions &= ~Func_Shade; + if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) + self->functions &= ~OB_CLIENT_FUNC_SHADE; /* now we need to check against rules for the client's current state */ if (self->fullscreen) { - self->functions &= (Func_Close | Func_Fullscreen | Func_Iconify); + self->functions &= (OB_CLIENT_FUNC_CLOSE | + OB_CLIENT_FUNC_FULLSCREEN | + OB_CLIENT_FUNC_ICONIFY); self->decorations = 0; } client_change_allowed_actions(self); if (self->frame) { - /* this makes sure that these windows appear on all desktops */ - if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL) - client_set_desktop(self, DESKTOP_ALL, FALSE); - - /* change the decors on the frame, and with more/less decorations, - we may also need to be repositioned */ - frame_adjust_area(self->frame, TRUE, TRUE); - /* with new decor, the window's maximized size may change */ - client_reconfigure(self); + /* adjust the client's decorations, etc. */ + client_reconfigure(self); } else { /* this makes sure that these windows appear on all desktops */ - if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL) + if (self->type == OB_CLIENT_TYPE_DESKTOP && + self->desktop != DESKTOP_ALL) + { self->desktop = DESKTOP_ALL; + } } } -static void client_change_allowed_actions(Client *self) +static void client_change_allowed_actions(ObClient *self) { guint32 actions[9]; int num = 0; /* desktop windows are kept on all desktops */ - if (self->type != Type_Desktop) + if (self->type != OB_CLIENT_TYPE_DESKTOP) actions[num++] = prop_atoms.net_wm_action_change_desktop; - if (self->functions & Func_Shade) + if (self->functions & OB_CLIENT_FUNC_SHADE) actions[num++] = prop_atoms.net_wm_action_shade; - if (self->functions & Func_Close) + if (self->functions & OB_CLIENT_FUNC_CLOSE) actions[num++] = prop_atoms.net_wm_action_close; - if (self->functions & Func_Move) + if (self->functions & OB_CLIENT_FUNC_MOVE) actions[num++] = prop_atoms.net_wm_action_move; - if (self->functions & Func_Iconify) + if (self->functions & OB_CLIENT_FUNC_ICONIFY) actions[num++] = prop_atoms.net_wm_action_minimize; - if (self->functions & Func_Resize) + if (self->functions & OB_CLIENT_FUNC_RESIZE) actions[num++] = prop_atoms.net_wm_action_resize; - if (self->functions & Func_Fullscreen) + if (self->functions & OB_CLIENT_FUNC_FULLSCREEN) actions[num++] = prop_atoms.net_wm_action_fullscreen; - if (self->functions & Func_Maximize) { + if (self->functions & OB_CLIENT_FUNC_MAXIMIZE) { actions[num++] = prop_atoms.net_wm_action_maximize_horz; actions[num++] = prop_atoms.net_wm_action_maximize_vert; } @@ -1069,33 +1179,35 @@ static void client_change_allowed_actions(Client *self) /* make sure the window isn't breaking any rules now */ - if (!(self->functions & Func_Shade) && self->shaded) { + if (!(self->functions & OB_CLIENT_FUNC_SHADE) && self->shaded) { if (self->frame) client_shade(self, FALSE); else self->shaded = FALSE; } - if (!(self->functions & Func_Iconify) && self->iconic) { - g_message("UNSETTING ICONIC"); + if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) { if (self->frame) client_iconify(self, FALSE, TRUE); else self->iconic = FALSE; } - if (!(self->functions & Func_Fullscreen) && self->fullscreen) { + if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) && self->fullscreen) { if (self->frame) client_fullscreen(self, FALSE, TRUE); else self->fullscreen = FALSE; } - if (!(self->functions & Func_Maximize) && (self->max_horz || - self->max_vert)) { + if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE) && (self->max_horz || + self->max_vert)) { if (self->frame) client_maximize(self, FALSE, 0, TRUE); else self->max_vert = self->max_horz = FALSE; } } -void client_reconfigure(Client *self) +void client_reconfigure(ObClient *self) { - client_configure(self, Corner_TopLeft, self->area.x, self->area.y, - self->area.width, self->area.height, TRUE, TRUE); + /* by making this pass FALSE for user, we avoid the emacs event storm where + every configurenotify causes an update in its normal hints, i think this + is generally what we want anyways... */ + client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y, + self->area.width, self->area.height, FALSE, TRUE); } -void client_update_wmhints(Client *self) +void client_update_wmhints(ObClient *self) { XWMHints *hints; gboolean ur = FALSE; @@ -1110,7 +1222,7 @@ void client_update_wmhints(Client *self) /* only do this when first managing the window *AND* when we aren't starting up! */ - if (ob_state != State_Starting && self->frame == NULL) + if (ob_state() != OB_STATE_STARTING && self->frame == NULL) if (hints->flags & StateHint) self->iconic = hints->initial_state == IconicState; @@ -1140,17 +1252,15 @@ void client_update_wmhints(Client *self) if (!self->transient_for) { /* add other transients of the group that are already set up */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - ((Client*)it->data)->transient_for == TRAN_GROUP) - self->transients = g_slist_append(self->transients, - it->data); + for (it = self->group->members; it; it = it->next) { + ObClient *c = it->data; + if (c != self && c->transient_for == OB_TRAN_GROUP) + self->transients = + g_slist_append(self->transients, c); + } } } - /* the WM_HINTS can contain an icon */ - client_update_icons(self); - /* because the self->transient flag wont change from this call, we don't need to update the window's type and such, only its transient_for, and the transients lists of other windows in @@ -1158,13 +1268,16 @@ void client_update_wmhints(Client *self) client_update_transient_for(self); } + /* the WM_HINTS can contain an icon */ + client_update_icons(self); + XFree(hints); } if (ur != self->urgent) { self->urgent = ur; - g_message("Urgent Hint for 0x%lx: %s", self->window, - ur ? "ON" : "OFF"); + ob_debug("Urgent Hint for 0x%lx: %s\n", self->window, + ur ? "ON" : "OFF"); /* fire the urgent callback if we're mapped, otherwise, wait until after we're mapped */ if (self->frame) @@ -1172,7 +1285,7 @@ void client_update_wmhints(Client *self) } } -void client_update_title(Client *self) +void client_update_title(ObClient *self) { GList *it; guint32 nums; @@ -1192,7 +1305,7 @@ void client_update_title(Client *self) nums = 0; for (it = client_list; it; it = it->next) if (it->data != self) { - Client *c = it->data; + ObClient *c = it->data; if (0 == strncmp(c->title, data, strlen(data))) nums |= 1 << c->title_count; } @@ -1248,7 +1361,7 @@ void client_update_title(Client *self) self->icon_title = data; } -void client_update_class(Client *self) +void client_update_class(ObClient *self) { char **data; char *s; @@ -1276,36 +1389,58 @@ void client_update_class(Client *self) if (self->role == NULL) self->role = g_strdup(""); } -void client_update_strut(Client *self) +void client_update_strut(ObClient *self) { guint num; guint32 *data; + gboolean got = FALSE; + StrutPartial strut; + + if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal, + &data, &num)) { + if (num == 12) { + got = TRUE; + STRUT_PARTIAL_SET(strut, + data[0], data[2], data[1], data[3], + data[4], data[5], data[8], data[9], + data[6], data[7], data[10], data[11]); + } + g_free(data); + } - if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) { - STRUT_SET(self->strut, 0, 0, 0, 0); - } else { - if (num == 4) - STRUT_SET(self->strut, data[0], data[2], data[1], data[3]); - else - STRUT_SET(self->strut, 0, 0, 0, 0); - g_free(data); + if (!got && + PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) { + if (num == 4) { + got = TRUE; + STRUT_PARTIAL_SET(strut, + data[0], data[2], data[1], data[3], + 0, 0, 0, 0, 0, 0, 0, 0); + } + g_free(data); } - /* updating here is pointless while we're being mapped cuz we're not in - the client list yet */ - if (self->frame) - screen_update_struts(); + if (!got) + STRUT_PARTIAL_SET(strut, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0); + + if (!STRUT_EQUAL(strut, self->strut)) { + self->strut = strut; + + /* updating here is pointless while we're being mapped cuz we're not in + the client list yet */ + if (self->frame) + screen_update_areas(); + } } -void client_update_icons(Client *self) +void client_update_icons(ObClient *self) { guint num; guint32 *data; - guint w, h, i; - int j; + guint w, h, i, j; - for (j = 0; j < self->nicons; ++j) - g_free(self->icons[j].data); + for (i = 0; i < self->nicons; ++i) + g_free(self->icons[i].data); if (self->nicons > 0) g_free(self->icons); self->nicons = 0; @@ -1321,7 +1456,7 @@ void client_update_icons(Client *self) ++self->nicons; } - self->icons = g_new(Icon, self->nicons); + self->icons = g_new(ObClientIcon, self->nicons); /* store the icons */ i = 0; @@ -1333,17 +1468,17 @@ void client_update_icons(Client *self) if (w*h == 0) continue; - self->icons[j].data = g_new(pixel32, w * h); + self->icons[j].data = g_new(RrPixel32, w * h); for (x = 0, y = 0, t = 0; t < w * h; ++t, ++x, ++i) { if (x >= w) { x = 0; ++y; } self->icons[j].data[t] = - (((data[i] >> 24) & 0xff) << default_alpha_offset) + - (((data[i] >> 16) & 0xff) << default_red_offset) + - (((data[i] >> 8) & 0xff) << default_green_offset) + - (((data[i] >> 0) & 0xff) << default_blue_offset); + (((data[i] >> 24) & 0xff) << RrDefaultAlphaOffset) + + (((data[i] >> 16) & 0xff) << RrDefaultRedOffset) + + (((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) + + (((data[i] >> 0) & 0xff) << RrDefaultBlueOffset); } g_assert(i <= num); } @@ -1353,12 +1488,13 @@ void client_update_icons(Client *self) kwm_win_icon, &data, &num)) { if (num == 2) { self->nicons++; - self->icons = g_new(Icon, self->nicons); + self->icons = g_new(ObClientIcon, self->nicons); xerror_set_ignore(TRUE); - if (!render_pixmap_to_rgba(data[0], data[1], - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)) { + if (!RrPixmapToRGBA(ob_rr_inst, + data[0], data[1], + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)) { g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1371,14 +1507,15 @@ void client_update_icons(Client *self) if ((hints = XGetWMHints(ob_display, self->window))) { if (hints->flags & IconPixmapHint) { self->nicons++; - self->icons = g_new(Icon, self->nicons); + self->icons = g_new(ObClientIcon, self->nicons); xerror_set_ignore(TRUE); - if (!render_pixmap_to_rgba(hints->icon_pixmap, - (hints->flags & IconMaskHint ? - hints->icon_mask : None), - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)){ + if (!RrPixmapToRGBA(ob_rr_inst, + hints->icon_pixmap, + (hints->flags & IconMaskHint ? + hints->icon_mask : None), + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)){ g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1392,7 +1529,7 @@ void client_update_icons(Client *self) frame_adjust_icon(self->frame); } -static void client_change_state(Client *self) +static void client_change_state(ObClient *self) { guint32 state[2]; guint32 netstate[10]; @@ -1431,10 +1568,10 @@ static void client_change_state(Client *self) frame_adjust_state(self->frame); } -Client *client_search_focus_tree(Client *self) +ObClient *client_search_focus_tree(ObClient *self) { GSList *it; - Client *ret; + ObClient *ret; for (it = self->transients; it != NULL; it = it->next) { if (client_focused(it->data)) return it->data; @@ -1443,18 +1580,18 @@ Client *client_search_focus_tree(Client *self) return NULL; } -Client *client_search_focus_tree_full(Client *self) +ObClient *client_search_focus_tree_full(ObClient *self) { if (self->transient_for) { - if (self->transient_for != TRAN_GROUP) { + if (self->transient_for != OB_TRAN_GROUP) { return client_search_focus_tree_full(self->transient_for); } else { GSList *it; gboolean recursed = FALSE; for (it = self->group->members; it; it = it->next) - if (!((Client*)it->data)->transient_for) { - Client *c; + if (!((ObClient*)it->data)->transient_for) { + ObClient *c; if ((c = client_search_focus_tree_full(it->data))) return c; recursed = TRUE; @@ -1471,27 +1608,28 @@ Client *client_search_focus_tree_full(Client *self) return client_search_focus_tree(self); } -static StackLayer calc_layer(Client *self) +static ObStackingLayer calc_layer(ObClient *self) { - StackLayer l; + ObStackingLayer l; - if (self->fullscreen) l = Layer_Fullscreen; - else if (self->type == Type_Desktop) l = Layer_Desktop; - else if (self->type == Type_Dock) { - if (!self->below) l = Layer_Top; - else l = Layer_Normal; + if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN; + else if (self->type == OB_CLIENT_TYPE_DESKTOP) + l = OB_STACKING_LAYER_DESKTOP; + else if (self->type == OB_CLIENT_TYPE_DOCK) { + if (!self->below) l = OB_STACKING_LAYER_TOP; + else l = OB_STACKING_LAYER_NORMAL; } - else if (self->above) l = Layer_Above; - else if (self->below) l = Layer_Below; - else l = Layer_Normal; + else if (self->above) l = OB_STACKING_LAYER_ABOVE; + else if (self->below) l = OB_STACKING_LAYER_BELOW; + else l = OB_STACKING_LAYER_NORMAL; return l; } -static void calc_recursive(Client *self, Client *orig, StackLayer l, - gboolean raised) +static void client_calc_layer_recursive(ObClient *self, ObClient *orig, + ObStackingLayer l, gboolean raised) { - StackLayer old, own; + ObStackingLayer old, own; GSList *it; old = self->layer; @@ -1499,42 +1637,33 @@ static void calc_recursive(Client *self, Client *orig, StackLayer l, self->layer = l > own ? l : own; for (it = self->transients; it; it = it->next) - calc_recursive(it->data, orig, l, raised ? raised : l != old); + client_calc_layer_recursive(it->data, orig, + l, raised ? raised : l != old); if (!raised && l != old) - if (orig->frame) /* only restack if the original window is managed */ - stacking_raise(CLIENT_AS_WINDOW(self)); + if (orig->frame) { /* only restack if the original window is managed */ + /* XXX add_non_intrusive ever? */ + stacking_remove(CLIENT_AS_WINDOW(self)); + stacking_add(CLIENT_AS_WINDOW(self)); + } } -void client_calc_layer(Client *self) +void client_calc_layer(ObClient *self) { - StackLayer l; - Client *orig; + ObStackingLayer l; + ObClient *orig; orig = self; /* transients take on the layer of their parents */ - if (self->transient_for) { - if (self->transient_for != TRAN_GROUP) { - self = self->transient_for; - } else { - GSList *it; - - for (it = self->group->members; it; it = it->next) - if (it->data != self && - !((Client*)it->data)->transient_for) { - self = it->data; - break; - } - } - } + self = client_search_top_transient(self); l = calc_layer(self); - calc_recursive(self, orig, l, FALSE); + client_calc_layer_recursive(self, orig, l, FALSE); } -gboolean client_should_show(Client *self) +gboolean client_should_show(ObClient *self) { if (self->iconic) return FALSE; else if (!(self->desktop == screen_desktop || @@ -1544,7 +1673,7 @@ gboolean client_should_show(Client *self) return TRUE; } -static void client_showhide(Client *self) +static void client_showhide(ObClient *self) { if (client_should_show(self)) @@ -1553,12 +1682,13 @@ static void client_showhide(Client *self) frame_hide(self->frame); } -gboolean client_normal(Client *self) { - return ! (self->type == Type_Desktop || self->type == Type_Dock || - self->type == Type_Splash); +gboolean client_normal(ObClient *self) { + return ! (self->type == OB_CLIENT_TYPE_DESKTOP || + self->type == OB_CLIENT_TYPE_DOCK || + self->type == OB_CLIENT_TYPE_SPLASH); } -static void client_apply_startup_state(Client *self) +static void client_apply_startup_state(ObClient *self) { /* these are in a carefully crafted order.. */ @@ -1597,10 +1727,19 @@ static void client_apply_startup_state(Client *self) */ } -void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, - gboolean user, gboolean final) +void client_configure_full(ObClient *self, ObCorner anchor, + int x, int y, int w, int h, + gboolean user, gboolean final, + gboolean force_reply) { gboolean moved = FALSE, resized = FALSE; + guint fdecor = self->frame->decorations; + gboolean fhorz = self->frame->max_horz; + + /* make the frame recalculate its dimentions n shit without changing + anything visible for real, this way the constraints below can work with + the updated frame dimensions. */ + frame_adjust_area(self->frame, TRUE, TRUE, TRUE); /* gets the frame's position */ frame_client_gravity(self->frame, &x, &y); @@ -1612,33 +1751,47 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, #ifdef VIDMODE int dot; XF86VidModeModeLine mode; +#endif + Rect *a; + guint i; + + i = client_monitor(self); + a = screen_physical_area_monitor(i); - if (XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) { +#ifdef VIDMODE + if (i == 0 && /* primary head */ + extensions_vidmode && + XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) && + /* get the mode last so the mode.privsize isnt freed incorrectly */ + XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) { + x += a->x; + y += a->y; w = mode.hdisplay; h = mode.vdisplay; if (mode.privsize) XFree(mode.private); - } else { -#else - w = screen_physical_size.width; - h = screen_physical_size.height; -#endif -#ifdef VIDMODE - } - if (!XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y)) { - x = y = 0; + } else #endif + { + x = a->x; + y = a->y; + w = a->width; + h = a->height; } + user = FALSE; /* ignore that increment etc shit when in fullscreen */ } else { + Rect *a; + + a = screen_area_monitor(self->desktop, client_monitor(self)); + /* set the size and position if maximized */ if (self->max_horz) { - x = screen_area(self->desktop)->x - self->frame->size.left; - w = screen_area(self->desktop)->width; + x = a->x; + w = a->width - self->frame->size.left - self->frame->size.right; } if (self->max_vert) { - y = screen_area(self->desktop)->y; - h = screen_area(self->desktop)->height - - self->frame->size.top - self->frame->size.bottom; + y = a->y; + h = a->height - self->frame->size.top - self->frame->size.bottom; } } @@ -1647,82 +1800,109 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* these override the above states! if you cant move you can't move! */ if (user) { - if (!(self->functions & Func_Move)) { + if (!(self->functions & OB_CLIENT_FUNC_MOVE)) { x = self->area.x; y = self->area.y; } - if (!(self->functions & Func_Resize)) { + if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) { w = self->area.width; h = self->area.height; } } if (!(w == self->area.width && h == self->area.height)) { - w -= self->base_size.width; - h -= self->base_size.height; + int basew, baseh, minw, minh; + int mw, mh, aw, ah; - if (user) { - /* for interactive resizing. have to move half an increment in each - direction. */ - - /* how far we are towards the next size inc */ - int mw = w % self->size_inc.width; - int mh = h % self->size_inc.height; - /* amount to add */ - int aw = self->size_inc.width / 2; - int 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 and aspect ratios */ - - /* smaller than min size or bigger than max size? */ - if (w > self->max_size.width) w = self->max_size.width; - if (w < self->min_size.width) w = self->min_size.width; - if (h > self->max_size.height) h = self->max_size.height; - if (h < self->min_size.height) h = self->min_size.height; - - /* adjust the height ot match the width for the aspect ratios */ - if (self->min_ratio) - if (h * self->min_ratio > w) h = (int)(w / self->min_ratio); - if (self->max_ratio) - if (h * self->max_ratio < w) h = (int)(w / self->max_ratio); + /* base size is substituted with min size if not specified */ + if (self->base_size.width || self->base_size.height) { + basew = self->base_size.width; + baseh = self->base_size.height; + } else { + basew = self->min_size.width; + baseh = self->min_size.height; } + /* min size is substituted with base size if not specified */ + if (self->min_size.width || self->min_size.height) { + minw = self->min_size.width; + minh = self->min_size.height; + } else { + minw = self->base_size.width; + 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 */ + + /* smaller than min size or bigger than max size? */ + if (w > self->max_size.width) w = self->max_size.width; + if (w < minw) w = minw; + if (h > self->max_size.height) h = self->max_size.height; + if (h < minh) h = minh; + + w -= basew; + h -= baseh; /* keep to the increments */ w /= self->size_inc.width; h /= self->size_inc.height; /* you cannot resize to nothing */ - if (w < 1) w = 1; - if (h < 1) h = 1; + if (basew + w < 1) w = 1 - basew; + if (baseh + h < 1) h = 1 - baseh; /* store the logical size */ - SIZE_SET(self->logical_size, w, h); + SIZE_SET(self->logical_size, + self->size_inc.width > 1 ? w : w + basew, + self->size_inc.height > 1 ? h : h + baseh); w *= self->size_inc.width; h *= self->size_inc.height; + w += basew; + h += baseh; + + /* adjust the height to match the width for the aspect ratios. + for this, min size is not substituted for base size ever. */ + w -= self->base_size.width; + h -= self->base_size.height; + + if (self->min_ratio) + if (h * self->min_ratio > w) h = (int)(w / self->min_ratio); + if (self->max_ratio) + if (h * self->max_ratio < w) h = (int)(w / self->max_ratio); + w += self->base_size.width; h += self->base_size.height; } switch (anchor) { - case Corner_TopLeft: + case OB_CORNER_TOPLEFT: break; - case Corner_TopRight: + case OB_CORNER_TOPRIGHT: x -= w - self->area.width; break; - case Corner_BottomLeft: + case OB_CORNER_BOTTOMLEFT: y -= h - self->area.height; break; - case Corner_BottomRight: + case OB_CORNER_BOTTOMRIGHT: x -= w - self->area.width; y -= h - self->area.height; break; @@ -1733,25 +1913,34 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, RECT_SET(self->area, x, y, w, h); - if (final || (resized && config_opaque_resize)) + /* 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); /* move/resize the frame to match the request */ if (self->frame) { + if (self->decorations != fdecor || self->max_horz != fhorz) + moved = resized = TRUE; + if (moved || resized) - frame_adjust_area(self->frame, moved, resized); + frame_adjust_area(self->frame, moved, resized, FALSE); - if (!user || final) { + if (!resized && (force_reply || ((!user && moved) || (user && final)))) + { XEvent event; event.type = ConfigureNotify; event.xconfigure.display = ob_display; event.xconfigure.event = self->window; event.xconfigure.window = self->window; - + /* root window real coords */ - event.xconfigure.x = self->frame->area.x + self->frame->size.left; - event.xconfigure.y = self->frame->area.y + self->frame->size.top; - + event.xconfigure.x = self->frame->area.x + self->frame->size.left - + self->border_width; + event.xconfigure.y = self->frame->area.y + self->frame->size.top - + self->border_width; event.xconfigure.width = w; event.xconfigure.height = h; event.xconfigure.border_width = 0; @@ -1763,12 +1952,12 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, } } -void client_fullscreen(Client *self, gboolean fs, gboolean savearea) +void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea) { int x, y, w, h; - if (!(self->functions & Func_Fullscreen) || /* can't */ - self->fullscreen == fs) return; /* already done */ + if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) || /* can't */ + self->fullscreen == fs) return; /* already done */ self->fullscreen = fs; client_change_state(self); /* change the state hints on the client, @@ -1792,14 +1981,14 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea) } else { guint num; gint32 *dimensions; + Rect *a; /* pick some fallbacks... */ - x = screen_area(self->desktop)->x + - screen_area(self->desktop)->width / 4; - y = screen_area(self->desktop)->y + - screen_area(self->desktop)->height / 4; - w = screen_area(self->desktop)->width / 2; - h = screen_area(self->desktop)->height / 2; + 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)) { @@ -1815,88 +2004,90 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea) client_setup_decor_and_functions(self); - client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE); + client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); /* try focus us when we go into fullscreen mode */ client_focus(self); } -void client_iconify(Client *self, gboolean iconic, gboolean curdesk) +static void client_iconify_recursive(ObClient *self, + gboolean iconic, gboolean curdesk) { GSList *it; + gboolean changed = FALSE; - /* move up the transient chain as far as possible first */ - if (self->transient_for) { - if (self->transient_for != TRAN_GROUP) { - if (self->transient_for->iconic != iconic) { - client_iconify(self->transient_for, iconic, curdesk); - return; - } - } else { - GSList *it; - for (it = self->group->members; it; it = it->next) { - Client *c = it->data; - if (c != self && c->iconic != iconic && - !c->transient_for) { - client_iconify(it->data, iconic, curdesk); - break; - } - } - if (it != NULL) return; - } - } + if (self->iconic != iconic) { + ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), + self->window); - if (self->iconic == iconic) return; /* nothing to do */ + self->iconic = iconic; - g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"), - self->window); + if (iconic) { + if (self->functions & OB_CLIENT_FUNC_ICONIFY) { + self->wmstate = IconicState; + self->ignore_unmaps++; + /* we unmap the client itself so that we can get MapRequest + events, and because the ICCCM tells us to! */ + XUnmapWindow(ob_display, self->window); - self->iconic = iconic; + /* update the focus lists.. iconic windows go to the bottom of + the list, put the new iconic window at the 'top of the + bottom'. */ + focus_order_to_top(self); - if (iconic) { - self->wmstate = IconicState; - self->ignore_unmaps++; - /* we unmap the client itself so that we can get MapRequest events, - and because the ICCCM tells us to! */ - XUnmapWindow(ob_display, self->window); - - /* update the focus lists.. iconic windows go to the bottom of the - list, put the new iconic window at the 'top of the bottom'. */ - focus_order_to_top(self); - } else { - if (curdesk) - client_set_desktop(self, screen_desktop, FALSE); - self->wmstate = self->shaded ? IconicState : NormalState; - XMapWindow(ob_display, self->window); + changed = TRUE; + } + } else { + if (curdesk) + client_set_desktop(self, screen_desktop, FALSE); + self->wmstate = self->shaded ? IconicState : NormalState; + XMapWindow(ob_display, self->window); + + /* this puts it after the current focused window */ + focus_order_remove(self); + focus_order_add_new(self); + + /* this is here cuz with the VIDMODE extension, the viewport can + change while a fullscreen window is iconic, and when it + uniconifies, it would be nice if it did so to the new position + of the viewport */ + client_reconfigure(self); + + changed = TRUE; + } + } - /* this puts it after the current focused window */ - focus_order_remove(self); - focus_order_add_new(self); + if (changed) { + client_change_state(self); + client_showhide(self); + screen_update_areas(); - /* this is here cuz with the VIDMODE extension, the viewport can change - while a fullscreen window is iconic, and when it uniconifies, it - would be nice if it did so to the new position of the viewport */ - client_reconfigure(self); + dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped, + self, 0, 0); } - client_change_state(self); - client_showhide(self); - screen_update_struts(); - - dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped, - self, 0, 0); /* iconify all transients */ for (it = self->transients; it != NULL; it = it->next) - if (it->data != self) client_iconify(it->data, iconic, curdesk); + if (it->data != self) client_iconify_recursive(it->data, + iconic, curdesk); } -void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) +void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk) +{ + /* move up the transient chain as far as possible first */ + self = client_search_top_transient(self); + + client_iconify_recursive(client_search_top_transient(self), + iconic, curdesk); +} + +void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea) { int x, y, w, h; g_assert(dir == 0 || dir == 1 || dir == 2); - if (!(self->functions & Func_Maximize)) return; /* can't */ + if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */ /* check if already done */ if (max) { @@ -1949,17 +2140,17 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) } else { guint num; gint32 *dimensions; + Rect *a; /* pick some fallbacks... */ + a = screen_area_monitor(self->desktop, 0); if (dir == 0 || dir == 1) { /* horz */ - x = screen_area(self->desktop)->x + - screen_area(self->desktop)->width / 4; - w = screen_area(self->desktop)->width / 2; + x = a->x + a->width / 4; + w = a->width / 2; } if (dir == 0 || dir == 2) { /* vert */ - y = screen_area(self->desktop)->y + - screen_area(self->desktop)->height / 4; - h = screen_area(self->desktop)->height / 2; + y = a->y + a->height / 4; + h = a->height / 2; } if (PROP_GETA32(self->window, openbox_premax, cardinal, @@ -1988,14 +2179,17 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) 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, Corner_TopLeft, x, y, w, h, TRUE, TRUE); + client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); } -void client_shade(Client *self, gboolean shade) +void client_shade(ObClient *self, gboolean shade) { - if ((!(self->functions & Func_Shade) && shade) || /* can't shade */ + if ((!(self->functions & OB_CLIENT_FUNC_SHADE) && + shade) || /* can't shade */ self->shaded == shade) return; /* already done */ /* when we're iconic, don't change the wmstate */ @@ -2004,14 +2198,14 @@ void client_shade(Client *self, gboolean shade) self->shaded = shade; client_change_state(self); /* resize the frame to just the titlebar */ - frame_adjust_area(self->frame, FALSE, FALSE); + frame_adjust_area(self->frame, FALSE, FALSE, FALSE); } -void client_close(Client *self) +void client_close(ObClient *self) { XEvent ce; - if (!(self->functions & Func_Close)) return; + if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return; /* XXX: itd be cool to do timeouts and shit here for killing the client's @@ -2034,60 +2228,74 @@ void client_close(Client *self) XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); } -void client_kill(Client *self) +void client_kill(ObClient *self) { XKillClient(ob_display, self->window); } -void client_set_desktop(Client *self, guint target, gboolean donthide) +void client_set_desktop_recursive(ObClient *self, + guint target, gboolean donthide) { guint old; + GSList *it; - if (target == self->desktop) return; - - g_message("Setting desktop %u", target+1); + if (target != self->desktop) { - g_assert(target < screen_num_desktops || target == DESKTOP_ALL); + ob_debug("Setting desktop %u\n", target+1); - /* remove from the old desktop(s) */ - focus_order_remove(self); + g_assert(target < screen_num_desktops || target == DESKTOP_ALL); - old = self->desktop; - self->desktop = target; - PROP_SET32(self->window, net_wm_desktop, cardinal, target); - /* the frame can display the current desktop state */ - frame_adjust_state(self->frame); - /* 'move' the window to the new desktop */ - if (!donthide) - client_showhide(self); - /* raise if it was not already on the desktop */ - if (old != DESKTOP_ALL) - stacking_raise(CLIENT_AS_WINDOW(self)); - screen_update_struts(); - - /* add to the new desktop(s) */ - if (config_focus_new) - focus_order_to_top(self); - else - focus_order_to_bottom(self); + /* remove from the old desktop(s) */ + focus_order_remove(self); + + old = self->desktop; + self->desktop = target; + PROP_SET32(self->window, net_wm_desktop, cardinal, target); + /* the frame can display the current desktop state */ + frame_adjust_state(self->frame); + /* 'move' the window to the new desktop */ + if (!donthide) + client_showhide(self); + /* raise if it was not already on the desktop */ + if (old != DESKTOP_ALL) + stacking_raise(CLIENT_AS_WINDOW(self)); + screen_update_areas(); + + /* add to the new desktop(s) */ + if (config_focus_new) + focus_order_to_top(self); + else + focus_order_to_bottom(self); + + dispatch_client(Event_Client_Desktop, self, target, old); + } - dispatch_client(Event_Client_Desktop, self, target, old); + /* move all transients */ + for (it = self->transients; it != NULL; it = it->next) + if (it->data != self) client_set_desktop_recursive(it->data, + target, donthide); +} + +void client_set_desktop(ObClient *self, guint target, gboolean donthide) +{ + client_set_desktop_recursive(client_search_top_transient(self), + target, donthide); } -Client *client_search_modal_child(Client *self) +ObClient *client_search_modal_child(ObClient *self) { GSList *it; - Client *ret; + ObClient *ret; for (it = self->transients; it != NULL; it = it->next) { - Client *c = it->data; + ObClient *c = it->data; if ((ret = client_search_modal_child(c))) return ret; if (c->modal) return c; } return NULL; } -gboolean client_validate(Client *self) +gboolean client_validate(ObClient *self) { XEvent e; @@ -2102,7 +2310,7 @@ gboolean client_validate(Client *self) return TRUE; } -void client_set_wm_state(Client *self, long state) +void client_set_wm_state(ObClient *self, long state) { if (state == self->wmstate) return; /* no change */ @@ -2116,7 +2324,7 @@ void client_set_wm_state(Client *self, long state) } } -void client_set_state(Client *self, Atom action, long data1, long data2) +void client_set_state(ObClient *self, Atom action, long data1, long data2) { gboolean shaded = self->shaded; gboolean fullscreen = self->fullscreen; @@ -2240,9 +2448,9 @@ void client_set_state(Client *self, Atom action, long data1, long data2) client_change_state(self); /* change the hint to reflect these changes */ } -Client *client_focus_target(Client *self) +ObClient *client_focus_target(ObClient *self) { - Client *child; + ObClient *child; /* if we have a modal child, then focus it, not us */ child = client_search_modal_child(self); @@ -2250,7 +2458,7 @@ Client *client_focus_target(Client *self) return self; } -gboolean client_can_focus(Client *self) +gboolean client_can_focus(ObClient *self) { XEvent ev; @@ -2287,7 +2495,7 @@ gboolean client_can_focus(Client *self) return TRUE; } -gboolean client_focus(Client *self) +gboolean client_focus(ObClient *self) { /* choose the correct target */ self = client_focus_target(self); @@ -2323,9 +2531,9 @@ gboolean client_focus(Client *self) } #ifdef DEBUG_FOCUS - g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"), - self->window, (int) - event_lasttime); + ob_debug("%sively focusing %lx at %d\n", + (self->can_focus ? "act" : "pass"), + self->window, (int) event_lasttime); #endif /* Cause the FocusIn to come back to us. Important for desktop switches, @@ -2335,22 +2543,28 @@ gboolean client_focus(Client *self) return TRUE; } -void client_unfocus(Client *self) +void client_unfocus(ObClient *self) { g_assert(focus_client == self); #ifdef DEBUG_FOCUS - g_message("client_unfocus for %lx", self->window); + ob_debug("client_unfocus for %lx\n", self->window); #endif - focus_fallback(Fallback_Unfocusing); + focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); } -void client_activate(Client *self) +void client_activate(ObClient *self, gboolean here) { if (client_normal(self) && screen_showing_desktop) screen_show_desktop(FALSE); if (self->iconic) - client_iconify(self, FALSE, TRUE); - else if (!self->frame->visible) + client_iconify(self, FALSE, FALSE); + if (self->desktop != DESKTOP_ALL && + self->desktop != screen_desktop) { + if (here) + client_set_desktop(self, screen_desktop, FALSE); + else + screen_set_desktop(self->desktop); + } else if (!self->frame->visible) /* if its not visible for other reasons, then don't mess with it */ return; @@ -2360,14 +2574,14 @@ void client_activate(Client *self) stacking_raise(CLIENT_AS_WINDOW(self)); } -gboolean client_focused(Client *self) +gboolean client_focused(ObClient *self) { return self == focus_client; } -Icon *client_icon(Client *self, int w, int h) +ObClientIcon *client_icon(ObClient *self, int w, int h) { - int i; + guint i; /* si is the smallest image >= req */ /* li is the largest image < req */ unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0; @@ -2391,13 +2605,13 @@ Icon *client_icon(Client *self, int w, int h) } /* this be mostly ripped from fvwm */ -Client *client_find_directional(Client *c, Direction dir) +ObClient *client_find_directional(ObClient *c, ObDirection dir) { int my_cx, my_cy, his_cx, his_cy; int offset = 0; int distance = 0; int score, best_score; - Client *best_client, *cur; + ObClient *best_client, *cur; GList *it; if(!client_list) @@ -2433,7 +2647,8 @@ Client *client_find_directional(Client *c, Direction dir) his_cy = (cur->frame->area.y - my_cy) + cur->frame->area.height / 2; - if(dir > 3) { + if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || + dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) { int tx; /* Rotate the diagonals 45 degrees counterclockwise. * To do this, multiply the matrix /+h +h\ with the @@ -2446,21 +2661,23 @@ Client *client_find_directional(Client *c, Direction dir) } switch(dir) { - case Direction_North : - case Direction_South : - case Direction_NorthEast : - case Direction_SouthWest : + case OB_DIRECTION_NORTH: + case OB_DIRECTION_SOUTH: + case OB_DIRECTION_NORTHEAST: + case OB_DIRECTION_SOUTHWEST: offset = (his_cx < 0) ? -his_cx : his_cx; - distance = (dir == Direction_North || dir == Direction_NorthEast) ? - -his_cy : his_cy; + distance = ((dir == OB_DIRECTION_NORTH || + dir == OB_DIRECTION_NORTHEAST) ? + -his_cy : his_cy); break; - case Direction_East : - case Direction_West : - case Direction_SouthEast : - case Direction_NorthWest : + case OB_DIRECTION_EAST: + case OB_DIRECTION_WEST: + case OB_DIRECTION_SOUTHEAST: + case OB_DIRECTION_NORTHWEST: offset = (his_cy < 0) ? -his_cy : his_cy; - distance = (dir == Direction_West || dir == Direction_NorthWest) ? - -his_cx : his_cx; + distance = ((dir == OB_DIRECTION_WEST || + dir == OB_DIRECTION_NORTHWEST) ? + -his_cx : his_cx); break; } @@ -2485,7 +2702,7 @@ Client *client_find_directional(Client *c, Direction dir) return best_client; } -void client_set_layer(Client *self, int layer) +void client_set_layer(ObClient *self, int layer) { if (layer < 0) { self->below = TRUE; @@ -2499,3 +2716,254 @@ void client_set_layer(Client *self, int layer) client_calc_layer(self); client_change_state(self); /* reflect this in the state hints */ } + +guint client_monitor(ObClient *self) +{ + guint i; + + for (i = 0; i < screen_num_monitors; ++i) { + Rect *area = screen_physical_area_monitor(i); + if (RECT_INTERSECTS_RECT(*area, self->frame->area)) + break; + } + if (i == screen_num_monitors) i = 0; + g_assert(i < screen_num_monitors); + return i; +} + +ObClient *client_search_top_transient(ObClient *self) +{ + /* move up the transient chain as far as possible */ + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) { + return client_search_top_transient(self->transient_for); + } else { + GSList *it; + + for (it = self->group->members; it; it = it->next) { + ObClient *c = it->data; + + /* checking transient_for prevents infinate loops! */ + if (c != self && !c->transient_for) + break; + } + if (it) + return it->data; + } + } + + return self; +} + +ObClient *client_search_transient(ObClient *self, ObClient *search) +{ + GSList *sit; + + for (sit = self->transients; sit; sit = g_slist_next(sit)) { + if (sit->data == search) + return search; + if (client_search_transient(sit->data, search)) + return search; + } + return NULL; +} + +gchar* client_get_sm_client_id(ObClient *self) +{ + gchar *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; +} + +/* finds the nearest edge in the given direction from the current client + * note to self: the edge is the -frame- edge (the actual one), not the + * client edge. + */ +int client_directional_edge_search(ObClient *c, ObDirection dir) +{ + int dest; + int my_edge_start, my_edge_end, my_offset; + GList *it; + Rect *a; + + if(!client_list) + return -1; + + a = screen_area(c->desktop); + + switch(dir) { + case OB_DIRECTION_NORTH: + my_edge_start = c->frame->area.x; + my_edge_end = c->frame->area.x + c->frame->area.width; + my_offset = c->frame->area.y; + + dest = a->y; /* default: top of screen */ + + for(it = g_list_first(client_list); it; it = it->next) { + int his_edge_start, his_edge_end, his_offset; + ObClient *cur = it->data; + + if(cur == c) + continue; + if(!client_normal(cur)) + continue; + if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + continue; + if(cur->iconic) + continue; + + his_edge_start = cur->frame->area.x; + his_edge_end = cur->frame->area.x + cur->frame->area.width; + his_offset = cur->frame->area.y + cur->frame->area.height; + + if(his_offset + 1 > my_offset) + continue; + + if(his_offset < dest) + continue; + + if(his_edge_start >= my_edge_start && + his_edge_start <= my_edge_end) + dest = his_offset; + + if(my_edge_start >= his_edge_start && + my_edge_start <= his_edge_end) + dest = his_offset; + + } + break; + case OB_DIRECTION_SOUTH: + my_edge_start = c->frame->area.x; + my_edge_end = c->frame->area.x + c->frame->area.width; + my_offset = c->frame->area.y + c->frame->area.height; + + dest = a->y + a->height; /* default: bottom of screen */ + + for(it = g_list_first(client_list); it; it = it->next) { + int his_edge_start, his_edge_end, his_offset; + ObClient *cur = it->data; + + if(cur == c) + continue; + if(!client_normal(cur)) + continue; + if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + continue; + if(cur->iconic) + continue; + + his_edge_start = cur->frame->area.x; + his_edge_end = cur->frame->area.x + cur->frame->area.width; + his_offset = cur->frame->area.y; + + + if(his_offset - 1 < my_offset) + continue; + + if(his_offset > dest) + continue; + + if(his_edge_start >= my_edge_start && + his_edge_start <= my_edge_end) + dest = his_offset; + + if(my_edge_start >= his_edge_start && + my_edge_start <= his_edge_end) + dest = his_offset; + + } + break; + case OB_DIRECTION_WEST: + my_edge_start = c->frame->area.y; + my_edge_end = c->frame->area.y + c->frame->area.height; + my_offset = c->frame->area.x; + + dest = a->x; /* default: leftmost egde of screen */ + + for(it = g_list_first(client_list); it; it = it->next) { + int his_edge_start, his_edge_end, his_offset; + ObClient *cur = it->data; + + if(cur == c) + continue; + if(!client_normal(cur)) + continue; + if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + continue; + if(cur->iconic) + continue; + + his_edge_start = cur->frame->area.y; + his_edge_end = cur->frame->area.y + cur->frame->area.height; + his_offset = cur->frame->area.x + cur->frame->area.width; + + if(his_offset + 1 > my_offset) + continue; + + if(his_offset < dest) + continue; + + if(his_edge_start >= my_edge_start && + his_edge_start <= my_edge_end) + dest = his_offset; + + if(my_edge_start >= his_edge_start && + my_edge_start <= his_edge_end) + dest = his_offset; + + + } + break; + case OB_DIRECTION_EAST: + my_edge_start = c->frame->area.y; + my_edge_end = c->frame->area.y + c->frame->area.height; + my_offset = c->frame->area.x + c->frame->area.width; + + dest = a->x + a->width; /* default: rightmost edge of screen */ + + for(it = g_list_first(client_list); it; it = it->next) { + int his_edge_start, his_edge_end, his_offset; + ObClient *cur = it->data; + + if(cur == c) + continue; + if(!client_normal(cur)) + continue; + if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + continue; + if(cur->iconic) + continue; + + his_edge_start = cur->frame->area.y; + his_edge_end = cur->frame->area.y + cur->frame->area.height; + his_offset = cur->frame->area.x; + + if(his_offset - 1 < my_offset) + continue; + + if(his_offset > dest) + continue; + + if(his_edge_start >= my_edge_start && + his_edge_start <= my_edge_end) + dest = his_offset; + + if(my_edge_start >= his_edge_start && + my_edge_start <= his_edge_end) + dest = his_offset; + + } + break; + case OB_DIRECTION_NORTHEAST: + case OB_DIRECTION_SOUTHEAST: + case OB_DIRECTION_NORTHWEST: + case OB_DIRECTION_SOUTHWEST: + /* not implemented */ + break; + default: + g_assert_not_reached(); + } + return dest; +}