summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-12-03 20:05:48 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-12-03 20:05:48 +0000
commit8b6899154c19fc6059b0727f04c4bd66bf4260e7 (patch)
tree417b33b0721576290cb59cfa1ab24e28cd71b705
parent6b13c32a78443e6248025c1357f04d3d0f303c9a (diff)
in 2011, we began using formatting tools to fix problematic formatting.
in later 2011, we began using formatting tools to fix problematic formatting caused by previous runs of formatting tools used to fix problematic formatting SVN revision: 65852
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c196
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c10
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c16
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c12
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c50
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c18
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c96
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c8
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c307
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c55
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c4
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c18
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c180
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c74
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c6
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c267
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c30
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c23
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c313
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c42
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c5
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_region.c16
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c259
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c16
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c38
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c230
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c142
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c102
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c2
30 files changed, 1275 insertions, 1262 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index f0db8e2fb3..7168d49ff5 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -19,9 +19,9 @@
19#include "Ecore_X_Atoms.h" 19#include "Ecore_X_Atoms.h"
20#include "Ecore_Input.h" 20#include "Ecore_Input.h"
21 21
22static Eina_Bool _ecore_x_fd_handler(void *data, 22static Eina_Bool _ecore_x_fd_handler(void *data,
23 Ecore_Fd_Handler *fd_handler); 23 Ecore_Fd_Handler *fd_handler);
24static Eina_Bool _ecore_x_fd_handler_buf(void *data, 24static Eina_Bool _ecore_x_fd_handler_buf(void *data,
25 Ecore_Fd_Handler *fd_handler); 25 Ecore_Fd_Handler *fd_handler);
26static int _ecore_x_key_mask_get(KeySym sym); 26static int _ecore_x_key_mask_get(KeySym sym);
27static int _ecore_x_event_modifier(unsigned int state); 27static int _ecore_x_event_modifier(unsigned int state);
@@ -139,9 +139,9 @@ EAPI int ECORE_X_LOCK_SHIFT = 0;
139#ifdef LOGRT 139#ifdef LOGRT
140static double t0 = 0.0; 140static double t0 = 0.0;
141static Status (*_logrt_real_reply)(Display *disp, 141static Status (*_logrt_real_reply)(Display *disp,
142 void *rep, 142 void *rep,
143 int extra, 143 int extra,
144 Bool discard) = NULL; 144 Bool discard) = NULL;
145static void 145static void
146_logrt_init(void) 146_logrt_init(void)
147{ 147{
@@ -163,9 +163,9 @@ _logrt_init(void)
163 163
164Status 164Status
165_XReply(Display *disp, 165_XReply(Display *disp,
166 void *rep, 166 void *rep,
167 int extra, 167 int extra,
168 Bool discard) 168 Bool discard)
169{ 169{
170 void *bt[128]; 170 void *bt[128];
171 int i, n; 171 int i, n;
@@ -215,35 +215,35 @@ void
215_ecore_x_modifiers_get(void) 215_ecore_x_modifiers_get(void)
216{ 216{
217 /* everything has these... unless its like a pda... :) */ 217 /* everything has these... unless its like a pda... :) */
218 ECORE_X_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L); 218 ECORE_X_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L);
219 ECORE_X_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L); 219 ECORE_X_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L);
220 220
221 /* apple's xdarwin has no alt!!!! */ 221 /* apple's xdarwin has no alt!!!! */
222 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L); 222 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L);
223 if (!ECORE_X_MODIFIER_ALT) 223 if (!ECORE_X_MODIFIER_ALT)
224 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Meta_L); 224 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Meta_L);
225 225
226 if (!ECORE_X_MODIFIER_ALT) 226 if (!ECORE_X_MODIFIER_ALT)
227 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Super_L); 227 ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Super_L);
228 228
229 /* the windows key... a valid modifier :) */ 229 /* the windows key... a valid modifier :) */
230 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L); 230 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L);
231 if (!ECORE_X_MODIFIER_WIN) 231 if (!ECORE_X_MODIFIER_WIN)
232 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Mode_switch); 232 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Mode_switch);
233 233
234 if (!ECORE_X_MODIFIER_WIN) 234 if (!ECORE_X_MODIFIER_WIN)
235 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L); 235 ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L);
236 236
237 if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT) 237 if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT)
238 ECORE_X_MODIFIER_WIN = 0; 238 ECORE_X_MODIFIER_WIN = 0;
239 239
240 if (ECORE_X_MODIFIER_ALT == ECORE_X_MODIFIER_CTRL) 240 if (ECORE_X_MODIFIER_ALT == ECORE_X_MODIFIER_CTRL)
241 ECORE_X_MODIFIER_ALT = 0; 241 ECORE_X_MODIFIER_ALT = 0;
242 242
243 ECORE_X_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock); 243 ECORE_X_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock);
244 ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock); 244 ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock);
245 ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock); 245 ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock);
246 ECORE_X_LOCK_SHIFT = _ecore_x_key_mask_get(XK_Shift_Lock); 246 ECORE_X_LOCK_SHIFT = _ecore_x_key_mask_get(XK_Shift_Lock);
247} 247}
248 248
249/** 249/**
@@ -300,7 +300,7 @@ ecore_x_init(const char *name)
300 eina_init(); 300 eina_init();
301 _ecore_xlib_log_dom = eina_log_domain_register 301 _ecore_xlib_log_dom = eina_log_domain_register
302 ("ecore_x", ECORE_XLIB_DEFAULT_LOG_COLOR); 302 ("ecore_x", ECORE_XLIB_DEFAULT_LOG_COLOR);
303 if(_ecore_xlib_log_dom < 0) 303 if (_ecore_xlib_log_dom < 0)
304 { 304 {
305 EINA_LOG_ERR( 305 EINA_LOG_ERR(
306 "Impossible to create a log domain for the Ecore Xlib module."); 306 "Impossible to create a log domain for the Ecore Xlib module.");
@@ -375,7 +375,7 @@ ecore_x_init(const char *name)
375 375
376#ifdef ECORE_XGESTURE 376#ifdef ECORE_XGESTURE
377 if (XGestureQueryExtension(_ecore_x_disp, &gesture_base, &gesture_err_base)) 377 if (XGestureQueryExtension(_ecore_x_disp, &gesture_base, &gesture_err_base))
378 _ecore_x_event_gesture_id = gesture_base; 378 _ecore_x_event_gesture_id = gesture_base;
379 379
380 ECORE_X_EVENT_HANDLERS_GROW(gesture_base, GestureNumberEvents); 380 ECORE_X_EVENT_HANDLERS_GROW(gesture_base, GestureNumberEvents);
381#endif /* ifdef ECORE_XGESTURE */ 381#endif /* ifdef ECORE_XGESTURE */
@@ -497,20 +497,20 @@ ecore_x_init(const char *name)
497#ifdef ECORE_XGESTURE 497#ifdef ECORE_XGESTURE
498 if (_ecore_x_event_gesture_id) 498 if (_ecore_x_event_gesture_id)
499 { 499 {
500 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] = 500 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] =
501 _ecore_x_event_handle_gesture_notify_flick; 501 _ecore_x_event_handle_gesture_notify_flick;
502 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] = 502 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] =
503 _ecore_x_event_handle_gesture_notify_pan; 503 _ecore_x_event_handle_gesture_notify_pan;
504 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] = 504 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] =
505 _ecore_x_event_handle_gesture_notify_pinchrotation; 505 _ecore_x_event_handle_gesture_notify_pinchrotation;
506 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] = 506 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] =
507 _ecore_x_event_handle_gesture_notify_tap; 507 _ecore_x_event_handle_gesture_notify_tap;
508 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] = 508 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] =
509 _ecore_x_event_handle_gesture_notify_tapnhold; 509 _ecore_x_event_handle_gesture_notify_tapnhold;
510 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] = 510 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] =
511 _ecore_x_event_handle_gesture_notify_hold; 511 _ecore_x_event_handle_gesture_notify_hold;
512 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] = 512 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] =
513 _ecore_x_event_handle_gesture_notify_group; 513 _ecore_x_event_handle_gesture_notify_group;
514 } 514 }
515 515
516#endif /* ifdef ECORE_XGESTURE */ 516#endif /* ifdef ECORE_XGESTURE */
@@ -767,8 +767,8 @@ ecore_x_default_screen_get(void)
767 */ 767 */
768EAPI void 768EAPI void
769ecore_x_screen_size_get(const Ecore_X_Screen *screen, 769ecore_x_screen_size_get(const Ecore_X_Screen *screen,
770 int *w, 770 int *w,
771 int *h) 771 int *h)
772{ 772{
773 Screen *s = (Screen *)screen; 773 Screen *s = (Screen *)screen;
774 LOGFN(__FILE__, __LINE__, __FUNCTION__); 774 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -992,7 +992,7 @@ ecore_x_bell(int percent)
992} 992}
993 993
994static Eina_Bool 994static Eina_Bool
995_ecore_x_fd_handler(void *data, 995_ecore_x_fd_handler(void *data,
996 Ecore_Fd_Handler *fd_handler __UNUSED__) 996 Ecore_Fd_Handler *fd_handler __UNUSED__)
997{ 997{
998 Display *d; 998 Display *d;
@@ -1024,7 +1024,7 @@ _ecore_x_fd_handler(void *data,
1024} 1024}
1025 1025
1026static Eina_Bool 1026static Eina_Bool
1027_ecore_x_fd_handler_buf(void *data, 1027_ecore_x_fd_handler_buf(void *data,
1028 Ecore_Fd_Handler *fd_handler __UNUSED__) 1028 Ecore_Fd_Handler *fd_handler __UNUSED__)
1029{ 1029{
1030 Display *d; 1030 Display *d;
@@ -1313,7 +1313,7 @@ ecore_x_window_client_sniff(Ecore_X_Window win)
1313} 1313}
1314 1314
1315EAPI Eina_Bool 1315EAPI Eina_Bool
1316ecore_x_window_attributes_get(Ecore_X_Window win, 1316ecore_x_window_attributes_get(Ecore_X_Window win,
1317 Ecore_X_Window_Attributes *att_ret) 1317 Ecore_X_Window_Attributes *att_ret)
1318{ 1318{
1319 XWindowAttributes att; 1319 XWindowAttributes att;
@@ -1371,7 +1371,7 @@ ecore_x_window_save_set_del(Ecore_X_Window win)
1371 1371
1372EAPI Ecore_X_Window * 1372EAPI Ecore_X_Window *
1373ecore_x_window_children_get(Ecore_X_Window win, 1373ecore_x_window_children_get(Ecore_X_Window win,
1374 int *num) 1374 int *num)
1375{ 1375{
1376 Ecore_X_Window *windows = NULL; 1376 Ecore_X_Window *windows = NULL;
1377 Window root_ret = 0, parent_ret = 0, *children_ret = NULL; 1377 Window root_ret = 0, parent_ret = 0, *children_ret = NULL;
@@ -1422,7 +1422,7 @@ ecore_x_pointer_control_get(int *accel_num,
1422 1422
1423EAPI Eina_Bool 1423EAPI Eina_Bool
1424ecore_x_pointer_mapping_set(unsigned char *map, 1424ecore_x_pointer_mapping_set(unsigned char *map,
1425 int nmap) 1425 int nmap)
1426{ 1426{
1427 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1427 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1428 return XSetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE; 1428 return XSetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE;
@@ -1430,7 +1430,7 @@ ecore_x_pointer_mapping_set(unsigned char *map,
1430 1430
1431EAPI Eina_Bool 1431EAPI Eina_Bool
1432ecore_x_pointer_mapping_get(unsigned char *map, 1432ecore_x_pointer_mapping_get(unsigned char *map,
1433 int nmap) 1433 int nmap)
1434{ 1434{
1435 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1435 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1436 return XGetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE; 1436 return XGetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE;
@@ -1473,8 +1473,8 @@ ecore_x_pointer_ungrab(void)
1473 1473
1474EAPI Eina_Bool 1474EAPI Eina_Bool
1475ecore_x_pointer_warp(Ecore_X_Window win, 1475ecore_x_pointer_warp(Ecore_X_Window win,
1476 int x, 1476 int x,
1477 int y) 1477 int y)
1478{ 1478{
1479 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1479 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1480 return XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y) ? EINA_TRUE : EINA_FALSE; 1480 return XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y) ? EINA_TRUE : EINA_FALSE;
@@ -1523,15 +1523,15 @@ ecore_x_ungrab(void)
1523int _ecore_window_grabs_num = 0; 1523int _ecore_window_grabs_num = 0;
1524Window *_ecore_window_grabs = NULL; 1524Window *_ecore_window_grabs = NULL;
1525Eina_Bool (*_ecore_window_grab_replay_func)(void *data, 1525Eina_Bool (*_ecore_window_grab_replay_func)(void *data,
1526 int event_type, 1526 int event_type,
1527 void *event); 1527 void *event);
1528void *_ecore_window_grab_replay_data; 1528void *_ecore_window_grab_replay_data;
1529 1529
1530EAPI void 1530EAPI void
1531ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data, 1531ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data,
1532 int event_type, 1532 int event_type,
1533 void *event), 1533 void *event),
1534 void *data) 1534 void *data)
1535{ 1535{
1536 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1536 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1537 _ecore_window_grab_replay_func = func; 1537 _ecore_window_grab_replay_func = func;
@@ -1539,11 +1539,11 @@ ecore_x_passive_grab_replay_func_set(Eina_Bool (*fun
1539} 1539}
1540 1540
1541EAPI void 1541EAPI void
1542ecore_x_window_button_grab(Ecore_X_Window win, 1542ecore_x_window_button_grab(Ecore_X_Window win,
1543 int button, 1543 int button,
1544 Ecore_X_Event_Mask event_mask, 1544 Ecore_X_Event_Mask event_mask,
1545 int mod, 1545 int mod,
1546 int any_mod) 1546 int any_mod)
1547{ 1547{
1548 unsigned int b; 1548 unsigned int b;
1549 unsigned int m; 1549 unsigned int m;
@@ -1581,7 +1581,7 @@ ecore_x_window_button_grab(Ecore_X_Window win,
1581} 1581}
1582 1582
1583void 1583void
1584_ecore_x_sync_magic_send(int val, 1584_ecore_x_sync_magic_send(int val,
1585 Ecore_X_Window swin) 1585 Ecore_X_Window swin)
1586{ 1586{
1587 XEvent xev; 1587 XEvent xev;
@@ -1635,9 +1635,9 @@ _ecore_x_window_grab_remove(Ecore_X_Window win)
1635 1635
1636EAPI void 1636EAPI void
1637ecore_x_window_button_ungrab(Ecore_X_Window win, 1637ecore_x_window_button_ungrab(Ecore_X_Window win,
1638 int button, 1638 int button,
1639 int mod, 1639 int mod,
1640 int any_mod) 1640 int any_mod)
1641{ 1641{
1642 unsigned int b; 1642 unsigned int b;
1643 unsigned int m; 1643 unsigned int m;
@@ -1671,9 +1671,9 @@ Window *_ecore_key_grabs = NULL;
1671 1671
1672EAPI void 1672EAPI void
1673ecore_x_window_key_grab(Ecore_X_Window win, 1673ecore_x_window_key_grab(Ecore_X_Window win,
1674 const char *key, 1674 const char *key,
1675 int mod, 1675 int mod,
1676 int any_mod) 1676 int any_mod)
1677{ 1677{
1678 KeyCode keycode = 0; 1678 KeyCode keycode = 0;
1679 KeySym keysym; 1679 KeySym keysym;
@@ -1755,9 +1755,9 @@ _ecore_x_key_grab_remove(Ecore_X_Window win)
1755 1755
1756EAPI void 1756EAPI void
1757ecore_x_window_key_ungrab(Ecore_X_Window win, 1757ecore_x_window_key_ungrab(Ecore_X_Window win,
1758 const char *key, 1758 const char *key,
1759 int mod, 1759 int mod,
1760 int any_mod) 1760 int any_mod)
1761{ 1761{
1762 KeyCode keycode = 0; 1762 KeyCode keycode = 0;
1763 KeySym keysym; 1763 KeySym keysym;
@@ -1811,14 +1811,14 @@ ecore_x_window_key_ungrab(Ecore_X_Window win,
1811 * @return EINA_TRUE on success EINA_FALSE otherwise. 1811 * @return EINA_TRUE on success EINA_FALSE otherwise.
1812 */ 1812 */
1813EAPI Eina_Bool 1813EAPI Eina_Bool
1814ecore_x_client_message32_send(Ecore_X_Window win, 1814ecore_x_client_message32_send(Ecore_X_Window win,
1815 Ecore_X_Atom type, 1815 Ecore_X_Atom type,
1816 Ecore_X_Event_Mask mask, 1816 Ecore_X_Event_Mask mask,
1817 long d0, 1817 long d0,
1818 long d1, 1818 long d1,
1819 long d2, 1819 long d2,
1820 long d3, 1820 long d3,
1821 long d4) 1821 long d4)
1822{ 1822{
1823 XEvent xev; 1823 XEvent xev;
1824 1824
@@ -1848,9 +1848,9 @@ ecore_x_client_message32_send(Ecore_X_Window win,
1848 */ 1848 */
1849EAPI Eina_Bool 1849EAPI Eina_Bool
1850ecore_x_client_message8_send(Ecore_X_Window win, 1850ecore_x_client_message8_send(Ecore_X_Window win,
1851 Ecore_X_Atom type, 1851 Ecore_X_Atom type,
1852 const void *data, 1852 const void *data,
1853 int len) 1853 int len)
1854{ 1854{
1855 XEvent xev; 1855 XEvent xev;
1856 1856
@@ -1870,8 +1870,8 @@ ecore_x_client_message8_send(Ecore_X_Window win,
1870 1870
1871EAPI Eina_Bool 1871EAPI Eina_Bool
1872ecore_x_mouse_move_send(Ecore_X_Window win, 1872ecore_x_mouse_move_send(Ecore_X_Window win,
1873 int x, 1873 int x,
1874 int y) 1874 int y)
1875{ 1875{
1876 XEvent xev; 1876 XEvent xev;
1877 XWindowAttributes att; 1877 XWindowAttributes att;
@@ -1898,9 +1898,9 @@ ecore_x_mouse_move_send(Ecore_X_Window win,
1898 1898
1899EAPI Eina_Bool 1899EAPI Eina_Bool
1900ecore_x_mouse_down_send(Ecore_X_Window win, 1900ecore_x_mouse_down_send(Ecore_X_Window win,
1901 int x, 1901 int x,
1902 int y, 1902 int y,
1903 int b) 1903 int b)
1904{ 1904{
1905 XEvent xev; 1905 XEvent xev;
1906 XWindowAttributes att; 1906 XWindowAttributes att;
@@ -1927,9 +1927,9 @@ ecore_x_mouse_down_send(Ecore_X_Window win,
1927 1927
1928EAPI Eina_Bool 1928EAPI Eina_Bool
1929ecore_x_mouse_up_send(Ecore_X_Window win, 1929ecore_x_mouse_up_send(Ecore_X_Window win,
1930 int x, 1930 int x,
1931 int y, 1931 int y,
1932 int b) 1932 int b)
1933{ 1933{
1934 XEvent xev; 1934 XEvent xev;
1935 XWindowAttributes att; 1935 XWindowAttributes att;
@@ -1981,8 +1981,8 @@ ecore_x_pointer_last_xy_get(int *x,
1981 1981
1982EAPI void 1982EAPI void
1983ecore_x_pointer_xy_get(Ecore_X_Window win, 1983ecore_x_pointer_xy_get(Ecore_X_Window win,
1984 int *x, 1984 int *x,
1985 int *y) 1985 int *y)
1986{ 1986{
1987 Window rwin, cwin; 1987 Window rwin, cwin;
1988 int rx, ry, wx, wy, ret; 1988 int rx, ry, wx, wy, ret;
@@ -2023,7 +2023,7 @@ ecore_x_visual_id_get(Ecore_X_Visual visual)
2023 */ 2023 */
2024EAPI Ecore_X_Visual 2024EAPI Ecore_X_Visual
2025ecore_x_default_visual_get(Ecore_X_Display *disp, 2025ecore_x_default_visual_get(Ecore_X_Display *disp,
2026 Ecore_X_Screen *screen) 2026 Ecore_X_Screen *screen)
2027{ 2027{
2028 return DefaultVisual(disp, ecore_x_screen_index_get(screen)); 2028 return DefaultVisual(disp, ecore_x_screen_index_get(screen));
2029} 2029}
@@ -2039,7 +2039,7 @@ ecore_x_default_visual_get(Ecore_X_Display *disp,
2039 */ 2039 */
2040EAPI Ecore_X_Colormap 2040EAPI Ecore_X_Colormap
2041ecore_x_default_colormap_get(Ecore_X_Display *disp, 2041ecore_x_default_colormap_get(Ecore_X_Display *disp,
2042 Ecore_X_Screen *screen) 2042 Ecore_X_Screen *screen)
2043{ 2043{
2044 return DefaultColormap(disp, ecore_x_screen_index_get(screen)); 2044 return DefaultColormap(disp, ecore_x_screen_index_get(screen));
2045} 2045}
@@ -2055,7 +2055,7 @@ ecore_x_default_colormap_get(Ecore_X_Display *disp,
2055 */ 2055 */
2056EAPI int 2056EAPI int
2057ecore_x_default_depth_get(Ecore_X_Display *disp, 2057ecore_x_default_depth_get(Ecore_X_Display *disp,
2058 Ecore_X_Screen *screen) 2058 Ecore_X_Screen *screen)
2059{ 2059{
2060 return DefaultDepth(disp, ecore_x_screen_index_get(screen)); 2060 return DefaultDepth(disp, ecore_x_screen_index_get(screen));
2061} 2061}
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
index 77ae1595e6..ee981fe979 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
@@ -291,9 +291,11 @@ _ecore_x_atoms_init(void)
291 num = sizeof(items) / sizeof(Atom_Item); 291 num = sizeof(items) / sizeof(Atom_Item);
292 atoms = alloca(num * sizeof(Atom)); 292 atoms = alloca(num * sizeof(Atom));
293 names = alloca(num * sizeof(char *)); 293 names = alloca(num * sizeof(char *));
294 for (i = 0; i < num; i++) names[i] = (char *)items[i].name; 294 for (i = 0; i < num; i++)
295 names[i] = (char *)items[i].name;
295 XInternAtoms(_ecore_x_disp, names, num, False, atoms); 296 XInternAtoms(_ecore_x_disp, names, num, False, atoms);
296 for (i = 0; i < num; i++) *(items[i].atom) = atoms[i]; 297 for (i = 0; i < num; i++)
298 *(items[i].atom) = atoms[i];
297} 299}
298 300
299/** 301/**
@@ -312,8 +314,8 @@ ecore_x_atom_get(const char *name)
312} 314}
313 315
314EAPI void 316EAPI void
315ecore_x_atoms_get(const char **names, 317ecore_x_atoms_get(const char **names,
316 int num, 318 int num,
317 Ecore_X_Atom *atoms) 319 Ecore_X_Atom *atoms)
318{ 320{
319 Atom *atoms_int; 321 Atom *atoms_int;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c
index e98292f272..b919db96d2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c
@@ -40,14 +40,14 @@ ecore_x_composite_query(void)
40} 40}
41 41
42EAPI void 42EAPI void
43ecore_x_composite_redirect_window(Ecore_X_Window win, 43ecore_x_composite_redirect_window(Ecore_X_Window win,
44 Ecore_X_Composite_Update_Type type) 44 Ecore_X_Composite_Update_Type type)
45{ 45{
46#ifdef ECORE_XCOMPOSITE 46#ifdef ECORE_XCOMPOSITE
47 int update = CompositeRedirectAutomatic; 47 int update = CompositeRedirectAutomatic;
48 48
49 LOGFN(__FILE__, __LINE__, __FUNCTION__); 49 LOGFN(__FILE__, __LINE__, __FUNCTION__);
50 switch(type) 50 switch (type)
51 { 51 {
52 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 52 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
53 update = CompositeRedirectAutomatic; 53 update = CompositeRedirectAutomatic;
@@ -62,14 +62,14 @@ ecore_x_composite_redirect_window(Ecore_X_Window win,
62} 62}
63 63
64EAPI void 64EAPI void
65ecore_x_composite_redirect_subwindows(Ecore_X_Window win, 65ecore_x_composite_redirect_subwindows(Ecore_X_Window win,
66 Ecore_X_Composite_Update_Type type) 66 Ecore_X_Composite_Update_Type type)
67{ 67{
68#ifdef ECORE_XCOMPOSITE 68#ifdef ECORE_XCOMPOSITE
69 int update = CompositeRedirectAutomatic; 69 int update = CompositeRedirectAutomatic;
70 70
71 LOGFN(__FILE__, __LINE__, __FUNCTION__); 71 LOGFN(__FILE__, __LINE__, __FUNCTION__);
72 switch(type) 72 switch (type)
73 { 73 {
74 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 74 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
75 update = CompositeRedirectAutomatic; 75 update = CompositeRedirectAutomatic;
@@ -84,14 +84,14 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win,
84} 84}
85 85
86EAPI void 86EAPI void
87ecore_x_composite_unredirect_window(Ecore_X_Window win, 87ecore_x_composite_unredirect_window(Ecore_X_Window win,
88 Ecore_X_Composite_Update_Type type) 88 Ecore_X_Composite_Update_Type type)
89{ 89{
90#ifdef ECORE_XCOMPOSITE 90#ifdef ECORE_XCOMPOSITE
91 int update = CompositeRedirectAutomatic; 91 int update = CompositeRedirectAutomatic;
92 92
93 LOGFN(__FILE__, __LINE__, __FUNCTION__); 93 LOGFN(__FILE__, __LINE__, __FUNCTION__);
94 switch(type) 94 switch (type)
95 { 95 {
96 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 96 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
97 update = CompositeRedirectAutomatic; 97 update = CompositeRedirectAutomatic;
@@ -106,14 +106,14 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win,
106} 106}
107 107
108EAPI void 108EAPI void
109ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, 109ecore_x_composite_unredirect_subwindows(Ecore_X_Window win,
110 Ecore_X_Composite_Update_Type type) 110 Ecore_X_Composite_Update_Type type)
111{ 111{
112#ifdef ECORE_XCOMPOSITE 112#ifdef ECORE_XCOMPOSITE
113 int update = CompositeRedirectAutomatic; 113 int update = CompositeRedirectAutomatic;
114 114
115 LOGFN(__FILE__, __LINE__, __FUNCTION__); 115 LOGFN(__FILE__, __LINE__, __FUNCTION__);
116 switch(type) 116 switch (type)
117 { 117 {
118 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 118 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
119 update = CompositeRedirectAutomatic; 119 update = CompositeRedirectAutomatic;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c
index 5c7c6629c8..a968c56af2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c
@@ -14,11 +14,11 @@ ecore_x_cursor_color_supported_get(void)
14 14
15EAPI Ecore_X_Cursor 15EAPI Ecore_X_Cursor
16ecore_x_cursor_new(Ecore_X_Window win, 16ecore_x_cursor_new(Ecore_X_Window win,
17 int *pixels, 17 int *pixels,
18 int w, 18 int w,
19 int h, 19 int h,
20 int hot_x, 20 int hot_x,
21 int hot_y) 21 int hot_y)
22{ 22{
23#ifdef ECORE_XCURSOR 23#ifdef ECORE_XCURSOR
24 LOGFN(__FILE__, __LINE__, __FUNCTION__); 24 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -43,7 +43,7 @@ ecore_x_cursor_new(Ecore_X_Window win,
43// r = (((pixels[i] >> 16) & 0xff) * a) / 0xff; 43// r = (((pixels[i] >> 16) & 0xff) * a) / 0xff;
44// g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff; 44// g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff;
45// b = (((pixels[i] ) & 0xff) * a) / 0xff; 45// b = (((pixels[i] ) & 0xff) * a) / 0xff;
46 xci->pixels[i] = pixels[i]; 46 xci->pixels[i] = pixels[i];
47// (a << 24) | (r << 16) | (g << 8) | (b); 47// (a << 24) | (r << 16) | (g << 8) | (b);
48 } 48 }
49 c = XcursorImageLoadCursor(_ecore_x_disp, xci); 49 c = XcursorImageLoadCursor(_ecore_x_disp, xci);
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c
index 8731957a4a..b094f85235 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c
@@ -35,7 +35,7 @@ ecore_x_damage_query(void)
35} 35}
36 36
37EAPI Ecore_X_Damage 37EAPI Ecore_X_Damage
38ecore_x_damage_new(Ecore_X_Drawable d, 38ecore_x_damage_new(Ecore_X_Drawable d,
39 Ecore_X_Damage_Report_Level level) 39 Ecore_X_Damage_Report_Level level)
40{ 40{
41#ifdef ECORE_XDAMAGE 41#ifdef ECORE_XDAMAGE
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
index e7c7c929f7..372470aa8b 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
@@ -88,13 +88,13 @@ _ecore_x_dnd_shutdown(void)
88} 88}
89 89
90static Eina_Bool 90static Eina_Bool
91_ecore_x_dnd_converter_copy(char *target __UNUSED__, 91_ecore_x_dnd_converter_copy(char *target __UNUSED__,
92 void *data, 92 void *data,
93 int size, 93 int size,
94 void **data_ret, 94 void **data_ret,
95 int *size_ret, 95 int *size_ret,
96 Ecore_X_Atom *tprop __UNUSED__, 96 Ecore_X_Atom *tprop __UNUSED__,
97 int *count __UNUSED__) 97 int *count __UNUSED__)
98{ 98{
99 XTextProperty text_prop; 99 XTextProperty text_prop;
100 char *mystr; 100 char *mystr;
@@ -134,7 +134,7 @@ _ecore_x_dnd_converter_copy(char *target __UNUSED__,
134 134
135EAPI void 135EAPI void
136ecore_x_dnd_aware_set(Ecore_X_Window win, 136ecore_x_dnd_aware_set(Ecore_X_Window win,
137 Eina_Bool on) 137 Eina_Bool on)
138{ 138{
139 Ecore_X_Atom prop_data = ECORE_X_DND_VERSION; 139 Ecore_X_Atom prop_data = ECORE_X_DND_VERSION;
140 140
@@ -212,7 +212,7 @@ ecore_x_dnd_version_get(Ecore_X_Window win)
212 212
213EAPI Eina_Bool 213EAPI Eina_Bool
214ecore_x_dnd_type_isset(Ecore_X_Window win, 214ecore_x_dnd_type_isset(Ecore_X_Window win,
215 const char *type) 215 const char *type)
216{ 216{
217 int num, i, ret = EINA_FALSE; 217 int num, i, ret = EINA_FALSE;
218 unsigned char *data; 218 unsigned char *data;
@@ -241,8 +241,8 @@ ecore_x_dnd_type_isset(Ecore_X_Window win,
241 241
242EAPI void 242EAPI void
243ecore_x_dnd_type_set(Ecore_X_Window win, 243ecore_x_dnd_type_set(Ecore_X_Window win,
244 const char *type, 244 const char *type,
245 Eina_Bool on) 245 Eina_Bool on)
246{ 246{
247 Ecore_X_Atom atom; 247 Ecore_X_Atom atom;
248 Ecore_X_Atom *oldset = NULL, *newset = NULL; 248 Ecore_X_Atom *oldset = NULL, *newset = NULL;
@@ -309,8 +309,8 @@ ecore_x_dnd_type_set(Ecore_X_Window win,
309 309
310EAPI void 310EAPI void
311ecore_x_dnd_types_set(Ecore_X_Window win, 311ecore_x_dnd_types_set(Ecore_X_Window win,
312 const char **types, 312 const char **types,
313 unsigned int num_types) 313 unsigned int num_types)
314{ 314{
315 Ecore_X_Atom *newset = NULL; 315 Ecore_X_Atom *newset = NULL;
316 unsigned int i; 316 unsigned int i;
@@ -340,8 +340,8 @@ ecore_x_dnd_types_set(Ecore_X_Window win,
340 340
341EAPI void 341EAPI void
342ecore_x_dnd_actions_set(Ecore_X_Window win, 342ecore_x_dnd_actions_set(Ecore_X_Window win,
343 Ecore_X_Atom *actions, 343 Ecore_X_Atom *actions,
344 unsigned int num_actions) 344 unsigned int num_actions)
345{ 345{
346 unsigned int i; 346 unsigned int i;
347 unsigned char *data = NULL; 347 unsigned char *data = NULL;
@@ -378,9 +378,9 @@ ecore_x_dnd_actions_set(Ecore_X_Window win,
378 */ 378 */
379EAPI void 379EAPI void
380ecore_x_dnd_callback_pos_update_set( 380ecore_x_dnd_callback_pos_update_set(
381 void (*cb)(void *, 381 void (*cb)(void *,
382 Ecore_X_Xdnd_Position *data), 382 Ecore_X_Xdnd_Position *data),
383 const void *data) 383 const void *data)
384{ 384{
385 _posupdatecb = cb; 385 _posupdatecb = cb;
386 _posupdatedata = (void *)data; /* Discard the const early */ 386 _posupdatedata = (void *)data; /* Discard the const early */
@@ -401,7 +401,7 @@ _ecore_x_dnd_target_get(void)
401EAPI Eina_Bool 401EAPI Eina_Bool
402ecore_x_dnd_begin(Ecore_X_Window source, 402ecore_x_dnd_begin(Ecore_X_Window source,
403 unsigned char *data, 403 unsigned char *data,
404 int size) 404 int size)
405{ 405{
406 LOGFN(__FILE__, __LINE__, __FUNCTION__); 406 LOGFN(__FILE__, __LINE__, __FUNCTION__);
407 if (!ecore_x_dnd_version_get(source)) 407 if (!ecore_x_dnd_version_get(source))
@@ -471,8 +471,8 @@ ecore_x_dnd_drop(void)
471 else 471 else
472 { 472 {
473 /* Dropping on nothing */ 473 /* Dropping on nothing */
474 ecore_x_selection_xdnd_clear(); 474 ecore_x_selection_xdnd_clear();
475 _source->state = ECORE_X_DND_SOURCE_IDLE; 475 _source->state = ECORE_X_DND_SOURCE_IDLE;
476 } 476 }
477 477
478 ecore_x_window_ignore_set(_source->win, 0); 478 ecore_x_window_ignore_set(_source->win, 0);
@@ -483,10 +483,10 @@ ecore_x_dnd_drop(void)
483} 483}
484 484
485EAPI void 485EAPI void
486ecore_x_dnd_send_status(Eina_Bool will_accept, 486ecore_x_dnd_send_status(Eina_Bool will_accept,
487 Eina_Bool suppress, 487 Eina_Bool suppress,
488 Ecore_X_Rectangle rectangle, 488 Ecore_X_Rectangle rectangle,
489 Ecore_X_Atom action) 489 Ecore_X_Atom action)
490{ 490{
491 XEvent xev; 491 XEvent xev;
492 492
@@ -579,8 +579,8 @@ ecore_x_dnd_source_action_get(void)
579 579
580void 580void
581_ecore_x_dnd_drag(Ecore_X_Window root, 581_ecore_x_dnd_drag(Ecore_X_Window root,
582 int x, 582 int x,
583 int y) 583 int y)
584{ 584{
585 XEvent xev; 585 XEvent xev;
586 Ecore_X_Window win; 586 Ecore_X_Window win;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c
index 7ea1656db8..d1b41114da 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c
@@ -21,10 +21,10 @@
21 */ 21 */
22EAPI void 22EAPI void
23ecore_x_drawable_geometry_get(Ecore_X_Drawable d, 23ecore_x_drawable_geometry_get(Ecore_X_Drawable d,
24 int *x, 24 int *x,
25 int *y, 25 int *y,
26 int *w, 26 int *w,
27 int *h) 27 int *h)
28{ 28{
29 Window dummy_win; 29 Window dummy_win;
30 int ret_x, ret_y; 30 int ret_x, ret_y;
@@ -106,11 +106,11 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d)
106 */ 106 */
107EAPI void 107EAPI void
108ecore_x_drawable_rectangle_fill(Ecore_X_Drawable d, 108ecore_x_drawable_rectangle_fill(Ecore_X_Drawable d,
109 Ecore_X_GC gc, 109 Ecore_X_GC gc,
110 int x, 110 int x,
111 int y, 111 int y,
112 int width, 112 int width,
113 int height) 113 int height)
114{ 114{
115 LOGFN(__FILE__, __LINE__, __FUNCTION__); 115 LOGFN(__FILE__, __LINE__, __FUNCTION__);
116 XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height); 116 XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height);
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c
index a560146255..5966bbd5b7 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c
@@ -18,10 +18,10 @@ ecore_x_e_init(void)
18 18
19EAPI void 19EAPI void
20ecore_x_e_frame_size_set(Ecore_X_Window win, 20ecore_x_e_frame_size_set(Ecore_X_Window win,
21 int fl, 21 int fl,
22 int fr, 22 int fr,
23 int ft, 23 int ft,
24 int fb) 24 int fb)
25{ 25{
26 unsigned int frames[4]; 26 unsigned int frames[4];
27 27
@@ -35,7 +35,7 @@ ecore_x_e_frame_size_set(Ecore_X_Window win,
35 35
36EAPI void 36EAPI void
37ecore_x_e_virtual_keyboard_set(Ecore_X_Window win, 37ecore_x_e_virtual_keyboard_set(Ecore_X_Window win,
38 unsigned int is_keyboard) 38 unsigned int is_keyboard)
39{ 39{
40 LOGFN(__FILE__, __LINE__, __FUNCTION__); 40 LOGFN(__FILE__, __LINE__, __FUNCTION__);
41 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, 41 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD,
@@ -162,7 +162,7 @@ _ecore_x_e_vkbd_atom_get(Ecore_X_Virtual_Keyboard_State state)
162} 162}
163 163
164EAPI void 164EAPI void
165ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win, 165ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win,
166 Ecore_X_Virtual_Keyboard_State state) 166 Ecore_X_Virtual_Keyboard_State state)
167{ 167{
168 Ecore_X_Atom atom = 0; 168 Ecore_X_Atom atom = 0;
@@ -187,7 +187,7 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win)
187} 187}
188 188
189EAPI void 189EAPI void
190ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, 190ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win,
191 Ecore_X_Virtual_Keyboard_State state) 191 Ecore_X_Virtual_Keyboard_State state)
192{ 192{
193 LOGFN(__FILE__, __LINE__, __FUNCTION__); 193 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -255,9 +255,9 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win)
255} 255}
256 256
257EAPI void 257EAPI void
258ecore_x_e_illume_zone_list_set(Ecore_X_Window win, 258ecore_x_e_illume_zone_list_set(Ecore_X_Window win,
259 Ecore_X_Window *zones, 259 Ecore_X_Window *zones,
260 unsigned int n_zones) 260 unsigned int n_zones)
261{ 261{
262 LOGFN(__FILE__, __LINE__, __FUNCTION__); 262 LOGFN(__FILE__, __LINE__, __FUNCTION__);
263 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST, 263 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST,
@@ -266,7 +266,7 @@ ecore_x_e_illume_zone_list_set(Ecore_X_Window win,
266 266
267EAPI void 267EAPI void
268ecore_x_e_illume_conformant_set(Ecore_X_Window win, 268ecore_x_e_illume_conformant_set(Ecore_X_Window win,
269 unsigned int is_conformant) 269 unsigned int is_conformant)
270{ 270{
271 LOGFN(__FILE__, __LINE__, __FUNCTION__); 271 LOGFN(__FILE__, __LINE__, __FUNCTION__);
272 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, 272 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT,
@@ -287,7 +287,7 @@ ecore_x_e_illume_conformant_get(Ecore_X_Window win)
287} 287}
288 288
289EAPI void 289EAPI void
290ecore_x_e_illume_mode_set(Ecore_X_Window win, 290ecore_x_e_illume_mode_set(Ecore_X_Window win,
291 Ecore_X_Illume_Mode mode) 291 Ecore_X_Illume_Mode mode)
292{ 292{
293 Ecore_X_Atom atom = 0; 293 Ecore_X_Atom atom = 0;
@@ -311,7 +311,7 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win)
311} 311}
312 312
313EAPI void 313EAPI void
314ecore_x_e_illume_mode_send(Ecore_X_Window win, 314ecore_x_e_illume_mode_send(Ecore_X_Window win,
315 Ecore_X_Illume_Mode mode) 315 Ecore_X_Illume_Mode mode)
316{ 316{
317 LOGFN(__FILE__, __LINE__, __FUNCTION__); 317 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -377,7 +377,7 @@ ecore_x_e_illume_home_del_send(Ecore_X_Window win)
377 377
378EAPI void 378EAPI void
379ecore_x_e_illume_drag_set(Ecore_X_Window win, 379ecore_x_e_illume_drag_set(Ecore_X_Window win,
380 unsigned int drag) 380 unsigned int drag)
381{ 381{
382 LOGFN(__FILE__, __LINE__, __FUNCTION__); 382 LOGFN(__FILE__, __LINE__, __FUNCTION__);
383 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1); 383 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1);
@@ -397,7 +397,7 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win)
397 397
398EAPI void 398EAPI void
399ecore_x_e_illume_drag_locked_set(Ecore_X_Window win, 399ecore_x_e_illume_drag_locked_set(Ecore_X_Window win,
400 unsigned int is_locked) 400 unsigned int is_locked)
401{ 401{
402 LOGFN(__FILE__, __LINE__, __FUNCTION__); 402 LOGFN(__FILE__, __LINE__, __FUNCTION__);
403 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED, 403 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED,
@@ -437,10 +437,10 @@ ecore_x_e_illume_drag_end_send(Ecore_X_Window win)
437 437
438EAPI void 438EAPI void
439ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win, 439ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win,
440 int x, 440 int x,
441 int y, 441 int y,
442 int w, 442 int w,
443 int h) 443 int h)
444{ 444{
445 unsigned int geom[4]; 445 unsigned int geom[4];
446 446
@@ -455,10 +455,10 @@ ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win,
455 455
456EAPI Eina_Bool 456EAPI Eina_Bool
457ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win, 457ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win,
458 int *x, 458 int *x,
459 int *y, 459 int *y,
460 int *w, 460 int *w,
461 int *h) 461 int *h)
462{ 462{
463 int ret = 0; 463 int ret = 0;
464 unsigned int geom[4]; 464 unsigned int geom[4];
@@ -488,10 +488,10 @@ ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win,
488 488
489EAPI void 489EAPI void
490ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win, 490ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win,
491 int x, 491 int x,
492 int y, 492 int y,
493 int w, 493 int w,
494 int h) 494 int h)
495{ 495{
496 unsigned int geom[4]; 496 unsigned int geom[4];
497 497
@@ -506,10 +506,10 @@ ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win,
506 506
507EAPI Eina_Bool 507EAPI Eina_Bool
508ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win, 508ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win,
509 int *x, 509 int *x,
510 int *y, 510 int *y,
511 int *w, 511 int *w,
512 int *h) 512 int *h)
513{ 513{
514 int ret = 0; 514 int ret = 0;
515 unsigned int geom[4]; 515 unsigned int geom[4];
@@ -539,10 +539,10 @@ ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win,
539 539
540EAPI void 540EAPI void
541ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win, 541ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win,
542 int x, 542 int x,
543 int y, 543 int y,
544 int w, 544 int w,
545 int h) 545 int h)
546{ 546{
547 unsigned int geom[4]; 547 unsigned int geom[4];
548 548
@@ -557,10 +557,10 @@ ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win,
557 557
558EAPI Eina_Bool 558EAPI Eina_Bool
559ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win, 559ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win,
560 int *x, 560 int *x,
561 int *y, 561 int *y,
562 int *w, 562 int *w,
563 int *h) 563 int *h)
564{ 564{
565 int ret = 0; 565 int ret = 0;
566 unsigned int geom[4]; 566 unsigned int geom[4];
@@ -619,7 +619,7 @@ _ecore_x_e_quickpanel_state_get(Ecore_X_Atom atom)
619 619
620EAPI void 620EAPI void
621ecore_x_e_illume_quickpanel_set(Ecore_X_Window win, 621ecore_x_e_illume_quickpanel_set(Ecore_X_Window win,
622 unsigned int is_quickpanel) 622 unsigned int is_quickpanel)
623{ 623{
624 LOGFN(__FILE__, __LINE__, __FUNCTION__); 624 LOGFN(__FILE__, __LINE__, __FUNCTION__);
625 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, 625 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL,
@@ -640,7 +640,7 @@ ecore_x_e_illume_quickpanel_get(Ecore_X_Window win)
640} 640}
641 641
642EAPI void 642EAPI void
643ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win, 643ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win,
644 Ecore_X_Illume_Quickpanel_State state) 644 Ecore_X_Illume_Quickpanel_State state)
645{ 645{
646 Ecore_X_Atom atom = 0; 646 Ecore_X_Atom atom = 0;
@@ -666,7 +666,7 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win)
666} 666}
667 667
668EAPI void 668EAPI void
669ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, 669ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win,
670 Ecore_X_Illume_Quickpanel_State state) 670 Ecore_X_Illume_Quickpanel_State state)
671{ 671{
672 LOGFN(__FILE__, __LINE__, __FUNCTION__); 672 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -688,7 +688,7 @@ ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win)
688 688
689EAPI void 689EAPI void
690ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win, 690ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win,
691 unsigned int priority) 691 unsigned int priority)
692{ 692{
693 LOGFN(__FILE__, __LINE__, __FUNCTION__); 693 LOGFN(__FILE__, __LINE__, __FUNCTION__);
694 ecore_x_window_prop_card32_set(win, 694 ecore_x_window_prop_card32_set(win,
@@ -712,7 +712,7 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win)
712 712
713EAPI void 713EAPI void
714ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, 714ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win,
715 unsigned int priority) 715 unsigned int priority)
716{ 716{
717 LOGFN(__FILE__, __LINE__, __FUNCTION__); 717 LOGFN(__FILE__, __LINE__, __FUNCTION__);
718 ecore_x_window_prop_card32_set(win, 718 ecore_x_window_prop_card32_set(win,
@@ -736,7 +736,7 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win)
736 736
737EAPI void 737EAPI void
738ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win, 738ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win,
739 unsigned int zone) 739 unsigned int zone)
740{ 740{
741 LOGFN(__FILE__, __LINE__, __FUNCTION__); 741 LOGFN(__FILE__, __LINE__, __FUNCTION__);
742 ecore_x_window_prop_card32_set(win, 742 ecore_x_window_prop_card32_set(win,
@@ -769,7 +769,7 @@ ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win)
769} 769}
770 770
771EAPI void 771EAPI void
772ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, 772ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
773 Ecore_X_Sync_Counter counter) 773 Ecore_X_Sync_Counter counter)
774{ 774{
775 LOGFN(__FILE__, __LINE__, __FUNCTION__); 775 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -827,8 +827,8 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root,
827EAPI void 827EAPI void
828ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root, 828ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root,
829 Ecore_X_Window win, 829 Ecore_X_Window win,
830 int w, 830 int w,
831 int h) 831 int h)
832{ 832{
833 XEvent xev; 833 XEvent xev;
834 834
@@ -854,7 +854,7 @@ ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root,
854 854
855EAPI void 855EAPI void
856ecore_x_e_comp_sync_supported_set(Ecore_X_Window root, 856ecore_x_e_comp_sync_supported_set(Ecore_X_Window root,
857 Eina_Bool enabled) 857 Eina_Bool enabled)
858{ 858{
859 Ecore_X_Window win; 859 Ecore_X_Window win;
860 860
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
index 24e4d5695f..9f18772ad5 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
@@ -9,7 +9,7 @@
9#include "ecore_x_private.h" 9#include "ecore_x_private.h"
10#include "Ecore_X.h" 10#include "Ecore_X.h"
11 11
12static int _ecore_x_error_handle(Display *d, 12static int _ecore_x_error_handle(Display *d,
13 XErrorEvent *ev); 13 XErrorEvent *ev);
14static int _ecore_x_io_error_handle(Display *d); 14static int _ecore_x_io_error_handle(Display *d);
15 15
@@ -28,7 +28,7 @@ static int _error_code = 0;
28 * Set the X error handler function 28 * Set the X error handler function
29 */ 29 */
30EAPI void 30EAPI void
31ecore_x_error_handler_set(void (*func)(void *data), 31ecore_x_error_handler_set(void (*func)(void *data),
32 const void *data) 32 const void *data)
33{ 33{
34 _error_func = func; 34 _error_func = func;
@@ -43,7 +43,7 @@ ecore_x_error_handler_set(void (*func)(void *data),
43 * Set the X I/O error handler function 43 * Set the X I/O error handler function
44 */ 44 */
45EAPI void 45EAPI void
46ecore_x_io_error_handler_set(void (*func)(void *data), 46ecore_x_io_error_handler_set(void (*func)(void *data),
47 const void *data) 47 const void *data)
48{ 48{
49 _io_error_func = func; 49 _io_error_func = func;
@@ -82,7 +82,7 @@ _ecore_x_error_handler_init(void)
82} 82}
83 83
84static int 84static int
85_ecore_x_error_handle(Display *d, 85_ecore_x_error_handle(Display *d,
86 XErrorEvent *ev) 86 XErrorEvent *ev)
87{ 87{
88 if (d == _ecore_x_disp) 88 if (d == _ecore_x_disp)
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
index 5521e3977d..0b06a79cdf 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -103,7 +103,7 @@ _ecore_x_event_free_mouse_move(void *data __UNUSED__,
103} 103}
104 104
105EAPI void 105EAPI void
106ecore_x_event_mask_set(Ecore_X_Window w, 106ecore_x_event_mask_set(Ecore_X_Window w,
107 Ecore_X_Event_Mask mask) 107 Ecore_X_Event_Mask mask)
108{ 108{
109 XWindowAttributes attr; 109 XWindowAttributes attr;
@@ -120,7 +120,7 @@ ecore_x_event_mask_set(Ecore_X_Window w,
120} 120}
121 121
122EAPI void 122EAPI void
123ecore_x_event_mask_unset(Ecore_X_Window w, 123ecore_x_event_mask_unset(Ecore_X_Window w,
124 Ecore_X_Event_Mask mask) 124 Ecore_X_Event_Mask mask)
125{ 125{
126 XWindowAttributes attr; 126 XWindowAttributes attr;
@@ -201,23 +201,23 @@ _ecore_x_event_modifiers(unsigned int state)
201void 201void
202_ecore_mouse_move(unsigned int timestamp, 202_ecore_mouse_move(unsigned int timestamp,
203 unsigned int xmodifiers, 203 unsigned int xmodifiers,
204 int x, 204 int x,
205 int y, 205 int y,
206 int x_root, 206 int x_root,
207 int y_root, 207 int y_root,
208 unsigned int event_window, 208 unsigned int event_window,
209 unsigned int window, 209 unsigned int window,
210 unsigned int root_win, 210 unsigned int root_win,
211 int same_screen, 211 int same_screen,
212 int dev, 212 int dev,
213 double radx, 213 double radx,
214 double rady, 214 double rady,
215 double pressure, 215 double pressure,
216 double angle, 216 double angle,
217 double mx, 217 double mx,
218 double my, 218 double my,
219 double mrx, 219 double mrx,
220 double mry) 220 double mry)
221{ 221{
222 Ecore_Event_Mouse_Move *e; 222 Ecore_Event_Mouse_Move *e;
223 Ecore_Event *event; 223 Ecore_Event *event;
@@ -263,7 +263,7 @@ _ecore_mouse_move(unsigned int timestamp,
263} 263}
264 264
265static void 265static void
266_ecore_key_press(int event, 266_ecore_key_press(int event,
267 XKeyEvent *xevent) 267 XKeyEvent *xevent)
268{ 268{
269 Ecore_Event_Key *e; 269 Ecore_Event_Key *e;
@@ -346,27 +346,27 @@ on_error:
346} 346}
347 347
348Ecore_Event_Mouse_Button * 348Ecore_Event_Mouse_Button *
349_ecore_mouse_button(int event, 349_ecore_mouse_button(int event,
350 unsigned int timestamp, 350 unsigned int timestamp,
351 unsigned int xmodifiers, 351 unsigned int xmodifiers,
352 unsigned int buttons, 352 unsigned int buttons,
353 int x, 353 int x,
354 int y, 354 int y,
355 int x_root, 355 int x_root,
356 int y_root, 356 int y_root,
357 unsigned int event_window, 357 unsigned int event_window,
358 unsigned int window, 358 unsigned int window,
359 unsigned int root_win, 359 unsigned int root_win,
360 int same_screen, 360 int same_screen,
361 int dev, 361 int dev,
362 double radx, 362 double radx,
363 double rady, 363 double rady,
364 double pressure, 364 double pressure,
365 double angle, 365 double angle,
366 double mx, 366 double mx,
367 double my, 367 double my,
368 double mrx, 368 double mrx,
369 double mry) 369 double mry)
370{ 370{
371 Ecore_Event_Mouse_Button *e; 371 Ecore_Event_Mouse_Button *e;
372 372
@@ -407,37 +407,37 @@ _ecore_mouse_button(int event,
407 { 407 {
408 if (event == ECORE_EVENT_MOUSE_BUTTON_DOWN) 408 if (event == ECORE_EVENT_MOUSE_BUTTON_DOWN)
409 { 409 {
410 //Check Double Clicked 410 //Check Double Clicked
411 if (((int)(timestamp - down_info->last_time) <= 411 if (((int)(timestamp - down_info->last_time) <=
412 (int)(1000 * _ecore_x_double_click_time)) && 412 (int)(1000 * _ecore_x_double_click_time)) &&
413 (window == down_info->last_win) && 413 (window == down_info->last_win) &&
414 (event_window == down_info->last_event_win)) 414 (event_window == down_info->last_event_win))
415 { 415 {
416 e->double_click = 1; 416 e->double_click = 1;
417 down_info->did_double = EINA_TRUE; 417 down_info->did_double = EINA_TRUE;
418 } 418 }
419 else 419 else
420 { 420 {
421 down_info->did_double = EINA_FALSE; 421 down_info->did_double = EINA_FALSE;
422 down_info->did_triple = EINA_FALSE; 422 down_info->did_triple = EINA_FALSE;
423 } 423 }
424 424
425 //Check Triple Clicked 425 //Check Triple Clicked
426 if (((int)(timestamp - down_info->last_last_time) <= 426 if (((int)(timestamp - down_info->last_last_time) <=
427 (int)(2 * 1000 * _ecore_x_double_click_time)) && 427 (int)(2 * 1000 * _ecore_x_double_click_time)) &&
428 (window == down_info->last_win) && 428 (window == down_info->last_win) &&
429 (window == down_info->last_last_win) && 429 (window == down_info->last_last_win) &&
430 (event_window == down_info->last_event_win) && 430 (event_window == down_info->last_event_win) &&
431 (event_window == down_info->last_last_event_win) 431 (event_window == down_info->last_last_event_win)
432 ) 432 )
433 { 433 {
434 e->triple_click = 1; 434 e->triple_click = 1;
435 down_info->did_triple = EINA_TRUE; 435 down_info->did_triple = EINA_TRUE;
436 } 436 }
437 else 437 else
438 { 438 {
439 down_info->did_triple = EINA_FALSE; 439 down_info->did_triple = EINA_FALSE;
440 } 440 }
441 } 441 }
442 else 442 else
443 { 443 {
@@ -715,26 +715,26 @@ _ecore_x_event_handle_motion_notify(XEvent *xevent)
715 _ecore_x_last_event_mouse_move_event = NULL; 715 _ecore_x_last_event_mouse_move_event = NULL;
716 } 716 }
717 */ 717 */
718 _ecore_mouse_move(xevent->xmotion.time, xevent->xmotion.state, 718 _ecore_mouse_move(xevent->xmotion.time, xevent->xmotion.state,
719 xevent->xmotion.x, xevent->xmotion.y, 719 xevent->xmotion.x, xevent->xmotion.y,
720 xevent->xmotion.x_root, xevent->xmotion.y_root, 720 xevent->xmotion.x_root, xevent->xmotion.y_root,
721 xevent->xmotion.window, 721 xevent->xmotion.window,
722 (xevent->xmotion.subwindow ? xevent->xmotion.subwindow : 722 (xevent->xmotion.subwindow ? xevent->xmotion.subwindow :
723 xevent->xmotion.window), 723 xevent->xmotion.window),
724 xevent->xmotion.root, 724 xevent->xmotion.root,
725 xevent->xmotion.same_screen, 725 xevent->xmotion.same_screen,
726 0, 1, 1, 726 0, 1, 1,
727 1.0, // pressure 727 1.0, // pressure
728 0.0, // angle 728 0.0, // angle
729 xevent->xmotion.x, xevent->xmotion.y, 729 xevent->xmotion.x, xevent->xmotion.y,
730 xevent->xmotion.x_root, xevent->xmotion.y_root); 730 xevent->xmotion.x_root, xevent->xmotion.y_root);
731 731
732 _ecore_x_last_event_mouse_move = 1; 732 _ecore_x_last_event_mouse_move = 1;
733 733
734 /* Xdnd handling */ 734 /* Xdnd handling */
735 _ecore_x_dnd_drag(xevent->xmotion.root, 735 _ecore_x_dnd_drag(xevent->xmotion.root,
736 xevent->xmotion.x_root, 736 xevent->xmotion.x_root,
737 xevent->xmotion.y_root); 737 xevent->xmotion.y_root);
738} 738}
739 739
740void 740void
@@ -1284,11 +1284,11 @@ void
1284_ecore_x_event_handle_selection_clear(XEvent *xevent) 1284_ecore_x_event_handle_selection_clear(XEvent *xevent)
1285{ 1285{
1286// Ecore_X_Selection_Intern *d; 1286// Ecore_X_Selection_Intern *d;
1287 Ecore_X_Event_Selection_Clear *e; 1287 Ecore_X_Event_Selection_Clear *e;
1288 Ecore_X_Atom sel; 1288 Ecore_X_Atom sel;
1289 1289
1290 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1290 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1291 _ecore_x_last_event_mouse_move = 0; 1291 _ecore_x_last_event_mouse_move = 0;
1292/* errr..... why? paranoia. 1292/* errr..... why? paranoia.
1293 d = _ecore_x_selection_get(xevent->xselectionclear.selection); 1293 d = _ecore_x_selection_get(xevent->xselectionclear.selection);
1294 if (d && (xevent->xselectionclear.time > d->time)) 1294 if (d && (xevent->xselectionclear.time > d->time))
@@ -1298,20 +1298,20 @@ _ecore_x_event_handle_selection_clear(XEvent *xevent)
1298 } 1298 }
1299 */ 1299 */
1300/* Generate event for app cleanup */ 1300/* Generate event for app cleanup */
1301 e = malloc(sizeof(Ecore_X_Event_Selection_Clear)); 1301 e = malloc(sizeof(Ecore_X_Event_Selection_Clear));
1302 e->win = xevent->xselectionclear.window; 1302 e->win = xevent->xselectionclear.window;
1303 e->time = xevent->xselectionclear.time; 1303 e->time = xevent->xselectionclear.time;
1304 e->atom = sel = xevent->xselectionclear.selection; 1304 e->atom = sel = xevent->xselectionclear.selection;
1305 if (sel == ECORE_X_ATOM_SELECTION_PRIMARY) 1305 if (sel == ECORE_X_ATOM_SELECTION_PRIMARY)
1306 e->selection = ECORE_X_SELECTION_PRIMARY; 1306 e->selection = ECORE_X_SELECTION_PRIMARY;
1307 else if (sel == ECORE_X_ATOM_SELECTION_SECONDARY) 1307 else if (sel == ECORE_X_ATOM_SELECTION_SECONDARY)
1308 e->selection = ECORE_X_SELECTION_SECONDARY; 1308 e->selection = ECORE_X_SELECTION_SECONDARY;
1309 else if (sel == ECORE_X_ATOM_SELECTION_CLIPBOARD) 1309 else if (sel == ECORE_X_ATOM_SELECTION_CLIPBOARD)
1310 e->selection = ECORE_X_SELECTION_CLIPBOARD; 1310 e->selection = ECORE_X_SELECTION_CLIPBOARD;
1311 else 1311 else
1312 e->selection = ECORE_X_SELECTION_OTHER; 1312 e->selection = ECORE_X_SELECTION_OTHER;
1313 1313
1314 ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, NULL, NULL); 1314 ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, NULL, NULL);
1315} 1315}
1316 1316
1317void 1317void
@@ -1360,17 +1360,17 @@ _ecore_x_event_handle_selection_request(XEvent *xevent)
1360 property = None; 1360 property = None;
1361 else if (data) 1361 else if (data)
1362 { 1362 {
1363 /* FIXME: This does not properly handle large data transfers */ 1363 /* FIXME: This does not properly handle large data transfers */
1364 ecore_x_window_prop_property_set( 1364 ecore_x_window_prop_property_set(
1365 xevent->xselectionrequest.requestor, 1365 xevent->xselectionrequest.requestor,
1366 xevent->xselectionrequest. 1366 xevent->xselectionrequest.
1367 property, 1367 property,
1368 type, 1368 type,
1369 typesize, 1369 typesize,
1370 data, 1370 data,
1371 len); 1371 len);
1372 property = xevent->xselectionrequest.property; 1372 property = xevent->xselectionrequest.property;
1373 free(data); 1373 free(data);
1374 } 1374 }
1375 1375
1376 ecore_x_selection_notify_send(xevent->xselectionrequest.requestor, 1376 ecore_x_selection_notify_send(xevent->xselectionrequest.requestor,
@@ -1528,32 +1528,32 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
1528 if (xevent->xclient.data.l[1] & 0x1UL) 1528 if (xevent->xclient.data.l[1] & 0x1UL)
1529 { 1529 {
1530 /* source supports more than 3 types, fetch property */ 1530 /* source supports more than 3 types, fetch property */
1531 unsigned char *data; 1531 unsigned char *data;
1532 Ecore_X_Atom *types; 1532 Ecore_X_Atom *types;
1533 int i, num_ret; 1533 int i, num_ret;
1534 1534
1535 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1535 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1536 if (!(ecore_x_window_prop_property_get(target->source, 1536 if (!(ecore_x_window_prop_property_get(target->source,
1537 ECORE_X_ATOM_XDND_TYPE_LIST, 1537 ECORE_X_ATOM_XDND_TYPE_LIST,
1538 XA_ATOM, 1538 XA_ATOM,
1539 32, &data, &num_ret))) 1539 32, &data, &num_ret)))
1540 { 1540 {
1541 WRN( 1541 WRN(
1542 "DND: Could not fetch data type list from source window, aborting."); 1542 "DND: Could not fetch data type list from source window, aborting.");
1543 free(e); 1543 free(e);
1544 return; 1544 return;
1545 } 1545 }
1546 1546
1547 types = (Ecore_X_Atom *)data; 1547 types = (Ecore_X_Atom *)data;
1548 e->types = calloc(num_ret, sizeof(char *)); 1548 e->types = calloc(num_ret, sizeof(char *));
1549 if (e->types) 1549 if (e->types)
1550 { 1550 {
1551 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1551 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1552 for (i = 0; i < num_ret; i++) 1552 for (i = 0; i < num_ret; i++)
1553 e->types[i] = XGetAtomName(_ecore_x_disp, types[i]); 1553 e->types[i] = XGetAtomName(_ecore_x_disp, types[i]);
1554 } 1554 }
1555 1555
1556 e->num_types = num_ret; 1556 e->num_types = num_ret;
1557 } 1557 }
1558 else 1558 else
1559 { 1559 {
@@ -1774,7 +1774,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
1774 if (e->state[0] == ECORE_X_WINDOW_STATE_UNKNOWN) 1774 if (e->state[0] == ECORE_X_WINDOW_STATE_UNKNOWN)
1775 { 1775 {
1776// char *name; 1776// char *name;
1777 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1777 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1778 1778
1779// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]); 1779// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]);
1780// if (name) ERR("Unknown state: %s", name); 1780// if (name) ERR("Unknown state: %s", name);
@@ -1784,7 +1784,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
1784 if (e->state[1] == ECORE_X_WINDOW_STATE_UNKNOWN) 1784 if (e->state[1] == ECORE_X_WINDOW_STATE_UNKNOWN)
1785 { 1785 {
1786// char *name; 1786// char *name;
1787 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1787 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1788 1788
1789// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]); 1789// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]);
1790// if (name) ERR("Unknown state: %s", name); 1790// if (name) ERR("Unknown state: %s", name);
@@ -1888,10 +1888,10 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
1888 && (xevent->xclient.window == _ecore_x_private_win)) 1888 && (xevent->xclient.window == _ecore_x_private_win))
1889 { 1889 {
1890 /* a grab sync marker */ 1890 /* a grab sync marker */
1891 if (xevent->xclient.data.l[1] == 0x10000001) 1891 if (xevent->xclient.data.l[1] == 0x10000001)
1892 _ecore_x_window_grab_remove(xevent->xclient.data.l[2]); 1892 _ecore_x_window_grab_remove(xevent->xclient.data.l[2]);
1893 else if (xevent->xclient.data.l[1] == 0x10000002) 1893 else if (xevent->xclient.data.l[1] == 0x10000002)
1894 _ecore_x_key_grab_remove(xevent->xclient.data.l[2]); 1894 _ecore_x_key_grab_remove(xevent->xclient.data.l[2]);
1895 } 1895 }
1896 else 1896 else
1897 { 1897 {
@@ -2315,7 +2315,7 @@ _ecore_x_event_handle_gesture_notify_flick(XEvent *xevent)
2315 xfe = (XGestureNotifyFlickEvent *)xevent; 2315 xfe = (XGestureNotifyFlickEvent *)xevent;
2316 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Flick)); 2316 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Flick));
2317 if (!e) 2317 if (!e)
2318 return; 2318 return;
2319 2319
2320 e->win = xfe->window; 2320 e->win = xfe->window;
2321 e->time = xfe->time; 2321 e->time = xfe->time;
@@ -2341,7 +2341,7 @@ _ecore_x_event_handle_gesture_notify_pan(XEvent *xevent)
2341 xpe = (XGestureNotifyPanEvent *)xevent; 2341 xpe = (XGestureNotifyPanEvent *)xevent;
2342 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Pan)); 2342 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Pan));
2343 if (!e) 2343 if (!e)
2344 return; 2344 return;
2345 2345
2346 e->win = xpe->window; 2346 e->win = xpe->window;
2347 e->time = xpe->time; 2347 e->time = xpe->time;
@@ -2368,7 +2368,7 @@ _ecore_x_event_handle_gesture_notify_pinchrotation(XEvent *xevent)
2368 xpre = (XGestureNotifyPinchRotationEvent *)xevent; 2368 xpre = (XGestureNotifyPinchRotationEvent *)xevent;
2369 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_PinchRotation)); 2369 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_PinchRotation));
2370 if (!e) 2370 if (!e)
2371 return; 2371 return;
2372 2372
2373 e->win = xpre->window; 2373 e->win = xpre->window;
2374 e->time = xpre->time; 2374 e->time = xpre->time;
@@ -2395,7 +2395,7 @@ _ecore_x_event_handle_gesture_notify_tap(XEvent *xevent)
2395 xte = (XGestureNotifyTapEvent *)xevent; 2395 xte = (XGestureNotifyTapEvent *)xevent;
2396 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Tap)); 2396 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Tap));
2397 if (!e) 2397 if (!e)
2398 return; 2398 return;
2399 2399
2400 e->win = xte->window; 2400 e->win = xte->window;
2401 e->time = xte->time; 2401 e->time = xte->time;
@@ -2421,7 +2421,7 @@ _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent)
2421 xthe = (XGestureNotifyTapNHoldEvent *)xevent; 2421 xthe = (XGestureNotifyTapNHoldEvent *)xevent;
2422 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_TapNHold)); 2422 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_TapNHold));
2423 if (!e) 2423 if (!e)
2424 return; 2424 return;
2425 2425
2426 e->win = xthe->window; 2426 e->win = xthe->window;
2427 e->time = xthe->time; 2427 e->time = xthe->time;
@@ -2436,7 +2436,7 @@ _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent)
2436} 2436}
2437 2437
2438void 2438void
2439 _ecore_x_event_handle_gesture_notify_hold(XEvent *xevent) 2439_ecore_x_event_handle_gesture_notify_hold(XEvent *xevent)
2440{ 2440{
2441 XGestureNotifyHoldEvent *xhe; 2441 XGestureNotifyHoldEvent *xhe;
2442 Ecore_X_Event_Gesture_Notify_Hold *e; 2442 Ecore_X_Event_Gesture_Notify_Hold *e;
@@ -2447,7 +2447,7 @@ void
2447 xhe = (XGestureNotifyHoldEvent *)xevent; 2447 xhe = (XGestureNotifyHoldEvent *)xevent;
2448 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Hold)); 2448 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Hold));
2449 if (!e) 2449 if (!e)
2450 return; 2450 return;
2451 2451
2452 e->win = xhe->window; 2452 e->win = xhe->window;
2453 e->time = xhe->time; 2453 e->time = xhe->time;
@@ -2461,7 +2461,7 @@ void
2461} 2461}
2462 2462
2463void 2463void
2464 _ecore_x_event_handle_gesture_notify_group(XEvent *xevent) 2464_ecore_x_event_handle_gesture_notify_group(XEvent *xevent)
2465{ 2465{
2466 XGestureNotifyGroupEvent *xge; 2466 XGestureNotifyGroupEvent *xge;
2467 Ecore_X_Event_Gesture_Notify_Group *e; 2467 Ecore_X_Event_Gesture_Notify_Group *e;
@@ -2472,7 +2472,7 @@ void
2472 xge = (XGestureNotifyGroupEvent *)xevent; 2472 xge = (XGestureNotifyGroupEvent *)xevent;
2473 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Group)); 2473 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Group));
2474 if (!e) 2474 if (!e)
2475 return; 2475 return;
2476 2476
2477 e->win = xge->window; 2477 e->win = xge->window;
2478 e->time = xge->time; 2478 e->time = xge->time;
@@ -2482,5 +2482,6 @@ void
2482 2482
2483 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_GROUP, e, NULL, NULL); 2483 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_GROUP, e, NULL, NULL);
2484} 2484}
2485
2485#endif /* ifdef ECORE_XGESTURE */ 2486#endif /* ifdef ECORE_XGESTURE */
2486 2487
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c
index 61d3943349..da0a6c3ac9 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c
@@ -38,7 +38,7 @@ _ecore_x_fixes_init(void)
38/* I don't know what to call this function. */ 38/* I don't know what to call this function. */
39static XRectangle * 39static XRectangle *
40_ecore_x_rectangle_ecore_to_x(Ecore_X_Rectangle *rects, 40_ecore_x_rectangle_ecore_to_x(Ecore_X_Rectangle *rects,
41 int num) 41 int num)
42{ 42{
43 XRectangle *xrect; 43 XRectangle *xrect;
44 int i; 44 int i;
@@ -62,7 +62,7 @@ _ecore_x_rectangle_ecore_to_x(Ecore_X_Rectangle *rects,
62 62
63static Ecore_X_Rectangle * 63static Ecore_X_Rectangle *
64_ecore_x_rectangle_x_to_ecore(XRectangle *xrect, 64_ecore_x_rectangle_x_to_ecore(XRectangle *xrect,
65 int num) 65 int num)
66{ 66{
67 Ecore_X_Rectangle *rects; 67 Ecore_X_Rectangle *rects;
68 int i; 68 int i;
@@ -106,7 +106,7 @@ ecore_x_fixes_selection_notification_request(Ecore_X_Atom selection)
106 106
107EAPI Ecore_X_Region 107EAPI Ecore_X_Region
108ecore_x_region_new(Ecore_X_Rectangle *rects, 108ecore_x_region_new(Ecore_X_Rectangle *rects,
109 int num) 109 int num)
110{ 110{
111#ifdef ECORE_XFIXES 111#ifdef ECORE_XFIXES
112 Ecore_X_Region region; 112 Ecore_X_Region region;
@@ -137,7 +137,7 @@ ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap)
137} 137}
138 138
139EAPI Ecore_X_Region 139EAPI Ecore_X_Region
140ecore_x_region_new_from_window(Ecore_X_Window win, 140ecore_x_region_new_from_window(Ecore_X_Window win,
141 Ecore_X_Region_Type type) 141 Ecore_X_Region_Type type)
142{ 142{
143#ifdef ECORE_XFIXES 143#ifdef ECORE_XFIXES
@@ -189,9 +189,9 @@ ecore_x_region_free(Ecore_X_Region region)
189} 189}
190 190
191EAPI void 191EAPI void
192ecore_x_region_set(Ecore_X_Region region, 192ecore_x_region_set(Ecore_X_Region region,
193 Ecore_X_Rectangle *rects, 193 Ecore_X_Rectangle *rects,
194 int num) 194 int num)
195{ 195{
196#ifdef ECORE_XFIXES 196#ifdef ECORE_XFIXES
197 XRectangle *xrect = _ecore_x_rectangle_ecore_to_x(rects, num); 197 XRectangle *xrect = _ecore_x_rectangle_ecore_to_x(rects, num);
@@ -244,16 +244,17 @@ ecore_x_region_subtract(Ecore_X_Region dest,
244} 244}
245 245
246EAPI void 246EAPI void
247ecore_x_region_invert(Ecore_X_Region dest, 247ecore_x_region_invert(Ecore_X_Region dest,
248 Ecore_X_Rectangle *bounds, 248 Ecore_X_Rectangle *bounds,
249 Ecore_X_Region source) 249 Ecore_X_Region source)
250{ 250{
251#ifdef ECORE_XFIXES 251#ifdef ECORE_XFIXES
252 XRectangle *xbound; 252 XRectangle *xbound;
253 int num = 0; 253 int num = 0;
254 254
255 LOGFN(__FILE__, __LINE__, __FUNCTION__); 255 LOGFN(__FILE__, __LINE__, __FUNCTION__);
256 while (bounds + num) num++; 256 while (bounds + num)
257 num++;
257 xbound = _ecore_x_rectangle_ecore_to_x(bounds, num); 258 xbound = _ecore_x_rectangle_ecore_to_x(bounds, num);
258 259
259 XFixesInvertRegion(_ecore_x_disp, dest, xbound, source); 260 XFixesInvertRegion(_ecore_x_disp, dest, xbound, source);
@@ -262,8 +263,8 @@ ecore_x_region_invert(Ecore_X_Region dest,
262 263
263EAPI void 264EAPI void
264ecore_x_region_translate(Ecore_X_Region region, 265ecore_x_region_translate(Ecore_X_Region region,
265 int dx, 266 int dx,
266 int dy) 267 int dy)
267{ 268{
268#ifdef ECORE_XFIXES 269#ifdef ECORE_XFIXES
269 LOGFN(__FILE__, __LINE__, __FUNCTION__); 270 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -282,8 +283,8 @@ ecore_x_region_extents(Ecore_X_Region dest,
282} 283}
283 284
284EAPI Ecore_X_Rectangle * 285EAPI Ecore_X_Rectangle *
285ecore_x_region_fetch(Ecore_X_Region region, 286ecore_x_region_fetch(Ecore_X_Region region,
286 int *num, 287 int *num,
287 Ecore_X_Rectangle *bounds){ 288 Ecore_X_Rectangle *bounds){
288#ifdef ECORE_XFIXES 289#ifdef ECORE_XFIXES
289 Ecore_X_Rectangle *rects; 290 Ecore_X_Rectangle *rects;
@@ -305,10 +306,10 @@ ecore_x_region_fetch(Ecore_X_Region region,
305EAPI void 306EAPI void
306ecore_x_region_expand(Ecore_X_Region dest, 307ecore_x_region_expand(Ecore_X_Region dest,
307 Ecore_X_Region source, 308 Ecore_X_Region source,
308 unsigned int left, 309 unsigned int left,
309 unsigned int right, 310 unsigned int right,
310 unsigned int top, 311 unsigned int top,
311 unsigned int bottom) 312 unsigned int bottom)
312{ 313{
313#ifdef ECORE_XFIXES 314#ifdef ECORE_XFIXES
314 LOGFN(__FILE__, __LINE__, __FUNCTION__); 315 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -318,9 +319,9 @@ ecore_x_region_expand(Ecore_X_Region dest,
318 319
319EAPI void 320EAPI void
320ecore_x_region_gc_clip_set(Ecore_X_Region region, 321ecore_x_region_gc_clip_set(Ecore_X_Region region,
321 Ecore_X_GC gc, 322 Ecore_X_GC gc,
322 int x_origin, 323 int x_origin,
323 int y_origin) 324 int y_origin)
324{ 325{
325#ifdef ECORE_XFIXES 326#ifdef ECORE_XFIXES
326 LOGFN(__FILE__, __LINE__, __FUNCTION__); 327 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -329,11 +330,11 @@ ecore_x_region_gc_clip_set(Ecore_X_Region region,
329} 330}
330 331
331EAPI void 332EAPI void
332ecore_x_region_window_shape_set(Ecore_X_Region region, 333ecore_x_region_window_shape_set(Ecore_X_Region region,
333 Ecore_X_Window win, 334 Ecore_X_Window win,
334 Ecore_X_Shape_Type type, 335 Ecore_X_Shape_Type type,
335 int x_offset, 336 int x_offset,
336 int y_offset) 337 int y_offset)
337{ 338{
338#ifdef ECORE_XFIXES 339#ifdef ECORE_XFIXES
339 LOGFN(__FILE__, __LINE__, __FUNCTION__); 340 LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -347,10 +348,10 @@ ecore_x_region_window_shape_set(Ecore_X_Region region,
347} 348}
348 349
349EAPI void 350EAPI void
350ecore_x_region_picture_clip_set(Ecore_X_Region region, 351ecore_x_region_picture_clip_set(Ecore_X_Region region,
351 Ecore_X_Picture picture, 352 Ecore_X_Picture picture,
352 int x_origin, 353 int x_origin,
353 int y_origin) 354 int y_origin)
354{ 355{
355#ifdef ECORE_XFIXES 356#ifdef ECORE_XFIXES
356 LOGFN(__FILE__, __LINE__, __FUNCTION__); 357 LOGFN(__FILE__, __LINE__, __FUNCTION__);
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
index 5f6ae04d3c..539636648f 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
@@ -19,9 +19,9 @@
19 * @return The new default graphics context. 19 * @return The new default graphics context.
20 */ 20 */
21EAPI Ecore_X_GC 21EAPI Ecore_X_GC
22ecore_x_gc_new(Ecore_X_Drawable draw, 22ecore_x_gc_new(Ecore_X_Drawable draw,
23 Ecore_X_GC_Value_Mask value_mask, 23 Ecore_X_GC_Value_Mask value_mask,
24 const unsigned int *value_list) 24 const unsigned int *value_list)
25{ 25{
26 XGCValues gcv; 26 XGCValues gcv;
27 int mask; 27 int mask;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c
index e1dc75c4a5..e89421bf4b 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c
@@ -26,7 +26,7 @@ _ecore_x_gesture_init(void)
26 _gesture_available = EINA_TRUE; 26 _gesture_available = EINA_TRUE;
27 } 27 }
28 else 28 else
29 _gesture_available = EINA_FALSE; 29 _gesture_available = EINA_FALSE;
30#else /* ifdef ECORE_XGESTURE */ 30#else /* ifdef ECORE_XGESTURE */
31 _gesture_available = EINA_FALSE; 31 _gesture_available = EINA_FALSE;
32#endif /* ifdef ECORE_XGESTURE */ 32#endif /* ifdef ECORE_XGESTURE */
@@ -48,11 +48,11 @@ ecore_x_gesture_events_select(Ecore_X_Window win,
48{ 48{
49#ifdef ECORE_XGESTURE 49#ifdef ECORE_XGESTURE
50 if (!_gesture_available) 50 if (!_gesture_available)
51 return EINA_FALSE; 51 return EINA_FALSE;
52 52
53 LOGFN(__FILE__, __LINE__, __FUNCTION__); 53 LOGFN(__FILE__, __LINE__, __FUNCTION__);
54 XGestureSelectEvents(_ecore_x_disp, win, mask); 54 XGestureSelectEvents(_ecore_x_disp, win, mask);
55 55
56 return EINA_TRUE; 56 return EINA_TRUE;
57#else /* ifdef ECORE_XGESTURE */ 57#else /* ifdef ECORE_XGESTURE */
58 return EINA_FALSE; 58 return EINA_FALSE;
@@ -68,7 +68,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win)
68 Ecore_X_Gesture_Event_Mask mask; 68 Ecore_X_Gesture_Event_Mask mask;
69 69
70 if (!_gesture_available) 70 if (!_gesture_available)
71 return ECORE_X_GESTURE_EVENT_MASK_NONE; 71 return ECORE_X_GESTURE_EVENT_MASK_NONE;
72 72
73 LOGFN(__FILE__, __LINE__, __FUNCTION__); 73 LOGFN(__FILE__, __LINE__, __FUNCTION__);
74 if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, &mask)) 74 if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, &mask))
@@ -76,7 +76,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win)
76 mask = ECORE_X_GESTURE_EVENT_MASK_NONE; 76 mask = ECORE_X_GESTURE_EVENT_MASK_NONE;
77 return mask; 77 return mask;
78 } 78 }
79 79
80 return mask; 80 return mask;
81#else /* ifdef ECORE_XGESTURE */ 81#else /* ifdef ECORE_XGESTURE */
82 return ECORE_X_GESTURE_EVENT_MASK_NONE; 82 return ECORE_X_GESTURE_EVENT_MASK_NONE;
@@ -91,14 +91,14 @@ ecore_x_gesture_event_grab(Ecore_X_Window win,
91{ 91{
92#ifdef ECORE_XGESTURE 92#ifdef ECORE_XGESTURE
93 if (!_gesture_available) 93 if (!_gesture_available)
94 return EINA_FALSE; 94 return EINA_FALSE;
95 95
96 LOGFN(__FILE__, __LINE__, __FUNCTION__); 96 LOGFN(__FILE__, __LINE__, __FUNCTION__);
97 if (GestureGrabSuccess != XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) 97 if (GestureGrabSuccess != XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime))
98 { 98 {
99 return EINA_FALSE; 99 return EINA_FALSE;
100 } 100 }
101 101
102 return EINA_TRUE; 102 return EINA_TRUE;
103#else /* ifdef ECORE_XGESTURE */ 103#else /* ifdef ECORE_XGESTURE */
104 return EINA_FALSE; 104 return EINA_FALSE;
@@ -117,14 +117,14 @@ ecore_x_gesture_event_ungrab(Ecore_X_Window win,
117 Ecore_X_Gesture_Event_Mask mask; 117 Ecore_X_Gesture_Event_Mask mask;
118 118
119 if (!_gesture_available) 119 if (!_gesture_available)
120 return EINA_FALSE; 120 return EINA_FALSE;
121 121
122 LOGFN(__FILE__, __LINE__, __FUNCTION__); 122 LOGFN(__FILE__, __LINE__, __FUNCTION__);
123 if (GestureUngrabSuccess != XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) 123 if (GestureUngrabSuccess != XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime))
124 { 124 {
125 return EINA_FALSE; 125 return EINA_FALSE;
126 } 126 }
127 127
128 return EINA_TRUE; 128 return EINA_TRUE;
129#else /* ifdef ECORE_XGESTURE */ 129#else /* ifdef ECORE_XGESTURE */
130 return EINA_FALSE; 130 return EINA_FALSE;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c
index 4aeff60832..3babbc147c 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c
@@ -24,7 +24,7 @@ ecore_x_icccm_init(void)
24} 24}
25 25
26EAPI void 26EAPI void
27ecore_x_icccm_state_set(Ecore_X_Window win, 27ecore_x_icccm_state_set(Ecore_X_Window win,
28 Ecore_X_Window_State_Hint state) 28 Ecore_X_Window_State_Hint state)
29{ 29{
30 unsigned long c[2]; 30 unsigned long c[2];
@@ -76,7 +76,7 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
76 76
77EAPI void 77EAPI void
78ecore_x_icccm_delete_window_send(Ecore_X_Window win, 78ecore_x_icccm_delete_window_send(Ecore_X_Window win,
79 Ecore_X_Time t) 79 Ecore_X_Time t)
80{ 80{
81 LOGFN(__FILE__, __LINE__, __FUNCTION__); 81 LOGFN(__FILE__, __LINE__, __FUNCTION__);
82 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, 82 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
@@ -87,7 +87,7 @@ ecore_x_icccm_delete_window_send(Ecore_X_Window win,
87 87
88EAPI void 88EAPI void
89ecore_x_icccm_take_focus_send(Ecore_X_Window win, 89ecore_x_icccm_take_focus_send(Ecore_X_Window win,
90 Ecore_X_Time t) 90 Ecore_X_Time t)
91{ 91{
92 LOGFN(__FILE__, __LINE__, __FUNCTION__); 92 LOGFN(__FILE__, __LINE__, __FUNCTION__);
93 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, 93 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
@@ -98,7 +98,7 @@ ecore_x_icccm_take_focus_send(Ecore_X_Window win,
98 98
99EAPI void 99EAPI void
100ecore_x_icccm_save_yourself_send(Ecore_X_Window win, 100ecore_x_icccm_save_yourself_send(Ecore_X_Window win,
101 Ecore_X_Time t) 101 Ecore_X_Time t)
102{ 102{
103 LOGFN(__FILE__, __LINE__, __FUNCTION__); 103 LOGFN(__FILE__, __LINE__, __FUNCTION__);
104 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, 104 ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS,
@@ -109,10 +109,10 @@ ecore_x_icccm_save_yourself_send(Ecore_X_Window win,
109 109
110EAPI void 110EAPI void
111ecore_x_icccm_move_resize_send(Ecore_X_Window win, 111ecore_x_icccm_move_resize_send(Ecore_X_Window win,
112 int x, 112 int x,
113 int y, 113 int y,
114 int w, 114 int w,
115 int h) 115 int h)
116{ 116{
117 XEvent ev; 117 XEvent ev;
118 118
@@ -132,14 +132,14 @@ ecore_x_icccm_move_resize_send(Ecore_X_Window win,
132} 132}
133 133
134EAPI void 134EAPI void
135ecore_x_icccm_hints_set(Ecore_X_Window win, 135ecore_x_icccm_hints_set(Ecore_X_Window win,
136 Eina_Bool accepts_focus, 136 Eina_Bool accepts_focus,
137 Ecore_X_Window_State_Hint initial_state, 137 Ecore_X_Window_State_Hint initial_state,
138 Ecore_X_Pixmap icon_pixmap, 138 Ecore_X_Pixmap icon_pixmap,
139 Ecore_X_Pixmap icon_mask, 139 Ecore_X_Pixmap icon_mask,
140 Ecore_X_Window icon_window, 140 Ecore_X_Window icon_window,
141 Ecore_X_Window window_group, 141 Ecore_X_Window window_group,
142 Eina_Bool is_urgent) 142 Eina_Bool is_urgent)
143{ 143{
144 XWMHints *hints; 144 XWMHints *hints;
145 145
@@ -189,14 +189,14 @@ ecore_x_icccm_hints_set(Ecore_X_Window win,
189} 189}
190 190
191EAPI Eina_Bool 191EAPI Eina_Bool
192ecore_x_icccm_hints_get(Ecore_X_Window win, 192ecore_x_icccm_hints_get(Ecore_X_Window win,
193 Eina_Bool *accepts_focus, 193 Eina_Bool *accepts_focus,
194 Ecore_X_Window_State_Hint *initial_state, 194 Ecore_X_Window_State_Hint *initial_state,
195 Ecore_X_Pixmap *icon_pixmap, 195 Ecore_X_Pixmap *icon_pixmap,
196 Ecore_X_Pixmap *icon_mask, 196 Ecore_X_Pixmap *icon_mask,
197 Ecore_X_Window *icon_window, 197 Ecore_X_Window *icon_window,
198 Ecore_X_Window *window_group, 198 Ecore_X_Window *window_group,
199 Eina_Bool *is_urgent) 199 Eina_Bool *is_urgent)
200{ 200{
201 XWMHints *hints; 201 XWMHints *hints;
202 202
@@ -266,19 +266,19 @@ ecore_x_icccm_hints_get(Ecore_X_Window win,
266} 266}
267 267
268EAPI void 268EAPI void
269ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, 269ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win,
270 Eina_Bool request_pos, 270 Eina_Bool request_pos,
271 Ecore_X_Gravity gravity, 271 Ecore_X_Gravity gravity,
272 int min_w, 272 int min_w,
273 int min_h, 273 int min_h,
274 int max_w, 274 int max_w,
275 int max_h, 275 int max_h,
276 int base_w, 276 int base_w,
277 int base_h, 277 int base_h,
278 int step_x, 278 int step_x,
279 int step_y, 279 int step_y,
280 double min_aspect, 280 double min_aspect,
281 double max_aspect) 281 double max_aspect)
282{ 282{
283 XSizeHints hint; 283 XSizeHints hint;
284 long mask; 284 long mask;
@@ -338,19 +338,19 @@ ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win,
338} 338}
339 339
340EAPI Eina_Bool 340EAPI Eina_Bool
341ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, 341ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win,
342 Eina_Bool *request_pos, 342 Eina_Bool *request_pos,
343 Ecore_X_Gravity *gravity, 343 Ecore_X_Gravity *gravity,
344 int *min_w, 344 int *min_w,
345 int *min_h, 345 int *min_h,
346 int *max_w, 346 int *max_w,
347 int *max_h, 347 int *max_h,
348 int *base_w, 348 int *base_w,
349 int *base_h, 349 int *base_h,
350 int *step_x, 350 int *step_x,
351 int *step_y, 351 int *step_y,
352 double *min_aspect, 352 double *min_aspect,
353 double *max_aspect) 353 double *max_aspect)
354{ 354{
355 XSizeHints hint; 355 XSizeHints hint;
356 long mask; 356 long mask;
@@ -464,7 +464,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win,
464 464
465EAPI void 465EAPI void
466ecore_x_icccm_title_set(Ecore_X_Window win, 466ecore_x_icccm_title_set(Ecore_X_Window win,
467 const char *t) 467 const char *t)
468{ 468{
469 char *list[1]; 469 char *list[1];
470 XTextProperty xprop; 470 XTextProperty xprop;
@@ -522,23 +522,23 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
522 t = strdup((char *)xprop.value); 522 t = strdup((char *)xprop.value);
523 else 523 else
524 { 524 {
525 /* convert to utf8 */ 525 /* convert to utf8 */
526#ifdef X_HAVE_UTF8_STRING 526#ifdef X_HAVE_UTF8_STRING
527 ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, 527 ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop,
528 &list, &num); 528 &list, &num);
529#else /* ifdef X_HAVE_UTF8_STRING */ 529#else /* ifdef X_HAVE_UTF8_STRING */
530 ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, 530 ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop,
531 &list, &num); 531 &list, &num);
532#endif /* ifdef X_HAVE_UTF8_STRING */ 532#endif /* ifdef X_HAVE_UTF8_STRING */
533 533
534 if ((ret == XLocaleNotSupported) || 534 if ((ret == XLocaleNotSupported) ||
535 (ret == XNoMemory) || (ret == XConverterNotFound)) 535 (ret == XNoMemory) || (ret == XConverterNotFound))
536 t = strdup((char *)xprop.value); 536 t = strdup((char *)xprop.value);
537 else if ((ret >= Success) && (num > 0)) 537 else if ((ret >= Success) && (num > 0))
538 t = strdup(list[0]); 538 t = strdup(list[0]);
539 539
540 if (list) 540 if (list)
541 XFreeStringList(list); 541 XFreeStringList(list);
542 } 542 }
543 543
544 if (xprop.value) 544 if (xprop.value)
@@ -559,8 +559,8 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
559 */ 559 */
560EAPI void 560EAPI void
561ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, 561ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win,
562 Ecore_X_Atom *protos, 562 Ecore_X_Atom *protos,
563 int num) 563 int num)
564{ 564{
565 LOGFN(__FILE__, __LINE__, __FUNCTION__); 565 LOGFN(__FILE__, __LINE__, __FUNCTION__);
566 if (num > 0) 566 if (num > 0)
@@ -576,9 +576,9 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win,
576 * @param on On/Off 576 * @param on On/Off
577 */ 577 */
578EAPI void 578EAPI void
579ecore_x_icccm_protocol_set(Ecore_X_Window win, 579ecore_x_icccm_protocol_set(Ecore_X_Window win,
580 Ecore_X_WM_Protocol protocol, 580 Ecore_X_WM_Protocol protocol,
581 Eina_Bool on) 581 Eina_Bool on)
582{ 582{
583 Atom *protos = NULL; 583 Atom *protos = NULL;
584 Atom proto; 584 Atom proto;
@@ -662,7 +662,7 @@ leave:
662 * @return 1 if the protocol is set, else 0. 662 * @return 1 if the protocol is set, else 0.
663 */ 663 */
664EAPI Eina_Bool 664EAPI Eina_Bool
665ecore_x_icccm_protocol_isset(Ecore_X_Window win, 665ecore_x_icccm_protocol_isset(Ecore_X_Window win,
666 Ecore_X_WM_Protocol protocol) 666 Ecore_X_WM_Protocol protocol)
667{ 667{
668 Atom proto, *protos = NULL; 668 Atom proto, *protos = NULL;
@@ -702,8 +702,8 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win,
702 */ 702 */
703EAPI void 703EAPI void
704ecore_x_icccm_name_class_set(Ecore_X_Window win, 704ecore_x_icccm_name_class_set(Ecore_X_Window win,
705 const char *n, 705 const char *n,
706 const char *c) 706 const char *c)
707{ 707{
708 XClassHint *xch; 708 XClassHint *xch;
709 709
@@ -728,8 +728,8 @@ ecore_x_icccm_name_class_set(Ecore_X_Window win,
728 */ 728 */
729EAPI void 729EAPI void
730ecore_x_icccm_name_class_get(Ecore_X_Window win, 730ecore_x_icccm_name_class_get(Ecore_X_Window win,
731 char **n, 731 char **n,
732 char **c) 732 char **c)
733{ 733{
734 XClassHint xch; 734 XClassHint xch;
735 735
@@ -783,8 +783,8 @@ ecore_x_icccm_client_machine_get(Ecore_X_Window win)
783 */ 783 */
784EAPI void 784EAPI void
785ecore_x_icccm_command_set(Ecore_X_Window win, 785ecore_x_icccm_command_set(Ecore_X_Window win,
786 int argc, 786 int argc,
787 char **argv) 787 char **argv)
788{ 788{
789 LOGFN(__FILE__, __LINE__, __FUNCTION__); 789 LOGFN(__FILE__, __LINE__, __FUNCTION__);
790 XSetCommand(_ecore_x_disp, win, argv, argc); 790 XSetCommand(_ecore_x_disp, win, argv, argc);
@@ -801,8 +801,8 @@ ecore_x_icccm_command_set(Ecore_X_Window win,
801 */ 801 */
802EAPI void 802EAPI void
803ecore_x_icccm_command_get(Ecore_X_Window win, 803ecore_x_icccm_command_get(Ecore_X_Window win,
804 int *argc, 804 int *argc,
805 char ***argv) 805 char ***argv)
806{ 806{
807 int i, c; 807 int i, c;
808 char **v; 808 char **v;
@@ -861,7 +861,7 @@ ecore_x_icccm_command_get(Ecore_X_Window win,
861 */ 861 */
862EAPI void 862EAPI void
863ecore_x_icccm_icon_name_set(Ecore_X_Window win, 863ecore_x_icccm_icon_name_set(Ecore_X_Window win,
864 const char *t) 864 const char *t)
865{ 865{
866 char *list[1]; 866 char *list[1];
867 XTextProperty xprop; 867 XTextProperty xprop;
@@ -921,26 +921,26 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win)
921 t = strdup((char *)xprop.value); 921 t = strdup((char *)xprop.value);
922 else 922 else
923 { 923 {
924 /* convert to utf8 */ 924 /* convert to utf8 */
925#ifdef X_HAVE_UTF8_STRING 925#ifdef X_HAVE_UTF8_STRING
926 ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, 926 ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop,
927 &list, &num); 927 &list, &num);
928#else /* ifdef X_HAVE_UTF8_STRING */ 928#else /* ifdef X_HAVE_UTF8_STRING */
929 ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, 929 ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop,
930 &list, &num); 930 &list, &num);
931#endif /* ifdef X_HAVE_UTF8_STRING */ 931#endif /* ifdef X_HAVE_UTF8_STRING */
932 932
933 if ((ret == XLocaleNotSupported) || 933 if ((ret == XLocaleNotSupported) ||
934 (ret == XNoMemory) || (ret == XConverterNotFound)) 934 (ret == XNoMemory) || (ret == XConverterNotFound))
935 t = strdup((char *)xprop.value); 935 t = strdup((char *)xprop.value);
936 else if (ret >= Success) 936 else if (ret >= Success)
937 { 937 {
938 if ((num >= 1) && (list)) 938 if ((num >= 1) && (list))
939 t = strdup(list[0]); 939 t = strdup(list[0]);
940 940
941 if (list) 941 if (list)
942 XFreeStringList(list); 942 XFreeStringList(list);
943 } 943 }
944 } 944 }
945 945
946 if (xprop.value) 946 if (xprop.value)
@@ -1129,7 +1129,7 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win)
1129 */ 1129 */
1130EAPI void 1130EAPI void
1131ecore_x_icccm_window_role_set(Ecore_X_Window win, 1131ecore_x_icccm_window_role_set(Ecore_X_Window win,
1132 const char *role) 1132 const char *role)
1133{ 1133{
1134 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1134 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1135 ecore_x_window_prop_string_set(win, ECORE_X_ATOM_WM_WINDOW_ROLE, 1135 ecore_x_window_prop_string_set(win, ECORE_X_ATOM_WM_WINDOW_ROLE,
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
index 5e52adf571..545048d6cd 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
@@ -15,7 +15,7 @@ static int _ecore_x_image_shm_can = -1;
15static int _ecore_x_image_err = 0; 15static int _ecore_x_image_err = 0;
16 16
17static int 17static int
18_ecore_x_image_error_handler(Display *d __UNUSED__, 18_ecore_x_image_error_handler(Display *d __UNUSED__,
19 XErrorEvent *ev __UNUSED__) 19 XErrorEvent *ev __UNUSED__)
20{ 20{
21 _ecore_x_image_err = 1; 21 _ecore_x_image_err = 1;
@@ -105,10 +105,10 @@ struct _Ecore_X_Image
105}; 105};
106 106
107EAPI Ecore_X_Image * 107EAPI Ecore_X_Image *
108ecore_x_image_new(int w, 108ecore_x_image_new(int w,
109 int h, 109 int h,
110 Ecore_X_Visual vis, 110 Ecore_X_Visual vis,
111 int depth) 111 int depth)
112{ 112{
113 Ecore_X_Image *im; 113 Ecore_X_Image *im;
114 114
@@ -195,14 +195,14 @@ _ecore_x_image_shm_create(Ecore_X_Image *im)
195} 195}
196 196
197EAPI Eina_Bool 197EAPI Eina_Bool
198ecore_x_image_get(Ecore_X_Image *im, 198ecore_x_image_get(Ecore_X_Image *im,
199 Ecore_X_Drawable draw, 199 Ecore_X_Drawable draw,
200 int x, 200 int x,
201 int y, 201 int y,
202 int sx, 202 int sx,
203 int sy, 203 int sy,
204 int w, 204 int w,
205 int h) 205 int h)
206{ 206{
207 Eina_Bool ret = EINA_TRUE; 207 Eina_Bool ret = EINA_TRUE;
208 XErrorHandler ph; 208 XErrorHandler ph;
@@ -281,15 +281,15 @@ ecore_x_image_get(Ecore_X_Image *im,
281} 281}
282 282
283EAPI void 283EAPI void
284ecore_x_image_put(Ecore_X_Image *im, 284ecore_x_image_put(Ecore_X_Image *im,
285 Ecore_X_Drawable draw, 285 Ecore_X_Drawable draw,
286 Ecore_X_GC gc, 286 Ecore_X_GC gc,
287 int x, 287 int x,
288 int y, 288 int y,
289 int sx, 289 int sx,
290 int sy, 290 int sy,
291 int w, 291 int w,
292 int h) 292 int h)
293{ 293{
294 Ecore_X_GC tgc = 0; 294 Ecore_X_GC tgc = 0;
295 295
@@ -310,9 +310,9 @@ ecore_x_image_put(Ecore_X_Image *im,
310 310
311EAPI void * 311EAPI void *
312ecore_x_image_data_get(Ecore_X_Image *im, 312ecore_x_image_data_get(Ecore_X_Image *im,
313 int *bpl, 313 int *bpl,
314 int *rows, 314 int *rows,
315 int *bpp) 315 int *bpp)
316{ 316{
317 LOGFN(__FILE__, __LINE__, __FUNCTION__); 317 LOGFN(__FILE__, __LINE__, __FUNCTION__);
318 if (!im->xim) _ecore_x_image_shm_create(im); 318 if (!im->xim) _ecore_x_image_shm_create(im);
@@ -345,19 +345,19 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im)
345} 345}
346 346
347EAPI Eina_Bool 347EAPI Eina_Bool
348ecore_x_image_to_argb_convert(void *src, 348ecore_x_image_to_argb_convert(void *src,
349 int sbpp, 349 int sbpp,
350 int sbpl, 350 int sbpl,
351 Ecore_X_Colormap c, 351 Ecore_X_Colormap c,
352 Ecore_X_Visual v, 352 Ecore_X_Visual v,
353 int x, 353 int x,
354 int y, 354 int y,
355 int w, 355 int w,
356 int h, 356 int h,
357 unsigned int *dst, 357 unsigned int *dst,
358 int dbpl, 358 int dbpl,
359 int dx, 359 int dx,
360 int dy) 360 int dy)
361{ 361{
362 Visual *vis = v; 362 Visual *vis = v;
363 XColor *cols = NULL; 363 XColor *cols = NULL;
@@ -411,9 +411,9 @@ ecore_x_image_to_argb_convert(void *src,
411 else if ((vis->class == TrueColor) || 411 else if ((vis->class == TrueColor) ||
412 (vis->class == DirectColor)) 412 (vis->class == DirectColor))
413 { 413 {
414 if ((vis->red_mask == 0x00ff0000) && 414 if ((vis->red_mask == 0x00ff0000) &&
415 (vis->green_mask == 0x0000ff00) && 415 (vis->green_mask == 0x0000ff00) &&
416 (vis->blue_mask == 0x000000ff)) 416 (vis->blue_mask == 0x000000ff))
417 mode = argbx888; 417 mode = argbx888;
418 else if ((vis->red_mask == 0x000000ff) && 418 else if ((vis->red_mask == 0x000000ff) &&
419 (vis->green_mask == 0x0000ff00) && 419 (vis->green_mask == 0x0000ff00) &&
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c
index 710d4b238c..7812cc23ae 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c
@@ -32,8 +32,8 @@ typedef struct _mwmhints
32MWMHints; 32MWMHints;
33 33
34EAPI Eina_Bool 34EAPI Eina_Bool
35ecore_x_mwm_hints_get(Ecore_X_Window win, 35ecore_x_mwm_hints_get(Ecore_X_Window win,
36 Ecore_X_MWM_Hint_Func *fhint, 36 Ecore_X_MWM_Hint_Func *fhint,
37 Ecore_X_MWM_Hint_Decor *dhint, 37 Ecore_X_MWM_Hint_Decor *dhint,
38 Ecore_X_MWM_Hint_Input *ihint) 38 Ecore_X_MWM_Hint_Input *ihint)
39{ 39{
@@ -90,7 +90,7 @@ ecore_x_mwm_hints_get(Ecore_X_Window win,
90 90
91EAPI void 91EAPI void
92ecore_x_mwm_borderless_set(Ecore_X_Window win, 92ecore_x_mwm_borderless_set(Ecore_X_Window win,
93 Eina_Bool borderless) 93 Eina_Bool borderless)
94{ 94{
95 unsigned int data[5] = {0, 0, 0, 0, 0}; 95 unsigned int data[5] = {0, 0, 0, 0, 0};
96 96
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
index 0806a4c732..bef285c7d4 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
@@ -39,17 +39,17 @@ struct _Ecore_X_Startup_Info
39 int silent; 39 int silent;
40}; 40};
41 41
42static void _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win, 42static void _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win,
43 Ecore_X_Atom atom, 43 Ecore_X_Atom atom,
44 const char *str); 44 const char *str);
45static char *_ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, 45static char *_ecore_x_window_prop_string_utf8_get(Ecore_X_Window win,
46 Ecore_X_Atom atom); 46 Ecore_X_Atom atom);
47#if 0 /* Unused */ 47#if 0 /* Unused */
48static int _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info); 48static int _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info);
49static int _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, 49static int _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info,
50 char *data); 50 char *data);
51#endif /* if 0 */ 51#endif /* if 0 */
52static void _ecore_x_netwm_startup_info_free(void *data); 52static void _ecore_x_netwm_startup_info_free(void *data);
53 53
54/* 54/*
55 * Convenience macros 55 * Convenience macros
@@ -94,7 +94,7 @@ ecore_x_netwm_shutdown(void)
94EAPI void 94EAPI void
95ecore_x_netwm_wm_identify(Ecore_X_Window root, 95ecore_x_netwm_wm_identify(Ecore_X_Window root,
96 Ecore_X_Window check, 96 Ecore_X_Window check,
97 const char *wm_name) 97 const char *wm_name)
98{ 98{
99 LOGFN(__FILE__, __LINE__, __FUNCTION__); 99 LOGFN(__FILE__, __LINE__, __FUNCTION__);
100 ecore_x_window_prop_window_set(root, 100 ecore_x_window_prop_window_set(root,
@@ -119,8 +119,8 @@ ecore_x_netwm_wm_identify(Ecore_X_Window root,
119 */ 119 */
120EAPI void 120EAPI void
121ecore_x_netwm_supported_set(Ecore_X_Window root, 121ecore_x_netwm_supported_set(Ecore_X_Window root,
122 Ecore_X_Atom *supported, 122 Ecore_X_Atom *supported,
123 int num) 123 int num)
124{ 124{
125 LOGFN(__FILE__, __LINE__, __FUNCTION__); 125 LOGFN(__FILE__, __LINE__, __FUNCTION__);
126 ecore_x_window_prop_atom_set(root, 126 ecore_x_window_prop_atom_set(root,
@@ -132,7 +132,7 @@ ecore_x_netwm_supported_set(Ecore_X_Window root,
132EAPI Eina_Bool 132EAPI Eina_Bool
133ecore_x_netwm_supported_get(Ecore_X_Window root, 133ecore_x_netwm_supported_get(Ecore_X_Window root,
134 Ecore_X_Atom **supported, 134 Ecore_X_Atom **supported,
135 int *num) 135 int *num)
136{ 136{
137 int num_ret; 137 int num_ret;
138 138
@@ -159,7 +159,7 @@ ecore_x_netwm_supported_get(Ecore_X_Window root,
159 */ 159 */
160EAPI void 160EAPI void
161ecore_x_netwm_desk_count_set(Ecore_X_Window root, 161ecore_x_netwm_desk_count_set(Ecore_X_Window root,
162 unsigned int n_desks) 162 unsigned int n_desks)
163{ 163{
164 LOGFN(__FILE__, __LINE__, __FUNCTION__); 164 LOGFN(__FILE__, __LINE__, __FUNCTION__);
165 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS, 165 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS,
@@ -167,9 +167,9 @@ ecore_x_netwm_desk_count_set(Ecore_X_Window root,
167} 167}
168 168
169EAPI void 169EAPI void
170ecore_x_netwm_desk_roots_set(Ecore_X_Window root, 170ecore_x_netwm_desk_roots_set(Ecore_X_Window root,
171 Ecore_X_Window *vroots, 171 Ecore_X_Window *vroots,
172 unsigned int n_desks) 172 unsigned int n_desks)
173{ 173{
174 LOGFN(__FILE__, __LINE__, __FUNCTION__); 174 LOGFN(__FILE__, __LINE__, __FUNCTION__);
175 ecore_x_window_prop_window_set(root, 175 ecore_x_window_prop_window_set(root,
@@ -180,8 +180,8 @@ ecore_x_netwm_desk_roots_set(Ecore_X_Window root,
180 180
181EAPI void 181EAPI void
182ecore_x_netwm_desk_names_set(Ecore_X_Window root, 182ecore_x_netwm_desk_names_set(Ecore_X_Window root,
183 const char **names, 183 const char **names,
184 unsigned int n_desks) 184 unsigned int n_desks)
185{ 185{
186 char ss[32], *buf, *t; 186 char ss[32], *buf, *t;
187 const char *s; 187 const char *s;
@@ -198,8 +198,8 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root,
198 if (!s) 198 if (!s)
199 { 199 {
200 /* Default to "Desk-<number>" */ 200 /* Default to "Desk-<number>" */
201 sprintf(ss, "Desk-%d", i); 201 sprintf(ss, "Desk-%d", i);
202 s = ss; 202 s = ss;
203 } 203 }
204 204
205 l = strlen(s) + 1; 205 l = strlen(s) + 1;
@@ -219,8 +219,8 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root,
219 219
220EAPI void 220EAPI void
221ecore_x_netwm_desk_size_set(Ecore_X_Window root, 221ecore_x_netwm_desk_size_set(Ecore_X_Window root,
222 unsigned int width, 222 unsigned int width,
223 unsigned int height) 223 unsigned int height)
224{ 224{
225 unsigned int size[2]; 225 unsigned int size[2];
226 226
@@ -233,8 +233,8 @@ ecore_x_netwm_desk_size_set(Ecore_X_Window root,
233 233
234EAPI void 234EAPI void
235ecore_x_netwm_desk_viewports_set(Ecore_X_Window root, 235ecore_x_netwm_desk_viewports_set(Ecore_X_Window root,
236 unsigned int *origins, 236 unsigned int *origins,
237 unsigned int n_desks) 237 unsigned int n_desks)
238{ 238{
239 LOGFN(__FILE__, __LINE__, __FUNCTION__); 239 LOGFN(__FILE__, __LINE__, __FUNCTION__);
240 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_VIEWPORT, 240 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_VIEWPORT,
@@ -243,10 +243,10 @@ ecore_x_netwm_desk_viewports_set(Ecore_X_Window root,
243 243
244EAPI void 244EAPI void
245ecore_x_netwm_desk_layout_set(Ecore_X_Window root, 245ecore_x_netwm_desk_layout_set(Ecore_X_Window root,
246 int orientation, 246 int orientation,
247 int columns, 247 int columns,
248 int rows, 248 int rows,
249 int starting_corner) 249 int starting_corner)
250{ 250{
251 unsigned int layout[4]; 251 unsigned int layout[4];
252 252
@@ -261,8 +261,8 @@ ecore_x_netwm_desk_layout_set(Ecore_X_Window root,
261 261
262EAPI void 262EAPI void
263ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, 263ecore_x_netwm_desk_workareas_set(Ecore_X_Window root,
264 unsigned int *areas, 264 unsigned int *areas,
265 unsigned int n_desks) 265 unsigned int n_desks)
266{ 266{
267 LOGFN(__FILE__, __LINE__, __FUNCTION__); 267 LOGFN(__FILE__, __LINE__, __FUNCTION__);
268 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_WORKAREA, areas, 268 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_WORKAREA, areas,
@@ -274,9 +274,9 @@ ecore_x_netwm_desk_workareas_get(Ecore_X_Window root, unsigned int *n_desks)
274{ 274{
275 int ret; 275 int ret;
276 unsigned int *areas = NULL; 276 unsigned int *areas = NULL;
277 277
278 if (!root) root = DefaultRootWindow(_ecore_x_disp); 278 if (!root) root = DefaultRootWindow(_ecore_x_disp);
279 279
280 ret = ecore_x_window_prop_card32_list_get(root, ECORE_X_ATOM_NET_WORKAREA, 280 ret = ecore_x_window_prop_card32_list_get(root, ECORE_X_ATOM_NET_WORKAREA,
281 &areas); 281 &areas);
282 if (!areas) 282 if (!areas)
@@ -290,7 +290,7 @@ ecore_x_netwm_desk_workareas_get(Ecore_X_Window root, unsigned int *n_desks)
290 290
291EAPI void 291EAPI void
292ecore_x_netwm_desk_current_set(Ecore_X_Window root, 292ecore_x_netwm_desk_current_set(Ecore_X_Window root,
293 unsigned int desk) 293 unsigned int desk)
294{ 294{
295 LOGFN(__FILE__, __LINE__, __FUNCTION__); 295 LOGFN(__FILE__, __LINE__, __FUNCTION__);
296 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_CURRENT_DESKTOP, &desk, 296 ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_CURRENT_DESKTOP, &desk,
@@ -299,7 +299,7 @@ ecore_x_netwm_desk_current_set(Ecore_X_Window root,
299 299
300EAPI void 300EAPI void
301ecore_x_netwm_showing_desktop_set(Ecore_X_Window root, 301ecore_x_netwm_showing_desktop_set(Ecore_X_Window root,
302 Eina_Bool on) 302 Eina_Bool on)
303{ 303{
304 unsigned int val; 304 unsigned int val;
305 305
@@ -315,9 +315,9 @@ ecore_x_netwm_showing_desktop_set(Ecore_X_Window root,
315 315
316/* Mapping order */ 316/* Mapping order */
317EAPI void 317EAPI void
318ecore_x_netwm_client_list_set(Ecore_X_Window root, 318ecore_x_netwm_client_list_set(Ecore_X_Window root,
319 Ecore_X_Window *p_clients, 319 Ecore_X_Window *p_clients,
320 unsigned int n_clients) 320 unsigned int n_clients)
321{ 321{
322 LOGFN(__FILE__, __LINE__, __FUNCTION__); 322 LOGFN(__FILE__, __LINE__, __FUNCTION__);
323 ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST, 323 ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST,
@@ -326,9 +326,9 @@ ecore_x_netwm_client_list_set(Ecore_X_Window root,
326 326
327/* Stacking order */ 327/* Stacking order */
328EAPI void 328EAPI void
329ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, 329ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root,
330 Ecore_X_Window *p_clients, 330 Ecore_X_Window *p_clients,
331 unsigned int n_clients) 331 unsigned int n_clients)
332{ 332{
333 LOGFN(__FILE__, __LINE__, __FUNCTION__); 333 LOGFN(__FILE__, __LINE__, __FUNCTION__);
334 ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST_STACKING, 334 ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST_STACKING,
@@ -347,7 +347,7 @@ ecore_x_netwm_client_active_set(Ecore_X_Window root,
347EAPI void 347EAPI void
348ecore_x_netwm_client_active_request(Ecore_X_Window root, 348ecore_x_netwm_client_active_request(Ecore_X_Window root,
349 Ecore_X_Window win, 349 Ecore_X_Window win,
350 int type, 350 int type,
351 Ecore_X_Window current_win) 351 Ecore_X_Window current_win)
352{ 352{
353 XEvent xev; 353 XEvent xev;
@@ -373,7 +373,7 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root,
373 373
374EAPI void 374EAPI void
375ecore_x_netwm_name_set(Ecore_X_Window win, 375ecore_x_netwm_name_set(Ecore_X_Window win,
376 const char *name) 376 const char *name)
377{ 377{
378 LOGFN(__FILE__, __LINE__, __FUNCTION__); 378 LOGFN(__FILE__, __LINE__, __FUNCTION__);
379 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name); 379 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name);
@@ -381,7 +381,7 @@ ecore_x_netwm_name_set(Ecore_X_Window win,
381 381
382EAPI int 382EAPI int
383ecore_x_netwm_name_get(Ecore_X_Window win, 383ecore_x_netwm_name_get(Ecore_X_Window win,
384 char **name) 384 char **name)
385{ 385{
386 LOGFN(__FILE__, __LINE__, __FUNCTION__); 386 LOGFN(__FILE__, __LINE__, __FUNCTION__);
387 if (name) 387 if (name)
@@ -393,7 +393,7 @@ ecore_x_netwm_name_get(Ecore_X_Window win,
393 393
394EAPI void 394EAPI void
395ecore_x_netwm_startup_id_set(Ecore_X_Window win, 395ecore_x_netwm_startup_id_set(Ecore_X_Window win,
396 const char *id) 396 const char *id)
397{ 397{
398 LOGFN(__FILE__, __LINE__, __FUNCTION__); 398 LOGFN(__FILE__, __LINE__, __FUNCTION__);
399 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_STARTUP_ID, id); 399 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_STARTUP_ID, id);
@@ -401,7 +401,7 @@ ecore_x_netwm_startup_id_set(Ecore_X_Window win,
401 401
402EAPI int 402EAPI int
403ecore_x_netwm_startup_id_get(Ecore_X_Window win, 403ecore_x_netwm_startup_id_get(Ecore_X_Window win,
404 char **id) 404 char **id)
405{ 405{
406 LOGFN(__FILE__, __LINE__, __FUNCTION__); 406 LOGFN(__FILE__, __LINE__, __FUNCTION__);
407 if (id) 407 if (id)
@@ -413,7 +413,7 @@ ecore_x_netwm_startup_id_get(Ecore_X_Window win,
413 413
414EAPI void 414EAPI void
415ecore_x_netwm_visible_name_set(Ecore_X_Window win, 415ecore_x_netwm_visible_name_set(Ecore_X_Window win,
416 const char *name) 416 const char *name)
417{ 417{
418 LOGFN(__FILE__, __LINE__, __FUNCTION__); 418 LOGFN(__FILE__, __LINE__, __FUNCTION__);
419 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME, 419 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME,
@@ -422,7 +422,7 @@ ecore_x_netwm_visible_name_set(Ecore_X_Window win,
422 422
423EAPI int 423EAPI int
424ecore_x_netwm_visible_name_get(Ecore_X_Window win, 424ecore_x_netwm_visible_name_get(Ecore_X_Window win,
425 char **name) 425 char **name)
426{ 426{
427 LOGFN(__FILE__, __LINE__, __FUNCTION__); 427 LOGFN(__FILE__, __LINE__, __FUNCTION__);
428 if (name) 428 if (name)
@@ -435,7 +435,7 @@ ecore_x_netwm_visible_name_get(Ecore_X_Window win,
435 435
436EAPI void 436EAPI void
437ecore_x_netwm_icon_name_set(Ecore_X_Window win, 437ecore_x_netwm_icon_name_set(Ecore_X_Window win,
438 const char *name) 438 const char *name)
439{ 439{
440 LOGFN(__FILE__, __LINE__, __FUNCTION__); 440 LOGFN(__FILE__, __LINE__, __FUNCTION__);
441 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_ICON_NAME, 441 _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_ICON_NAME,
@@ -444,7 +444,7 @@ ecore_x_netwm_icon_name_set(Ecore_X_Window win,
444 444
445EAPI int 445EAPI int
446ecore_x_netwm_icon_name_get(Ecore_X_Window win, 446ecore_x_netwm_icon_name_get(Ecore_X_Window win,
447 char **name) 447 char **name)
448{ 448{
449 LOGFN(__FILE__, __LINE__, __FUNCTION__); 449 LOGFN(__FILE__, __LINE__, __FUNCTION__);
450 if (name) 450 if (name)
@@ -457,7 +457,7 @@ ecore_x_netwm_icon_name_get(Ecore_X_Window win,
457 457
458EAPI void 458EAPI void
459ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win, 459ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win,
460 const char *name) 460 const char *name)
461{ 461{
462 LOGFN(__FILE__, __LINE__, __FUNCTION__); 462 LOGFN(__FILE__, __LINE__, __FUNCTION__);
463 _ecore_x_window_prop_string_utf8_set(win, 463 _ecore_x_window_prop_string_utf8_set(win,
@@ -467,7 +467,7 @@ ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win,
467 467
468EAPI int 468EAPI int
469ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, 469ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win,
470 char **name) 470 char **name)
471{ 471{
472 LOGFN(__FILE__, __LINE__, __FUNCTION__); 472 LOGFN(__FILE__, __LINE__, __FUNCTION__);
473 if (name) 473 if (name)
@@ -480,7 +480,7 @@ ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win,
480 480
481EAPI void 481EAPI void
482ecore_x_netwm_desktop_set(Ecore_X_Window win, 482ecore_x_netwm_desktop_set(Ecore_X_Window win,
483 unsigned int desk) 483 unsigned int desk)
484{ 484{
485 LOGFN(__FILE__, __LINE__, __FUNCTION__); 485 LOGFN(__FILE__, __LINE__, __FUNCTION__);
486 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_DESKTOP, &desk, 1); 486 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_DESKTOP, &desk, 1);
@@ -488,7 +488,7 @@ ecore_x_netwm_desktop_set(Ecore_X_Window win,
488 488
489EAPI Eina_Bool 489EAPI Eina_Bool
490ecore_x_netwm_desktop_get(Ecore_X_Window win, 490ecore_x_netwm_desktop_get(Ecore_X_Window win,
491 unsigned int *desk) 491 unsigned int *desk)
492{ 492{
493 int ret; 493 int ret;
494 unsigned int tmp; 494 unsigned int tmp;
@@ -508,10 +508,10 @@ ecore_x_netwm_desktop_get(Ecore_X_Window win,
508 */ 508 */
509EAPI void 509EAPI void
510ecore_x_netwm_strut_set(Ecore_X_Window win, 510ecore_x_netwm_strut_set(Ecore_X_Window win,
511 int left, 511 int left,
512 int right, 512 int right,
513 int top, 513 int top,
514 int bottom) 514 int bottom)
515{ 515{
516 unsigned int strut[4]; 516 unsigned int strut[4];
517 517
@@ -528,10 +528,10 @@ ecore_x_netwm_strut_set(Ecore_X_Window win,
528 */ 528 */
529EAPI Eina_Bool 529EAPI Eina_Bool
530ecore_x_netwm_strut_get(Ecore_X_Window win, 530ecore_x_netwm_strut_get(Ecore_X_Window win,
531 int *left, 531 int *left,
532 int *right, 532 int *right,
533 int *top, 533 int *top,
534 int *bottom) 534 int *bottom)
535{ 535{
536 int ret = 0; 536 int ret = 0;
537 unsigned int strut[4]; 537 unsigned int strut[4];
@@ -561,18 +561,18 @@ ecore_x_netwm_strut_get(Ecore_X_Window win,
561 561
562EAPI void 562EAPI void
563ecore_x_netwm_strut_partial_set(Ecore_X_Window win, 563ecore_x_netwm_strut_partial_set(Ecore_X_Window win,
564 int left, 564 int left,
565 int right, 565 int right,
566 int top, 566 int top,
567 int bottom, 567 int bottom,
568 int left_start_y, 568 int left_start_y,
569 int left_end_y, 569 int left_end_y,
570 int right_start_y, 570 int right_start_y,
571 int right_end_y, 571 int right_end_y,
572 int top_start_x, 572 int top_start_x,
573 int top_end_x, 573 int top_end_x,
574 int bottom_start_x, 574 int bottom_start_x,
575 int bottom_end_x) 575 int bottom_end_x)
576{ 576{
577 unsigned int strut[12]; 577 unsigned int strut[12];
578 578
@@ -597,18 +597,18 @@ ecore_x_netwm_strut_partial_set(Ecore_X_Window win,
597 597
598EAPI Eina_Bool 598EAPI Eina_Bool
599ecore_x_netwm_strut_partial_get(Ecore_X_Window win, 599ecore_x_netwm_strut_partial_get(Ecore_X_Window win,
600 int *left, 600 int *left,
601 int *right, 601 int *right,
602 int *top, 602 int *top,
603 int *bottom, 603 int *bottom,
604 int *left_start_y, 604 int *left_start_y,
605 int *left_end_y, 605 int *left_end_y,
606 int *right_start_y, 606 int *right_start_y,
607 int *right_end_y, 607 int *right_end_y,
608 int *top_start_x, 608 int *top_start_x,
609 int *top_end_x, 609 int *top_end_x,
610 int *bottom_start_x, 610 int *bottom_start_x,
611 int *bottom_end_x) 611 int *bottom_end_x)
612{ 612{
613 int ret = 0; 613 int ret = 0;
614 unsigned int strut[12]; 614 unsigned int strut[12];
@@ -663,7 +663,7 @@ ecore_x_netwm_strut_partial_get(Ecore_X_Window win,
663EAPI Eina_Bool 663EAPI Eina_Bool
664ecore_x_netwm_icons_get(Ecore_X_Window win, 664ecore_x_netwm_icons_get(Ecore_X_Window win,
665 Ecore_X_Icon **icon, 665 Ecore_X_Icon **icon,
666 int *num) 666 int *num)
667{ 667{
668 unsigned int *data, *p; 668 unsigned int *data, *p;
669 unsigned int *src; 669 unsigned int *src;
@@ -771,10 +771,10 @@ ecore_x_netwm_icons_get(Ecore_X_Window win,
771 771
772EAPI void 772EAPI void
773ecore_x_netwm_icon_geometry_set(Ecore_X_Window win, 773ecore_x_netwm_icon_geometry_set(Ecore_X_Window win,
774 int x, 774 int x,
775 int y, 775 int y,
776 int width, 776 int width,
777 int height) 777 int height)
778{ 778{
779 unsigned int geometry[4]; 779 unsigned int geometry[4];
780 780
@@ -791,10 +791,10 @@ ecore_x_netwm_icon_geometry_set(Ecore_X_Window win,
791 791
792EAPI Eina_Bool 792EAPI Eina_Bool
793ecore_x_netwm_icon_geometry_get(Ecore_X_Window win, 793ecore_x_netwm_icon_geometry_get(Ecore_X_Window win,
794 int *x, 794 int *x,
795 int *y, 795 int *y,
796 int *width, 796 int *width,
797 int *height) 797 int *height)
798{ 798{
799 int ret; 799 int ret;
800 unsigned int geometry[4]; 800 unsigned int geometry[4];
@@ -824,7 +824,7 @@ ecore_x_netwm_icon_geometry_get(Ecore_X_Window win,
824 824
825EAPI void 825EAPI void
826ecore_x_netwm_pid_set(Ecore_X_Window win, 826ecore_x_netwm_pid_set(Ecore_X_Window win,
827 int pid) 827 int pid)
828{ 828{
829 unsigned int tmp; 829 unsigned int tmp;
830 830
@@ -836,7 +836,7 @@ ecore_x_netwm_pid_set(Ecore_X_Window win,
836 836
837EAPI Eina_Bool 837EAPI Eina_Bool
838ecore_x_netwm_pid_get(Ecore_X_Window win, 838ecore_x_netwm_pid_get(Ecore_X_Window win,
839 int *pid) 839 int *pid)
840{ 840{
841 int ret; 841 int ret;
842 unsigned int tmp; 842 unsigned int tmp;
@@ -870,7 +870,7 @@ ecore_x_netwm_handled_icons_get(Ecore_X_Window win)
870 870
871EAPI void 871EAPI void
872ecore_x_netwm_user_time_set(Ecore_X_Window win, 872ecore_x_netwm_user_time_set(Ecore_X_Window win,
873 unsigned int tim) 873 unsigned int tim)
874{ 874{
875 LOGFN(__FILE__, __LINE__, __FUNCTION__); 875 LOGFN(__FILE__, __LINE__, __FUNCTION__);
876 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME, 876 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME,
@@ -879,7 +879,7 @@ ecore_x_netwm_user_time_set(Ecore_X_Window win,
879 879
880EAPI Eina_Bool 880EAPI Eina_Bool
881ecore_x_netwm_user_time_get(Ecore_X_Window win, 881ecore_x_netwm_user_time_get(Ecore_X_Window win,
882 unsigned int *tim) 882 unsigned int *tim)
883{ 883{
884 int ret; 884 int ret;
885 unsigned int tmp; 885 unsigned int tmp;
@@ -927,7 +927,7 @@ _ecore_x_netwm_state_get(Ecore_X_Atom a)
927static Ecore_X_Atom 927static Ecore_X_Atom
928_ecore_x_netwm_state_atom_get(Ecore_X_Window_State s) 928_ecore_x_netwm_state_atom_get(Ecore_X_Window_State s)
929{ 929{
930 switch(s) 930 switch (s)
931 { 931 {
932 case ECORE_X_WINDOW_STATE_MODAL: 932 case ECORE_X_WINDOW_STATE_MODAL:
933 return ECORE_X_ATOM_NET_WM_STATE_MODAL; 933 return ECORE_X_ATOM_NET_WM_STATE_MODAL;
@@ -971,9 +971,9 @@ _ecore_x_netwm_state_atom_get(Ecore_X_Window_State s)
971} 971}
972 972
973EAPI void 973EAPI void
974ecore_x_netwm_window_state_set(Ecore_X_Window win, 974ecore_x_netwm_window_state_set(Ecore_X_Window win,
975 Ecore_X_Window_State *state, 975 Ecore_X_Window_State *state,
976 unsigned int num) 976 unsigned int num)
977{ 977{
978 Ecore_X_Atom *set; 978 Ecore_X_Atom *set;
979 unsigned int i; 979 unsigned int i;
@@ -998,9 +998,9 @@ ecore_x_netwm_window_state_set(Ecore_X_Window win,
998} 998}
999 999
1000EAPI Eina_Bool 1000EAPI Eina_Bool
1001ecore_x_netwm_window_state_get(Ecore_X_Window win, 1001ecore_x_netwm_window_state_get(Ecore_X_Window win,
1002 Ecore_X_Window_State **state, 1002 Ecore_X_Window_State **state,
1003 unsigned int *num) 1003 unsigned int *num)
1004{ 1004{
1005 int num_ret, i; 1005 int num_ret, i;
1006 Ecore_X_Atom *atoms; 1006 Ecore_X_Atom *atoms;
@@ -1124,7 +1124,7 @@ _ecore_x_netwm_window_type_atom_get(Ecore_X_Window_Type type)
1124 * , ECORE_X_WINDOW_TYPE_MENU or ECORE_X_WINDOW_TYPE_DIALOG 1124 * , ECORE_X_WINDOW_TYPE_MENU or ECORE_X_WINDOW_TYPE_DIALOG
1125 */ 1125 */
1126EAPI void 1126EAPI void
1127ecore_x_netwm_window_type_set(Ecore_X_Window win, 1127ecore_x_netwm_window_type_set(Ecore_X_Window win,
1128 Ecore_X_Window_Type type) 1128 Ecore_X_Window_Type type)
1129{ 1129{
1130 Ecore_X_Atom atom; 1130 Ecore_X_Atom atom;
@@ -1137,7 +1137,7 @@ ecore_x_netwm_window_type_set(Ecore_X_Window win,
1137 1137
1138/* FIXME: Maybe return 0 on some conditions? */ 1138/* FIXME: Maybe return 0 on some conditions? */
1139EAPI Eina_Bool 1139EAPI Eina_Bool
1140ecore_x_netwm_window_type_get(Ecore_X_Window win, 1140ecore_x_netwm_window_type_get(Ecore_X_Window win,
1141 Ecore_X_Window_Type *type) 1141 Ecore_X_Window_Type *type)
1142{ 1142{
1143 int num; 1143 int num;
@@ -1161,7 +1161,7 @@ ecore_x_netwm_window_type_get(Ecore_X_Window win,
1161} 1161}
1162 1162
1163EAPI int 1163EAPI int
1164ecore_x_netwm_window_types_get(Ecore_X_Window win, 1164ecore_x_netwm_window_types_get(Ecore_X_Window win,
1165 Ecore_X_Window_Type **types) 1165 Ecore_X_Window_Type **types)
1166{ 1166{
1167 int num, i; 1167 int num, i;
@@ -1276,9 +1276,9 @@ ecore_x_netwm_allowed_action_isset(Ecore_X_Window win,
1276 1276
1277/* FIXME: Set complete list */ 1277/* FIXME: Set complete list */
1278EAPI void 1278EAPI void
1279ecore_x_netwm_allowed_action_set(Ecore_X_Window win, 1279ecore_x_netwm_allowed_action_set(Ecore_X_Window win,
1280 Ecore_X_Action *action, 1280 Ecore_X_Action *action,
1281 unsigned int num) 1281 unsigned int num)
1282{ 1282{
1283 Ecore_X_Atom *set; 1283 Ecore_X_Atom *set;
1284 unsigned int i; 1284 unsigned int i;
@@ -1307,9 +1307,9 @@ ecore_x_netwm_allowed_action_set(Ecore_X_Window win,
1307} 1307}
1308 1308
1309EAPI Eina_Bool 1309EAPI Eina_Bool
1310ecore_x_netwm_allowed_action_get(Ecore_X_Window win, 1310ecore_x_netwm_allowed_action_get(Ecore_X_Window win,
1311 Ecore_X_Action **action, 1311 Ecore_X_Action **action,
1312 unsigned int *num) 1312 unsigned int *num)
1313{ 1313{
1314 int num_ret, i; 1314 int num_ret, i;
1315 Ecore_X_Atom *atoms; 1315 Ecore_X_Atom *atoms;
@@ -1345,7 +1345,7 @@ ecore_x_netwm_allowed_action_get(Ecore_X_Window win,
1345 1345
1346EAPI void 1346EAPI void
1347ecore_x_netwm_opacity_set(Ecore_X_Window win, 1347ecore_x_netwm_opacity_set(Ecore_X_Window win,
1348 unsigned int opacity) 1348 unsigned int opacity)
1349{ 1349{
1350 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1350 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1351 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY, 1351 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY,
@@ -1354,7 +1354,7 @@ ecore_x_netwm_opacity_set(Ecore_X_Window win,
1354 1354
1355EAPI Eina_Bool 1355EAPI Eina_Bool
1356ecore_x_netwm_opacity_get(Ecore_X_Window win, 1356ecore_x_netwm_opacity_get(Ecore_X_Window win,
1357 unsigned int *opacity) 1357 unsigned int *opacity)
1358{ 1358{
1359 int ret; 1359 int ret;
1360 unsigned int tmp; 1360 unsigned int tmp;
@@ -1370,10 +1370,10 @@ ecore_x_netwm_opacity_get(Ecore_X_Window win,
1370 1370
1371EAPI void 1371EAPI void
1372ecore_x_netwm_frame_size_set(Ecore_X_Window win, 1372ecore_x_netwm_frame_size_set(Ecore_X_Window win,
1373 int fl, 1373 int fl,
1374 int fr, 1374 int fr,
1375 int ft, 1375 int ft,
1376 int fb) 1376 int fb)
1377{ 1377{
1378 unsigned int frames[4]; 1378 unsigned int frames[4];
1379 1379
@@ -1390,10 +1390,10 @@ ecore_x_netwm_frame_size_set(Ecore_X_Window win,
1390 1390
1391EAPI Eina_Bool 1391EAPI Eina_Bool
1392ecore_x_netwm_frame_size_get(Ecore_X_Window win, 1392ecore_x_netwm_frame_size_get(Ecore_X_Window win,
1393 int *fl, 1393 int *fl,
1394 int *fr, 1394 int *fr,
1395 int *ft, 1395 int *ft,
1396 int *fb) 1396 int *fb)
1397{ 1397{
1398 int ret = 0; 1398 int ret = 0;
1399 unsigned int frames[4]; 1399 unsigned int frames[4];
@@ -1422,7 +1422,7 @@ ecore_x_netwm_frame_size_get(Ecore_X_Window win,
1422} 1422}
1423 1423
1424EAPI Eina_Bool 1424EAPI Eina_Bool
1425ecore_x_netwm_sync_counter_get(Ecore_X_Window win, 1425ecore_x_netwm_sync_counter_get(Ecore_X_Window win,
1426 Ecore_X_Sync_Counter *counter) 1426 Ecore_X_Sync_Counter *counter)
1427{ 1427{
1428 int ret; 1428 int ret;
@@ -1466,7 +1466,7 @@ ecore_x_netwm_ping_send(Ecore_X_Window win)
1466 1466
1467EAPI void 1467EAPI void
1468ecore_x_netwm_sync_request_send(Ecore_X_Window win, 1468ecore_x_netwm_sync_request_send(Ecore_X_Window win,
1469 unsigned int serial) 1469 unsigned int serial)
1470{ 1470{
1471 XSyncValue value; 1471 XSyncValue value;
1472 XEvent xev; 1472 XEvent xev;
@@ -1492,11 +1492,11 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win,
1492} 1492}
1493 1493
1494EAPI void 1494EAPI void
1495ecore_x_netwm_state_request_send(Ecore_X_Window win, 1495ecore_x_netwm_state_request_send(Ecore_X_Window win,
1496 Ecore_X_Window root, 1496 Ecore_X_Window root,
1497 Ecore_X_Window_State s1, 1497 Ecore_X_Window_State s1,
1498 Ecore_X_Window_State s2, 1498 Ecore_X_Window_State s2,
1499 Eina_Bool set) 1499 Eina_Bool set)
1500{ 1500{
1501 XEvent xev; 1501 XEvent xev;
1502 1502
@@ -1529,7 +1529,7 @@ ecore_x_netwm_state_request_send(Ecore_X_Window win,
1529EAPI void 1529EAPI void
1530ecore_x_netwm_desktop_request_send(Ecore_X_Window win, 1530ecore_x_netwm_desktop_request_send(Ecore_X_Window win,
1531 Ecore_X_Window root, 1531 Ecore_X_Window root,
1532 unsigned int desktop) 1532 unsigned int desktop)
1533{ 1533{
1534 XEvent xev; 1534 XEvent xev;
1535 1535
@@ -1555,7 +1555,7 @@ ecore_x_netwm_desktop_request_send(Ecore_X_Window win,
1555 1555
1556int 1556int
1557_ecore_x_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__, 1557_ecore_x_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__,
1558 char *data __UNUSED__) 1558 char *data __UNUSED__)
1559{ 1559{
1560#if 0 1560#if 0
1561 Ecore_X_Startup_Info *info; 1561 Ecore_X_Startup_Info *info;
@@ -1604,7 +1604,7 @@ _ecore_x_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__,
1604 1604
1605int 1605int
1606_ecore_x_netwm_startup_info(Ecore_X_Window win __UNUSED__, 1606_ecore_x_netwm_startup_info(Ecore_X_Window win __UNUSED__,
1607 char *data __UNUSED__) 1607 char *data __UNUSED__)
1608{ 1608{
1609#if 0 1609#if 0
1610 Ecore_X_Startup_Info *info; 1610 Ecore_X_Startup_Info *info;
@@ -1646,8 +1646,8 @@ _ecore_x_netwm_startup_info(Ecore_X_Window win __UNUSED__,
1646 */ 1646 */
1647static void 1647static void
1648_ecore_x_window_prop_string_utf8_set(Ecore_X_Window win, 1648_ecore_x_window_prop_string_utf8_set(Ecore_X_Window win,
1649 Ecore_X_Atom atom, 1649 Ecore_X_Atom atom,
1650 const char *str) 1650 const char *str)
1651{ 1651{
1652 XChangeProperty(_ecore_x_disp, win, atom, ECORE_X_ATOM_UTF8_STRING, 8, 1652 XChangeProperty(_ecore_x_disp, win, atom, ECORE_X_ATOM_UTF8_STRING, 8,
1653 PropModeReplace, (unsigned char *)str, strlen(str)); 1653 PropModeReplace, (unsigned char *)str, strlen(str));
@@ -1658,7 +1658,7 @@ _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win,
1658 */ 1658 */
1659static char * 1659static char *
1660_ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, 1660_ecore_x_window_prop_string_utf8_get(Ecore_X_Window win,
1661 Ecore_X_Atom atom) 1661 Ecore_X_Atom atom)
1662{ 1662{
1663 char *str; 1663 char *str;
1664 unsigned char *prop_ret; 1664 unsigned char *prop_ret;
@@ -1758,8 +1758,8 @@ _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info)
1758 else 1758 else
1759 { 1759 {
1760 /* Discard buffer */ 1760 /* Discard buffer */
1761 info->length = 0; 1761 info->length = 0;
1762 info->buffer[0] = 0; 1762 info->buffer[0] = 0;
1763 } 1763 }
1764 1764
1765 return 1; 1765 return 1;
@@ -1770,7 +1770,7 @@ _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info)
1770 */ 1770 */
1771static int 1771static int
1772_ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, 1772_ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info,
1773 char *data) 1773 char *data)
1774{ 1774{
1775 while (*data) 1775 while (*data)
1776 { 1776 {
@@ -1780,7 +1780,8 @@ _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info,
1780 char value[1024]; 1780 char value[1024];
1781 1781
1782 /* Skip space */ 1782 /* Skip space */
1783 while (*data == ' ') data++; 1783 while (*data == ' ')
1784 data++;
1784 /* Get key */ 1785 /* Get key */
1785 key = data; 1786 key = data;
1786 data = strchr(key, '='); 1787 data = strchr(key, '=');
@@ -1984,7 +1985,7 @@ ecore_x_screen_is_composited(int screen)
1984} 1985}
1985 1986
1986EAPI void 1987EAPI void
1987ecore_x_screen_is_composited_set(int screen, 1988ecore_x_screen_is_composited_set(int screen,
1988 Ecore_X_Window win) 1989 Ecore_X_Window win)
1989{ 1990{
1990 static Ecore_X_Atom atom = None; 1991 static Ecore_X_Atom atom = None;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c
index 67fd410389..7b13615675 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c
@@ -26,9 +26,9 @@
26 */ 26 */
27EAPI Ecore_X_Pixmap 27EAPI Ecore_X_Pixmap
28ecore_x_pixmap_new(Ecore_X_Window win, 28ecore_x_pixmap_new(Ecore_X_Window win,
29 int w, 29 int w,
30 int h, 30 int h,
31 int dep) 31 int dep)
32{ 32{
33 LOGFN(__FILE__, __LINE__, __FUNCTION__); 33 LOGFN(__FILE__, __LINE__, __FUNCTION__);
34 if (win == 0) 34 if (win == 0)
@@ -71,15 +71,15 @@ ecore_x_pixmap_free(Ecore_X_Pixmap pmap)
71 * @ingroup Ecore_X_Pixmap_Group 71 * @ingroup Ecore_X_Pixmap_Group
72 */ 72 */
73EAPI void 73EAPI void
74ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, 74ecore_x_pixmap_paste(Ecore_X_Pixmap pmap,
75 Ecore_X_Drawable dest, 75 Ecore_X_Drawable dest,
76 Ecore_X_GC gc, 76 Ecore_X_GC gc,
77 int sx, 77 int sx,
78 int sy, 78 int sy,
79 int w, 79 int w,
80 int h, 80 int h,
81 int dx, 81 int dx,
82 int dy) 82 int dy)
83{ 83{
84 LOGFN(__FILE__, __LINE__, __FUNCTION__); 84 LOGFN(__FILE__, __LINE__, __FUNCTION__);
85 XCopyArea(_ecore_x_disp, pmap, dest, gc, sx, sy, w, h, dx, dy); 85 XCopyArea(_ecore_x_disp, pmap, dest, gc, sx, sy, w, h, dx, dy);
@@ -96,10 +96,10 @@ ecore_x_pixmap_paste(Ecore_X_Pixmap pmap,
96 */ 96 */
97EAPI void 97EAPI void
98ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap, 98ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap,
99 int *x, 99 int *x,
100 int *y, 100 int *y,
101 int *w, 101 int *w,
102 int *h) 102 int *h)
103{ 103{
104 LOGFN(__FILE__, __LINE__, __FUNCTION__); 104 LOGFN(__FILE__, __LINE__, __FUNCTION__);
105 if (pmap) 105 if (pmap)
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
index c4002b94a0..d028ac18ea 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
@@ -18,7 +18,8 @@
18 root) ((screen = \ 18 root) ((screen = \
19 XRRRootToScreen(_ecore_x_disp, \ 19 XRRRootToScreen(_ecore_x_disp, \
20 root)) != -1) 20 root)) != -1)
21#define RANDR_CHECK_1_1_RET(ret) if(_randr_version < RANDR_1_1) return ret 21#define RANDR_CHECK_1_1_RET(ret) if (_randr_version < RANDR_1_1) \
22 return ret
22 23
23extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display * 24extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display *
24 dpy, 25 dpy,
@@ -105,7 +106,7 @@ ecore_x_randr_screen_primary_output_orientation_set(
105 */ 106 */
106EAPI Ecore_X_Randr_Screen_Size_MM * 107EAPI Ecore_X_Randr_Screen_Size_MM *
107ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, 108ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root,
108 int *num) 109 int *num)
109{ 110{
110#ifdef ECORE_XRANDR 111#ifdef ECORE_XRANDR
111 Ecore_X_Randr_Screen_Size_MM *ret = NULL; 112 Ecore_X_Randr_Screen_Size_MM *ret = NULL;
@@ -148,11 +149,11 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root,
148 */ 149 */
149EAPI void 150EAPI void
150ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, 151ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root,
151 int *w, 152 int *w,
152 int *h, 153 int *h,
153 int *w_mm, 154 int *w_mm,
154 int *h_mm, 155 int *h_mm,
155 int *size_index) 156 int *size_index)
156{ 157{
157#ifdef ECORE_XRANDR 158#ifdef ECORE_XRANDR
158 XRRScreenSize *sizes; 159 XRRScreenSize *sizes;
@@ -202,7 +203,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root,
202 */ 203 */
203EAPI Eina_Bool 204EAPI Eina_Bool
204ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, 205ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root,
205 int size_index) 206 int size_index)
206{ 207{
207#ifdef ECORE_XRANDR 208#ifdef ECORE_XRANDR
208 XRRScreenConfiguration *sc = NULL; 209 XRRScreenConfiguration *sc = NULL;
@@ -270,8 +271,8 @@ ecore_x_randr_screen_primary_output_current_refresh_rate_get(
270 */ 271 */
271EAPI Ecore_X_Randr_Refresh_Rate * 272EAPI Ecore_X_Randr_Refresh_Rate *
272ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, 273ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root,
273 int size_index, 274 int size_index,
274 int *num) 275 int *num)
275{ 276{
276#ifdef ECORE_XRANDR 277#ifdef ECORE_XRANDR
277 Ecore_X_Randr_Refresh_Rate *ret = NULL, *rates = NULL; 278 Ecore_X_Randr_Refresh_Rate *ret = NULL, *rates = NULL;
@@ -306,7 +307,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root,
306EAPI Eina_Bool 307EAPI Eina_Bool
307ecore_x_randr_screen_primary_output_refresh_rate_set( 308ecore_x_randr_screen_primary_output_refresh_rate_set(
308 Ecore_X_Window root, 309 Ecore_X_Window root,
309 int size_index, 310 int size_index,
310 Ecore_X_Randr_Refresh_Rate 311 Ecore_X_Randr_Refresh_Rate
311 rate) 312 rate)
312{ 313{
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
index 319f09f787..8af3754424 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
@@ -19,7 +19,8 @@
19#define RANDR_VALIDATE_ROOT(screen, root) \ 19#define RANDR_VALIDATE_ROOT(screen, root) \
20 ((screen = XRRRootToScreen(_ecore_x_disp, root)) != -1) 20 ((screen = XRRRootToScreen(_ecore_x_disp, root)) != -1)
21 21
22#define RANDR_CHECK_1_2_RET(ret) if(_randr_version < RANDR_1_2) return ret 22#define RANDR_CHECK_1_2_RET(ret) if (_randr_version < RANDR_1_2) \
23 return ret
23 24
24#define RANDR_PROPERTY_EDID "EDID" 25#define RANDR_PROPERTY_EDID "EDID"
25#define RANDR_PROPERTY_BACKLIGHT "Backlight" 26#define RANDR_PROPERTY_BACKLIGHT "Backlight"
@@ -45,7 +46,7 @@ extern int _randr_version;
45 */ 46 */
46EAPI void