#include "frame.h"
#include "engine.h"
#include "event.h"
+#include "grab.h"
#include "focus.h"
#include "stacking.h"
+#include "dispatch.h"
#include <glib.h>
#include <X11/Xutil.h>
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
-
- XGrabServer(ob_display);
- XSync(ob_display, FALSE);
+ guint i;
+
+ grab_server(TRUE);
/* check if it has already been unmapped by the time we started mapping
the grab does a sync so we don't have to here */
XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
XPutBackEvent(ob_display, &e);
- XUngrabServer(ob_display);
- XFlush(ob_display);
+ grab_server(FALSE);
return; /* don't manage it */
}
/* make sure it isn't an override-redirect window */
if (!XGetWindowAttributes(ob_display, window, &attrib) ||
attrib.override_redirect) {
- XUngrabServer(ob_display);
- XFlush(ob_display);
+ grab_server(FALSE);
return; /* don't manage it */
}
if ((wmhint->flags & StateHint) &&
wmhint->initial_state == WithdrawnState) {
/\* XXX: make dock apps work! *\/
- XUngrabServer(ob_display);
- XFlush(ob_display);
+ grab_server(FALSE);
XFree(wmhint);
return;
}
client_apply_startup_state(client);
- XUngrabServer(ob_display);
- XFlush(ob_display);
+ grab_server(FALSE);
client_list = g_slist_append(client_list, client);
stacking_list = g_list_append(stacking_list, client);
g_hash_table_insert(client_map, (gpointer)window, client);
+ /* update the focus lists */
+ if (client->desktop == DESKTOP_ALL) {
+ for (i = 0; i < screen_num_desktops; ++i)
+ focus_order[i] = g_list_append(focus_order[i], client);
+ } else {
+ i = client->desktop;
+ focus_order[i] = g_list_append(focus_order[i], client);
+ }
+
stacking_raise(client);
screen_update_struts();
- /*HOOKFIRECLIENT(managed, client);XXX*/
+ dispatch_client(Event_Client_New, client, 0, 0);
client_showhide(client);
- /* grab all mouse bindings */
- /*pointer_grab_all(client, TRUE);XXX*/
+ dispatch_client(Event_Client_Mapped, client, 0, 0);
/* update the list hints */
client_set_list();
void client_unmanage(Client *client)
{
+ guint i;
int j;
GSList *it;
g_message("Unmanaging window: %lx", client->window);
- /*HOOKFIRECLIENT(closed, client);XXX*/
+ dispatch_client(Event_Client_Destroy, client, 0, 0);
+ g_assert(client != NULL);
/* remove the window from our save set */
XChangeSaveSet(ob_display, client->window, SetModeDelete);
/* we dont want events no more */
XSelectInput(ob_display, client->window, NoEventMask);
- /* ungrab any mouse bindings */
- /*pointer_grab_all(client, FALSE);XXX*/
-
engine_frame_hide(client->frame);
+ /* dispatch the unmapped event */
+ dispatch_client(Event_Client_Unmapped, client, 0, 0);
+ g_assert(client != NULL);
+
/* give the client its border back */
client_toggle_border(client, TRUE);
/* reparent the window out of the frame, and free the frame */
engine_frame_release_client(client->frame, client);
+ client->frame = NULL;
client_list = g_slist_remove(client_list, client);
stacking_list = g_list_remove(stacking_list, client);
g_hash_table_remove(client_map, (gpointer)client->window);
+ /* update the focus lists */
+ if (client->desktop == DESKTOP_ALL) {
+ for (i = 0; i < screen_num_desktops; ++i)
+ focus_order[i] = g_list_remove(focus_order[i], client);
+ } else {
+ i = client->desktop;
+ focus_order[i] = g_list_remove(focus_order[i], client);
+ }
+
/* once the client is out of the list, update the struts to remove it's
influence */
screen_update_struts();
client_calc_layer(it->data);
}
- /* unfocus the client (calls the focus callbacks) (we're out of the
+ /* unfocus the client (dispatchs the focus event) (we're out of the
transient lists already, so being modal doesn't matter) */
- if (client->focused)
+ if (client_focused(client))
client_unfocus(client);
-
+
if (ob_state != State_Exiting) {
/* these values should not be persisted across a window
unmapping/mapping */
g_free(client->icons);
g_free(client->title);
g_free(client->icon_title);
- g_free(client->res_name);
- g_free(client->res_class);
+ g_free(client->name);
+ g_free(client->class);
g_free(client->role);
g_free(client);
/* defaults */
self->frame = NULL;
self->title = self->icon_title = NULL;
- self->res_name = self->res_class = self->role = NULL;
+ self->name = self->class = self->role = NULL;
self->wmstate = NormalState;
- self->focused = FALSE;
self->transient = FALSE;
self->transients = NULL;
self->transient_for = NULL;
client_change_allowed_actions(self);
if (self->frame) {
- /* change the decors on the frame */
- engine_frame_adjust_size(self->frame);
- /* with more/less decorations, we may need to be repositioned */
- engine_frame_adjust_position(self->frame);
+ /* change the decors on the frame, and with more/less decorations,
+ we may also need to be repositioned */
+ engine_frame_adjust_area(self->frame);
/* with new decor, the window's maximized size may change */
client_remaximize(self);
}
/* fire the urgent callback if we're mapped, otherwise, wait until
after we're mapped */
if (self->frame)
- /*HOOKFIRECLIENT(urgent, self)XXX*/;
+ dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
}
}
{
gchar *data = NULL;
- if (self->title != NULL)
- g_free(self->title);
+ g_free(self->title);
/* try netwm */
if (!PROP_GETS(self->window, net_wm_name, utf8, data)) {
{
gchar *data = NULL;
- if (self->icon_title != NULL)
- g_free(self->icon_title);
+ g_free(self->icon_title);
/* try netwm */
if (!PROP_GETS(self->window, net_wm_icon_name, utf8, data)) {
gchar *s;
guint i;
- if (self->res_name) g_free(self->res_name);
- if (self->res_class) g_free(self->res_class);
+ if (self->name) g_free(self->name);
+ if (self->class) g_free(self->class);
if (self->role) g_free(self->role);
- self->res_name = self->res_class = self->role = NULL;
+ self->name = self->class = self->role = NULL;
data = g_ptr_array_new();
if (PROP_GETSA(self->window, wm_class, string, data)) {
if (data->len > 0)
- self->res_name = g_strdup(g_ptr_array_index(data, 0));
+ self->name = g_strdup(g_ptr_array_index(data, 0));
if (data->len > 1)
- self->res_class = g_strdup(g_ptr_array_index(data, 1));
+ self->class = g_strdup(g_ptr_array_index(data, 1));
}
for (i = 0; i < data->len; ++i)
if (PROP_GETS(self->window, wm_window_role, string, s))
self->role = g_strdup(s);
- if (self->res_name == NULL) self->res_name = g_strdup("");
- if (self->res_class == NULL) self->res_class = g_strdup("");
+ if (self->name == NULL) self->name = g_strdup("");
+ if (self->class == NULL) self->class = g_strdup("");
if (self->role == NULL) self->role = g_strdup("");
}
Client *c = it->data;
if (c == skip) continue; /* circular? */
if ((ret = search_focus_tree(c, skip))) return ret;
- if (c->focused) return c;
+ if (client_focused(c)) return c;
}
return NULL;
}
engine_frame_show(self->frame);
else
engine_frame_hide(self->frame);
-
- /*HOOKFIRECLIENT(visible, self);XXX*/
}
gboolean client_normal(Client *self) {
client_shade(self, TRUE);
}
if (self->urgent)
- /*HOOKFIRECLIENT(urgent, self)XXX*/;
+ dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
if (self->max_vert && self->max_horz) {
self->max_vert = self->max_horz = FALSE;
{
gboolean moved = FALSE, resized = FALSE;
+ /* set the size and position if fullscreen */
+ if (self->fullscreen) {
+ x = 0;
+ y = 0;
+ w = screen_physical_size.width;
+ h = screen_physical_size.height;
+ } else {
+ /* 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)->x +
+ screen_area(self->desktop)->width;
+ }
+ if (self->max_vert) {
+ y = screen_area(self->desktop)->y;
+ h = screen_area(self->desktop)->y +
+ screen_area(self->desktop)->height -
+ self->frame->size.top - self->frame->size.bottom;
+ }
+ }
+
+ if (x == self->area.x && y == self->area.y && w == self->area.width &&
+ h == self->area.height)
+ return; /* no change */
+
w -= self->base_size.width;
h -= self->base_size.height;
/* move/resize the frame to match the request */
if (self->frame) {
- /* Adjust the size and then the position, as required by the EWMH */
- if (resized)
- engine_frame_adjust_size(self->frame);
- if (moved) {
- engine_frame_adjust_position(self->frame);
+ engine_frame_adjust_area(self->frame);
+ if (moved) {
if (!user || final) {
XEvent event;
event.type = ConfigureNotify;
void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
{
- static int saved_func, saved_decor;
int x, y, w, h;
if (!(self->functions & Func_Fullscreen) || /* can't */
if (fs) {
/* save the functions and remove them */
- saved_func = self->functions;
+ self->pre_fs_func = self->functions;
self->functions &= (Func_Close | Func_Fullscreen |
Func_Iconify);
/* save the decorations and remove them */
- saved_decor = self->decorations;
+ self->pre_fs_decor = self->decorations;
self->decorations = 0;
if (savearea) {
long dimensions[4];
PROP_SET32A(self->window, openbox_premax, cardinal,
dimensions, 4);
}
- x = 0;
- y = 0;
- w = screen_physical_size.width;
- h = screen_physical_size.height;
+
+ /* these are not actually used cuz client_configure will set them
+ as appropriate when the window is fullscreened */
+ x = y = w = h = 0;
} else {
long *dimensions;
- self->functions = saved_func;
- self->decorations = saved_decor;
+ self->functions = self->pre_fs_func;
+ self->decorations = self->pre_fs_decor;
if (PROP_GET32A(self->window, openbox_premax, cardinal,
dimensions, 4)) {
{
if (self->iconic == iconic) return; /* nothing to do */
- g_message("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+ g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
self->window);
self->iconic = iconic;
PROP_SET32A(self->window, openbox_premax, cardinal,
dimensions, 4);
}
- if (dir == 0 || dir == 1) { /* horz */
- x = screen_area(self->desktop)->x - self->frame->size.left;
- w = screen_area(self->desktop)->x +
- screen_area(self->desktop)->width;
- }
- if (dir == 0 || dir == 2) { /* vert */
- y = screen_area(self->desktop)->y;
- h = screen_area(self->desktop)->y +
- screen_area(self->desktop)->height -
- self->frame->size.top - self->frame->size.bottom;
- }
+
+ /* 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;
self->wmstate = shade ? IconicState : NormalState;
self->shaded = shade;
client_change_state(self);
- engine_frame_adjust_size(self->frame);
+ /* resize the frame to just the titlebar */
+ engine_frame_adjust_area(self->frame);
}
void client_close(Client *self)
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
-void client_set_desktop(Client *self, unsigned int target)
+void client_kill(Client *self)
{
+ XKillClient(ob_display, self->window);
+}
+
+void client_set_desktop(Client *self, guint target)
+{
+ guint old, i;
+
if (target == self->desktop) return;
g_message("Setting desktop %u\n", target);
- if (!(target < screen_num_desktops ||
- target == DESKTOP_ALL))
- return;
+ 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 */
/* 'move' the window to the new desktop */
client_showhide(self);
screen_update_struts();
+
+ /* update the focus lists */
+ if (old == DESKTOP_ALL) {
+ for (i = 0; i < screen_num_desktops; ++i)
+ focus_order[i] = g_list_remove(focus_order[i], self);
+ } else {
+ focus_order[old] = g_list_remove(focus_order[old], self);
+ }
+ if (target == DESKTOP_ALL) {
+ for (i = 0; i < screen_num_desktops; ++i)
+ focus_order[i] = g_list_prepend(focus_order[i], self);
+ } else {
+ focus_order[target] = g_list_prepend(focus_order[target], self);
+ }
+
+ dispatch_client(Event_Client_Desktop, self, target, old);
}
static Client *search_modal_tree(Client *node, Client *skip)
return FALSE;
}
}
-
+
+ if (client_focused(self))
+ return TRUE;
+
if (self->can_focus)
XSetInputFocus(ob_display, self->window, RevertToNone, CurrentTime);
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
- /*XSync(ob_display, FALSE); XXX Why sync? */
+ client_set_focused(self, TRUE);
+
+ /* XSync(ob_display, FALSE); XXX Why sync? */
return TRUE;
}
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
- focus_set_client(NULL);
+ client_set_focused(self, FALSE);
+}
+
+void client_set_focused(Client *self, gboolean focused)
+{
+ if (focused) {
+ if (focus_client != self) {
+ focus_set_client(self);
+
+ /* focus state can affect the stacking layer */
+ client_calc_layer(self);
+
+ engine_frame_adjust_focus(self->frame);
+ }
+ } else {
+ if (focus_client == self)
+ focus_set_client(NULL);
+
+ /* focus state can affect the stacking layer */
+ client_calc_layer(self);
+
+ if (self->frame != NULL) /* unfocus can happen while being unmanaged */
+ engine_frame_adjust_focus(self->frame);
+ }
+}
+
+gboolean client_focused(Client *self)
+{
+ return self == focus_client;
}
projects / chaz / openbox / blobdiff