Browse Source

screen.[ch]: Move into objects/

Signed-off-by: Uli Schlachter <psychon@znc.in>
Uli Schlachter 5 years ago
parent
commit
d8b73de739
17 changed files with 16 additions and 21 deletions
  1. 1
    1
      CMakeLists.txt
  2. 1
    1
      awesome.c
  3. 1
    1
      banning.c
  4. 1
    2
      draw.c
  5. 1
    1
      event.c
  6. 2
    2
      ewmh.c
  7. 1
    1
      luaa.c
  8. 1
    1
      mouse.c
  9. 1
    1
      objects/client.c
  10. 1
    2
      objects/drawin.c
  11. 2
    2
      objects/screen.c
  12. 0
    0
      objects/screen.h
  13. 1
    1
      objects/window.c
  14. 2
    2
      property.c
  15. 0
    1
      spawn.c
  16. 0
    1
      stack.c
  17. 0
    1
      systray.c

+ 1
- 1
CMakeLists.txt View File

@@ -48,7 +48,6 @@ set(AWE_SRCS
48 48
     ${SOURCE_DIR}/mousegrabber.c
49 49
     ${SOURCE_DIR}/property.c
50 50
     ${SOURCE_DIR}/root.c
51
-    ${SOURCE_DIR}/screen.c
52 51
     ${SOURCE_DIR}/selection.c
53 52
     ${SOURCE_DIR}/spawn.c
54 53
     ${SOURCE_DIR}/stack.c
@@ -71,6 +70,7 @@ set(AWE_SRCS
71 70
     ${SOURCE_DIR}/objects/drawable.c
72 71
     ${SOURCE_DIR}/objects/drawin.c
73 72
     ${SOURCE_DIR}/objects/key.c
73
+    ${SOURCE_DIR}/objects/screen.c
74 74
     ${SOURCE_DIR}/objects/tag.c
75 75
     ${SOURCE_DIR}/objects/timer.c
76 76
     ${SOURCE_DIR}/objects/window.c)

+ 1
- 1
awesome.c View File

@@ -39,13 +39,13 @@
39 39
 #include "awesome.h"
40 40
 #include "spawn.h"
41 41
 #include "objects/client.h"
42
+#include "objects/screen.h"
42 43
 #include "xwindow.h"
43 44
 #include "ewmh.h"
44 45
 #include "dbus.h"
45 46
 #include "systray.h"
46 47
 #include "event.h"
47 48
 #include "property.h"
48
-#include "screen.h"
49 49
 #include "luaa.h"
50 50
 #include "common/version.h"
51 51
 #include "common/atoms.h"

+ 1
- 1
banning.c View File

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

+ 1
- 2
draw.c View File

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

+ 1
- 1
event.c View File

@@ -39,7 +39,7 @@
39 39
 #include "mousegrabber.h"
40 40
 #include "luaa.h"
41 41
 #include "systray.h"
42
-#include "screen.h"
42
+#include "objects/screen.h"
43 43
 #include "common/atoms.h"
44 44
 #include "common/xutil.h"
45 45
 

+ 2
- 2
ewmh.c View File

@@ -26,9 +26,9 @@
26 26
 #include <xcb/xcb_atom.h>
27 27
 
28 28
 #include "ewmh.h"
29
-#include "objects/tag.h"
30
-#include "screen.h"
31 29
 #include "objects/client.h"
30
+#include "objects/screen.h"
31
+#include "objects/tag.h"
32 32
 #include "luaa.h"
33 33
 #include "common/atoms.h"
34 34
 #include "common/buffer.h"

+ 1
- 1
luaa.c View File

@@ -40,7 +40,7 @@
40 40
 #include "objects/client.h"
41 41
 #include "objects/drawin.h"
42 42
 #include "objects/drawable.h"
43
-#include "screen.h"
43
+#include "objects/screen.h"
44 44
 #include "event.h"
45 45
 #include "property.h"
46 46
 #include "selection.h"

+ 1
- 1
mouse.c View File

@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "mouse.h"
23
-#include "screen.h"
23
+#include "objects/screen.h"
24 24
 #include "objects/client.h"
25 25
 #include "globalconf.h"
26 26
 #include "objects/drawin.h"

+ 1
- 1
objects/client.c View File

@@ -24,8 +24,8 @@
24 24
 #include <cairo-xcb.h>
25 25
 
26 26
 #include "objects/tag.h"
27
+#include "objects/screen.h"
27 28
 #include "ewmh.h"
28
-#include "screen.h"
29 29
 #include "systray.h"
30 30
 #include "property.h"
31 31
 #include "spawn.h"

+ 1
- 2
objects/drawin.c View File

@@ -20,10 +20,9 @@
20 20
  *
21 21
  */
22 22
 
23
-#include "screen.h"
24 23
 #include "drawin.h"
25 24
 #include "objects/client.h"
26
-#include "screen.h"
25
+#include "objects/screen.h"
27 26
 #include "xwindow.h"
28 27
 #include "luaa.h"
29 28
 #include "ewmh.h"

screen.c → objects/screen.c View File

@@ -25,11 +25,11 @@
25 25
 #include <xcb/xinerama.h>
26 26
 #include <xcb/randr.h>
27 27
 
28
-#include "screen.h"
29
-#include "ewmh.h"
28
+#include "objects/screen.h"
30 29
 #include "objects/tag.h"
31 30
 #include "objects/client.h"
32 31
 #include "objects/drawin.h"
32
+#include "ewmh.h"
33 33
 #include "luaa.h"
34 34
 #include "common/xutil.h"
35 35
 

screen.h → objects/screen.h View File


+ 1
- 1
objects/window.c View File

@@ -22,8 +22,8 @@
22 22
 #include "luaa.h"
23 23
 #include "xwindow.h"
24 24
 #include "ewmh.h"
25
-#include "screen.h"
26 25
 #include "property.h"
26
+#include "objects/screen.h"
27 27
 #include "objects/window.h"
28 28
 #include "common/atoms.h"
29 29
 #include "common/luaobject.h"

+ 2
- 2
property.c View File

@@ -21,11 +21,11 @@
21 21
 
22 22
 #include <xcb/xcb_atom.h>
23 23
 
24
-#include "screen.h"
25 24
 #include "property.h"
26
-#include "objects/client.h"
27 25
 #include "ewmh.h"
26
+#include "objects/client.h"
28 27
 #include "objects/drawin.h"
28
+#include "objects/screen.h"
29 29
 #include "xwindow.h"
30 30
 #include "luaa.h"
31 31
 #include "common/atoms.h"

+ 0
- 1
spawn.c View File

@@ -27,7 +27,6 @@
27 27
 #include <glib.h>
28 28
 
29 29
 #include "spawn.h"
30
-#include "screen.h"
31 30
 #include "luaa.h"
32 31
 #include "event.h"
33 32
 

+ 0
- 1
stack.c View File

@@ -20,7 +20,6 @@
20 20
  */
21 21
 
22 22
 #include "ewmh.h"
23
-#include "screen.h"
24 23
 #include "stack.h"
25 24
 #include "objects/client.h"
26 25
 #include "objects/drawin.h"

+ 0
- 1
systray.c View File

@@ -24,7 +24,6 @@
24 24
 #include <xcb/xcb_atom.h>
25 25
 
26 26
 #include "luaa.h"
27
-#include "screen.h"
28 27
 #include "systray.h"
29 28
 #include "xwindow.h"
30 29
 #include "common/array.h"

Loading…
Cancel
Save