/* -*- 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.
+
+ client.c for the Openbox window manager
+ Copyright (c) 2004 Mikael Magnusson
+ 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"
/*! The event mask to grab on client windows */
#define CLIENT_EVENTMASK (PropertyChangeMask | FocusChangeMask | \
- StructureNotifyMask)
+ StructureNotifyMask)
#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
- ButtonMotionMask)
+ ButtonMotionMask)
typedef struct
{
if (size > 0) {
windows = g_new(Window, size);
win_it = windows;
- for (it = client_list; it != NULL; it = it->next, ++win_it)
+ for (it = client_list; it; it = g_list_next(it), ++win_it)
*win_it = ((ObClient*)it->data)->window;
} else
windows = NULL;
PROP_SETA32(RootWindow(ob_display, ob_screen),
- net_client_list, window, (guint32*)windows, size);
+ net_client_list, window, (gulong*)windows, size);
if (windows)
g_free(windows);
}
/*
- void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data)
+ void client_foreach_transient(ObClient *self, ObClientForeachFunc func, gpointer data)
{
GSList *it;
- for (it = self->transients; it; it = it->next) {
+ for (it = self->transients; it; it = g_slist_next(it)) {
if (!func(it->data, data)) return;
client_foreach_transient(it->data, func, data);
}
}
- void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data)
+ void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, gpointer data)
{
if (self->transient_for) {
if (self->transient_for != OB_TRAN_GROUP) {
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (it->data != self &&
!((ObClient*)it->data)->transient_for) {
if (!func(it->data, data)) return;
void client_manage_all()
{
- unsigned int i, j, nchild;
+ guint i, j, nchild;
Window w, *children;
XWMHints *wmhints;
XWindowAttributes attrib;
XFree(children);
}
+/* This should possibly do something more interesting than just match
+ * against WM_CLASS literally. */
+static ObAppSettings *get_settings(ObClient *client)
+{
+ GSList *a = config_per_app_settings;
+
+ while (a) {
+ ObAppSettings *app = (ObAppSettings *) a->data;
+
+ if (
+ (app->name && !app->class && !strcmp(app->name, client->name))
+ || (app->class && !app->name && !strcmp(app->class, client->class))
+ || (app->class && app->name && !strcmp(app->class, client->class)
+ && !strcmp(app->name, client->name))
+ ) {
+ ob_debug("Window matching: %s\n", app->name);
+ /* Match if no role was specified in the per app setting, or if the string
+ * matches the beginning of the role, since apps like to set the role to
+ * things like browser-window-23c4b2f */
+ if (!app->role || !strncmp(app->role, client->role, strlen(app->role)))
+ return app;
+ }
+
+ a = a->next;
+ }
+ return NULL;
+}
+
void client_manage(Window window)
{
ObClient *self;
XSetWindowAttributes attrib_set;
XWMHints *wmhint;
gboolean activate = FALSE;
+ ObAppSettings *settings;
grab_server(TRUE);
sn_app_started(self->class);
+ /* update the focus lists, do this before the call to change_state or
+ it can end up in the list twice! */
+ focus_order_add_new(self);
+
client_change_state(self);
/* remove the client's border (and adjust re gravity) */
client_apply_startup_state(self);
- /* update the focus lists */
- focus_order_add_new(self);
+ /* get and set application level settings */
+ settings = get_settings(self);
+
+ if (settings) {
+ /* Don't worry, we won't actually both shade and undecorate the
+ * window when push comes to shove. */
+ if (settings->shade != -1)
+ client_shade(self, settings->shade);
+ if (settings->decor != -1)
+ client_set_undecorated(self, !settings->decor);
+ if (settings->iconic != -1)
+ client_iconify(self, settings->iconic, FALSE);
+ if (settings->skip_pager != -1) {
+ self->skip_pager = !!settings->skip_pager;
+ client_change_state(self);
+ }
+ if (settings->skip_taskbar != -1) {
+ self->skip_taskbar = !!settings->skip_taskbar;
+ client_change_state(self);
+ }
+
+ /* 1 && -1 shouldn't be possible by the code in config.c */
+ if (settings->max_vert == 1 && self->max_horz == 1)
+ client_maximize(self, TRUE, 0, TRUE);
+ else if (settings->max_vert == 0 && self->max_horz == 0)
+ client_maximize(self, FALSE, 0, TRUE);
+ else if (settings->max_vert == 1 && self->max_horz == 0) {
+ client_maximize(self, TRUE, 2, TRUE);
+ client_maximize(self, FALSE, 1, TRUE);
+ } else if (settings->max_vert == 0 && self->max_horz == 1) {
+ client_maximize(self, TRUE, 1, TRUE);
+ client_maximize(self, FALSE, 2, TRUE);
+ }
+
+ if (settings->fullscreen != -1)
+ client_fullscreen(self, !!settings->fullscreen, TRUE);
+
+ if (settings->desktop < screen_num_desktops)
+ client_set_desktop(self, settings->desktop, FALSE);
+
+ if (settings->layer > -2 && settings->layer < 2)
+ client_set_layer(self, settings->layer);
+
+ }
stacking_add(CLIENT_AS_WINDOW(self));
client_restore_session_stacking(self);
/* focus the new window? */
if (ob_state() != OB_STATE_STARTING &&
- (config_focus_new || client_search_focus_parent(self)) &&
+ (config_focus_new || client_search_focus_parent(self)) ||
+ (settings && settings->focus == TRUE) &&
/* 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 (self->group) {
GSList *it;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
{
if (client_focused(it->data))
{
}
if (ob_state() == OB_STATE_RUNNING) {
- int x = self->area.x, ox = x;
- int y = self->area.y, oy = y;
+ gint x = self->area.x, ox = x;
+ gint y = self->area.y, oy = y;
- place_client(self, &x, &y);
+ place_client(self, &x, &y, settings);
- /* make sure the window is visible */
+ /* make sure the window is visible. */
client_find_onscreen(self, &x, &y,
self->frame->area.width,
self->frame->area.height,
/* non-normal clients has less rules, and
- windows that are being restored from a session
- do also. we can assume you want it back where
- you saved it */
- client_normal(self) && !self->session);
-
- if (x != ox || y != oy)
+ windows that are being restored from a
+ session do also. we can assume you want
+ it back where you saved it. Clients saying
+ they placed themselves are subjected to
+ harder rules, ones that are placed by
+ place.c or by the user are allowed partially
+ off-screen and on xinerama divides (ie,
+ it is up to the placement routines to avoid
+ the xinerama divides) */
+ ((self->positioned & PPosition) &&
+ !(self->positioned & USPosition)) &&
+ client_normal(self) &&
+ !self->session);
+ if (x != ox || y != oy)
client_move(self, x, y);
}
+ keyboard_grab_for_client(self, TRUE);
+ mouse_grab_for_client(self, TRUE);
+
client_showhide(self);
/* use client_focus instead of client_activate cuz client_activate does
/* update the list hints */
client_set_list();
- keyboard_grab_for_client(self, TRUE);
- mouse_grab_for_client(self, TRUE);
-
ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
}
keyboard_grab_for_client(self, FALSE);
mouse_grab_for_client(self, FALSE);
+ /* potentially fix focusLast */
+ if (config_focus_last)
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+
/* remove the window from our save set */
XChangeSaveSet(ob_display, self->window, SetModeDelete);
/* tell our parent(s) that we're gone */
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
- GSList *it;
-
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (it->data != self)
((ObClient*)it->data)->transients =
g_slist_remove(((ObClient*)it->data)->transients, self);
}
/* tell our transients that we're gone */
- for (it = self->transients; it != NULL; it = it->next) {
+ for (it = self->transients; it; it = g_slist_next(it)) {
if (((ObClient*)it->data)->transient_for != OB_TRAN_GROUP) {
((ObClient*)it->data)->transient_for = NULL;
client_calc_layer(it->data);
/* update the list hints */
client_set_list();
+
+ if (config_focus_last)
+ grab_pointer(FALSE, OB_CURSOR_NONE);
}
static void client_urgent_notify(ObClient *self)
self->session = it->data;
RECT_SET_POINT(self->area, self->session->x, self->session->y);
- self->positioned = TRUE;
+ self->positioned = PPosition;
if (self->session->w > 0)
self->area.width = self->session->w;
if (self->session->h > 0)
void client_move_onscreen(ObClient *self, gboolean rude)
{
- int x = self->area.x;
- int y = self->area.y;
+ gint x = self->area.x;
+ gint y = self->area.y;
if (client_find_onscreen(self, &x, &y,
self->frame->area.width,
self->frame->area.height, rude)) {
}
}
-gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h,
+gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
gboolean rude)
{
Rect *a;
- int ox = *x, oy = *y;
+ gint 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);
+ /* This makes sure windows aren't entirely outside of the screen so you
+ * can't see them at all */
if (client_normal(self)) {
+ 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;
}
+ /* This here doesn't let windows even a pixel outside the screen,
+ * when called from client_manage, programs placing themselves are
+ * forced completely onscreen, while things like
+ * xterm -geometry resolution-width/2 will work fine. Trying to
+ * place it completely offscreen will be handled in the above code.
+ * Sorry for this confused comment, i am tired. */
if (rude) {
- /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good.
- Java can suck it too. */
-
+ /* avoid the xinerama monitor divide while we're at it,
+ * remember to fix the placement stuff to avoid it also and
+ * then remove this XXX */
+ a = screen_physical_area_monitor(client_monitor(self));
/* dont let windows map/move into the strut unless they
are bigger than the available area */
if (w <= a->width) {
different position.
when re-adding the border to the client, the same operation needs to be
reversed. */
- int oldx = self->area.x, oldy = self->area.y;
- int x = oldx, y = oldy;
+ gint oldx = self->area.x, oldy = self->area.y;
+ gint x = oldx, y = oldy;
switch(self->gravity) {
default:
case NorthWestGravity:
client_update_wmhints(self);
client_get_startup_id(self);
client_get_desktop(self);
- client_get_state(self);
client_get_shaped(self);
client_get_mwm_hints(self);
client_get_type(self);/* this can change the mwmhints for special cases */
+ /* The transient hint is used to pick a type, but the type can also affect
+ transiency (dialogs are always made transients). This is Havoc's idea,
+ but it is needed to make some apps work right (eg tsclient). */
+ client_update_transient_for(self);
+
+ client_get_state(self);
+
{
/* a couple type-based defaults for new windows */
/* this makes sure that these windows appear on all desktops */
if (self->type == OB_CLIENT_TYPE_DESKTOP)
self->desktop = DESKTOP_ALL;
-
- /* dock windows default to ABOVE */
- if (self->type == OB_CLIENT_TYPE_DOCK && !self->below)
- self->above = TRUE;
}
client_update_protocols(self);
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (it->data != self &&
!((ObClient*)it->data)->transient_for) {
self->desktop = ((ObClient*)it->data)->desktop;
for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
- if (c != self && !client_search_transient(self, c))
+ if (c != self && !client_search_transient(self, c) &&
+ client_normal(self) && client_normal(c))
{
layer = MAX(layer,
(c->above ? 1 : (c->below ? -1 : 0)));
self->shaped = FALSE;
#ifdef SHAPE
if (extensions_shape) {
- int foo;
+ gint foo;
guint ufoo;
- int s;
+ gint s;
XShapeSelectInput(ob_display, self->window, ShapeNotifyMask);
}
}
}
+ } else if (self->type == OB_CLIENT_TYPE_DIALOG && self->group) {
+ self->transient = TRUE;
+ target = OB_TRAN_GROUP;
} else
self->transient = FALSE;
void client_update_normal_hints(ObClient *self)
{
XSizeHints size;
- long ret;
- int oldgravity = self->gravity;
+ glong ret;
+ gint oldgravity = self->gravity;
/* defaults */
self->min_ratio = 0.0f;
/* normal windows can't request placement! har har
if (!client_normal(self))
*/
- self->positioned = !!(size.flags & (PPosition|USPosition));
+ self->positioned = (size.flags & (PPosition|USPosition));
if (size.flags & PWinGravity) {
self->gravity = size.win_gravity;
if (size.flags & PAspect) {
if (size.min_aspect.y)
- self->min_ratio = (float)size.min_aspect.x / size.min_aspect.y;
+ self->min_ratio =
+ (gfloat) size.min_aspect.x / size.min_aspect.y;
if (size.max_aspect.y)
- self->max_ratio = (float)size.max_aspect.x / size.max_aspect.y;
+ self->max_ratio =
+ (gfloat) size.max_aspect.x / size.max_aspect.y;
}
if (size.flags & PMinSize)
(self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
/* if the mwm hints request no handle or title, then all
decorations are disabled */
- self->decorations = 0;
+ self->decorations = config_theme_keepborder ? OB_FRAME_DECOR_BORDER : 0;
}
}
/* dont let mwm hints kill the close button
if (! (self->mwmhints.functions & MwmFunc_Close))
self->functions &= ~OB_CLIENT_FUNC_CLOSE; */
- }
+ }
}
if (!(self->functions & OB_CLIENT_FUNC_SHADE))
/* finally, the user can have requested no decorations, which overrides
everything (but doesnt give it a border if it doesnt have one) */
- if (self->undecorated)
- self->decorations &= OB_FRAME_DECOR_BORDER;
+ if (self->undecorated) {
+ if (config_theme_keepborder)
+ self->decorations &= OB_FRAME_DECOR_BORDER;
+ else
+ self->decorations = 0;
+ }
/* if we don't have a titlebar, then we cannot shade! */
if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
static void client_change_allowed_actions(ObClient *self)
{
- guint32 actions[9];
- int num = 0;
+ gulong actions[9];
+ gint num = 0;
/* desktop windows are kept on all desktops */
if (self->type != OB_CLIENT_TYPE_DESKTOP)
/* remove from the old group if there was one */
if (self->group != NULL) {
/* remove transients of the group */
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
self->transients = g_slist_remove(self->transients,
it->data);
/* remove myself from parents in the group */
if (self->transient_for == OB_TRAN_GROUP) {
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it;
+ it = g_slist_next(it))
+ {
ObClient *c = it->data;
if (c != self && !c->transient_for)
if (!self->transient_for) {
/* add other transients of the group that are already
set up */
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it;
+ it = g_slist_next(it))
+ {
ObClient *c = it->data;
if (c != self && c->transient_for == OB_TRAN_GROUP)
self->transients =
old_title = self->title;
/* try netwm */
- if (!PROP_GETS(self->window, net_wm_name, utf8, &data))
+ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) {
/* try old x stuff */
- if (!PROP_GETS(self->window, wm_name, locale, &data))
- data = g_strdup("Unnamed Window");
+ if (!PROP_GETS(self->window, wm_name, locale, &data)) {
+ // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
+ if (self->transient) {
+ data = g_strdup("");
+ goto no_number;
+ } else
+ data = g_strdup("Unnamed Window");
+ }
+ }
/* did the title change? then reset the title_count */
if (old_title && 0 != strncmp(old_title, data, strlen(data)))
/* look for duplicates and append a number */
nums = 0;
- for (it = client_list; it; it = it->next)
+ for (it = client_list; it; it = g_list_next(it))
if (it->data != self) {
ObClient *c = it->data;
if (0 == strncmp(c->title, data, strlen(data)))
}
/* dont display the number for the first window */
if (self->title_count > 1) {
- char *ndata;
+ gchar *ndata;
ndata = g_strdup_printf("%s - [%u]", data, self->title_count);
g_free(data);
data = ndata;
}
PROP_SETS(self->window, net_wm_visible_name, data);
-
+no_number:
self->title = data;
if (self->frame)
/* append the title count, dont display the number for the first window */
if (read_title && self->title_count > 1) {
- char *vdata, *ndata;
+ gchar *vdata, *ndata;
ndata = g_strdup_printf(" - [%u]", self->title_count);
vdata = g_strconcat(data, ndata, NULL);
g_free(ndata);
void client_update_class(ObClient *self)
{
- char **data;
- char *s;
+ gchar **data;
+ gchar *s;
if (self->name) g_free(self->name);
if (self->class) g_free(self->class);
static void client_change_state(ObClient *self)
{
- guint32 state[2];
- guint32 netstate[11];
+ gulong state[2];
+ gulong netstate[11];
guint num;
state[0] = self->wmstate;
GSList *it;
ObClient *ret;
- for (it = self->transients; it != NULL; it = it->next) {
+ for (it = self->transients; it; it = g_slist_next(it)) {
if (client_focused(it->data)) return it->data;
if ((ret = client_search_focus_tree(it->data))) return ret;
}
GSList *it;
gboolean recursed = FALSE;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (!((ObClient*)it->data)->transient_for) {
ObClient *c;
if ((c = client_search_focus_tree_full(it->data)))
else if (self->type == OB_CLIENT_TYPE_DESKTOP)
l = OB_STACKING_LAYER_DESKTOP;
else if (self->type == OB_CLIENT_TYPE_DOCK) {
- if (self->above) l = OB_STACKING_LAYER_DOCK_ABOVE;
- else if (self->below) l = OB_STACKING_LAYER_DOCK_BELOW;
- else l = OB_STACKING_LAYER_NORMAL;
+ if (self->below) l = OB_STACKING_LAYER_NORMAL;
+ else l = OB_STACKING_LAYER_ABOVE;
}
else if (self->above) l = OB_STACKING_LAYER_ABOVE;
else if (self->below) l = OB_STACKING_LAYER_BELOW;
own = calc_layer(self);
self->layer = l > own ? l : own;
- for (it = self->transients; it; it = it->next)
+ for (it = self->transients; it; it = g_slist_next(it))
client_calc_layer_recursive(it->data, orig,
l, raised ? raised : l != old);
}
void client_configure_full(ObClient *self, ObCorner anchor,
- int x, int y, int w, int h,
+ gint x, gint y, gint w, gint h,
gboolean user, gboolean final,
gboolean force_reply)
{
/* set the size and position if fullscreen */
if (self->fullscreen) {
-#ifdef VIDMODE
- int dot;
- XF86VidModeModeLine mode;
-#endif
Rect *a;
guint i;
i = client_monitor(self);
a = screen_physical_area_monitor(i);
-#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
-#endif
- {
- x = a->x;
- y = a->y;
- w = a->width;
- h = a->height;
- }
+ x = a->x;
+ y = a->y;
+ w = a->width;
+ h = a->height;
user = FALSE; /* ignore that increment etc shit when in fullscreen */
} else {
}
if (!(w == self->area.width && h == self->area.height)) {
- int basew, baseh, minw, minh;
+ gint basew, baseh, minw, minh;
/* base size is substituted with min size if not specified */
if (self->base_size.width || self->base_size.height) {
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->fullscreen) {
+ if (self->min_ratio)
+ if (h * self->min_ratio > w) {
+ h = (gint)(w / self->min_ratio);
- /* you cannot resize to nothing */
- if (h < 1) {
- h = 1;
- w = (int)(h * self->min_ratio);
+ /* you cannot resize to nothing */
+ if (h < 1) {
+ h = 1;
+ w = (gint)(h * self->min_ratio);
+ }
}
- }
- if (self->max_ratio)
- if (h * self->max_ratio < w) {
- h = (int)(w / self->max_ratio);
-
- /* you cannot resize to nothing */
- if (h < 1) {
- h = 1;
- w = (int)(h * self->min_ratio);
+ if (self->max_ratio)
+ if (h * self->max_ratio < w) {
+ h = (gint)(w / self->max_ratio);
+
+ /* you cannot resize to nothing */
+ if (h < 1) {
+ h = 1;
+ w = (gint)(h * self->min_ratio);
+ }
}
- }
+ }
w += self->base_size.width;
h += self->base_size.height;
resizing in redraw mode */
send_resize_client = ((!user && resized) ||
(user && (final ||
- (resized && config_redraw_resize))));
+ (resized && config_resize_redraw))));
- /* if the client is enlarging, the resize the client before the frame */
+ /* if the client is enlarging, then 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));
void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
{
- int x, y, w, h;
+ gint x, y, w, h;
if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) || /* can't */
self->fullscreen == fs) return; /* already done */
if (iconic) {
if (self->functions & OB_CLIENT_FUNC_ICONIFY) {
- long old;
+ glong old;
old = self->wmstate;
self->wmstate = IconicState;
changed = TRUE;
}
} else {
- long old;
+ glong old;
if (curdesk)
client_set_desktop(self, screen_desktop, FALSE);
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;
}
}
}
/* iconify all transients */
- for (it = self->transients; it != NULL; it = it->next)
+ for (it = self->transients; it; it = g_slist_next(it))
if (it->data != self) client_iconify_recursive(it->data,
iconic, curdesk);
}
iconic, curdesk);
}
-void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
+void client_maximize(ObClient *self, gboolean max, gint dir, gboolean savearea)
{
- int x, y, w, h;
+ gint x, y, w, h;
g_assert(dir == 0 || dir == 1 || dir == 2);
if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */
/* when we're iconic, don't change the wmstate */
if (!self->iconic) {
- long old;
+ glong old;
old = self->wmstate;
self->wmstate = shade ? IconicState : NormalState;
}
/* move all transients */
- for (it = self->transients; it != NULL; it = it->next)
+ for (it = self->transients; it; it = g_slist_next(it))
if (it->data != self) client_set_desktop_recursive(it->data,
target, donthide);
}
GSList *it;
ObClient *ret;
- for (it = self->transients; it != NULL; it = it->next) {
+ for (it = self->transients; it; it = g_slist_next(it)) {
ObClient *c = it->data;
if ((ret = client_search_modal_child(c))) return ret;
if (c->modal) return c;
return TRUE;
}
-void client_set_wm_state(ObClient *self, long state)
+void client_set_wm_state(ObClient *self, glong state)
{
if (state == self->wmstate) return; /* no change */
}
}
-void client_set_state(ObClient *self, Atom action, long data1, long data2)
+void client_set_state(ObClient *self, Atom action, glong data1, glong data2)
{
gboolean shaded = self->shaded;
gboolean fullscreen = self->fullscreen;
gboolean max_horz = self->max_horz;
gboolean max_vert = self->max_vert;
gboolean modal = self->modal;
- int i;
+ gboolean iconic = self->iconic;
+ gint i;
if (!(action == prop_atoms.net_wm_state_add ||
action == prop_atoms.net_wm_state_remove ||
action = self->skip_pager ?
prop_atoms.net_wm_state_remove :
prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_hidden)
+ action = self->iconic ?
+ 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 :
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_hidden) {
+ iconic = TRUE;
} else if (state == prop_atoms.net_wm_state_fullscreen) {
fullscreen = TRUE;
} else if (state == prop_atoms.net_wm_state_above) {
self->above = TRUE;
+ self->below = FALSE;
} else if (state == prop_atoms.net_wm_state_below) {
+ self->above = FALSE;
self->below = TRUE;
} else if (state == prop_atoms.ob_wm_state_undecorated) {
undecorated = TRUE;
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_hidden) {
+ iconic = FALSE;
} else if (state == prop_atoms.net_wm_state_fullscreen) {
fullscreen = FALSE;
} else if (state == prop_atoms.net_wm_state_above) {
transients needs to change */
client_raise(self);
}
+ if (iconic != self->iconic)
+ client_iconify(self, iconic, FALSE);
+
client_calc_layer(self);
client_change_state(self); /* change the hint to reflect these changes */
}
#ifdef DEBUG_FOCUS
ob_debug("%sively focusing %lx at %d\n",
(self->can_focus ? "act" : "pass"),
- self->window, (int) event_lasttime);
+ self->window, (gint) event_lasttime);
#endif
/* Cause the FocusIn to come back to us. Important for desktop switches,
void client_activate(ObClient *self, gboolean here)
{
+ /* This check is for the client_list_menu trying to activate
+ * a closed client. */
+ if (!g_list_find(client_list, self)) return;
if (client_normal(self) && screen_showing_desktop)
screen_show_desktop(FALSE);
if (self->iconic)
void client_lower(ObClient *self)
{
- action_run_string("Raise", self);
+ action_run_string("Lower", self);
}
gboolean client_focused(ObClient *self)
return self == focus_client;
}
-static ObClientIcon* client_icon_recursive(ObClient *self, int w, int h)
+static ObClientIcon* client_icon_recursive(ObClient *self, gint w, gint h)
{
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;
+ gulong size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
if (!self->nicons) {
ObClientIcon *parent = NULL;
return &self->icons[li];
}
-const ObClientIcon* client_icon(ObClient *self, int w, int h)
+const ObClientIcon* client_icon(ObClient *self, gint w, gint h)
{
ObClientIcon *ret;
static ObClientIcon deficon;
/* this be mostly ripped from fvwm */
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;
+ gint my_cx, my_cy, his_cx, his_cy;
+ gint offset = 0;
+ gint distance = 0;
+ gint score, best_score;
ObClient *best_client, *cur;
GList *it;
best_score = -1;
best_client = NULL;
- for(it = g_list_first(client_list); it; it = it->next) {
+ for(it = g_list_first(client_list); it; it = g_list_next(it)) {
cur = it->data;
/* the currently selected window isn't interesting */
continue;
if (!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ /* using c->desktop instead of screen_desktop doesn't work if the
+ * current window was omnipresent, hope this doesn't have any other
+ * side effects */
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST ||
dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) {
- int tx;
+ gint tx;
/* Rotate the diagonals 45 degrees counterclockwise.
* To do this, multiply the matrix /+h +h\ with the
* vector (x y). \-h +h/
return best_client;
}
-void client_set_layer(ObClient *self, int layer)
+void client_set_layer(ObClient *self, gint layer)
{
if (layer < 0) {
self->below = TRUE;
if (self->undecorated != undecorated) {
self->undecorated = undecorated;
client_setup_decor_and_functions(self);
+ /* Make sure the client knows it might have moved. Maybe there is a
+ * better way of doing this so only one client_configure is sent, but
+ * since 125 of these are sent per second when moving the window (with
+ * user = FALSE) i doubt it matters much.
+ */
+ client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y,
+ self->area.width, self->area.height, TRUE, TRUE);
client_change_state(self); /* reflect this in the state hints */
}
}
+/* Determines which physical monitor a client is on by calculating the
+ area of the part of the client on each monitor. The number of the
+ monitor containing the greatest area of the client is returned.*/
guint client_monitor(ObClient *self)
{
guint i;
g_assert(self->group);
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
/* checking transient_for prevents infinate loops! */
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
/* checking transient_for prevents infinate loops! */
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
/* checking transient_for prevents infinate loops! */
* 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)
+gint client_directional_edge_search(ObClient *c, ObDirection dir)
{
- int dest;
- int my_edge_start, my_edge_end, my_offset;
+ gint dest, monitor_dest;
+ gint my_edge_start, my_edge_end, my_offset;
GList *it;
- Rect *a;
+ Rect *a, *monitor;
if(!client_list)
return -1;
a = screen_area(c->desktop);
+ monitor = screen_area_monitor(c->desktop, client_monitor(c));
switch(dir) {
case OB_DIRECTION_NORTH:
/* default: top of screen */
dest = a->y;
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ monitor_dest = monitor->y;
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset > monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint 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)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
+ if(cur->layer < c->layer && !config_resist_layers_below)
+ continue;
his_edge_start = cur->frame->area.x;
his_edge_end = cur->frame->area.x + cur->frame->area.width;
/* default: bottom of screen */
dest = a->y + a->height;
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ monitor_dest = monitor->y + monitor->height;
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset < monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint 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)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
+ if(cur->layer < c->layer && !config_resist_layers_below)
+ continue;
his_edge_start = cur->frame->area.x;
his_edge_end = cur->frame->area.x + cur->frame->area.width;
/* default: leftmost egde of screen */
dest = a->x;
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ monitor_dest = monitor->x;
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset > monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint 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)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
+ if(cur->layer < c->layer && !config_resist_layers_below)
+ continue;
his_edge_start = cur->frame->area.y;
his_edge_end = cur->frame->area.y + cur->frame->area.height;
/* default: rightmost edge of screen */
dest = a->x + a->width;
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ monitor_dest = monitor->x + monitor->width;
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset < monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint 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)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
+ if(cur->layer < c->layer && !config_resist_layers_below)
+ continue;
his_edge_start = cur->frame->area.y;
his_edge_end = cur->frame->area.y + cur->frame->area.height;
/* not implemented */
default:
g_assert_not_reached();
+ dest = 0; /* suppress warning */
}
return dest;
}
ObClient* client_under_pointer()
{
- int x, y;
+ gint x, y;
GList *it;
ObClient *ret = NULL;
if (screen_pointer_pos(&x, &y)) {
- for (it = stacking_list; it != NULL; it = it->next) {
+ for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = WINDOW_AS_CLIENT(it->data);
if (c->frame->visible &&
projects / mikachu / openbox.git / blobdiff