Merge branch 'status'

[bspwm.git] / bspwm.h

diff --git a/bspwm.h b/bspwm.h
index 7577af3c4afc06bb5229745cac419d563d39d29b..261e8d99a837b685105128e6c6177cb464752f38 100644 (file)
--- a/bspwm.h
+++ b/bspwm.h
@@ -4,30 +4,36 @@
 #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)
-#define MOUSE_MODIFIER     XCB_MOD_MASK_4
+#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;
+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;
-xcb_rectangle_t root_rect;
 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;
 pointer_state_t *frozen_pointer;
+xcb_point_t pointer_position;
 
 bool running;
 
 void register_events(void);
-void handle_zombie(int);
+void handle_buttons(bool);
+void grab_buttons(void);
+void ungrab_buttons(void);
 void setup(void);
 void quit(void);