Numerous fixes

[bspwm.git] / bspwm.h

diff --git a/bspwm.h b/bspwm.h
index c8c67a22670705d50895be925c255b875bba4a93..7e1557ec8016a9d18b65105ba4246669e579a96b 100644 (file)
--- a/bspwm.h
+++ b/bspwm.h
@@ -1,26 +1,25 @@
 #ifndef _BSPWM_H
 #define _BSPWM_H
 
+#include "types.h"
+
 xcb_connection_t *dpy;
 int default_screen, screen_width, screen_height;
 unsigned int num_clients;
-unsigned int num_desktops;
+uint32_t num_desktops;
 xcb_screen_t *screen;
+xcb_rectangle_t root_rect;
 split_mode_t split_mode;
 direction_t split_dir;
 desktop_t *desk;
 desktop_t *last_desk;
 desktop_t *desk_head;
 desktop_t *desk_tail;
+rule_t *rule_head;
 bool running;
 
-enum { WM_PROTOCOLS, WM_DELETE_WINDOW, WM_COUNT };
-
-xcb_atom_t wmatoms[WM_COUNT];
-
 int register_events(void);
-xcb_screen_t *screen_of_display(xcb_connection_t *, int);
-/* void handle_zombie(int); */
+void handle_zombie(int);
 void setup(int);
 void quit(void);