From bb3f3b8d83036777c562a0537e5cf1ce77656ece Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sun, 5 Nov 2006 15:14:49 +0000 Subject: [PATCH] Selection data should be untyped. Add const. Fix warnings. SVN revision: 26972 --- legacy/ecore/src/lib/ecore_x/Ecore_X.h | 18 ++++----- legacy/ecore/src/lib/ecore_x/ecore_x.c | 8 ++-- legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c | 4 +- legacy/ecore/src/lib/ecore_x/ecore_x_events.c | 17 +++++---- legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c | 16 +++++--- .../ecore/src/lib/ecore_x/ecore_x_private.h | 6 +-- .../src/lib/ecore_x/ecore_x_screensaver.c | 3 +- .../ecore/src/lib/ecore_x/ecore_x_selection.c | 38 ++++++++++--------- .../src/lib/ecore_x/ecore_x_window_prop.c | 2 +- 9 files changed, 63 insertions(+), 49 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h index 320c438f34..b48da45d97 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h @@ -986,23 +986,23 @@ EAPI int ecore_x_error_code_get(void); 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); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x.c b/legacy/ecore/src/lib/ecore_x/ecore_x.c index 1e96aef486..e1eb05eaad 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x.c @@ -603,9 +603,9 @@ ecore_x_sync(void) 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 @@ ecore_x_cursor_size_set(int size) { #ifdef ECORE_XCURSOR XcursorSetDefaultSize(_ecore_x_disp, size); +#else + size = 0; #endif } diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c b/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c index a945586334..3c9d6c8155 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c @@ -232,7 +232,7 @@ EAPI void 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_drag(int x, int y) ecore_x_dnd_version_get(win)); if (win != _source->dest) { - int i, num; + int i; unsigned char *data; Ecore_X_Atom *types; diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c index da21b4fe2a..6cfc4fd7a3 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c @@ -188,7 +188,7 @@ _ecore_x_event_handle_key_press(XEvent *xevent) 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 @@ _ecore_x_event_handle_key_press(XEvent *xevent) 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 @@ _ecore_x_event_handle_key_release(XEvent *xevent) 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 @@ _ecore_x_event_handle_key_release(XEvent *xevent) 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_event_handle_client_message(XEvent *xevent) 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_event_handle_client_message(XEvent *xevent) 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_x_event_handle_client_message(XEvent *xevent) 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 @@ _ecore_x_event_handle_screensaver_notify(XEvent *xevent) 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 @@ void _ecore_x_event_handle_fixes_selection_notify(XEvent *event) { /* Nothing here yet */ + event = NULL; } #endif diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c index 09e3919920..40483ed2e9 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c @@ -692,7 +692,7 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num) 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 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num) 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 @@ EAPI void 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 @@ EAPI void 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 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win, unsigned int serial) if (!win) return; - XSyncIntToValue(&value, serial); + XSyncIntToValue(&value, (int)serial); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; @@ -1327,6 +1327,9 @@ _ecore_x_netwm_startup_info_begin(Ecore_X_Window win, char *data) /* 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 @@ _ecore_x_netwm_startup_info(Ecore_X_Window win, char *data) /* 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; } diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h index 0400d4a533..f34bb691bb 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h @@ -90,7 +90,7 @@ typedef struct _Ecore_X_Selection_Parser Ecore_X_Selection_Parser; 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 @@ Ecore_X_Atom 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); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_screensaver.c b/legacy/ecore/src/lib/ecore_x/ecore_x_screensaver.c index 2ab03a126c..492a015970 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_screensaver.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_screensaver.c @@ -48,6 +48,7 @@ ecore_x_screensaver_event_listen_set(int on) XScreenSaverSelectInput(_ecore_x_disp, root, ScreenSaverNotifyMask); else XScreenSaverSelectInput(_ecore_x_disp, root, 0); +#else + on = 0; #endif } - diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c b/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c index 3590004b0a..fb99c2c3fa 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c @@ -13,11 +13,11 @@ static Ecore_X_Selection_Parser *parsers = NULL; 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 @@ _ecore_x_selection_get(Ecore_X_Atom selection) } 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 @@ _ecore_x_selection_set(Window w, unsigned char *data, int size, Ecore_X_Atom sel * 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 @@ ecore_x_selection_primary_clear(void) * 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 @@ ecore_x_selection_secondary_clear(void) * 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 @@ ecore_x_selection_xdnd_clear(void) * 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 @@ _ecore_x_selection_target_get(Ecore_X_Atom target) } 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 @@ _ecore_x_selection_request(Ecore_X_Window w, Ecore_X_Atom selection, char *targe } 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 @@ ecore_x_selection_xdnd_request(Ecore_X_Window w, char *target) } 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 @@ _ecore_x_selection_converter_text(char *target, void *data, int size, void **dat 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 @@ ecore_x_selection_parser_del(const char *target) /* 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 @@ _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) +_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 @@ _ecore_x_selection_data_files_free(void *data) } 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 @@ _ecore_x_selection_data_text_free(void *data) } 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; diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c b/legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c index ca97fbe83c..60816800fd 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c @@ -433,7 +433,7 @@ ecore_x_window_prop_property_set(Ecore_X_Window win, Ecore_X_Atom property, Ecor * 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;