Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x.c ecore_x_dnd.c ecore_x_events.c
ecore_x_netwm.c ecore_x_private.h ecore_x_screensaver.c
ecore_x_selection.c ecore_x_window_prop.c
Log Message:
Selection data should be untyped. Add const. Fix warnings.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- Ecore_X.h 29 Sep 2006 05:49:13 -0000 1.174
+++ Ecore_X.h 5 Nov 2006 15:14:49 -0000 1.175
@@ -986,23 +986,23 @@
EAPI void ecore_x_event_mask_set(Ecore_X_Window w,
Ecore_X_Event_Mask mask);
EAPI void ecore_x_event_mask_unset(Ecore_X_Window w,
Ecore_X_Event_Mask mask);
-EAPI int ecore_x_selection_primary_set(Ecore_X_Window w, unsigned
char *data, int size);
+EAPI int ecore_x_selection_primary_set(Ecore_X_Window w, const
void *data, int size);
EAPI int ecore_x_selection_primary_clear(void);
-EAPI int ecore_x_selection_secondary_set(Ecore_X_Window w,
unsigned char *data, int size);
+EAPI int ecore_x_selection_secondary_set(Ecore_X_Window w, const
void *data, int size);
EAPI int ecore_x_selection_secondary_clear(void);
-EAPI int ecore_x_selection_xdnd_set(Ecore_X_Window w, unsigned
char *data, int size);
+EAPI int ecore_x_selection_xdnd_set(Ecore_X_Window w, const void
*data, int size);
EAPI int ecore_x_selection_xdnd_clear(void);
-EAPI int ecore_x_selection_clipboard_set(Ecore_X_Window w,
unsigned char *data, int size);
+EAPI int ecore_x_selection_clipboard_set(Ecore_X_Window w, const
void *data, int size);
EAPI int ecore_x_selection_clipboard_clear(void);
-EAPI void ecore_x_selection_primary_request(Ecore_X_Window w, char
*target);
-EAPI void ecore_x_selection_secondary_request(Ecore_X_Window w,
char *target);
-EAPI void ecore_x_selection_xdnd_request(Ecore_X_Window w, char
*target);
-EAPI void ecore_x_selection_clipboard_request(Ecore_X_Window w,
char *target);
+EAPI void ecore_x_selection_primary_request(Ecore_X_Window w,
const char *target);
+EAPI void ecore_x_selection_secondary_request(Ecore_X_Window w,
const char *target);
+EAPI void ecore_x_selection_xdnd_request(Ecore_X_Window w, const
char *target);
+EAPI void ecore_x_selection_clipboard_request(Ecore_X_Window w,
const char *target);
EAPI void ecore_x_selection_converter_add(char *target, int
(*func)(char *target, void *data, int size, void **data_ret, int *size_ret));
EAPI void ecore_x_selection_converter_atom_add(Ecore_X_Atom
target, int (*func)(char *target, void *data, int size, void **data_ret, int
*size_ret));
EAPI void ecore_x_selection_converter_del(char *target);
EAPI void ecore_x_selection_converter_atom_del(Ecore_X_Atom
target);
-EAPI void ecore_x_selection_parser_add(const char *target, void
*(*func)(const char *target, unsigned char *data, int size, int format));
+EAPI void ecore_x_selection_parser_add(const char *target, void
*(*func)(const char *target, void *data, int size, int format));
EAPI void ecore_x_selection_parser_del(const char *target);
EAPI void ecore_x_dnd_aware_set(Ecore_X_Window win, int on);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- ecore_x.c 30 Sep 2006 10:18:31 -0000 1.116
+++ ecore_x.c 5 Nov 2006 15:14:49 -0000 1.117
@@ -603,9 +603,9 @@
EAPI void
ecore_x_killall(Ecore_X_Window root)
{
- int screens;
- int i, j;
-
+ unsigned int screens;
+ unsigned int i, j;
+
XGrabServer(_ecore_x_disp);
screens = ScreenCount(_ecore_x_disp);
@@ -1364,6 +1364,8 @@
{
#ifdef ECORE_XCURSOR
XcursorSetDefaultSize(_ecore_x_disp, size);
+#else
+ size = 0;
#endif
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dnd.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ecore_x_dnd.c 6 Jan 2006 21:56:05 -0000 1.29
+++ ecore_x_dnd.c 5 Nov 2006 15:14:49 -0000 1.30
@@ -232,7 +232,7 @@
ecore_x_dnd_types_set(Ecore_X_Window win, char **types, unsigned int num_types)
{
Ecore_X_Atom *newset = NULL;
- int i;
+ unsigned int i;
unsigned char *data = NULL;
if (!num_types)
@@ -449,7 +449,7 @@
ecore_x_dnd_version_get(win));
if (win != _source->dest)
{
- int i, num;
+ int i;
unsigned char *data;
Ecore_X_Atom *types;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- ecore_x_events.c 29 Sep 2006 05:49:13 -0000 1.86
+++ ecore_x_events.c 5 Nov 2006 15:14:49 -0000 1.87
@@ -188,7 +188,7 @@
int val;
char buf[256];
KeySym sym;
- XComposeStatus stat;
+ XComposeStatus status;
e = calloc(1, sizeof(Ecore_X_Event_Key_Down));
if (!e) return;
@@ -205,7 +205,7 @@
free(e);
return;
}
- val = XLookupString((XKeyEvent *)xevent, buf, sizeof(buf), &sym, &stat);
+ val = XLookupString((XKeyEvent *)xevent, buf, sizeof(buf), &sym, &status);
if (val > 0)
{
buf[val] = 0;
@@ -239,7 +239,7 @@
int val;
char buf[256];
KeySym sym;
- XComposeStatus stat;
+ XComposeStatus status;
e = calloc(1, sizeof(Ecore_X_Event_Key_Up));
if (!e) return;
@@ -256,7 +256,7 @@
free(e);
return;
}
- val = XLookupString((XKeyEvent *)xevent, buf, sizeof(buf), &sym, &stat);
+ val = XLookupString((XKeyEvent *)xevent, buf, sizeof(buf), &sym, &status);
if (val > 0)
{
buf[val] = 0;
@@ -1339,7 +1339,7 @@
Ecore_X_DND_Target *target;
target = _ecore_x_dnd_target_get();
- if ((target->source != xevent->xclient.data.l[0]) ||
+ if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) ||
(target->win != xevent->xclient.window))
return;
@@ -1406,7 +1406,7 @@
Ecore_X_DND_Target *target;
target = _ecore_x_dnd_target_get();
- if ((target->source != xevent->xclient.data.l[0]) ||
+ if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) ||
(target->win != xevent->xclient.window))
return;
@@ -1568,7 +1568,7 @@
ecore_event_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST, e, NULL, NULL);
}
else if ((xevent->xclient.message_type == ECORE_X_ATOM_WM_PROTOCOLS)
- && (xevent->xclient.data.l[0] == ECORE_X_ATOM_NET_WM_PING)
+ && ((Ecore_X_Atom)xevent->xclient.data.l[0] ==
ECORE_X_ATOM_NET_WM_PING)
&& (xevent->xclient.format == 32))
{
Ecore_X_Event_Ping *e;
@@ -1656,6 +1656,8 @@
e->on = 0;
e->time = screensaver_event->time;
ecore_event_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, e, NULL, NULL);
+#else
+ xevent = NULL;
#endif
}
@@ -1713,6 +1715,7 @@
_ecore_x_event_handle_fixes_selection_notify(XEvent *event)
{
/* Nothing here yet */
+ event = NULL;
}
#endif
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_netwm.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ecore_x_netwm.c 2 Oct 2006 10:37:13 -0000 1.57
+++ ecore_x_netwm.c 5 Nov 2006 15:14:49 -0000 1.58
@@ -692,7 +692,7 @@
p = data;
for (i = 0; i < icons; i++)
{
- int *ps, *pd, *pe;
+ unsigned int *ps, *pd, *pe;
len = p[0] * p[1];
((*icon)[i]).width = p[0];
@@ -711,7 +711,7 @@
pd = ((*icon)[i]).data;
ps = src;
pe = ps + len;
- for (ps; ps < pe; ps++)
+ for (; ps < pe; ps++)
{
unsigned int r, g, b, a;
@@ -885,7 +885,7 @@
ecore_x_netwm_window_state_set(Ecore_X_Window win, Ecore_X_Window_State
*state, unsigned int num)
{
Ecore_X_Atom *set;
- int i;
+ unsigned int i;
if (!num)
{
@@ -1091,7 +1091,7 @@
ecore_x_netwm_allowed_action_set(Ecore_X_Window win, Ecore_X_Action *action,
unsigned int num)
{
Ecore_X_Atom *set;
- int i;
+ unsigned int i;
if (!num)
{
@@ -1229,7 +1229,7 @@
if (!win) return;
- XSyncIntToValue(&value, serial);
+ XSyncIntToValue(&value, (int)serial);
xev.xclient.type = ClientMessage;
xev.xclient.display = _ecore_x_disp;
@@ -1327,6 +1327,9 @@
/* We have a '\0' in there, the message is done */
_ecore_x_netwm_startup_info_process(info);
}
+#else
+ win = 0;
+ data = NULL;
#endif
return 1;
}
@@ -1361,6 +1364,9 @@
/* We have a '\0' in there, the message is done */
_ecore_x_netwm_startup_info_process(info);
}
+#else
+ win = 0;
+ data = NULL;
#endif
return 1;
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ecore_x_private.h 29 Sep 2006 05:49:13 -0000 1.55
+++ ecore_x_private.h 5 Nov 2006 15:14:49 -0000 1.56
@@ -90,7 +90,7 @@
struct _Ecore_X_Selection_Parser
{
char *target;
- void *(*parse)(const char *target, unsigned char *data, int size, int
format);
+ void *(*parse)(const char *target, void *data, int size, int format);
Ecore_X_Selection_Parser *next;
};
@@ -213,9 +213,9 @@
char *_ecore_x_selection_target_get(Ecore_X_Atom target);
Ecore_X_Selection_Intern *
_ecore_x_selection_get(Ecore_X_Atom selection);
-int _ecore_x_selection_set(Window w, unsigned char *data, int len,
Ecore_X_Atom selection);
+int _ecore_x_selection_set(Window w, const void *data, int len, Ecore_X_Atom
selection);
int _ecore_x_selection_convert(Ecore_X_Atom selection, Ecore_X_Atom target,
void **data_ret);
-void *_ecore_x_selection_parse(const char *target, unsigned char *data, int
size, int format);
+void *_ecore_x_selection_parse(const char *target, void *data, int size, int
format);
void _ecore_x_sync_magic_send(int val, Ecore_X_Window swin);
void _ecore_x_window_grab_remove(Ecore_X_Window win);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_screensaver.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_x_screensaver.c 31 May 2006 19:14:59 -0000 1.3
+++ ecore_x_screensaver.c 5 Nov 2006 15:14:49 -0000 1.4
@@ -48,6 +48,7 @@
XScreenSaverSelectInput(_ecore_x_disp, root, ScreenSaverNotifyMask);
else
XScreenSaverSelectInput(_ecore_x_disp, root, 0);
+#else
+ on = 0;
#endif
}
-
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_selection.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ecore_x_selection.c 29 Sep 2006 05:49:14 -0000 1.30
+++ ecore_x_selection.c 5 Nov 2006 15:14:49 -0000 1.31
@@ -13,11 +13,11 @@
static int _ecore_x_selection_converter_text(char *target, void *data, int
size, void **data_ret, int *size_ret);
static int _ecore_x_selection_data_default_free(void *data);
-static void *_ecore_x_selection_parser_files(const char *target, unsigned char
*data, int size, int format);
+static void *_ecore_x_selection_parser_files(const char *target, void *data,
int size, int format);
static int _ecore_x_selection_data_files_free(void *data);
-static void *_ecore_x_selection_parser_text(const char *target, unsigned char
*data, int size, int format);
+static void *_ecore_x_selection_parser_text(const char *target, void *data,
int size, int format);
static int _ecore_x_selection_data_text_free(void *data);
-static void *_ecore_x_selection_parser_targets(const char *target, unsigned
char *data, int size, int format);
+static void *_ecore_x_selection_parser_targets(const char *target, void *data,
int size, int format);
static int _ecore_x_selection_data_targets_free(void *data);
#define ECORE_X_SELECTION_DATA(x) ((Ecore_X_Selection_Data *)(x))
@@ -101,7 +101,7 @@
}
int
-_ecore_x_selection_set(Window w, unsigned char *data, int size, Ecore_X_Atom
selection)
+_ecore_x_selection_set(Window w, const void *data, int size, Ecore_X_Atom
selection)
{
int in;
unsigned char *buf = NULL;
@@ -153,7 +153,7 @@
* claimed, or 0 if unsuccessful.
*/
EAPI int
-ecore_x_selection_primary_set(Ecore_X_Window w, unsigned char *data, int size)
+ecore_x_selection_primary_set(Ecore_X_Window w, const void *data, int size)
{
return _ecore_x_selection_set(w, data, size,
ECORE_X_ATOM_SELECTION_PRIMARY);
}
@@ -179,7 +179,7 @@
* claimed, or 0 if unsuccessful.
*/
EAPI int
-ecore_x_selection_secondary_set(Ecore_X_Window w, unsigned char *data, int
size)
+ecore_x_selection_secondary_set(Ecore_X_Window w, const void *data, int size)
{
return _ecore_x_selection_set(w, data, size,
ECORE_X_ATOM_SELECTION_SECONDARY);
}
@@ -205,7 +205,7 @@
* claimed, or 0 if unsuccessful.
*/
EAPI int
-ecore_x_selection_xdnd_set(Ecore_X_Window w, unsigned char *data, int size)
+ecore_x_selection_xdnd_set(Ecore_X_Window w, const void *data, int size)
{
return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_XDND);
}
@@ -234,7 +234,7 @@
* request. The buffer must be freed when done with.
*/
EAPI int
-ecore_x_selection_clipboard_set(Ecore_X_Window w, unsigned char *data, int
size)
+ecore_x_selection_clipboard_set(Ecore_X_Window w, const void *data, int size)
{
return _ecore_x_selection_set(w, data, size,
ECORE_X_ATOM_SELECTION_CLIPBOARD);
}
@@ -290,7 +290,7 @@
}
static void
-_ecore_x_selection_request(Ecore_X_Window w, Ecore_X_Atom selection, char
*target_str)
+_ecore_x_selection_request(Ecore_X_Window w, Ecore_X_Atom selection, const
char *target_str)
{
Ecore_X_Atom target, prop;
@@ -310,19 +310,19 @@
}
EAPI void
-ecore_x_selection_primary_request(Ecore_X_Window w, char *target)
+ecore_x_selection_primary_request(Ecore_X_Window w, const char *target)
{
_ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_PRIMARY, target);
}
EAPI void
-ecore_x_selection_secondary_request(Ecore_X_Window w, char *target)
+ecore_x_selection_secondary_request(Ecore_X_Window w, const char *target)
{
_ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_SECONDARY, target);
}
EAPI void
-ecore_x_selection_xdnd_request(Ecore_X_Window w, char *target)
+ecore_x_selection_xdnd_request(Ecore_X_Window w, const char *target)
{
Ecore_X_Atom atom;
Ecore_X_DND_Target *_target;
@@ -335,7 +335,7 @@
}
EAPI void
-ecore_x_selection_clipboard_request(Ecore_X_Window w, char *target)
+ecore_x_selection_clipboard_request(Ecore_X_Window w, const char *target)
{
_ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_CLIPBOARD, target);
}
@@ -523,7 +523,7 @@
EAPI void
ecore_x_selection_parser_add(const char *target,
- void *(*func)(const char *target, unsigned char *data, int size, int
format))
+ void *(*func)(const char *target, void *data, int size, int format))
{
Ecore_X_Selection_Parser *prs;
@@ -586,7 +586,7 @@
/* Locate and run conversion callback for specified selection target */
void *
-_ecore_x_selection_parse(const char *target, unsigned char *data, int size,
int format)
+_ecore_x_selection_parse(const char *target, void *data, int size, int format)
{
Ecore_X_Selection_Parser *prs;
Ecore_X_Selection_Data *sel;
@@ -621,9 +621,10 @@
}
static void *
-_ecore_x_selection_parser_files(const char *target, unsigned char *data, int
size, int format)
+_ecore_x_selection_parser_files(const char *target, void *_data, int size, int
format __UNUSED__)
{
Ecore_X_Selection_Data_Files *sel;
+ char *data = _data;
int i, is;
char *tmp;
@@ -704,9 +705,10 @@
}
static void *
-_ecore_x_selection_parser_text(const char *target __UNUSED__, unsigned char
*data, int size, int format)
+_ecore_x_selection_parser_text(const char *target __UNUSED__, void *_data, int
size, int format __UNUSED__)
{
Ecore_X_Selection_Data_Text *sel;
+ char *data = _data;
sel = calloc(1, sizeof(Ecore_X_Selection_Data_Text));
@@ -737,7 +739,7 @@
}
static void *
-_ecore_x_selection_parser_targets(const char *target __UNUSED__, unsigned char
*data, int size, int format)
+_ecore_x_selection_parser_targets(const char *target __UNUSED__, void *data,
int size, int format __UNUSED__)
{
Ecore_X_Selection_Data_Targets *sel;
unsigned long *targets;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_window_prop.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- ecore_x_window_prop.c 29 Sep 2006 05:49:14 -0000 1.81
+++ ecore_x_window_prop.c 5 Nov 2006 15:14:49 -0000 1.82
@@ -433,7 +433,7 @@
* FIXME: To be fixed.
*/
EAPI int
-ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property,
Ecore_X_Atom type, int size, unsigned char **data, int *num)
+ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property,
Ecore_X_Atom type, int size __UNUSED__, unsigned char **data, int *num)
{
Atom type_ret = 0;
int ret, size_ret = 0;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs