Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h Ecore_X_Atoms.h Makefile.am ecore_x.c ecore_x_dnd.c
ecore_x_e.c ecore_x_icccm.c ecore_x_mwm.c ecore_x_netwm.c
ecore_x_private.h ecore_xcb_atom.c
Added Files:
ecore_x_atoms.c ecore_x_atoms_decl.h
Log Message:
moe all atom fetching to 1 round trip instead of 200 of them... and mrge into
1 bit of code to do it.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- Ecore_X.h 30 Jun 2008 08:39:36 -0000 1.199
+++ Ecore_X.h 9 Jul 2008 15:18:55 -0000 1.200
@@ -1274,7 +1274,8 @@
EAPI void ecore_x_atom_get_prefetch(const char *name);
EAPI void ecore_x_atom_get_fetch(void);
EAPI Ecore_X_Atom ecore_x_atom_get(const char *name);
-
+EAPI void ecore_x_atoms_get(const char **names, int num,
Ecore_X_Atom *atoms);
+
EAPI void ecore_x_icccm_init(void);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X_Atoms.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Ecore_X_Atoms.h 8 Apr 2007 20:52:54 -0000 1.16
+++ Ecore_X_Atoms.h 9 Jul 2008 15:18:55 -0000 1.17
@@ -9,88 +9,114 @@
* @brief Ecore X atoms
*/
-/* General */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING;
+/* generic atoms */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_ATOM;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_CARDINAL;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_FILE_NAME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_STRING;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_TEXT;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WINDOW;
-/* ICCCM */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_STATE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_DELETE_WINDOW;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_TAKE_FOCUS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLASS;
+/* dnd atoms */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_XDND;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_XDND;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_AWARE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ENTER;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_TYPE_LIST;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_POSITION;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_COPY;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_MOVE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_PRIVATE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_ASK;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LIST;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LINK;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_DESCRIPTION;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_PROXY;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_STATUS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_LEAVE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_DROP;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_FINISHED;
+
+/* dnd atoms that need to be exposed to the application interface */
+EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_COPY;
+EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_MOVE;
+EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_LINK;
+EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_ASK;
+EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_PRIVATE;
+
+/* old E atom */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE;
+
+/* old Gnome atom */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WIN_LAYER;
+
+/* ICCCM: client properties */
EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_NAME;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_ICON_NAME;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CHANGE_STATE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_WINDOW_ROLE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_HINTS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_NORMAL_HINTS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_LEADER;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_SIZE_HINTS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_HINTS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLASS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_TRANSIENT_FOR;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE;
+
+/* ICCCM: window manager properties */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_STATE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_ICON_SIZE;
+
+/* ICCCM: WM_STATEproperty */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CHANGE_STATE;
+
+/* ICCCM: WM_PROTOCOLS properties */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_TAKE_FOCUS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_SAVE_YOURSELF;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_DELETE_WINDOW;
-/* MWM */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_MOTIF_WM_HINTS;
+/* ICCCM: WM_COLORMAP properties */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_NOTIFY;
-/* GNOME */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_WIN_LAYER;
+/* ICCCM: session management properties */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_SM_CLIENT_ID;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_LEADER;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_WINDOW_ROLE;
-/* EWMH */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTED;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK;
+/* Motif WM atom */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_MOTIF_WM_HINTS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTED;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST_STACKING;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_VIRTUAL_ROOTS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_NAMES;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_GEOMETRY;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_VIEWPORT;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_LAYOUT;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WORKAREA;
-
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CURRENT_DESKTOP;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_NAMES;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_ACTIVE_WINDOW;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WORKAREA;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_VIRTUAL_ROOTS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_LAYOUT;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_SHOWING_DESKTOP;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST_STACKING;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_ACTIVE_WINDOW;
+/* pager */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLOSE_WINDOW;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_MOVERESIZE_WINDOW;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_MOVERESIZE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_RESTACK_WINDOW;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_NAME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_NAME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_NAME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_DESKTOP;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_GEOMETRY;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_PID;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_HANDLED_ICONS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_USER_TIME;
-
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_CLOSE_WINDOW;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_MOVERESIZE;
-
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_MOVERESIZE_WINDOW;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_RESTACK_WINDOW;
-
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MOVE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_RESIZE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_SHADE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_STICK;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE; /*x*/
+/* window type */
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DESKTOP;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DOCK;
@@ -101,6 +127,7 @@
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL;
+/* state */
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MODAL;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_STICKY;
@@ -115,23 +142,36 @@
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_BELOW;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS;
+/* allowed actions */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MOVE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_RESIZE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_SHADE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_STICK;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_GEOMETRY;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_PID;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_HANDLED_ICONS;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_USER_TIME;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_ID;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_PING;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER;
-
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_ID;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO;
-
-/* NetWM Opacity Atoms */
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_OPACITY;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADOW;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADE;
-
-/* Selections */
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN;
+EAPI extern Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_TARGETS;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PRIMARY;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_SECONDARY;
@@ -139,23 +179,5 @@
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_PRIMARY;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_SECONDARY;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_CLIPBOARD;
-
-/* DND */
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_XDND;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_XDND;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_AWARE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_TYPE_LIST;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_COPY;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_PRIVATE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_ASK;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LIST;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_DESCRIPTION;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ENTER;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_LEAVE;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_STATUS;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_POSITION;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_DROP;
-EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_FINISHED;
-
#endif /* _ECORE_X_ATOMS_H */
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- Makefile.am 28 Mar 2008 14:38:35 -0000 1.41
+++ Makefile.am 9 Jul 2008 15:18:55 -0000 1.42
@@ -73,7 +73,8 @@
ecore_xcb_window_prop.c \
ecore_xcb_xinerama.c \
ecore_xcb.c \
-ecore_xcb_private.h
+ecore_xcb_private.h \
+ecore_x_atoms_decl.h
libecore_x_la_LIBADD = \
@XCB_DAMAGE_LIBS@ \
@@ -134,7 +135,9 @@
ecore_x_drawable.c \
ecore_x_cursor.c \
ecore_x_test.c \
-ecore_x_private.h
+ecore_x_atoms.c \
+ecore_x_private.h \
+ecore_x_atoms_decl.h
libecore_x_la_LIBADD = \
@Xcursor_libs@ \
@@ -191,4 +194,6 @@
ecore_x_drawable.c \
ecore_x_cursor.c \
ecore_x_test.c \
-ecore_x_private.h
+ecore_x_atoms.c \
+ecore_x_private.h \
+ecore_x_atoms_decl.h
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- ecore_x.c 18 Jun 2008 11:36:21 -0000 1.132
+++ ecore_x.c 9 Jul 2008 15:18:55 -0000 1.133
@@ -40,31 +40,8 @@
Ecore_X_Window _ecore_x_private_win = 0;
-/* FIXME - These are duplicates after making ecore atoms public */
-EAPI Ecore_X_Atom ECORE_X_ATOM_FILE_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_STRING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_TEXT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT = 0;
-
Ecore_X_Atom _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
-/*
- * GNOME hints.
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WIN_LAYER = 0;
-
-/*
- * Other hints.
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_TARGETS;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PRIMARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_SECONDARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_CLIPBOARD = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_PRIMARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_SECONDARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_CLIPBOARD = 0;
-
EAPI int ECORE_X_EVENT_KEY_DOWN = 0;
EAPI int ECORE_X_EVENT_KEY_UP = 0;
EAPI int ECORE_X_EVENT_MOUSE_BUTTON_DOWN = 0;
@@ -401,19 +378,11 @@
return 0;
}
- ECORE_X_ATOM_COMPOUND_TEXT = XInternAtom(_ecore_x_disp,
"COMPOUND_TEXT", False);
- ECORE_X_ATOM_UTF8_STRING = XInternAtom(_ecore_x_disp, "UTF8_STRING",
False);
- ECORE_X_ATOM_FILE_NAME = XInternAtom(_ecore_x_disp, "FILE_NAME",
False);
- ECORE_X_ATOM_STRING = XInternAtom(_ecore_x_disp, "STRING",
False);
- ECORE_X_ATOM_TEXT = XInternAtom(_ecore_x_disp, "TEXT", False);
+ _ecore_x_atoms_init();
/* Set up the ICCCM hints */
ecore_x_icccm_init();
- ECORE_X_ATOM_MOTIF_WM_HINTS = XInternAtom(_ecore_x_disp,
"_MOTIF_WM_HINTS", False);
-
- ECORE_X_ATOM_WIN_LAYER = XInternAtom(_ecore_x_disp,
"_WIN_LAYER", False);
-
/* Set up the _NET_... hints */
ecore_x_netwm_init();
@@ -421,13 +390,6 @@
ecore_x_e_init();
/* This is just to be anal about naming conventions */
- ECORE_X_ATOM_SELECTION_TARGETS = XInternAtom(_ecore_x_disp,
"TARGETS", False);
- ECORE_X_ATOM_SELECTION_PRIMARY = XA_PRIMARY;
- ECORE_X_ATOM_SELECTION_SECONDARY = XA_SECONDARY;
- ECORE_X_ATOM_SELECTION_CLIPBOARD = XInternAtom(_ecore_x_disp,
"CLIPBOARD", False);
- ECORE_X_ATOM_SELECTION_PROP_PRIMARY = XInternAtom(_ecore_x_disp,
"_ECORE_SELECTION_PRIMARY", False);
- ECORE_X_ATOM_SELECTION_PROP_SECONDARY = XInternAtom(_ecore_x_disp,
"_ECORE_SELECTION_SECONDARY", False);
- ECORE_X_ATOM_SELECTION_PROP_CLIPBOARD = XInternAtom(_ecore_x_disp,
"_ECORE_SELECTION_CLIPBOARD", False);
_ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_DELETE_REQUEST] =
ECORE_X_ATOM_WM_DELETE_WINDOW;
_ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_TAKE_FOCUS] =
ECORE_X_ATOM_WM_TAKE_FOCUS;
@@ -955,6 +917,19 @@
{
if (!_ecore_x_disp) return 0;
return XInternAtom(_ecore_x_disp, name, False);
+}
+
+EAPI void
+ecore_x_atoms_get(const char **names, int num, Ecore_X_Atom *atoms)
+{
+ Atom *atoms_int;
+ int i;
+
+ if (!_ecore_x_disp) return 0;
+ atoms_int = alloca(num * sizeof(Atom));
+ XInternAtoms(_ecore_x_disp, names, num, False, atoms_int);
+ for (i = 0; i < num; i++)
+ atoms[i] = atoms_int[i];
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dnd.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ecore_x_dnd.c 15 Nov 2007 04:48:36 -0000 1.33
+++ ecore_x_dnd.c 9 Jul 2008 15:18:55 -0000 1.34
@@ -6,32 +6,6 @@
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_XDND = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_XDND = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_AWARE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ENTER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_TYPE_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_POSITION = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_COPY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LINK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_PRIVATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_ASK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_DESCRIPTION = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_PROXY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_STATUS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_DROP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_FINISHED = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_LEAVE = 0;
-
-/* Xdnd atoms that need to be exposed to the application interface */
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_COPY = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_LINK = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_ASK = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_PRIVATE = 0;
-
EAPI int ECORE_X_EVENT_XDND_ENTER = 0;
EAPI int ECORE_X_EVENT_XDND_POSITION = 0;
EAPI int ECORE_X_EVENT_XDND_STATUS = 0;
@@ -73,32 +47,6 @@
ECORE_X_EVENT_XDND_LEAVE = ecore_event_type_new();
ECORE_X_EVENT_XDND_DROP = ecore_event_type_new();
ECORE_X_EVENT_XDND_FINISHED = ecore_event_type_new();
-
- ECORE_X_ATOM_SELECTION_PROP_XDND = XInternAtom(_ecore_x_disp,
"XSelectionWindowProperty", False);
- ECORE_X_ATOM_SELECTION_XDND = XInternAtom(_ecore_x_disp,
"XdndSelection", False);
- ECORE_X_ATOM_XDND_AWARE = XInternAtom(_ecore_x_disp,
"XdndAware", False);
- ECORE_X_ATOM_XDND_TYPE_LIST = XInternAtom(_ecore_x_disp,
"XdndTypeList", False);
- ECORE_X_ATOM_XDND_ENTER = XInternAtom(_ecore_x_disp,
"XdndEnter", False);
- ECORE_X_ATOM_XDND_POSITION = XInternAtom(_ecore_x_disp,
"XdndPosition", False);
- ECORE_X_ATOM_XDND_ACTION_COPY = XInternAtom(_ecore_x_disp,
"XdndActionCopy", False);
- ECORE_X_ATOM_XDND_ACTION_MOVE = XInternAtom(_ecore_x_disp,
"XdndActionMove", False);
- ECORE_X_ATOM_XDND_ACTION_PRIVATE = XInternAtom(_ecore_x_disp,
"XdndActionPrivate", False);
- ECORE_X_ATOM_XDND_ACTION_ASK = XInternAtom(_ecore_x_disp,
"XdndActionAsk", False);
- ECORE_X_ATOM_XDND_ACTION_LIST = XInternAtom(_ecore_x_disp,
"XdndActionList", False);
- ECORE_X_ATOM_XDND_ACTION_LINK = XInternAtom(_ecore_x_disp,
"XdndActionLink", False);
- ECORE_X_ATOM_XDND_ACTION_DESCRIPTION = XInternAtom(_ecore_x_disp,
"XdndActionDescription", False);
- ECORE_X_ATOM_XDND_PROXY = XInternAtom(_ecore_x_disp,
"XdndProxy", False);
- ECORE_X_ATOM_XDND_STATUS = XInternAtom(_ecore_x_disp,
"XdndStatus", False);
- ECORE_X_ATOM_XDND_LEAVE = XInternAtom(_ecore_x_disp,
"XdndLeave", False);
- ECORE_X_ATOM_XDND_DROP = XInternAtom(_ecore_x_disp,
"XdndDrop", False);
- ECORE_X_ATOM_XDND_FINISHED = XInternAtom(_ecore_x_disp,
"XdndFinished", False);
-
- /* Initialize the globally defined xdnd atoms */
- ECORE_X_DND_ACTION_COPY = ECORE_X_ATOM_XDND_ACTION_COPY;
- ECORE_X_DND_ACTION_MOVE = ECORE_X_ATOM_XDND_ACTION_MOVE;
- ECORE_X_DND_ACTION_LINK = ECORE_X_ATOM_XDND_ACTION_LINK;
- ECORE_X_DND_ACTION_ASK = ECORE_X_ATOM_XDND_ACTION_ASK;
- ECORE_X_DND_ACTION_PRIVATE =
ECORE_X_ATOM_XDND_ACTION_PRIVATE;
}
_ecore_x_dnd_init_count++;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_e.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_x_e.c 6 Jan 2006 20:22:09 -0000 1.5
+++ ecore_x_e.c 9 Jul 2008 15:18:55 -0000 1.6
@@ -10,18 +10,9 @@
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
-/*
- * Convenience macros
- */
-#define _ATOM_GET(name) \
- XInternAtom(_ecore_x_disp, name, False)
-
-Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE = 0;
-
EAPI void
ecore_x_e_init(void)
{
- ECORE_X_ATOM_E_FRAME_SIZE = _ATOM_GET("_E_FRAME_SIZE");
}
EAPI void
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_icccm.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ecore_x_icccm.c 10 Jun 2006 19:26:25 -0000 1.45
+++ ecore_x_icccm.c 9 Jul 2008 15:18:55 -0000 1.46
@@ -12,58 +12,10 @@
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
-/* Atoms */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_STATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_DELETE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_TAKE_FOCUS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLASS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CHANGE_STATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_WINDOW_ROLE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_HINTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_NORMAL_HINTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_LEADER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_TRANSIENT_FOR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_SAVE_YOURSELF = 0;
EAPI void
ecore_x_icccm_init(void)
{
-
- ECORE_X_ATOM_WM_STATE = XInternAtom(_ecore_x_disp, "WM_STATE", False);
- ECORE_X_ATOM_WM_DELETE_WINDOW =
- XInternAtom(_ecore_x_disp, "WM_DELETE_WINDOW", False);
- ECORE_X_ATOM_WM_TAKE_FOCUS =
- XInternAtom(_ecore_x_disp, "WM_TAKE_FOCUS", False);
- ECORE_X_ATOM_WM_PROTOCOLS =
- XInternAtom(_ecore_x_disp, "WM_PROTOCOLS", False);
- ECORE_X_ATOM_WM_CLASS = XInternAtom(_ecore_x_disp, "WM_CLASS", False);
- ECORE_X_ATOM_WM_NAME = XInternAtom(_ecore_x_disp, "WM_NAME", False);
- ECORE_X_ATOM_WM_COMMAND = XInternAtom(_ecore_x_disp, "WM_COMMAND", False);
- ECORE_X_ATOM_WM_ICON_NAME =
- XInternAtom(_ecore_x_disp, "WM_ICON_NAME", False);
- ECORE_X_ATOM_WM_CLIENT_MACHINE =
- XInternAtom(_ecore_x_disp, "WM_CLIENT_MACHINE", False);
- ECORE_X_ATOM_WM_CHANGE_STATE =
- XInternAtom(_ecore_x_disp, "WM_CHANGE_STATE", False);
- ECORE_X_ATOM_WM_COLORMAP_WINDOWS =
- XInternAtom(_ecore_x_disp, "WM_COLORMAP_WINDOWS", False);
- ECORE_X_ATOM_WM_WINDOW_ROLE =
- XInternAtom(_ecore_x_disp, "WM_WINDOW_ROLE", False);
- ECORE_X_ATOM_WM_HINTS = XInternAtom(_ecore_x_disp, "WM_HINTS", False);
- ECORE_X_ATOM_WM_NORMAL_HINTS =
- XInternAtom(_ecore_x_disp, "WM_NORMAL_HINTS", False);
- ECORE_X_ATOM_WM_CLIENT_LEADER =
- XInternAtom(_ecore_x_disp, "WM_CLIENT_LEADER", False);
- ECORE_X_ATOM_WM_TRANSIENT_FOR =
- XInternAtom(_ecore_x_disp, "WM_TRANSIENT_FOR", False);
- ECORE_X_ATOM_WM_SAVE_YOURSELF =
- XInternAtom(_ecore_x_disp, "WM_SAVE_YOURSELF", False);
}
EAPI void
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_mwm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_x_mwm.c 6 Jan 2006 21:56:05 -0000 1.6
+++ ecore_x_mwm.c 9 Jul 2008 15:18:55 -0000 1.7
@@ -24,9 +24,6 @@
}
MWMHints;
-/* Atoms */
-EAPI Ecore_X_Atom ECORE_X_ATOM_MOTIF_WM_HINTS = 0;
-
EAPI int
ecore_x_mwm_hints_get(Ecore_X_Window win,
Ecore_X_MWM_Hint_Func * fhint,
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- ecore_x_netwm.c 1 Jul 2008 07:12:27 -0000 1.64
+++ ecore_x_netwm.c 9 Jul 2008 15:18:55 -0000 1.65
@@ -48,9 +48,6 @@
/*
* Convenience macros
*/
-#define _ATOM_GET(name) \
- XInternAtom(_ecore_x_disp, name, False)
-
#define _ATOM_SET_UTF8_STRING_LIST(win, atom, string, cnt) \
XChangeProperty(_ecore_x_disp, win, atom, ECORE_X_ATOM_UTF8_STRING, 8,
PropModeReplace, \
(unsigned char *)string, cnt)
@@ -61,203 +58,12 @@
static Ecore_Hash *startup_info = NULL;
-/*
- * Root window NetWM hints.
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTED = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_VIRTUAL_ROOTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_NAMES = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_GEOMETRY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_VIEWPORT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_LAYOUT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WORKAREA = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CURRENT_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SHOWING_DESKTOP = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST_STACKING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_ACTIVE_WINDOW = 0;
-
-/*
- * Client message types.
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLOSE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_MOVERESIZE = 0;
-
-/*
- * Pagers
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_MOVERESIZE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_RESTACK_WINDOW = 0;
-
-/*
- * Application window specific NetWM hints.
- */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_ID = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_GEOMETRY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_PID = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_HANDLED_ICONS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_USER_TIME = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_RESIZE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_SHADE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_STICK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DOCK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_TOOLBAR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_MENU = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_UTILITY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_SPLASH = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MODAL = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_STICKY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SHADED = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SKIP_TASKBAR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SKIP_PAGER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_HIDDEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_FULLSCREEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_ABOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_BELOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_OPACITY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADE = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_PING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO = 0;
-
EAPI void
ecore_x_netwm_init(void)
{
- ECORE_X_ATOM_NET_SUPPORTED = _ATOM_GET("_NET_SUPPORTED");
- ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK =
_ATOM_GET("_NET_SUPPORTING_WM_CHECK");
-
- ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS = _ATOM_GET("_NET_NUMBER_OF_DESKTOPS");
- ECORE_X_ATOM_NET_VIRTUAL_ROOTS = _ATOM_GET("_NET_VIRTUAL_ROOTS");
- ECORE_X_ATOM_NET_DESKTOP_NAMES = _ATOM_GET("_NET_DESKTOP_NAMES");
- ECORE_X_ATOM_NET_DESKTOP_GEOMETRY = _ATOM_GET("_NET_DESKTOP_GEOMETRY");
- ECORE_X_ATOM_NET_DESKTOP_VIEWPORT = _ATOM_GET("_NET_DESKTOP_VIEWPORT");
- ECORE_X_ATOM_NET_DESKTOP_LAYOUT = _ATOM_GET("_NET_DESKTOP_LAYOUT");
- ECORE_X_ATOM_NET_WORKAREA = _ATOM_GET("_NET_WORKAREA");
-
- ECORE_X_ATOM_NET_CURRENT_DESKTOP = _ATOM_GET("_NET_CURRENT_DESKTOP");
- ECORE_X_ATOM_NET_SHOWING_DESKTOP = _ATOM_GET("_NET_SHOWING_DESKTOP");
-
- ECORE_X_ATOM_NET_CLIENT_LIST = _ATOM_GET("_NET_CLIENT_LIST");
- ECORE_X_ATOM_NET_CLIENT_LIST_STACKING =
- _ATOM_GET("_NET_CLIENT_LIST_STACKING");
- ECORE_X_ATOM_NET_ACTIVE_WINDOW = _ATOM_GET("_NET_ACTIVE_WINDOW");
-
- ECORE_X_ATOM_NET_CLOSE_WINDOW = _ATOM_GET("_NET_CLOSE_WINDOW");
- ECORE_X_ATOM_NET_WM_MOVERESIZE = _ATOM_GET("_NET_WM_MOVERESIZE");
-
- ECORE_X_ATOM_NET_MOVERESIZE_WINDOW = _ATOM_GET("_NET_MOVERESIZE_WINDOW");
- ECORE_X_ATOM_NET_RESTACK_WINDOW = _ATOM_GET("_NET_RESTACK_WINDOW");
-
- ECORE_X_ATOM_NET_WM_NAME = _ATOM_GET("_NET_WM_NAME");
- ECORE_X_ATOM_NET_STARTUP_ID = _ATOM_GET("_NET_STARTUP_ID");
- ECORE_X_ATOM_NET_WM_VISIBLE_NAME = _ATOM_GET("_NET_WM_VISIBLE_NAME");
- ECORE_X_ATOM_NET_WM_ICON_NAME = _ATOM_GET("_NET_WM_ICON_NAME");
- ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME =
_ATOM_GET("_NET_WM_VISIBLE_ICON_NAME");
- ECORE_X_ATOM_NET_WM_DESKTOP = _ATOM_GET("_NET_WM_DESKTOP");
- ECORE_X_ATOM_NET_WM_STRUT = _ATOM_GET("_NET_WM_STRUT");
- ECORE_X_ATOM_NET_WM_STRUT_PARTIAL = _ATOM_GET("_NET_WM_STRUT_PARTIAL");
- ECORE_X_ATOM_NET_WM_ICON_GEOMETRY = _ATOM_GET("_NET_WM_ICON_GEOMETRY");
- ECORE_X_ATOM_NET_WM_ICON = _ATOM_GET("_NET_WM_ICON");
- ECORE_X_ATOM_NET_WM_PID = _ATOM_GET("_NET_WM_PID");
- ECORE_X_ATOM_NET_WM_HANDLED_ICONS = _ATOM_GET("_NET_WM_HANDLED_ICONS");
- ECORE_X_ATOM_NET_WM_USER_TIME = _ATOM_GET("_NET_WM_USER_TIME");
-
- ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS = _ATOM_GET("_NET_WM_ALLOWED_ACTIONS");
- ECORE_X_ATOM_NET_WM_ACTION_MOVE = _ATOM_GET("_NET_WM_ACTION_MOVE");
- ECORE_X_ATOM_NET_WM_ACTION_RESIZE = _ATOM_GET("_NET_WM_ACTION_RESIZE");
- ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE = _ATOM_GET("_NET_WM_ACTION_MINIMIZE");
- ECORE_X_ATOM_NET_WM_ACTION_SHADE = _ATOM_GET("_NET_WM_ACTION_SHADE");
- ECORE_X_ATOM_NET_WM_ACTION_STICK = _ATOM_GET("_NET_WM_ACTION_STICK");
- ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ =
_ATOM_GET("_NET_WM_ACTION_MAXIMIZE_HORZ");
- ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT =
_ATOM_GET("_NET_WM_ACTION_MAXIMIZE_VERT");
- ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN =
_ATOM_GET("_NET_WM_ACTION_FULLSCREEN");
- ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP =
_ATOM_GET("_NET_WM_ACTION_CHANGE_DESKTOP");
- ECORE_X_ATOM_NET_WM_ACTION_CLOSE = _ATOM_GET("_NET_WM_ACTION_CLOSE");
-
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE = _ATOM_GET("_NET_WM_WINDOW_TYPE");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DESKTOP =
_ATOM_GET("_NET_WM_WINDOW_TYPE_DESKTOP");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DOCK =
_ATOM_GET("_NET_WM_WINDOW_TYPE_DOCK");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_TOOLBAR =
_ATOM_GET("_NET_WM_WINDOW_TYPE_TOOLBAR");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_MENU =
_ATOM_GET("_NET_WM_WINDOW_TYPE_MENU");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_UTILITY =
_ATOM_GET("_NET_WM_WINDOW_TYPE_UTILITY");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_SPLASH =
_ATOM_GET("_NET_WM_WINDOW_TYPE_SPLASH");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG =
_ATOM_GET("_NET_WM_WINDOW_TYPE_DIALOG");
- ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL =
_ATOM_GET("_NET_WM_WINDOW_TYPE_NORMAL");
-
- ECORE_X_ATOM_NET_WM_STATE = _ATOM_GET("_NET_WM_STATE");
- ECORE_X_ATOM_NET_WM_STATE_MODAL = _ATOM_GET("_NET_WM_STATE_MODAL");
- ECORE_X_ATOM_NET_WM_STATE_STICKY = _ATOM_GET("_NET_WM_STATE_STICKY");
- ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT =
_ATOM_GET("_NET_WM_STATE_MAXIMIZED_VERT");
- ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ =
_ATOM_GET("_NET_WM_STATE_MAXIMIZED_HORZ");
- ECORE_X_ATOM_NET_WM_STATE_SHADED = _ATOM_GET("_NET_WM_STATE_SHADED");
- ECORE_X_ATOM_NET_WM_STATE_SKIP_TASKBAR =
_ATOM_GET("_NET_WM_STATE_SKIP_TASKBAR");
- ECORE_X_ATOM_NET_WM_STATE_SKIP_PAGER =
_ATOM_GET("_NET_WM_STATE_SKIP_PAGER");
- ECORE_X_ATOM_NET_WM_STATE_HIDDEN = _ATOM_GET("_NET_WM_STATE_HIDDEN");
- ECORE_X_ATOM_NET_WM_STATE_FULLSCREEN =
_ATOM_GET("_NET_WM_STATE_FULLSCREEN");
- ECORE_X_ATOM_NET_WM_STATE_ABOVE = _ATOM_GET("_NET_WM_STATE_ABOVE");
- ECORE_X_ATOM_NET_WM_STATE_BELOW = _ATOM_GET("_NET_WM_STATE_BELOW");
- ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION =
_ATOM_GET("_NET_WM_STATE_DEMANDS_ATTENTION");
-
- ECORE_X_ATOM_NET_WM_WINDOW_OPACITY = _ATOM_GET("_NET_WM_WINDOW_OPACITY");
- ECORE_X_ATOM_NET_WM_WINDOW_SHADOW = _ATOM_GET("_NET_WM_WINDOW_SHADOW");
- ECORE_X_ATOM_NET_WM_WINDOW_SHADE = _ATOM_GET("_NET_WM_WINDOW_SHADE");
-
- ECORE_X_ATOM_NET_FRAME_EXTENTS = _ATOM_GET("_NET_FRAME_EXTENTS");
- ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS =
_ATOM_GET("_NET_REQUEST_FRAME_EXTENTS");
-
- ECORE_X_ATOM_NET_WM_PING = _ATOM_GET("_NET_WM_PING");
- ECORE_X_ATOM_NET_WM_SYNC_REQUEST = _ATOM_GET("_NET_WM_SYNC_REQUEST");
- ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER =
_ATOM_GET("_NET_WM_SYNC_REQUEST_COUNTER");
-
- ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN = _ATOM_GET("_NET_STARTUP_INFO_BEGIN");
- ECORE_X_ATOM_NET_STARTUP_INFO = _ATOM_GET("_NET_STARTUP_INFO");
-
startup_info = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
if (startup_info)
- {
- ecore_hash_free_value_cb_set(startup_info,
_ecore_x_netwm_startup_info_free);
- }
+ ecore_hash_free_value_cb_set(startup_info,
_ecore_x_netwm_startup_info_free);
}
EAPI void
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- ecore_x_private.h 15 Nov 2007 04:48:36 -0000 1.63
+++ ecore_x_private.h 9 Jul 2008 15:18:55 -0000 1.64
@@ -231,6 +231,8 @@
void _ecore_x_composite_init(void);
void _ecore_x_dpms_init(void);
+void _ecore_x_atoms_init(void);
+
/* from sync */
#endif
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_xcb_atom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_xcb_atom.c 11 May 2007 17:53:50 -0000 1.5
+++ ecore_xcb_atom.c 9 Jul 2008 15:18:55 -0000 1.6
@@ -15,210 +15,7 @@
/* Atoms */
/*********/
-/* generic atoms */
-EAPI Ecore_X_Atom ECORE_X_ATOM_ATOM = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_CARDINAL = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_FILE_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_STRING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_TEXT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WINDOW = 0;
-
-/* dnd atoms */
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_XDND = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_XDND = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_AWARE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ENTER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_TYPE_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_POSITION = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_COPY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_PRIVATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_ASK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LINK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_DESCRIPTION = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_PROXY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_STATUS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_LEAVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_DROP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_XDND_FINISHED = 0;
-
-/* dnd atoms that need to be exposed to the application interface */
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_COPY = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_LINK = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_ASK = 0;
-EAPI Ecore_X_Atom ECORE_X_DND_ACTION_PRIVATE = 0;
-
-/* old E atom */
-EAPI Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE = 0;
-
-/* old Gnome atom */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WIN_LAYER = 0;
-
-/* ICCCM atoms */
-
-/* ICCCM: client properties */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_NORMAL_HINTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_SIZE_HINTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_HINTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLASS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_TRANSIENT_FOR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND = 0; /* obsolete */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE = 0; /* obsolete */
-
-/* ICCCM: window manager properties */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_STATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_ICON_SIZE = 0;
-
-/* ICCCM: WM_STATE property */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CHANGE_STATE = 0;
-
-/* ICCCM: WM_PROTOCOLS properties */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_TAKE_FOCUS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_SAVE_YOURSELF = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_DELETE_WINDOW = 0;
-
-/* ICCCM: WM_COLORMAP properties */
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_NOTIFY = 0;
-
-/* ICCCM: session management properties */
-EAPI Ecore_X_Atom ECORE_X_ATOM_SM_CLIENT_ID = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_LEADER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_WM_WINDOW_ROLE = 0;
-
-/* Motif WM atom */
-EAPI Ecore_X_Atom ECORE_X_ATOM_MOTIF_WM_HINTS = 0;
-
-/* NetWM 1.3 atoms (http://standards.freedesktop.org/wm-spec/wm-spec-1.3.html)
*/
-
-/*
- * NetWM: Root Window Properties and related messages (complete)
- */
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTED = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLIENT_LIST_STACKING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_GEOMETRY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_VIEWPORT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CURRENT_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_NAMES = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_ACTIVE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WORKAREA = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_VIRTUAL_ROOTS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_DESKTOP_LAYOUT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_SHOWING_DESKTOP = 0;
-
-/*
- * NetWM: Other Root Window Messages (complete)
- */
-
-/* pager */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_CLOSE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_MOVERESIZE_WINDOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_MOVERESIZE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_RESTACK_WINDOW = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS = 0;
-
-/*
- * NetWM: Application Window Properties (complete)
- */
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_DESKTOP = 0;
-
-/* window type */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DOCK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_TOOLBAR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_MENU = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_UTILITY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_SPLASH = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL = 0;
-
-/* state */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MODAL = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_STICKY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SHADED = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SKIP_TASKBAR = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_SKIP_PAGER = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_HIDDEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_FULLSCREEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_ABOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_BELOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION = 0;
-
-/* allowed actions */
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MOVE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_RESIZE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_SHADE = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_STICK = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ACTION_CLOSE = 0;
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_GEOMETRY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_PID = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_HANDLED_ICONS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_USER_TIME = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_ID = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS = 0;
-
-/*
- * NetWM: Window Manager Protocols (complete)
- */
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_PING = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER = 0;
-
-/*
- * NetWM: Not in the spec
- */
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_OPACITY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADOW = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_WM_WINDOW_SHADE = 0;
-
-/*
- * Startup Notification
(http://standards.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt)
- */
-
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO_BEGIN = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_NET_STARTUP_INFO = 0;
-
-/* selection atoms */
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_TARGETS = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PRIMARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_SECONDARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_CLIPBOARD = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_PRIMARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_SECONDARY = 0;
-EAPI Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_CLIPBOARD = 0;
+#include "ecore_x_atoms_decl.h"
/* To avoid round trips, the initialization is separated in 2
functions: _ecore_xcb_atom_init and
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
