panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me.

[chaz/tint2] / src / server.h

diff --git a/src/server.h b/src/server.h
index 369014a878cdc628741e3456c65f9ee985498112..0ee6ea523f3a9ba834183579fe406834e97ede13 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -11,93 +11,126 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
-#include <X11/extensions/Xrandr.h>
 #include <X11/extensions/Xinerama.h>
 
 
 typedef struct Global_atom
 {
-        Atom _XROOTPMAP_ID;
-        Atom _NET_CURRENT_DESKTOP;
-        Atom _NET_NUMBER_OF_DESKTOPS;
-        Atom _NET_DESKTOP_GEOMETRY;
-        Atom _NET_DESKTOP_VIEWPORT;
-        Atom _NET_ACTIVE_WINDOW;
-        Atom _NET_WM_WINDOW_TYPE;
-        Atom _NET_WM_STATE_SKIP_PAGER;
-        Atom _NET_WM_STATE_SKIP_TASKBAR;
-        Atom _NET_WM_STATE_STICKY;
-        Atom _NET_WM_WINDOW_TYPE_DOCK;
-        Atom _NET_WM_WINDOW_TYPE_DESKTOP;
-        Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
-        Atom _NET_WM_WINDOW_TYPE_MENU;
-        Atom _NET_WM_WINDOW_TYPE_SPLASH;
-        Atom _NET_WM_WINDOW_TYPE_DIALOG;
-        Atom _NET_WM_WINDOW_TYPE_NORMAL;
-        Atom _NET_WM_DESKTOP;
-        Atom WM_STATE;
-        Atom _NET_WM_STATE;
-        Atom _NET_WM_STATE_SHADED;
-        Atom _NET_WM_STATE_BELOW;
-        Atom _NET_WM_STATE_MODAL;
-        Atom _NET_CLIENT_LIST;
-        Atom _NET_WM_NAME;
-        Atom _NET_WM_VISIBLE_NAME;
-        Atom _NET_WM_STRUT;
-        Atom _NET_WM_ICON;
-        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 _XROOTPMAP_ID;
+       Atom _NET_CURRENT_DESKTOP;
+       Atom _NET_NUMBER_OF_DESKTOPS;
+       Atom _NET_DESKTOP_NAMES;
+       Atom _NET_DESKTOP_GEOMETRY;
+       Atom _NET_DESKTOP_VIEWPORT;
+       Atom _NET_ACTIVE_WINDOW;
+       Atom _NET_WM_WINDOW_TYPE;
+       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;
+       Atom _NET_WM_WINDOW_TYPE_MENU;
+       Atom _NET_WM_WINDOW_TYPE_SPLASH;
+       Atom _NET_WM_WINDOW_TYPE_DIALOG;
+       Atom _NET_WM_WINDOW_TYPE_NORMAL;
+       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_HIDDEN;
+       Atom _NET_WM_STATE_BELOW;
+       Atom _NET_WM_STATE_ABOVE;
+       Atom _NET_WM_STATE_MODAL;
+       Atom _NET_CLIENT_LIST;
+       Atom _NET_WM_NAME;
+       Atom _NET_WM_VISIBLE_NAME;
+       Atom _NET_WM_STRUT;
+       Atom _NET_WM_ICON;
+  Atom _NET_WM_ICON_GEOMETRY;
+       Atom _NET_CLOSE_WINDOW;
+       Atom UTF8_STRING;
+       Atom _NET_SUPPORTING_WM_CHECK;
+       Atom _NET_WM_CM_S0;
+       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;
+       Atom XdndLeave;
 } Global_atom;
 
 
 
 typedef struct Monitor
 {
-        int x;
-        int y;
-        int width;
-        int height;
+       int x;
+       int y;
+       int width;
+       int height;
+       char** names;
 } Monitor;
 
 
 typedef struct
 {
-        Display *dsp;
-        Window root_win;
-        int desktop;
-        int screen;
-        int depth;
-        int nb_desktop;
-        Monitor *monitor;
-        int nb_monitor;
-        int got_root_win;
-        Visual *visual;
-        int posx, posy;
-        Pixmap pmap;
-        GC gc;
-        GC gc_root;
-        Global_atom atom;
+       Display *dsp;
+       Window root_win;
+       Window composite_manager;
+       int real_transparency;
+       // current desktop
+       int desktop;
+       int screen;
+       int depth;
+       int nb_desktop;
+       // number of monitor (without monitor included into another one)
+       int nb_monitor;
+       Monitor *monitor;
+       int got_root_win;
+       Visual *visual;
+       Visual *visual32;
+       // root background
+       Pixmap root_pmap;
+       GC gc;
+       Colormap colormap;
+       Colormap colormap32;
+       Global_atom atom;
 } Server_global;
 
 
 Server_global server;
 
 
-void send_event32 (Window win, Atom at, long data1, long data2);
+// freed memory
+void cleanup_server();
+
+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);
-void server_refresh_root_pixmap ();
-void server_refresh_main_pixmap ();
 void server_catch_error (Display *d, XErrorEvent *ev);
 void server_init_atoms ();
+void server_init_visual();
+
+// detect root background
+void get_root_pixmap();
+
+// detect monitors and desktops
 void get_monitors();
+void get_desktops();
 
 
 #endif