if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
XPutBackEvent(ob_display, &e);
-
+
grab_server(FALSE);
return; /* don't manage it */
}
client_list = g_slist_append(client_list, client);
stacking_list = g_list_append(stacking_list, client);
+ g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window));
g_hash_table_insert(client_map, (gpointer)window, client);
/* update the focus lists */
g_message("Unmanaging window: %lx", client->window);
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);
/* 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);
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->transient = FALSE;
self->transients = NULL;
if (c != self->transient_for) {
if (self->transient_for)
/* remove from old parent */
- g_slist_remove(self->transient_for->transients, self);
+ self->transient_for->transients =
+ g_slist_remove(self->transient_for->transients, self);
self->transient_for = c;
if (self->transient_for)
/* add to new parent */
- g_slist_append(self->transient_for->transients, self);
+ self->transient_for->transients =
+ g_slist_append(self->transient_for->transients, self);
}
}
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("");
}
GSList *it;
Client *ret;
- for (it = node->transients; it != NULL; it = g_slist_next(it)) {
+ for (it = node->transients; it != NULL; it = it->next) {
Client *c = it->data;
if (c == skip) continue; /* circular? */
if ((ret = search_focus_tree(c, skip))) return ret;
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
+void client_kill(Client *self)
+{
+ XKillClient(ob_display, self->window);
+}
+
void client_set_desktop(Client *self, guint target)
{
guint old, i;
if (old == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
focus_order[i] = g_list_remove(focus_order[i], self);
+ focus_order[target] = g_list_prepend(focus_order[target], 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);
+ if (target == DESKTOP_ALL)
+ for (i = 0; i < screen_num_desktops; ++i)
+ focus_order[i] = g_list_prepend(focus_order[i], self);
}
dispatch_client(Event_Client_Desktop, self, target, old);