Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
ecore-e16.c ecore-e16.h ewmh.c icccm.c
Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecore-e16.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore-e16.c 23 Oct 2004 14:23:38 -0000 1.1.2.2
+++ ecore-e16.c 23 Oct 2004 15:36:27 -0000 1.1.2.3
@@ -63,14 +63,9 @@
#else /* USE_ECORE_X */
-Atom _ecore_x_atom_wm_state = 0;
-Atom _ecore_x_atom_wm_protocols = 0;
-Atom _ecore_x_atom_wm_delete_window = 0;
-Atom _ecore_x_atom_wm_take_focus = 0;
-
-#if 0
-Atom _ecore_x_atom_wm_save_yourself = 0;
-#endif
+/*
+ * General stuff
+ */
int
ecore_x_client_message32_send(Window win, Atom type, long d0, long d1,
@@ -91,6 +86,33 @@
return XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev);
}
+/*
+ * ICCCM stuff
+ */
+Atom _ecore_x_atom_wm_state = 0;
+Atom _ecore_x_atom_wm_protocols = 0;
+Atom _ecore_x_atom_wm_delete_window = 0;
+Atom _ecore_x_atom_wm_take_focus = 0;
+
+#if 0
+Atom _ecore_x_atom_wm_save_yourself = 0;
+#endif
+
+void
+ecore_x_icccm_init(void)
+{
+ _ecore_x_atom_wm_state = XInternAtom(disp, "WM_STATE", False);
+
+ _ecore_x_atom_wm_protocols = XInternAtom(disp, "WM_PROTOCOLS", False);
+ _ecore_x_atom_wm_delete_window =
+ XInternAtom(disp, "WM_DELETE_WINDOW", False);
+ _ecore_x_atom_wm_take_focus = XInternAtom(disp, "WM_TAKE_FOCUS", False);
+#if 0
+ _ecore_x_atom_wm_save_yourself =
+ XInternAtom(disp, "WM_SAVE_YOURSELF", False);
+#endif
+}
+
static void
ecore_x_icccm_state_set(Ecore_X_Window win, unsigned int state)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecore-e16.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ecore-e16.h 23 Oct 2004 14:23:38 -0000 1.1.2.6
+++ ecore-e16.h 23 Oct 2004 15:36:27 -0000 1.1.2.7
@@ -42,7 +42,8 @@
void ecore_x_grab(void);
void ecore_x_ungrab(void);
-int ecore_x_client_message32_send(Window win, Atom type,
+int ecore_x_client_message32_send(Ecore_X_Window win,
+ Ecore_X_Atom type,
long d0, long d1, long d2,
long d3, long d4);
@@ -51,8 +52,6 @@
void ecore_x_icccm_take_focus_send(Ecore_X_Window win,
Ecore_X_Time ts);
-#endif
-
/* Misc. */
extern Atom _ecore_x_atom_utf8_string;
@@ -62,14 +61,12 @@
extern Atom _ecore_x_atom_wm_delete_window;
extern Atom _ecore_x_atom_wm_take_focus;
-void ecore_x_icccm_state_set_iconic(Ecore_X_Window win);
-void ecore_x_icccm_state_set_normal(Ecore_X_Window win);
-void ecore_x_icccm_state_set_withdrawn(Ecore_X_Window win);
-
#if 0
extern Atom _ecore_x_atom_wm_save_yourself;
#endif
+void ecore_x_icccm_init(void);
+
/* NETWM (EWMH) */
extern Atom _ecore_x_atom_net_number_of_desktops;
extern Atom _ecore_x_atom_net_virtual_roots;
@@ -84,12 +81,15 @@
void ecore_x_netwm_init(void);
-void ecore_x_netwm_desk_count_set(Window root, int n_desks);
-void ecore_x_netwm_desk_roots_set(Window root, int n_desks,
- Window * vroots);
-void ecore_x_netwm_desk_names_set(Window root, int n_desks,
+void ecore_x_netwm_desk_count_set(Ecore_X_Window root,
+ int n_desks);
+void ecore_x_netwm_desk_roots_set(Ecore_X_Window root,
+ int n_desks,
+ Ecore_X_Window * vroots);
+void ecore_x_netwm_desk_names_set(Ecore_X_Window root,
+ int n_desks,
const char **names);
-void ecore_x_netwm_desk_size_set(Window root, int width,
+void ecore_x_netwm_desk_size_set(Ecore_X_Window root, int width,
int height);
void ecore_x_netwm_desk_workareas_set(Ecore_X_Window root,
int n_desks, int *areas);
@@ -99,6 +99,7 @@
int n_desks, int *origins);
void ecore_x_netwm_showing_desktop_set(Ecore_X_Window root,
int on);
+
void ecore_x_netwm_client_list_set(Ecore_X_Window root,
int n_clients,
Ecore_X_Window * p_clients);
@@ -108,3 +109,9 @@
p_clients);
void ecore_x_netwm_client_active_set(Ecore_X_Window root,
Ecore_X_Window win);
+
+#endif
+
+void ecore_x_icccm_state_set_iconic(Ecore_X_Window win);
+void ecore_x_icccm_state_set_normal(Ecore_X_Window win);
+void ecore_x_icccm_state_set_withdrawn(Ecore_X_Window win);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.55.2.12
retrieving revision 1.55.2.13
diff -u -3 -r1.55.2.12 -r1.55.2.13
--- ewmh.c 23 Oct 2004 14:23:38 -0000 1.55.2.12
+++ ewmh.c 23 Oct 2004 15:36:27 -0000 1.55.2.13
@@ -297,10 +297,10 @@
EWMH_SetDesktopRoots(void)
{
int i, n_desks;
- Window *wl;
+ Ecore_X_Window *wl;
n_desks = DesksGetNumber();
- wl = Emalloc(n_desks * sizeof(Window));
+ wl = Emalloc(n_desks * sizeof(Ecore_X_Window));
if (!wl)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.76.2.11
retrieving revision 1.76.2.12
diff -u -3 -r1.76.2.11 -r1.76.2.12
--- icccm.c 23 Oct 2004 14:23:39 -0000 1.76.2.11
+++ icccm.c 23 Oct 2004 15:36:28 -0000 1.76.2.12
@@ -22,6 +22,12 @@
*/
#include "E.h"
+#ifdef USE_ECORE_X /* Shouldn't be here */
+extern Atom _ecore_x_atom_wm_protocols;
+extern Atom _ecore_x_atom_wm_delete_window;
+extern Atom _ecore_x_atom_wm_take_focus;
+#endif
+
#define FREE_AND_CLEAR(ptr) if (ptr) { Efree(ptr); ptr = NULL; }
static Atom E_XA_WM_CHANGE_STATE = 0;
@@ -52,17 +58,9 @@
E_XA_WM_HINTS = XInternAtom(disp, "WM_HINTS", False);
E_XA_WM_CLIENT_LEADER = XInternAtom(disp, "WM_CLIENT_LEADER", False);
E_XA_WM_TRANSIENT_FOR = XInternAtom(disp, "WM_TRANSIENT_FOR", False);
-#ifndef USE_ECORE_X
- _ecore_x_atom_wm_state = XInternAtom(disp, "WM_STATE", False);
- _ecore_x_atom_wm_protocols = XInternAtom(disp, "WM_PROTOCOLS", False);
- _ecore_x_atom_wm_delete_window =
- XInternAtom(disp, "WM_DELETE_WINDOW", False);
- _ecore_x_atom_wm_take_focus = XInternAtom(disp, "WM_TAKE_FOCUS", False);
-#if 0
- _ecore_x_atom_wm_save_yourself =
- XInternAtom(disp, "WM_SAVE_YOURSELF", False);
-#endif
+#ifndef USE_ECORE_X
+ ecore_x_icccm_init();
#endif
if (Mode.wm.window)
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
