#include "screen.h"
#include "prop.h"
#include "extensions.h"
-#include "config.h"
#include "frame.h"
#include "engine.h"
#include "event.h"
#include "focus.h"
#include "stacking.h"
#include "dispatch.h"
+#include "group.h"
#include <glib.h>
#include <X11/Xutil.h>
#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask)
-GSList *client_list = NULL;
+GList *client_list = NULL;
GHashTable *client_map = NULL;
static Window *client_startup_stack_order = NULL;
void client_set_list()
{
Window *windows, *win_it;
- GSList *it;
- guint size = g_slist_length(client_list);
+ GList *it;
+ guint size = g_list_length(client_list);
/* create an array of the window ids */
if (size > 0) {
void client_manage_all()
{
- ConfigValue focus_new;
unsigned int i, j, nchild;
Window w, *children;
XWMHints *wmhints;
w = client_startup_stack_order[i-1];
c = g_hash_table_lookup(client_map, &w);
- g_message("0x%lx %d %d", c->window, c->iconic, c->shaded);
if (c) stacking_lower(c);
}
g_free(client_startup_stack_order);
client_startup_stack_order = NULL;
client_startup_stack_size = 0;
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
- if (focus_new.bool)
+ if (focus_new)
focus_fallback(FALSE);
}
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
guint i;
- ConfigValue focus_new;
grab_server(TRUE);
grab_server(FALSE);
- client_list = g_slist_append(client_list, client);
+ client_list = g_list_append(client_list, client);
stacking_list = g_list_append(stacking_list, client);
g_assert(!g_hash_table_lookup(client_map, &client->window));
g_hash_table_insert(client_map, &client->window, client);
dispatch_client(Event_Client_Mapped, client, 0, 0);
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
- if (ob_state != State_Starting && focus_new.bool)
+ if (ob_state != State_Starting && focus_new)
client_focus(client);
/* update the list hints */
engine_frame_hide(client->frame);
- client_list = g_slist_remove(client_list, client);
+ client_list = g_list_remove(client_list, client);
stacking_list = g_list_remove(stacking_list, client);
g_hash_table_remove(client_map, &client->window);
XMapWindow(ob_display, client->window);
}
+ /* remoev from its group */
+ if (client->group)
+ group_remove(client->group, client);
+
/* free all data allocated in the client struct */
g_slist_free(client->transients);
for (j = 0; j < client->nicons; ++j)
self->urgent = FALSE;
self->positioned = FALSE;
self->disabled_decorations = 0;
- self->group = None;
+ self->group = NULL;
self->nicons = 0;
client_get_area(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;
{
/* start with everything (cept fullscreen) */
self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
- Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
+ Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize |
+ Decor_Shade;
self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
Func_Shade;
if (self->delete_window) {
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;
ur = TRUE;
if (hints->flags & WindowGroupHint) {
- if (hints->window_group != self->group) {
- /* XXX: remove from the old group if there was one */
- self->group = hints->window_group;
- /* XXX: do stuff with the group */
+ if (hints->window_group !=
+ (self->group ? self->group->leader : None)) {
+ /* remove from the old group if there was one */
+ if (self->group != NULL)
+ group_remove(self->group, self);
+ self->group = group_add(hints->window_group, self);
}
} else /* no group! */
self->group = None;
{
gboolean moved = FALSE, resized = FALSE;
+ /* gets the frame's position */
+ frame_client_gravity(self->frame, &x, &y);
+
+ /* these positions are frame positions, not client positions */
+
/* set the size and position if fullscreen */
if (self->fullscreen) {
x = 0;
}
}
+ /* gets the client's position */
+ frame_frame_gravity(self->frame, &x, &y);
+
/* these override the above states! if you cant move you can't move! */
if (user) {
if (!(self->functions & Func_Move)) {
dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped,
self, 0, 0);
+
+ /* iconify all transients */
+ if (self->transients) {
+ GSList *it;
+
+ for (it = self->transients; it != NULL; it = it->next)
+ if (it->data != self) client_iconify(it->data, iconic, curdesk);
+ }
}
void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
PROP_SET32A(self->window, openbox_premax, cardinal,
dimensions, 4);
}
-
- /* pass the client's current position info. the client_configure
- will move/size stuff as appropriate for a maximized window */
- x = self->area.x;
- y = self->area.y;
- w = self->area.width;
- h = self->area.height;
} else {
long *dimensions;
void client_shade(Client *self, gboolean shade)
{
- if (!(self->functions & Func_Shade) || /* can't */
+ if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
self->shaded == shade) return; /* already done */
/* when we're iconic, don't change the wmstate */
void client_set_desktop(Client *self, guint target, gboolean donthide)
{
guint old, i;
- ConfigValue focus_new;
if (target == self->desktop) return;
/* 'move' the window to the new desktop */
if (!donthide)
client_showhide(self);
- stacking_raise(self);
+ /* raise if it was not already on the desktop */
+ if (old != DESKTOP_ALL)
+ stacking_raise(self);
screen_update_struts();
/* update the focus lists */
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
if (old == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
focus_order[i] = g_list_remove(focus_order[i], self);
focus_order[old] = g_list_remove(focus_order[old], self);
if (target == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i) {
- if (focus_new.bool)
+ if (focus_new)
focus_order[i] = g_list_prepend(focus_order[i], self);
else
focus_order[i] = g_list_append(focus_order[i], self);
}
} else {
- if (focus_new.bool)
+ if (focus_new)
focus_order[target] = g_list_prepend(focus_order[target], self);
else
focus_order[target] = g_list_append(focus_order[target], self);
client_change_state(self); /* change the hint to relect these changes */
}
-gboolean client_focus(Client *self)
+Client *client_focus_target(Client *self)
{
- XEvent ev;
Client *child;
/* if we have a modal child, then focus it, not us */
child = client_find_modal_child(self);
- if (child)
- return client_focus(child);
+ if (child) return child;
+ return self;
+}
+gboolean client_focusable(Client *self)
+{
/* won't try focus if the client doesn't want it, or if the window isn't
visible on the screen */
- if (!(self->frame->visible &&
- (self->can_focus || self->focus_notify)))
+ return self->frame->visible &&
+ (self->can_focus || self->focus_notify);
+}
+
+gboolean client_focus(Client *self)
+{
+ XEvent ev;
+
+ /* choose the correct target */
+ self = client_focus_target(self);
+
+ if (!client_focusable(self))
return FALSE;
/* do a check to see if the window has already been unmapped or destroyed
}
if (self->can_focus)
- /* RevertToNone is used so that windows dont get focused inadvertantly
- by having the pointer in them, and then FocusIn events go missing */
- XSetInputFocus(ob_display, self->window, RevertToNone,
+ /* RevertToPointerRoot causes much more headache than TevertToNone, so
+ I choose to use it always, hopefully to find errors quicker, if any
+ are left. (I hate X. I hate focus events.) */
+ XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
event_lasttime);
if (self->focus_notify) {
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
+ g_message("client_unfocus");
focus_fallback(FALSE);
}
projects / chaz / openbox / blobdiff