X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fserver.h;h=aba113255c11c24b818124b036f4d65e7500c814;hb=f704f3350599d7f71afd0fb827c0948dec67ede3;hp=2f8a7018d2ad24b317ab9e71f0f5a584aaed8b5c;hpb=cb9288bcb990b5ff5b550285f6d3ef752bd44d68;p=chaz%2Ftint2

diff --git a/src/server.h b/src/server.h
index 2f8a701..aba1132 100644
--- a/src/server.h
+++ b/src/server.h
@@ -11,7 +11,6 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
-#include <X11/extensions/Xrandr.h>
 #include <X11/extensions/Xinerama.h>
 
 
@@ -27,6 +26,7 @@ typedef struct Global_atom
 	Atom _NET_WM_STATE_SKIP_PAGER;
 	Atom _NET_WM_STATE_SKIP_TASKBAR;
 	Atom _NET_WM_STATE_STICKY;
+	Atom _NET_WM_STATE_DEMANDS_ATTENTION;
 	Atom _NET_WM_WINDOW_TYPE_DOCK;
 	Atom _NET_WM_WINDOW_TYPE_DESKTOP;
 	Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
@@ -37,6 +37,8 @@ typedef struct Global_atom
 	Atom _NET_WM_DESKTOP;
 	Atom WM_STATE;
 	Atom _NET_WM_STATE;
+	Atom _NET_WM_STATE_MAXIMIZED_VERT;
+	Atom _NET_WM_STATE_MAXIMIZED_HORZ;
 	Atom _NET_WM_STATE_SHADED;
 	Atom _NET_WM_STATE_BELOW;
 	Atom _NET_WM_STATE_MODAL;
@@ -48,11 +50,21 @@ typedef struct Global_atom
 	Atom _NET_CLOSE_WINDOW;
 	Atom UTF8_STRING;
 	Atom _NET_SUPPORTING_WM_CHECK;
-	Atom _WIN_LAYER;
 	Atom _NET_WM_STRUT_PARTIAL;
 	Atom WM_NAME;
 	Atom __SWM_VROOT;
 	Atom _MOTIF_WM_HINTS;
+	Atom WM_HINTS;
+	Atom _NET_SYSTEM_TRAY_SCREEN;
+	Atom _NET_SYSTEM_TRAY_OPCODE;
+	Atom MANAGER;
+	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
+	Atom _NET_SYSTEM_TRAY_ORIENTATION;
+	Atom _XEMBED;
+	Atom _XEMBED_INFO;
+	Atom XdndAware;
+	Atom XdndPosition;
+	Atom XdndStatus;
 } Global_atom;
 
 
@@ -70,6 +82,7 @@ typedef struct
 {
 	Display *dsp;
 	Window root_win;
+	// current desktop
 	int desktop;
 	int screen;
 	int depth;
@@ -79,8 +92,6 @@ typedef struct
 	Monitor *monitor;
 	int got_root_win;
 	Visual *visual;
-	int posx, posy;
-	Pixmap pmap;
 	// root background
 	Pixmap root_pmap;
 	GC gc;
@@ -91,7 +102,7 @@ typedef struct
 Server_global server;
 
 
-void send_event32 (Window win, Atom at, long data1, long data2);
+void send_event32 (Window win, Atom at, long data1, long data2, long data3);
 int  get_property32 (Window win, Atom at, Atom type);
 void *server_get_property (Window win, Atom at, Atom type, int *num_results);
 Atom server_get_atom (char *atom_name);
@@ -100,9 +111,12 @@ void server_refresh_main_pixmap ();
 void server_catch_error (Display *d, XErrorEvent *ev);
 void server_init_atoms ();
 
-// detect monitors
-// doesn't count monitor included into another one
+// detect root background
+void get_root_pixmap();
+
+// detect monitors and desktops
 void get_monitors();
+void get_desktops();
 
 
 #endif