t/*ewmh*: fix flakiness by syncing

[i3/i3] / src / xinerama.c

diff --git a/src/xinerama.c b/src/xinerama.c
index c116deaa954fb0bd709a1e5ec44a23c0f1b5e7a9..9e412e0330db13a788068c1bcb3c34534047fb40 100644 (file)
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -1,33 +1,31 @@
+#undef I3__FILE__
+#define I3__FILE__ "xinerama.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 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 "all.h"
 
 #include <xcb/xinerama.h>
 
-#include "all.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;
 }
@@ -59,7 +57,7 @@ static void query_screens(xcb_connection_t *conn) {
             s->rect.height = min(s->rect.height, screen_info[screen].height);
         } else {
             s = scalloc(sizeof(Output));
-            asprintf(&(s->name), "xinerama-%d", num_screens);
+            sasprintf(&(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;
@@ -68,16 +66,17 @@ static void query_screens(xcb_connection_t *conn) {
             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);
@@ -93,7 +92,7 @@ static void query_screens(xcb_connection_t *conn) {
  * information to setup workspaces for each screen.
  *
  */
-void xinerama_init() {
+void xinerama_init(void) {
     if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
         DLOG("Xinerama extension not found, disabling.\n");
         disable_randr(conn);