Merge branch 'status'

[bspwm.git] / bspwm.h

diff --git a/bspwm.h b/bspwm.h
index 7233fadee8b96fe8c2f5bf3b2e091764c8eea00e..261e8d99a837b685105128e6c6177cb464752f38 100644 (file)
--- a/bspwm.h
+++ b/bspwm.h
@@ -1,28 +1,40 @@
 #ifndef _BSPWM_H
 #define _BSPWM_H
 
+#include "types.h"
+
+#define ROOT_EVENT_MASK    (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY)
+#define CLIENT_EVENT_MASK  (XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_ENTER_WINDOW)
+
 xcb_connection_t *dpy;
 int default_screen, screen_width, screen_height;
-unsigned int num_clients;
-unsigned int num_desktops;
+uint32_t num_clients;
+uint32_t num_desktops;
+unsigned int num_monitors;
+unsigned int monitor_uid;
+unsigned int desktop_uid;
+unsigned int client_uid;
 xcb_screen_t *screen;
+uint8_t root_depth;
+FILE *status_fifo;
+
 split_mode_t split_mode;
 direction_t split_dir;
-desktop_t *desk;
-desktop_t *last_desk;
-desktop_t *desk_head;
-desktop_t *desk_tail;
+monitor_t *mon;
+monitor_t *last_mon;
+monitor_t *mon_head;
+monitor_t *mon_tail;
 rule_t *rule_head;
-bool running;
-
-enum { WM_PROTOCOLS, WM_DELETE_WINDOW, WM_COUNT };
+pointer_state_t *frozen_pointer;
+xcb_point_t pointer_position;
 
-xcb_atom_t wmatoms[WM_COUNT];
+bool running;
 
-int register_events(void);
-xcb_screen_t *screen_of_display(xcb_connection_t *, int);
-/* void handle_zombie(int); */
-void setup(int);
+void register_events(void);
+void handle_buttons(bool);
+void grab_buttons(void);
+void ungrab_buttons(void);
+void setup(void);
 void quit(void);
 
 #endif