nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more reformatting

This commit is contained in:
Michael Stapelberg 2010-04-13 16:48:42 +02:00
parent 4206db2839
commit bcfb0d2505
2 changed files with 133 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
src/manage.c
View File

@ -1,51 +1,45 @@
/* /*
* vim:ts=8:expandtab * vim:ts=4:sw=4:expandtab
* *
* i3 - an improved dynamic tiling window manager * i3 - an improved dynamic tiling window manager
* © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
* *
* © 2009-2010 Michael Stapelberg and contributors * manage.c: Contains all functions for initially managing new windows
* * (or existing ones on restart).
* See file LICENSE for license information.
*
* src/manage.c: Contains all functions for initially managing new windows
* (or existing ones on restart).
* *
*/ */
#include "all.h" #include "all.h"
extern struct Con *focused;
/* /*
* Go through all existing windows (if the window manager is restarted) and manage them * Go through all existing windows (if the window manager is restarted) and manage them
* *
*/ */
void manage_existing_windows(xcb_window_t root) { void manage_existing_windows(xcb_window_t root) {
xcb_query_tree_reply_t *reply; xcb_query_tree_reply_t *reply;
int i, len; int i, len;
xcb_window_t *children; xcb_window_t *children;
xcb_get_window_attributes_cookie_t *cookies; xcb_get_window_attributes_cookie_t *cookies;
/* Get the tree of windows whose parent is the root window (= all) */ /* Get the tree of windows whose parent is the root window (= all) */
if ((reply = xcb_query_tree_reply(conn, xcb_query_tree(conn, root), 0)) == NULL) if ((reply = xcb_query_tree_reply(conn, xcb_query_tree(conn, root), 0)) == NULL)
return; return;
len = xcb_query_tree_children_length(reply); len = xcb_query_tree_children_length(reply);
cookies = smalloc(len * sizeof(*cookies)); cookies = smalloc(len * sizeof(*cookies));
/* Request the window attributes for every window */ /* Request the window attributes for every window */
children = xcb_query_tree_children(reply); children = xcb_query_tree_children(reply);
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
cookies[i] = xcb_get_window_attributes(conn, children[i]); cookies[i] = xcb_get_window_attributes(conn, children[i]);
/* Call manage_window with the attributes for every window */ /* Call manage_window with the attributes for every window */
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
manage_window(children[i], cookies[i], true); manage_window(children[i], cookies[i], true);
free(reply); free(reply);
free(cookies); free(cookies);
} }
/* /*
@ -57,18 +51,18 @@ void manage_existing_windows(xcb_window_t root) {
* *
*/ */
void restore_geometry() { void restore_geometry() {
LOG("Restoring geometry\n"); LOG("Restoring geometry\n");
Con *con; Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) TAILQ_FOREACH(con, &all_cons, all_cons)
if (con->window) { if (con->window) {
printf("placing window at %d %d\n", con->rect.x, con->rect.y); printf("placing window at %d %d\n", con->rect.x, con->rect.y);
xcb_reparent_window(conn, con->window->id, root, xcb_reparent_window(conn, con->window->id, root,
con->rect.x, con->rect.y); con->rect.x, con->rect.y);
} }
/* Make sure our changes reach the X server, we restart/exit now */ /* Make sure our changes reach the X server, we restart/exit now */
xcb_flush(conn); xcb_flush(conn);
} }
/* /*
@ -77,118 +71,116 @@ void restore_geometry() {
*/ */
void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cookie, void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cookie,
bool needs_to_be_mapped) { bool needs_to_be_mapped) {
xcb_drawable_t d = { window }; xcb_drawable_t d = { window };
xcb_get_geometry_cookie_t geomc; xcb_get_geometry_cookie_t geomc;
xcb_get_geometry_reply_t *geom; xcb_get_geometry_reply_t *geom;
xcb_get_window_attributes_reply_t *attr = 0; xcb_get_window_attributes_reply_t *attr = 0;
printf("---> looking at window 0x%08x\n", window); printf("---> looking at window 0x%08x\n", window);
xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie, xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie,
utf8_title_cookie, title_cookie, utf8_title_cookie, title_cookie,
class_cookie, leader_cookie; class_cookie, leader_cookie;
wm_type_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_WINDOW_TYPE], UINT32_MAX); wm_type_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_WINDOW_TYPE], UINT32_MAX);
strut_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STRUT_PARTIAL], UINT32_MAX); strut_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STRUT_PARTIAL], UINT32_MAX);
state_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STATE], UINT32_MAX); state_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STATE], UINT32_MAX);
utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_NAME], 128); utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_NAME], 128);
leader_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[WM_CLIENT_LEADER], UINT32_MAX); leader_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[WM_CLIENT_LEADER], UINT32_MAX);
title_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_NAME, 128); title_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_NAME, 128);
class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128); class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128);
geomc = xcb_get_geometry(conn, d); geomc = xcb_get_geometry(conn, d);
/* Check if the window is mapped (it could be not mapped when intializing and /* Check if the window is mapped (it could be not mapped when intializing and
calling manage_window() for every window) */ calling manage_window() for every window) */
if ((attr = xcb_get_window_attributes_reply(conn, cookie, 0)) == NULL) { if ((attr = xcb_get_window_attributes_reply(conn, cookie, 0)) == NULL) {
LOG("Could not get attributes\n"); LOG("Could not get attributes\n");
return; return;
}
if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) {
LOG("map_state unviewable\n");
goto out;
}
/* Don’t manage clients with the override_redirect flag */
LOG("override_redirect is %d\n", attr->override_redirect);
if (attr->override_redirect)
goto out;
/* Check if the window is already managed */
if (con_by_window_id(window) != NULL)
goto out;
/* Get the initial geometry (position, size, …) */
if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL)
goto out;
LOG("reparenting!\n");
i3Window *cwindow = scalloc(sizeof(i3Window));
cwindow->id = window;
class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128);
xcb_get_property_reply_t *preply;
preply = xcb_get_property_reply(conn, class_cookie, NULL);
if (preply == NULL || xcb_get_property_value_length(preply) == 0) {
LOG("cannot get wm_class\n");
} else cwindow->class = strdup(xcb_get_property_value(preply));
Con *nc;
Match *match;
/* TODO: assignments */
/* TODO: two matches for one container */
/* See if any container swallows this new window */
nc = con_for_window(cwindow, &match);
if (nc == NULL) {
if (focused->type == CT_CON && con_accepts_window(focused)) {
LOG("using current container, focused = %p, focused->name = %s\n",
focused, focused->name);
nc = focused;
} else nc = tree_open_con(NULL);
} else {
if (match != NULL && match->insert_where == M_ACTIVE) {
/* We need to go down the focus stack starting from nc */
while (TAILQ_FIRST(&(nc->focus_head)) != TAILQ_END(&(nc->focus_head))) {
printf("walking down one step...\n");
nc = TAILQ_FIRST(&(nc->focus_head));
}
/* We need to open a new con */
/* TODO: make a difference between match-once containers (directly assign
* cwindow) and match-multiple (tree_open_con first) */
nc = tree_open_con(nc->parent);
} }
}
nc->window = cwindow;
if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) { xcb_void_cookie_t rcookie = xcb_reparent_window_checked(conn, window, nc->frame, 0, 0);
LOG("map_state unviewable\n"); if (xcb_request_check(conn, rcookie) != NULL) {
goto out; LOG("Could not reparent the window, aborting\n");
} goto out;
//xcb_destroy_window(conn, nc->frame);
}
/* Don’t manage clients with the override_redirect flag */ xcb_change_save_set(conn, XCB_SET_MODE_INSERT, window);
LOG("override_redirect is %d\n", attr->override_redirect);
if (attr->override_redirect)
goto out;
/* Check if the window is already managed */ tree_render();
if (con_by_window_id(window) != NULL)
goto out;
/* Get the initial geometry (position, size, …) */
if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL)
goto out;
LOG("reparenting!\n");
i3Window *cwindow = scalloc(sizeof(i3Window));
cwindow->id = window;
class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128);
xcb_get_property_reply_t *preply;
preply = xcb_get_property_reply(conn, class_cookie, NULL);
if (preply == NULL || xcb_get_property_value_length(preply) == 0) {
LOG("cannot get wm_class\n");
} else cwindow->class = strdup(xcb_get_property_value(preply));
Con *nc;
Match *match;
/* TODO: assignments */
/* TODO: two matches for one container */
/* See if any container swallows this new window */
nc = con_for_window(cwindow, &match);
if (nc == NULL) {
if (focused->type == CT_CON && con_accepts_window(focused)) {
LOG("using current container, focused = %p, focused->name = %s\n",
focused, focused->name);
nc = focused;
} else nc = tree_open_con(NULL);
} else {
if (match != NULL && match->insert_where == M_ACTIVE) {
/* We need to go down the focus stack starting from nc */
while (TAILQ_FIRST(&(nc->focus_head)) != TAILQ_END(&(nc->focus_head))) {
printf("walking down one step...\n");
nc = TAILQ_FIRST(&(nc->focus_head));
}
/* We need to open a new con */
/* TODO: make a difference between match-once containers (directly assign
* cwindow) and match-multiple (tree_open_con first) */
nc = tree_open_con(nc->parent);
}
}
nc->window = cwindow;
xcb_void_cookie_t rcookie = xcb_reparent_window_checked(conn, window, nc->frame, 0, 0);
if (xcb_request_check(conn, rcookie) != NULL) {
LOG("Could not reparent the window, aborting\n");
goto out;
//xcb_destroy_window(conn, nc->frame);
}
xcb_change_save_set(conn, XCB_SET_MODE_INSERT, window);
tree_render();
#if 0 #if 0
/* Reparent the window and add it to our list of managed windows */ /* Reparent the window and add it to our list of managed windows */
reparent_window(conn, window, attr->visual, geom->root, geom->depth, reparent_window(conn, window, attr->visual, geom->root, geom->depth,
geom->x, geom->y, geom->width, geom->height, geom->x, geom->y, geom->width, geom->height,
geom->border_width); geom->border_width);
#endif #endif
/* Generate callback events for every property we watch */ /* Generate callback events for every property we watch */
free(geom); free(geom);
out: out:
free(attr); free(attr);
return; return;
} }
#if 0 #if 0

12
src/nc.c
View File

@ -172,12 +172,12 @@ int main(int argc, char *argv[]) {
bool force_xinerama = false; bool force_xinerama = false;
xcb_intern_atom_cookie_t atom_cookies[NUM_ATOMS]; xcb_intern_atom_cookie_t atom_cookies[NUM_ATOMS];
static struct option long_options[] = { static struct option long_options[] = {
{"no-autostart", no_argument, 0, 'a'}, {"no-autostart", no_argument, 0, 'a'},
{"config", required_argument, 0, 'c'}, {"config", required_argument, 0, 'c'},
{"version", no_argument, 0, 'v'}, {"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{"force-xinerama", no_argument, 0, 0}, {"force-xinerama", no_argument, 0, 0},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index = 0, opt; int option_index = 0, opt;