* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* This is LEGACY code (we support RandR, which can do much more than
* Xinerama), but necessary for the poor users of the nVidia binary
#include <xcb/xinerama.h>
-
static int num_screens;
/*
* Looks in outputs for the Output whose start coordinates are x, y
*
*/
-static Output *get_screen_at(int x, int y) {
+static Output *get_screen_at(unsigned int x, unsigned int y) {
Output *output;
TAILQ_FOREACH(output, &outputs, outputs)
- if (output->rect.x == x && output->rect.y == y)
- return output;
+ if (output->rect.x == x && output->rect.y == y)
+ return output;
return NULL;
}
s->rect.width = min(s->rect.width, screen_info[screen].width);
s->rect.height = min(s->rect.height, screen_info[screen].height);
} else {
- s = scalloc(sizeof(Output));
- sasprintf(&(s->name), "xinerama-%d", num_screens);
- DLOG("Created new Xinerama screen %s (%p)\n", s->name, s);
+ s = scalloc(1, sizeof(Output));
+ struct output_name *output_name = scalloc(1, sizeof(struct output_name));
+ sasprintf(&output_name->name, "xinerama-%d", num_screens);
+ SLIST_INIT(&s->names_head);
+ SLIST_INSERT_HEAD(&s->names_head, output_name, names);
+ DLOG("Created new Xinerama screen %s (%p)\n", output_primary_name(s), s);
s->active = true;
s->rect.x = screen_info[screen].x_org;
s->rect.y = screen_info[screen].y_org;
s->rect.height = screen_info[screen].height;
/* We always treat the screen at 0x0 as the primary screen */
if (s->rect.x == 0 && s->rect.y == 0)
- TAILQ_INSERT_HEAD(&outputs, s, outputs);
- else TAILQ_INSERT_TAIL(&outputs, s, outputs);
+ TAILQ_INSERT_HEAD(&outputs, s, outputs);
+ else
+ TAILQ_INSERT_TAIL(&outputs, s, outputs);
output_init_con(s);
init_ws_for_output(s, output_get_content(s->con));
num_screens++;
}
DLOG("found Xinerama screen: %d x %d at %d x %d\n",
- screen_info[screen].width, screen_info[screen].height,
- screen_info[screen].x_org, screen_info[screen].y_org);
+ screen_info[screen].width, screen_info[screen].height,
+ screen_info[screen].x_org, screen_info[screen].y_org);
}
free(reply);
}
}
+/*
+ * This creates the root_output (borrowed from randr.c) and uses it
+ * as the sole output for this session.
+ *
+ */
+static void use_root_output(xcb_connection_t *conn) {
+ Output *s = create_root_output(conn);
+ s->active = true;
+ TAILQ_INSERT_TAIL(&outputs, s, outputs);
+ output_init_con(s);
+ init_ws_for_output(s, output_get_content(s->con));
+}
+
/*
* We have just established a connection to the X server and need the initial Xinerama
* information to setup workspaces for each screen.
*/
void xinerama_init(void) {
if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
- DLOG("Xinerama extension not found, disabling.\n");
- disable_randr(conn);
+ DLOG("Xinerama extension not found, using root output.\n");
+ use_root_output(conn);
} else {
xcb_xinerama_is_active_reply_t *reply;
reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
if (reply == NULL || !reply->state) {
- DLOG("Xinerama is not active (in your X-Server), disabling.\n");
- disable_randr(conn);
+ DLOG("Xinerama is not active (in your X-Server), using root output.\n");
+ use_root_output(conn);
} else
query_screens(conn);
FREE(reply);
}
-
-#if 0
- Output *output;
- Workspace *ws;
- /* Just go through each active output and associate one workspace */
- TAILQ_FOREACH(output, &outputs, outputs) {
- ws = get_first_workspace_for_output(output);
- initialize_output(conn, output, ws);
- }
-#endif
}