From 825a3d837a33f226c879cd02ad15c3fba57e8b2c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 23 Jan 2012 23:30:42 +1000 Subject: Update the EFL to what I'm actually using, coz I'm using some stuff not yet released. --- libraries/ecore/src/lib/ecore_x/xlib/Makefile.in | 14 +- libraries/ecore/src/lib/ecore_x/xlib/ecore_x.c | 324 ++++++++-------- .../ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c | 18 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_composite.c | 42 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c | 24 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_damage.c | 12 +- libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c | 86 ++--- .../ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c | 32 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c | 26 +- libraries/ecore/src/lib/ecore_x/xlib/ecore_x_e.c | 232 +++++------ .../ecore/src/lib/ecore_x/xlib/ecore_x_error.c | 36 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_events.c | 421 ++++++++++---------- .../ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c | 99 ++--- libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c | 10 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c | 18 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c | 248 ++++++------ .../ecore/src/lib/ecore_x/xlib/ecore_x_image.c | 100 ++--- libraries/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c | 10 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c | 424 +++++++++++---------- .../ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c | 40 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c | 49 +-- .../ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c | 339 ++++++++-------- .../src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c | 46 ++- .../ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c | 9 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_region.c | 40 +- .../src/lib/ecore_x/xlib/ecore_x_screensaver.c | 24 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_selection.c | 333 ++++++++-------- .../ecore/src/lib/ecore_x/xlib/ecore_x_sync.c | 30 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_test.c | 8 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c | 38 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_window.c | 344 ++++++++--------- .../src/lib/ecore_x/xlib/ecore_x_window_prop.c | 190 ++++----- .../src/lib/ecore_x/xlib/ecore_x_window_shape.c | 150 ++++---- libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c | 10 +- .../ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c | 6 +- 35 files changed, 1953 insertions(+), 1879 deletions(-) (limited to 'libraries/ecore/src/lib/ecore_x/xlib') diff --git a/libraries/ecore/src/lib/ecore_x/xlib/Makefile.in b/libraries/ecore/src/lib/ecore_x/xlib/Makefile.in index e1026e5..27a2841 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/Makefile.in +++ b/libraries/ecore/src/lib/ecore_x/xlib/Makefile.in @@ -252,10 +252,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ PIXMAN_LIBS = @PIXMAN_LIBS@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SCIM_CFLAGS = @SCIM_CFLAGS@ +SCIM_LIBS = @SCIM_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ @@ -274,6 +274,10 @@ TSLIB_LIBS = @TSLIB_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VMAJ = @VMAJ@ +WAYLAND_CFLAGS = @WAYLAND_CFLAGS@ +WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ +WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ +WAYLAND_LIBS = @WAYLAND_LIBS@ WIN32_CFLAGS = @WIN32_CFLAGS@ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ WIN32_LIBS = @WIN32_LIBS@ @@ -387,6 +391,8 @@ ecore_imf_cflags = @ecore_imf_cflags@ ecore_imf_evas_cflags = @ecore_imf_evas_cflags@ ecore_imf_evas_libs = @ecore_imf_evas_libs@ ecore_imf_libs = @ecore_imf_libs@ +ecore_imf_scim_cflags = @ecore_imf_scim_cflags@ +ecore_imf_scim_libs = @ecore_imf_scim_libs@ ecore_imf_xim_cflags = @ecore_imf_xim_cflags@ ecore_imf_xim_libs = @ecore_imf_xim_libs@ ecore_input_cflags = @ecore_input_cflags@ @@ -399,6 +405,8 @@ ecore_psl1ght_cflags = @ecore_psl1ght_cflags@ ecore_psl1ght_libs = @ecore_psl1ght_libs@ ecore_sdl_cflags = @ecore_sdl_cflags@ ecore_sdl_libs = @ecore_sdl_libs@ +ecore_wayland_cflags = @ecore_wayland_cflags@ +ecore_wayland_libs = @ecore_wayland_libs@ ecore_win32_cflags = @ecore_win32_cflags@ ecore_win32_libs = @ecore_win32_libs@ ecore_wince_cflags = @ecore_wince_cflags@ @@ -443,12 +451,14 @@ requirements_ecore_fb = @requirements_ecore_fb@ requirements_ecore_file = @requirements_ecore_file@ requirements_ecore_imf = @requirements_ecore_imf@ requirements_ecore_imf_evas = @requirements_ecore_imf_evas@ +requirements_ecore_imf_scim = @requirements_ecore_imf_scim@ requirements_ecore_imf_xim = @requirements_ecore_imf_xim@ requirements_ecore_input = @requirements_ecore_input@ requirements_ecore_input_evas = @requirements_ecore_input_evas@ requirements_ecore_ipc = @requirements_ecore_ipc@ requirements_ecore_psl1ght = @requirements_ecore_psl1ght@ requirements_ecore_sdl = @requirements_ecore_sdl@ +requirements_ecore_wayland = @requirements_ecore_wayland@ requirements_ecore_win32 = @requirements_ecore_win32@ requirements_ecore_wince = @requirements_ecore_wince@ requirements_ecore_x = @requirements_ecore_x@ diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x.c index 844ab04..6d275bc 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x.c @@ -19,9 +19,9 @@ #include "Ecore_X_Atoms.h" #include "Ecore_Input.h" -static Eina_Bool _ecore_x_fd_handler(void *data, +static Eina_Bool _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); -static Eina_Bool _ecore_x_fd_handler_buf(void *data, +static Eina_Bool _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler); static int _ecore_x_key_mask_get(KeySym sym); static int _ecore_x_event_modifier(unsigned int state); @@ -139,9 +139,9 @@ EAPI int ECORE_X_LOCK_SHIFT = 0; #ifdef LOGRT static double t0 = 0.0; static Status (*_logrt_real_reply)(Display *disp, - void *rep, - int extra, - Bool discard) = NULL; + void *rep, + int extra, + Bool discard) = NULL; static void _logrt_init(void) { @@ -159,13 +159,13 @@ _logrt_init(void) _logrt_real_reply = dlsym(lib, "_XReply"); t0 = ecore_time_get(); -} /* _logrt_init */ +} Status _XReply(Display *disp, - void *rep, - int extra, - Bool discard) + void *rep, + int extra, + Bool discard) { void *bt[128]; int i, n; @@ -207,7 +207,7 @@ _XReply(Display *disp, // fixme: logme return _logrt_real_reply(disp, rep, extra, discard); -} /* _XReply */ +} #endif /* ifdef LOGRT */ @@ -215,35 +215,35 @@ void _ecore_x_modifiers_get(void) { /* everything has these... unless its like a pda... :) */ - ECORE_X_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L); - ECORE_X_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L); + ECORE_X_MODIFIER_SHIFT = _ecore_x_key_mask_get(XK_Shift_L); + ECORE_X_MODIFIER_CTRL = _ecore_x_key_mask_get(XK_Control_L); - /* apple's xdarwin has no alt!!!! */ - ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L); - if (!ECORE_X_MODIFIER_ALT) - ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Meta_L); + /* apple's xdarwin has no alt!!!! */ + ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Alt_L); + if (!ECORE_X_MODIFIER_ALT) + ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Meta_L); - if (!ECORE_X_MODIFIER_ALT) - ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Super_L); + if (!ECORE_X_MODIFIER_ALT) + ECORE_X_MODIFIER_ALT = _ecore_x_key_mask_get(XK_Super_L); - /* the windows key... a valid modifier :) */ - ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L); - if (!ECORE_X_MODIFIER_WIN) - ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Mode_switch); + /* the windows key... a valid modifier :) */ + ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Super_L); + if (!ECORE_X_MODIFIER_WIN) + ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Mode_switch); - if (!ECORE_X_MODIFIER_WIN) - ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L); + if (!ECORE_X_MODIFIER_WIN) + ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L); - if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT) - ECORE_X_MODIFIER_WIN = 0; + if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT) + ECORE_X_MODIFIER_WIN = 0; - if (ECORE_X_MODIFIER_ALT == ECORE_X_MODIFIER_CTRL) - ECORE_X_MODIFIER_ALT = 0; + if (ECORE_X_MODIFIER_ALT == ECORE_X_MODIFIER_CTRL) + ECORE_X_MODIFIER_ALT = 0; - ECORE_X_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock); - ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock); - ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock); - ECORE_X_LOCK_SHIFT = _ecore_x_key_mask_get(XK_Shift_Lock); + ECORE_X_LOCK_SCROLL = _ecore_x_key_mask_get(XK_Scroll_Lock); + ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock); + ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock); + ECORE_X_LOCK_SHIFT = _ecore_x_key_mask_get(XK_Shift_Lock); } /** @@ -300,7 +300,7 @@ ecore_x_init(const char *name) eina_init(); _ecore_xlib_log_dom = eina_log_domain_register ("ecore_x", ECORE_XLIB_DEFAULT_LOG_COLOR); - if(_ecore_xlib_log_dom < 0) + if (_ecore_xlib_log_dom < 0) { EINA_LOG_ERR( "Impossible to create a log domain for the Ecore Xlib module."); @@ -375,7 +375,7 @@ ecore_x_init(const char *name) #ifdef ECORE_XGESTURE if (XGestureQueryExtension(_ecore_x_disp, &gesture_base, &gesture_err_base)) - _ecore_x_event_gesture_id = gesture_base; + _ecore_x_event_gesture_id = gesture_base; ECORE_X_EVENT_HANDLERS_GROW(gesture_base, GestureNumberEvents); #endif /* ifdef ECORE_XGESTURE */ @@ -497,20 +497,20 @@ ecore_x_init(const char *name) #ifdef ECORE_XGESTURE if (_ecore_x_event_gesture_id) { - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] = - _ecore_x_event_handle_gesture_notify_flick; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] = - _ecore_x_event_handle_gesture_notify_pan; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] = - _ecore_x_event_handle_gesture_notify_pinchrotation; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] = - _ecore_x_event_handle_gesture_notify_tap; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] = - _ecore_x_event_handle_gesture_notify_tapnhold; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] = - _ecore_x_event_handle_gesture_notify_hold; - _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] = - _ecore_x_event_handle_gesture_notify_group; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] = + _ecore_x_event_handle_gesture_notify_flick; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] = + _ecore_x_event_handle_gesture_notify_pan; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] = + _ecore_x_event_handle_gesture_notify_pinchrotation; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] = + _ecore_x_event_handle_gesture_notify_tap; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] = + _ecore_x_event_handle_gesture_notify_tapnhold; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] = + _ecore_x_event_handle_gesture_notify_hold; + _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] = + _ecore_x_event_handle_gesture_notify_group; } #endif /* ifdef ECORE_XGESTURE */ @@ -641,7 +641,7 @@ shutdown_eina: eina_shutdown(); return --_ecore_x_init_count; -} /* ecore_x_init */ +} static int _ecore_x_shutdown(int close_display) @@ -683,7 +683,7 @@ _ecore_x_shutdown(int close_display) eina_shutdown(); return _ecore_x_init_count; -} /* _ecore_x_shutdown */ +} /** * Shuts down the Ecore X library. @@ -699,7 +699,7 @@ EAPI int ecore_x_shutdown(void) { return _ecore_x_shutdown(1); -} /* ecore_x_shutdown */ +} /** * Shuts down the Ecore X library. @@ -712,7 +712,7 @@ EAPI int ecore_x_disconnect(void) { return _ecore_x_shutdown(0); -} /* ecore_x_disconnect */ +} /** * @defgroup Ecore_X_Display_Attr_Group X Display Attributes @@ -729,7 +729,7 @@ EAPI Ecore_X_Display * ecore_x_display_get(void) { return (Ecore_X_Display *)_ecore_x_disp; -} /* ecore_x_display_get */ +} /** * Retrieves the X display file descriptor. @@ -741,7 +741,7 @@ ecore_x_fd_get(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ConnectionNumber(_ecore_x_disp); -} /* ecore_x_fd_get */ +} /** * Retrieves the Ecore_X_Screen handle used for the current X connection. @@ -753,7 +753,7 @@ ecore_x_default_screen_get(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return (Ecore_X_Screen *)DefaultScreenOfDisplay(_ecore_x_disp); -} /* ecore_x_default_screen_get */ +} /** * Retrieves the size of an Ecore_X_Screen. @@ -767,8 +767,8 @@ ecore_x_default_screen_get(void) */ EAPI void ecore_x_screen_size_get(const Ecore_X_Screen *screen, - int *w, - int *h) + int *w, + int *h) { Screen *s = (Screen *)screen; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -840,7 +840,7 @@ ecore_x_double_click_time_set(double t) t = 0.0; _ecore_x_double_click_time = t; -} /* ecore_x_double_click_time_set */ +} /** * Retrieves the double and triple click flag timeout. @@ -854,7 +854,7 @@ EAPI double ecore_x_double_click_time_get(void) { return _ecore_x_double_click_time; -} /* ecore_x_double_click_time_get */ +} /** * @defgroup Ecore_X_Flush_Group X Synchronization Functions @@ -872,7 +872,7 @@ ecore_x_flush(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XFlush(_ecore_x_disp); -} /* ecore_x_flush */ +} /** * Flushes the command buffer and waits until all requests have been @@ -884,7 +884,7 @@ ecore_x_sync(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSync(_ecore_x_disp, False); -} /* ecore_x_sync */ +} /** * Kill all clients with subwindows under a given window. @@ -920,7 +920,7 @@ ecore_x_killall(Ecore_X_Window root) } XUngrabServer(_ecore_x_disp); XSync(_ecore_x_disp, False); -} /* ecore_x_killall */ +} /** * Kill a specific client @@ -934,7 +934,7 @@ ecore_x_kill(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XKillClient(_ecore_x_disp, win); -} /* ecore_x_kill */ +} /** * Return the last event time @@ -943,7 +943,7 @@ EAPI Ecore_X_Time ecore_x_current_time_get(void) { return _ecore_x_event_last_time; -} /* ecore_x_current_time_get */ +} /** * Return the screen DPI @@ -965,7 +965,7 @@ ecore_x_dpi_get(void) return 75; return (((s->width * 254) / s->mwidth) + 5) / 10; -} /* ecore_x_dpi_get */ +} /** * Invoke the standard system beep to alert users @@ -989,10 +989,10 @@ ecore_x_bell(int percent) return EINA_FALSE; return EINA_TRUE; -} /* ecore_x_bell */ +} static Eina_Bool -_ecore_x_fd_handler(void *data, +_ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__) { Display *d; @@ -1021,10 +1021,10 @@ _ecore_x_fd_handler(void *data, } } return ECORE_CALLBACK_RENEW; -} /* _ecore_x_fd_handler */ +} static Eina_Bool -_ecore_x_fd_handler_buf(void *data, +_ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__) { Display *d; @@ -1034,7 +1034,7 @@ _ecore_x_fd_handler_buf(void *data, return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_CANCEL; -} /* _ecore_x_fd_handler_buf */ +} static int _ecore_x_key_mask_get(KeySym sym) @@ -1080,7 +1080,7 @@ _ecore_x_key_mask_get(KeySym sym) } return 0; -} /* _ecore_x_key_mask_get */ +} /*****************************************************************************/ /*****************************************************************************/ @@ -1132,7 +1132,7 @@ ecore_x_window_root_list(int *num_ret) overlap++; } } - roots = malloc((num - overlap) * sizeof(Window)); + roots = malloc(MAX((num - overlap) * sizeof(Window), 1)); if (roots) { int k; @@ -1195,7 +1195,7 @@ ecore_x_window_root_list(int *num_ret) roots[i] = RootWindow(_ecore_x_disp, i); #endif /* ifdef ECORE_XPRINT */ return roots; -} /* ecore_x_window_root_list */ +} EAPI Ecore_X_Window ecore_x_window_root_first_get(void) @@ -1217,7 +1217,7 @@ ecore_x_window_root_first_get(void) free(roots); return root; */ -} /* ecore_x_window_root_first_get */ +} static void _ecore_x_window_manage_error(void *data); @@ -1228,7 +1228,7 @@ _ecore_x_window_manage_error(void *data __UNUSED__) if ((ecore_x_error_request_get() == X_ChangeWindowAttributes) && (ecore_x_error_code_get() == BadAccess)) _ecore_x_window_manage_failed = 1; -} /* _ecore_x_window_manage_error */ +} EAPI Eina_Bool ecore_x_window_manage(Ecore_X_Window win) @@ -1262,7 +1262,7 @@ ecore_x_window_manage(Ecore_X_Window win) } return EINA_TRUE; -} /* ecore_x_window_manage */ +} EAPI void ecore_x_window_container_manage(Ecore_X_Window win) @@ -1271,7 +1271,7 @@ ecore_x_window_container_manage(Ecore_X_Window win) XSelectInput(_ecore_x_disp, win, SubstructureRedirectMask | SubstructureNotifyMask); -} /* ecore_x_window_container_manage */ +} EAPI void ecore_x_window_client_manage(Ecore_X_Window win) @@ -1287,7 +1287,7 @@ ecore_x_window_client_manage(Ecore_X_Window win) SubstructureNotifyMask ); XShapeSelectInput(_ecore_x_disp, win, ShapeNotifyMask); -} /* ecore_x_window_client_manage */ +} EAPI void ecore_x_window_sniff(Ecore_X_Window win) @@ -1296,7 +1296,7 @@ ecore_x_window_sniff(Ecore_X_Window win) XSelectInput(_ecore_x_disp, win, PropertyChangeMask | SubstructureNotifyMask); -} /* ecore_x_window_sniff */ +} EAPI void ecore_x_window_client_sniff(Ecore_X_Window win) @@ -1310,10 +1310,10 @@ ecore_x_window_client_sniff(Ecore_X_Window win) StructureNotifyMask | SubstructureNotifyMask); XShapeSelectInput(_ecore_x_disp, win, ShapeNotifyMask); -} /* ecore_x_window_client_sniff */ +} EAPI Eina_Bool -ecore_x_window_attributes_get(Ecore_X_Window win, +ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att_ret) { XWindowAttributes att; @@ -1353,25 +1353,25 @@ ecore_x_window_attributes_get(Ecore_X_Window win, att_ret->colormap = att.colormap; att_ret->visual = att.visual; return EINA_TRUE; -} /* ecore_x_window_attributes_get */ +} EAPI void ecore_x_window_save_set_add(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XAddToSaveSet(_ecore_x_disp, win); -} /* ecore_x_window_save_set_add */ +} EAPI void ecore_x_window_save_set_del(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XRemoveFromSaveSet(_ecore_x_disp, win); -} /* ecore_x_window_save_set_del */ +} EAPI Ecore_X_Window * ecore_x_window_children_get(Ecore_X_Window win, - int *num) + int *num) { Ecore_X_Window *windows = NULL; Window root_ret = 0, parent_ret = 0, *children_ret = NULL; @@ -1398,7 +1398,7 @@ ecore_x_window_children_get(Ecore_X_Window win, } return windows; -} /* ecore_x_window_children_get */ +} EAPI Eina_Bool ecore_x_pointer_control_set(int accel_num, @@ -1408,7 +1408,7 @@ ecore_x_pointer_control_set(int accel_num, LOGFN(__FILE__, __LINE__, __FUNCTION__); return XChangePointerControl(_ecore_x_disp, 1, 1, accel_num, accel_denom, threshold) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_pointer_control_set */ +} EAPI Eina_Bool ecore_x_pointer_control_get(int *accel_num, @@ -1418,23 +1418,23 @@ ecore_x_pointer_control_get(int *accel_num, LOGFN(__FILE__, __LINE__, __FUNCTION__); return XGetPointerControl(_ecore_x_disp, accel_num, accel_denom, threshold) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_pointer_control_get */ +} EAPI Eina_Bool ecore_x_pointer_mapping_set(unsigned char *map, - int nmap) + int nmap) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_pointer_mapping_set */ +} EAPI Eina_Bool ecore_x_pointer_mapping_get(unsigned char *map, - int nmap) + int nmap) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XGetPointerMapping(_ecore_x_disp, map, nmap) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_pointer_mapping_get */ +} EAPI Eina_Bool ecore_x_pointer_grab(Ecore_X_Window win) @@ -1448,7 +1448,7 @@ ecore_x_pointer_grab(Ecore_X_Window win) return EINA_TRUE; return EINA_FALSE; -} /* ecore_x_pointer_grab */ +} EAPI Eina_Bool ecore_x_pointer_confine_grab(Ecore_X_Window win) @@ -1462,23 +1462,23 @@ ecore_x_pointer_confine_grab(Ecore_X_Window win) return EINA_TRUE; return EINA_FALSE; -} /* ecore_x_pointer_confine_grab */ +} EAPI void ecore_x_pointer_ungrab(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XUngrabPointer(_ecore_x_disp, CurrentTime); -} /* ecore_x_pointer_ungrab */ +} EAPI Eina_Bool ecore_x_pointer_warp(Ecore_X_Window win, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_pointer_warp */ +} EAPI Eina_Bool ecore_x_keyboard_grab(Ecore_X_Window win) @@ -1490,14 +1490,14 @@ ecore_x_keyboard_grab(Ecore_X_Window win) return EINA_TRUE; return EINA_FALSE; -} /* ecore_x_keyboard_grab */ +} EAPI void ecore_x_keyboard_ungrab(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XUngrabKeyboard(_ecore_x_disp, CurrentTime); -} /* ecore_x_keyboard_ungrab */ +} EAPI void ecore_x_grab(void) @@ -1506,7 +1506,7 @@ ecore_x_grab(void) _ecore_x_grab_count++; if (_ecore_x_grab_count == 1) XGrabServer(_ecore_x_disp); -} /* ecore_x_grab */ +} EAPI void ecore_x_ungrab(void) @@ -1518,32 +1518,32 @@ ecore_x_ungrab(void) if (_ecore_x_grab_count == 0) XUngrabServer(_ecore_x_disp); -} /* ecore_x_ungrab */ +} int _ecore_window_grabs_num = 0; Window *_ecore_window_grabs = NULL; Eina_Bool (*_ecore_window_grab_replay_func)(void *data, - int event_type, + int event_type, void *event); void *_ecore_window_grab_replay_data; EAPI void -ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data, - int event_type, - void *event), - void *data) +ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data, + int event_type, + void *event), + void *data) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_window_grab_replay_func = func; _ecore_window_grab_replay_data = data; -} /* ecore_x_passive_grab_replay_func_set */ +} EAPI void -ecore_x_window_button_grab(Ecore_X_Window win, - int button, +ecore_x_window_button_grab(Ecore_X_Window win, + int button, Ecore_X_Event_Mask event_mask, - int mod, - int any_mod) + int mod, + int any_mod) { unsigned int b; unsigned int m; @@ -1578,10 +1578,10 @@ ecore_x_window_button_grab(Ecore_X_Window win, if (!t) return; _ecore_window_grabs = t; _ecore_window_grabs[_ecore_window_grabs_num - 1] = win; -} /* ecore_x_window_button_grab */ +} void -_ecore_x_sync_magic_send(int val, +_ecore_x_sync_magic_send(int val, Ecore_X_Window swin) { XEvent xev; @@ -1597,7 +1597,7 @@ _ecore_x_sync_magic_send(int val, xev.xclient.data.l[1] = 0x10000000 + val; xev.xclient.data.l[2] = swin; XSendEvent(_ecore_x_disp, _ecore_x_private_win, False, NoEventMask, &xev); -} /* _ecore_x_sync_magic_send */ +} void _ecore_x_window_grab_remove(Ecore_X_Window win) @@ -1631,13 +1631,13 @@ _ecore_x_window_grab_remove(Ecore_X_Window win) _ecore_window_grabs = t; } } -} /* _ecore_x_window_grab_remove */ +} EAPI void ecore_x_window_button_ungrab(Ecore_X_Window win, - int button, - int mod, - int any_mod) + int button, + int mod, + int any_mod) { unsigned int b; unsigned int m; @@ -1664,16 +1664,16 @@ ecore_x_window_button_ungrab(Ecore_X_Window win, for (i = 0; i < 8; i++) XUngrabButton(_ecore_x_disp, b, m | locks[i], win); _ecore_x_sync_magic_send(1, win); -} /* ecore_x_window_button_ungrab */ +} int _ecore_key_grabs_num = 0; Window *_ecore_key_grabs = NULL; EAPI void ecore_x_window_key_grab(Ecore_X_Window win, - const char *key, - int mod, - int any_mod) + const char *key, + int mod, + int any_mod) { KeyCode keycode = 0; KeySym keysym; @@ -1718,7 +1718,7 @@ ecore_x_window_key_grab(Ecore_X_Window win, if (!t) return; _ecore_key_grabs = t; _ecore_key_grabs[_ecore_key_grabs_num - 1] = win; -} /* ecore_x_window_key_grab */ +} void _ecore_x_key_grab_remove(Ecore_X_Window win) @@ -1751,13 +1751,13 @@ _ecore_x_key_grab_remove(Ecore_X_Window win) _ecore_key_grabs = t; } } -} /* _ecore_x_key_grab_remove */ +} EAPI void ecore_x_window_key_ungrab(Ecore_X_Window win, - const char *key, - int mod, - int any_mod) + const char *key, + int mod, + int any_mod) { KeyCode keycode = 0; KeySym keysym; @@ -1795,7 +1795,7 @@ ecore_x_window_key_ungrab(Ecore_X_Window win, for (i = 0; i < 8; i++) XUngrabKey(_ecore_x_disp, keycode, m | locks[i], win); _ecore_x_sync_magic_send(2, win); -} /* ecore_x_window_key_ungrab */ +} /** * Send client message with given type and format 32. @@ -1811,14 +1811,14 @@ ecore_x_window_key_ungrab(Ecore_X_Window win, * @return EINA_TRUE on success EINA_FALSE otherwise. */ EAPI Eina_Bool -ecore_x_client_message32_send(Ecore_X_Window win, - Ecore_X_Atom type, +ecore_x_client_message32_send(Ecore_X_Window win, + Ecore_X_Atom type, Ecore_X_Event_Mask mask, - long d0, - long d1, - long d2, - long d3, - long d4) + long d0, + long d1, + long d2, + long d3, + long d4) { XEvent xev; @@ -1834,7 +1834,7 @@ ecore_x_client_message32_send(Ecore_X_Window win, xev.xclient.data.l[4] = d4; return XSendEvent(_ecore_x_disp, win, False, mask, &xev) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_client_message32_send */ +} /** * Send client message with given type and format 8. @@ -1848,9 +1848,9 @@ ecore_x_client_message32_send(Ecore_X_Window win, */ EAPI Eina_Bool ecore_x_client_message8_send(Ecore_X_Window win, - Ecore_X_Atom type, - const void *data, - int len) + Ecore_X_Atom type, + const void *data, + int len) { XEvent xev; @@ -1866,12 +1866,12 @@ ecore_x_client_message8_send(Ecore_X_Window win, memset(xev.xclient.data.b + len, 0, 20 - len); return XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_client_message8_send */ +} EAPI Eina_Bool ecore_x_mouse_move_send(Ecore_X_Window win, - int x, - int y) + int x, + int y) { XEvent xev; XWindowAttributes att; @@ -1894,13 +1894,13 @@ ecore_x_mouse_move_send(Ecore_X_Window win, xev.xmotion.is_hint = 0; xev.xmotion.same_screen = 1; return XSendEvent(_ecore_x_disp, win, True, PointerMotionMask, &xev) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_mouse_move_send */ +} EAPI Eina_Bool ecore_x_mouse_down_send(Ecore_X_Window win, - int x, - int y, - int b) + int x, + int y, + int b) { XEvent xev; XWindowAttributes att; @@ -1923,13 +1923,13 @@ ecore_x_mouse_down_send(Ecore_X_Window win, xev.xbutton.button = b; xev.xbutton.same_screen = 1; return XSendEvent(_ecore_x_disp, win, True, ButtonPressMask, &xev) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_mouse_down_send */ +} EAPI Eina_Bool ecore_x_mouse_up_send(Ecore_X_Window win, - int x, - int y, - int b) + int x, + int y, + int b) { XEvent xev; XWindowAttributes att; @@ -1952,21 +1952,21 @@ ecore_x_mouse_up_send(Ecore_X_Window win, xev.xbutton.button = b; xev.xbutton.same_screen = 1; return XSendEvent(_ecore_x_disp, win, True, ButtonReleaseMask, &xev) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_mouse_up_send */ +} EAPI void ecore_x_focus_reset(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetInputFocus(_ecore_x_disp, PointerRoot, RevertToPointerRoot, CurrentTime); -} /* ecore_x_focus_reset */ +} EAPI void ecore_x_events_allow_all(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XAllowEvents(_ecore_x_disp, AsyncBoth, CurrentTime); -} /* ecore_x_events_allow_all */ +} EAPI void ecore_x_pointer_last_xy_get(int *x, @@ -1977,12 +1977,12 @@ ecore_x_pointer_last_xy_get(int *x, if (y) *y = _ecore_x_event_last_root_y; -} /* ecore_x_pointer_last_xy_get */ +} EAPI void ecore_x_pointer_xy_get(Ecore_X_Window win, - int *x, - int *y) + int *x, + int *y) { Window rwin, cwin; int rx, ry, wx, wy, ret; @@ -1996,7 +1996,7 @@ ecore_x_pointer_xy_get(Ecore_X_Window win, if (x) *x = wx; if (y) *y = wy; -} /* ecore_x_pointer_xy_get */ +} /** * Retrieve the Visual ID from a given Visual. @@ -2023,7 +2023,7 @@ ecore_x_visual_id_get(Ecore_X_Visual visual) */ EAPI Ecore_X_Visual ecore_x_default_visual_get(Ecore_X_Display *disp, - Ecore_X_Screen *screen) + Ecore_X_Screen *screen) { return DefaultVisual(disp, ecore_x_screen_index_get(screen)); } @@ -2039,7 +2039,7 @@ ecore_x_default_visual_get(Ecore_X_Display *disp, */ EAPI Ecore_X_Colormap ecore_x_default_colormap_get(Ecore_X_Display *disp, - Ecore_X_Screen *screen) + Ecore_X_Screen *screen) { return DefaultColormap(disp, ecore_x_screen_index_get(screen)); } @@ -2055,7 +2055,7 @@ ecore_x_default_colormap_get(Ecore_X_Display *disp, */ EAPI int ecore_x_default_depth_get(Ecore_X_Display *disp, - Ecore_X_Screen *screen) + Ecore_X_Screen *screen) { return DefaultDepth(disp, ecore_x_screen_index_get(screen)); } @@ -2094,5 +2094,5 @@ _ecore_x_event_modifier(unsigned int state) xmodifiers |= ECORE_X_LOCK_SHIFT; return xmodifiers; -} /* _ecore_x_event_modifier */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c index fd96d5c..ee981fe 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -291,10 +291,12 @@ _ecore_x_atoms_init(void) num = sizeof(items) / sizeof(Atom_Item); atoms = alloca(num * sizeof(Atom)); names = alloca(num * sizeof(char *)); - for (i = 0; i < num; i++) names[i] = (char *)items[i].name; + for (i = 0; i < num; i++) + names[i] = (char *)items[i].name; XInternAtoms(_ecore_x_disp, names, num, False, atoms); - for (i = 0; i < num; i++) *(items[i].atom) = atoms[i]; -} /* _ecore_x_atoms_init */ + for (i = 0; i < num; i++) + *(items[i].atom) = atoms[i]; +} /** * Retrieves the atom value associated with the given name. @@ -309,11 +311,11 @@ ecore_x_atom_get(const char *name) LOGFN(__FILE__, __LINE__, __FUNCTION__); return XInternAtom(_ecore_x_disp, name, False); -} /* ecore_x_atom_get */ +} EAPI void -ecore_x_atoms_get(const char **names, - int num, +ecore_x_atoms_get(const char **names, + int num, Ecore_X_Atom *atoms) { Atom *atoms_int; @@ -327,7 +329,7 @@ ecore_x_atoms_get(const char **names, XInternAtoms(_ecore_x_disp, (char **)names, num, False, atoms_int); for (i = 0; i < num; i++) atoms[i] = atoms_int[i]; -} /* ecore_x_atoms_get */ +} EAPI char * ecore_x_atom_name_get(Ecore_X_Atom atom) @@ -348,5 +350,5 @@ ecore_x_atom_name_get(Ecore_X_Atom atom) XFree(xname); return name; -} /* ecore_x_atom_name_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c index 43153ff..b919db9 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c @@ -30,24 +30,24 @@ _ecore_x_composite_init(void) # endif } #endif -} /* _ecore_x_composite_init */ +} EAPI Eina_Bool ecore_x_composite_query(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _composite_available; -} /* ecore_x_composite_query */ +} EAPI void -ecore_x_composite_redirect_window(Ecore_X_Window win, +ecore_x_composite_redirect_window(Ecore_X_Window win, Ecore_X_Composite_Update_Type type) { #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; LOGFN(__FILE__, __LINE__, __FUNCTION__); - switch(type) + switch (type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: update = CompositeRedirectAutomatic; @@ -56,20 +56,20 @@ ecore_x_composite_redirect_window(Ecore_X_Window win, case ECORE_X_COMPOSITE_UPDATE_MANUAL: update = CompositeRedirectManual; break; - } /* switch */ + } XCompositeRedirectWindow(_ecore_x_disp, win, update); #endif /* ifdef ECORE_XCOMPOSITE */ -} /* ecore_x_composite_redirect_window */ +} EAPI void -ecore_x_composite_redirect_subwindows(Ecore_X_Window win, +ecore_x_composite_redirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Update_Type type) { #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; LOGFN(__FILE__, __LINE__, __FUNCTION__); - switch(type) + switch (type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: update = CompositeRedirectAutomatic; @@ -78,20 +78,20 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win, case ECORE_X_COMPOSITE_UPDATE_MANUAL: update = CompositeRedirectManual; break; - } /* switch */ + } XCompositeRedirectSubwindows(_ecore_x_disp, win, update); #endif /* ifdef ECORE_XCOMPOSITE */ -} /* ecore_x_composite_redirect_subwindows */ +} EAPI void -ecore_x_composite_unredirect_window(Ecore_X_Window win, +ecore_x_composite_unredirect_window(Ecore_X_Window win, Ecore_X_Composite_Update_Type type) { #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; LOGFN(__FILE__, __LINE__, __FUNCTION__); - switch(type) + switch (type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: update = CompositeRedirectAutomatic; @@ -100,20 +100,20 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win, case ECORE_X_COMPOSITE_UPDATE_MANUAL: update = CompositeRedirectManual; break; - } /* switch */ + } XCompositeUnredirectWindow(_ecore_x_disp, win, update); #endif /* ifdef ECORE_XCOMPOSITE */ -} /* ecore_x_composite_unredirect_window */ +} EAPI void -ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, +ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Update_Type type) { #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; LOGFN(__FILE__, __LINE__, __FUNCTION__); - switch(type) + switch (type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: update = CompositeRedirectAutomatic; @@ -122,10 +122,10 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, case ECORE_X_COMPOSITE_UPDATE_MANUAL: update = CompositeRedirectManual; break; - } /* switch */ + } XCompositeUnredirectSubwindows(_ecore_x_disp, win, update); #endif /* ifdef ECORE_XCOMPOSITE */ -} /* ecore_x_composite_unredirect_subwindows */ +} EAPI Ecore_X_Pixmap ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win) @@ -136,7 +136,7 @@ ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win) pixmap = XCompositeNameWindowPixmap(_ecore_x_disp, win); #endif /* ifdef ECORE_XCOMPOSITE */ return pixmap; -} /* ecore_x_composite_name_window_pixmap_get */ +} EAPI void ecore_x_composite_window_events_disable(Ecore_X_Window win) @@ -163,7 +163,7 @@ ecore_x_composite_render_window_enable(Ecore_X_Window root) ecore_x_composite_window_events_disable(win); #endif /* ifdef ECORE_XCOMPOSITE */ return win; -} /* ecore_x_composite_render_window_enable */ +} EAPI void ecore_x_composite_render_window_disable(Ecore_X_Window root) @@ -172,5 +172,5 @@ ecore_x_composite_render_window_disable(Ecore_X_Window root) LOGFN(__FILE__, __LINE__, __FUNCTION__); XCompositeReleaseOverlayWindow(_ecore_x_disp, root); #endif /* ifdef ECORE_XCOMPOSITE */ -} /* ecore_x_composite_render_window_disable */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c index 434505c..a968c56 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c @@ -10,15 +10,15 @@ EAPI Eina_Bool ecore_x_cursor_color_supported_get(void) { return _ecore_x_xcursor; -} /* ecore_x_cursor_color_supported_get */ +} EAPI Ecore_X_Cursor ecore_x_cursor_new(Ecore_X_Window win, - int *pixels, - int w, - int h, - int hot_x, - int hot_y) + int *pixels, + int w, + int h, + int hot_x, + int hot_y) { #ifdef ECORE_XCURSOR LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -43,7 +43,7 @@ ecore_x_cursor_new(Ecore_X_Window win, // r = (((pixels[i] >> 16) & 0xff) * a) / 0xff; // g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff; // b = (((pixels[i] ) & 0xff) * a) / 0xff; - xci->pixels[i] = pixels[i]; + xci->pixels[i] = pixels[i]; // (a << 24) | (r << 16) | (g << 8) | (b); } c = XcursorImageLoadCursor(_ecore_x_disp, xci); @@ -200,14 +200,14 @@ ecore_x_cursor_new(Ecore_X_Window win, } return 0; -} /* ecore_x_cursor_new */ +} EAPI void ecore_x_cursor_free(Ecore_X_Cursor c) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreeCursor(_ecore_x_disp, c); -} /* ecore_x_cursor_free */ +} /* * Returns the cursor for the given shape. @@ -220,7 +220,7 @@ ecore_x_cursor_shape_get(int shape) LOGFN(__FILE__, __LINE__, __FUNCTION__); /* Shapes are defined in Ecore_X_Cursor.h */ return XCreateFontCursor(_ecore_x_disp, shape); -} /* ecore_x_cursor_shape_get */ +} EAPI void ecore_x_cursor_size_set(int size) @@ -231,7 +231,7 @@ ecore_x_cursor_size_set(int size) #else /* ifdef ECORE_XCURSOR */ size = 0; #endif /* ifdef ECORE_XCURSOR */ -} /* ecore_x_cursor_size_set */ +} EAPI int ecore_x_cursor_size_get(void) @@ -242,5 +242,5 @@ ecore_x_cursor_size_get(void) #else /* ifdef ECORE_XCURSOR */ return 0; #endif /* ifdef ECORE_XCURSOR */ -} /* ecore_x_cursor_size_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c index 5e44d07..b094f85 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c @@ -26,16 +26,16 @@ _ecore_x_damage_init(void) #else /* ifdef ECORE_XDAMAGE */ _damage_available = EINA_FALSE; #endif /* ifdef ECORE_XDAMAGE */ -} /* _ecore_x_damage_init */ +} EAPI Eina_Bool ecore_x_damage_query(void) { return _damage_available; -} /* ecore_x_damage_query */ +} EAPI Ecore_X_Damage -ecore_x_damage_new(Ecore_X_Drawable d, +ecore_x_damage_new(Ecore_X_Drawable d, Ecore_X_Damage_Report_Level level) { #ifdef ECORE_XDAMAGE @@ -47,7 +47,7 @@ ecore_x_damage_new(Ecore_X_Drawable d, #else /* ifdef ECORE_XDAMAGE */ return 0; #endif /* ifdef ECORE_XDAMAGE */ -} /* ecore_x_damage_new */ +} EAPI void ecore_x_damage_free(Ecore_X_Damage damage) @@ -56,7 +56,7 @@ ecore_x_damage_free(Ecore_X_Damage damage) LOGFN(__FILE__, __LINE__, __FUNCTION__); XDamageDestroy(_ecore_x_disp, damage); #endif /* ifdef ECORE_XDAMAGE */ -} /* ecore_x_damage_free */ +} EAPI void ecore_x_damage_subtract(Ecore_X_Damage damage, @@ -67,5 +67,5 @@ ecore_x_damage_subtract(Ecore_X_Damage damage, LOGFN(__FILE__, __LINE__, __FUNCTION__); XDamageSubtract(_ecore_x_disp, damage, repair, parts); #endif /* ifdef ECORE_XDAMAGE */ -} /* ecore_x_damage_subtract */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c index 7908584..372470a 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c @@ -65,7 +65,7 @@ _ecore_x_dnd_init(void) } _ecore_x_dnd_init_count++; -} /* _ecore_x_dnd_init */ +} void _ecore_x_dnd_shutdown(void) @@ -85,16 +85,16 @@ _ecore_x_dnd_shutdown(void) _target = NULL; _ecore_x_dnd_init_count = 0; -} /* _ecore_x_dnd_shutdown */ +} static Eina_Bool -_ecore_x_dnd_converter_copy(char *target __UNUSED__, - void *data, - int size, - void **data_ret, - int *size_ret, +_ecore_x_dnd_converter_copy(char *target __UNUSED__, + void *data, + int size, + void **data_ret, + int *size_ret, Ecore_X_Atom *tprop __UNUSED__, - int *count __UNUSED__) + int *count __UNUSED__) { XTextProperty text_prop; char *mystr; @@ -130,11 +130,11 @@ _ecore_x_dnd_converter_copy(char *target __UNUSED__, free(mystr); return EINA_FALSE; } -} /* _ecore_x_dnd_converter_copy */ +} EAPI void ecore_x_dnd_aware_set(Ecore_X_Window win, - Eina_Bool on) + Eina_Bool on) { Ecore_X_Atom prop_data = ECORE_X_DND_VERSION; @@ -144,7 +144,7 @@ ecore_x_dnd_aware_set(Ecore_X_Window win, XA_ATOM, 32, &prop_data, 1); else ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_AWARE); -} /* ecore_x_dnd_aware_set */ +} EAPI int ecore_x_dnd_version_get(Ecore_X_Window win) @@ -208,11 +208,11 @@ ecore_x_dnd_version_get(Ecore_X_Window win) } return 0; -} /* ecore_x_dnd_version_get */ +} EAPI Eina_Bool ecore_x_dnd_type_isset(Ecore_X_Window win, - const char *type) + const char *type) { int num, i, ret = EINA_FALSE; unsigned char *data; @@ -237,12 +237,12 @@ ecore_x_dnd_type_isset(Ecore_X_Window win, XFree(data); return ret; -} /* ecore_x_dnd_type_isset */ +} EAPI void ecore_x_dnd_type_set(Ecore_X_Window win, - const char *type, - Eina_Bool on) + const char *type, + Eina_Bool on) { Ecore_X_Atom atom; Ecore_X_Atom *oldset = NULL, *newset = NULL; @@ -305,12 +305,12 @@ ecore_x_dnd_type_set(Ecore_X_Window win, XFree(oldset); free(newset); -} /* ecore_x_dnd_type_set */ +} EAPI void ecore_x_dnd_types_set(Ecore_X_Window win, - const char **types, - unsigned int num_types) + const char **types, + unsigned int num_types) { Ecore_X_Atom *newset = NULL; unsigned int i; @@ -336,12 +336,12 @@ ecore_x_dnd_types_set(Ecore_X_Window win, XA_ATOM, 32, data, num_types); free(newset); } -} /* ecore_x_dnd_types_set */ +} EAPI void ecore_x_dnd_actions_set(Ecore_X_Window win, - Ecore_X_Atom *actions, - unsigned int num_actions) + Ecore_X_Atom *actions, + unsigned int num_actions) { unsigned int i; unsigned char *data = NULL; @@ -360,7 +360,7 @@ ecore_x_dnd_actions_set(Ecore_X_Window win, ecore_x_window_prop_property_set(win, ECORE_X_ATOM_XDND_ACTION_LIST, XA_ATOM, 32, data, num_actions); } -} /* ecore_x_dnd_actions_set */ +} /** * The DND position update cb is called Ecore_X sends a DND position to a @@ -378,9 +378,9 @@ ecore_x_dnd_actions_set(Ecore_X_Window win, */ EAPI void ecore_x_dnd_callback_pos_update_set( - void (*cb)(void *, - Ecore_X_Xdnd_Position *data), - const void *data) + void (*cb)(void *, + Ecore_X_Xdnd_Position *data), + const void *data) { _posupdatecb = cb; _posupdatedata = (void *)data; /* Discard the const early */ @@ -390,18 +390,18 @@ Ecore_X_DND_Source * _ecore_x_dnd_source_get(void) { return _source; -} /* _ecore_x_dnd_source_get */ +} Ecore_X_DND_Target * _ecore_x_dnd_target_get(void) { return _target; -} /* _ecore_x_dnd_target_get */ +} EAPI Eina_Bool ecore_x_dnd_begin(Ecore_X_Window source, unsigned char *data, - int size) + int size) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_dnd_version_get(source)) @@ -433,7 +433,7 @@ ecore_x_dnd_begin(Ecore_X_Window source, _source->dest = None; return EINA_TRUE; -} /* ecore_x_dnd_begin */ +} EAPI Eina_Bool ecore_x_dnd_drop(void) @@ -471,8 +471,8 @@ ecore_x_dnd_drop(void) else { /* Dropping on nothing */ - ecore_x_selection_xdnd_clear(); - _source->state = ECORE_X_DND_SOURCE_IDLE; + ecore_x_selection_xdnd_clear(); + _source->state = ECORE_X_DND_SOURCE_IDLE; } ecore_x_window_ignore_set(_source->win, 0); @@ -480,13 +480,13 @@ ecore_x_dnd_drop(void) _source->prev.window = 0; return status; -} /* ecore_x_dnd_drop */ +} EAPI void -ecore_x_dnd_send_status(Eina_Bool will_accept, - Eina_Bool suppress, +ecore_x_dnd_send_status(Eina_Bool will_accept, + Eina_Bool suppress, Ecore_X_Rectangle rectangle, - Ecore_X_Atom action) + Ecore_X_Atom action) { XEvent xev; @@ -532,7 +532,7 @@ ecore_x_dnd_send_status(Eina_Bool will_accept, } XSendEvent(_ecore_x_disp, _target->source, False, 0, &xev); -} /* ecore_x_dnd_send_status */ +} EAPI void ecore_x_dnd_send_finished(void) @@ -561,7 +561,7 @@ ecore_x_dnd_send_finished(void) XSendEvent(_ecore_x_disp, _target->source, False, 0, &xev); _target->state = ECORE_X_DND_TARGET_IDLE; -} /* ecore_x_dnd_send_finished */ +} EAPI void ecore_x_dnd_source_action_set(Ecore_X_Atom action) @@ -569,18 +569,18 @@ ecore_x_dnd_source_action_set(Ecore_X_Atom action) _source->action = action; if (_source->prev.window) _ecore_x_dnd_drag(_source->prev.window, _source->prev.x, _source->prev.y); -} /* ecore_x_dnd_source_action_set */ +} EAPI Ecore_X_Atom ecore_x_dnd_source_action_get(void) { return _source->action; -} /* ecore_x_dnd_source_action_get */ +} void _ecore_x_dnd_drag(Ecore_X_Window root, - int x, - int y) + int x, + int y) { XEvent xev; Ecore_X_Window win; @@ -701,6 +701,6 @@ _ecore_x_dnd_drag(Ecore_X_Window root, _source->prev.y = y; _source->prev.window = root; _source->dest = win; -} /* _ecore_x_dnd_drag */ +} /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c index 74d5344..23349f4 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c @@ -23,7 +23,7 @@ _ecore_x_dpms_init(void) #else /* ifdef ECORE_XDPMS */ _dpms_available = EINA_FALSE; #endif /* ifdef ECORE_XDPMS */ -} /* _ecore_x_dpms_init */ +} /** * @defgroup Ecore_X_DPMS_Group X DPMS Extension Functions @@ -40,7 +40,7 @@ EAPI Eina_Bool ecore_x_dpms_query(void) { return _dpms_available; -} /* ecore_x_dpms_query */ +} /** * Checks if the X server is capable of DPMS. @@ -56,7 +56,7 @@ ecore_x_dpms_capable_get(void) #else /* ifdef ECORE_XDPMS */ return EINA_FALSE; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_capable_get */ +} /** * Checks the DPMS state of the display. @@ -76,7 +76,7 @@ ecore_x_dpms_enabled_get(void) #else /* ifdef ECORE_XDPMS */ return EINA_FALSE; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_enabled_get */ +} /** * Sets the DPMS state of the display. @@ -94,7 +94,7 @@ ecore_x_dpms_enabled_set(int enabled) DPMSDisable(_ecore_x_disp); #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_enabled_set */ +} /** * Gets the timeouts. The values are in unit of seconds. @@ -113,7 +113,7 @@ ecore_x_dpms_timeouts_get(unsigned int *standby, DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, (unsigned short *)suspend, (unsigned short *)off); #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeouts_get */ +} /** * Sets the timeouts. The values are in unit of seconds. @@ -133,7 +133,7 @@ ecore_x_dpms_timeouts_set(unsigned int standby, #else /* ifdef ECORE_XDPMS */ return EINA_FALSE; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeouts_set */ +} /** * Returns the amount of time of inactivity before standby mode is invoked. @@ -152,7 +152,7 @@ ecore_x_dpms_timeout_standby_get(void) #else /* ifdef ECORE_XDPMS */ return 0; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_standby_get */ +} /** * Returns the amount of time of inactivity before the second level of @@ -172,7 +172,7 @@ ecore_x_dpms_timeout_suspend_get(void) #else /* ifdef ECORE_XDPMS */ return 0; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_suspend_get */ +} /** * Returns the amount of time of inactivity before the third and final @@ -192,11 +192,11 @@ ecore_x_dpms_timeout_off_get(void) #else /* ifdef ECORE_XDPMS */ return 0; #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_off_get */ +} /** * Sets the standby timeout (in unit of seconds). - * @param new_standby Amount of time of inactivity before standby mode will be invoked. + * @param new_timeout Amount of time of inactivity before standby mode will be invoked. * @ingroup Ecore_X_DPMS_Group */ EAPI void @@ -209,11 +209,11 @@ ecore_x_dpms_timeout_standby_set(unsigned int new_timeout) DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off); #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_standby_set */ +} /** * Sets the suspend timeout (in unit of seconds). - * @param suspend Amount of time of inactivity before the screen is placed into suspend mode. + * @param new_timeout Amount of time of inactivity before the screen is placed into suspend mode. * @ingroup Ecore_X_DPMS_Group */ EAPI void @@ -226,11 +226,11 @@ ecore_x_dpms_timeout_suspend_set(unsigned int new_timeout) DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off); #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_suspend_set */ +} /** * Sets the off timeout (in unit of seconds). - * @param off Amount of time of inactivity before the monitor is shut off. + * @param new_timeout Amount of time of inactivity before the monitor is shut off. * @ingroup Ecore_X_DPMS_Group */ EAPI void @@ -243,5 +243,5 @@ ecore_x_dpms_timeout_off_set(unsigned int new_timeout) DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout); #endif /* ifdef ECORE_XDPMS */ -} /* ecore_x_dpms_timeout_off_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c index a64060b..d1b4111 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c @@ -21,10 +21,10 @@ */ EAPI void ecore_x_drawable_geometry_get(Ecore_X_Drawable d, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { Window dummy_win; int ret_x, ret_y; @@ -51,7 +51,7 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d, if (h) *h = (int)ret_h; -} /* ecore_x_drawable_geometry_get */ +} /** * Retrieves the width of the border of the given drawable. @@ -72,7 +72,7 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d) border_ret = 0; return (int)border_ret; -} /* ecore_x_drawable_border_width_get */ +} /** * Retrieves the depth of the given drawable. @@ -93,7 +93,7 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d) depth_ret = 0; return (int)depth_ret; -} /* ecore_x_drawable_depth_get */ +} /** * Fill the specified rectangle on a drawable. @@ -106,13 +106,13 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d) */ EAPI void ecore_x_drawable_rectangle_fill(Ecore_X_Drawable d, - Ecore_X_GC gc, - int x, - int y, - int width, - int height) + Ecore_X_GC gc, + int x, + int y, + int width, + int height) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height); -} /* ecore_x_drawable_rectangle_fill */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_e.c index d357c9b..5966bbd 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_e.c @@ -14,14 +14,14 @@ EAPI void ecore_x_e_init(void) { -} /* ecore_x_e_init */ +} EAPI void ecore_x_e_frame_size_set(Ecore_X_Window win, - int fl, - int fr, - int ft, - int fb) + int fl, + int fr, + int ft, + int fb) { unsigned int frames[4]; @@ -31,16 +31,16 @@ ecore_x_e_frame_size_set(Ecore_X_Window win, frames[2] = ft; frames[3] = fb; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_FRAME_SIZE, frames, 4); -} /* ecore_x_e_frame_size_set */ +} EAPI void ecore_x_e_virtual_keyboard_set(Ecore_X_Window win, - unsigned int is_keyboard) + unsigned int is_keyboard) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, &is_keyboard, 1); -} /* ecore_x_e_virtual_keyboard_set */ +} EAPI Eina_Bool ecore_x_e_virtual_keyboard_get(Ecore_X_Window win) @@ -53,7 +53,7 @@ ecore_x_e_virtual_keyboard_get(Ecore_X_Window win) return EINA_FALSE; return val ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_e_virtual_keyboard_get */ +} static Ecore_X_Virtual_Keyboard_State _ecore_x_e_vkbd_state_get(Ecore_X_Atom atom) @@ -104,7 +104,7 @@ _ecore_x_e_vkbd_state_get(Ecore_X_Atom atom) return ECORE_X_VIRTUAL_KEYBOARD_STATE_J2ME; return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN; -} /* _ecore_x_e_vkbd_state_get */ +} static Ecore_X_Atom _ecore_x_e_vkbd_atom_get(Ecore_X_Virtual_Keyboard_State state) @@ -157,12 +157,12 @@ _ecore_x_e_vkbd_atom_get(Ecore_X_Virtual_Keyboard_State state) return ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME; default: break; - } /* switch */ + } return 0; -} /* _ecore_x_e_vkbd_atom_get */ +} EAPI void -ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win, +ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win, Ecore_X_Virtual_Keyboard_State state) { Ecore_X_Atom atom = 0; @@ -171,7 +171,7 @@ ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win, atom = _ecore_x_e_vkbd_atom_get(state); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, &atom, 1); -} /* ecore_x_e_virtual_keyboard_state_set */ +} EAPI Ecore_X_Virtual_Keyboard_State ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win) @@ -184,10 +184,10 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win) return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN; return _ecore_x_e_vkbd_state_get(atom); -} /* ecore_x_e_virtual_keyboard_state_get */ +} EAPI void -ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, +ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, Ecore_X_Virtual_Keyboard_State state) { LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -195,7 +195,7 @@ ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_vkbd_atom_get(state), 0, 0, 0, 0); -} /* ecore_x_e_virtual_keyboard_state_send */ +} static Ecore_X_Atom _ecore_x_e_illume_atom_get(Ecore_X_Illume_Mode mode) @@ -213,9 +213,9 @@ _ecore_x_e_illume_atom_get(Ecore_X_Illume_Mode mode) default: break; - } /* switch */ + } return ECORE_X_ILLUME_MODE_UNKNOWN; -} /* _ecore_x_e_illume_atom_get */ +} static Ecore_X_Illume_Mode _ecore_x_e_illume_mode_get(Ecore_X_Atom atom) @@ -230,7 +230,7 @@ _ecore_x_e_illume_mode_get(Ecore_X_Atom atom) return ECORE_X_ILLUME_MODE_DUAL_LEFT; return ECORE_X_ILLUME_MODE_UNKNOWN; -} /* _ecore_x_e_illume_mode_get */ +} EAPI void ecore_x_e_illume_zone_set(Ecore_X_Window win, @@ -239,7 +239,7 @@ ecore_x_e_illume_zone_set(Ecore_X_Window win, LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE, &zone, 1); -} /* ecore_x_e_illume_zone_set */ +} EAPI Ecore_X_Window ecore_x_e_illume_zone_get(Ecore_X_Window win) @@ -252,26 +252,26 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win) return 0; return zone; -} /* ecore_x_e_illume_zone_get */ +} EAPI void -ecore_x_e_illume_zone_list_set(Ecore_X_Window win, +ecore_x_e_illume_zone_list_set(Ecore_X_Window win, Ecore_X_Window *zones, - unsigned int n_zones) + unsigned int n_zones) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST, zones, n_zones); -} /* ecore_x_e_illume_zone_list_set */ +} EAPI void ecore_x_e_illume_conformant_set(Ecore_X_Window win, - unsigned int is_conformant) + unsigned int is_conformant) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, &is_conformant, 1); -} /* ecore_x_e_illume_conformant_set */ +} EAPI Eina_Bool ecore_x_e_illume_conformant_get(Ecore_X_Window win) @@ -284,10 +284,10 @@ ecore_x_e_illume_conformant_get(Ecore_X_Window win) return EINA_FALSE; return val ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_e_illume_conformant_get */ +} EAPI void -ecore_x_e_illume_mode_set(Ecore_X_Window win, +ecore_x_e_illume_mode_set(Ecore_X_Window win, Ecore_X_Illume_Mode mode) { Ecore_X_Atom atom = 0; @@ -296,7 +296,7 @@ ecore_x_e_illume_mode_set(Ecore_X_Window win, atom = _ecore_x_e_illume_atom_get(mode); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1); -} /* ecore_x_e_illume_mode_set */ +} EAPI Ecore_X_Illume_Mode ecore_x_e_illume_mode_get(Ecore_X_Window win) @@ -308,10 +308,10 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win) return ECORE_X_ILLUME_MODE_UNKNOWN; return _ecore_x_e_illume_mode_get(atom); -} /* ecore_x_e_illume_mode_get */ +} EAPI void -ecore_x_e_illume_mode_send(Ecore_X_Window win, +ecore_x_e_illume_mode_send(Ecore_X_Window win, Ecore_X_Illume_Mode mode) { LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -319,7 +319,7 @@ ecore_x_e_illume_mode_send(Ecore_X_Window win, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_illume_atom_get(mode), 0, 0, 0, 0); -} /* ecore_x_e_illume_mode_send */ +} EAPI void ecore_x_e_illume_focus_back_send(Ecore_X_Window win) @@ -328,7 +328,7 @@ ecore_x_e_illume_focus_back_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_BACK, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_focus_back_send */ +} EAPI void ecore_x_e_illume_focus_forward_send(Ecore_X_Window win) @@ -337,7 +337,7 @@ ecore_x_e_illume_focus_forward_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_focus_forward_send */ +} EAPI void ecore_x_e_illume_focus_home_send(Ecore_X_Window win) @@ -346,7 +346,7 @@ ecore_x_e_illume_focus_home_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_HOME, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_focus_home_send */ +} EAPI void ecore_x_e_illume_close_send(Ecore_X_Window win) @@ -355,7 +355,7 @@ ecore_x_e_illume_close_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_CLOSE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_close_send */ +} EAPI void ecore_x_e_illume_home_new_send(Ecore_X_Window win) @@ -364,7 +364,7 @@ ecore_x_e_illume_home_new_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_NEW, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_home_new_send */ +} EAPI void ecore_x_e_illume_home_del_send(Ecore_X_Window win) @@ -373,15 +373,15 @@ ecore_x_e_illume_home_del_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_DEL, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_home_del_send */ +} EAPI void ecore_x_e_illume_drag_set(Ecore_X_Window win, - unsigned int drag) + unsigned int drag) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1); -} /* ecore_x_e_illume_drag_set */ +} EAPI Eina_Bool ecore_x_e_illume_drag_get(Ecore_X_Window win) @@ -393,16 +393,16 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win) return EINA_FALSE; return val ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_e_illume_drag_get */ +} EAPI void ecore_x_e_illume_drag_locked_set(Ecore_X_Window win, - unsigned int is_locked) + unsigned int is_locked) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED, &is_locked, 1); -} /* ecore_x_e_illume_drag_locked_set */ +} EAPI Eina_Bool ecore_x_e_illume_drag_locked_get(Ecore_X_Window win) @@ -415,7 +415,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win) return EINA_FALSE; return val ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_e_illume_drag_locked_get */ +} EAPI void ecore_x_e_illume_drag_start_send(Ecore_X_Window win) @@ -424,7 +424,7 @@ ecore_x_e_illume_drag_start_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_START, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_drag_start_send */ +} EAPI void ecore_x_e_illume_drag_end_send(Ecore_X_Window win) @@ -433,14 +433,14 @@ ecore_x_e_illume_drag_end_send(Ecore_X_Window win) ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_END, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_drag_end_send */ +} EAPI void ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { unsigned int geom[4]; @@ -451,14 +451,14 @@ ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win, geom[3] = h; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY, geom, 4); -} /* ecore_x_e_illume_indicator_geometry_set */ +} EAPI Eina_Bool ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { int ret = 0; unsigned int geom[4]; @@ -484,14 +484,14 @@ ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win, *h = geom[3]; return EINA_TRUE; -} /* ecore_x_e_illume_indicator_geometry_get */ +} EAPI void ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { unsigned int geom[4]; @@ -502,14 +502,14 @@ ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win, geom[3] = h; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY, geom, 4); -} /* ecore_x_e_illume_softkey_geometry_set */ +} EAPI Eina_Bool ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { int ret = 0; unsigned int geom[4]; @@ -535,14 +535,14 @@ ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win, *h = geom[3]; return EINA_TRUE; -} /* ecore_x_e_illume_softkey_geometry_get */ +} EAPI void ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { unsigned int geom[4]; @@ -553,14 +553,14 @@ ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win, geom[3] = h; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY, geom, 4); -} /* ecore_x_e_illume_keyboard_geometry_set */ +} EAPI Eina_Bool ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { int ret = 0; unsigned int geom[4]; @@ -586,7 +586,7 @@ ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win, *h = geom[3]; return EINA_TRUE; -} /* ecore_x_e_illume_keyboard_geometry_get */ +} static Ecore_X_Atom _ecore_x_e_quickpanel_atom_get(Ecore_X_Illume_Quickpanel_State state) @@ -601,9 +601,9 @@ _ecore_x_e_quickpanel_atom_get(Ecore_X_Illume_Quickpanel_State state) default: break; - } /* switch */ + } return 0; -} /* _ecore_x_e_quickpanel_atom_get */ +} static Ecore_X_Illume_Quickpanel_State _ecore_x_e_quickpanel_state_get(Ecore_X_Atom atom) @@ -615,16 +615,16 @@ _ecore_x_e_quickpanel_state_get(Ecore_X_Atom atom) return ECORE_X_ILLUME_QUICKPANEL_STATE_OFF; return ECORE_X_ILLUME_QUICKPANEL_STATE_UNKNOWN; -} /* _ecore_x_e_quickpanel_state_get */ +} EAPI void ecore_x_e_illume_quickpanel_set(Ecore_X_Window win, - unsigned int is_quickpanel) + unsigned int is_quickpanel) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, &is_quickpanel, 1); -} /* ecore_x_e_illume_quickpanel_set */ +} EAPI Eina_Bool ecore_x_e_illume_quickpanel_get(Ecore_X_Window win) @@ -637,10 +637,10 @@ ecore_x_e_illume_quickpanel_get(Ecore_X_Window win) return EINA_FALSE; return val ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_e_illume_quickpanel_get */ +} EAPI void -ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win, +ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win, Ecore_X_Illume_Quickpanel_State state) { Ecore_X_Atom atom = 0; @@ -649,7 +649,7 @@ ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win, atom = _ecore_x_e_quickpanel_atom_get(state); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, &atom, 1); -} /* ecore_x_e_illume_quickpanel_state_set */ +} EAPI Ecore_X_Illume_Quickpanel_State ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win) @@ -663,10 +663,10 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win) return ECORE_X_ILLUME_QUICKPANEL_STATE_UNKNOWN; return _ecore_x_e_quickpanel_state_get(atom); -} /* ecore_x_e_illume_quickpanel_state_get */ +} EAPI void -ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, +ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, Ecore_X_Illume_Quickpanel_State state) { LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -674,7 +674,7 @@ ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_quickpanel_atom_get(state), 0, 0, 0, 0); -} /* ecore_x_e_illume_quickpanel_state_send */ +} EAPI void ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win) @@ -684,17 +684,17 @@ ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win) ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE_TOGGLE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 0, 0, 0, 0, 0); -} /* ecore_x_e_illume_quickpanel_state_toggle */ +} EAPI void ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win, - unsigned int priority) + unsigned int priority) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR, &priority, 1); -} /* ecore_x_e_illume_quickpanel_priority_major_set */ +} EAPI int ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win) @@ -708,17 +708,17 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win) return 0; return val; -} /* ecore_x_e_illume_quickpanel_priority_major_get */ +} EAPI void ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, - unsigned int priority) + unsigned int priority) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR, &priority, 1); -} /* ecore_x_e_illume_quickpanel_priority_minor_set */ +} EAPI int ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win) @@ -732,17 +732,17 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win) return 0; return val; -} /* ecore_x_e_illume_quickpanel_priority_minor_get */ +} EAPI void ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win, - unsigned int zone) + unsigned int zone) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE, &zone, 1); -} /* ecore_x_e_illume_quickpanel_zone_set */ +} EAPI int ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win) @@ -756,7 +756,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win) return 0; return val; -} /* ecore_x_e_illume_quickpanel_zone_get */ +} EAPI void ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) @@ -766,10 +766,10 @@ ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); -} /* ecore_x_e_illume_quickpanel_position_update_send */ +} EAPI void -ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, +ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, Ecore_X_Sync_Counter counter) { LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -778,7 +778,7 @@ ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, ECORE_X_ATOM_CARDINAL, &counter, 1); else ecore_x_window_prop_property_del(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER); -} /* ecore_x_e_comp_sync_counter_set */ +} EAPI Ecore_X_Sync_Counter ecore_x_e_comp_sync_counter_get(Ecore_X_Window win) @@ -796,7 +796,7 @@ ecore_x_e_comp_sync_counter_get(Ecore_X_Window win) return 0; return counter; -} /* ecore_x_e_comp_sync_counter_get */ +} EAPI void ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root, @@ -822,13 +822,13 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root, XSendEvent(_ecore_x_disp, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_sync_draw_done_send */ +} EAPI void ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root, Ecore_X_Window win, - int w, - int h) + int w, + int h) { XEvent xev; @@ -850,11 +850,11 @@ ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root, XSendEvent(_ecore_x_disp, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_sync_draw_done_send */ +} EAPI void ecore_x_e_comp_sync_supported_set(Ecore_X_Window root, - Eina_Bool enabled) + Eina_Bool enabled) { Ecore_X_Window win; @@ -887,7 +887,7 @@ ecore_x_e_comp_sync_supported_set(Ecore_X_Window root, ecore_x_window_free(win); } } -} /* ecore_x_e_comp_sync_supported_set */ +} EAPI Eina_Bool ecore_x_e_comp_sync_supported_get(Ecore_X_Window root) @@ -916,7 +916,7 @@ ecore_x_e_comp_sync_supported_get(Ecore_X_Window root) } return EINA_FALSE; -} /* ecore_x_e_comp_sync_supported_get */ +} EAPI void ecore_x_e_comp_sync_begin_send(Ecore_X_Window win) @@ -938,7 +938,7 @@ ecore_x_e_comp_sync_begin_send(Ecore_X_Window win) XSendEvent(_ecore_x_disp, win, False, NoEventMask, //SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_sync_begin_send */ +} EAPI void ecore_x_e_comp_sync_end_send(Ecore_X_Window win) @@ -960,7 +960,7 @@ ecore_x_e_comp_sync_end_send(Ecore_X_Window win) XSendEvent(_ecore_x_disp, win, False, NoEventMask, //SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_sync_end_send */ +} EAPI void ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win) @@ -982,7 +982,7 @@ ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win) XSendEvent(_ecore_x_disp, win, False, NoEventMask, //SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_sync_cancel_send */ +} EAPI void ecore_x_e_comp_flush_send(Ecore_X_Window win) @@ -1004,7 +1004,7 @@ ecore_x_e_comp_flush_send(Ecore_X_Window win) XSendEvent(_ecore_x_disp, win, False, NoEventMask, //SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_flush_send */ +} EAPI void ecore_x_e_comp_dump_send(Ecore_X_Window win) @@ -1026,7 +1026,7 @@ ecore_x_e_comp_dump_send(Ecore_X_Window win) XSendEvent(_ecore_x_disp, win, False, NoEventMask, //SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_e_comp_dump_send */ +} EAPI void ecore_x_e_comp_pixmap_set(Ecore_X_Window win, @@ -1038,7 +1038,7 @@ ecore_x_e_comp_pixmap_set(Ecore_X_Window win, ECORE_X_ATOM_PIXMAP, &pixmap, 1); else ecore_x_window_prop_property_del(win, pixmap); -} /* ecore_x_e_comp_pixmap_set */ +} EAPI Ecore_X_Pixmap ecore_x_e_comp_pixmap_get(Ecore_X_Window win) @@ -1056,5 +1056,5 @@ ecore_x_e_comp_pixmap_get(Ecore_X_Window win) return 0; return pixmap; -} /* ecore_x_e_comp_pixmap_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_error.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_error.c index 837ff53..11e9f20 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_error.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_error.c @@ -9,7 +9,7 @@ #include "ecore_x_private.h" #include "Ecore_X.h" -static int _ecore_x_error_handle(Display *d, +static int _ecore_x_error_handle(Display *d, XErrorEvent *ev); static int _ecore_x_io_error_handle(Display *d); @@ -19,6 +19,7 @@ static void (*_io_error_func)(void *data) = NULL; static void *_io_error_data = NULL; static int _error_request_code = 0; static int _error_code = 0; +static Ecore_X_ID _error_resource_id = 0; /** * Set the error handler. @@ -28,12 +29,12 @@ static int _error_code = 0; * Set the X error handler function */ EAPI void -ecore_x_error_handler_set(void (*func)(void *data), +ecore_x_error_handler_set(void (*func)(void *data), const void *data) { _error_func = func; _error_data = (void *)data; -} /* ecore_x_error_handler_set */ +} /** * Set the I/O error handler. @@ -43,12 +44,12 @@ ecore_x_error_handler_set(void (*func)(void *data), * Set the X I/O error handler function */ EAPI void -ecore_x_io_error_handler_set(void (*func)(void *data), +ecore_x_io_error_handler_set(void (*func)(void *data), const void *data) { _io_error_func = func; _io_error_data = (void *)data; -} /* ecore_x_io_error_handler_set */ +} /** * Get the request code that caused the error. @@ -60,7 +61,7 @@ EAPI int ecore_x_error_request_get(void) { return _error_request_code; -} /* ecore_x_error_request_get */ +} /** * Get the error code from the error. @@ -72,28 +73,41 @@ EAPI int ecore_x_error_code_get(void) { return _error_code; -} /* ecore_x_error_code_get */ +} + +/** + * Get the resource id that caused the error. + * @return The resource id causing the X error + * + * Return the X resource id that caused the last X error + */ +EAPI Ecore_X_ID +ecore_x_error_resource_id_get(void) +{ + return _error_resource_id; +} void _ecore_x_error_handler_init(void) { XSetErrorHandler((XErrorHandler)_ecore_x_error_handle); XSetIOErrorHandler((XIOErrorHandler)_ecore_x_io_error_handle); -} /* _ecore_x_error_handler_init */ +} static int -_ecore_x_error_handle(Display *d, +_ecore_x_error_handle(Display *d, XErrorEvent *ev) { if (d == _ecore_x_disp) { _error_request_code = ev->request_code; _error_code = ev->error_code; + _error_resource_id = ev->resourceid; if (_error_func) _error_func(_error_data); } return 0; -} /* _ecore_x_error_handle */ +} static int _ecore_x_io_error_handle(Display *d) @@ -107,5 +121,5 @@ _ecore_x_io_error_handle(Display *d) } return 0; -} /* _ecore_x_io_error_handle */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_events.c index 136cd63..0b06a79 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_events.c @@ -100,10 +100,10 @@ _ecore_x_event_free_mouse_move(void *data __UNUSED__, } free(e); -} /* _ecore_x_event_free_mouse_move */ +} EAPI void -ecore_x_event_mask_set(Ecore_X_Window w, +ecore_x_event_mask_set(Ecore_X_Window w, Ecore_X_Event_Mask mask) { XWindowAttributes attr; @@ -117,10 +117,10 @@ ecore_x_event_mask_set(Ecore_X_Window w, XGetWindowAttributes(_ecore_x_disp, w, &attr); s_attr.event_mask = mask | attr.your_event_mask; XChangeWindowAttributes(_ecore_x_disp, w, CWEventMask, &s_attr); -} /* ecore_x_event_mask_set */ +} EAPI void -ecore_x_event_mask_unset(Ecore_X_Window w, +ecore_x_event_mask_unset(Ecore_X_Window w, Ecore_X_Event_Mask mask) { XWindowAttributes attr; @@ -134,7 +134,7 @@ ecore_x_event_mask_unset(Ecore_X_Window w, XGetWindowAttributes(_ecore_x_disp, w, &attr); s_attr.event_mask = attr.your_event_mask & ~mask; XChangeWindowAttributes(_ecore_x_disp, w, CWEventMask, &s_attr); -} /* ecore_x_event_mask_unset */ +} static void _ecore_x_event_free_xdnd_enter(void *data __UNUSED__, @@ -148,7 +148,7 @@ _ecore_x_event_free_xdnd_enter(void *data __UNUSED__, XFree(e->types[i]); free(e->types); free(e); -} /* _ecore_x_event_free_xdnd_enter */ +} static void _ecore_x_event_free_selection_notify(void *data __UNUSED__, @@ -164,7 +164,7 @@ _ecore_x_event_free_selection_notify(void *data __UNUSED__, free(e->target); free(e); -} /* _ecore_x_event_free_selection_notify */ +} static unsigned int _ecore_x_event_modifiers(unsigned int state) @@ -196,28 +196,28 @@ _ecore_x_event_modifiers(unsigned int state) modifiers |= ECORE_EVENT_LOCK_SHIFT; return modifiers; -} /* _ecore_x_event_modifiers */ +} void _ecore_mouse_move(unsigned int timestamp, unsigned int xmodifiers, - int x, - int y, - int x_root, - int y_root, + int x, + int y, + int x_root, + int y_root, unsigned int event_window, unsigned int window, unsigned int root_win, - int same_screen, - int dev, - double radx, - double rady, - double pressure, - double angle, - double mx, - double my, - double mrx, - double mry) + int same_screen, + int dev, + double radx, + double rady, + double pressure, + double angle, + double mx, + double my, + double mrx, + double mry) { Ecore_Event_Mouse_Move *e; Ecore_Event *event; @@ -260,10 +260,10 @@ _ecore_mouse_move(unsigned int timestamp, _ecore_x_event_last_root_y = y_root; _ecore_x_last_event_mouse_move_event = event; -} /* _ecore_mouse_move */ +} static void -_ecore_key_press(int event, +_ecore_key_press(int event, XKeyEvent *xevent) { Ecore_Event_Key *e; @@ -343,30 +343,30 @@ _ecore_key_press(int event, on_error: if (tmp) free(tmp); -} /* _ecore_key_press */ +} Ecore_Event_Mouse_Button * -_ecore_mouse_button(int event, +_ecore_mouse_button(int event, unsigned int timestamp, unsigned int xmodifiers, unsigned int buttons, - int x, - int y, - int x_root, - int y_root, + int x, + int y, + int x_root, + int y_root, unsigned int event_window, unsigned int window, unsigned int root_win, - int same_screen, - int dev, - double radx, - double rady, - double pressure, - double angle, - double mx, - double my, - double mrx, - double mry) + int same_screen, + int dev, + double radx, + double rady, + double pressure, + double angle, + double mx, + double my, + double mrx, + double mry) { Ecore_Event_Mouse_Button *e; @@ -407,37 +407,37 @@ _ecore_mouse_button(int event, { if (event == ECORE_EVENT_MOUSE_BUTTON_DOWN) { - //Check Double Clicked - if (((int)(timestamp - down_info->last_time) <= - (int)(1000 * _ecore_x_double_click_time)) && - (window == down_info->last_win) && - (event_window == down_info->last_event_win)) - { - e->double_click = 1; - down_info->did_double = EINA_TRUE; - } - else - { - down_info->did_double = EINA_FALSE; - down_info->did_triple = EINA_FALSE; - } - - //Check Triple Clicked - if (((int)(timestamp - down_info->last_last_time) <= - (int)(2 * 1000 * _ecore_x_double_click_time)) && - (window == down_info->last_win) && - (window == down_info->last_last_win) && - (event_window == down_info->last_event_win) && - (event_window == down_info->last_last_event_win) - ) - { - e->triple_click = 1; - down_info->did_triple = EINA_TRUE; - } - else - { - down_info->did_triple = EINA_FALSE; - } + //Check Double Clicked + if (((int)(timestamp - down_info->last_time) <= + (int)(1000 * _ecore_x_double_click_time)) && + (window == down_info->last_win) && + (event_window == down_info->last_event_win)) + { + e->double_click = 1; + down_info->did_double = EINA_TRUE; + } + else + { + down_info->did_double = EINA_FALSE; + down_info->did_triple = EINA_FALSE; + } + + //Check Triple Clicked + if (((int)(timestamp - down_info->last_last_time) <= + (int)(2 * 1000 * _ecore_x_double_click_time)) && + (window == down_info->last_win) && + (window == down_info->last_last_win) && + (event_window == down_info->last_event_win) && + (event_window == down_info->last_last_event_win) + ) + { + e->triple_click = 1; + down_info->did_triple = EINA_TRUE; + } + else + { + down_info->did_triple = EINA_FALSE; + } } else { @@ -491,7 +491,7 @@ _ecore_mouse_button(int event, } return e; -} /* _ecore_mouse_button */ +} void _ecore_x_event_handle_any_event(XEvent *xevent) @@ -500,19 +500,19 @@ _ecore_x_event_handle_any_event(XEvent *xevent) if (!ev) return; memcpy(ev, xevent, sizeof(XEvent)); ecore_event_add(ECORE_X_EVENT_ANY, ev, NULL, NULL); -} /* _ecore_x_event_handle_any_event */ +} void _ecore_x_event_handle_key_press(XEvent *xevent) { _ecore_key_press(ECORE_EVENT_KEY_DOWN, (XKeyEvent *)xevent); -} /* _ecore_x_event_handle_key_press */ +} void _ecore_x_event_handle_key_release(XEvent *xevent) { _ecore_key_press(ECORE_EVENT_KEY_UP, (XKeyEvent *)xevent); -} /* _ecore_x_event_handle_key_release */ +} void _ecore_x_event_handle_button_press(XEvent *xevent) @@ -541,7 +541,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent) case 7: e->direction = 1; e->z = 1; break; default: e->direction = 0; e->z = 0; break; - } /* switch */ + } e->x = xevent->xbutton.x; e->y = xevent->xbutton.y; @@ -663,7 +663,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent) } } } -} /* _ecore_x_event_handle_button_press */ +} void _ecore_x_event_handle_button_release(XEvent *xevent) @@ -702,7 +702,7 @@ _ecore_x_event_handle_button_release(XEvent *xevent) xevent->xbutton.x, xevent->xbutton.y, xevent->xbutton.x_root, xevent->xbutton.y_root); } -} /* _ecore_x_event_handle_button_release */ +} void _ecore_x_event_handle_motion_notify(XEvent *xevent) @@ -715,27 +715,27 @@ _ecore_x_event_handle_motion_notify(XEvent *xevent) _ecore_x_last_event_mouse_move_event = NULL; } */ - _ecore_mouse_move(xevent->xmotion.time, xevent->xmotion.state, - xevent->xmotion.x, xevent->xmotion.y, - xevent->xmotion.x_root, xevent->xmotion.y_root, - xevent->xmotion.window, - (xevent->xmotion.subwindow ? xevent->xmotion.subwindow : - xevent->xmotion.window), - xevent->xmotion.root, - xevent->xmotion.same_screen, - 0, 1, 1, - 1.0, // pressure - 0.0, // angle - xevent->xmotion.x, xevent->xmotion.y, - xevent->xmotion.x_root, xevent->xmotion.y_root); - - _ecore_x_last_event_mouse_move = 1; - - /* Xdnd handling */ - _ecore_x_dnd_drag(xevent->xmotion.root, - xevent->xmotion.x_root, - xevent->xmotion.y_root); -} /* _ecore_x_event_handle_motion_notify */ + _ecore_mouse_move(xevent->xmotion.time, xevent->xmotion.state, + xevent->xmotion.x, xevent->xmotion.y, + xevent->xmotion.x_root, xevent->xmotion.y_root, + xevent->xmotion.window, + (xevent->xmotion.subwindow ? xevent->xmotion.subwindow : + xevent->xmotion.window), + xevent->xmotion.root, + xevent->xmotion.same_screen, + 0, 1, 1, + 1.0, // pressure + 0.0, // angle + xevent->xmotion.x, xevent->xmotion.y, + xevent->xmotion.x_root, xevent->xmotion.y_root); + + _ecore_x_last_event_mouse_move = 1; + + /* Xdnd handling */ + _ecore_x_dnd_drag(xevent->xmotion.root, + xevent->xmotion.x_root, + xevent->xmotion.y_root); +} void _ecore_x_event_handle_enter_notify(XEvent *xevent) @@ -799,7 +799,7 @@ _ecore_x_event_handle_enter_notify(XEvent *xevent) _ecore_x_event_last_time = e->time; ecore_event_add(ECORE_X_EVENT_MOUSE_IN, e, NULL, NULL); } -} /* _ecore_x_event_handle_enter_notify */ +} void _ecore_x_event_handle_leave_notify(XEvent *xevent) @@ -866,7 +866,7 @@ _ecore_x_event_handle_leave_notify(XEvent *xevent) _ecore_x_event_last_root_y = e->root.y; ecore_event_add(ECORE_X_EVENT_MOUSE_OUT, e, NULL, NULL); } -} /* _ecore_x_event_handle_leave_notify */ +} void _ecore_x_event_handle_focus_in(XEvent *xevent) @@ -910,7 +910,7 @@ _ecore_x_event_handle_focus_in(XEvent *xevent) e->time = _ecore_x_event_last_time; _ecore_x_event_last_time = e->time; ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, e, NULL, NULL); -} /* _ecore_x_event_handle_focus_in */ +} void _ecore_x_event_handle_focus_out(XEvent *xevent) @@ -954,14 +954,14 @@ _ecore_x_event_handle_focus_out(XEvent *xevent) e->time = _ecore_x_event_last_time; _ecore_x_event_last_time = e->time; ecore_event_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, e, NULL, NULL); -} /* _ecore_x_event_handle_focus_out */ +} void _ecore_x_event_handle_keymap_notify(XEvent *xevent __UNUSED__) { _ecore_x_last_event_mouse_move = 0; /* FIXME: handle this event type */ -} /* _ecore_x_event_handle_keymap_notify */ +} void _ecore_x_event_handle_expose(XEvent *xevent) @@ -981,7 +981,7 @@ _ecore_x_event_handle_expose(XEvent *xevent) e->h = xevent->xexpose.height; e->count = xevent->xexpose.count; ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, NULL, NULL); -} /* _ecore_x_event_handle_expose */ +} void _ecore_x_event_handle_graphics_expose(XEvent *xevent) @@ -1001,7 +1001,7 @@ _ecore_x_event_handle_graphics_expose(XEvent *xevent) e->h = xevent->xgraphicsexpose.height; e->count = xevent->xgraphicsexpose.count; ecore_event_add(ECORE_X_EVENT_WINDOW_DAMAGE, e, NULL, NULL); -} /* _ecore_x_event_handle_graphics_expose */ +} void _ecore_x_event_handle_visibility_notify(XEvent *xevent) @@ -1024,7 +1024,7 @@ _ecore_x_event_handle_visibility_notify(XEvent *xevent) ecore_event_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, e, NULL, NULL); } -} /* _ecore_x_event_handle_visibility_notify */ +} void _ecore_x_event_handle_create_notify(XEvent *xevent) @@ -1050,7 +1050,7 @@ _ecore_x_event_handle_create_notify(XEvent *xevent) e->border = xevent->xcreatewindow.border_width; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_CREATE, e, NULL, NULL); -} /* _ecore_x_event_handle_create_notify */ +} void _ecore_x_event_handle_destroy_notify(XEvent *xevent) @@ -1069,7 +1069,7 @@ _ecore_x_event_handle_destroy_notify(XEvent *xevent) _ecore_x_event_last_win = 0; ecore_event_add(ECORE_X_EVENT_WINDOW_DESTROY, e, NULL, NULL); -} /* _ecore_x_event_handle_destroy_notify */ +} void _ecore_x_event_handle_unmap_notify(XEvent *xevent) @@ -1085,7 +1085,7 @@ _ecore_x_event_handle_unmap_notify(XEvent *xevent) e->event_win = xevent->xunmap.event; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_HIDE, e, NULL, NULL); -} /* _ecore_x_event_handle_unmap_notify */ +} void _ecore_x_event_handle_map_notify(XEvent *xevent) @@ -1101,7 +1101,7 @@ _ecore_x_event_handle_map_notify(XEvent *xevent) e->event_win = xevent->xmap.event; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW, e, NULL, NULL); -} /* _ecore_x_event_handle_map_notify */ +} void _ecore_x_event_handle_map_request(XEvent *xevent) @@ -1117,7 +1117,7 @@ _ecore_x_event_handle_map_request(XEvent *xevent) e->time = _ecore_x_event_last_time; e->parent = xevent->xmaprequest.parent; ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, e, NULL, NULL); -} /* _ecore_x_event_handle_map_request */ +} void _ecore_x_event_handle_reparent_notify(XEvent *xevent) @@ -1134,7 +1134,7 @@ _ecore_x_event_handle_reparent_notify(XEvent *xevent) e->parent = xevent->xreparent.parent; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_REPARENT, e, NULL, NULL); -} /* _ecore_x_event_handle_reparent_notify */ +} void _ecore_x_event_handle_configure_notify(XEvent *xevent) @@ -1158,7 +1158,7 @@ _ecore_x_event_handle_configure_notify(XEvent *xevent) e->from_wm = xevent->xconfigure.send_event; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_CONFIGURE, e, NULL, NULL); -} /* _ecore_x_event_handle_configure_notify */ +} void _ecore_x_event_handle_configure_request(XEvent *xevent) @@ -1193,14 +1193,14 @@ _ecore_x_event_handle_configure_request(XEvent *xevent) e->detail = ECORE_X_WINDOW_STACK_OPPOSITE; ecore_event_add(ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST, e, NULL, NULL); -} /* _ecore_x_event_handle_configure_request */ +} void _ecore_x_event_handle_gravity_notify(XEvent *xevent __UNUSED__) { _ecore_x_last_event_mouse_move = 0; /* FIXME: handle this event type */ -} /* _ecore_x_event_handle_gravity_notify */ +} void _ecore_x_event_handle_resize_request(XEvent *xevent) @@ -1217,7 +1217,7 @@ _ecore_x_event_handle_resize_request(XEvent *xevent) e->h = xevent->xresizerequest.height; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_RESIZE_REQUEST, e, NULL, NULL); -} /* _ecore_x_event_handle_resize_request */ +} void _ecore_x_event_handle_circulate_notify(XEvent *xevent) @@ -1238,7 +1238,7 @@ _ecore_x_event_handle_circulate_notify(XEvent *xevent) e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_STACK, e, NULL, NULL); -} /* _ecore_x_event_handle_circulate_notify */ +} void _ecore_x_event_handle_circulate_request(XEvent *xevent) @@ -1259,7 +1259,7 @@ _ecore_x_event_handle_circulate_request(XEvent *xevent) e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_STACK_REQUEST, e, NULL, NULL); -} /* _ecore_x_event_handle_circulate_request */ +} void _ecore_x_event_handle_property_notify(XEvent *xevent) @@ -1278,17 +1278,17 @@ _ecore_x_event_handle_property_notify(XEvent *xevent) _ecore_x_event_last_time = e->time; ecore_event_add(ECORE_X_EVENT_WINDOW_PROPERTY, e, NULL, NULL); } -} /* _ecore_x_event_handle_property_notify */ +} void _ecore_x_event_handle_selection_clear(XEvent *xevent) { // Ecore_X_Selection_Intern *d; - Ecore_X_Event_Selection_Clear *e; - Ecore_X_Atom sel; + Ecore_X_Event_Selection_Clear *e; + Ecore_X_Atom sel; - LOGFN(__FILE__, __LINE__, __FUNCTION__); - _ecore_x_last_event_mouse_move = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + _ecore_x_last_event_mouse_move = 0; /* errr..... why? paranoia. d = _ecore_x_selection_get(xevent->xselectionclear.selection); if (d && (xevent->xselectionclear.time > d->time)) @@ -1298,21 +1298,21 @@ _ecore_x_event_handle_selection_clear(XEvent *xevent) } */ /* Generate event for app cleanup */ - e = malloc(sizeof(Ecore_X_Event_Selection_Clear)); - e->win = xevent->xselectionclear.window; - e->time = xevent->xselectionclear.time; - e->atom = sel = xevent->xselectionclear.selection; - if (sel == ECORE_X_ATOM_SELECTION_PRIMARY) - e->selection = ECORE_X_SELECTION_PRIMARY; - else if (sel == ECORE_X_ATOM_SELECTION_SECONDARY) - e->selection = ECORE_X_SELECTION_SECONDARY; - else if (sel == ECORE_X_ATOM_SELECTION_CLIPBOARD) - e->selection = ECORE_X_SELECTION_CLIPBOARD; - else - e->selection = ECORE_X_SELECTION_OTHER; - - ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, NULL, NULL); -} /* _ecore_x_event_handle_selection_clear */ + e = malloc(sizeof(Ecore_X_Event_Selection_Clear)); + e->win = xevent->xselectionclear.window; + e->time = xevent->xselectionclear.time; + e->atom = sel = xevent->xselectionclear.selection; + if (sel == ECORE_X_ATOM_SELECTION_PRIMARY) + e->selection = ECORE_X_SELECTION_PRIMARY; + else if (sel == ECORE_X_ATOM_SELECTION_SECONDARY) + e->selection = ECORE_X_SELECTION_SECONDARY; + else if (sel == ECORE_X_ATOM_SELECTION_CLIPBOARD) + e->selection = ECORE_X_SELECTION_CLIPBOARD; + else + e->selection = ECORE_X_SELECTION_OTHER; + + ecore_event_add(ECORE_X_EVENT_SELECTION_CLEAR, e, NULL, NULL); +} void _ecore_x_event_handle_selection_request(XEvent *xevent) @@ -1360,17 +1360,17 @@ _ecore_x_event_handle_selection_request(XEvent *xevent) property = None; else if (data) { - /* FIXME: This does not properly handle large data transfers */ - ecore_x_window_prop_property_set( - xevent->xselectionrequest.requestor, - xevent->xselectionrequest. - property, - type, - typesize, - data, - len); - property = xevent->xselectionrequest.property; - free(data); + /* FIXME: This does not properly handle large data transfers */ + ecore_x_window_prop_property_set( + xevent->xselectionrequest.requestor, + xevent->xselectionrequest. + property, + type, + typesize, + data, + len); + property = xevent->xselectionrequest.property; + free(data); } ecore_x_selection_notify_send(xevent->xselectionrequest.requestor, @@ -1380,7 +1380,7 @@ _ecore_x_event_handle_selection_request(XEvent *xevent) xevent->xselectionrequest.time); } } -} /* _ecore_x_event_handle_selection_request */ +} void _ecore_x_event_handle_selection_notify(XEvent *xevent) @@ -1436,7 +1436,7 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent) ecore_event_add(ECORE_X_EVENT_SELECTION_NOTIFY, e, _ecore_x_event_free_selection_notify, NULL); -} /* _ecore_x_event_handle_selection_notify */ +} void _ecore_x_event_handle_colormap_notify(XEvent *xevent) @@ -1457,7 +1457,7 @@ _ecore_x_event_handle_colormap_notify(XEvent *xevent) e->installed = EINA_FALSE; ecore_event_add(ECORE_X_EVENT_WINDOW_COLORMAP, e, NULL, NULL); -} /* _ecore_x_event_handle_colormap_notify */ +} void _ecore_x_event_handle_client_message(XEvent *xevent) @@ -1528,32 +1528,32 @@ _ecore_x_event_handle_client_message(XEvent *xevent) if (xevent->xclient.data.l[1] & 0x1UL) { /* source supports more than 3 types, fetch property */ - unsigned char *data; - Ecore_X_Atom *types; - int i, num_ret; - - LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (!(ecore_x_window_prop_property_get(target->source, - ECORE_X_ATOM_XDND_TYPE_LIST, - XA_ATOM, - 32, &data, &num_ret))) - { - WRN( - "DND: Could not fetch data type list from source window, aborting."); - free(e); - return; - } - - types = (Ecore_X_Atom *)data; - e->types = calloc(num_ret, sizeof(char *)); - if (e->types) - { - LOGFN(__FILE__, __LINE__, __FUNCTION__); - for (i = 0; i < num_ret; i++) - e->types[i] = XGetAtomName(_ecore_x_disp, types[i]); - } - - e->num_types = num_ret; + unsigned char *data; + Ecore_X_Atom *types; + int i, num_ret; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (!(ecore_x_window_prop_property_get(target->source, + ECORE_X_ATOM_XDND_TYPE_LIST, + XA_ATOM, + 32, &data, &num_ret))) + { + WRN( + "DND: Could not fetch data type list from source window, aborting."); + free(e); + return; + } + + types = (Ecore_X_Atom *)data; + e->types = calloc(num_ret, sizeof(char *)); + if (e->types) + { + LOGFN(__FILE__, __LINE__, __FUNCTION__); + for (i = 0; i < num_ret; i++) + e->types[i] = XGetAtomName(_ecore_x_disp, types[i]); + } + + e->num_types = num_ret; } else { @@ -1774,7 +1774,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) if (e->state[0] == ECORE_X_WINDOW_STATE_UNKNOWN) { // char *name; - LOGFN(__FILE__, __LINE__, __FUNCTION__); + LOGFN(__FILE__, __LINE__, __FUNCTION__); // name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]); // if (name) ERR("Unknown state: %s", name); @@ -1784,7 +1784,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) if (e->state[1] == ECORE_X_WINDOW_STATE_UNKNOWN) { // char *name; - LOGFN(__FILE__, __LINE__, __FUNCTION__); + LOGFN(__FILE__, __LINE__, __FUNCTION__); // name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]); // if (name) ERR("Unknown state: %s", name); @@ -1888,10 +1888,10 @@ _ecore_x_event_handle_client_message(XEvent *xevent) && (xevent->xclient.window == _ecore_x_private_win)) { /* a grab sync marker */ - if (xevent->xclient.data.l[1] == 0x10000001) - _ecore_x_window_grab_remove(xevent->xclient.data.l[2]); - else if (xevent->xclient.data.l[1] == 0x10000002) - _ecore_x_key_grab_remove(xevent->xclient.data.l[2]); + if (xevent->xclient.data.l[1] == 0x10000001) + _ecore_x_window_grab_remove(xevent->xclient.data.l[2]); + else if (xevent->xclient.data.l[1] == 0x10000002) + _ecore_x_key_grab_remove(xevent->xclient.data.l[2]); } else { @@ -1910,7 +1910,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) ecore_event_add(ECORE_X_EVENT_CLIENT_MESSAGE, e, NULL, NULL); } -} /* _ecore_x_event_handle_client_message */ +} void _ecore_x_event_handle_mapping_notify(XEvent *xevent) @@ -1940,7 +1940,7 @@ _ecore_x_event_handle_mapping_notify(XEvent *xevent) e->keycode = xevent->xmapping.first_keycode; e->num = xevent->xmapping.count; ecore_event_add(ECORE_X_EVENT_MAPPING_CHANGE, e, NULL, NULL); -} /* _ecore_x_event_handle_mapping_notify */ +} void _ecore_x_event_handle_shape_change(XEvent *xevent) @@ -1979,7 +1979,7 @@ _ecore_x_event_handle_shape_change(XEvent *xevent) e->h = shape_event->height; e->shaped = shape_event->shaped; ecore_event_add(ECORE_X_EVENT_WINDOW_SHAPE, e, NULL, NULL); -} /* _ecore_x_event_handle_shape_change */ +} void _ecore_x_event_handle_screensaver_notify(XEvent *xevent) @@ -2005,7 +2005,7 @@ _ecore_x_event_handle_screensaver_notify(XEvent *xevent) #else /* ifdef ECORE_XSS */ xevent = NULL; #endif /* ifdef ECORE_XSS */ -} /* _ecore_x_event_handle_screensaver_notify */ +} void _ecore_x_event_handle_sync_counter(XEvent *xevent) @@ -2021,7 +2021,7 @@ _ecore_x_event_handle_sync_counter(XEvent *xevent) e->time = sync_counter_event->time; ecore_event_add(ECORE_X_EVENT_SYNC_COUNTER, e, NULL, NULL); -} /* _ecore_x_event_handle_sync_counter */ +} void _ecore_x_event_handle_sync_alarm(XEvent *xevent) @@ -2039,7 +2039,7 @@ _ecore_x_event_handle_sync_alarm(XEvent *xevent) e->time = sync_alarm_event->time; e->alarm = sync_alarm_event->alarm; ecore_event_add(ECORE_X_EVENT_SYNC_ALARM, e, NULL, NULL); -} /* _ecore_x_event_handle_sync_alarm */ +} #ifdef ECORE_XRANDR void @@ -2068,7 +2068,7 @@ _ecore_x_event_handle_randr_change(XEvent *xevent) e->orientation = randr_event->rotation; e->subpixel_order = randr_event->subpixel_order; ecore_event_add(ECORE_X_EVENT_SCREEN_CHANGE, e, NULL, NULL); -} /* _ecore_x_event_handle_randr_change */ +} static void _ecore_x_event_handle_randr_notify_crtc_change(const XRRNotifyEvent *xevent) @@ -2091,7 +2091,7 @@ _ecore_x_event_handle_randr_notify_crtc_change(const XRRNotifyEvent *xevent) e->geo.w = randr_event->width; e->geo.h = randr_event->height; ecore_event_add(ECORE_X_EVENT_RANDR_CRTC_CHANGE, e, NULL, NULL); -} /* _ecore_x_event_handle_randr_notify_crtc_change */ +} static void _ecore_x_event_handle_randr_notify_output_change(const XRRNotifyEvent *xevent) @@ -2113,7 +2113,7 @@ _ecore_x_event_handle_randr_notify_output_change(const XRRNotifyEvent *xevent) e->connection = randr_event->connection; e->subpixel_order = randr_event->subpixel_order; ecore_event_add(ECORE_X_EVENT_RANDR_OUTPUT_CHANGE, e, NULL, NULL); -} /* _ecore_x_event_handle_randr_notify_output_change */ +} static void _ecore_x_event_handle_randr_notify_output_property(const XRRNotifyEvent *xevent) @@ -2136,7 +2136,7 @@ _ecore_x_event_handle_randr_notify_output_property(const XRRNotifyEvent *xevent) else e->state = ECORE_X_RANDR_PROPERTY_CHANGE_DEL; ecore_event_add(ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY, e, NULL, NULL); -} /* _ecore_x_event_handle_randr_notify_output_property */ +} void _ecore_x_event_handle_randr_notify(XEvent *xevent) @@ -2164,8 +2164,8 @@ _ecore_x_event_handle_randr_notify(XEvent *xevent) ERR("Unknown XRandR RRNotify subtype: %d.", randr_event->subtype); break; - } /* switch */ -} /* _ecore_x_event_handle_randr_notify */ + } +} #endif /* ifdef ECORE_XRANDR */ @@ -2201,7 +2201,7 @@ _ecore_x_event_handle_fixes_selection_notify(XEvent *event) e->reason = notify_event->subtype; ecore_event_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY, e, NULL, NULL); -} /* _ecore_x_event_handle_fixes_selection_notify */ +} #endif /* ifdef ECORE_XFIXES */ @@ -2234,7 +2234,7 @@ _ecore_x_event_handle_damage_notify(XEvent *event) e->geometry.height = damage_event->geometry.height; ecore_event_add(ECORE_X_EVENT_DAMAGE_NOTIFY, e, NULL, NULL); -} /* _ecore_x_event_handle_damage_notify */ +} #endif /* ifdef ECORE_XDAMAGE */ @@ -2256,7 +2256,7 @@ _ecore_x_event_free_generic_event(void *data, return; data = NULL; ev = NULL; #endif /* ifdef ECORE_XI2 */ -} /* _ecore_x_event_free_generic_event */ +} void _ecore_x_event_handle_generic_event(XEvent *event) @@ -2300,7 +2300,7 @@ _ecore_x_event_handle_generic_event(XEvent *event) return; event = NULL; #endif /* ifdef ECORE_XI2 */ -} /* _ecore_x_event_handle_generic_event */ +} #ifdef ECORE_XGESTURE void @@ -2315,7 +2315,7 @@ _ecore_x_event_handle_gesture_notify_flick(XEvent *xevent) xfe = (XGestureNotifyFlickEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Flick)); if (!e) - return; + return; e->win = xfe->window; e->time = xfe->time; @@ -2341,7 +2341,7 @@ _ecore_x_event_handle_gesture_notify_pan(XEvent *xevent) xpe = (XGestureNotifyPanEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Pan)); if (!e) - return; + return; e->win = xpe->window; e->time = xpe->time; @@ -2368,7 +2368,7 @@ _ecore_x_event_handle_gesture_notify_pinchrotation(XEvent *xevent) xpre = (XGestureNotifyPinchRotationEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_PinchRotation)); if (!e) - return; + return; e->win = xpre->window; e->time = xpre->time; @@ -2395,7 +2395,7 @@ _ecore_x_event_handle_gesture_notify_tap(XEvent *xevent) xte = (XGestureNotifyTapEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Tap)); if (!e) - return; + return; e->win = xte->window; e->time = xte->time; @@ -2421,7 +2421,7 @@ _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent) xthe = (XGestureNotifyTapNHoldEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_TapNHold)); if (!e) - return; + return; e->win = xthe->window; e->time = xthe->time; @@ -2436,7 +2436,7 @@ _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent) } void - _ecore_x_event_handle_gesture_notify_hold(XEvent *xevent) +_ecore_x_event_handle_gesture_notify_hold(XEvent *xevent) { XGestureNotifyHoldEvent *xhe; Ecore_X_Event_Gesture_Notify_Hold *e; @@ -2447,7 +2447,7 @@ void xhe = (XGestureNotifyHoldEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Hold)); if (!e) - return; + return; e->win = xhe->window; e->time = xhe->time; @@ -2461,7 +2461,7 @@ void } void - _ecore_x_event_handle_gesture_notify_group(XEvent *xevent) +_ecore_x_event_handle_gesture_notify_group(XEvent *xevent) { XGestureNotifyGroupEvent *xge; Ecore_X_Event_Gesture_Notify_Group *e; @@ -2472,7 +2472,7 @@ void xge = (XGestureNotifyGroupEvent *)xevent; e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Group)); if (!e) - return; + return; e->win = xge->window; e->time = xge->time; @@ -2482,5 +2482,6 @@ void ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_GROUP, e, NULL, NULL); } + #endif /* ifdef ECORE_XGESTURE */ diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c index e81af13..da0a6c3 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c @@ -32,13 +32,13 @@ _ecore_x_fixes_init(void) #else /* ifdef ECORE_XFIXES */ _fixes_available = 0; #endif /* ifdef ECORE_XFIXES */ -} /* _ecore_x_fixes_init */ +} #ifdef ECORE_XFIXES /* I don't know what to call this function. */ static XRectangle * _ecore_x_rectangle_ecore_to_x(Ecore_X_Rectangle *rects, - int num) + int num) { XRectangle *xrect; int i; @@ -58,11 +58,11 @@ _ecore_x_rectangle_ecore_to_x(Ecore_X_Rectangle *rects, xrect[i].height = rects[i].height; } return xrect; -} /* _ecore_x_rectangle_ecore_to_x */ +} static Ecore_X_Rectangle * _ecore_x_rectangle_x_to_ecore(XRectangle *xrect, - int num) + int num) { Ecore_X_Rectangle *rects; int i; @@ -82,7 +82,7 @@ _ecore_x_rectangle_x_to_ecore(XRectangle *xrect, rects[i].height = xrect[i].height; } return rects; -} /* _ecore_x_rectangle_x_to_ecore */ +} #endif /* ifdef ECORE_XFIXES */ @@ -106,7 +106,7 @@ ecore_x_fixes_selection_notification_request(Ecore_X_Atom selection) EAPI Ecore_X_Region ecore_x_region_new(Ecore_X_Rectangle *rects, - int num) + int num) { #ifdef ECORE_XFIXES Ecore_X_Region region; @@ -120,7 +120,7 @@ ecore_x_region_new(Ecore_X_Rectangle *rects, #else /* ifdef ECORE_XFIXES */ return 0; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_new */ +} EAPI Ecore_X_Region ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap) @@ -134,10 +134,10 @@ ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap) #else /* ifdef ECORE_XFIXES */ return 0; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_new_from_bitmap */ +} EAPI Ecore_X_Region -ecore_x_region_new_from_window(Ecore_X_Window win, +ecore_x_region_new_from_window(Ecore_X_Window win, Ecore_X_Region_Type type) { #ifdef ECORE_XFIXES @@ -149,7 +149,7 @@ ecore_x_region_new_from_window(Ecore_X_Window win, #else /* ifdef ECORE_XFIXES */ return 0; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_new_from_window */ +} EAPI Ecore_X_Region ecore_x_region_new_from_gc(Ecore_X_GC gc) @@ -163,7 +163,7 @@ ecore_x_region_new_from_gc(Ecore_X_GC gc) #else /* ifdef ECORE_XFIXES */ return 0; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_new_from_gc */ +} EAPI Ecore_X_Region ecore_x_region_new_from_picture(Ecore_X_Picture picture) @@ -177,7 +177,7 @@ ecore_x_region_new_from_picture(Ecore_X_Picture picture) #else /* ifdef ECORE_XFIXES */ return 0; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_new_from_picture */ +} EAPI void ecore_x_region_free(Ecore_X_Region region) @@ -186,19 +186,19 @@ ecore_x_region_free(Ecore_X_Region region) LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesDestroyRegion(_ecore_x_disp, region); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_free */ +} EAPI void -ecore_x_region_set(Ecore_X_Region region, +ecore_x_region_set(Ecore_X_Region region, Ecore_X_Rectangle *rects, - int num) + int num) { #ifdef ECORE_XFIXES XRectangle *xrect = _ecore_x_rectangle_ecore_to_x(rects, num); LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSetRegion(_ecore_x_disp, region, xrect, num); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_set */ +} EAPI void ecore_x_region_copy(Ecore_X_Region dest, @@ -208,7 +208,7 @@ ecore_x_region_copy(Ecore_X_Region dest, LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesCopyRegion(_ecore_x_disp, dest, source); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_copy */ +} EAPI void ecore_x_region_combine(Ecore_X_Region dest, @@ -219,7 +219,7 @@ ecore_x_region_combine(Ecore_X_Region dest, LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesUnionRegion(_ecore_x_disp, dest, source1, source2); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_combine */ +} EAPI void ecore_x_region_intersect(Ecore_X_Region dest, @@ -230,7 +230,7 @@ ecore_x_region_intersect(Ecore_X_Region dest, LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesIntersectRegion(_ecore_x_disp, dest, source1, source2); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_intersect */ +} EAPI void ecore_x_region_subtract(Ecore_X_Region dest, @@ -241,35 +241,36 @@ ecore_x_region_subtract(Ecore_X_Region dest, LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSubtractRegion(_ecore_x_disp, dest, source1, source2); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_subtract */ +} EAPI void -ecore_x_region_invert(Ecore_X_Region dest, +ecore_x_region_invert(Ecore_X_Region dest, Ecore_X_Rectangle *bounds, - Ecore_X_Region source) + Ecore_X_Region source) { #ifdef ECORE_XFIXES XRectangle *xbound; int num = 0; LOGFN(__FILE__, __LINE__, __FUNCTION__); - while (bounds + num) num++; + while (bounds + num) + num++; xbound = _ecore_x_rectangle_ecore_to_x(bounds, num); XFixesInvertRegion(_ecore_x_disp, dest, xbound, source); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_invert */ +} EAPI void ecore_x_region_translate(Ecore_X_Region region, - int dx, - int dy) + int dx, + int dy) { #ifdef ECORE_XFIXES LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesTranslateRegion(_ecore_x_disp, region, dx, dy); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_translate */ +} EAPI void ecore_x_region_extents(Ecore_X_Region dest, @@ -279,11 +280,11 @@ ecore_x_region_extents(Ecore_X_Region dest, LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesRegionExtents(_ecore_x_disp, dest, source); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_extents */ +} EAPI Ecore_X_Rectangle * -ecore_x_region_fetch(Ecore_X_Region region, - int *num, +ecore_x_region_fetch(Ecore_X_Region region, + int *num, Ecore_X_Rectangle *bounds){ #ifdef ECORE_XFIXES Ecore_X_Rectangle *rects; @@ -300,40 +301,40 @@ ecore_x_region_fetch(Ecore_X_Region region, #else /* ifdef ECORE_XFIXES */ return NULL; #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_fetch */ +} EAPI void ecore_x_region_expand(Ecore_X_Region dest, Ecore_X_Region source, - unsigned int left, - unsigned int right, - unsigned int top, - unsigned int bottom) + unsigned int left, + unsigned int right, + unsigned int top, + unsigned int bottom) { #ifdef ECORE_XFIXES LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesExpandRegion(_ecore_x_disp, dest, source, left, right, top, bottom); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_expand */ +} EAPI void ecore_x_region_gc_clip_set(Ecore_X_Region region, - Ecore_X_GC gc, - int x_origin, - int y_origin) + Ecore_X_GC gc, + int x_origin, + int y_origin) { #ifdef ECORE_XFIXES LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSetGCClipRegion(_ecore_x_disp, gc, x_origin, y_origin, region); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_gc_clip_set */ +} EAPI void -ecore_x_region_window_shape_set(Ecore_X_Region region, - Ecore_X_Window win, +ecore_x_region_window_shape_set(Ecore_X_Region region, + Ecore_X_Window win, Ecore_X_Shape_Type type, - int x_offset, - int y_offset) + int x_offset, + int y_offset) { #ifdef ECORE_XFIXES LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -344,13 +345,13 @@ ecore_x_region_window_shape_set(Ecore_X_Region region, y_offset, region); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_window_shape_set */ +} EAPI void -ecore_x_region_picture_clip_set(Ecore_X_Region region, +ecore_x_region_picture_clip_set(Ecore_X_Region region, Ecore_X_Picture picture, - int x_origin, - int y_origin) + int x_origin, + int y_origin) { #ifdef ECORE_XFIXES LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -360,5 +361,5 @@ ecore_x_region_picture_clip_set(Ecore_X_Region region, y_origin, region); #endif /* ifdef ECORE_XFIXES */ -} /* ecore_x_region_picture_clip_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c index 10b807b..5396366 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c @@ -19,9 +19,9 @@ * @return The new default graphics context. */ EAPI Ecore_X_GC -ecore_x_gc_new(Ecore_X_Drawable draw, +ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, - const unsigned int *value_list) + const unsigned int *value_list) { XGCValues gcv; int mask; @@ -152,11 +152,11 @@ ecore_x_gc_new(Ecore_X_Drawable draw, gcv.arc_mode = value_list[idx]; idx++; break; - } /* switch */ + } } return XCreateGC(_ecore_x_disp, draw, value_mask, &gcv); -} /* ecore_x_gc_new */ +} /** * Deletes and frees the given graphics context. @@ -167,5 +167,5 @@ ecore_x_gc_free(Ecore_X_GC gc) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreeGC(_ecore_x_disp, gc); -} /* ecore_x_gc_free */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c index e1dc75c..e89421b 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c @@ -26,7 +26,7 @@ _ecore_x_gesture_init(void) _gesture_available = EINA_TRUE; } else - _gesture_available = EINA_FALSE; + _gesture_available = EINA_FALSE; #else /* ifdef ECORE_XGESTURE */ _gesture_available = EINA_FALSE; #endif /* ifdef ECORE_XGESTURE */ @@ -48,11 +48,11 @@ ecore_x_gesture_events_select(Ecore_X_Window win, { #ifdef ECORE_XGESTURE if (!_gesture_available) - return EINA_FALSE; + return EINA_FALSE; LOGFN(__FILE__, __LINE__, __FUNCTION__); XGestureSelectEvents(_ecore_x_disp, win, mask); - + return EINA_TRUE; #else /* ifdef ECORE_XGESTURE */ return EINA_FALSE; @@ -68,7 +68,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win) Ecore_X_Gesture_Event_Mask mask; if (!_gesture_available) - return ECORE_X_GESTURE_EVENT_MASK_NONE; + return ECORE_X_GESTURE_EVENT_MASK_NONE; LOGFN(__FILE__, __LINE__, __FUNCTION__); if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, &mask)) @@ -76,7 +76,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win) mask = ECORE_X_GESTURE_EVENT_MASK_NONE; return mask; } - + return mask; #else /* ifdef ECORE_XGESTURE */ return ECORE_X_GESTURE_EVENT_MASK_NONE; @@ -91,14 +91,14 @@ ecore_x_gesture_event_grab(Ecore_X_Window win, { #ifdef ECORE_XGESTURE if (!_gesture_available) - return EINA_FALSE; + return EINA_FALSE; LOGFN(__FILE__, __LINE__, __FUNCTION__); if (GestureGrabSuccess != XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) { return EINA_FALSE; } - + return EINA_TRUE; #else /* ifdef ECORE_XGESTURE */ return EINA_FALSE; @@ -117,14 +117,14 @@ ecore_x_gesture_event_ungrab(Ecore_X_Window win, Ecore_X_Gesture_Event_Mask mask; if (!_gesture_available) - return EINA_FALSE; + return EINA_FALSE; LOGFN(__FILE__, __LINE__, __FUNCTION__); if (GestureUngrabSuccess != XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) { return EINA_FALSE; } - + return EINA_TRUE; #else /* ifdef ECORE_XGESTURE */ return EINA_FALSE; diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c index 3899651..8d6ea1f 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c @@ -21,10 +21,10 @@ EAPI void ecore_x_icccm_init(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); -} /* ecore_x_icccm_init */ +} EAPI void -ecore_x_icccm_state_set(Ecore_X_Window win, +ecore_x_icccm_state_set(Ecore_X_Window win, Ecore_X_Window_State_Hint state) { unsigned long c[2]; @@ -41,7 +41,7 @@ ecore_x_icccm_state_set(Ecore_X_Window win, XChangeProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_STATE, ECORE_X_ATOM_WM_STATE, 32, PropModeReplace, (unsigned char *)c, 2); -} /* ecore_x_icccm_state_set */ +} EAPI Ecore_X_Window_State_Hint ecore_x_icccm_state_get(Ecore_X_Window win) @@ -72,47 +72,47 @@ ecore_x_icccm_state_get(Ecore_X_Window win) XFree(prop_ret); return hint; -} /* ecore_x_icccm_state_get */ +} EAPI void ecore_x_icccm_delete_window_send(Ecore_X_Window win, - Ecore_X_Time t) + Ecore_X_Time t) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, ECORE_X_EVENT_MASK_NONE, ECORE_X_ATOM_WM_DELETE_WINDOW, t, 0, 0, 0); -} /* ecore_x_icccm_delete_window_send */ +} EAPI void ecore_x_icccm_take_focus_send(Ecore_X_Window win, - Ecore_X_Time t) + Ecore_X_Time t) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, ECORE_X_EVENT_MASK_NONE, ECORE_X_ATOM_WM_TAKE_FOCUS, t, 0, 0, 0); -} /* ecore_x_icccm_take_focus_send */ +} EAPI void ecore_x_icccm_save_yourself_send(Ecore_X_Window win, - Ecore_X_Time t) + Ecore_X_Time t) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_WM_PROTOCOLS, ECORE_X_EVENT_MASK_NONE, ECORE_X_ATOM_WM_SAVE_YOURSELF, t, 0, 0, 0); -} /* ecore_x_icccm_save_yourself_send */ +} EAPI void ecore_x_icccm_move_resize_send(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { XEvent ev; @@ -129,17 +129,17 @@ ecore_x_icccm_move_resize_send(Ecore_X_Window win, ev.xconfigure.above = None; ev.xconfigure.override_redirect = False; XSendEvent(_ecore_x_disp, win, False, StructureNotifyMask, &ev); -} /* ecore_x_icccm_move_resize_send */ +} EAPI void -ecore_x_icccm_hints_set(Ecore_X_Window win, - Eina_Bool accepts_focus, +ecore_x_icccm_hints_set(Ecore_X_Window win, + Eina_Bool accepts_focus, Ecore_X_Window_State_Hint initial_state, - Ecore_X_Pixmap icon_pixmap, - Ecore_X_Pixmap icon_mask, - Ecore_X_Window icon_window, - Ecore_X_Window window_group, - Eina_Bool is_urgent) + Ecore_X_Pixmap icon_pixmap, + Ecore_X_Pixmap icon_mask, + Ecore_X_Window icon_window, + Ecore_X_Window window_group, + Eina_Bool is_urgent) { XWMHints *hints; @@ -186,17 +186,17 @@ ecore_x_icccm_hints_set(Ecore_X_Window win, XSetWMHints(_ecore_x_disp, win, hints); XFree(hints); -} /* ecore_x_icccm_hints_set */ +} EAPI Eina_Bool -ecore_x_icccm_hints_get(Ecore_X_Window win, - Eina_Bool *accepts_focus, +ecore_x_icccm_hints_get(Ecore_X_Window win, + Eina_Bool *accepts_focus, Ecore_X_Window_State_Hint *initial_state, - Ecore_X_Pixmap *icon_pixmap, - Ecore_X_Pixmap *icon_mask, - Ecore_X_Window *icon_window, - Ecore_X_Window *window_group, - Eina_Bool *is_urgent) + Ecore_X_Pixmap *icon_pixmap, + Ecore_X_Pixmap *icon_mask, + Ecore_X_Window *icon_window, + Ecore_X_Window *window_group, + Eina_Bool *is_urgent) { XWMHints *hints; @@ -263,22 +263,22 @@ ecore_x_icccm_hints_get(Ecore_X_Window win, } return EINA_FALSE; -} /* ecore_x_icccm_hints_get */ +} EAPI void -ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, - Eina_Bool request_pos, +ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, + Eina_Bool request_pos, Ecore_X_Gravity gravity, - int min_w, - int min_h, - int max_w, - int max_h, - int base_w, - int base_h, - int step_x, - int step_y, - double min_aspect, - double max_aspect) + int min_w, + int min_h, + int max_w, + int max_h, + int base_w, + int base_h, + int step_x, + int step_y, + double min_aspect, + double max_aspect) { XSizeHints hint; long mask; @@ -335,22 +335,22 @@ ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, } XSetWMNormalHints(_ecore_x_disp, win, &hint); -} /* ecore_x_icccm_size_pos_hints_set */ +} EAPI Eina_Bool -ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, - Eina_Bool *request_pos, +ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, + Eina_Bool *request_pos, Ecore_X_Gravity *gravity, - int *min_w, - int *min_h, - int *max_w, - int *max_h, - int *base_w, - int *base_h, - int *step_x, - int *step_y, - double *min_aspect, - double *max_aspect) + int *min_w, + int *min_h, + int *max_w, + int *max_h, + int *base_w, + int *base_h, + int *step_x, + int *step_y, + double *min_aspect, + double *max_aspect) { XSizeHints hint; long mask; @@ -460,11 +460,11 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, *max_aspect = maxa; return EINA_TRUE; -} /* ecore_x_icccm_size_pos_hints_get */ +} EAPI void ecore_x_icccm_title_set(Ecore_X_Window win, - const char *t) + const char *t) { char *list[1]; XTextProperty xprop; @@ -500,7 +500,7 @@ ecore_x_icccm_title_set(Ecore_X_Window win, } free(list[0]); -} /* ecore_x_icccm_title_set */ +} EAPI char * ecore_x_icccm_title_get(Ecore_X_Window win) @@ -522,23 +522,23 @@ ecore_x_icccm_title_get(Ecore_X_Window win) t = strdup((char *)xprop.value); else { - /* convert to utf8 */ + /* convert to utf8 */ #ifdef X_HAVE_UTF8_STRING - ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, - &list, &num); + ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, + &list, &num); #else /* ifdef X_HAVE_UTF8_STRING */ - ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, - &list, &num); + ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, + &list, &num); #endif /* ifdef X_HAVE_UTF8_STRING */ - if ((ret == XLocaleNotSupported) || - (ret == XNoMemory) || (ret == XConverterNotFound)) - t = strdup((char *)xprop.value); - else if ((ret >= Success) && (num > 0)) - t = strdup(list[0]); + if ((ret == XLocaleNotSupported) || + (ret == XNoMemory) || (ret == XConverterNotFound)) + t = strdup((char *)xprop.value); + else if ((ret >= Success) && (num > 0)) + t = strdup(list[0]); - if (list) - XFreeStringList(list); + if (list) + XFreeStringList(list); } if (xprop.value) @@ -549,7 +549,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win) } return NULL; -} /* ecore_x_icccm_title_get */ +} /** * Set protocol atoms explicitly @@ -559,15 +559,15 @@ ecore_x_icccm_title_get(Ecore_X_Window win) */ EAPI void ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, - Ecore_X_Atom *protos, - int num) + Ecore_X_Atom *protos, + int num) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num > 0) XSetWMProtocols(_ecore_x_disp, win, (Atom *)(protos), num); else XDeleteProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_PROTOCOLS); -} /* ecore_x_icccm_protocol_atoms_set */ +} /** * Set or unset a wm protocol property. @@ -576,9 +576,9 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, * @param on On/Off */ EAPI void -ecore_x_icccm_protocol_set(Ecore_X_Window win, +ecore_x_icccm_protocol_set(Ecore_X_Window win, Ecore_X_WM_Protocol protocol, - Eina_Bool on) + Eina_Bool on) { Atom *protos = NULL; Atom proto; @@ -653,7 +653,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, leave: if (protos) XFree(protos); -} /* ecore_x_icccm_protocol_set */ +} /** * Determines whether a protocol is set for a window. @@ -662,7 +662,7 @@ leave: * @return 1 if the protocol is set, else 0. */ EAPI Eina_Bool -ecore_x_icccm_protocol_isset(Ecore_X_Window win, +ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol) { Atom proto, *protos = NULL; @@ -690,7 +690,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, XFree(protos); return ret; -} /* ecore_x_icccm_protocol_isset */ +} /** * Set a window name & class. @@ -702,8 +702,8 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, */ EAPI void ecore_x_icccm_name_class_set(Ecore_X_Window win, - const char *n, - const char *c) + const char *n, + const char *c) { XClassHint *xch; @@ -716,7 +716,7 @@ ecore_x_icccm_name_class_set(Ecore_X_Window win, xch->res_class = (char *)c; XSetClassHint(_ecore_x_disp, win, xch); XFree(xch); -} /* ecore_x_icccm_name_class_set */ +} /** * Get a window name & class. @@ -728,8 +728,8 @@ ecore_x_icccm_name_class_set(Ecore_X_Window win, */ EAPI void ecore_x_icccm_name_class_get(Ecore_X_Window win, - char **n, - char **c) + char **n, + char **c) { XClassHint xch; @@ -755,7 +755,7 @@ ecore_x_icccm_name_class_get(Ecore_X_Window win, XFree(xch.res_name); XFree(xch.res_class); } -} /* ecore_x_icccm_name_class_get */ +} /** * Get a window client machine string. @@ -772,7 +772,7 @@ ecore_x_icccm_client_machine_get(Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); name = ecore_x_window_prop_string_get(win, ECORE_X_ATOM_WM_CLIENT_MACHINE); return name; -} /* ecore_x_icccm_client_machine_get */ +} /** * Sets the WM_COMMAND property for @a win. @@ -783,12 +783,12 @@ ecore_x_icccm_client_machine_get(Ecore_X_Window win) */ EAPI void ecore_x_icccm_command_set(Ecore_X_Window win, - int argc, - char **argv) + int argc, + char **argv) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetCommand(_ecore_x_disp, win, argv, argc); -} /* ecore_x_icccm_command_set */ +} /** * Get the WM_COMMAND property for @a win. @@ -801,8 +801,8 @@ ecore_x_icccm_command_set(Ecore_X_Window win, */ EAPI void ecore_x_icccm_command_get(Ecore_X_Window win, - int *argc, - char ***argv) + int *argc, + char ***argv) { int i, c; char **v; @@ -850,7 +850,7 @@ ecore_x_icccm_command_get(Ecore_X_Window win, } XFreeStringList(v); -} /* ecore_x_icccm_command_get */ +} /** * Set a window icon name. @@ -861,7 +861,7 @@ ecore_x_icccm_command_get(Ecore_X_Window win, */ EAPI void ecore_x_icccm_icon_name_set(Ecore_X_Window win, - const char *t) + const char *t) { char *list[1]; XTextProperty xprop; @@ -892,7 +892,7 @@ ecore_x_icccm_icon_name_set(Ecore_X_Window win, } free(list[0]); -} /* ecore_x_icccm_icon_name_set */ +} /** * Get a window icon name. @@ -921,26 +921,26 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win) t = strdup((char *)xprop.value); else { - /* convert to utf8 */ + /* convert to utf8 */ #ifdef X_HAVE_UTF8_STRING - ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, - &list, &num); + ret = Xutf8TextPropertyToTextList(_ecore_x_disp, &xprop, + &list, &num); #else /* ifdef X_HAVE_UTF8_STRING */ - ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, - &list, &num); + ret = XmbTextPropertyToTextList(_ecore_x_disp, &xprop, + &list, &num); #endif /* ifdef X_HAVE_UTF8_STRING */ - if ((ret == XLocaleNotSupported) || - (ret == XNoMemory) || (ret == XConverterNotFound)) - t = strdup((char *)xprop.value); - else if (ret >= Success) - { - if ((num >= 1) && (list)) - t = strdup(list[0]); - - if (list) - XFreeStringList(list); - } + if ((ret == XLocaleNotSupported) || + (ret == XNoMemory) || (ret == XConverterNotFound)) + t = strdup((char *)xprop.value); + else if (ret >= Success) + { + if ((num >= 1) && (list)) + t = strdup(list[0]); + + if (list) + XFreeStringList(list); + } } if (xprop.value) @@ -951,7 +951,7 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win) } return NULL; -} /* ecore_x_icccm_icon_name_get */ +} /** * Add a subwindow to the list of windows that need a different colormap installed. @@ -1014,7 +1014,7 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS, XA_WINDOW, 32, data, num); free(newset); -} /* ecore_x_icccm_colormap_window_set */ +} /** * Remove a window from the list of colormap windows. @@ -1079,7 +1079,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win, if (old_data) XFree(old_data); -} /* ecore_x_icccm_colormap_window_unset */ +} /** * Specify that a window is transient for another top-level window and should be handled accordingly. @@ -1092,18 +1092,18 @@ ecore_x_icccm_transient_for_set(Ecore_X_Window win, { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetTransientForHint(_ecore_x_disp, win, forwin); -} /* ecore_x_icccm_transient_for_set */ +} /** * Remove the transient_for setting from a window. - * @param The window + * @param win The window */ EAPI void ecore_x_icccm_transient_for_unset(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XDeleteProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_TRANSIENT_FOR); -} /* ecore_x_icccm_transient_for_unset */ +} /** * Get the window this window is transient for, if any. @@ -1120,7 +1120,7 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win) return (Ecore_X_Window)forwin; else return 0; -} /* ecore_x_icccm_transient_for_get */ +} /** * Set the window role hint. @@ -1129,12 +1129,12 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win) */ EAPI void ecore_x_icccm_window_role_set(Ecore_X_Window win, - const char *role) + const char *role) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_string_set(win, ECORE_X_ATOM_WM_WINDOW_ROLE, (char *)role); -} /* ecore_x_icccm_window_role_set */ +} /** * Get the window role. @@ -1146,7 +1146,7 @@ ecore_x_icccm_window_role_get(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_string_get(win, ECORE_X_ATOM_WM_WINDOW_ROLE); -} /* ecore_x_icccm_window_role_get */ +} /** * Set the window's client leader. @@ -1163,7 +1163,7 @@ ecore_x_icccm_client_leader_set(Ecore_X_Window win, LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(win, ECORE_X_ATOM_WM_CLIENT_LEADER, &l, 1); -} /* ecore_x_icccm_client_leader_set */ +} /** * Get the window's client leader. @@ -1180,7 +1180,7 @@ ecore_x_icccm_client_leader_get(Ecore_X_Window win) return l; return 0; -} /* ecore_x_icccm_client_leader_get */ +} EAPI void ecore_x_icccm_iconic_request_send(Ecore_X_Window win, @@ -1206,7 +1206,7 @@ ecore_x_icccm_iconic_request_send(Ecore_X_Window win, XSendEvent(_ecore_x_disp, root, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); -} /* ecore_x_icccm_iconic_request_send */ +} /* FIXME: there are older E hints, gnome hints and mwm hints and new netwm */ /* hints. each should go in their own file/section so we know which */ diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_image.c index 2de5319..b8e720c 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_image.c @@ -1,26 +1,28 @@ #ifdef HAVE_CONFIG_H # include -#endif /* ifdef HAVE_CONFIG_H */ +#endif + +#include +#include +#include +#include #include "ecore_x_private.h" #include "Ecore_X.h" #include #include -#include -#include -#include static int _ecore_x_image_shm_can = -1; static int _ecore_x_image_err = 0; static int -_ecore_x_image_error_handler(Display *d __UNUSED__, +_ecore_x_image_error_handler(Display *d __UNUSED__, XErrorEvent *ev __UNUSED__) { _ecore_x_image_err = 1; return 0; -} /* _ecore_x_image_error_handler */ +} static void _ecore_x_image_shm_check(void) @@ -90,7 +92,7 @@ _ecore_x_image_shm_check(void) shmctl(shminfo.shmid, IPC_RMID, 0); _ecore_x_image_shm_can = 1; -} /* _ecore_x_image_shm_check */ +} struct _Ecore_X_Image { @@ -105,10 +107,10 @@ struct _Ecore_X_Image }; EAPI Ecore_X_Image * -ecore_x_image_new(int w, - int h, +ecore_x_image_new(int w, + int h, Ecore_X_Visual vis, - int depth) + int depth) { Ecore_X_Image *im; @@ -124,7 +126,7 @@ ecore_x_image_new(int w, _ecore_x_image_shm_check(); im->shm = _ecore_x_image_shm_can; return im; -} /* ecore_x_image_new */ +} EAPI void ecore_x_image_free(Ecore_X_Image *im) @@ -148,7 +150,7 @@ ecore_x_image_free(Ecore_X_Image *im) } free(im); -} /* ecore_x_image_free */ +} static void _ecore_x_image_shm_create(Ecore_X_Image *im) @@ -192,17 +194,17 @@ _ecore_x_image_shm_create(Ecore_X_Image *im) im->bpp = 2; else im->bpp = 4; -} /* _ecore_x_image_shm_create */ +} EAPI Eina_Bool -ecore_x_image_get(Ecore_X_Image *im, +ecore_x_image_get(Ecore_X_Image *im, Ecore_X_Drawable draw, - int x, - int y, - int sx, - int sy, - int w, - int h) + int x, + int y, + int sx, + int sy, + int w, + int h) { Eina_Bool ret = EINA_TRUE; XErrorHandler ph; @@ -278,18 +280,18 @@ ecore_x_image_get(Ecore_X_Image *im, } return ret; -} /* ecore_x_image_get */ +} EAPI void -ecore_x_image_put(Ecore_X_Image *im, +ecore_x_image_put(Ecore_X_Image *im, Ecore_X_Drawable draw, - Ecore_X_GC gc, - int x, - int y, - int sx, - int sy, - int w, - int h) + Ecore_X_GC gc, + int x, + int y, + int sx, + int sy, + int w, + int h) { Ecore_X_GC tgc = 0; @@ -306,13 +308,13 @@ ecore_x_image_put(Ecore_X_Image *im, if (im->xim) XShmPutImage(_ecore_x_disp, draw, gc, im->xim, sx, sy, x, y, w, h, False); if (tgc) ecore_x_gc_free(tgc); -} /* ecore_x_image_put */ +} EAPI void * ecore_x_image_data_get(Ecore_X_Image *im, - int *bpl, - int *rows, - int *bpp) + int *bpl, + int *rows, + int *bpp) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!im->xim) _ecore_x_image_shm_create(im); @@ -321,7 +323,7 @@ ecore_x_image_data_get(Ecore_X_Image *im, if (rows) *rows = im->rows; if (bpp) *bpp = im->bpp; return im->data; -} /* ecore_x_image_data_get */ +} EAPI Eina_Bool ecore_x_image_is_argb32_get(Ecore_X_Image *im) @@ -345,19 +347,19 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im) } EAPI Eina_Bool -ecore_x_image_to_argb_convert(void *src, - int sbpp, - int sbpl, +ecore_x_image_to_argb_convert(void *src, + int sbpp, + int sbpl, Ecore_X_Colormap c, - Ecore_X_Visual v, - int x, - int y, - int w, - int h, - unsigned int *dst, - int dbpl, - int dx, - int dy) + Ecore_X_Visual v, + int x, + int y, + int w, + int h, + unsigned int *dst, + int dbpl, + int dx, + int dy) { Visual *vis = v; XColor *cols = NULL; @@ -411,9 +413,9 @@ ecore_x_image_to_argb_convert(void *src, else if ((vis->class == TrueColor) || (vis->class == DirectColor)) { - if ((vis->red_mask == 0x00ff0000) && - (vis->green_mask == 0x0000ff00) && - (vis->blue_mask == 0x000000ff)) + if ((vis->red_mask == 0x00ff0000) && + (vis->green_mask == 0x0000ff00) && + (vis->blue_mask == 0x000000ff)) mode = argbx888; else if ((vis->red_mask == 0x000000ff) && (vis->green_mask == 0x0000ff00) && diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c index 7459a8b..7812cc2 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c @@ -32,8 +32,8 @@ typedef struct _mwmhints MWMHints; EAPI Eina_Bool -ecore_x_mwm_hints_get(Ecore_X_Window win, - Ecore_X_MWM_Hint_Func *fhint, +ecore_x_mwm_hints_get(Ecore_X_Window win, + Ecore_X_MWM_Hint_Func *fhint, Ecore_X_MWM_Hint_Decor *dhint, Ecore_X_MWM_Hint_Input *ihint) { @@ -86,11 +86,11 @@ ecore_x_mwm_hints_get(Ecore_X_Window win, } return ret; -} /* ecore_x_mwm_hints_get */ +} EAPI void ecore_x_mwm_borderless_set(Ecore_X_Window win, - Eina_Bool borderless) + Eina_Bool borderless) { unsigned int data[5] = {0, 0, 0, 0, 0}; @@ -102,5 +102,5 @@ ecore_x_mwm_borderless_set(Ecore_X_Window win, ECORE_X_ATOM_MOTIF_WM_HINTS, ECORE_X_ATOM_MOTIF_WM_HINTS, 32, (void *)data, 5); -} /* ecore_x_mwm_borderless_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c index 1a6fc9a..9fc428a 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c @@ -4,8 +4,9 @@ #ifdef HAVE_CONFIG_H # include -#endif /* ifdef HAVE_CONFIG_H */ +#endif +#include #include #include @@ -39,17 +40,17 @@ struct _Ecore_X_Startup_Info int silent; }; -static void _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win, - Ecore_X_Atom atom, - const char *str); +static void _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win, + Ecore_X_Atom atom, + const char *str); static char *_ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, - Ecore_X_Atom atom); + Ecore_X_Atom atom); #if 0 /* Unused */ -static int _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info); -static int _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, - char *data); +static int _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info); +static int _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, + char *data); #endif /* if 0 */ -static void _ecore_x_netwm_startup_info_free(void *data); +static void _ecore_x_netwm_startup_info_free(void *data); /* * Convenience macros @@ -76,7 +77,7 @@ ecore_x_netwm_init(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); startup_info = eina_hash_string_superfast_new( _ecore_x_netwm_startup_info_free); -} /* ecore_x_netwm_init */ +} EAPI void ecore_x_netwm_shutdown(void) @@ -86,7 +87,7 @@ ecore_x_netwm_shutdown(void) eina_hash_free(startup_info); startup_info = NULL; -} /* ecore_x_netwm_shutdown */ +} /* * WM identification @@ -94,7 +95,7 @@ ecore_x_netwm_shutdown(void) EAPI void ecore_x_netwm_wm_identify(Ecore_X_Window root, Ecore_X_Window check, - const char *wm_name) + const char *wm_name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, @@ -112,27 +113,27 @@ ecore_x_netwm_wm_identify(Ecore_X_Window root, _ecore_x_window_prop_string_utf8_set(root, ECORE_X_ATOM_NET_WM_NAME, wm_name); -} /* ecore_x_netwm_wm_identify */ +} /* * Set supported atoms */ EAPI void ecore_x_netwm_supported_set(Ecore_X_Window root, - Ecore_X_Atom *supported, - int num) + Ecore_X_Atom *supported, + int num) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_atom_set(root, ECORE_X_ATOM_NET_SUPPORTED, supported, num); -} /* ecore_x_netwm_supported_set */ +} EAPI Eina_Bool ecore_x_netwm_supported_get(Ecore_X_Window root, Ecore_X_Atom **supported, - int *num) + int *num) { int num_ret; @@ -152,36 +153,36 @@ ecore_x_netwm_supported_get(Ecore_X_Window root, *num = num_ret; return EINA_TRUE; -} /* ecore_x_netwm_supported_get */ +} /* * Desktop configuration and status */ EAPI void ecore_x_netwm_desk_count_set(Ecore_X_Window root, - unsigned int n_desks) + unsigned int n_desks) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS, &n_desks, 1); -} /* ecore_x_netwm_desk_count_set */ +} EAPI void -ecore_x_netwm_desk_roots_set(Ecore_X_Window root, +ecore_x_netwm_desk_roots_set(Ecore_X_Window root, Ecore_X_Window *vroots, - unsigned int n_desks) + unsigned int n_desks) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_VIRTUAL_ROOTS, vroots, n_desks); -} /* ecore_x_netwm_desk_roots_set */ +} EAPI void ecore_x_netwm_desk_names_set(Ecore_X_Window root, - const char **names, - unsigned int n_desks) + const char **names, + unsigned int n_desks) { char ss[32], *buf, *t; const char *s; @@ -198,8 +199,8 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root, if (!s) { /* Default to "Desk-" */ - sprintf(ss, "Desk-%d", i); - s = ss; + sprintf(ss, "Desk-%d", i); + s = ss; } l = strlen(s) + 1; @@ -215,12 +216,12 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root, _ATOM_SET_UTF8_STRING_LIST(root, ECORE_X_ATOM_NET_DESKTOP_NAMES, buf, len); free(buf); -} /* ecore_x_netwm_desk_names_set */ +} EAPI void ecore_x_netwm_desk_size_set(Ecore_X_Window root, - unsigned int width, - unsigned int height) + unsigned int width, + unsigned int height) { unsigned int size[2]; @@ -229,24 +230,24 @@ ecore_x_netwm_desk_size_set(Ecore_X_Window root, size[1] = height; ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_GEOMETRY, size, 2); -} /* ecore_x_netwm_desk_size_set */ +} EAPI void ecore_x_netwm_desk_viewports_set(Ecore_X_Window root, - unsigned int *origins, - unsigned int n_desks) + unsigned int *origins, + unsigned int n_desks) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_VIEWPORT, origins, 2 * n_desks); -} /* ecore_x_netwm_desk_viewports_set */ +} EAPI void ecore_x_netwm_desk_layout_set(Ecore_X_Window root, - int orientation, - int columns, - int rows, - int starting_corner) + int orientation, + int columns, + int rows, + int starting_corner) { unsigned int layout[4]; @@ -257,26 +258,26 @@ ecore_x_netwm_desk_layout_set(Ecore_X_Window root, layout[3] = starting_corner; ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_LAYOUT, layout, 4); -} /* ecore_x_netwm_desk_layout_set */ +} EAPI void ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, - unsigned int *areas, - unsigned int n_desks) + unsigned int *areas, + unsigned int n_desks) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_WORKAREA, areas, 4 * n_desks); -} /* ecore_x_netwm_desk_workareas_set */ +} EAPI unsigned int * ecore_x_netwm_desk_workareas_get(Ecore_X_Window root, unsigned int *n_desks) { int ret; unsigned int *areas = NULL; - + if (!root) root = DefaultRootWindow(_ecore_x_disp); - + ret = ecore_x_window_prop_card32_list_get(root, ECORE_X_ATOM_NET_WORKAREA, &areas); if (!areas) @@ -290,16 +291,16 @@ ecore_x_netwm_desk_workareas_get(Ecore_X_Window root, unsigned int *n_desks) EAPI void ecore_x_netwm_desk_current_set(Ecore_X_Window root, - unsigned int desk) + unsigned int desk) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_CURRENT_DESKTOP, &desk, 1); -} /* ecore_x_netwm_desk_current_set */ +} EAPI void ecore_x_netwm_showing_desktop_set(Ecore_X_Window root, - Eina_Bool on) + Eina_Bool on) { unsigned int val; @@ -307,7 +308,7 @@ ecore_x_netwm_showing_desktop_set(Ecore_X_Window root, val = (on) ? 1 : 0; ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_SHOWING_DESKTOP, &val, 1); -} /* ecore_x_netwm_showing_desktop_set */ +} /* * Client status @@ -315,25 +316,25 @@ ecore_x_netwm_showing_desktop_set(Ecore_X_Window root, /* Mapping order */ EAPI void -ecore_x_netwm_client_list_set(Ecore_X_Window root, +ecore_x_netwm_client_list_set(Ecore_X_Window root, Ecore_X_Window *p_clients, - unsigned int n_clients) + unsigned int n_clients) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST, p_clients, n_clients); -} /* ecore_x_netwm_client_list_set */ +} /* Stacking order */ EAPI void -ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, +ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, Ecore_X_Window *p_clients, - unsigned int n_clients) + unsigned int n_clients) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_CLIENT_LIST_STACKING, p_clients, n_clients); -} /* ecore_x_netwm_client_list_stacking_set */ +} EAPI void ecore_x_netwm_client_active_set(Ecore_X_Window root, @@ -342,12 +343,12 @@ ecore_x_netwm_client_active_set(Ecore_X_Window root, LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_ACTIVE_WINDOW, &win, 1); -} /* ecore_x_netwm_client_active_set */ +} EAPI void ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, - int type, + int type, Ecore_X_Window current_win) { XEvent xev; @@ -369,19 +370,19 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, XSendEvent(_ecore_x_disp, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); -} /* ecore_x_netwm_client_active_request */ +} EAPI void ecore_x_netwm_name_set(Ecore_X_Window win, - const char *name) + const char *name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name); -} /* ecore_x_netwm_name_set */ +} EAPI int ecore_x_netwm_name_get(Ecore_X_Window win, - char **name) + char **name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) @@ -389,19 +390,19 @@ ecore_x_netwm_name_get(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_NAME); return 1; -} /* ecore_x_netwm_name_get */ +} EAPI void ecore_x_netwm_startup_id_set(Ecore_X_Window win, - const char *id) + const char *id) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_STARTUP_ID, id); -} /* ecore_x_netwm_startup_id_set */ +} EAPI int ecore_x_netwm_startup_id_get(Ecore_X_Window win, - char **id) + char **id) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (id) @@ -409,20 +410,20 @@ ecore_x_netwm_startup_id_get(Ecore_X_Window win, ECORE_X_ATOM_NET_STARTUP_ID); return 1; -} /* ecore_x_netwm_startup_id_get */ +} EAPI void ecore_x_netwm_visible_name_set(Ecore_X_Window win, - const char *name) + const char *name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME, name); -} /* ecore_x_netwm_visible_name_set */ +} EAPI int ecore_x_netwm_visible_name_get(Ecore_X_Window win, - char **name) + char **name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) @@ -431,20 +432,20 @@ ecore_x_netwm_visible_name_get(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME); return 1; -} /* ecore_x_netwm_visible_name_get */ +} EAPI void ecore_x_netwm_icon_name_set(Ecore_X_Window win, - const char *name) + const char *name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_ICON_NAME, name); -} /* ecore_x_netwm_icon_name_set */ +} EAPI int ecore_x_netwm_icon_name_get(Ecore_X_Window win, - char **name) + char **name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) @@ -453,21 +454,21 @@ ecore_x_netwm_icon_name_get(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_ICON_NAME); return 1; -} /* ecore_x_netwm_icon_name_get */ +} EAPI void ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win, - const char *name) + const char *name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME, name); -} /* ecore_x_netwm_visible_icon_name_set */ +} EAPI int ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, - char **name) + char **name) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) @@ -476,19 +477,19 @@ ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME); return 1; -} /* ecore_x_netwm_visible_icon_name_get */ +} EAPI void ecore_x_netwm_desktop_set(Ecore_X_Window win, - unsigned int desk) + unsigned int desk) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_DESKTOP, &desk, 1); -} /* ecore_x_netwm_desktop_set */ +} EAPI Eina_Bool ecore_x_netwm_desktop_get(Ecore_X_Window win, - unsigned int *desk) + unsigned int *desk) { int ret; unsigned int tmp; @@ -501,17 +502,17 @@ ecore_x_netwm_desktop_get(Ecore_X_Window win, *desk = tmp; return ret == 1 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_desktop_get */ +} /* * _NET_WM_STRUT is deprecated */ EAPI void ecore_x_netwm_strut_set(Ecore_X_Window win, - int left, - int right, - int top, - int bottom) + int left, + int right, + int top, + int bottom) { unsigned int strut[4]; @@ -521,17 +522,17 @@ ecore_x_netwm_strut_set(Ecore_X_Window win, strut[2] = top; strut[3] = bottom; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_STRUT, strut, 4); -} /* ecore_x_netwm_strut_set */ +} /* * _NET_WM_STRUT is deprecated */ EAPI Eina_Bool ecore_x_netwm_strut_get(Ecore_X_Window win, - int *left, - int *right, - int *top, - int *bottom) + int *left, + int *right, + int *top, + int *bottom) { int ret = 0; unsigned int strut[4]; @@ -557,22 +558,22 @@ ecore_x_netwm_strut_get(Ecore_X_Window win, *bottom = strut[3]; return EINA_TRUE; -} /* ecore_x_netwm_strut_get */ +} EAPI void ecore_x_netwm_strut_partial_set(Ecore_X_Window win, - int left, - int right, - int top, - int bottom, - int left_start_y, - int left_end_y, - int right_start_y, - int right_end_y, - int top_start_x, - int top_end_x, - int bottom_start_x, - int bottom_end_x) + int left, + int right, + int top, + int bottom, + int left_start_y, + int left_end_y, + int right_start_y, + int right_end_y, + int top_start_x, + int top_end_x, + int bottom_start_x, + int bottom_end_x) { unsigned int strut[12]; @@ -593,22 +594,22 @@ ecore_x_netwm_strut_partial_set(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_STRUT_PARTIAL, strut, 12); -} /* ecore_x_netwm_strut_partial_set */ +} EAPI Eina_Bool ecore_x_netwm_strut_partial_get(Ecore_X_Window win, - int *left, - int *right, - int *top, - int *bottom, - int *left_start_y, - int *left_end_y, - int *right_start_y, - int *right_end_y, - int *top_start_x, - int *top_end_x, - int *bottom_start_x, - int *bottom_end_x) + int *left, + int *right, + int *top, + int *bottom, + int *left_start_y, + int *left_end_y, + int *right_start_y, + int *right_end_y, + int *top_start_x, + int *top_end_x, + int *bottom_start_x, + int *bottom_end_x) { int ret = 0; unsigned int strut[12]; @@ -658,12 +659,12 @@ ecore_x_netwm_strut_partial_get(Ecore_X_Window win, *bottom_end_x = strut[11]; return EINA_TRUE; -} /* ecore_x_netwm_strut_partial_get */ +} EAPI Eina_Bool ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, - int *num) + int *num) { unsigned int *data, *p; unsigned int *src; @@ -767,14 +768,14 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, free(data); return EINA_TRUE; -} /* ecore_x_netwm_icons_get */ +} EAPI void ecore_x_netwm_icon_geometry_set(Ecore_X_Window win, - int x, - int y, - int width, - int height) + int x, + int y, + int width, + int height) { unsigned int geometry[4]; @@ -787,14 +788,14 @@ ecore_x_netwm_icon_geometry_set(Ecore_X_Window win, ECORE_X_ATOM_NET_WM_ICON_GEOMETRY, geometry, 4); -} /* ecore_x_netwm_icon_geometry_set */ +} EAPI Eina_Bool ecore_x_netwm_icon_geometry_get(Ecore_X_Window win, - int *x, - int *y, - int *width, - int *height) + int *x, + int *y, + int *width, + int *height) { int ret; unsigned int geometry[4]; @@ -820,11 +821,11 @@ ecore_x_netwm_icon_geometry_get(Ecore_X_Window win, *height = geometry[3]; return EINA_TRUE; -} /* ecore_x_netwm_icon_geometry_get */ +} EAPI void ecore_x_netwm_pid_set(Ecore_X_Window win, - int pid) + int pid) { unsigned int tmp; @@ -832,11 +833,11 @@ ecore_x_netwm_pid_set(Ecore_X_Window win, tmp = pid; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_PID, &tmp, 1); -} /* ecore_x_netwm_pid_set */ +} EAPI Eina_Bool ecore_x_netwm_pid_get(Ecore_X_Window win, - int *pid) + int *pid) { int ret; unsigned int tmp; @@ -848,7 +849,7 @@ ecore_x_netwm_pid_get(Ecore_X_Window win, *pid = tmp; return ret == 1 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_pid_get */ +} EAPI void ecore_x_netwm_handled_icons_set(Ecore_X_Window win) @@ -856,7 +857,7 @@ ecore_x_netwm_handled_icons_set(Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_HANDLED_ICONS, NULL, 0); -} /* ecore_x_netwm_handled_icons_set */ +} EAPI Eina_Bool ecore_x_netwm_handled_icons_get(Ecore_X_Window win) @@ -866,20 +867,20 @@ ecore_x_netwm_handled_icons_get(Ecore_X_Window win) ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_HANDLED_ICONS, NULL, 0); return ret == 0 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_handled_icons_get */ +} EAPI void ecore_x_netwm_user_time_set(Ecore_X_Window win, - unsigned int tim) + unsigned int tim) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME, &tim, 1); -} /* ecore_x_netwm_user_time_set */ +} EAPI Eina_Bool ecore_x_netwm_user_time_get(Ecore_X_Window win, - unsigned int *tim) + unsigned int *tim) { int ret; unsigned int tmp; @@ -891,7 +892,7 @@ ecore_x_netwm_user_time_get(Ecore_X_Window win, *tim = tmp; return ret == 1 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_user_time_get */ +} Ecore_X_Window_State _ecore_x_netwm_state_get(Ecore_X_Atom a) @@ -922,12 +923,12 @@ _ecore_x_netwm_state_get(Ecore_X_Atom a) return ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION; else return ECORE_X_WINDOW_STATE_UNKNOWN; -} /* _ecore_x_netwm_state_get */ +} static Ecore_X_Atom _ecore_x_netwm_state_atom_get(Ecore_X_Window_State s) { - switch(s) + switch (s) { case ECORE_X_WINDOW_STATE_MODAL: return ECORE_X_ATOM_NET_WM_STATE_MODAL; @@ -967,13 +968,13 @@ _ecore_x_netwm_state_atom_get(Ecore_X_Window_State s) default: return 0; - } /* switch */ -} /* _ecore_x_netwm_state_atom_get */ + } +} EAPI void -ecore_x_netwm_window_state_set(Ecore_X_Window win, +ecore_x_netwm_window_state_set(Ecore_X_Window win, Ecore_X_Window_State *state, - unsigned int num) + unsigned int num) { Ecore_X_Atom *set; unsigned int i; @@ -995,12 +996,12 @@ ecore_x_netwm_window_state_set(Ecore_X_Window win, ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_NET_WM_STATE, set, num); free(set); -} /* ecore_x_netwm_window_state_set */ +} EAPI Eina_Bool -ecore_x_netwm_window_state_get(Ecore_X_Window win, +ecore_x_netwm_window_state_get(Ecore_X_Window win, Ecore_X_Window_State **state, - unsigned int *num) + unsigned int *num) { int num_ret, i; Ecore_X_Atom *atoms; @@ -1030,7 +1031,7 @@ ecore_x_netwm_window_state_get(Ecore_X_Window win, free(atoms); return EINA_TRUE; -} /* ecore_x_netwm_window_state_get */ +} static Ecore_X_Window_Type _ecore_x_netwm_window_type_type_get(Ecore_X_Atom atom) @@ -1065,7 +1066,7 @@ _ecore_x_netwm_window_type_type_get(Ecore_X_Atom atom) return ECORE_X_WINDOW_TYPE_DND; else return ECORE_X_WINDOW_TYPE_UNKNOWN; -} /* _ecore_x_netwm_window_type_type_get */ +} static Ecore_X_Atom _ecore_x_netwm_window_type_atom_get(Ecore_X_Window_Type type) @@ -1116,15 +1117,15 @@ _ecore_x_netwm_window_type_atom_get(Ecore_X_Window_Type type) default: return 0; - } /* switch */ -} /* _ecore_x_netwm_window_type_atom_get */ + } +} /* * FIXME: We should set WM_TRANSIENT_FOR if type is ECORE_X_WINDOW_TYPE_TOOLBAR * , ECORE_X_WINDOW_TYPE_MENU or ECORE_X_WINDOW_TYPE_DIALOG */ EAPI void -ecore_x_netwm_window_type_set(Ecore_X_Window win, +ecore_x_netwm_window_type_set(Ecore_X_Window win, Ecore_X_Window_Type type) { Ecore_X_Atom atom; @@ -1133,11 +1134,11 @@ ecore_x_netwm_window_type_set(Ecore_X_Window win, atom = _ecore_x_netwm_window_type_atom_get(type); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_NET_WM_WINDOW_TYPE, &atom, 1); -} /* ecore_x_netwm_window_type_set */ +} /* FIXME: Maybe return 0 on some conditions? */ EAPI Eina_Bool -ecore_x_netwm_window_type_get(Ecore_X_Window win, +ecore_x_netwm_window_type_get(Ecore_X_Window win, Ecore_X_Window_Type *type) { int num; @@ -1158,10 +1159,10 @@ ecore_x_netwm_window_type_get(Ecore_X_Window win, return EINA_TRUE; return EINA_FALSE; -} /* ecore_x_netwm_window_type_get */ +} EAPI int -ecore_x_netwm_window_types_get(Ecore_X_Window win, +ecore_x_netwm_window_types_get(Ecore_X_Window win, Ecore_X_Window_Type **types) { int num, i; @@ -1196,7 +1197,7 @@ ecore_x_netwm_window_types_get(Ecore_X_Window win, free(atoms2); return num; -} /* ecore_x_netwm_window_types_get */ +} static Ecore_X_Atom _ecore_x_netwm_action_atom_get(Ecore_X_Action action) @@ -1241,8 +1242,8 @@ _ecore_x_netwm_action_atom_get(Ecore_X_Action action) default: return 0; - } /* switch */ -} /* _ecore_x_netwm_action_atom_get */ + } +} /* FIXME: Get complete list */ EAPI Eina_Bool @@ -1272,13 +1273,13 @@ ecore_x_netwm_allowed_action_isset(Ecore_X_Window win, free(atoms); return ret; -} /* ecore_x_netwm_allowed_action_isset */ +} /* FIXME: Set complete list */ EAPI void -ecore_x_netwm_allowed_action_set(Ecore_X_Window win, +ecore_x_netwm_allowed_action_set(Ecore_X_Window win, Ecore_X_Action *action, - unsigned int num) + unsigned int num) { Ecore_X_Atom *set; unsigned int i; @@ -1304,12 +1305,12 @@ ecore_x_netwm_allowed_action_set(Ecore_X_Window win, num); free(set); -} /* ecore_x_netwm_allowed_action_set */ +} EAPI Eina_Bool -ecore_x_netwm_allowed_action_get(Ecore_X_Window win, +ecore_x_netwm_allowed_action_get(Ecore_X_Window win, Ecore_X_Action **action, - unsigned int *num) + unsigned int *num) { int num_ret, i; Ecore_X_Atom *atoms; @@ -1341,20 +1342,20 @@ ecore_x_netwm_allowed_action_get(Ecore_X_Window win, free(atoms); return EINA_TRUE; -} /* ecore_x_netwm_allowed_action_get */ +} EAPI void ecore_x_netwm_opacity_set(Ecore_X_Window win, - unsigned int opacity) + unsigned int opacity) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY, &opacity, 1); -} /* ecore_x_netwm_opacity_set */ +} EAPI Eina_Bool ecore_x_netwm_opacity_get(Ecore_X_Window win, - unsigned int *opacity) + unsigned int *opacity) { int ret; unsigned int tmp; @@ -1366,14 +1367,14 @@ ecore_x_netwm_opacity_get(Ecore_X_Window win, *opacity = tmp; return ret == 1 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_opacity_get */ +} EAPI void ecore_x_netwm_frame_size_set(Ecore_X_Window win, - int fl, - int fr, - int ft, - int fb) + int fl, + int fr, + int ft, + int fb) { unsigned int frames[4]; @@ -1386,14 +1387,14 @@ ecore_x_netwm_frame_size_set(Ecore_X_Window win, ECORE_X_ATOM_NET_FRAME_EXTENTS, frames, 4); -} /* ecore_x_netwm_frame_size_set */ +} EAPI Eina_Bool ecore_x_netwm_frame_size_get(Ecore_X_Window win, - int *fl, - int *fr, - int *ft, - int *fb) + int *fl, + int *fr, + int *ft, + int *fb) { int ret = 0; unsigned int frames[4]; @@ -1419,10 +1420,10 @@ ecore_x_netwm_frame_size_get(Ecore_X_Window win, *fb = frames[3]; return EINA_TRUE; -} /* ecore_x_netwm_frame_size_get */ +} EAPI Eina_Bool -ecore_x_netwm_sync_counter_get(Ecore_X_Window win, +ecore_x_netwm_sync_counter_get(Ecore_X_Window win, Ecore_X_Sync_Counter *counter) { int ret; @@ -1439,7 +1440,7 @@ ecore_x_netwm_sync_counter_get(Ecore_X_Window win, *counter = tmp; return ret == 1 ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_netwm_sync_counter_get */ +} EAPI void ecore_x_netwm_ping_send(Ecore_X_Window win) @@ -1462,11 +1463,11 @@ ecore_x_netwm_ping_send(Ecore_X_Window win) xev.xclient.data.l[4] = 0; XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); -} /* ecore_x_netwm_ping_send */ +} EAPI void ecore_x_netwm_sync_request_send(Ecore_X_Window win, - unsigned int serial) + unsigned int serial) { XSyncValue value; XEvent xev; @@ -1489,14 +1490,14 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win, xev.xclient.data.l[4] = 0; XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); -} /* ecore_x_netwm_sync_request_send */ +} EAPI void -ecore_x_netwm_state_request_send(Ecore_X_Window win, - Ecore_X_Window root, +ecore_x_netwm_state_request_send(Ecore_X_Window win, + Ecore_X_Window root, Ecore_X_Window_State s1, Ecore_X_Window_State s2, - Eina_Bool set) + Eina_Bool set) { XEvent xev; @@ -1524,12 +1525,12 @@ ecore_x_netwm_state_request_send(Ecore_X_Window win, XSendEvent(_ecore_x_disp, root, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); -} /* ecore_x_netwm_state_request_send */ +} EAPI void ecore_x_netwm_desktop_request_send(Ecore_X_Window win, Ecore_X_Window root, - unsigned int desktop) + unsigned int desktop) { XEvent xev; @@ -1551,11 +1552,11 @@ ecore_x_netwm_desktop_request_send(Ecore_X_Window win, XSendEvent(_ecore_x_disp, root, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); -} /* ecore_x_netwm_desktop_request_send */ +} int _ecore_x_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__, - char *data __UNUSED__) + char *data __UNUSED__) { #if 0 Ecore_X_Startup_Info *info; @@ -1600,11 +1601,11 @@ _ecore_x_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__, #endif /* if 0 */ return 1; -} /* _ecore_x_netwm_startup_info_begin */ +} int _ecore_x_netwm_startup_info(Ecore_X_Window win __UNUSED__, - char *data __UNUSED__) + char *data __UNUSED__) { #if 0 Ecore_X_Startup_Info *info; @@ -1639,26 +1640,26 @@ _ecore_x_netwm_startup_info(Ecore_X_Window win __UNUSED__, #endif /* if 0 */ return 1; -} /* _ecore_x_netwm_startup_info */ +} /* * Set UTF-8 string property */ static void _ecore_x_window_prop_string_utf8_set(Ecore_X_Window win, - Ecore_X_Atom atom, - const char *str) + Ecore_X_Atom atom, + const char *str) { XChangeProperty(_ecore_x_disp, win, atom, ECORE_X_ATOM_UTF8_STRING, 8, PropModeReplace, (unsigned char *)str, strlen(str)); -} /* _ecore_x_window_prop_string_utf8_set */ +} /* * Get UTF-8 string property */ static char * _ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, - Ecore_X_Atom atom) + Ecore_X_Atom atom) { char *str; unsigned char *prop_ret; @@ -1685,7 +1686,7 @@ _ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, XFree(prop_ret); return str; -} /* _ecore_x_window_prop_string_utf8_get */ +} #if 0 /* Unused */ /* @@ -1758,19 +1759,19 @@ _ecore_x_netwm_startup_info_process(Ecore_X_Startup_Info *info) else { /* Discard buffer */ - info->length = 0; - info->buffer[0] = 0; + info->length = 0; + info->buffer[0] = 0; } return 1; -} /* _ecore_x_netwm_startup_info_process */ +} /* * Parse startup info */ static int _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, - char *data) + char *data) { while (*data) { @@ -1780,7 +1781,8 @@ _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, char value[1024]; /* Skip space */ - while (*data == ' ') data++; + while (*data == ' ') + data++; /* Get key */ key = data; data = strchr(key, '='); @@ -1920,7 +1922,7 @@ _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info, return 0; return 1; -} /* _ecore_x_netwm_startup_info_parse */ +} #endif /* if 0 */ @@ -1958,7 +1960,7 @@ _ecore_x_netwm_startup_info_free(void *data) free(info->wmclass); free(info); -} /* _ecore_x_netwm_startup_info_free */ +} /* * Is screen composited? @@ -1981,10 +1983,10 @@ ecore_x_screen_is_composited(int screen) win = XGetSelectionOwner(_ecore_x_disp, atom); return (win != None) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_screen_is_composited */ +} EAPI void -ecore_x_screen_is_composited_set(int screen, +ecore_x_screen_is_composited_set(int screen, Ecore_X_Window win) { static Ecore_X_Atom atom = None; @@ -1999,5 +2001,5 @@ ecore_x_screen_is_composited_set(int screen, return; XSetSelectionOwner(_ecore_x_disp, atom, win, _ecore_x_event_last_time); -} /* ecore_x_screen_is_composited_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c index b81d06c..7b13615 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c @@ -26,9 +26,9 @@ */ EAPI Ecore_X_Pixmap ecore_x_pixmap_new(Ecore_X_Window win, - int w, - int h, - int dep) + int w, + int h, + int dep) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) @@ -38,7 +38,7 @@ ecore_x_pixmap_new(Ecore_X_Window win, dep = DefaultDepth(_ecore_x_disp, DefaultScreen(_ecore_x_disp)); return XCreatePixmap(_ecore_x_disp, win, w, h, dep); -} /* ecore_x_pixmap_new */ +} /** * Deletes the reference to the given pixmap. @@ -54,7 +54,7 @@ ecore_x_pixmap_free(Ecore_X_Pixmap pmap) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreePixmap(_ecore_x_disp, pmap); -} /* ecore_x_pixmap_free */ +} /** * Pastes a rectangular area of the given pixmap onto the given drawable. @@ -71,19 +71,19 @@ ecore_x_pixmap_free(Ecore_X_Pixmap pmap) * @ingroup Ecore_X_Pixmap_Group */ EAPI void -ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, +ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, Ecore_X_Drawable dest, - Ecore_X_GC gc, - int sx, - int sy, - int w, - int h, - int dx, - int dy) + Ecore_X_GC gc, + int sx, + int sy, + int w, + int h, + int dx, + int dy) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XCopyArea(_ecore_x_disp, pmap, dest, gc, sx, sy, w, h, dx, dy); -} /* ecore_x_pixmap_paste */ +} /** * Retrieves the size of the given pixmap. @@ -96,15 +96,15 @@ ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, */ EAPI void ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (pmap) ecore_x_drawable_geometry_get(pmap, x, y, w, h); -} /* ecore_x_pixmap_geometry_get */ +} /** * Retrieves the depth of the given pixmap. @@ -117,5 +117,5 @@ ecore_x_pixmap_depth_get(Ecore_X_Pixmap pmap) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_drawable_depth_get(pmap); -} /* ecore_x_pixmap_depth_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c index a6bafb6..816f8d5 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c @@ -8,6 +8,10 @@ #include "ecore_x_private.h" #include "ecore_x_randr.h" +#include +#include +#include +#include #define Ecore_X_Randr_None 0 #ifdef ECORE_XRANDR @@ -18,7 +22,8 @@ root) ((screen = \ XRRRootToScreen(_ecore_x_disp, \ root)) != -1) -#define RANDR_CHECK_1_1_RET(ret) if(_randr_version < RANDR_1_1) return ret +#define RANDR_CHECK_1_1_RET(ret) if (_randr_version < RANDR_1_1) \ + return ret extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display * dpy, @@ -44,7 +49,7 @@ ecore_x_randr_screen_primary_output_orientations_get(Ecore_X_Window root) #else /* ifdef ECORE_XRANDR */ return Ecore_X_Randr_None; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_orientations_get */ +} /* * @param root window which's primary output will be queried @@ -61,7 +66,7 @@ ecore_x_randr_screen_primary_output_orientation_get(Ecore_X_Window root) #else /* ifdef ECORE_XRANDR */ return Ecore_X_Randr_None; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_orientation_get */ +} /* * @brief sets a given screen's primary output's orientation @@ -95,7 +100,7 @@ ecore_x_randr_screen_primary_output_orientation_set( #else /* ifdef ECORE_XRANDR */ return EINA_FALSE; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_orientation_set */ +} /* * @brief gets a screen's primary output's possible sizes @@ -105,7 +110,7 @@ ecore_x_randr_screen_primary_output_orientation_set( */ EAPI Ecore_X_Randr_Screen_Size_MM * ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, - int *num) + int *num) { #ifdef ECORE_XRANDR Ecore_X_Randr_Screen_Size_MM *ret = NULL; @@ -135,7 +140,7 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, #else /* ifdef ECORE_XRANDR */ return NULL; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_sizes_get */ +} /* * @brief get the current set size of a given screen's primary output @@ -148,11 +153,11 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, */ EAPI void ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, - int *w, - int *h, - int *w_mm, - int *h_mm, - int *size_index) + int *w, + int *h, + int *w_mm, + int *h_mm, + int *size_index) { #ifdef ECORE_XRANDR XRRScreenSize *sizes; @@ -192,7 +197,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, XRRFreeScreenConfigInfo(sc); #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_current_size_get */ +} /* * @brief sets a given screen's primary output size, but disables all other outputs at the same time @@ -202,18 +207,16 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, */ EAPI Eina_Bool ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, - int size_index) + int size_index) { #ifdef ECORE_XRANDR XRRScreenConfiguration *sc = NULL; - XRRScreenSize *sizes; Eina_Bool ret = EINA_FALSE; int nsizes = 0; if (size_index >= 0 && _ecore_x_randr_root_validate(root)) { - sizes = - XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, + XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &nsizes); if (size_index < nsizes) @@ -235,7 +238,7 @@ ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, #else /* ifdef ECORE_XRANDR */ return EINA_FALSE; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_size_set */ +} /* * @param root window which's primary output will be queried @@ -261,7 +264,7 @@ ecore_x_randr_screen_primary_output_current_refresh_rate_get( #else /* ifdef ECORE_XRANDR */ return 0.0; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_current_refresh_rate_get */ +} /* * @param root window which's primary output will be queried @@ -270,8 +273,8 @@ ecore_x_randr_screen_primary_output_current_refresh_rate_get( */ EAPI Ecore_X_Randr_Refresh_Rate * ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, - int size_index, - int *num) + int size_index, + int *num) { #ifdef ECORE_XRANDR Ecore_X_Randr_Refresh_Rate *ret = NULL, *rates = NULL; @@ -293,7 +296,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, #else /* ifdef ECORE_XRANDR */ return NULL; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_refresh_rates_get */ +} //>= 1.1 /* @@ -306,7 +309,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, EAPI Eina_Bool ecore_x_randr_screen_primary_output_refresh_rate_set( Ecore_X_Window root, - int size_index, + int size_index, Ecore_X_Randr_Refresh_Rate rate) { @@ -328,5 +331,5 @@ ecore_x_randr_screen_primary_output_refresh_rate_set( #else /* ifdef ECORE_XRANDR */ return EINA_FALSE; #endif /* ifdef ECORE_XRANDR */ -} /* ecore_x_randr_screen_primary_output_refresh_rate_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c index fb607d1..38218a5 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c @@ -8,6 +8,10 @@ #include "ecore_x_private.h" #include "ecore_x_randr.h" +#include +#include +#include +#include #define Ecore_X_Randr_None (Ecore_X_Randr_Crtc)0 #define Ecore_X_Randr_Unset (Ecore_X_Randr_Crtc) - 1 @@ -19,7 +23,8 @@ #define RANDR_VALIDATE_ROOT(screen, root) \ ((screen = XRRRootToScreen(_ecore_x_disp, root)) != -1) -#define RANDR_CHECK_1_2_RET(ret) if(_randr_version < RANDR_1_2) return ret +#define RANDR_CHECK_1_2_RET(ret) if (_randr_version < RANDR_1_2) \ + return ret #define RANDR_PROPERTY_EDID "EDID" #define RANDR_PROPERTY_BACKLIGHT "Backlight" @@ -45,7 +50,7 @@ extern int _randr_version; */ EAPI void ecore_x_randr_events_select(Ecore_X_Window win, - Eina_Bool on) + Eina_Bool on) { #ifdef ECORE_XRANDR int mask; @@ -73,7 +78,7 @@ ecore_x_randr_events_select(Ecore_X_Window win, * @return in case it is found EINA_TRUE will be returned. Else EINA_FALSE is returned. */ static inline Eina_Bool -_ecore_x_randr_crtc_validate(Ecore_X_Window root, +_ecore_x_randr_crtc_validate(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) { #ifdef ECORE_XRANDR @@ -108,7 +113,7 @@ _ecore_x_randr_crtc_validate(Ecore_X_Window root, } Eina_Bool -_ecore_x_randr_output_validate(Ecore_X_Window root, +_ecore_x_randr_output_validate(Ecore_X_Window root, Ecore_X_Randr_Output output) { #ifdef ECORE_XRANDR @@ -139,7 +144,7 @@ _ecore_x_randr_output_validate(Ecore_X_Window root, } static inline Eina_Bool -_ecore_x_randr_mode_validate(Ecore_X_Window root, +_ecore_x_randr_mode_validate(Ecore_X_Window root, Ecore_X_Randr_Mode mode) { #ifdef ECORE_XRANDR @@ -175,10 +180,10 @@ _ecore_x_randr_mode_validate(Ecore_X_Window root, */ EAPI void ecore_x_randr_screen_current_size_get(Ecore_X_Window root, - int *w, - int *h, - int *w_mm, - int *h_mm) + int *w, + int *h, + int *w_mm, + int *h_mm) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -211,10 +216,10 @@ ecore_x_randr_screen_current_size_get(Ecore_X_Window root, */ EAPI void ecore_x_randr_screen_size_range_get(Ecore_X_Window root, - int *wmin, - int *hmin, - int *wmax, - int *hmax) + int *wmin, + int *hmin, + int *wmax, + int *hmax) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -249,10 +254,10 @@ ecore_x_randr_screen_size_range_get(Ecore_X_Window root, */ EAPI Eina_Bool ecore_x_randr_screen_current_size_set(Ecore_X_Window root, - int w, - int h, - int w_mm, - int h_mm) + int w, + int h, + int w_mm, + int h_mm) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(EINA_FALSE); @@ -281,14 +286,14 @@ ecore_x_randr_screen_current_size_set(Ecore_X_Window root, if (h <= 0) h = DisplayHeight(_ecore_x_disp, scr); - if(w_mm <= 0) + if (w_mm <= 0) w_mm = (int)(((double)(DisplayWidthMM(_ecore_x_disp, scr) / (double)DisplayWidth(_ecore_x_disp, scr))) * (double)w); - if(h_mm <= 0) + if (h_mm <= 0) h_mm = (int)(((double)(DisplayHeightMM(_ecore_x_disp, scr) / @@ -310,7 +315,7 @@ ecore_x_randr_screen_current_size_set(Ecore_X_Window root, */ EAPI Ecore_X_Randr_Mode_Info ** ecore_x_randr_modes_info_get(Ecore_X_Window root, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -353,7 +358,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, } else { - while(i > 0) + while (i > 0) free(ret[--i]); free(ret); ret = NULL; @@ -381,7 +386,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, * @return mode's detailed information */ EAPI Ecore_X_Randr_Mode_Info * -ecore_x_randr_mode_info_get(Ecore_X_Window root, +ecore_x_randr_mode_info_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode) { #ifdef ECORE_XRANDR @@ -461,7 +466,7 @@ ecore_x_randr_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info) */ EAPI Ecore_X_Randr_Crtc * ecore_x_randr_crtcs_get(Ecore_X_Window root, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -488,7 +493,7 @@ ecore_x_randr_crtcs_get(Ecore_X_Window root, EAPI Ecore_X_Randr_Output * ecore_x_randr_outputs_get(Ecore_X_Window root, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -523,9 +528,9 @@ ecore_x_randr_outputs_get(Ecore_X_Window root, * @param num number of outputs referenced by given CRTC */ EAPI Ecore_X_Randr_Output * -ecore_x_randr_crtc_outputs_get(Ecore_X_Window root, +ecore_x_randr_crtc_outputs_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -567,9 +572,9 @@ ecore_x_randr_crtc_outputs_get(Ecore_X_Window root, * @param num number of possible outputs referenced by given CRTC */ EAPI Ecore_X_Randr_Output * -ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root, +ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -581,7 +586,7 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root, crtc) && (res = _ecore_x_randr_get_screen_resources (_ecore_x_disp, root))) { - if((crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc))) + if ((crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc))) { if ((ret = malloc(sizeof(Ecore_X_Randr_Output) * crtc_info->npossible))) @@ -605,12 +610,12 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root, } EAPI void -ecore_x_randr_crtc_geometry_get(Ecore_X_Window root, +ecore_x_randr_crtc_geometry_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -652,10 +657,10 @@ ecore_x_randr_crtc_geometry_get(Ecore_X_Window root, * @return EINA_TRUE if position could be successfully be altered. */ EAPI Eina_Bool -ecore_x_randr_crtc_pos_set(Ecore_X_Window root, +ecore_x_randr_crtc_pos_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int x, - int y) + int x, + int y) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(EINA_FALSE); @@ -706,7 +711,7 @@ ecore_x_randr_crtc_pos_set(Ecore_X_Window root, * Ecore_X_Randr_Unset */ EAPI Ecore_X_Randr_Mode -ecore_x_randr_crtc_mode_get(Ecore_X_Window root, +ecore_x_randr_crtc_mode_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) { #ifdef ECORE_XRANDR @@ -746,11 +751,11 @@ ecore_x_randr_crtc_mode_get(Ecore_X_Window root, * @return EINA_TRUE if mode setting was successful. Else EINA_FALSE */ EAPI Eina_Bool -ecore_x_randr_crtc_mode_set(Ecore_X_Window root, - Ecore_X_Randr_Crtc crtc, +ecore_x_randr_crtc_mode_set(Ecore_X_Window root, + Ecore_X_Randr_Crtc crtc, Ecore_X_Randr_Output *outputs, - int noutputs, - Ecore_X_Randr_Mode mode) + int noutputs, + Ecore_X_Randr_Mode mode) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(EINA_FALSE); @@ -772,10 +777,10 @@ ecore_x_randr_crtc_mode_set(Ecore_X_Window root, } EAPI void -ecore_x_randr_crtc_size_get(Ecore_X_Window root, +ecore_x_randr_crtc_size_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int *w, - int *h) + int *w, + int *h) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -784,7 +789,7 @@ ecore_x_randr_crtc_size_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Refresh_Rate -ecore_x_randr_crtc_refresh_rate_get(Ecore_X_Window root, +ecore_x_randr_crtc_refresh_rate_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, Ecore_X_Randr_Mode mode) { @@ -824,7 +829,7 @@ ecore_x_randr_crtc_refresh_rate_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Orientation -ecore_x_randr_crtc_orientations_get(Ecore_X_Window root, +ecore_x_randr_crtc_orientations_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) { #ifdef ECORE_XRANDR @@ -855,7 +860,7 @@ ecore_x_randr_crtc_orientations_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Orientation -ecore_x_randr_crtc_orientation_get(Ecore_X_Window root, +ecore_x_randr_crtc_orientation_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) { #ifdef ECORE_XRANDR @@ -886,8 +891,8 @@ ecore_x_randr_crtc_orientation_get(Ecore_X_Window root, } EAPI Eina_Bool -ecore_x_randr_crtc_orientation_set(Ecore_X_Window root, - Ecore_X_Randr_Crtc crtc, +ecore_x_randr_crtc_orientation_set(Ecore_X_Window root, + Ecore_X_Randr_Crtc crtc, Ecore_X_Randr_Orientation orientation) { #ifdef ECORE_XRANDR @@ -913,10 +918,10 @@ ecore_x_randr_crtc_orientation_set(Ecore_X_Window root, } EAPI void -ecore_x_randr_crtc_pos_get(Ecore_X_Window root, +ecore_x_randr_crtc_pos_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, - int *x, - int *y) + int *x, + int *y) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -926,7 +931,7 @@ ecore_x_randr_crtc_pos_get(Ecore_X_Window root, } EAPI Eina_Bool -ecore_x_randr_crtc_clone_set(Ecore_X_Window root, +ecore_x_randr_crtc_clone_set(Ecore_X_Window root, Ecore_X_Randr_Crtc original, Ecore_X_Randr_Crtc clon) { @@ -993,13 +998,13 @@ ecore_x_randr_crtc_clone_set(Ecore_X_Window root, * EINA_FALSE */ EAPI Eina_Bool -ecore_x_randr_crtc_settings_set(Ecore_X_Window root, - Ecore_X_Randr_Crtc crtc, - Ecore_X_Randr_Output *outputs, - int noutputs, - int x, - int y, - Ecore_X_Randr_Mode mode, +ecore_x_randr_crtc_settings_set(Ecore_X_Window root, + Ecore_X_Randr_Crtc crtc, + Ecore_X_Randr_Output *outputs, + int noutputs, + int x, + int y, + Ecore_X_Randr_Mode mode, Ecore_X_Randr_Orientation orientation) { #ifdef ECORE_XRANDR @@ -1059,17 +1064,17 @@ ecore_x_randr_crtc_settings_set(Ecore_X_Window root, * @brief sets a CRTC relative to another one. * @param crtc_r1 the CRTC to be positioned. * @param crtc_r2 the CRTC the position should be relative to - * @param position the relation between the crtcs + * @param policy the relation between the crtcs * @param alignment in case CRTCs size differ, aligns CRTC1 accordingly at CRTC2's * borders * @return EINA_TRUE if crtc could be successfully positioned. EINA_FALSE if * repositioning failed or if position of new crtc would be out of given screen's min/max bounds. */ EAPI Eina_Bool -ecore_x_randr_crtc_pos_relative_set(Ecore_X_Window root, - Ecore_X_Randr_Crtc crtc_r1, - Ecore_X_Randr_Crtc crtc_r2, - Ecore_X_Randr_Output_Policy policy, +ecore_x_randr_crtc_pos_relative_set(Ecore_X_Window root, + Ecore_X_Randr_Crtc crtc_r1, + Ecore_X_Randr_Crtc crtc_r2, + Ecore_X_Randr_Output_Policy policy, Ecore_X_Randr_Relative_Alignment alignment) { #ifdef ECORE_XRANDR @@ -1360,10 +1365,10 @@ ecore_x_randr_crtc_pos_relative_set(Ecore_X_Window root, } EAPI Ecore_X_Randr_Mode * -ecore_x_randr_output_modes_get(Ecore_X_Window root, +ecore_x_randr_output_modes_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - int *num, - int *npreferred) + int *num, + int *npreferred) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -1401,9 +1406,9 @@ ecore_x_randr_output_modes_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Crtc * -ecore_x_randr_output_possible_crtcs_get(Ecore_X_Window root, +ecore_x_randr_output_possible_crtcs_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -1441,9 +1446,9 @@ ecore_x_randr_output_possible_crtcs_get(Ecore_X_Window root, * @param num number of possible clones */ EAPI Ecore_X_Randr_Output * -ecore_x_randr_output_clones_get(Ecore_X_Window root, +ecore_x_randr_output_clones_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - int *num) + int *num) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -1474,7 +1479,7 @@ ecore_x_randr_output_clones_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Crtc -ecore_x_randr_output_crtc_get(Ecore_X_Window root, +ecore_x_randr_output_crtc_get(Ecore_X_Window root, Ecore_X_Randr_Output output) { #ifdef ECORE_XRANDR @@ -1509,9 +1514,9 @@ ecore_x_randr_output_crtc_get(Ecore_X_Window root, * @return name of the output as reported by X */ EAPI char * -ecore_x_randr_output_name_get(Ecore_X_Window root, +ecore_x_randr_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - int *len) + int *len) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -1532,10 +1537,10 @@ ecore_x_randr_output_name_get(Ecore_X_Window root, * *len = output_info->nameLen; * */ - if ((ret = strdup(output_info->name)) && len) - *len = strlen(ret); + if ((ret = strdup(output_info->name)) && len) + *len = strlen(ret); - XRRFreeOutputInfo(output_info); + XRRFreeOutputInfo(output_info); } if (res) @@ -1554,10 +1559,10 @@ ecore_x_randr_output_name_get(Ecore_X_Window root, * @param h height of given mode in px */ EAPI void -ecore_x_randr_mode_size_get(Ecore_X_Window root, +ecore_x_randr_mode_size_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode, - int *w, - int *h) + int *w, + int *h) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -1598,9 +1603,9 @@ ecore_x_randr_mode_size_get(Ecore_X_Window root, * @param length length of the byte-array. If NULL, request will fail. */ EAPI unsigned char * -ecore_x_randr_output_edid_get(Ecore_X_Window root, +ecore_x_randr_output_edid_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - unsigned long *length) + unsigned long *length) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(NULL); @@ -1613,18 +1618,18 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root, if (!length || !_ecore_x_randr_output_validate(root, output)) return NULL; - if(XRRGetOutputProperty (_ecore_x_disp, output, name, - 0, 100, False, False, - AnyPropertyType, - &actual_type, &actual_format, - &nitems, &bytes_after, &prop_data) == Success) + if (XRRGetOutputProperty (_ecore_x_disp, output, name, + 0, 100, False, False, + AnyPropertyType, + &actual_type, &actual_format, + &nitems, &bytes_after, &prop_data) == Success) { if (actual_type == XA_INTEGER && actual_format == 8) { if ((ret = malloc(nitems * sizeof(unsigned char)))) { - if(length && - (memcpy(ret, prop_data, (nitems * sizeof(unsigned char))))) + if (length && + (memcpy(ret, prop_data, (nitems * sizeof(unsigned char))))) *length = nitems; return ret; @@ -1639,7 +1644,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root, } EAPI Ecore_X_Randr_Connection_Status -ecore_x_randr_output_connection_status_get(Ecore_X_Window root, +ecore_x_randr_output_connection_status_get(Ecore_X_Window root, Ecore_X_Randr_Output output) { #ifdef ECORE_XRANDR @@ -1669,10 +1674,10 @@ ecore_x_randr_output_connection_status_get(Ecore_X_Window root, } EAPI void -ecore_x_randr_output_size_mm_get(Ecore_X_Window root, +ecore_x_randr_output_size_mm_get(Ecore_X_Window root, Ecore_X_Randr_Output output, - int *w_mm, - int *h_mm) + int *w_mm, + int *h_mm) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -1701,11 +1706,11 @@ ecore_x_randr_output_size_mm_get(Ecore_X_Window root, } EAPI Eina_Bool -ecore_x_randr_move_all_crtcs_but(Ecore_X_Window root, +ecore_x_randr_move_all_crtcs_but(Ecore_X_Window root, const Ecore_X_Randr_Crtc *not_moved, - int nnot_moved, - int dx, - int dy) + int nnot_moved, + int dx, + int dy) { #ifdef ECORE_XRANDR Ecore_X_Randr_Crtc *crtcs_to_be_moved = NULL; @@ -1754,11 +1759,11 @@ ecore_x_randr_move_all_crtcs_but(Ecore_X_Window root, * @return EINA_TRUE if all crtcs could be moved successfully. */ EAPI Eina_Bool -ecore_x_randr_move_crtcs(Ecore_X_Window root, +ecore_x_randr_move_crtcs(Ecore_X_Window root, const Ecore_X_Randr_Crtc *crtcs, - int ncrtc, - int dx, - int dy) + int ncrtc, + int dx, + int dy) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(EINA_FALSE); @@ -1821,18 +1826,18 @@ ecore_x_randr_move_crtcs(Ecore_X_Window root, { //something went wrong, let's try to move the already moved crtcs //back. - while ((i--) >= 0) - { - if (crtc_info[i]) - ecore_x_randr_crtc_settings_set(root, - crtcs[i], - NULL, - Ecore_X_Randr_Unset, - (crtc_info[i]->x - dx), - (crtc_info[i]->y - dy), - crtc_info[i]->mode, - crtc_info[i]->rotation); - } + while ((i--) >= 0) + { + if (crtc_info[i]) + ecore_x_randr_crtc_settings_set(root, + crtcs[i], + NULL, + Ecore_X_Randr_Unset, + (crtc_info[i]->x - dx), + (crtc_info[i]->y - dy), + crtc_info[i]->mode, + crtc_info[i]->rotation); + } } for (i = 0; i < ncrtc; i++) @@ -1923,7 +1928,7 @@ ecore_x_randr_screen_reset(Ecore_X_Window root) EAPI void ecore_x_randr_screen_backlight_level_set(Ecore_X_Window root, - double level) + double level) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(); @@ -1965,6 +1970,26 @@ ecore_x_randr_screen_backlight_level_set(Ecore_X_Window root, } /* + * @brief check if a backlight is available + * @return whether a blacklight is available + */ + +EAPI Eina_Bool +ecore_x_randr_output_backlight_available(void) +{ +#ifdef ECORE_XRANDR + RANDR_CHECK_1_2_RET(-1); + Atom _backlight; + + _backlight = XInternAtom(_ecore_x_disp, RANDR_PROPERTY_BACKLIGHT, True); + + return (_backlight == None) ? EINA_FALSE : EINA_TRUE; + +#endif + return EINA_FALSE; +} + +/* * @brief get the backlight level of the given output * @param root window which's screen should be queried * @param output from which the backlight level should be retrieved @@ -1972,7 +1997,7 @@ ecore_x_randr_screen_backlight_level_set(Ecore_X_Window root, */ EAPI double -ecore_x_randr_output_backlight_level_get(Ecore_X_Window root, +ecore_x_randr_output_backlight_level_get(Ecore_X_Window root, Ecore_X_Randr_Output output) { #ifdef ECORE_XRANDR @@ -2025,9 +2050,9 @@ ecore_x_randr_output_backlight_level_get(Ecore_X_Window root, if ((info->range) && (info->num_values == 2)) { /* finally convert the current value in the interval [0..1] */ - min = info->values[0]; - max = info->values[1]; - dvalue = ((double)(value - min)) / ((double)(max - min)); + min = info->values[0]; + max = info->values[1]; + dvalue = ((double)(value - min)) / ((double)(max - min)); } free(info); return dvalue; @@ -2045,9 +2070,9 @@ ecore_x_randr_output_backlight_level_get(Ecore_X_Window root, */ EAPI Eina_Bool -ecore_x_randr_output_backlight_level_set(Ecore_X_Window root, +ecore_x_randr_output_backlight_level_set(Ecore_X_Window root, Ecore_X_Randr_Output output, - double level) + double level) { #ifdef ECORE_XRANDR RANDR_CHECK_1_2_RET(EINA_FALSE); @@ -2107,7 +2132,7 @@ ecore_x_randr_output_backlight_level_set(Ecore_X_Window root, EAPI Ecore_X_Randr_Output * ecore_x_randr_window_outputs_get(Ecore_X_Window window, - int *num) + int *num) { #ifdef ECORE_XRANDR Ecore_X_Window root; @@ -2136,39 +2161,39 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, for (i = 0; i < ncrtcs; i++) { /* if crtc is not enabled, don't bother about it any further */ - mode = ecore_x_randr_crtc_mode_get(root, crtcs[i]); - if (mode == Ecore_X_Randr_None) continue; - - ecore_x_randr_crtc_geometry_get(root, crtcs[i], - &c_geo.x, &c_geo.y, - &c_geo.w, &c_geo.h); - if (eina_rectangles_intersect(&w_geo, &c_geo)) - { - outputs = ecore_x_randr_crtc_outputs_get(root, crtcs[i], - &noutputs); - /* The case below should be impossible, but for safety reasons - * remains */ - if (!outputs) - { - if (num) *num = 0; - free(ret); - free(crtcs); - return NULL; - } - tret = realloc(ret, ((nret + noutputs) * sizeof(Ecore_X_Randr_Output))); - if (!tret) - { - if (num) *num = 0; - free(outputs); - free(ret); - free(crtcs); - return NULL; - } - ret = tret; - memcpy(&ret[nret], outputs, (noutputs * sizeof(Ecore_X_Randr_Output))); - nret += noutputs; - free(outputs); - } + mode = ecore_x_randr_crtc_mode_get(root, crtcs[i]); + if (mode == Ecore_X_Randr_None) continue; + + ecore_x_randr_crtc_geometry_get(root, crtcs[i], + &c_geo.x, &c_geo.y, + &c_geo.w, &c_geo.h); + if (eina_rectangles_intersect(&w_geo, &c_geo)) + { + outputs = ecore_x_randr_crtc_outputs_get(root, crtcs[i], + &noutputs); + /* The case below should be impossible, but for safety reasons + * remains */ + if (!outputs) + { + if (num) *num = 0; + free(ret); + free(crtcs); + return NULL; + } + tret = realloc(ret, ((nret + noutputs) * sizeof(Ecore_X_Randr_Output))); + if (!tret) + { + if (num) *num = 0; + free(outputs); + free(ret); + free(crtcs); + return NULL; + } + ret = tret; + memcpy(&ret[nret], outputs, (noutputs * sizeof(Ecore_X_Randr_Output))); + nret += noutputs; + free(outputs); + } } free(crtcs); @@ -2192,7 +2217,7 @@ _ecore_x_randr_current_output_get_fail: EINA_DEPRECATED EAPI Ecore_X_Randr_Output * ecore_x_randr_current_output_get(Ecore_X_Window window, - int *num) + int *num) { return ecore_x_randr_window_outputs_get(window, num); } diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c index d434f2f..5bda332 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c @@ -23,6 +23,10 @@ /* Heavily modified by: Leif Middelschulte */ #include "Ecore_X.h" +#include +#include +#include +#include /* TODO: * - see other TODO's within this file. @@ -100,7 +104,7 @@ typedef enum _Ecore_X_Randr_Edid_Aspect_Ratio_Preferred { EAPI Eina_Bool ecore_x_randr_edid_has_valid_header(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { const unsigned char header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; @@ -112,7 +116,7 @@ ecore_x_randr_edid_has_valid_header(unsigned char *edid, EAPI int ecore_x_randr_edid_version_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { if ((edid_length > _ECORE_X_RANDR_EDID_OFFSET_VERSION_MINOR) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) @@ -123,7 +127,7 @@ ecore_x_randr_edid_version_get(unsigned char *edid, EAPI int ecore_x_randr_edid_manufacturer_model_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { if ((edid_length > 0x0b) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) @@ -133,7 +137,7 @@ ecore_x_randr_edid_manufacturer_model_get(unsigned char *edid, EAPI int ecore_x_randr_edid_manufacturer_serial_number_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { if ((edid_length > 0x0f) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) @@ -144,7 +148,7 @@ ecore_x_randr_edid_manufacturer_serial_number_get(unsigned char *edid, EAPI char * ecore_x_randr_edid_manufacturer_name_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { if ((edid_length > (_ECORE_X_RANDR_EDID_OFFSET_MANUFACTURER + 1)) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) @@ -166,7 +170,7 @@ ecore_x_randr_edid_manufacturer_name_get(unsigned char *edid, EAPI char * ecore_x_randr_edid_display_name_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -196,7 +200,7 @@ ecore_x_randr_edid_display_name_get(unsigned char *edid, EAPI Ecore_X_Randr_Edid_Aspect_Ratio ecore_x_randr_edid_display_aspect_ratio_preferred_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -238,7 +242,7 @@ ecore_x_randr_edid_display_aspect_ratio_preferred_get(unsigned char *edid, EAPI Ecore_X_Randr_Edid_Aspect_Ratio ecore_x_randr_edid_display_aspect_ratios_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { Ecore_X_Randr_Edid_Aspect_Ratio ret = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; unsigned char *block = NULL; @@ -267,7 +271,7 @@ ecore_x_randr_edid_display_aspect_ratios_get(unsigned char *edid, EAPI char * ecore_x_randr_edid_display_ascii_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -300,7 +304,7 @@ ecore_x_randr_edid_display_ascii_get(unsigned char *edid, EAPI char * ecore_x_randr_edid_display_serial_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -333,7 +337,7 @@ ecore_x_randr_edid_display_serial_get(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { unsigned char *cea_block_iter = NULL; char sum = 0; @@ -344,13 +348,15 @@ ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid, if (edid_length < 128) return EINA_FALSE; /* Check the EDID block itself */ - for (i = 0; i < 128; i++) sum += edid[i]; + for (i = 0; i < 128; i++) + sum += edid[i]; if (sum) return EINA_FALSE; /* Check the cea extension blocks */ _ECORE_X_RANDR_EDID_FOR_EACH_CEA_BLOCK(edid, edid_length, cea_block_iter) { - for (i = 0, sum = 0; i < 128; i++) sum += cea_block_iter[i]; + for (i = 0, sum = 0; i < 128; i++) + sum += cea_block_iter[i]; } if (sum) return EINA_FALSE; return EINA_TRUE; @@ -358,7 +364,7 @@ ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_dpms_available_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -369,7 +375,7 @@ ecore_x_randr_edid_dpms_available_get(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_dpms_standby_available_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -382,7 +388,7 @@ ecore_x_randr_edid_dpms_standby_available_get(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_dpms_suspend_available_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -395,7 +401,7 @@ ecore_x_randr_edid_dpms_suspend_available_get(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_dpms_off_available_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -408,7 +414,7 @@ ecore_x_randr_edid_dpms_off_available_get(unsigned char *edid, EAPI Eina_Bool ecore_x_randr_edid_display_type_digital_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -419,7 +425,7 @@ ecore_x_randr_edid_display_type_digital_get(unsigned char *edid, EAPI Ecore_X_Randr_Edid_Display_Colorscheme ecore_x_randr_edid_display_colorscheme_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { Ecore_X_Randr_Edid_Display_Colorscheme colorscheme = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; int version = ecore_x_randr_edid_version_get(edid, edid_length); @@ -442,7 +448,7 @@ ecore_x_randr_edid_display_colorscheme_get(unsigned char *edid, EAPI Ecore_X_Randr_Edid_Display_Interface_Type ecore_x_randr_edid_display_interface_type_get(unsigned char *edid, - unsigned long edid_length) + unsigned long edid_length) { Ecore_X_Randr_Edid_Display_Interface_Type type = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; int version = ecore_x_randr_edid_version_get(edid, edid_length); diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c index ab242f7..5d1c8e9 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c @@ -8,6 +8,10 @@ #include "ecore_x_private.h" #include "ecore_x_randr.h" +#include +#include +#include +#include #define Ecore_X_Randr_None 0 #define Ecore_X_Randr_Unset -1 @@ -15,7 +19,8 @@ #ifdef ECORE_XRANDR #define RANDR_1_3 ((1 << 16) | 3) -#define RANDR_CHECK_1_3_RET(ret) if(_randr_version < RANDR_1_3) return ret +#define RANDR_CHECK_1_3_RET(ret) if (_randr_version < RANDR_1_3) \ + return ret extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display * dpy, @@ -47,7 +52,7 @@ ecore_x_randr_primary_output_get(Ecore_X_Window root) * @param output that should be set as given root window's screen primary output */ EAPI void -ecore_x_randr_primary_output_set(Ecore_X_Window root, +ecore_x_randr_primary_output_set(Ecore_X_Window root, Ecore_X_Randr_Output output) { #ifdef ECORE_XRANDR diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c index 7cc66e3..81d7eea 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c @@ -32,7 +32,7 @@ ecore_x_xregion_new() { LOGFN(__FILE__, __LINE__, __FUNCTION__); return (Ecore_X_XRegion *)XCreateRegion(); -} /* ecore_x_xregion_new */ +} EAPI void ecore_x_xregion_free(Ecore_X_XRegion *region) @@ -42,20 +42,20 @@ ecore_x_xregion_free(Ecore_X_XRegion *region) return; XDestroyRegion((Region)region); -} /* ecore_x_xregion_free */ +} EAPI Eina_Bool ecore_x_xregion_set(Ecore_X_XRegion *region, - Ecore_X_GC gc) + Ecore_X_GC gc) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSetRegion(_ecore_x_disp, gc, (Region)region) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_set */ +} EAPI void ecore_x_xregion_translate(Ecore_X_XRegion *region, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!region) @@ -63,7 +63,7 @@ ecore_x_xregion_translate(Ecore_X_XRegion *region, /* return value not used */ XOffsetRegion((Region)region, x, y); -} /* ecore_x_xregion_translate */ +} EAPI Eina_Bool ecore_x_xregion_intersect(Ecore_X_XRegion *dst, @@ -72,7 +72,7 @@ ecore_x_xregion_intersect(Ecore_X_XRegion *dst, { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XIntersectRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_intersect */ +} EAPI Eina_Bool ecore_x_xregion_union(Ecore_X_XRegion *dst, @@ -81,11 +81,11 @@ ecore_x_xregion_union(Ecore_X_XRegion *dst, { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XUnionRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_union */ +} EAPI Eina_Bool -ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, - Ecore_X_XRegion *src, +ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, + Ecore_X_XRegion *src, Ecore_X_Rectangle *rect) { XRectangle xr; @@ -97,7 +97,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, xr.height = rect->height; return XUnionRectWithRegion(&xr, (Region)src, (Region)dst) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_union_rect */ +} EAPI Eina_Bool ecore_x_xregion_subtract(Ecore_X_XRegion *dst, @@ -106,7 +106,7 @@ ecore_x_xregion_subtract(Ecore_X_XRegion *dst, { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSubtractRegion((Region)rm, (Region)rs, (Region)dst) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_subtract */ +} EAPI Eina_Bool ecore_x_xregion_is_empty(Ecore_X_XRegion *region) @@ -116,7 +116,7 @@ ecore_x_xregion_is_empty(Ecore_X_XRegion *region) LOGFN(__FILE__, __LINE__, __FUNCTION__); return XEmptyRegion((Region)region) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_is_empty */ +} EAPI Eina_Bool ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, @@ -127,22 +127,22 @@ ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, LOGFN(__FILE__, __LINE__, __FUNCTION__); return XEqualRegion((Region)r1, (Region)r1) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_is_equal */ +} EAPI Eina_Bool ecore_x_xregion_point_contain(Ecore_X_XRegion *region, - int x, - int y) + int x, + int y) { if (!region) return EINA_FALSE; LOGFN(__FILE__, __LINE__, __FUNCTION__); return XPointInRegion((Region)region, x, y) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_point_contain */ +} EAPI Eina_Bool -ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, +ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, Ecore_X_Rectangle *rect) { if (!region || !rect) @@ -154,5 +154,5 @@ ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, rect->y, rect->width, rect->height) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_xregion_rect_contain */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c index a3bca67..40dd738 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c @@ -36,7 +36,7 @@ ecore_x_screensaver_event_available_get(void) _screensaver_available = 0; #endif /* ifdef ECORE_XSS */ return _screensaver_available; -} /* ecore_x_screensaver_event_available_get */ +} EAPI int ecore_x_screensaver_idle_time_get(void) @@ -57,7 +57,7 @@ ecore_x_screensaver_idle_time_get(void) #else return 0; #endif /* ifdef ECORE_XSS */ -} /* ecore_x_screensaver_idle_time_get */ +} EAPI void ecore_x_screensaver_set(int timeout, @@ -71,7 +71,7 @@ ecore_x_screensaver_set(int timeout, interval, prefer_blanking, allow_exposures); -} /* ecore_x_screensaver_set */ +} EAPI void ecore_x_screensaver_timeout_set(int timeout) @@ -81,7 +81,7 @@ ecore_x_screensaver_timeout_set(int timeout) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, timeout, pint, pblank, pexpo); -} /* ecore_x_screensaver_timeout_set */ +} EAPI int ecore_x_screensaver_timeout_get(void) @@ -91,7 +91,7 @@ ecore_x_screensaver_timeout_get(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pto; -} /* ecore_x_screensaver_timeout_get */ +} EAPI void ecore_x_screensaver_blank_set(int blank) @@ -101,7 +101,7 @@ ecore_x_screensaver_blank_set(int blank) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, pint, blank, pexpo); -} /* ecore_x_screensaver_blank_set */ +} EAPI int ecore_x_screensaver_blank_get(void) @@ -111,7 +111,7 @@ ecore_x_screensaver_blank_get(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pblank; -} /* ecore_x_screensaver_blank_get */ +} EAPI void ecore_x_screensaver_expose_set(int expose) @@ -121,7 +121,7 @@ ecore_x_screensaver_expose_set(int expose) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, pint, pblank, expose); -} /* ecore_x_screensaver_expose_set */ +} EAPI int ecore_x_screensaver_expose_get(void) @@ -131,7 +131,7 @@ ecore_x_screensaver_expose_get(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pexpo; -} /* ecore_x_screensaver_expose_get */ +} EAPI void ecore_x_screensaver_interval_set(int interval) @@ -141,7 +141,7 @@ ecore_x_screensaver_interval_set(int interval) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, interval, pblank, pexpo); -} /* ecore_x_screensaver_interval_set */ +} EAPI int ecore_x_screensaver_interval_get(void) @@ -151,7 +151,7 @@ ecore_x_screensaver_interval_get(void) LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pint; -} /* ecore_x_screensaver_interval_get */ +} EAPI void ecore_x_screensaver_event_listen_set(Eina_Bool on) @@ -169,5 +169,5 @@ ecore_x_screensaver_event_listen_set(Eina_Bool on) return; on = EINA_FALSE; #endif /* ifdef ECORE_XSS */ -} /* ecore_x_screensaver_event_listen_set */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c index b1aa611..fa177c3 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c @@ -15,29 +15,29 @@ static Ecore_X_Selection_Intern selections[4]; static Ecore_X_Selection_Converter *converters = NULL; static Ecore_X_Selection_Parser *parsers = NULL; -static Eina_Bool _ecore_x_selection_converter_text(char *target, - void *data, - int size, - void **data_ret, - int *size_ret, +static Eina_Bool _ecore_x_selection_converter_text(char *target, + void *data, + int size, + void **data_ret, + int *size_ret, Ecore_X_Atom *tprop, int *); static int _ecore_x_selection_data_default_free(void *data); static void *_ecore_x_selection_parser_files(const char *target, - void *data, - int size, - int format); + void *data, + int size, + int format); static int _ecore_x_selection_data_files_free(void *data); static void *_ecore_x_selection_parser_text(const char *target, - void *data, - int size, - int format); + void *data, + int size, + int format); static int _ecore_x_selection_data_text_free(void *data); static void *_ecore_x_selection_parser_targets(const char *target, - void *data, - int size, - int format); -static int _ecore_x_selection_data_targets_free(void *data); + void *data, + int size, + int format); +static int _ecore_x_selection_data_targets_free(void *data); #define ECORE_X_SELECTION_DATA(x) ((Ecore_X_Selection_Data *)(x)) @@ -45,32 +45,32 @@ void _ecore_x_selection_data_init(void) { /* Initialize global data */ - memset(selections, 0, sizeof(selections)); + memset(selections, 0, sizeof(selections)); - /* Initialize converters */ - ecore_x_selection_converter_atom_add(ECORE_X_ATOM_TEXT, - _ecore_x_selection_converter_text); + /* Initialize converters */ + ecore_x_selection_converter_atom_add(ECORE_X_ATOM_TEXT, + _ecore_x_selection_converter_text); #ifdef X_HAVE_UTF8_STRING - ecore_x_selection_converter_atom_add(ECORE_X_ATOM_UTF8_STRING, - _ecore_x_selection_converter_text); + ecore_x_selection_converter_atom_add(ECORE_X_ATOM_UTF8_STRING, + _ecore_x_selection_converter_text); #endif /* ifdef X_HAVE_UTF8_STRING */ - ecore_x_selection_converter_atom_add(ECORE_X_ATOM_COMPOUND_TEXT, - _ecore_x_selection_converter_text); - ecore_x_selection_converter_atom_add(ECORE_X_ATOM_STRING, - _ecore_x_selection_converter_text); - - /* Initialize parsers */ - ecore_x_selection_parser_add("text/plain", - _ecore_x_selection_parser_text); - ecore_x_selection_parser_add(ECORE_X_SELECTION_TARGET_UTF8_STRING, - _ecore_x_selection_parser_text); - ecore_x_selection_parser_add("text/uri-list", - _ecore_x_selection_parser_files); - ecore_x_selection_parser_add("_NETSCAPE_URL", - _ecore_x_selection_parser_files); - ecore_x_selection_parser_add(ECORE_X_SELECTION_TARGET_TARGETS, - _ecore_x_selection_parser_targets); -} /* _ecore_x_selection_data_init */ + ecore_x_selection_converter_atom_add(ECORE_X_ATOM_COMPOUND_TEXT, + _ecore_x_selection_converter_text); + ecore_x_selection_converter_atom_add(ECORE_X_ATOM_STRING, + _ecore_x_selection_converter_text); + + /* Initialize parsers */ + ecore_x_selection_parser_add("text/plain", + _ecore_x_selection_parser_text); + ecore_x_selection_parser_add(ECORE_X_SELECTION_TARGET_UTF8_STRING, + _ecore_x_selection_parser_text); + ecore_x_selection_parser_add("text/uri-list", + _ecore_x_selection_parser_files); + ecore_x_selection_parser_add("_NETSCAPE_URL", + _ecore_x_selection_parser_files); + ecore_x_selection_parser_add(ECORE_X_SELECTION_TARGET_TARGETS, + _ecore_x_selection_parser_targets); +} void _ecore_x_selection_shutdown(void) @@ -102,7 +102,7 @@ _ecore_x_selection_shutdown(void) free(tmp); } parsers = NULL; -} /* _ecore_x_selection_shutdown */ +} Ecore_X_Selection_Intern * _ecore_x_selection_get(Ecore_X_Atom selection) @@ -117,12 +117,12 @@ _ecore_x_selection_get(Ecore_X_Atom selection) return &selections[3]; else return NULL; -} /* _ecore_x_selection_get */ +} Eina_Bool -_ecore_x_selection_set(Window w, - const void *data, - int size, +_ecore_x_selection_set(Window w, + const void *data, + int size, Ecore_X_Atom selection) { int in; @@ -162,7 +162,7 @@ _ecore_x_selection_set(Window w, } return EINA_TRUE; -} /* _ecore_x_selection_set */ +} /** * Claim ownership of the PRIMARY selection and set its data. @@ -174,12 +174,12 @@ _ecore_x_selection_set(Window w, */ EAPI Eina_Bool ecore_x_selection_primary_set(Ecore_X_Window w, - const void *data, - int size) + const void *data, + int size) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_PRIMARY); -} /* ecore_x_selection_primary_set */ +} /** * Release ownership of the primary selection @@ -192,7 +192,7 @@ ecore_x_selection_primary_clear(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_PRIMARY); -} /* ecore_x_selection_primary_clear */ +} /** * Claim ownership of the SECONDARY selection and set its data. @@ -204,15 +204,15 @@ ecore_x_selection_primary_clear(void) */ EAPI Eina_Bool ecore_x_selection_secondary_set(Ecore_X_Window w, - const void *data, - int size) + const void *data, + int size) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_SECONDARY); -} /* ecore_x_selection_secondary_set */ +} /** * Release ownership of the secondary selection @@ -228,7 +228,7 @@ ecore_x_selection_secondary_clear(void) NULL, 0, ECORE_X_ATOM_SELECTION_SECONDARY); -} /* ecore_x_selection_secondary_clear */ +} /** * Claim ownership of the XDND selection and set its data. @@ -240,12 +240,12 @@ ecore_x_selection_secondary_clear(void) */ EAPI Eina_Bool ecore_x_selection_xdnd_set(Ecore_X_Window w, - const void *data, - int size) + const void *data, + int size) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_XDND); -} /* ecore_x_selection_xdnd_set */ +} /** * Release ownership of the XDND selection @@ -258,7 +258,7 @@ ecore_x_selection_xdnd_clear(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_XDND); -} /* ecore_x_selection_xdnd_clear */ +} /** * Claim ownership of the CLIPBOARD selection and set its data. @@ -273,15 +273,15 @@ ecore_x_selection_xdnd_clear(void) */ EAPI Eina_Bool ecore_x_selection_clipboard_set(Ecore_X_Window w, - const void *data, - int size) + const void *data, + int size) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_CLIPBOARD); -} /* ecore_x_selection_clipboard_set */ +} /** * Release ownership of the clipboard selection @@ -297,7 +297,7 @@ ecore_x_selection_clipboard_clear(void) NULL, 0, ECORE_X_ATOM_SELECTION_CLIPBOARD); -} /* ecore_x_selection_clipboard_clear */ +} Ecore_X_Atom _ecore_x_selection_target_atom_get(const char *target) @@ -318,29 +318,29 @@ _ecore_x_selection_target_atom_get(const char *target) x_target = ecore_x_atom_get(target); return x_target; -} /* _ecore_x_selection_target_atom_get */ +} char * _ecore_x_selection_target_get(Ecore_X_Atom target) { /* FIXME: Should not return mem allocated with strdup or X mixed, * one should use free to free, the other XFree */ - if (target == ECORE_X_ATOM_FILE_NAME) - return strdup(ECORE_X_SELECTION_TARGET_FILENAME); - else if (target == ECORE_X_ATOM_STRING) - return strdup(ECORE_X_SELECTION_TARGET_STRING); - else if (target == ECORE_X_ATOM_UTF8_STRING) - return strdup(ECORE_X_SELECTION_TARGET_UTF8_STRING); - else if (target == ECORE_X_ATOM_TEXT) - return strdup(ECORE_X_SELECTION_TARGET_TEXT); - else - return XGetAtomName(_ecore_x_disp, target); -} /* _ecore_x_selection_target_get */ + if (target == ECORE_X_ATOM_FILE_NAME) + return strdup(ECORE_X_SELECTION_TARGET_FILENAME); + else if (target == ECORE_X_ATOM_STRING) + return strdup(ECORE_X_SELECTION_TARGET_STRING); + else if (target == ECORE_X_ATOM_UTF8_STRING) + return strdup(ECORE_X_SELECTION_TARGET_UTF8_STRING); + else if (target == ECORE_X_ATOM_TEXT) + return strdup(ECORE_X_SELECTION_TARGET_TEXT); + else + return XGetAtomName(_ecore_x_disp, target); +} static void _ecore_x_selection_request(Ecore_X_Window w, - Ecore_X_Atom selection, - const char *target_str) + Ecore_X_Atom selection, + const char *target_str) { Ecore_X_Atom target, prop; @@ -357,27 +357,27 @@ _ecore_x_selection_request(Ecore_X_Window w, XConvertSelection(_ecore_x_disp, selection, target, prop, w, CurrentTime); -} /* _ecore_x_selection_request */ +} EAPI void ecore_x_selection_primary_request(Ecore_X_Window w, - const char *target) + const char *target) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_PRIMARY, target); -} /* ecore_x_selection_primary_request */ +} EAPI void ecore_x_selection_secondary_request(Ecore_X_Window w, - const char *target) + const char *target) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_SECONDARY, target); -} /* ecore_x_selection_secondary_request */ +} EAPI void ecore_x_selection_xdnd_request(Ecore_X_Window w, - const char *target) + const char *target) { Ecore_X_Atom atom; Ecore_X_DND_Target *_target; @@ -388,25 +388,25 @@ ecore_x_selection_xdnd_request(Ecore_X_Window w, XConvertSelection(_ecore_x_disp, ECORE_X_ATOM_SELECTION_XDND, atom, ECORE_X_ATOM_SELECTION_PROP_XDND, w, _target->time); -} /* ecore_x_selection_xdnd_request */ +} EAPI void ecore_x_selection_clipboard_request(Ecore_X_Window w, - const char *target) + const char *target) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_CLIPBOARD, target); -} /* ecore_x_selection_clipboard_request */ +} EAPI void -ecore_x_selection_converter_atom_add(Ecore_X_Atom target, - Eina_Bool (*func)(char *target, - void *data, - int size, - void **data_ret, - int *size_ret, - Ecore_X_Atom *ttype, - int *tsize)) +ecore_x_selection_converter_atom_add(Ecore_X_Atom target, + Eina_Bool (*func)(char *target, + void *data, + int size, + void **data_ret, + int *size_ret, + Ecore_X_Atom *ttype, + int *tsize)) { Ecore_X_Selection_Converter *cnv; @@ -441,17 +441,17 @@ ecore_x_selection_converter_atom_add(Ecore_X_Atom cnv->target = target; cnv->convert = func; -} /* ecore_x_selection_converter_atom_add */ +} EAPI void -ecore_x_selection_converter_add(char *target, - Eina_Bool (*func)(char *target, - void *data, - int size, - void **data_ret, - int *size_ret, - Ecore_X_Atom *, - int *)) +ecore_x_selection_converter_add(char *target, + Eina_Bool (*func)(char *target, + void *data, + int size, + void **data_ret, + int *size_ret, + Ecore_X_Atom *, + int *)) { Ecore_X_Atom x_target; @@ -462,7 +462,7 @@ ecore_x_selection_converter_add(char *target, x_target = _ecore_x_selection_target_atom_get(target); ecore_x_selection_converter_atom_add(x_target, func); -} /* ecore_x_selection_converter_add */ +} EAPI void ecore_x_selection_converter_atom_del(Ecore_X_Atom target) @@ -492,7 +492,7 @@ ecore_x_selection_converter_atom_del(Ecore_X_Atom target) prev_cnv = cnv; cnv = cnv->next; } -} /* ecore_x_selection_converter_atom_del */ +} EAPI void ecore_x_selection_converter_del(char *target) @@ -505,14 +505,14 @@ ecore_x_selection_converter_del(char *target) LOGFN(__FILE__, __LINE__, __FUNCTION__); x_target = _ecore_x_selection_target_atom_get(target); ecore_x_selection_converter_atom_del(x_target); -} /* ecore_x_selection_converter_del */ +} EAPI Eina_Bool ecore_x_selection_notify_send(Ecore_X_Window requestor, - Ecore_X_Atom selection, - Ecore_X_Atom target, - Ecore_X_Atom property, - Ecore_X_Time tim) + Ecore_X_Atom selection, + Ecore_X_Atom target, + Ecore_X_Atom property, + Ecore_X_Time tim) { XEvent xev; XSelectionEvent xnotify; @@ -530,16 +530,16 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor, xev.xselection = xnotify; return (XSendEvent(_ecore_x_disp, requestor, False, 0, &xev) > 0) ? EINA_TRUE : EINA_FALSE; -} /* ecore_x_selection_notify_send */ +} /* Locate and run conversion callback for specified selection target */ EAPI Eina_Bool -ecore_x_selection_convert(Ecore_X_Atom selection, - Ecore_X_Atom target, - void **data_ret, - int *size, +ecore_x_selection_convert(Ecore_X_Atom selection, + Ecore_X_Atom target, + void **data_ret, + int *size, Ecore_X_Atom *targtype, - int *typesize) + int *typesize) { Ecore_X_Selection_Intern *sel; Ecore_X_Selection_Converter *cnv; @@ -572,24 +572,24 @@ ecore_x_selection_convert(Ecore_X_Atom selection, return EINA_FALSE; /* Default, just return the data - *data_ret = malloc(sel->length); + * data_ret = malloc(sel->length); memcpy(*data_ret, sel->data, sel->length); free(tgt_str); return 1; */ -} /* ecore_x_selection_convert */ +} /* TODO: We need to work out a mechanism for automatic conversion to any requested * locale using Ecore_Txt functions */ /* Converter for standard non-utf8 text targets */ static Eina_Bool -_ecore_x_selection_converter_text(char *target, - void *data, - int size, - void **data_ret, - int *size_ret, +_ecore_x_selection_converter_text(char *target, + void *data, + int size, + void **data_ret, + int *size_ret, Ecore_X_Atom *targprop __UNUSED__, - int *s __UNUSED__) + int *s __UNUSED__) { XTextProperty text_prop; char *mystr; @@ -651,7 +651,7 @@ _ecore_x_selection_converter_text(char *target, { return EINA_TRUE; } -} /* _ecore_x_selection_converter_text */ +} EAPI void ecore_x_selection_parser_add(const char *target, @@ -692,7 +692,7 @@ ecore_x_selection_parser_add(const char *target, prs->target = strdup(target); prs->parse = func; -} /* ecore_x_selection_parser_add */ +} EAPI void ecore_x_selection_parser_del(const char *target) @@ -726,19 +726,19 @@ ecore_x_selection_parser_del(const char *target) prev_prs = prs; prs = prs->next; } -} /* ecore_x_selection_parser_del */ +} /** * Change the owner and last-change time for the specified selection. * @param win The owner of the specified atom. * @param atom The selection atom - * @param time Specifies the time + * @param tim Specifies the time * @since 1.1.0 */ EAPI void ecore_x_selection_owner_set(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Time tim) + Ecore_X_Atom atom, + Ecore_X_Time tim) { XSetSelectionOwner(_ecore_x_disp, atom, win, tim); } @@ -760,9 +760,9 @@ ecore_x_selection_owner_get(Ecore_X_Atom atom) /* Locate and run conversion callback for specified selection target */ void * _ecore_x_selection_parse(const char *target, - void *data, - int size, - int format) + void *data, + int size, + int format) { Ecore_X_Selection_Parser *prs; Ecore_X_Selection_Data *sel; @@ -784,7 +784,7 @@ _ecore_x_selection_parse(const char *target, sel->format = format; sel->data = data; return sel; -} /* _ecore_x_selection_parse */ +} static int _ecore_x_selection_data_default_free(void *data) @@ -795,13 +795,13 @@ _ecore_x_selection_data_default_free(void *data) free(sel->data); free(sel); return 1; -} /* _ecore_x_selection_data_default_free */ +} static void * _ecore_x_selection_parser_files(const char *target, - void *_data, - int size, - int format __UNUSED__) + void *_data, + int size, + int format __UNUSED__) { Ecore_X_Selection_Data_Files *sel; char *t, *data = _data; @@ -820,15 +820,15 @@ _ecore_x_selection_parser_files(const char *target, if (data[size - 1]) { /* Isn't nul terminated */ - size++; - t = realloc(data, size); - if (!t) - { - free(sel); - return NULL; - } - data = t; - data[size - 1] = 0; + size++; + t = realloc(data, size); + if (!t) + { + free(sel); + return NULL; + } + data = t; + data[size - 1] = 0; } tmp = malloc(size); @@ -850,7 +850,8 @@ _ecore_x_selection_parser_files(const char *target, tmp[i++] = data[is++]; else { - while ((data[is] == '\r') || (data[is] == '\n')) is++; + while ((data[is] == '\r') || (data[is] == '\n')) + is++; tmp[i] = 0; sel->num_files++; t2 = realloc(sel->files, sel->num_files * sizeof(char *)); @@ -883,7 +884,7 @@ _ecore_x_selection_parser_files(const char *target, ECORE_X_SELECTION_DATA(sel)->length = sel->num_files; return ECORE_X_SELECTION_DATA(sel); -} /* _ecore_x_selection_parser_files */ +} static int _ecore_x_selection_data_files_free(void *data) @@ -901,13 +902,13 @@ _ecore_x_selection_data_files_free(void *data) free(sel); return 0; -} /* _ecore_x_selection_data_files_free */ +} static void * _ecore_x_selection_parser_text(const char *target __UNUSED__, - void *_data, - int size, - int format __UNUSED__) + void *_data, + int size, + int format __UNUSED__) { Ecore_X_Selection_Data_Text *sel; unsigned char *data = _data; @@ -918,15 +919,15 @@ _ecore_x_selection_parser_text(const char *target __UNUSED__, if (data[size - 1]) { /* Isn't nul terminated */ - size++; - t = realloc(data, size); - if (!t) - { - free(sel); - return NULL; - } - data = t; - data[size - 1] = 0; + size++; + t = realloc(data, size); + if (!t) + { + free(sel); + return NULL; + } + data = t; + data[size - 1] = 0; } sel->text = (char *)data; @@ -935,7 +936,7 @@ _ecore_x_selection_parser_text(const char *target __UNUSED__, ECORE_X_SELECTION_DATA(sel)->data = data; ECORE_X_SELECTION_DATA(sel)->free = _ecore_x_selection_data_text_free; return sel; -} /* _ecore_x_selection_parser_text */ +} static int _ecore_x_selection_data_text_free(void *data) @@ -946,13 +947,13 @@ _ecore_x_selection_data_text_free(void *data) free(sel->text); free(sel); return 1; -} /* _ecore_x_selection_data_text_free */ +} static void * _ecore_x_selection_parser_targets(const char *target __UNUSED__, - void *data, - int size, - int format __UNUSED__) + void *data, + int size, + int format __UNUSED__) { Ecore_X_Selection_Data_Targets *sel; unsigned long *targets; @@ -977,7 +978,7 @@ _ecore_x_selection_parser_targets(const char *target __UNUSED__, ECORE_X_SELECTION_DATA(sel)->length = size; ECORE_X_SELECTION_DATA(sel)->data = data; return sel; -} /* _ecore_x_selection_parser_targets */ +} static int _ecore_x_selection_data_targets_free(void *data) @@ -997,5 +998,5 @@ _ecore_x_selection_data_targets_free(void *data) free(ECORE_X_SELECTION_DATA(sel)->data); free(sel); return 1; -} /* _ecore_x_selection_data_targets_free */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c index e49fede..0c7f546 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c @@ -42,18 +42,18 @@ ecore_x_sync_alarm_new(Ecore_X_Sync_Counter counter) ecore_x_sync(); return alarm; -} /* ecore_x_sync_alarm_new */ +} EAPI Eina_Bool ecore_x_sync_alarm_free(Ecore_X_Sync_Alarm alarm) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSyncDestroyAlarm(_ecore_x_disp, alarm); -} /* ecore_x_sync_alarm_free */ +} EAPI Eina_Bool ecore_x_sync_counter_query(Ecore_X_Sync_Counter counter, - unsigned int *val) + unsigned int *val) { XSyncValue value; @@ -65,7 +65,7 @@ ecore_x_sync_counter_query(Ecore_X_Sync_Counter counter, } return EINA_FALSE; -} /* ecore_x_sync_counter_query */ +} EAPI Ecore_X_Sync_Counter ecore_x_sync_counter_new(int val) @@ -77,29 +77,29 @@ ecore_x_sync_counter_new(int val) XSyncIntToValue(&v, val); counter = XSyncCreateCounter(_ecore_x_disp, v); return counter; -} /* ecore_x_sync_counter_new */ +} EAPI void ecore_x_sync_counter_free(Ecore_X_Sync_Counter counter) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncDestroyCounter(_ecore_x_disp, counter); -} /* ecore_x_sync_counter_free */ +} EAPI void ecore_x_sync_counter_inc(Ecore_X_Sync_Counter counter, - int by) + int by) { XSyncValue v; LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&v, by); XSyncChangeCounter(_ecore_x_disp, counter, v); -} /* ecore_x_sync_counter_inc */ +} EAPI void ecore_x_sync_counter_val_wait(Ecore_X_Sync_Counter counter, - int val) + int val) { XSyncWaitCondition cond; XSyncValue v, v2; @@ -115,11 +115,11 @@ ecore_x_sync_counter_val_wait(Ecore_X_Sync_Counter counter, cond.event_threshold = v2; XSyncAwait(_ecore_x_disp, &cond, 1); // XSync(_ecore_x_disp, False); // dont need this -} /* ecore_x_sync_counter_val_wait */ +} EAPI void ecore_x_sync_counter_set(Ecore_X_Sync_Counter counter, - int val) + int val) { XSyncValue v; @@ -130,8 +130,8 @@ ecore_x_sync_counter_set(Ecore_X_Sync_Counter counter, EAPI void ecore_x_sync_counter_2_set(Ecore_X_Sync_Counter counter, - int val_hi, - unsigned int val_lo) + int val_hi, + unsigned int val_lo) { XSyncValue v; @@ -142,8 +142,8 @@ ecore_x_sync_counter_2_set(Ecore_X_Sync_Counter counter, EAPI Eina_Bool ecore_x_sync_counter_2_query(Ecore_X_Sync_Counter counter, - int *val_hi, - unsigned int *val_lo) + int *val_hi, + unsigned int *val_lo) { XSyncValue value; diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_test.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_test.c index c4576f9..c8c04e4 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_test.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_test.c @@ -42,7 +42,7 @@ ecore_x_test_fake_key_down(const char *key __UNUSED__) #else /* ifdef ECORE_XTEST */ return EINA_FALSE; #endif /* ifdef ECORE_XTEST */ -} /* ecore_x_test_fake_key_down */ +} EAPI Eina_Bool #ifdef ECORE_XTEST @@ -74,7 +74,7 @@ ecore_x_test_fake_key_up(const char *key __UNUSED__) #else /* ifdef ECORE_XTEST */ return EINA_FALSE; #endif /* ifdef ECORE_XTEST */ -} /* ecore_x_test_fake_key_up */ +} EAPI Eina_Bool #ifdef ECORE_XTEST @@ -145,11 +145,11 @@ ecore_x_test_fake_key_press(const char *key __UNUSED__) #else /* ifdef ECORE_XTEST */ return EINA_FALSE; #endif /* ifdef ECORE_XTEST */ -} /* ecore_x_test_fake_key_press */ +} EAPI const char * ecore_x_keysym_string_get(int keysym) { return XKeysymToString(keysym); -} /* ecore_x_keysym_string_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c index f054298..4296bb2 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c @@ -61,40 +61,40 @@ typedef union _drmVBlank typedef struct _drmEventContext { int version; - void (*vblank_handler)(int fd, + void (*vblank_handler)(int fd, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, - void *user_data); - void (*page_flip_handler)(int fd, + void *user_data); + void (*page_flip_handler)(int fd, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, - void *user_data); + void *user_data); } drmEventContext; static int (*sym_drmClose)(int fd) = NULL; -static int (*sym_drmGetMagic)(int fd, +static int (*sym_drmGetMagic)(int fd, drm_magic_t *magic) = NULL; -static int (*sym_drmWaitVBlank)(int fd, +static int (*sym_drmWaitVBlank)(int fd, drmVBlank *vbl) = NULL; -static int (*sym_drmHandleEvent)(int fd, +static int (*sym_drmHandleEvent)(int fd, drmEventContext *evctx) = NULL; //// dri static Bool (*sym_DRI2QueryExtension)(Display *display, - int *eventBase, - int *errorBase) = NULL; + int *eventBase, + int *errorBase) = NULL; static Bool (*sym_DRI2QueryVersion)(Display *display, - int *major, - int *minor) = NULL; + int *major, + int *minor) = NULL; static Bool (*sym_DRI2Connect)(Display *display, - XID window, - char **driverName, - char **deviceName) = NULL; -static Bool (*sym_DRI2Authenticate)(Display *display, - XID window, + XID window, + char **driverName, + char **deviceName) = NULL; +static Bool (*sym_DRI2Authenticate)(Display *display, + XID window, drm_magic_t magic) = NULL; //// dri/drm data needed @@ -142,18 +142,18 @@ _dri_drm_tick_end(void *data __UNUSED__) } static void -_dri_drm_vblank_handler(int fd __UNUSED__, +_dri_drm_vblank_handler(int fd __UNUSED__, unsigned int frame __UNUSED__, unsigned int sec __UNUSED__, unsigned int usec __UNUSED__, - void *data __UNUSED__) + void *data __UNUSED__) { ecore_animator_custom_tick(); if (drm_event_is_busy) _dri_drm_tick_schedule(); } static Eina_Bool -_dri_drm_cb(void *data __UNUSED__, +_dri_drm_cb(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__) { sym_drmHandleEvent(drm_fd, &drm_evctx); diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window.c index 76670d3..1adb36b 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window.c @@ -33,10 +33,10 @@ static Ecore_X_Window *ignore_list = NULL; */ EAPI Ecore_X_Window ecore_x_window_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { Window win; XSetWindowAttributes attr; @@ -87,7 +87,7 @@ ecore_x_window_new(Ecore_X_Window parent, ecore_x_window_defaults_set(win); return win; -} /* ecore_x_window_new */ +} /** * Creates a window with the override redirect attribute set to @c True. @@ -102,10 +102,10 @@ ecore_x_window_new(Ecore_X_Window parent, */ EAPI Ecore_X_Window ecore_x_window_override_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { Window win; XSetWindowAttributes attr; @@ -152,7 +152,7 @@ ecore_x_window_override_new(Ecore_X_Window parent, CWWinGravity, &attr); return win; -} /* ecore_x_window_override_new */ +} /** * Creates a new input window. @@ -167,10 +167,10 @@ ecore_x_window_override_new(Ecore_X_Window parent, */ EAPI Ecore_X_Window ecore_x_window_input_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { Window win; XSetWindowAttributes attr; @@ -209,7 +209,7 @@ ecore_x_window_input_new(Ecore_X_Window parent, } return win; -} /* ecore_x_window_input_new */ +} /** * @defgroup Ecore_X_Window_Properties_Group X Window Property Functions @@ -263,18 +263,18 @@ ecore_x_window_defaults_set(Ecore_X_Window win) ecore_app_args_get(&argc, &argv); ecore_x_icccm_command_set(win, argc, argv); -} /* ecore_x_window_defaults_set */ +} EAPI void -ecore_x_window_configure(Ecore_X_Window win, +ecore_x_window_configure(Ecore_X_Window win, Ecore_X_Window_Configure_Mask mask, - int x, - int y, - int w, - int h, - int border_width, - Ecore_X_Window sibling, - int stack_mode) + int x, + int y, + int w, + int h, + int border_width, + Ecore_X_Window sibling, + int stack_mode) { XWindowChanges xwc; @@ -292,7 +292,7 @@ ecore_x_window_configure(Ecore_X_Window win, xwc.stack_mode = stack_mode; XConfigureWindow(_ecore_x_disp, win, mask, &xwc); -} /* ecore_x_window_configure */ +} /** * @defgroup Ecore_X_Window_Destroy_Group X Window Destroy Functions @@ -311,10 +311,10 @@ ecore_x_window_free(Ecore_X_Window win) /* sorry sir, deleting the root window doesn't sound like * a smart idea. */ - LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (win) - XDestroyWindow(_ecore_x_disp, win); -} /* ecore_x_window_free */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (win) + XDestroyWindow(_ecore_x_disp, win); +} /** * Set if a window should be ignored. @@ -323,7 +323,7 @@ ecore_x_window_free(Ecore_X_Window win) */ EAPI void ecore_x_window_ignore_set(Ecore_X_Window win, - int ignore) + int ignore) { int i, j, cnt; Ecore_X_Window *t; @@ -373,7 +373,7 @@ ecore_x_window_ignore_set(Ecore_X_Window win, t = realloc(ignore_list, ignore_num * sizeof(Ecore_X_Window)); if (t) ignore_list = t; } -} /* ecore_x_window_ignore_set */ +} /** * Get the ignore list @@ -387,7 +387,7 @@ ecore_x_window_ignore_list(int *num) *num = ignore_num; return ignore_list; -} /* ecore_x_window_ignore_list */ +} /** * Sends a delete request to the given window. @@ -415,7 +415,7 @@ ecore_x_window_delete_request_send(Ecore_X_Window win) xev.xclient.data.l[1] = CurrentTime; XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); -} /* ecore_x_window_delete_request_send */ +} /** * @defgroup Ecore_X_Window_Visibility_Group X Window Visibility Functions @@ -436,7 +436,7 @@ ecore_x_window_show(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XMapWindow(_ecore_x_disp, win); -} /* ecore_x_window_show */ +} /** * Hides a window. @@ -480,7 +480,7 @@ ecore_x_window_hide(Ecore_X_Window win) XSendEvent(_ecore_x_disp, xev.xunmap.event, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); XUnmapWindow(_ecore_x_disp, win); -} /* ecore_x_window_hide */ +} /** * @defgroup Ecore_X_Window_Geometry_Group X Window Geometry Functions @@ -501,12 +501,12 @@ ecore_x_window_hide(Ecore_X_Window win) */ EAPI void ecore_x_window_move(Ecore_X_Window win, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XMoveWindow(_ecore_x_disp, win, x, y); -} /* ecore_x_window_move */ +} /** * Resizes a window. @@ -517,8 +517,8 @@ ecore_x_window_move(Ecore_X_Window win, */ EAPI void ecore_x_window_resize(Ecore_X_Window win, - int w, - int h) + int w, + int h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (w < 1) @@ -528,7 +528,7 @@ ecore_x_window_resize(Ecore_X_Window win, h = 1; XResizeWindow(_ecore_x_disp, win, w, h); -} /* ecore_x_window_resize */ +} /** * Moves and resizes a window. @@ -541,10 +541,10 @@ ecore_x_window_resize(Ecore_X_Window win, */ EAPI void ecore_x_window_move_resize(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (w < 1) @@ -554,7 +554,7 @@ ecore_x_window_move_resize(Ecore_X_Window win, h = 1; XMoveResizeWindow(_ecore_x_disp, win, x, y, w, h); -} /* ecore_x_window_move_resize */ +} /** * @defgroup Ecore_X_Window_Focus_Functions X Window Focus Functions @@ -576,7 +576,7 @@ ecore_x_window_focus(Ecore_X_Window win) // XSetInputFocus(_ecore_x_disp, win, RevertToPointerRoot, CurrentTime); XSetInputFocus(_ecore_x_disp, win, RevertToParent, CurrentTime); -} /* ecore_x_window_focus */ +} /** * Sets the focus to the given window at a specific time. @@ -586,7 +586,7 @@ ecore_x_window_focus(Ecore_X_Window win) */ EAPI void ecore_x_window_focus_at_time(Ecore_X_Window win, - Ecore_X_Time t) + Ecore_X_Time t) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) @@ -594,7 +594,7 @@ ecore_x_window_focus_at_time(Ecore_X_Window win, // XSetInputFocus(_ecore_x_disp, win, PointerRoot, t); XSetInputFocus(_ecore_x_disp, win, RevertToParent, t); -} /* ecore_x_window_focus_at_time */ +} /** * gets the focus to the window @p win. @@ -611,7 +611,7 @@ ecore_x_window_focus_get(void) win = 0; XGetInputFocus(_ecore_x_disp, &win, &revert_mode); return win; -} /* ecore_x_window_focus_get */ +} /** * @defgroup Ecore_X_Window_Z_Order_Group X Window Z Order Functions @@ -629,7 +629,7 @@ ecore_x_window_raise(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XRaiseWindow(_ecore_x_disp, win); -} /* ecore_x_window_raise */ +} /** * Lowers the given window. @@ -641,7 +641,7 @@ ecore_x_window_lower(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XLowerWindow(_ecore_x_disp, win); -} /* ecore_x_window_lower */ +} /** * @defgroup Ecore_X_Window_Parent_Group X Window Parent Functions @@ -660,15 +660,15 @@ ecore_x_window_lower(Ecore_X_Window win) EAPI void ecore_x_window_reparent(Ecore_X_Window win, Ecore_X_Window new_parent, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (new_parent == 0) new_parent = DefaultRootWindow(_ecore_x_disp); XReparentWindow(_ecore_x_disp, win, new_parent, x, y); -} /* ecore_x_window_reparent */ +} /** * Retrieves the size of the given window. @@ -679,8 +679,8 @@ ecore_x_window_reparent(Ecore_X_Window win, */ EAPI void ecore_x_window_size_get(Ecore_X_Window win, - int *w, - int *h) + int *w, + int *h) { int dummy_x, dummy_y; @@ -689,7 +689,7 @@ ecore_x_window_size_get(Ecore_X_Window win, win = DefaultRootWindow(_ecore_x_disp); ecore_x_drawable_geometry_get(win, &dummy_x, &dummy_y, w, h); -} /* ecore_x_window_size_get */ +} /** * Retrieves the geometry of the given window. @@ -709,17 +709,17 @@ ecore_x_window_size_get(Ecore_X_Window win, */ EAPI void ecore_x_window_geometry_get(Ecore_X_Window win, - int *x, - int *y, - int *w, - int *h) + int *x, + int *y, + int *w, + int *h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!win) win = DefaultRootWindow(_ecore_x_disp); ecore_x_drawable_geometry_get(win, x, y, w, h); -} /* ecore_x_window_geometry_get */ +} /** * Retrieves the width of the border of the given window. @@ -736,7 +736,7 @@ ecore_x_window_border_width_get(Ecore_X_Window win) return 0; return ecore_x_drawable_border_width_get(win); -} /* ecore_x_window_border_width_get */ +} /** * Sets the width of the border of the given window. @@ -746,7 +746,7 @@ ecore_x_window_border_width_get(Ecore_X_Window win) */ EAPI void ecore_x_window_border_width_set(Ecore_X_Window win, - int width) + int width) { LOGFN(__FILE__, __LINE__, __FUNCTION__); /* doesn't make sense to call this on a root window */ @@ -754,7 +754,7 @@ ecore_x_window_border_width_set(Ecore_X_Window win, return; XSetWindowBorderWidth (_ecore_x_disp, win, width); -} /* ecore_x_window_border_width_set */ +} /** * Retrieves the depth of the given window. @@ -766,7 +766,7 @@ ecore_x_window_depth_get(Ecore_X_Window win) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_drawable_depth_get(win); -} /* ecore_x_window_depth_get */ +} /** * To be documented. @@ -775,7 +775,7 @@ ecore_x_window_depth_get(Ecore_X_Window win) */ EAPI void ecore_x_window_cursor_show(Ecore_X_Window win, - Eina_Bool show) + Eina_Bool show) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) @@ -803,7 +803,7 @@ ecore_x_window_cursor_show(Ecore_X_Window win, } else XDefineCursor(_ecore_x_disp, win, 0); -} /* ecore_x_window_cursor_show */ +} EAPI void ecore_x_window_cursor_set(Ecore_X_Window win, @@ -814,7 +814,7 @@ ecore_x_window_cursor_set(Ecore_X_Window win, XUndefineCursor(_ecore_x_disp, win); else XDefineCursor(_ecore_x_disp, win, c); -} /* ecore_x_window_cursor_set */ +} /** * Finds out whether the given window is currently visible. @@ -830,7 +830,7 @@ ecore_x_window_visible_get(Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); return XGetWindowAttributes(_ecore_x_disp, win, &attr) && (attr.map_state == IsViewable); -} /* ecore_x_window_visible_get */ +} typedef struct _Shadow Shadow; struct _Shadow @@ -914,7 +914,7 @@ _ecore_x_window_tree_walk(Window win) XFree(list); return s; -} /* _ecore_x_window_tree_walk */ +} static void _ecore_x_window_tree_shadow_free1(Shadow *s) @@ -935,7 +935,7 @@ _ecore_x_window_tree_shadow_free1(Shadow *s) } free(s); -} /* _ecore_x_window_tree_shadow_free1 */ +} static void _ecore_x_window_tree_shadow_free(void) @@ -955,7 +955,7 @@ _ecore_x_window_tree_shadow_free(void) free(shadow_base); shadow_base = NULL; shadow_num = 0; -} /* _ecore_x_window_tree_shadow_free */ +} static void _ecore_x_window_tree_shadow_populate(void) @@ -976,7 +976,7 @@ _ecore_x_window_tree_shadow_populate(void) free(roots); } -} /* _ecore_x_window_tree_shadow_populate */ +} /* static int shadow_count = 0; @@ -1000,7 +1000,7 @@ _ecore_x_window_tree_shadow_populate(void) static Shadow * _ecore_x_window_shadow_tree_find_shadow(Shadow *s, - Window win) + Window win) { Shadow *ss; int i; @@ -1020,7 +1020,7 @@ _ecore_x_window_shadow_tree_find_shadow(Shadow *s, } return NULL; -} /* _ecore_x_window_shadow_tree_find_shadow */ +} static Shadow * _ecore_x_window_shadow_tree_find(Window base) @@ -1037,16 +1037,16 @@ _ecore_x_window_shadow_tree_find(Window base) return s; } return NULL; -} /* _ecore_x_window_shadow_tree_find */ +} static int -_inside_rects(Shadow *s, - int x, - int y, - int bx, - int by, +_inside_rects(Shadow *s, + int x, + int y, + int bx, + int by, Ecore_X_Rectangle *rects, - int num) + int num) { int i, inside; @@ -1068,13 +1068,13 @@ _inside_rects(Shadow *s, } static Window -_ecore_x_window_shadow_tree_at_xy_get_shadow(Shadow *s, - int bx, - int by, - int x, - int y, +_ecore_x_window_shadow_tree_at_xy_get_shadow(Shadow *s, + int bx, + int by, + int x, + int y, Ecore_X_Window *skip, - int skip_num) + int skip_num) { Window child; int i, j; @@ -1131,16 +1131,16 @@ onward: } return s->win; -} /* _ecore_x_window_shadow_tree_at_xy_get_shadow */ +} static Window -_ecore_x_window_shadow_tree_at_xy_get(Window base, - int bx, - int by, - int x, - int y, +_ecore_x_window_shadow_tree_at_xy_get(Window base, + int bx, + int by, + int x, + int y, Ecore_X_Window *skip, - int skip_num) + int skip_num) { Shadow *s; @@ -1162,7 +1162,7 @@ _ecore_x_window_shadow_tree_at_xy_get(Window base, y, skip, skip_num); -} /* _ecore_x_window_shadow_tree_at_xy_get */ +} /** * Retrieves the top, visible window at the given location, @@ -1177,11 +1177,11 @@ _ecore_x_window_shadow_tree_at_xy_get(Window base, * @ingroup Ecore_X_Window_Geometry_Group */ EAPI Ecore_X_Window -ecore_x_window_shadow_tree_at_xy_with_skip_get(Ecore_X_Window base, - int x, - int y, +ecore_x_window_shadow_tree_at_xy_with_skip_get(Ecore_X_Window base, + int x, + int y, Ecore_X_Window *skip, - int skip_num) + int skip_num) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_window_shadow_tree_at_xy_get(base, @@ -1191,7 +1191,7 @@ ecore_x_window_shadow_tree_at_xy_with_skip_get(Ecore_X_Window base, y, skip, skip_num); -} /* ecore_x_window_shadow_tree_at_xy_with_skip_get */ +} /** * Retrieves the parent window a given window has. This uses the shadow window @@ -1231,7 +1231,7 @@ ecore_x_window_shadow_parent_get(Ecore_X_Window root __UNUSED__, } } return 0; -} /* ecore_x_window_shadow_parent_get */ +} /** * Flushes the window shadow tree so nothing is stored. @@ -1242,7 +1242,7 @@ ecore_x_window_shadow_tree_flush(void) { LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_tree_shadow_free(); -} /* ecore_x_window_shadow_tree_flush */ +} /** * Retrieves the root window a given window is on. @@ -1260,16 +1260,16 @@ ecore_x_window_root_get(Ecore_X_Window win) return 0; return att.root; -} /* ecore_x_window_root_get */ +} static Window -_ecore_x_window_at_xy_get(Window base, - int bx, - int by, - int x, - int y, +_ecore_x_window_at_xy_get(Window base, + int bx, + int by, + int x, + int y, Ecore_X_Window *skip, - int skip_num) + int skip_num) { Window *list = NULL; Window parent_win = 0, child = 0, root_win = 0; @@ -1324,7 +1324,7 @@ onward: } return base; -} /* _ecore_x_window_at_xy_get */ +} /** * Retrieves the top, visible window at the given location. @@ -1349,7 +1349,7 @@ ecore_x_window_at_xy_get(int x, ecore_x_ungrab(); return win ? win : root; -} /* ecore_x_window_at_xy_get */ +} /** * Retrieves the top, visible window at the given location, @@ -1360,10 +1360,10 @@ ecore_x_window_at_xy_get(int x, * @ingroup Ecore_X_Window_Geometry_Group */ EAPI Ecore_X_Window -ecore_x_window_at_xy_with_skip_get(int x, - int y, +ecore_x_window_at_xy_with_skip_get(int x, + int y, Ecore_X_Window *skip, - int skip_num) + int skip_num) { Ecore_X_Window win, root; @@ -1377,12 +1377,12 @@ ecore_x_window_at_xy_with_skip_get(int x, ecore_x_ungrab(); return win ? win : root; -} /* ecore_x_window_at_xy_with_skip_get */ +} EAPI Ecore_X_Window ecore_x_window_at_xy_begin_get(Ecore_X_Window begin, - int x, - int y) + int x, + int y) { Ecore_X_Window win; @@ -1392,7 +1392,7 @@ ecore_x_window_at_xy_begin_get(Ecore_X_Window begin, ecore_x_ungrab(); return win ? win : begin; -} /* ecore_x_window_at_xy_begin_get */ +} /** * Retrieves the parent window of the given window. @@ -1414,7 +1414,7 @@ ecore_x_window_parent_get(Ecore_X_Window win) XFree(children); return parent; -} /* ecore_x_window_parent_get */ +} /** * Sets the background color of the given window. @@ -1443,10 +1443,10 @@ ecore_x_window_background_color_set(Ecore_X_Window win, attr.background_pixel = col.pixel; XChangeWindowAttributes(_ecore_x_disp, win, CWBackPixel, &attr); -} /* ecore_x_window_background_color_set */ +} EAPI void -ecore_x_window_gravity_set(Ecore_X_Window win, +ecore_x_window_gravity_set(Ecore_X_Window win, Ecore_X_Gravity grav) { XSetWindowAttributes att; @@ -1454,10 +1454,10 @@ ecore_x_window_gravity_set(Ecore_X_Window win, LOGFN(__FILE__, __LINE__, __FUNCTION__); att.win_gravity = grav; XChangeWindowAttributes(_ecore_x_disp, win, CWWinGravity, &att); -} /* ecore_x_window_gravity_set */ +} EAPI void -ecore_x_window_pixel_gravity_set(Ecore_X_Window win, +ecore_x_window_pixel_gravity_set(Ecore_X_Window win, Ecore_X_Gravity grav) { XSetWindowAttributes att; @@ -1465,7 +1465,7 @@ ecore_x_window_pixel_gravity_set(Ecore_X_Window win, LOGFN(__FILE__, __LINE__, __FUNCTION__); att.bit_gravity = grav; XChangeWindowAttributes(_ecore_x_disp, win, CWBitGravity, &att); -} /* ecore_x_window_pixel_gravity_set */ +} EAPI void ecore_x_window_pixmap_set(Ecore_X_Window win, @@ -1473,50 +1473,50 @@ ecore_x_window_pixmap_set(Ecore_X_Window win, { LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetWindowBackgroundPixmap(_ecore_x_disp, win, pmap); -} /* ecore_x_window_pixmap_set */ +} EAPI void ecore_x_window_area_clear(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XClearArea(_ecore_x_disp, win, x, y, w, h, False); -} /* ecore_x_window_area_clear */ +} EAPI void ecore_x_window_area_expose(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XClearArea(_ecore_x_disp, win, x, y, w, h, True); -} /* ecore_x_window_area_expose */ +} EAPI void ecore_x_window_override_set(Ecore_X_Window win, - Eina_Bool override) + Eina_Bool override) { XSetWindowAttributes att; LOGFN(__FILE__, __LINE__, __FUNCTION__); att.override_redirect = override; XChangeWindowAttributes(_ecore_x_disp, win, CWOverrideRedirect, &att); -} /* ecore_x_window_override_set */ +} #ifdef ECORE_XRENDER static Ecore_X_Window _ecore_x_window_argb_internal_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h, - Eina_Bool override, - Eina_Bool saveunder) + int x, + int y, + int w, + int h, + Eina_Bool override, + Eina_Bool saveunder) { Window win; XSetWindowAttributes attr; @@ -1535,15 +1535,15 @@ _ecore_x_window_argb_internal_new(Ecore_X_Window parent, else { /* ewww - round trip */ - XGetWindowAttributes(_ecore_x_disp, parent, &att); - for (i = 0; i < ScreenCount(_ecore_x_disp); i++) - { - if (att.screen == ScreenOfDisplay(_ecore_x_disp, i)) - { - scr = i; - break; - } - } + XGetWindowAttributes(_ecore_x_disp, parent, &att); + for (i = 0; i < ScreenCount(_ecore_x_disp); i++) + { + if (att.screen == ScreenOfDisplay(_ecore_x_disp, i)) + { + scr = i; + break; + } + } } vi_in.screen = scr; @@ -1615,7 +1615,7 @@ _ecore_x_window_argb_internal_new(Ecore_X_Window parent, ecore_x_window_defaults_set(win); return win; -} /* _ecore_x_window_argb_internal_new */ +} #endif /* ifdef ECORE_XRENDER */ @@ -1641,7 +1641,7 @@ ecore_x_window_argb_get(Ecore_X_Window win) #else /* ifdef ECORE_XRENDER */ return 0; #endif /* ifdef ECORE_XRENDER */ -} /* ecore_x_window_argb_get */ +} /** * Creates a new window. @@ -1656,10 +1656,10 @@ ecore_x_window_argb_get(Ecore_X_Window win) */ EAPI Ecore_X_Window ecore_x_window_manager_argb_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ECORE_XRENDER LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -1667,7 +1667,7 @@ ecore_x_window_manager_argb_new(Ecore_X_Window parent, #else /* ifdef ECORE_XRENDER */ return 0; #endif /* ifdef ECORE_XRENDER */ -} /* ecore_x_window_manager_argb_new */ +} /** * Creates a new window. @@ -1682,10 +1682,10 @@ ecore_x_window_manager_argb_new(Ecore_X_Window parent, */ EAPI Ecore_X_Window ecore_x_window_argb_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ECORE_XRENDER LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -1693,7 +1693,7 @@ ecore_x_window_argb_new(Ecore_X_Window parent, #else /* ifdef ECORE_XRENDER */ return 0; #endif /* ifdef ECORE_XRENDER */ -} /* ecore_x_window_argb_new */ +} /** * Creates a window with the override redirect attribute set to @c True. @@ -1708,10 +1708,10 @@ ecore_x_window_argb_new(Ecore_X_Window parent, */ EAPI Ecore_X_Window ecore_x_window_override_argb_new(Ecore_X_Window parent, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ECORE_XRENDER LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -1719,5 +1719,5 @@ ecore_x_window_override_argb_new(Ecore_X_Window parent, #else /* ifdef ECORE_XRENDER */ return 0; #endif /* ifdef ECORE_XRENDER */ -} /* ecore_x_window_override_argb_new */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c index 8d5c757..b581a0e 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c @@ -21,9 +21,9 @@ */ EAPI void ecore_x_window_prop_card32_set(Ecore_X_Window win, - Ecore_X_Atom atom, - unsigned int *val, - unsigned int num) + Ecore_X_Atom atom, + unsigned int *val, + unsigned int num) { #if SIZEOF_INT == SIZEOF_LONG _ATOM_SET_CARD32(win, atom, val, num); @@ -41,7 +41,7 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win, _ATOM_SET_CARD32(win, atom, v2, num); free(v2); #endif /* if SIZEOF_INT == SIZEOF_LONG */ -} /* ecore_x_window_prop_card32_set */ +} /* * Get CARD32 (array) property @@ -53,9 +53,9 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_card32_get(Ecore_X_Window win, - Ecore_X_Atom atom, - unsigned int *val, - unsigned int len) + Ecore_X_Atom atom, + unsigned int *val, + unsigned int len) { unsigned char *prop_ret; Atom type_ret; @@ -89,7 +89,7 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win, XFree(prop_ret); return num; -} /* ecore_x_window_prop_card32_get */ +} /* * Get CARD32 (array) property of any length @@ -100,7 +100,7 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_card32_list_get(Ecore_X_Window win, - Ecore_X_Atom atom, + Ecore_X_Atom atom, unsigned int **plst) { unsigned char *prop_ret; @@ -125,7 +125,7 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win, else { val = malloc(num_ret * sizeof(unsigned int)); - if (!val) + if (!val) { if (prop_ret) XFree(prop_ret); return -1; @@ -140,17 +140,17 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win, XFree(prop_ret); return num; -} /* ecore_x_window_prop_card32_list_get */ +} /* * Set X ID (array) property */ EAPI void ecore_x_window_prop_xid_set(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom type, - Ecore_X_ID *lst, - unsigned int num) + Ecore_X_Atom atom, + Ecore_X_Atom type, + Ecore_X_ID *lst, + unsigned int num) { #if SIZEOF_INT == SIZEOF_LONG XChangeProperty(_ecore_x_disp, win, atom, type, 32, PropModeReplace, @@ -170,7 +170,7 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win, (unsigned char *)pl, num); free(pl); #endif /* if SIZEOF_INT == SIZEOF_LONG */ -} /* ecore_x_window_prop_xid_set */ +} /* * Get X ID (array) property @@ -182,10 +182,10 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_xid_get(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom type, - Ecore_X_ID *lst, - unsigned int len) + Ecore_X_Atom atom, + Ecore_X_Atom type, + Ecore_X_ID *lst, + unsigned int len) { unsigned char *prop_ret; Atom type_ret; @@ -219,7 +219,7 @@ ecore_x_window_prop_xid_get(Ecore_X_Window win, XFree(prop_ret); return num; -} /* ecore_x_window_prop_xid_get */ +} /* * Get X ID (array) property @@ -231,9 +231,9 @@ ecore_x_window_prop_xid_get(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_xid_list_get(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom type, - Ecore_X_ID **val) + Ecore_X_Atom atom, + Ecore_X_Atom type, + Ecore_X_ID **val) { unsigned char *prop_ret; Atom type_ret; @@ -268,17 +268,17 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win, XFree(prop_ret); return num; -} /* ecore_x_window_prop_xid_list_get */ +} /* * Remove/add/toggle X ID list item. */ EAPI void ecore_x_window_prop_xid_list_change(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom type, - Ecore_X_ID item, - int op) + Ecore_X_Atom atom, + Ecore_X_Atom type, + Ecore_X_ID item, + int op) { Ecore_X_ID *lst; int i, num; @@ -300,22 +300,22 @@ ecore_x_window_prop_xid_list_change(Ecore_X_Window win, if (i < num) { /* Was in list */ - if (op == ECORE_X_PROP_LIST_ADD) - goto done; /* Remove it */ + if (op == ECORE_X_PROP_LIST_ADD) + goto done; /* Remove it */ - num--; - for (; i < num; i++) - lst[i] = lst[i + 1]; + num--; + for (; i < num; i++) + lst[i] = lst[i + 1]; } else { /* Was not in list */ - if (op == ECORE_X_PROP_LIST_REMOVE) - goto done; /* Add it */ + if (op == ECORE_X_PROP_LIST_REMOVE) + goto done; /* Add it */ - num++; - lst = realloc(lst, num * sizeof(Ecore_X_ID)); - lst[i] = item; + num++; + lst = realloc(lst, num * sizeof(Ecore_X_ID)); + lst[i] = item; } ecore_x_window_prop_xid_set(win, atom, type, lst, num); @@ -323,20 +323,20 @@ ecore_x_window_prop_xid_list_change(Ecore_X_Window win, done: if (lst) free(lst); -} /* ecore_x_window_prop_xid_list_change */ +} /* * Set Atom (array) property */ EAPI void ecore_x_window_prop_atom_set(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom *lst, - unsigned int num) + Ecore_X_Atom atom, + Ecore_X_Atom *lst, + unsigned int num) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_xid_set(win, atom, XA_ATOM, lst, num); -} /* ecore_x_window_prop_atom_set */ +} /* * Get Atom (array) property @@ -348,13 +348,13 @@ ecore_x_window_prop_atom_set(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_atom_get(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom *lst, - unsigned int len) + Ecore_X_Atom atom, + Ecore_X_Atom *lst, + unsigned int len) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_xid_get(win, atom, XA_ATOM, lst, len); -} /* ecore_x_window_prop_atom_get */ +} /* * Get Atom (array) property @@ -366,38 +366,38 @@ ecore_x_window_prop_atom_get(Ecore_X_Window win, */ EAPI int ecore_x_window_prop_atom_list_get(Ecore_X_Window win, - Ecore_X_Atom atom, + Ecore_X_Atom atom, Ecore_X_Atom **plst) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_xid_list_get(win, atom, XA_ATOM, plst); -} /* ecore_x_window_prop_atom_list_get */ +} /* * Remove/add/toggle atom list item. */ EAPI void ecore_x_window_prop_atom_list_change(Ecore_X_Window win, - Ecore_X_Atom atom, - Ecore_X_Atom item, - int op) + Ecore_X_Atom atom, + Ecore_X_Atom item, + int op) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_xid_list_change(win, atom, XA_ATOM, item, op); -} /* ecore_x_window_prop_atom_list_change */ +} /* * Set Window (array) property */ EAPI void -ecore_x_window_prop_window_set(Ecore_X_Window win, - Ecore_X_Atom atom, +ecore_x_window_prop_window_set(Ecore_X_Window win, + Ecore_X_Atom atom, Ecore_X_Window *lst, - unsigned int num) + unsigned int num) { LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_xid_set(win, atom, XA_WINDOW, lst, num); -} /* ecore_x_window_prop_window_set */ +} /* * Get Window (array) property @@ -408,14 +408,14 @@ ecore_x_window_prop_window_set(Ecore_X_Window win, * Note: Return value 0 means that the property exists but has no elements. */ EAPI int -ecore_x_window_prop_window_get(Ecore_X_Window win, - Ecore_X_Atom atom, +ecore_x_window_prop_window_get(Ecore_X_Window win, + Ecore_X_Atom atom, Ecore_X_Window *lst, - unsigned int len) + unsigned int len) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_xid_get(win, atom, XA_WINDOW, lst, len); -} /* ecore_x_window_prop_window_get */ +} /* * Get Window (array) property @@ -426,13 +426,13 @@ ecore_x_window_prop_window_get(Ecore_X_Window win, * Note: Return value 0 means that the property exists but has no elements. */ EAPI int -ecore_x_window_prop_window_list_get(Ecore_X_Window win, - Ecore_X_Atom atom, +ecore_x_window_prop_window_list_get(Ecore_X_Window win, + Ecore_X_Atom atom, Ecore_X_Window **plst) { LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_xid_list_get(win, atom, XA_WINDOW, plst); -} /* ecore_x_window_prop_window_list_get */ +} /** * To be documented. @@ -443,7 +443,7 @@ EAPI Ecore_X_Atom ecore_x_window_prop_any_type(void) { return AnyPropertyType; -} /* ecore_x_window_prop_any_type */ +} /** * To be documented. @@ -452,11 +452,11 @@ ecore_x_window_prop_any_type(void) */ EAPI void ecore_x_window_prop_property_set(Ecore_X_Window win, - Ecore_X_Atom property, - Ecore_X_Atom type, - int size, - void *data, - int number) + Ecore_X_Atom property, + Ecore_X_Atom type, + int size, + void *data, + int number) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) @@ -479,13 +479,14 @@ ecore_x_window_prop_property_set(Ecore_X_Window win, dat = malloc(sizeof(unsigned long) * number); if (dat) { - for (ptr = (int *)data, i = 0; i < number; i++) dat[i] = ptr[i]; + for (ptr = (int *)data, i = 0; i < number; i++) + dat[i] = ptr[i]; XChangeProperty(_ecore_x_disp, win, property, type, size, PropModeReplace, (unsigned char *)dat, number); free(dat); } } -} /* ecore_x_window_prop_property_set */ +} /** * To be documented. @@ -493,12 +494,12 @@ ecore_x_window_prop_property_set(Ecore_X_Window win, * FIXME: To be fixed. */ EAPI int -ecore_x_window_prop_property_get(Ecore_X_Window win, - Ecore_X_Atom property, - Ecore_X_Atom type, - int size __UNUSED__, +ecore_x_window_prop_property_get(Ecore_X_Window win, + Ecore_X_Atom property, + Ecore_X_Atom type, + int size __UNUSED__, unsigned char **data, - int *num) + int *num) { Atom type_ret = 0; int ret, size_ret = 0; @@ -552,7 +553,7 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, for (i = 0; i < num_ret; i++) ((unsigned int *)*data)[i] = ((unsigned long *)prop_ret)[i]; break; - } /* switch */ + } XFree(prop_ret); @@ -560,19 +561,19 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, *num = num_ret; return size_ret; -} /* ecore_x_window_prop_property_get */ +} EAPI void ecore_x_window_prop_property_del(Ecore_X_Window win, - Ecore_X_Atom property) + Ecore_X_Atom property) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XDeleteProperty(_ecore_x_disp, win, property); -} /* ecore_x_window_prop_property_del */ +} EAPI Ecore_X_Atom * ecore_x_window_prop_list(Ecore_X_Window win, - int *num_ret) + int *num_ret) { Ecore_X_Atom *atoms; Atom *atom_ret; @@ -589,14 +590,15 @@ ecore_x_window_prop_list(Ecore_X_Window win, atoms = malloc(num * sizeof(Ecore_X_Atom)); if (atoms) { - for (i = 0; i < num; i++) atoms[i] = atom_ret[i]; + for (i = 0; i < num; i++) + atoms[i] = atom_ret[i]; if (num_ret) *num_ret = num; } XFree(atom_ret); return atoms; -} /* ecore_x_window_prop_list */ +} /** * Set a window string property. @@ -608,8 +610,8 @@ ecore_x_window_prop_list(Ecore_X_Window win, */ EAPI void ecore_x_window_prop_string_set(Ecore_X_Window win, - Ecore_X_Atom type, - const char *str) + Ecore_X_Atom type, + const char *str) { XTextProperty xtp; @@ -622,7 +624,7 @@ ecore_x_window_prop_string_set(Ecore_X_Window win, xtp.encoding = ECORE_X_ATOM_UTF8_STRING; xtp.nitems = strlen(str); XSetTextProperty(_ecore_x_disp, win, &xtp, type); -} /* ecore_x_window_prop_string_set */ +} /** * Get a window string property. @@ -633,7 +635,7 @@ ecore_x_window_prop_string_set(Ecore_X_Window win, */ EAPI char * ecore_x_window_prop_string_get(Ecore_X_Window win, - Ecore_X_Atom type) + Ecore_X_Atom type) { XTextProperty xtp; char *str = NULL; @@ -673,10 +675,10 @@ ecore_x_window_prop_string_get(Ecore_X_Window win, } return str; -} /* ecore_x_window_prop_string_get */ +} EAPI Eina_Bool -ecore_x_window_prop_protocol_isset(Ecore_X_Window win, +ecore_x_window_prop_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol) { Atom proto, *protos = NULL; @@ -703,7 +705,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, XFree(protos); return ret; -} /* ecore_x_window_prop_protocol_isset */ +} /** * To be documented. @@ -712,7 +714,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, */ EAPI Ecore_X_WM_Protocol * ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, - int *num_ret) + int *num_ret) { Atom *protos = NULL; int i, protos_count = 0; @@ -746,5 +748,5 @@ ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, XFree(protos); *num_ret = protos_count; return prot_ret; -} /* ecore_x_window_prop_protocol_list_get */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c index 2e8f8ce..71718cf 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c @@ -28,7 +28,7 @@ ecore_x_window_shape_mask_set(Ecore_X_Window win, { LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineMask(_ecore_x_disp, win, ShapeBounding, 0, 0, mask, ShapeSet); -} /* ecore_x_window_shape_mask_set */ +} /** * Sets the input shape of the given window to that given by the pixmap @p mask. @@ -48,7 +48,7 @@ ecore_x_window_shape_input_mask_set(Ecore_X_Window win, return; win = mask = 0; #endif /* ifdef ShapeInput */ -} /* ecore_x_window_shape_input_mask_set */ +} EAPI void ecore_x_window_shape_window_set(Ecore_X_Window win, @@ -63,7 +63,7 @@ ecore_x_window_shape_window_set(Ecore_X_Window win, shape_win, ShapeBounding, ShapeSet); -} /* ecore_x_window_shape_window_set */ +} EAPI void ecore_x_window_shape_input_window_set(Ecore_X_Window win, @@ -83,13 +83,13 @@ ecore_x_window_shape_input_window_set(Ecore_X_Window win, return; win = shape_win = 0; #endif -} /* ecore_x_window_shape_input_window_set */ +} EAPI void ecore_x_window_shape_window_set_xy(Ecore_X_Window win, Ecore_X_Window shape_win, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, @@ -100,13 +100,13 @@ ecore_x_window_shape_window_set_xy(Ecore_X_Window win, shape_win, ShapeBounding, ShapeSet); -} /* ecore_x_window_shape_window_set_xy */ +} EAPI void ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win, Ecore_X_Window shape_win, - int x, - int y) + int x, + int y) { #ifdef ShapeInput LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -122,14 +122,14 @@ ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win, return; win = shape_win = x = y = 0; #endif -} /* ecore_x_window_shape_input_window_set_xy */ +} EAPI void ecore_x_window_shape_rectangle_set(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { XRectangle rect; @@ -147,14 +147,14 @@ ecore_x_window_shape_rectangle_set(Ecore_X_Window win, 1, ShapeSet, Unsorted); -} /* ecore_x_window_shape_rectangle_set */ +} EAPI void ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ShapeInput XRectangle rect; @@ -177,12 +177,12 @@ ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win, return; win = x = y = w = h = 0; #endif -} /* ecore_x_window_shape_input_rectangle_set */ +} EAPI void -ecore_x_window_shape_rectangles_set(Ecore_X_Window win, +ecore_x_window_shape_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects, - int num) + int num) { #ifdef ShapeInput XRectangle *rect = NULL; @@ -216,12 +216,12 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win, return; win = rects = num = 0; #endif -} /* ecore_x_window_shape_rectangles_set */ +} EAPI void -ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, +ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects, - int num) + int num) { #ifdef ShapeInput XRectangle *rect = NULL; @@ -255,14 +255,14 @@ ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, return; win = rects = num = 0; #endif -} /* ecore_x_window_shape_input_rectangles_set */ +} EAPI void ecore_x_window_shape_rectangle_subtract(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { XRectangle rect; @@ -280,14 +280,14 @@ ecore_x_window_shape_rectangle_subtract(Ecore_X_Window win, 1, ShapeSubtract, Unsorted); -} /* ecore_x_window_shape_rectangle_subtract */ +} EAPI void ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ShapeInput XRectangle rect; @@ -310,7 +310,7 @@ ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win, return; win = x = y = w = h = 0; #endif -} /* ecore_x_window_shape_input_rectangle_subtract */ +} EAPI void ecore_x_window_shape_window_add(Ecore_X_Window win, @@ -325,13 +325,13 @@ ecore_x_window_shape_window_add(Ecore_X_Window win, shape_win, ShapeBounding, ShapeUnion); -} /* ecore_x_window_shape_window_add */ +} EAPI void ecore_x_window_shape_window_add_xy(Ecore_X_Window win, Ecore_X_Window shape_win, - int x, - int y) + int x, + int y) { LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, @@ -342,13 +342,13 @@ ecore_x_window_shape_window_add_xy(Ecore_X_Window win, shape_win, ShapeBounding, ShapeUnion); -} /* ecore_x_window_shape_window_add_xy */ +} EAPI void ecore_x_window_shape_input_window_add_xy(Ecore_X_Window win, Ecore_X_Window shape_win, - int x, - int y) + int x, + int y) { #ifdef ShapeInput LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -364,14 +364,14 @@ ecore_x_window_shape_input_window_add_xy(Ecore_X_Window win, return; win = shape_win = x = y = 0; #endif -} /* ecore_x_window_shape_input_window_add_xy */ +} EAPI void ecore_x_window_shape_rectangle_add(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { XRectangle rect; @@ -389,14 +389,14 @@ ecore_x_window_shape_rectangle_add(Ecore_X_Window win, 1, ShapeUnion, Unsorted); -} /* ecore_x_window_shape_rectangle_add */ +} EAPI void ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ShapeInput XRectangle rect; @@ -419,14 +419,14 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, return; win = x = y = w = h = 0; #endif -} /* ecore_x_window_shape_input_rectangle_add */ +} EAPI void ecore_x_window_shape_rectangle_clip(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { XRectangle rect; @@ -444,14 +444,14 @@ ecore_x_window_shape_rectangle_clip(Ecore_X_Window win, 1, ShapeIntersect, Unsorted); -} /* ecore_x_window_shape_rectangle_clip */ +} EAPI void ecore_x_window_shape_input_rectangle_clip(Ecore_X_Window win, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { #ifdef ShapeInput XRectangle rect; @@ -474,12 +474,12 @@ ecore_x_window_shape_input_rectangle_clip(Ecore_X_Window win, return; win = x = y = w = h = 0; #endif -} /* ecore_x_window_shape_input_rectangle_clip */ +} EAPI void -ecore_x_window_shape_rectangles_add(Ecore_X_Window win, +ecore_x_window_shape_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle *rects, - int num) + int num) { XRectangle *rect = NULL; int i; @@ -508,12 +508,12 @@ ecore_x_window_shape_rectangles_add(Ecore_X_Window win, ShapeUnion, Unsorted); if (rect) free(rect); -} /* ecore_x_window_shape_rectangles_add */ +} EAPI void -ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, +ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle *rects, - int num) + int num) { #ifdef ShapeInput XRectangle *rect = NULL; @@ -547,11 +547,11 @@ ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, return; win = rects = num = 0; #endif -} /* ecore_x_window_shape_input_rectangles_add */ +} EAPI Ecore_X_Rectangle * ecore_x_window_shape_rectangles_get(Ecore_X_Window win, - int *num_ret) + int *num_ret) { XRectangle *rect; Ecore_X_Rectangle *rects = NULL; @@ -585,11 +585,11 @@ ecore_x_window_shape_rectangles_get(Ecore_X_Window win, } if (num_ret) *num_ret = num; return rects; -} /* ecore_x_window_shape_rectangles_get */ +} EAPI Ecore_X_Rectangle * ecore_x_window_shape_input_rectangles_get(Ecore_X_Window win, - int *num_ret) + int *num_ret) { Ecore_X_Rectangle *rects = NULL; #ifdef ShapeInput @@ -643,16 +643,16 @@ ecore_x_window_shape_input_rectangles_get(Ecore_X_Window win, if (num_ret) *num_ret = 1; return rects; #endif -} /* ecore_x_window_shape_input_rectangles_get */ +} EAPI void ecore_x_window_shape_events_select(Ecore_X_Window win, - Eina_Bool on) + Eina_Bool on) { LOGFN(__FILE__, __LINE__, __FUNCTION__); if (on) XShapeSelectInput(_ecore_x_disp, win, ShapeNotifyMask); else XShapeSelectInput(_ecore_x_disp, win, 0); -} /* ecore_x_window_shape_events_select */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c index 38a81dd..fbfbd43 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c @@ -46,7 +46,7 @@ _ecore_x_input_init(void) _ecore_x_xi2_devs = XIQueryDevice(_ecore_x_disp, XIAllDevices, &_ecore_x_xi2_num); #endif /* ifdef ECORE_XI2 */ -} /* _ecore_x_input_init */ +} void _ecore_x_input_shutdown(void) @@ -61,7 +61,7 @@ _ecore_x_input_shutdown(void) _ecore_x_xi2_num = 0; _ecore_x_xi2_opcode = -1; #endif /* ifdef ECORE_XI2 */ -} /* _ecore_x_input_shutdown */ +} void _ecore_x_input_handler(XEvent *xevent) @@ -205,9 +205,9 @@ _ecore_x_input_handler(XEvent *xevent) #endif default: break; - } /* switch */ + } #endif /* ifdef ECORE_XI2 */ -} /* _ecore_x_input_handler */ +} EAPI Eina_Bool ecore_x_input_multi_select(Ecore_X_Window win) @@ -279,5 +279,5 @@ ecore_x_input_multi_select(Ecore_X_Window win) #else /* ifdef ECORE_XI2 */ return EINA_FALSE; #endif /* ifdef ECORE_XI2 */ -} /* ecore_x_input_multi_select */ +} diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c index 1d956b7..f49a4d3 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c @@ -36,10 +36,10 @@ ecore_x_xinerama_screen_count_get(void) #endif /* ifdef ECORE_XINERAMA */ return 0; -} /* ecore_x_xinerama_screen_count_get */ +} EAPI Eina_Bool -ecore_x_xinerama_screen_geometry_get(int screen, +ecore_x_xinerama_screen_geometry_get(int screen, int *x, int *y, int *w, @@ -87,5 +87,5 @@ ecore_x_xinerama_screen_geometry_get(int screen, return EINA_FALSE; screen = 0; -} /* ecore_x_xinerama_screen_geometry_get */ +} -- cgit v1.1