screen.[ch]: Move into objects/

Signed-off-by: Uli Schlachter <psychon@znc.in>

CMakeLists.txt

@@ -48,7 +48,6 @@ set(AWE_SRCS
     ${SOURCE_DIR}/mousegrabber.c
     ${SOURCE_DIR}/property.c
     ${SOURCE_DIR}/root.c
-    ${SOURCE_DIR}/screen.c
     ${SOURCE_DIR}/selection.c
     ${SOURCE_DIR}/spawn.c
     ${SOURCE_DIR}/stack.c
@@ -71,6 +70,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/objects/drawable.c
     ${SOURCE_DIR}/objects/drawin.c
     ${SOURCE_DIR}/objects/key.c
+    ${SOURCE_DIR}/objects/screen.c
     ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/objects/timer.c
     ${SOURCE_DIR}/objects/window.c)

awesome.c

@@ -39,13 +39,13 @@
 #include "awesome.h"
 #include "spawn.h"
 #include "objects/client.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "ewmh.h"
 #include "dbus.h"
 #include "systray.h"
 #include "event.h"
 #include "property.h"
-#include "screen.h"
 #include "luaa.h"
 #include "common/version.h"
 #include "common/atoms.h"

banning.c

@@ -20,8 +20,8 @@
  */
 
 #include "banning.h"
+#include "objects/screen.h"
 #include "objects/tag.h"
-#include "screen.h"
 
 /** Reban windows following current selected tags.
  * \param screen The screen to arrange.

draw.c

@@ -32,8 +32,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "globalconf.h"
-#include "screen.h"
+#include "objects/screen.h"
-
 #include "common/xutil.h"
 
 /** Convert text from any charset to UTF-8 using iconv.

event.c

@@ -39,7 +39,7 @@
 #include "mousegrabber.h"
 #include "luaa.h"
 #include "systray.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "common/atoms.h"
 #include "common/xutil.h"
 

ewmh.c

@@ -26,9 +26,9 @@
 #include <xcb/xcb_atom.h>
 
 #include "ewmh.h"
-#include "objects/tag.h"
-#include "screen.h"
 #include "objects/client.h"
+#include "objects/screen.h"
+#include "objects/tag.h"
 #include "luaa.h"
 #include "common/atoms.h"
 #include "common/buffer.h"

luaa.c

@@ -40,7 +40,7 @@
 #include "objects/client.h"
 #include "objects/drawin.h"
 #include "objects/drawable.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "event.h"
 #include "property.h"
 #include "selection.h"

mouse.c

@@ -20,7 +20,7 @@
  */
 
 #include "mouse.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "objects/client.h"
 #include "globalconf.h"
 #include "objects/drawin.h"

objects/client.c

@@ -24,8 +24,8 @@
 #include <cairo-xcb.h>
 
 #include "objects/tag.h"
+#include "objects/screen.h"
 #include "ewmh.h"
-#include "screen.h"
 #include "systray.h"
 #include "property.h"
 #include "spawn.h"

objects/drawin.c

@@ -20,10 +20,9 @@
  *
  */
 
-#include "screen.h"
 #include "drawin.h"
 #include "objects/client.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "luaa.h"
 #include "ewmh.h"

objects/screen.c

@@ -25,11 +25,11 @@
 #include <xcb/xinerama.h>
 #include <xcb/randr.h>
 
-#include "screen.h"
+#include "objects/screen.h"
-#include "ewmh.h"
 #include "objects/tag.h"
 #include "objects/client.h"
 #include "objects/drawin.h"
+#include "ewmh.h"
 #include "luaa.h"
 #include "common/xutil.h"
 

objects/window.c

@@ -22,8 +22,8 @@
 #include "luaa.h"
 #include "xwindow.h"
 #include "ewmh.h"
-#include "screen.h"
 #include "property.h"
+#include "objects/screen.h"
 #include "objects/window.h"
 #include "common/atoms.h"
 #include "common/luaobject.h"

property.c

@@ -21,11 +21,11 @@
 
 #include <xcb/xcb_atom.h>
 
-#include "screen.h"
 #include "property.h"
-#include "objects/client.h"
 #include "ewmh.h"
+#include "objects/client.h"
 #include "objects/drawin.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "luaa.h"
 #include "common/atoms.h"

spawn.c

@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include "spawn.h"
-#include "screen.h"
 #include "luaa.h"
 #include "event.h"
 

stack.c

@@ -20,7 +20,6 @@
  */
 
 #include "ewmh.h"
-#include "screen.h"
 #include "stack.h"
 #include "objects/client.h"
 #include "objects/drawin.h"

systray.c

@@ -24,7 +24,6 @@
 #include <xcb/xcb_atom.h>
 
 #include "luaa.h"
-#include "screen.h"
 #include "systray.h"
 #include "xwindow.h"
 #include "common/array.h"