Merge branch 'master' into next

[i3/i3] / src / fake_outputs.c

diff --git a/src/fake_outputs.c b/src/fake_outputs.c
index 512a808f94c2133840ed05c1fac2b5103fb2a65d..4f2740992b9540639b0fd5009a1a95382487129e 100644 (file)
--- a/src/fake_outputs.c
+++ b/src/fake_outputs.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "fake_outputs.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -16,11 +18,11 @@ 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;
 }
@@ -58,7 +60,8 @@ void fake_outputs_init(const char *output_spec) {
             /* We always treat the screen at 0x0 as the primary screen */
             if (new_output->rect.x == 0 && new_output->rect.y == 0)
                 TAILQ_INSERT_HEAD(&outputs, new_output, outputs);
-            else TAILQ_INSERT_TAIL(&outputs, new_output, outputs);
+            else
+                TAILQ_INSERT_TAIL(&outputs, new_output, outputs);
             output_init_con(new_output);
             init_ws_for_output(new_output, output_get_content(new_output->con));
             num_screens++;