#include "frame.h"
#include "engine.h"
#include "event.h"
+#include "grab.h"
#include "focus.h"
#include "stacking.h"
#include "dispatch.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();
dispatch_client(Event_Client_Mapped, client, 0, 0);
- /* grab all mouse bindings */
- /*pointer_grab_all(client, TRUE);XXX*/
-
/* update the list hints */
client_set_list();
void client_unmanage(Client *client)
{
+ guint i;
int j;
GSList *it;
/* 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);
+
/* give the client its border back */
client_toggle_border(client, TRUE);
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)
client_unfocus(client);
-
+
if (ob_state != State_Exiting) {
/* these values should not be persisted across a window
unmapping/mapping */
{
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;
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;
void client_set_desktop(Client *self, guint target)
{
- guint old;
+ 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;
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);
}
projects / chaz / openbox / blobdiff