Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecore-e16.c ecore-e16.h x.c
Log Message:
Fix compiling with ecore_x
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ecore-e16.c 7 Jan 2006 07:20:58 -0000 1.21
+++ ecore-e16.c 7 Jan 2006 08:53:15 -0000 1.22
@@ -41,9 +41,11 @@
#define ECORE_X_PROP_LIST_ADD 1
#define ECORE_X_PROP_LIST_TOGGLE 2
-#ifdef USE_ECORE_X
+extern Display *disp;
-extern Display *_ecore_x_disp;
+#define _ecore_x_disp disp
+
+#ifdef USE_ECORE_X
/* WM identification */
Ecore_X_Atom ECORE_X_ATOM_NET_SUPPORTED = 0;
@@ -379,7 +381,6 @@
return str;
}
-#endif /* USE_ECORE_X */
/*
* Set X ID (array) property
@@ -643,6 +644,8 @@
return ecore_x_window_prop_xid_list_get(win, atom, XA_WINDOW, plst);
}
+#endif /* USE_ECORE_X */
+
#ifndef USE_ECORE_X
/*
* ICCCM stuff
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore-e16.h 7 Jan 2006 07:20:58 -0000 1.15
+++ ecore-e16.h 7 Jan 2006 08:53:15 -0000 1.16
@@ -47,8 +47,6 @@
#define Ecore_X_Time Time
#define Ecore_X_GC GC
-#define _ecore_x_disp disp
-
int ecore_x_client_message32_send(Ecore_X_Window win,
Ecore_X_Atom type,
long mask,
@@ -67,6 +65,52 @@
Ecore_X_Atom atom,
unsigned int **plst);
+void ecore_x_window_prop_xid_set(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom type,
+ Ecore_X_ID * lst,
+ unsigned int num);
+int ecore_x_window_prop_xid_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom type,
+ Ecore_X_ID * lst,
+ unsigned int len);
+int ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom type,
+ Ecore_X_ID ** plst);
+void ecore_x_window_prop_xid_list_change(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom type,
+ Ecore_X_ID item,
+ int op);
+void ecore_x_window_prop_atom_set(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom * val,
+ unsigned int num);
+int ecore_x_window_prop_atom_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom * val,
+ unsigned int len);
+int ecore_x_window_prop_atom_list_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom ** plst);
+void ecore_x_window_prop_atom_list_change(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Atom item,
+ int op);
+void ecore_x_window_prop_window_set(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Window * val,
+ unsigned int num);
+int ecore_x_window_prop_window_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Window * val,
+ unsigned int len);
+int ecore_x_window_prop_window_list_get(Ecore_X_Window win,
+ Ecore_X_Atom atom,
+ Ecore_X_Window ** plst);
+
void ecore_x_window_prop_string_set(Ecore_X_Window win,
Ecore_X_Atom atom,
const char *str);
@@ -285,49 +329,3 @@
int ecore_x_window_prop_string_list_get(Ecore_X_Window win,
Ecore_X_Atom atom,
char ***plst);
-
-void ecore_x_window_prop_xid_set(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom type,
- Ecore_X_ID * lst,
- unsigned int num);
-int ecore_x_window_prop_xid_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom type,
- Ecore_X_ID * lst,
- unsigned int len);
-int ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom type,
- Ecore_X_ID ** plst);
-void ecore_x_window_prop_xid_list_change(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom type,
- Ecore_X_ID item,
- int op);
-void ecore_x_window_prop_atom_set(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom * val,
- unsigned int num);
-int ecore_x_window_prop_atom_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom * val,
- unsigned int len);
-int ecore_x_window_prop_atom_list_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom ** plst);
-void ecore_x_window_prop_atom_list_change(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Atom item,
- int op);
-void ecore_x_window_prop_window_set(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Window * val,
- unsigned int num);
-int ecore_x_window_prop_window_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Window * val,
- unsigned int len);
-int ecore_x_window_prop_window_list_get(Ecore_X_Window win,
- Ecore_X_Atom atom,
- Ecore_X_Window ** plst);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- x.c 7 Jan 2006 07:20:58 -0000 1.115
+++ x.c 7 Jan 2006 08:53:15 -0000 1.116
@@ -22,6 +22,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
+#ifdef USE_ECORE_X
+#include "ecore-e16.h"
+#endif
#include "xwin.h"
#include <X11/Xutil.h>
#include <X11/Xresource.h>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
