#include "frame.h"
#include "engine.h"
#include "event.h"
+#include "grab.h"
#include "focus.h"
#include "stacking.h"
-#include "pointer.h"
-#include "hooks.h"
-#include "openboxwrap.h"
-#include "clientwrap.h"
+#include "dispatch.h"
+#include <glib.h>
#include <X11/Xutil.h>
/*! The event mask to grab on client windows */
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 Client *search_focus_tree(Client *node, Client *skip);
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
- PyObject *cw;
-
- XGrabServer(ob_display);
- XSync(ob_display, FALSE);
+
+ 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);
screen_update_struts();
- /* add to the python list */
- cw = clientwrap_new(client);
- PyList_Append(openboxwrap_obj->client_list, cw);
- Py_DECREF(cw);
-
- HOOKFIRECLIENT(managed, client);
+ dispatch_client(Event_Client_New, client, 0, 0);
client_showhide(client);
+ dispatch_client(Event_Client_Mapped, client, 0, 0);
+
/* grab all mouse bindings */
- pointer_grab_all(client, TRUE);
+ /*pointer_grab_all(client, TRUE);XXX*/
/* update the list hints */
client_set_list();
void client_unmanage(Client *client)
{
- int j, seq;
- PyObject *cw;
+ guint i;
+ int j;
GSList *it;
g_message("Unmanaging window: %lx", client->window);
- HOOKFIRECLIENT(closed, client);
+ dispatch_client(Event_Client_Destroy, client, 0, 0);
/* remove the window from our save set */
XChangeSaveSet(ob_display, client->window, SetModeDelete);
XSelectInput(ob_display, client->window, NoEventMask);
/* ungrab any mouse bindings */
- pointer_grab_all(client, FALSE);
+ /*pointer_grab_all(client, FALSE);XXX*/
engine_frame_hide(client->frame);
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();
- /* remove from the python list */
- cw = clientwrap_new(client);
- seq = PySequence_Index(openboxwrap_obj->client_list, cw);
- if (seq == -1)
- PyErr_Clear();
- else
- PySequence_DelItem(openboxwrap_obj->client_list, seq);
- Py_DECREF(cw);
-
- /* notify the wrapper that its useless now */
- if (client->wrap != NULL)
- client->wrap->client = NULL;
-
/* tell our parent that we're gone */
if (client->transient_for != NULL)
client->transient_for->transients =
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);
self->disabled_decorations = 0;
self->group = None;
self->nicons = 0;
- self->wrap = NULL;
client_get_area(self);
client_get_desktop(self);
/* fire the urgent callback if we're mapped, otherwise, wait until
after we're mapped */
if (self->frame)
- HOOKFIRECLIENT(urgent, self);
+ dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
}
}
return TRUE;
}
-void client_showhide(Client *self)
+static void client_showhide(Client *self)
{
if (client_should_show(self))
engine_frame_show(self->frame);
else
engine_frame_hide(self->frame);
-
- HOOKFIRECLIENT(visible, self);
}
gboolean client_normal(Client *self) {
client_shade(self, TRUE);
}
if (self->urgent)
- HOOKFIRECLIENT(urgent, self);
+ dispatch_client(Event_Client_Urgent, self, self->urgent, 0);
if (self->max_vert && self->max_horz) {
self->max_vert = self->max_horz = FALSE;
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
-void client_set_desktop(Client *self, unsigned int target)
+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)
projects / chaz / openbox / blobdiff