]> git.sur5r.net Git - i3/i3/blobdiff - src/xinerama.c
Merge pull request #3424 from orestisf1993/con_num_windows
[i3/i3] / src / xinerama.c
index d7efff0d6c6199f096a1730bd477ef40b8780aa6..d0651a851dadf9acf0787c4502d67564a941b474 100644 (file)
@@ -1,45 +1,31 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 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
- * driver which does not support RandR in 2010 *sigh*.
+ * driver which does not support RandR in 2011 *sigh*.
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "all.h"
 
-#include <xcb/xcb.h>
 #include <xcb/xinerama.h>
 
-#include "queue.h"
-#include "data.h"
-#include "util.h"
-#include "xinerama.h"
-#include "workspace.h"
-#include "log.h"
-#include "randr.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) {
-        Output *output;
-        TAILQ_FOREACH(output, &outputs, outputs)
-                if (output->rect.x == x && output->rect.y == y)
-                        return output;
+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;
 
-        return NULL;
+    return NULL;
 }
 
 /*
@@ -48,52 +34,71 @@ static Output *get_screen_at(int x, int y) {
  *
  */
 static void query_screens(xcb_connection_t *conn) {
-        xcb_xinerama_query_screens_reply_t *reply;
-        xcb_xinerama_screen_info_t *screen_info;
+    xcb_xinerama_query_screens_reply_t *reply;
+    xcb_xinerama_screen_info_t *screen_info;
+
+    reply = xcb_xinerama_query_screens_reply(conn, xcb_xinerama_query_screens_unchecked(conn), NULL);
+    if (!reply) {
+        ELOG("Couldn't get Xinerama screens\n");
+        return;
+    }
+    screen_info = xcb_xinerama_query_screens_screen_info(reply);
+    int screens = xcb_xinerama_query_screens_screen_info_length(reply);
 
-        reply = xcb_xinerama_query_screens_reply(conn, xcb_xinerama_query_screens_unchecked(conn), NULL);
-        if (!reply) {
-                ELOG("Couldn't get Xinerama screens\n");
-                return;
+    for (int screen = 0; screen < screens; screen++) {
+        Output *s = get_screen_at(screen_info[screen].x_org, screen_info[screen].y_org);
+        if (s != NULL) {
+            DLOG("Re-used old Xinerama screen %p\n", s);
+            /* This screen already exists. We use the littlest screen so that the user
+               can always see the complete workspace */
+            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(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.width = screen_info[screen].width;
+            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);
+            output_init_con(s);
+            init_ws_for_output(s, output_get_content(s->con));
+            num_screens++;
         }
-        screen_info = xcb_xinerama_query_screens_screen_info(reply);
-        int screens = xcb_xinerama_query_screens_screen_info_length(reply);
 
-        for (int screen = 0; screen < screens; screen++) {
-                Output *s = get_screen_at(screen_info[screen].x_org, screen_info[screen].y_org);
-                if (s != NULL) {
-                        DLOG("Re-used old Xinerama screen %p\n", s);
-                        /* This screen already exists. We use the littlest screen so that the user
-                           can always see the complete workspace */
-                        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));
-                        asprintf(&(s->name), "xinerama-%d", num_screens);
-                        DLOG("Created new Xinerama screen %s (%p)\n", s->name, s);
-                        s->active = true;
-                        s->rect.x = screen_info[screen].x_org;
-                        s->rect.y = screen_info[screen].y_org;
-                        s->rect.width = screen_info[screen].width;
-                        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);
-                        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);
+    }
 
-                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);
-        }
+    free(reply);
 
-        free(reply);
+    if (num_screens == 0) {
+        ELOG("No screens found. Please fix your setup. i3 will exit now.\n");
+        exit(0);
+    }
+}
 
-        if (num_screens == 0) {
-                ELOG("No screens found. Please fix your setup. i3 will exit now.\n");
-                exit(0);
-        }
+/*
+ * 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));
 }
 
 /*
@@ -101,28 +106,20 @@ static void query_screens(xcb_connection_t *conn) {
  * information to setup workspaces for each screen.
  *
  */
-void initialize_xinerama(xcb_connection_t *conn) {
-        if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
-                DLOG("Xinerama extension not found, disabling.\n");
-                disable_randr(conn);
-        } else {
-                xcb_xinerama_is_active_reply_t *reply;
-                reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
+void xinerama_init(void) {
+    if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
+        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);
-                } else
-                        query_screens(conn);
+        if (reply == NULL || !reply->state) {
+            DLOG("Xinerama is not active (in your X-Server), using root output.\n");
+            use_root_output(conn);
+        } else
+            query_screens(conn);
 
-                FREE(reply);
-        }
-
-        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);
-        }
+        FREE(reply);
+    }
 }