From b4da8091c714e954aaa54f1a58b43cb9a53d8f94 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 25 Feb 2010 12:19:02 +0000 Subject: [PATCH] add lots of logging functions - for trackign x overhead when u cant get symbols... booo! - disabled of course. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@46458 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/xlib/ecore_x.c | 102 ++++++++++++++++++++-------- src/lib/ecore_x/xlib/ecore_x_atoms.c | 3 + src/lib/ecore_x/xlib/ecore_x_composite.c | 8 +++ src/lib/ecore_x/xlib/ecore_x_cursor.c | 5 ++ src/lib/ecore_x/xlib/ecore_x_damage.c | 4 ++ src/lib/ecore_x/xlib/ecore_x_dnd.c | 11 +++ src/lib/ecore_x/xlib/ecore_x_dpms.c | 11 +++ src/lib/ecore_x/xlib/ecore_x_drawable.c | 4 ++ src/lib/ecore_x/xlib/ecore_x_e.c | 52 ++++++++++++++ src/lib/ecore_x/xlib/ecore_x_events.c | 37 ++++++++-- src/lib/ecore_x/xlib/ecore_x_fixes.c | 44 ++++++++---- src/lib/ecore_x/xlib/ecore_x_gc.c | 2 + src/lib/ecore_x/xlib/ecore_x_icccm.c | 39 ++++++++++- src/lib/ecore_x/xlib/ecore_x_image.c | 5 ++ src/lib/ecore_x/xlib/ecore_x_mwm.c | 2 + src/lib/ecore_x/xlib/ecore_x_netwm.c | 64 +++++++++++++++++ src/lib/ecore_x/xlib/ecore_x_pixmap.c | 8 ++- src/lib/ecore_x/xlib/ecore_x_private.h | 8 +++ src/lib/ecore_x/xlib/ecore_x_randr.c | 11 +++ src/lib/ecore_x/xlib/ecore_x_region.c | 14 +++- src/lib/ecore_x/xlib/ecore_x_screensaver.c | 12 ++++ src/lib/ecore_x/xlib/ecore_x_selection.c | 21 ++++++ src/lib/ecore_x/xlib/ecore_x_sync.c | 25 ++++--- src/lib/ecore_x/xlib/ecore_x_test.c | 3 + src/lib/ecore_x/xlib/ecore_x_window.c | 75 ++++++++++++++------ src/lib/ecore_x/xlib/ecore_x_window_prop.c | 22 ++++++ src/lib/ecore_x/xlib/ecore_x_window_shape.c | 13 ++++ src/lib/ecore_x/xlib/ecore_x_xi2.c | 1 + src/lib/ecore_x/xlib/ecore_x_xinerama.c | 2 + 29 files changed, 526 insertions(+), 82 deletions(-) diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c index ecb3e33..30b5ea3 100644 --- a/src/lib/ecore_x/xlib/ecore_x.c +++ b/src/lib/ecore_x/xlib/ecore_x.c @@ -237,6 +237,7 @@ ecore_x_init(const char *name) if (++_ecore_x_init_count != 1) return _ecore_x_init_count; + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef LOGRT _logrt_init(); #endif @@ -572,6 +573,7 @@ _ecore_x_shutdown(int close_display) return _ecore_x_init_count; if (!_ecore_x_disp) return _ecore_x_init_count; + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ENABLE_XIM if (_ecore_x_ic) @@ -656,6 +658,7 @@ ecore_x_display_get(void) EAPI int ecore_x_fd_get(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return ConnectionNumber(_ecore_x_disp); } @@ -667,6 +670,7 @@ ecore_x_fd_get(void) EAPI Ecore_X_Screen* ecore_x_default_screen_get(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return (Ecore_X_Screen*) DefaultScreenOfDisplay(_ecore_x_disp); } @@ -715,6 +719,7 @@ ecore_x_double_click_time_get(void) EAPI void ecore_x_flush(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFlush(_ecore_x_disp); } @@ -726,6 +731,7 @@ ecore_x_flush(void) EAPI void ecore_x_sync(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSync(_ecore_x_disp, False); } @@ -747,6 +753,7 @@ ecore_x_killall(Ecore_X_Window root) Window *children_r = NULL; unsigned int num_children = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGrabServer(_ecore_x_disp); /* Tranverse window tree starting from root, and drag each * before the firing squad */ @@ -774,6 +781,7 @@ ecore_x_killall(Ecore_X_Window root) EAPI void ecore_x_kill(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XKillClient(_ecore_x_disp, win); } @@ -800,6 +808,7 @@ ecore_x_dpi_get(void) { Screen *s; + LOGFN(__FILE__, __LINE__, __FUNCTION__); s = DefaultScreenOfDisplay(_ecore_x_disp); if (s->mwidth <= 0) return 75; return (((s->width * 254) / s->mwidth) + 5) / 10; @@ -932,6 +941,7 @@ ecore_x_window_root_list(int *num_ret) if (!num_ret) return NULL; *num_ret = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ECORE_XPRINT num = ScreenCount(_ecore_x_disp); if (XpQueryExtension(_ecore_x_disp, &xp_base, &xp_err_base)) @@ -1016,14 +1026,15 @@ ecore_x_window_root_first_get(void) int num; Ecore_X_Window root, *roots = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); roots = ecore_x_window_root_list(&num); - if(!(roots)) return 0; + if (!(roots)) return 0; if (num > 0) - root = roots[0]; + root = roots[0]; else - root = 0; - + root = 0; + free(roots); return root; } @@ -1045,6 +1056,7 @@ ecore_x_window_manage(Ecore_X_Window win) { XWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XGetWindowAttributes(_ecore_x_disp, win, &att) != True) return 0; ecore_x_sync(); _ecore_x_window_manage_failed = 0; @@ -1073,6 +1085,7 @@ ecore_x_window_manage(Ecore_X_Window win) EAPI void ecore_x_window_container_manage(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSelectInput(_ecore_x_disp, win, SubstructureRedirectMask | SubstructureNotifyMask); @@ -1081,6 +1094,7 @@ ecore_x_window_container_manage(Ecore_X_Window win) EAPI void ecore_x_window_client_manage(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSelectInput(_ecore_x_disp, win, PropertyChangeMask | // ResizeRedirectMask | @@ -1096,6 +1110,7 @@ ecore_x_window_client_manage(Ecore_X_Window win) EAPI void ecore_x_window_sniff(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSelectInput(_ecore_x_disp, win, PropertyChangeMask | SubstructureNotifyMask); @@ -1104,6 +1119,7 @@ ecore_x_window_sniff(Ecore_X_Window win) EAPI void ecore_x_window_client_sniff(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSelectInput(_ecore_x_disp, win, PropertyChangeMask | FocusChangeMask | @@ -1124,6 +1140,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att { XWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetWindowAttributes(_ecore_x_disp, win, &att)) return 0; memset(att_ret, 0, sizeof(Ecore_X_Window_Attributes)); att_ret->root = att.root; @@ -1151,12 +1168,14 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att EAPI void ecore_x_window_save_set_add(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XAddToSaveSet(_ecore_x_disp, win); } EAPI void ecore_x_window_save_set_del(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XRemoveFromSaveSet(_ecore_x_disp, win); } @@ -1167,6 +1186,7 @@ ecore_x_window_children_get(Ecore_X_Window win, int *num) Window root_ret = 0, parent_ret = 0, *children_ret = NULL; unsigned int children_ret_num = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XQueryTree(_ecore_x_disp, win, &root_ret, &parent_ret, &children_ret, &children_ret_num)) { @@ -1191,6 +1211,7 @@ ecore_x_window_children_get(Ecore_X_Window win, int *num) EAPI int ecore_x_pointer_control_set(int accel_num, int accel_denom, int threshold) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XChangePointerControl(_ecore_x_disp, 1, 1, accel_num, accel_denom, threshold); } @@ -1198,6 +1219,7 @@ ecore_x_pointer_control_set(int accel_num, int accel_denom, int threshold) EAPI int ecore_x_pointer_control_get(int *accel_num, int *accel_denom, int *threshold) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XGetPointerControl(_ecore_x_disp, accel_num, accel_denom, threshold); } @@ -1205,18 +1227,21 @@ ecore_x_pointer_control_get(int *accel_num, int *accel_denom, int *threshold) EAPI int ecore_x_pointer_mapping_set(unsigned char *map, int nmap) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSetPointerMapping(_ecore_x_disp, map, nmap); } EAPI int ecore_x_pointer_mapping_get(unsigned char *map, int nmap) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XGetPointerMapping(_ecore_x_disp, map, nmap); } EAPI int ecore_x_pointer_grab(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XGrabPointer(_ecore_x_disp, win, False, ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, @@ -1228,6 +1253,7 @@ ecore_x_pointer_grab(Ecore_X_Window win) EAPI int ecore_x_pointer_confine_grab(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XGrabPointer(_ecore_x_disp, win, False, ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, @@ -1239,18 +1265,21 @@ ecore_x_pointer_confine_grab(Ecore_X_Window win) EAPI void ecore_x_pointer_ungrab(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XUngrabPointer(_ecore_x_disp, CurrentTime); } EAPI int ecore_x_pointer_warp(Ecore_X_Window win, int x, int y) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y); } EAPI int ecore_x_keyboard_grab(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XGrabKeyboard(_ecore_x_disp, win, False, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) return 1; @@ -1260,12 +1289,14 @@ ecore_x_keyboard_grab(Ecore_X_Window win) EAPI void ecore_x_keyboard_ungrab(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XUngrabKeyboard(_ecore_x_disp, CurrentTime); } EAPI void ecore_x_grab(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_grab_count++; if (_ecore_x_grab_count == 1) XGrabServer(_ecore_x_disp); } @@ -1273,6 +1304,7 @@ ecore_x_grab(void) EAPI void ecore_x_ungrab(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_grab_count--; if (_ecore_x_grab_count < 0) _ecore_x_grab_count = 0; if (_ecore_x_grab_count == 0) XUngrabServer(_ecore_x_disp); @@ -1286,6 +1318,7 @@ void *_ecore_window_grab_replay_data; EAPI void ecore_x_passive_grab_replay_func_set(int (*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; } @@ -1300,6 +1333,7 @@ ecore_x_window_button_grab(Ecore_X_Window win, int button, unsigned int locks[8]; int i, ev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); b = button; if (b == 0) b = AnyButton; m = _ecore_x_event_modifier(mod); @@ -1371,6 +1405,7 @@ ecore_x_window_button_ungrab(Ecore_X_Window win, int button, unsigned int locks[8]; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); b = button; if (b == 0) b = AnyButton; m = _ecore_x_event_modifier(mod); @@ -1401,6 +1436,7 @@ ecore_x_window_key_grab(Ecore_X_Window win, const char *key, unsigned int locks[8]; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strncmp(key, "Keycode-", 8)) keycode = atoi(key + 8); else @@ -1462,6 +1498,7 @@ ecore_x_window_key_ungrab(Ecore_X_Window win, const char *key, unsigned int locks[8]; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strncmp(key, "Keycode-", 8)) keycode = atoi(key + 8); else @@ -1505,19 +1542,20 @@ 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) { - XEvent xev; - - xev.xclient.window = win; - xev.xclient.type = ClientMessage; - xev.xclient.message_type = type; - xev.xclient.format = 32; - xev.xclient.data.l[0] = d0; - xev.xclient.data.l[1] = d1; - xev.xclient.data.l[2] = d2; - xev.xclient.data.l[3] = d3; - xev.xclient.data.l[4] = d4; - - return XSendEvent(_ecore_x_disp, win, False, mask, &xev); + XEvent xev; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + xev.xclient.window = win; + xev.xclient.type = ClientMessage; + xev.xclient.message_type = type; + xev.xclient.format = 32; + xev.xclient.data.l[0] = d0; + xev.xclient.data.l[1] = d1; + xev.xclient.data.l[2] = d2; + xev.xclient.data.l[3] = d3; + xev.xclient.data.l[4] = d4; + + return XSendEvent(_ecore_x_disp, win, False, mask, &xev); } /** @@ -1534,18 +1572,18 @@ EAPI int ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom type, const void *data, int len) { - XEvent xev; - - xev.xclient.window = win; - xev.xclient.type = ClientMessage; - xev.xclient.message_type = type; - xev.xclient.format = 8; - if (len > 20) - len = 20; - memcpy(xev.xclient.data.b, data, len); - memset(xev.xclient.data.b + len, 0, 20 - len); - - return XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); + XEvent xev; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + xev.xclient.window = win; + xev.xclient.type = ClientMessage; + xev.xclient.message_type = type; + xev.xclient.format = 8; + if (len > 20) len = 20; + memcpy(xev.xclient.data.b, data, len); + memset(xev.xclient.data.b + len, 0, 20 - len); + + return XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev); } EAPI int @@ -1556,6 +1594,7 @@ ecore_x_mouse_move_send(Ecore_X_Window win, int x, int y) Window tw; int rx, ry; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetWindowAttributes(_ecore_x_disp, win, &att); XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); xev.xmotion.type = MotionNotify; @@ -1581,6 +1620,7 @@ ecore_x_mouse_down_send(Ecore_X_Window win, int x, int y, int b) Window tw; int rx, ry; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetWindowAttributes(_ecore_x_disp, win, &att); XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); xev.xbutton.type = ButtonPress; @@ -1606,6 +1646,7 @@ ecore_x_mouse_up_send(Ecore_X_Window win, int x, int y, int b) Window tw; int rx, ry; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetWindowAttributes(_ecore_x_disp, win, &att); XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); xev.xbutton.type = ButtonRelease; @@ -1626,12 +1667,14 @@ ecore_x_mouse_up_send(Ecore_X_Window win, int x, int y, int b) EAPI void ecore_x_focus_reset(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetInputFocus(_ecore_x_disp, PointerRoot, RevertToPointerRoot, CurrentTime); } EAPI void ecore_x_events_allow_all(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XAllowEvents(_ecore_x_disp, AsyncBoth, CurrentTime); } @@ -1649,6 +1692,7 @@ ecore_x_pointer_xy_get(Ecore_X_Window win, int *x, int *y) int rx, ry, wx, wy, ret; unsigned int mask; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = XQueryPointer(_ecore_x_disp, win, &rwin, &cwin, &rx, &ry, &wx, &wy, &mask); if (!ret) wx = wy = -1; if (x) *x = wx; diff --git a/src/lib/ecore_x/xlib/ecore_x_atoms.c b/src/lib/ecore_x/xlib/ecore_x_atoms.c index f4178a4..a4ea219 100644 --- a/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -277,6 +277,7 @@ EAPI Ecore_X_Atom ecore_x_atom_get(const char *name) { if (!_ecore_x_disp) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XInternAtom(_ecore_x_disp, name, False); } @@ -287,6 +288,7 @@ ecore_x_atoms_get(const char **names, int num, Ecore_X_Atom *atoms) int i; if (!_ecore_x_disp) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); atoms_int = alloca(num * sizeof(Atom)); XInternAtoms(_ecore_x_disp, (char **)names, num, False, atoms_int); for (i = 0; i < num; i++) @@ -300,6 +302,7 @@ ecore_x_atom_name_get(Ecore_X_Atom atom) char *xname; if (!_ecore_x_disp) return NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xname = XGetAtomName(_ecore_x_disp, atom); if (!xname) return NULL; diff --git a/src/lib/ecore_x/xlib/ecore_x_composite.c b/src/lib/ecore_x/xlib/ecore_x_composite.c index 8f0176f..617f0fb 100644 --- a/src/lib/ecore_x/xlib/ecore_x_composite.c +++ b/src/lib/ecore_x/xlib/ecore_x_composite.c @@ -28,6 +28,7 @@ _ecore_x_composite_init(void) EAPI int ecore_x_composite_query(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _composite_available; } @@ -37,6 +38,7 @@ ecore_x_composite_redirect_window(Ecore_X_Window win, Ecore_X_Composite_Update_T #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; + LOGFN(__FILE__, __LINE__, __FUNCTION__); switch(type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: @@ -56,6 +58,7 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Upda #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; + LOGFN(__FILE__, __LINE__, __FUNCTION__); switch(type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: @@ -75,6 +78,7 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win, Ecore_X_Composite_Update #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; + LOGFN(__FILE__, __LINE__, __FUNCTION__); switch(type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: @@ -94,6 +98,7 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win, Ecore_X_Composite_Up #ifdef ECORE_XCOMPOSITE int update = CompositeRedirectAutomatic; + LOGFN(__FILE__, __LINE__, __FUNCTION__); switch(type) { case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: @@ -113,6 +118,7 @@ ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win) Ecore_X_Pixmap pixmap = None; #ifdef ECORE_XCOMPOSITE + LOGFN(__FILE__, __LINE__, __FUNCTION__); pixmap = XCompositeNameWindowPixmap(_ecore_x_disp, win); #endif @@ -126,6 +132,7 @@ ecore_x_composite_render_window_enable(Ecore_X_Window root) #ifdef ECORE_XCOMPOSITE XRectangle rect; + LOGFN(__FILE__, __LINE__, __FUNCTION__); win = XCompositeGetOverlayWindow(_ecore_x_disp, root); rect.x = -1; rect.y = -1; @@ -141,6 +148,7 @@ EAPI void ecore_x_composite_render_window_disable(Ecore_X_Window root) { #ifdef ECORE_XCOMPOSITE + LOGFN(__FILE__, __LINE__, __FUNCTION__); XCompositeReleaseOverlayWindow(_ecore_x_disp, root); #endif } diff --git a/src/lib/ecore_x/xlib/ecore_x_cursor.c b/src/lib/ecore_x/xlib/ecore_x_cursor.c index 797b0b8..82c50a0 100644 --- a/src/lib/ecore_x/xlib/ecore_x_cursor.c +++ b/src/lib/ecore_x/xlib/ecore_x_cursor.c @@ -21,6 +21,7 @@ EAPI Ecore_X_Cursor ecore_x_cursor_new(Ecore_X_Window win, int *pixels, int w, int h, int hot_x, int hot_y) { #ifdef ECORE_XCURSOR + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (_ecore_x_xcursor) { Cursor c; @@ -197,6 +198,7 @@ ecore_x_cursor_new(Ecore_X_Window win, int *pixels, int w, int h, int hot_x, int EAPI void ecore_x_cursor_free(Ecore_X_Cursor c) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreeCursor(_ecore_x_disp, c); } @@ -208,6 +210,7 @@ ecore_x_cursor_free(Ecore_X_Cursor c) EAPI Ecore_X_Cursor 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); } @@ -216,6 +219,7 @@ EAPI void ecore_x_cursor_size_set(int size) { #ifdef ECORE_XCURSOR + LOGFN(__FILE__, __LINE__, __FUNCTION__); XcursorSetDefaultSize(_ecore_x_disp, size); #else size = 0; @@ -226,6 +230,7 @@ EAPI int ecore_x_cursor_size_get(void) { #ifdef ECORE_XCURSOR + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XcursorGetDefaultSize(_ecore_x_disp); #else return 0; diff --git a/src/lib/ecore_x/xlib/ecore_x_damage.c b/src/lib/ecore_x/xlib/ecore_x_damage.c index 564b48f..05695ec 100644 --- a/src/lib/ecore_x/xlib/ecore_x_damage.c +++ b/src/lib/ecore_x/xlib/ecore_x_damage.c @@ -22,6 +22,7 @@ _ecore_x_damage_init(void) _damage_major = 1; _damage_minor = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XDamageQueryVersion(_ecore_x_disp, &_damage_major, &_damage_minor)) _damage_available = 1; else @@ -43,6 +44,7 @@ ecore_x_damage_new(Ecore_X_Drawable d, Ecore_X_Damage_Report_Level level) #ifdef ECORE_XDAMAGE Ecore_X_Damage damage; + LOGFN(__FILE__, __LINE__, __FUNCTION__); damage = XDamageCreate(_ecore_x_disp, d, level); return damage; #else @@ -54,6 +56,7 @@ EAPI void ecore_x_damage_free(Ecore_X_Damage damage) { #ifdef ECORE_XDAMAGE + LOGFN(__FILE__, __LINE__, __FUNCTION__); XDamageDestroy(_ecore_x_disp, damage); #endif } @@ -62,6 +65,7 @@ EAPI void ecore_x_damage_subtract(Ecore_X_Damage damage, Ecore_X_Region repair, Ecore_X_Region parts) { #ifdef ECORE_XDAMAGE + LOGFN(__FILE__, __LINE__, __FUNCTION__); XDamageSubtract(_ecore_x_disp, damage, repair, parts); #endif } diff --git a/src/lib/ecore_x/xlib/ecore_x_dnd.c b/src/lib/ecore_x/xlib/ecore_x_dnd.c index 382dff8..1caeb25 100644 --- a/src/lib/ecore_x/xlib/ecore_x_dnd.c +++ b/src/lib/ecore_x/xlib/ecore_x_dnd.c @@ -115,6 +115,7 @@ ecore_x_dnd_aware_set(Ecore_X_Window win, int on) { Ecore_X_Atom prop_data = ECORE_X_DND_VERSION; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (on) ecore_x_window_prop_property_set(win, ECORE_X_ATOM_XDND_AWARE, XA_ATOM, 32, &prop_data, 1); @@ -128,6 +129,7 @@ ecore_x_dnd_version_get(Ecore_X_Window win) unsigned char *prop_data; int num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); // this looks hacky - and it is, but we need a way of caching info about // a window while dragging, because we literally query this every mouse // move and going to and from x multiple times per move is EXPENSIVE @@ -181,6 +183,7 @@ ecore_x_dnd_type_isset(Ecore_X_Window win, const char *type) unsigned char *data; Ecore_X_Atom *atoms, atom; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST, XA_ATOM, 32, &data, &num)) return ret; @@ -210,11 +213,13 @@ ecore_x_dnd_type_set(Ecore_X_Window win, const char *type, int on) unsigned char *data = NULL; unsigned char *old_data = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); atom = ecore_x_atom_get(type); ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST, XA_ATOM, 32, &old_data, &num); oldset = (Ecore_X_Atom *)old_data; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (on) { if (ecore_x_dnd_type_isset(win, type)) @@ -266,6 +271,7 @@ ecore_x_dnd_types_set(Ecore_X_Window win, const char **types, unsigned int num_t unsigned int i; unsigned char *data = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!num_types) { ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_TYPE_LIST); @@ -292,6 +298,7 @@ ecore_x_dnd_actions_set(Ecore_X_Window win, Ecore_X_Atom *actions, unsigned int unsigned int i; unsigned char *data = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!num_actions) { ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_ACTION_LIST); @@ -324,6 +331,7 @@ EAPI int ecore_x_dnd_begin(Ecore_X_Window source, unsigned char *data, int size) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_dnd_version_get(source)) return 0; @@ -360,6 +368,7 @@ ecore_x_dnd_drop(void) XEvent xev; int status = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (_source->dest) { xev.xany.type = ClientMessage; @@ -407,6 +416,7 @@ ecore_x_dnd_send_status(int will_accept, int suppress, Ecore_X_Rectangle rectang if (_target->state == ECORE_X_DND_TARGET_IDLE) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); memset(&xev, 0, sizeof(XEvent)); _target->will_accept = will_accept; @@ -454,6 +464,7 @@ ecore_x_dnd_send_finished(void) if (_target->state == ECORE_X_DND_TARGET_IDLE) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xany.type = ClientMessage; xev.xany.display = _ecore_x_disp; xev.xclient.message_type = ECORE_X_ATOM_XDND_FINISHED; diff --git a/src/lib/ecore_x/xlib/ecore_x_dpms.c b/src/lib/ecore_x/xlib/ecore_x_dpms.c index b7583bc..3b15dbc 100644 --- a/src/lib/ecore_x/xlib/ecore_x_dpms.c +++ b/src/lib/ecore_x/xlib/ecore_x_dpms.c @@ -54,6 +54,7 @@ EAPI int ecore_x_dpms_capable_get(void) { #ifdef ECORE_XDPMS + LOGFN(__FILE__, __LINE__, __FUNCTION__); return DPMSCapable(_ecore_x_disp); #else return 0; @@ -72,6 +73,7 @@ ecore_x_dpms_enabled_get(void) unsigned char state; unsigned short power_lvl; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSInfo(_ecore_x_disp, &power_lvl, &state); return state; #else @@ -88,6 +90,7 @@ EAPI void ecore_x_dpms_enabled_set(int enabled) { #ifdef ECORE_XDPMS + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (enabled) DPMSEnable(_ecore_x_disp); else @@ -106,6 +109,7 @@ EAPI void ecore_x_dpms_timeouts_get(unsigned int *standby, unsigned int *suspend, unsigned int *off) { #ifdef ECORE_XDPMS + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, (unsigned short *)suspend, (unsigned short *)off); #endif @@ -122,6 +126,7 @@ EAPI int ecore_x_dpms_timeouts_set(unsigned int standby, unsigned int suspend, unsigned int off) { #ifdef ECORE_XDPMS + LOGFN(__FILE__, __LINE__, __FUNCTION__); return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off); #else return 0; @@ -139,6 +144,7 @@ ecore_x_dpms_timeout_standby_get() #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); return standby; #else @@ -158,6 +164,7 @@ ecore_x_dpms_timeout_suspend_get() #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); return suspend; #else @@ -177,6 +184,7 @@ ecore_x_dpms_timeout_off_get() #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); return off; #else @@ -195,6 +203,7 @@ ecore_x_dpms_timeout_standby_set(unsigned int new_timeout) #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off); #endif @@ -211,6 +220,7 @@ ecore_x_dpms_timeout_suspend_set(unsigned int new_timeout) #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off); #endif @@ -227,6 +237,7 @@ ecore_x_dpms_timeout_off_set(unsigned int new_timeout) #ifdef ECORE_XDPMS unsigned short standby, suspend, off; + LOGFN(__FILE__, __LINE__, __FUNCTION__); DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout); #endif diff --git a/src/lib/ecore_x/xlib/ecore_x_drawable.c b/src/lib/ecore_x/xlib/ecore_x_drawable.c index 3daa54a..91d7959 100644 --- a/src/lib/ecore_x/xlib/ecore_x_drawable.c +++ b/src/lib/ecore_x/xlib/ecore_x_drawable.c @@ -32,6 +32,7 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h int ret_x, ret_y; unsigned int ret_w, ret_h, dummy_border, dummy_depth; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &ret_x, &ret_y, &ret_w, &ret_h, &dummy_border, &dummy_depth)) { @@ -60,6 +61,7 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d) int dummy_x, dummy_y; unsigned int dummy_w, dummy_h, border_ret, dummy_depth; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y, &dummy_w, &dummy_h, &border_ret, &dummy_depth)) border_ret = 0; @@ -80,6 +82,7 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d) int dummy_x, dummy_y; unsigned int dummy_w, dummy_h, dummy_border, depth_ret; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y, &dummy_w, &dummy_h, &dummy_border, &depth_ret)) depth_ret = 0; @@ -99,5 +102,6 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height); } diff --git a/src/lib/ecore_x/xlib/ecore_x_e.c b/src/lib/ecore_x/xlib/ecore_x_e.c index 7c290f1..c2dcfaf 100644 --- a/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/src/lib/ecore_x/xlib/ecore_x_e.c @@ -25,6 +25,7 @@ ecore_x_e_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb) { unsigned int frames[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); frames[0] = fl; frames[1] = fr; frames[2] = ft; @@ -35,6 +36,7 @@ ecore_x_e_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb) EAPI void ecore_x_e_virtual_keyboard_set(Ecore_X_Window win, unsigned int is_keyboard) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, &is_keyboard, 1); } @@ -44,6 +46,7 @@ ecore_x_e_virtual_keyboard_get(Ecore_X_Window win) { unsigned int val; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, &val, 1)) return 0; return val; @@ -130,6 +133,7 @@ ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win, Ecore_X_Virtual_Keyboar { Ecore_X_Atom atom = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); atom = _ecore_x_e_vkbd_atom_get(state); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, &atom, 1); @@ -140,6 +144,7 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win) { Ecore_X_Atom atom; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, &atom, 1)) return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN; @@ -149,6 +154,7 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win) EAPI void ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, Ecore_X_Virtual_Keyboard_State state) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_vkbd_atom_get(state), @@ -187,6 +193,7 @@ _ecore_x_e_illume_mode_get(Ecore_X_Atom atom) EAPI void ecore_x_e_illume_zone_set(Ecore_X_Window win, Ecore_X_Window zone) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE, &zone, 1); } @@ -196,6 +203,7 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win) { Ecore_X_Window zone; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_window_get(win, ECORE_X_ATOM_E_ILLUME_ZONE, &zone, 1)) return 0; return zone; @@ -204,6 +212,7 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_zone_list_set(Ecore_X_Window win, Ecore_X_Window *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); } @@ -211,6 +220,7 @@ ecore_x_e_illume_zone_list_set(Ecore_X_Window win, Ecore_X_Window *zones, unsign EAPI void ecore_x_e_illume_conformant_set(Ecore_X_Window win, unsigned int is_conformant) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, &is_conformant, 1); } @@ -220,6 +230,7 @@ ecore_x_e_illume_conformant_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, &val, 1)) return 0; @@ -231,6 +242,7 @@ ecore_x_e_illume_mode_set(Ecore_X_Window win, Ecore_X_Illume_Mode mode) { Ecore_X_Atom atom = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); atom = _ecore_x_e_illume_atom_get(mode); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1); @@ -241,6 +253,7 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win) { Ecore_X_Atom atom = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1)) return ECORE_X_ILLUME_MODE_UNKNOWN; return _ecore_x_e_illume_mode_get(atom); @@ -249,6 +262,7 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_mode_send(Ecore_X_Window win, Ecore_X_Illume_Mode mode) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_MODE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_illume_atom_get(mode), @@ -258,6 +272,7 @@ ecore_x_e_illume_mode_send(Ecore_X_Window win, Ecore_X_Illume_Mode mode) EAPI void ecore_x_e_illume_focus_back_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_BACK, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -266,6 +281,7 @@ ecore_x_e_illume_focus_back_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_focus_forward_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -274,6 +290,7 @@ ecore_x_e_illume_focus_forward_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_focus_home_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_HOME, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -282,6 +299,7 @@ ecore_x_e_illume_focus_home_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_close_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_CLOSE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -290,6 +308,7 @@ ecore_x_e_illume_close_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_home_new_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_NEW, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -298,6 +317,7 @@ ecore_x_e_illume_home_new_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_home_del_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_DEL, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -306,6 +326,7 @@ ecore_x_e_illume_home_del_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_drag_set(Ecore_X_Window win, unsigned int drag) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1); } @@ -314,6 +335,7 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG, &val, 1)) return 0; return val; @@ -322,6 +344,7 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_drag_locked_set(Ecore_X_Window win, 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); } @@ -331,6 +354,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED, &val, 1)) return 0; @@ -340,6 +364,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_drag_start_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_START, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -348,6 +373,7 @@ ecore_x_e_illume_drag_start_send(Ecore_X_Window win) EAPI void ecore_x_e_illume_drag_end_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_END, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); @@ -358,6 +384,7 @@ ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win, int x, int y, int w, { unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); geom[0] = x; geom[1] = y; geom[2] = w; @@ -372,6 +399,7 @@ ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win, int *x, int *y, int int ret = 0; unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY, @@ -389,6 +417,7 @@ ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win, int x, int y, int w, i { unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); geom[0] = x; geom[1] = y; geom[2] = w; @@ -403,6 +432,7 @@ ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win, int *x, int *y, int *w int ret = 0; unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY, @@ -420,6 +450,7 @@ ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win, int x, int y, int w, { unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); geom[0] = x; geom[1] = y; geom[2] = w; @@ -434,6 +465,7 @@ ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win, int *x, int *y, int * int ret = 0; unsigned int geom[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY, @@ -474,6 +506,7 @@ _ecore_x_e_quickpanel_state_get(Ecore_X_Atom atom) EAPI void ecore_x_e_illume_quickpanel_set(Ecore_X_Window win, unsigned int is_quickpanel) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, &is_quickpanel, 1); } @@ -483,6 +516,7 @@ ecore_x_e_illume_quickpanel_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, &val, 1)) return 0; @@ -494,6 +528,7 @@ ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win, Ecore_X_Illume_Quickpa { Ecore_X_Atom atom = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); atom = _ecore_x_e_quickpanel_atom_get(state); ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, &atom, 1); @@ -504,6 +539,7 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win) { Ecore_X_Atom atom; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, &atom, 1)) return ECORE_X_ILLUME_QUICKPANEL_STATE_UNKNOWN; @@ -513,6 +549,7 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, Ecore_X_Illume_Quickpanel_State state) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, _ecore_x_e_quickpanel_atom_get(state), @@ -522,6 +559,7 @@ ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, Ecore_X_Illume_Quickp EAPI void ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win, unsigned int priority) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR, &priority, 1); @@ -532,6 +570,7 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR, &val, 1)) return 0; @@ -541,6 +580,7 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, unsigned int priority) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR, &priority, 1); @@ -551,6 +591,7 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR, &val, 1)) return 0; @@ -560,6 +601,7 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win, unsigned int zone) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE, &zone, 1); @@ -570,6 +612,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win) { unsigned int val = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE, &val, 1)) return 0; @@ -579,6 +622,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win) EAPI void ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE, ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, @@ -588,6 +632,7 @@ ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) EAPI void ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, Ecore_X_Sync_Counter counter) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (counter) ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER, ECORE_X_ATOM_CARDINAL, &counter, 1); @@ -601,6 +646,7 @@ ecore_x_e_comp_sync_counter_get(Ecore_X_Window win) int ret = 0; Ecore_X_Sync_Counter counter = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_xid_get(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER, @@ -615,6 +661,7 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root, Ecore_X_Window win) { XEvent xev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; @@ -638,6 +685,7 @@ ecore_x_e_comp_sync_supported_set(Ecore_X_Window root, Eina_Bool enabled) Ecore_X_Window win; if (!root) root = DefaultRootWindow(_ecore_x_disp); + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (enabled) { win = ecore_x_window_new(root, 1, 2, 3, 4); @@ -669,6 +717,7 @@ ecore_x_e_comp_sync_supported_get(Ecore_X_Window root) Ecore_X_Window win, win2; int ret; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); ret = ecore_x_window_prop_xid_get(root, @@ -695,6 +744,7 @@ ecore_x_e_comp_sync_begin_send(Ecore_X_Window win) { XEvent xev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; xev.xclient.window = win; @@ -716,6 +766,7 @@ ecore_x_e_comp_sync_end_send(Ecore_X_Window win) { XEvent xev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; xev.xclient.window = win; @@ -737,6 +788,7 @@ ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win) { XEvent xev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; xev.xclient.window = win; diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c index bd50dc8..28cf663 100644 --- a/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/src/lib/ecore_x/xlib/ecore_x_events.c @@ -66,6 +66,7 @@ ecore_x_event_mask_set(Ecore_X_Window w, Ecore_X_Event_Mask mask) XWindowAttributes attr; XSetWindowAttributes s_attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!w) w = DefaultRootWindow(_ecore_x_disp); memset(&attr, 0, sizeof(XWindowAttributes)); XGetWindowAttributes(_ecore_x_disp, w, &attr); @@ -79,6 +80,7 @@ ecore_x_event_mask_unset(Ecore_X_Window w, Ecore_X_Event_Mask mask) XWindowAttributes attr; XSetWindowAttributes s_attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!w) w = DefaultRootWindow(_ecore_x_disp); memset(&attr, 0, sizeof(XWindowAttributes)); XGetWindowAttributes(_ecore_x_disp, w, &attr); @@ -1278,6 +1280,7 @@ _ecore_x_event_handle_selection_clear(XEvent *xevent) Ecore_X_Event_Selection_Clear *e; Ecore_X_Atom sel; + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_last_event_mouse_move = 0; d = _ecore_x_selection_get(xevent->xselectionclear.selection); if (d && (xevent->xselectionclear.time > d->time)) @@ -1309,6 +1312,7 @@ _ecore_x_event_handle_selection_request(XEvent *xevent) Ecore_X_Selection_Intern *sd; void *data; + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_last_event_mouse_move = 0; /* * Generate a selection request event. @@ -1368,6 +1372,7 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent) Ecore_X_Atom selection; int num_ret, format; + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_last_event_mouse_move = 0; selection = xevent->xselection.selection; @@ -1478,6 +1483,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Xdnd_Enter)); if (!e) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); target = _ecore_x_dnd_target_get(); target->state = ECORE_X_DND_TARGET_ENTERED; target->source = xevent->xclient.data.l[0]; @@ -1497,6 +1503,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) 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, @@ -1509,6 +1516,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) 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]); } @@ -1521,6 +1529,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) e->types = calloc(3, sizeof(char *)); if (e->types) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); while ((i < 3) && (xevent->xclient.data.l[i + 2])) { e->types[i] = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[i + 2]); @@ -1542,6 +1551,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) Ecore_X_Event_Xdnd_Position *e; Ecore_X_DND_Target *target; + LOGFN(__FILE__, __LINE__, __FUNCTION__); target = _ecore_x_dnd_target_get(); if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) || (target->win != xevent->xclient.window)) @@ -1570,6 +1580,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) Ecore_X_Event_Xdnd_Status *e; Ecore_X_DND_Source *source; + LOGFN(__FILE__, __LINE__, __FUNCTION__); source = _ecore_x_dnd_source_get(); /* Make sure source/target match */ if ((source->win != xevent->xclient.window ) || @@ -1609,6 +1620,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) Ecore_X_Event_Xdnd_Leave *e; Ecore_X_DND_Target *target; + LOGFN(__FILE__, __LINE__, __FUNCTION__); target = _ecore_x_dnd_target_get(); if ((target->source != (Ecore_X_Window)xevent->xclient.data.l[0]) || (target->win != xevent->xclient.window)) @@ -1629,6 +1641,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) Ecore_X_Event_Xdnd_Drop *e; Ecore_X_DND_Target *target; + LOGFN(__FILE__, __LINE__, __FUNCTION__); target = _ecore_x_dnd_target_get(); /* Match source/target */ if ((target->source != (Window)xevent->xclient.data.l[0]) || @@ -1655,6 +1668,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) Ecore_X_DND_Source *source; int completed = 1; + LOGFN(__FILE__, __LINE__, __FUNCTION__); source = _ecore_x_dnd_source_get(); /* Match source/target */ if ((source->win != xevent->xclient.window) || @@ -1663,6 +1677,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent) if ((source->version < 5) || (xevent->xclient.data.l[1] & 0x1UL)) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* Target successfully performed drop action */ ecore_x_selection_xdnd_clear(); source->state = ECORE_X_DND_SOURCE_IDLE; @@ -1712,23 +1727,26 @@ _ecore_x_event_handle_client_message(XEvent *xevent) free(e); return; } + LOGFN(__FILE__, __LINE__, __FUNCTION__); e->state[0] = _ecore_x_netwm_state_get(xevent->xclient.data.l[1]); if (e->state[0] == ECORE_X_WINDOW_STATE_UNKNOWN) { char *name; - name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]); - if (name) ERR("Unknown state: %s", name); - XFree(name); + LOGFN(__FILE__, __LINE__, __FUNCTION__); +// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[1]); +// if (name) ERR("Unknown state: %s", name); +// XFree(name); } e->state[1] = _ecore_x_netwm_state_get(xevent->xclient.data.l[2]); if (e->state[1] == ECORE_X_WINDOW_STATE_UNKNOWN) { char *name; - name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]); - if (name) ERR("Unknown state: %s", name); - XFree(name); + LOGFN(__FILE__, __LINE__, __FUNCTION__); +// name = XGetAtomName(_ecore_x_disp, xevent->xclient.data.l[2]); +// if (name) ERR("Unknown state: %s", name); +// XFree(name); } e->source = xevent->xclient.data.l[3]; @@ -1787,7 +1805,10 @@ _ecore_x_event_handle_client_message(XEvent *xevent) /* send a reply anyway - we are alive... eventloop at least */ ecore_event_add(ECORE_X_EVENT_PING, e, NULL, NULL); if (ScreenCount(_ecore_x_disp) > 1) - root = ecore_x_window_root_get(e->win); + { + LOGFN(__FILE__, __LINE__, __FUNCTION__); + root = ecore_x_window_root_get(e->win); + } else root = DefaultRootWindow(_ecore_x_disp); @@ -2005,6 +2026,7 @@ _ecore_x_event_handle_randr_notify(XEvent *xevent) _ecore_x_last_event_mouse_move = 0; randr_event = (const XRRNotifyEvent *)xevent; + LOGFN(__FILE__, __LINE__, __FUNCTION__); switch (randr_event->subtype) { case RRNotify_CrtcChange: @@ -2085,6 +2107,7 @@ _ecore_x_event_handle_generic_event(XEvent *event) XGenericEvent *generic_event; Ecore_X_Event_Generic *e; + LOGFN(__FILE__, __LINE__, __FUNCTION__); generic_event = (XGenericEvent *)event; e = calloc(1, sizeof(Ecore_X_Event_Generic)); diff --git a/src/lib/ecore_x/xlib/ecore_x_fixes.c b/src/lib/ecore_x/xlib/ecore_x_fixes.c index a6c6bc7..ce2d19d 100644 --- a/src/lib/ecore_x/xlib/ecore_x_fixes.c +++ b/src/lib/ecore_x/xlib/ecore_x_fixes.c @@ -23,6 +23,7 @@ _ecore_x_fixes_init(void) _fixes_major = 3; _fixes_minor = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XFixesQueryVersion(_ecore_x_disp, &_fixes_major, &_fixes_minor)) _fixes_available = 1; else @@ -81,6 +82,7 @@ ecore_x_region_new(Ecore_X_Rectangle *rects, int num) Ecore_X_Region region; XRectangle *xrect; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xrect = _ecore_x_rectangle_ecore_to_x(rects, num); region = XFixesCreateRegion(_ecore_x_disp, xrect, num); free(xrect); @@ -96,6 +98,7 @@ ecore_x_region_new_from_bitmap(Ecore_X_Pixmap bitmap) #ifdef ECORE_XFIXES Ecore_X_Region region; + LOGFN(__FILE__, __LINE__, __FUNCTION__); region = XFixesCreateRegionFromBitmap(_ecore_x_disp, bitmap); return region; #else @@ -109,6 +112,7 @@ ecore_x_region_new_from_window(Ecore_X_Window win, Ecore_X_Region_Type type) #ifdef ECORE_XFIXES Ecore_X_Region region; + LOGFN(__FILE__, __LINE__, __FUNCTION__); region = XFixesCreateRegionFromWindow(_ecore_x_disp, win, type); return region; #else @@ -122,6 +126,7 @@ ecore_x_region_new_from_gc(Ecore_X_GC gc) #ifdef ECORE_XFIXES Ecore_X_Region region; + LOGFN(__FILE__, __LINE__, __FUNCTION__); region = XFixesCreateRegionFromGC(_ecore_x_disp, gc); return region; #else @@ -135,6 +140,7 @@ ecore_x_region_new_from_picture(Ecore_X_Picture picture) #ifdef ECORE_XFIXES Ecore_X_Region region; + LOGFN(__FILE__, __LINE__, __FUNCTION__); region = XFixesCreateRegionFromPicture(_ecore_x_disp, picture); return region; #else @@ -146,6 +152,7 @@ EAPI void ecore_x_region_free(Ecore_X_Region region) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesDestroyRegion(_ecore_x_disp, region); #endif } @@ -155,6 +162,7 @@ ecore_x_region_set(Ecore_X_Region region, Ecore_X_Rectangle *rects, 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 } @@ -163,6 +171,7 @@ EAPI void ecore_x_region_copy(Ecore_X_Region dest, Ecore_X_Region source) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesCopyRegion(_ecore_x_disp, dest, source); #endif } @@ -171,6 +180,7 @@ EAPI void ecore_x_region_combine(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Region source2) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesUnionRegion(_ecore_x_disp, dest, source1, source2); #endif } @@ -179,6 +189,7 @@ EAPI void ecore_x_region_intersect(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Region source2) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesIntersectRegion(_ecore_x_disp, dest, source1, source2); #endif } @@ -187,6 +198,7 @@ EAPI void ecore_x_region_subtract(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Region source2) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSubtractRegion(_ecore_x_disp, dest, source1, source2); #endif } @@ -198,7 +210,8 @@ ecore_x_region_invert(Ecore_X_Region dest, Ecore_X_Rectangle *bounds, Ecore_X_Re XRectangle *xbound; int num = 0; - while(bounds + num) num++; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + while (bounds + num) num++; xbound = _ecore_x_rectangle_ecore_to_x(bounds, num); XFixesInvertRegion(_ecore_x_disp, dest, xbound, source); @@ -209,6 +222,7 @@ EAPI void ecore_x_region_translate(Ecore_X_Region region, int dx, int dy) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesTranslateRegion(_ecore_x_disp, region, dx, dy); #endif } @@ -217,6 +231,7 @@ EAPI void ecore_x_region_extents(Ecore_X_Region dest, Ecore_X_Region source) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesRegionExtents(_ecore_x_disp, dest, source); #endif } @@ -224,18 +239,19 @@ ecore_x_region_extents(Ecore_X_Region dest, Ecore_X_Region source) EAPI Ecore_X_Rectangle * ecore_x_region_fetch(Ecore_X_Region region, int *num, Ecore_X_Rectangle *bounds){ #ifdef ECORE_XFIXES - Ecore_X_Rectangle *rects; - XRectangle *xrect, xbound; - - xrect = XFixesFetchRegionAndBounds(_ecore_x_disp, region, num, &xbound); - rects = _ecore_x_rectangle_x_to_ecore(xrect, *num); - (*bounds).x = xbound.x; - (*bounds).y = xbound.y; - (*bounds).width = xbound.width; - (*bounds).height = xbound.height; - return rects; + Ecore_X_Rectangle *rects; + XRectangle *xrect, xbound; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + xrect = XFixesFetchRegionAndBounds(_ecore_x_disp, region, num, &xbound); + rects = _ecore_x_rectangle_x_to_ecore(xrect, *num); + (*bounds).x = xbound.x; + (*bounds).y = xbound.y; + (*bounds).width = xbound.width; + (*bounds).height = xbound.height; + return rects; #else - return NULL; + return NULL; #endif } @@ -243,6 +259,7 @@ 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) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesExpandRegion(_ecore_x_disp, dest, source, left, right, top, bottom); #endif } @@ -251,6 +268,7 @@ EAPI void ecore_x_region_gc_clip_set(Ecore_X_Region region, 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 } @@ -259,6 +277,7 @@ EAPI void 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) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSetWindowShapeRegion(_ecore_x_disp, win, type, x_offset, y_offset, region); #endif } @@ -267,6 +286,7 @@ EAPI void ecore_x_region_picture_clip_set(Ecore_X_Region region, Ecore_X_Picture picture, int x_origin, int y_origin) { #ifdef ECORE_XFIXES + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFixesSetPictureClipRegion(_ecore_x_disp, picture, x_origin, y_origin, region); #endif } diff --git a/src/lib/ecore_x/xlib/ecore_x_gc.c b/src/lib/ecore_x/xlib/ecore_x_gc.c index 9ea0316..7f527e7 100644 --- a/src/lib/ecore_x/xlib/ecore_x_gc.c +++ b/src/lib/ecore_x/xlib/ecore_x_gc.c @@ -30,6 +30,7 @@ ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, const un int index; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!draw) draw = DefaultRootWindow(_ecore_x_disp); memset(&gcv, 0, sizeof (gcv)); @@ -143,5 +144,6 @@ ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, const un EAPI void ecore_x_gc_free(Ecore_X_GC gc) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreeGC(_ecore_x_disp, gc); } diff --git a/src/lib/ecore_x/xlib/ecore_x_icccm.c b/src/lib/ecore_x/xlib/ecore_x_icccm.c index b8728f7..5afaab4 100644 --- a/src/lib/ecore_x/xlib/ecore_x_icccm.c +++ b/src/lib/ecore_x/xlib/ecore_x_icccm.c @@ -25,6 +25,7 @@ EAPI void ecore_x_icccm_init(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); } EAPI void @@ -32,6 +33,7 @@ ecore_x_icccm_state_set(Ecore_X_Window win, Ecore_X_Window_State_Hint state) { unsigned long c[2]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN) c[0] = WithdrawnState; else if (state == ECORE_X_WINDOW_STATE_HINT_NORMAL) @@ -53,6 +55,7 @@ ecore_x_icccm_state_get(Ecore_X_Window win) int format_ret; Ecore_X_Window_State_Hint hint; + LOGFN(__FILE__, __LINE__, __FUNCTION__); hint = ECORE_X_WINDOW_STATE_HINT_NONE; XGetWindowProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_STATE, 0, 0x7fffffff, False, ECORE_X_ATOM_WM_STATE, @@ -77,6 +80,7 @@ ecore_x_icccm_state_get(Ecore_X_Window win) EAPI void ecore_x_icccm_delete_window_send(Ecore_X_Window win, 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, @@ -86,6 +90,7 @@ ecore_x_icccm_delete_window_send(Ecore_X_Window win, Ecore_X_Time t) EAPI void ecore_x_icccm_take_focus_send(Ecore_X_Window win, 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, @@ -95,6 +100,7 @@ ecore_x_icccm_take_focus_send(Ecore_X_Window win, Ecore_X_Time t) EAPI void ecore_x_icccm_save_yourself_send(Ecore_X_Window win, 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, @@ -106,6 +112,7 @@ ecore_x_icccm_move_resize_send(Ecore_X_Window win, int x, int y, int w, int h) { XEvent ev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ev.type = ConfigureNotify; ev.xconfigure.display = _ecore_x_disp; ev.xconfigure.event = win; @@ -135,6 +142,7 @@ ecore_x_icccm_hints_set(Ecore_X_Window win, if (!hints) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); hints->flags = InputHint | StateHint; hints->input = accepts_focus; if (initial_state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN) @@ -180,6 +188,7 @@ ecore_x_icccm_hints_get(Ecore_X_Window win, { XWMHints *hints; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (accepts_focus) *accepts_focus = 1; if (initial_state) @@ -252,6 +261,7 @@ ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, XSizeHints hint; long mask; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask)) { memset(&hint, 0, sizeof(XSizeHints)); @@ -321,6 +331,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, int stepx = -1, stepy = -1; double mina = 0.0, maxa = 0.0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask)) return 0; @@ -415,6 +426,7 @@ ecore_x_icccm_title_set(Ecore_X_Window win, const char *t) if (!t) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xprop.value = NULL; #ifdef X_HAVE_UTF8_STRING list[0] = strdup(t); @@ -448,6 +460,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win) { XTextProperty xprop; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xprop.value = NULL; if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success) { @@ -503,6 +516,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num > 0) XSetWMProtocols(_ecore_x_disp, win, (Atom *)(protos), num); else @@ -529,6 +543,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); proto = _ecore_x_atoms_wm_protocols[protocol]; if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count)) @@ -606,6 +621,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol) if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); proto = _ecore_x_atoms_wm_protocols[protocol]; if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count)) @@ -639,6 +655,7 @@ ecore_x_icccm_name_class_set(Ecore_X_Window win, const char *n, const char *c) xch = XAllocClassHint(); if (!xch) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xch->res_name = (char *)n; xch->res_class = (char *)c; XSetClassHint(_ecore_x_disp, win, xch); @@ -658,6 +675,7 @@ ecore_x_icccm_name_class_get(Ecore_X_Window win, char **n, char **c) { XClassHint xch; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (n) *n = NULL; if (c) *c = NULL; xch.res_name = NULL; @@ -689,6 +707,7 @@ ecore_x_icccm_client_machine_get(Ecore_X_Window win) { char *name; + LOGFN(__FILE__, __LINE__, __FUNCTION__); name = ecore_x_window_prop_string_get(win, ECORE_X_ATOM_WM_CLIENT_MACHINE); return name; } @@ -703,6 +722,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetCommand(_ecore_x_disp, win, argv, argc); } @@ -724,6 +744,7 @@ ecore_x_icccm_command_get(Ecore_X_Window win, int *argc, char ***argv) if (argc) *argc = 0; if (argv) *argv = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetCommand(_ecore_x_disp, win, &v, &c)) return; if (c < 1) @@ -768,6 +789,7 @@ ecore_x_icccm_icon_name_set(Ecore_X_Window win, const char *t) XTextProperty xprop; int ret; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xprop.value = NULL; #ifdef X_HAVE_UTF8_STRING list[0] = strdup(t); @@ -806,6 +828,7 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win) { XTextProperty xprop; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xprop.value = NULL; if (XGetWMIconName(_ecore_x_disp, win, &xprop) >= Success) { @@ -869,6 +892,7 @@ ecore_x_icccm_colormap_window_set(Ecore_X_Window win, Ecore_X_Window subwin) Window *oldset = NULL; Window *newset = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS, XA_WINDOW, 32, &old_data, &num)) @@ -924,6 +948,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win, Ecore_X_Window subwin) Window *oldset = NULL; Window *newset = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_WM_COLORMAP_WINDOWS, XA_WINDOW, 32, &old_data, &num)) @@ -971,6 +996,7 @@ ecore_x_icccm_colormap_window_unset(Ecore_X_Window win, Ecore_X_Window subwin) EAPI void ecore_x_icccm_transient_for_set(Ecore_X_Window win, Ecore_X_Window forwin) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetTransientForHint(_ecore_x_disp, win, forwin); } @@ -981,6 +1007,7 @@ ecore_x_icccm_transient_for_set(Ecore_X_Window win, Ecore_X_Window forwin) 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); } @@ -994,10 +1021,11 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win) { Window forwin; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (XGetTransientForHint(_ecore_x_disp, win, &forwin)) - return (Ecore_X_Window) forwin; + return (Ecore_X_Window) forwin; else - return 0; + return 0; } @@ -1009,6 +1037,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_string_set(win, ECORE_X_ATOM_WM_WINDOW_ROLE, (char *)role); } @@ -1021,6 +1050,7 @@ ecore_x_icccm_window_role_set(Ecore_X_Window win, const char *role) EAPI char * 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); } @@ -1035,6 +1065,7 @@ ecore_x_icccm_window_role_get(Ecore_X_Window win) EAPI void ecore_x_icccm_client_leader_set(Ecore_X_Window win, Ecore_X_Window l) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(win, ECORE_X_ATOM_WM_CLIENT_LEADER, &l, 1); } @@ -1048,9 +1079,10 @@ ecore_x_icccm_client_leader_get(Ecore_X_Window win) { Ecore_X_Window l; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (ecore_x_window_prop_window_get(win, ECORE_X_ATOM_WM_CLIENT_LEADER, &l, 1) > 0) - return l; + return l; return 0; } @@ -1060,6 +1092,7 @@ ecore_x_icccm_iconic_request_send(Ecore_X_Window win, Ecore_X_Window root) XEvent xev; if (!win) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); xev.xclient.type = ClientMessage; diff --git a/src/lib/ecore_x/xlib/ecore_x_image.c b/src/lib/ecore_x/xlib/ecore_x_image.c index ff648c9..a0c2923 100644 --- a/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/src/lib/ecore_x/xlib/ecore_x_image.c @@ -114,6 +114,7 @@ ecore_x_image_new(int w, int h, Ecore_X_Visual vis, int depth) im = calloc(1, sizeof(Ecore_X_Image)); if (!im) return NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); im->w = w; im->h = h; im->vis = vis; @@ -126,6 +127,7 @@ ecore_x_image_new(int w, int h, Ecore_X_Visual vis, int depth) EAPI void ecore_x_image_free(Ecore_X_Image *im) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (im->shm) { if (im->xim) @@ -193,6 +195,7 @@ ecore_x_image_get(Ecore_X_Image *im, Ecore_X_Drawable draw, int ret = 1; XErrorHandler ph; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (im->shm) { if (!im->xim) _ecore_x_image_shm_create(im); @@ -256,12 +259,14 @@ EAPI void ecore_x_image_put(Ecore_X_Image *im, Ecore_X_Drawable draw, int x, int y, int sx, int sy, int w, int h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); printf("ecore_x_image_put: unimplemented!\n"); } EAPI void * ecore_x_image_data_get(Ecore_X_Image *im, int *bpl, int *rows, int *bpp) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!im->xim) _ecore_x_image_shm_create(im); if (!im->xim) return NULL; diff --git a/src/lib/ecore_x/xlib/ecore_x_mwm.c b/src/lib/ecore_x/xlib/ecore_x_mwm.c index d421128..d580da9 100644 --- a/src/lib/ecore_x/xlib/ecore_x_mwm.c +++ b/src/lib/ecore_x/xlib/ecore_x_mwm.c @@ -46,6 +46,7 @@ ecore_x_mwm_hints_get(Ecore_X_Window win, int num; int ret; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = 0; if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_MOTIF_WM_HINTS, @@ -93,6 +94,7 @@ ecore_x_mwm_borderless_set(Ecore_X_Window win, int borderless) data[0] = 2; /* just set the decorations hint! */ data[2] = !borderless; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_property_set(win, ECORE_X_ATOM_MOTIF_WM_HINTS, ECORE_X_ATOM_MOTIF_WM_HINTS, diff --git a/src/lib/ecore_x/xlib/ecore_x_netwm.c b/src/lib/ecore_x/xlib/ecore_x_netwm.c index 4ca18bf..80712a9 100644 --- a/src/lib/ecore_x/xlib/ecore_x_netwm.c +++ b/src/lib/ecore_x/xlib/ecore_x_netwm.c @@ -67,12 +67,14 @@ static Eina_Hash *startup_info = NULL; EAPI void ecore_x_netwm_init(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); startup_info = eina_hash_string_superfast_new(_ecore_x_netwm_startup_info_free); } EAPI void ecore_x_netwm_shutdown(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (startup_info) eina_hash_free(startup_info); startup_info = NULL; @@ -85,6 +87,7 @@ EAPI void ecore_x_netwm_wm_identify(Ecore_X_Window root, Ecore_X_Window check, const char *wm_name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, &check, 1); ecore_x_window_prop_window_set(check, ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, &check, 1); _ecore_x_window_prop_string_utf8_set(check, ECORE_X_ATOM_NET_WM_NAME, wm_name); @@ -98,6 +101,7 @@ ecore_x_netwm_wm_identify(Ecore_X_Window root, Ecore_X_Window check, EAPI void ecore_x_netwm_supported_set(Ecore_X_Window root, Ecore_X_Atom *supported, int num) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_atom_set(root, ECORE_X_ATOM_NET_SUPPORTED, supported, num); } @@ -109,6 +113,7 @@ ecore_x_netwm_supported_get(Ecore_X_Window root, Ecore_X_Atom **supported, int * if (num) *num = 0; if (supported) *supported = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); num_ret = ecore_x_window_prop_atom_list_get(root, ECORE_X_ATOM_NET_SUPPORTED, supported); if (num_ret <= 0) @@ -124,6 +129,7 @@ ecore_x_netwm_supported_get(Ecore_X_Window root, Ecore_X_Atom **supported, int * EAPI void ecore_x_netwm_desk_count_set(Ecore_X_Window root, 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); } @@ -132,6 +138,7 @@ EAPI void ecore_x_netwm_desk_roots_set(Ecore_X_Window root, Ecore_X_Window *vroots, unsigned int n_desks) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_VIRTUAL_ROOTS, vroots, n_desks); } @@ -144,6 +151,7 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root, unsigned int i; int l, len; + LOGFN(__FILE__, __LINE__, __FUNCTION__); buf = NULL; len = 0; @@ -174,6 +182,7 @@ ecore_x_netwm_desk_size_set(Ecore_X_Window root, unsigned int width, { unsigned int size[2]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); size[0] = width; size[1] = height; ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_DESKTOP_GEOMETRY, size, @@ -184,6 +193,7 @@ EAPI void ecore_x_netwm_desk_viewports_set(Ecore_X_Window root, 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); } @@ -195,6 +205,7 @@ ecore_x_netwm_desk_layout_set(Ecore_X_Window root, int orientation, { unsigned int layout[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); layout[0] = orientation; layout[1] = columns; layout[2] = rows; @@ -207,6 +218,7 @@ EAPI void ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, 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); } @@ -214,6 +226,7 @@ ecore_x_netwm_desk_workareas_set(Ecore_X_Window root, EAPI void ecore_x_netwm_desk_current_set(Ecore_X_Window root, unsigned int desk) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_CURRENT_DESKTOP, &desk, 1); } @@ -223,6 +236,7 @@ ecore_x_netwm_showing_desktop_set(Ecore_X_Window root, int on) { unsigned int val; + LOGFN(__FILE__, __LINE__, __FUNCTION__); val = (on) ? 1 : 0; ecore_x_window_prop_card32_set(root, ECORE_X_ATOM_NET_SHOWING_DESKTOP, &val, 1); @@ -237,6 +251,7 @@ EAPI void ecore_x_netwm_client_list_set(Ecore_X_Window root, Ecore_X_Window *p_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); } @@ -247,6 +262,7 @@ ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, Ecore_X_Window *p_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); } @@ -254,6 +270,7 @@ ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, EAPI void ecore_x_netwm_client_active_set(Ecore_X_Window root, Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_window_set(root, ECORE_X_ATOM_NET_ACTIVE_WINDOW, &win, 1); } @@ -263,6 +280,7 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, int { XEvent xev; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); xev.xclient.type = ClientMessage; @@ -283,12 +301,14 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, int EAPI void ecore_x_netwm_name_set(Ecore_X_Window win, const char *name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_NAME, name); } EAPI int ecore_x_netwm_name_get(Ecore_X_Window win, char **name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) *name = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_NAME); return 1; @@ -297,12 +317,14 @@ ecore_x_netwm_name_get(Ecore_X_Window win, char **name) EAPI void ecore_x_netwm_startup_id_set(Ecore_X_Window win, const char *id) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_STARTUP_ID, id); } EAPI int ecore_x_netwm_startup_id_get(Ecore_X_Window win, char **id) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (id) *id = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_STARTUP_ID); return 1; @@ -311,6 +333,7 @@ ecore_x_netwm_startup_id_get(Ecore_X_Window win, char **id) EAPI void ecore_x_netwm_visible_name_set(Ecore_X_Window win, const char *name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME, name); } @@ -318,6 +341,7 @@ ecore_x_netwm_visible_name_set(Ecore_X_Window win, const char *name) EAPI int ecore_x_netwm_visible_name_get(Ecore_X_Window win, char **name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) *name = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_VISIBLE_NAME); @@ -327,6 +351,7 @@ ecore_x_netwm_visible_name_get(Ecore_X_Window win, char **name) EAPI void ecore_x_netwm_icon_name_set(Ecore_X_Window win, const char *name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_ICON_NAME, name); } @@ -334,6 +359,7 @@ ecore_x_netwm_icon_name_set(Ecore_X_Window win, const char *name) EAPI int ecore_x_netwm_icon_name_get(Ecore_X_Window win, char **name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) *name = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_ICON_NAME); @@ -343,6 +369,7 @@ ecore_x_netwm_icon_name_get(Ecore_X_Window win, char **name) EAPI void ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win, const char *name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_prop_string_utf8_set(win, ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME, name); @@ -351,6 +378,7 @@ ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win, const char *name) EAPI int ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, char **name) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (name) *name = _ecore_x_window_prop_string_utf8_get(win, ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME); @@ -360,6 +388,7 @@ ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, char **name) EAPI void ecore_x_netwm_desktop_set(Ecore_X_Window win, unsigned int desk) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_DESKTOP, &desk, 1); } @@ -369,6 +398,7 @@ ecore_x_netwm_desktop_get(Ecore_X_Window win, unsigned int *desk) int ret; unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_DESKTOP, &tmp, 1); @@ -385,6 +415,7 @@ ecore_x_netwm_strut_set(Ecore_X_Window win, int left, int right, { unsigned int strut[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); strut[0] = left; strut[1] = right; strut[2] = top; @@ -402,6 +433,7 @@ ecore_x_netwm_strut_get(Ecore_X_Window win, int *left, int *right, int ret = 0; unsigned int strut[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_STRUT, strut, 4); if (ret != 4) return 0; @@ -421,6 +453,7 @@ ecore_x_netwm_strut_partial_set(Ecore_X_Window win, int left, int right, { unsigned int strut[12]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); strut[0] = left; strut[1] = right; strut[2] = top; @@ -445,6 +478,7 @@ ecore_x_netwm_strut_partial_get(Ecore_X_Window win, int *left, int *right, int ret = 0; unsigned int strut[12]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_STRUT_PARTIAL, strut, 12); if (ret != 12) return 0; @@ -472,6 +506,7 @@ ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num) unsigned int len, icons, i; int num_ret; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num) *num = 0; if (icon) *icon = NULL; @@ -567,6 +602,7 @@ ecore_x_netwm_icon_geometry_set(Ecore_X_Window win, int x, int y, int width, int { unsigned int geometry[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); geometry[0] = x; geometry[1] = y; geometry[2] = width; @@ -580,6 +616,7 @@ ecore_x_netwm_icon_geometry_get(Ecore_X_Window win, int *x, int *y, int *width, int ret; unsigned int geometry[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_ICON_GEOMETRY, geometry, 4); if (ret != 4) return 0; @@ -596,6 +633,7 @@ ecore_x_netwm_pid_set(Ecore_X_Window win, int pid) { unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); tmp = pid; ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_PID, &tmp, 1); @@ -607,6 +645,7 @@ ecore_x_netwm_pid_get(Ecore_X_Window win, int *pid) int ret; unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_PID, &tmp, 1); if (pid) *pid = tmp; @@ -616,6 +655,7 @@ ecore_x_netwm_pid_get(Ecore_X_Window win, int *pid) EAPI void 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); } @@ -624,6 +664,7 @@ EAPI int ecore_x_netwm_handled_icons_get(Ecore_X_Window win) { int ret = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_HANDLED_ICONS, NULL, 0); return ret == 0 ? 1 : 0; @@ -632,6 +673,7 @@ ecore_x_netwm_handled_icons_get(Ecore_X_Window win) EAPI void ecore_x_netwm_user_time_set(Ecore_X_Window win, unsigned int time) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME, &time, 1); } @@ -642,6 +684,7 @@ ecore_x_netwm_user_time_get(Ecore_X_Window win, unsigned int *time) int ret; unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_USER_TIME, &tmp, 1); if (time) *time = tmp; @@ -719,6 +762,7 @@ ecore_x_netwm_window_state_set(Ecore_X_Window win, Ecore_X_Window_State *state, Ecore_X_Atom *set; unsigned int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!num) { ecore_x_window_prop_property_del(win, ECORE_X_ATOM_NET_WM_STATE); @@ -742,6 +786,7 @@ ecore_x_netwm_window_state_get(Ecore_X_Window win, Ecore_X_Window_State **state, int num_ret, i; Ecore_X_Atom *atoms; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num) *num = 0; if (state) *state = NULL; @@ -822,6 +867,7 @@ ecore_x_netwm_window_type_set(Ecore_X_Window win, Ecore_X_Window_Type type) { Ecore_X_Atom atom; + LOGFN(__FILE__, __LINE__, __FUNCTION__); 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); @@ -834,6 +880,7 @@ ecore_x_netwm_window_type_get(Ecore_X_Window win, Ecore_X_Window_Type *type) int num; Ecore_X_Atom *atoms = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (type) *type = ECORE_X_WINDOW_TYPE_NORMAL; num = ecore_x_window_prop_atom_list_get(win, @@ -854,6 +901,7 @@ ecore_x_netwm_window_types_get(Ecore_X_Window win, Ecore_X_Window_Type **types) Ecore_X_Atom *atoms = NULL; Ecore_X_Window_Type *atoms2 = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (types) *types = NULL; num = ecore_x_window_prop_atom_list_get(win, ECORE_X_ATOM_NET_WM_WINDOW_TYPE, @@ -914,6 +962,7 @@ ecore_x_netwm_allowed_action_isset(Ecore_X_Window win, Ecore_X_Action action) int num, i, ret = 0; Ecore_X_Atom *atoms, atom; + LOGFN(__FILE__, __LINE__, __FUNCTION__); num = ecore_x_window_prop_atom_list_get(win, ECORE_X_ATOM_NET_WM_WINDOW_TYPE, &atoms); if (num <= 0) @@ -941,6 +990,7 @@ ecore_x_netwm_allowed_action_set(Ecore_X_Window win, Ecore_X_Action *action, uns Ecore_X_Atom *set; unsigned int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!num) { ecore_x_window_prop_property_del(win, ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS); @@ -964,6 +1014,7 @@ ecore_x_netwm_allowed_action_get(Ecore_X_Window win, Ecore_X_Action **action, un int num_ret, i; Ecore_X_Atom *atoms; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num) *num = 0; if (action) *action = NULL; @@ -989,6 +1040,7 @@ ecore_x_netwm_allowed_action_get(Ecore_X_Window win, Ecore_X_Action **action, un EAPI void ecore_x_netwm_opacity_set(Ecore_X_Window win, unsigned int opacity) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY, &opacity, 1); } @@ -999,6 +1051,7 @@ ecore_x_netwm_opacity_get(Ecore_X_Window win, unsigned int *opacity) int ret; unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_WINDOW_OPACITY, &tmp, 1); if (opacity) *opacity = tmp; @@ -1010,6 +1063,7 @@ ecore_x_netwm_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb) { unsigned int frames[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); frames[0] = fl; frames[1] = fr; frames[2] = ft; @@ -1023,6 +1077,7 @@ ecore_x_netwm_frame_size_get(Ecore_X_Window win, int *fl, int *fr, int *ft, int int ret = 0; unsigned int frames[4]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_FRAME_EXTENTS, frames, 4); if (ret != 4) return 0; @@ -1040,6 +1095,7 @@ ecore_x_netwm_sync_counter_get(Ecore_X_Window win, Ecore_X_Sync_Counter *counter int ret; unsigned int tmp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER, &tmp, 1); @@ -1054,6 +1110,7 @@ ecore_x_netwm_ping_send(Ecore_X_Window win) if (!win) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; xev.xclient.window = win; @@ -1076,6 +1133,7 @@ ecore_x_netwm_sync_request_send(Ecore_X_Window win, unsigned int serial) if (!win) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&value, (int)serial); xev.xclient.type = ClientMessage; @@ -1099,6 +1157,8 @@ ecore_x_netwm_state_request_send(Ecore_X_Window win, Ecore_X_Window root, XEvent xev; if (!win) return; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); xev.xclient.type = ClientMessage; @@ -1126,6 +1186,8 @@ ecore_x_netwm_desktop_request_send(Ecore_X_Window win, Ecore_X_Window root, unsi XEvent xev; if (!win) return; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!root) root = DefaultRootWindow(_ecore_x_disp); xev.xclient.type = ClientMessage; @@ -1514,6 +1576,7 @@ ecore_x_screen_is_composited(int screen) static Ecore_X_Atom atom = None; char buf[32]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); snprintf(buf, sizeof(buf), "_NET_WM_CM_S%i", screen); if (atom == None) atom = XInternAtom(_ecore_x_disp, buf, False); if (atom == None) return 0; @@ -1529,6 +1592,7 @@ ecore_x_screen_is_composited_set(int screen, Ecore_X_Window win) static Ecore_X_Atom atom = None; char buf[32]; + LOGFN(__FILE__, __LINE__, __FUNCTION__); snprintf(buf, sizeof(buf), "_NET_WM_CM_S%i", screen); if (atom == None) atom = XInternAtom(_ecore_x_disp, buf, False); if (atom == None) return; diff --git a/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/src/lib/ecore_x/xlib/ecore_x_pixmap.c index a6802db..5c69770 100644 --- a/src/lib/ecore_x/xlib/ecore_x_pixmap.c +++ b/src/lib/ecore_x/xlib/ecore_x_pixmap.c @@ -31,6 +31,7 @@ EAPI Ecore_X_Pixmap ecore_x_pixmap_new(Ecore_X_Window win, int w, int h, int dep) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); if (dep == 0) dep = DefaultDepth(_ecore_x_disp, DefaultScreen(_ecore_x_disp)); return XCreatePixmap(_ecore_x_disp, win, w, h, dep); @@ -48,6 +49,7 @@ ecore_x_pixmap_new(Ecore_X_Window win, int w, int h, int dep) EAPI void ecore_x_pixmap_free(Ecore_X_Pixmap pmap) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XFreePixmap(_ecore_x_disp, pmap); } @@ -70,6 +72,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XCopyArea(_ecore_x_disp, pmap, dest, gc, sx, sy, w, h, dx, dy); } @@ -85,8 +88,8 @@ ecore_x_pixmap_paste(Ecore_X_Pixmap pmap, Ecore_X_Drawable dest, EAPI void ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap, int *x, int *y, int *w, int *h) { - if (pmap) - ecore_x_drawable_geometry_get(pmap, x, y, w, h); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (pmap) ecore_x_drawable_geometry_get(pmap, x, y, w, h); } /** @@ -98,6 +101,7 @@ ecore_x_pixmap_geometry_get(Ecore_X_Pixmap pmap, int *x, int *y, int *w, int *h) EAPI int ecore_x_pixmap_depth_get(Ecore_X_Pixmap pmap) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_drawable_depth_get(pmap); } diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h index 3e0ec60..484a7f2 100644 --- a/src/lib/ecore_x/xlib/ecore_x_private.h +++ b/src/lib/ecore_x/xlib/ecore_x_private.h @@ -297,4 +297,12 @@ void _ecore_x_input_handler(XEvent* xevent); void _ecore_mouse_move(unsigned int timestamp, unsigned int xmodifiers, 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); Ecore_Event_Mouse_Button *_ecore_mouse_button(int event, unsigned int timestamp, unsigned int xmodifiers, unsigned int buttons, 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); +//#define LOGFNS 1 + +#ifdef LOGFNS +#define LOGFN(fl, ln, fn) printf("-ECORE-X: %25s: %5i - %s\n", fl, ln, fn); +#else +#define LOGFN(fl, ln, fn) +#endif + #endif diff --git a/src/lib/ecore_x/xlib/ecore_x_randr.c b/src/lib/ecore_x/xlib/ecore_x_randr.c index a873cd2..185c04f 100644 --- a/src/lib/ecore_x/xlib/ecore_x_randr.c +++ b/src/lib/ecore_x/xlib/ecore_x_randr.c @@ -40,6 +40,7 @@ _ecore_x_randr_init(void) EAPI int ecore_x_randr_query(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _randr_available; } @@ -49,6 +50,7 @@ ecore_x_randr_events_select(Ecore_X_Window win, int on) #ifdef ECORE_XRANDR int mask; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!on) mask = 0; else @@ -74,6 +76,7 @@ ecore_x_randr_screen_rotations_get(Ecore_X_Window root) #ifdef ECORE_XRANDR Rotation rot, crot; + LOGFN(__FILE__, __LINE__, __FUNCTION__); rot = XRRRotations(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &crot); return rot; #else @@ -87,6 +90,7 @@ ecore_x_randr_screen_rotation_get(Ecore_X_Window root) #ifdef ECORE_XRANDR Rotation crot = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XRRRotations(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &crot); return crot; #else @@ -102,6 +106,7 @@ ecore_x_randr_screen_rotation_set(Ecore_X_Window root, Ecore_X_Randr_Rotation ro SizeID sizeid; Rotation crot; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xrrcfg = XRRGetScreenInfo(_ecore_x_disp, root); if (!xrrcfg) return; sizeid = XRRConfigCurrentConfiguration(xrrcfg, &crot); @@ -118,6 +123,7 @@ ecore_x_randr_screen_sizes_get(Ecore_X_Window root, int *num) XRRScreenSize *sizes; int i, n; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num) *num = 0; /* we don't have to free sizes, no idea why not */ @@ -149,6 +155,7 @@ ecore_x_randr_current_screen_size_get(Ecore_X_Window root) Rotation rotation; int n; + LOGFN(__FILE__, __LINE__, __FUNCTION__); sc = XRRGetScreenInfo(_ecore_x_disp, root); if (!sc) { @@ -176,6 +183,7 @@ ecore_x_randr_screen_size_set(Ecore_X_Window root, Ecore_X_Screen_Size size) XRRScreenSize *sizes; int i, n, size_index = -1; + LOGFN(__FILE__, __LINE__, __FUNCTION__); sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); for (i = 0; i < n; i++) { @@ -210,6 +218,7 @@ ecore_x_randr_current_screen_refresh_rate_get(Ecore_X_Window root) #ifdef ECORE_XRANDR XRRScreenConfiguration *sc; + LOGFN(__FILE__, __LINE__, __FUNCTION__); sc = XRRGetScreenInfo(_ecore_x_disp, root); if (!sc) { @@ -231,6 +240,7 @@ ecore_x_randr_screen_refresh_rates_get(Ecore_X_Window root, int size_id, int *nu short *rates; int i, n; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num) *num = 0; sc = XRRGetScreenInfo(_ecore_x_disp, root); @@ -269,6 +279,7 @@ ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root, Ecore_X_Screen_Size s XRRScreenSize *sizes; int i, n, size_index = -1; + LOGFN(__FILE__, __LINE__, __FUNCTION__); sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); for (i = 0; i < n; i++) { diff --git a/src/lib/ecore_x/xlib/ecore_x_region.c b/src/lib/ecore_x/xlib/ecore_x_region.c index 69c7a8c..eb2345d 100644 --- a/src/lib/ecore_x/xlib/ecore_x_region.c +++ b/src/lib/ecore_x/xlib/ecore_x_region.c @@ -35,12 +35,14 @@ EAPI Ecore_X_XRegion * ecore_x_xregion_new() { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return (Ecore_X_XRegion *)XCreateRegion(); } EAPI void ecore_x_xregion_free(Ecore_X_XRegion *region) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!region) return; @@ -50,12 +52,14 @@ ecore_x_xregion_free(Ecore_X_XRegion *region) EAPI int ecore_x_xregion_set(Ecore_X_XRegion *region, Ecore_X_GC gc) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSetRegion(_ecore_x_disp, gc, (Region)region); } EAPI void ecore_x_xregion_translate(Ecore_X_XRegion *region, int x, int y) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!region) return; @@ -66,12 +70,14 @@ ecore_x_xregion_translate(Ecore_X_XRegion *region, int x, int y) EAPI int ecore_x_xregion_intersect(Ecore_X_XRegion *dst, Ecore_X_XRegion *r1, Ecore_X_XRegion *r2) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XIntersectRegion((Region)r1, (Region)r2, (Region)dst); } -int +EAPI int ecore_x_xregion_union(Ecore_X_XRegion *dst, Ecore_X_XRegion *r1, Ecore_X_XRegion *r2) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XUnionRegion((Region)r1, (Region)r2, (Region)dst); } @@ -80,6 +86,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, Ecore_X_XRegion *src, Ecore_X_R { XRectangle xr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xr.x = rect->x; xr.y = rect->y; xr.width = rect->width; @@ -91,6 +98,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, Ecore_X_XRegion *src, Ecore_X_R EAPI int ecore_x_xregion_subtract(Ecore_X_XRegion *dst, Ecore_X_XRegion *rm, Ecore_X_XRegion *rs) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSubtractRegion((Region)rm, (Region)rs, (Region)dst); } @@ -100,6 +108,7 @@ ecore_x_xregion_is_empty(Ecore_X_XRegion *region) if (!region) return 1; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return !XEmptyRegion((Region)region); } @@ -109,6 +118,7 @@ ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, Ecore_X_XRegion *r2) if (!r1 || !r2) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XEqualRegion((Region)r1, (Region)r1); } @@ -118,6 +128,7 @@ ecore_x_xregion_point_contain(Ecore_X_XRegion *region, int x, int y) if (!region) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XPointInRegion((Region)region, x, y); } @@ -127,5 +138,6 @@ ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, Ecore_X_Rectangle *rect) if (!region || !rect) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XRectInRegion((Region)region, rect->x, rect->y, rect->width, rect->height); } diff --git a/src/lib/ecore_x/xlib/ecore_x_screensaver.c b/src/lib/ecore_x/xlib/ecore_x_screensaver.c index bfae17b..dcb718a 100644 --- a/src/lib/ecore_x/xlib/ecore_x_screensaver.c +++ b/src/lib/ecore_x/xlib/ecore_x_screensaver.c @@ -24,6 +24,7 @@ ecore_x_screensaver_event_available_get(void) #ifdef ECORE_XSS int _screensaver_major, _screensaver_minor; + LOGFN(__FILE__, __LINE__, __FUNCTION__); _screensaver_major = 1; _screensaver_minor = 0; @@ -44,6 +45,7 @@ ecore_x_screensaver_idle_time_get(void) XScreenSaverInfo *xss; int idle; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xss = XScreenSaverAllocInfo(); XScreenSaverQueryInfo(_ecore_x_disp, RootWindow(_ecore_x_disp, DefaultScreen(_ecore_x_disp)), xss); idle = xss->idle / 1000; @@ -58,6 +60,7 @@ ecore_x_screensaver_idle_time_get(void) EAPI void ecore_x_screensaver_set(int timeout, int interval, int prefer_blanking, int allow_exposures) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetScreenSaver(_ecore_x_disp, timeout, interval, prefer_blanking, allow_exposures); } @@ -66,6 +69,7 @@ ecore_x_screensaver_timeout_set(int timeout) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, timeout, pint, pblank, pexpo); } @@ -75,6 +79,7 @@ ecore_x_screensaver_timeout_get(void) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pto; } @@ -84,6 +89,7 @@ ecore_x_screensaver_blank_set(int blank) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, pint, blank, pexpo); } @@ -93,6 +99,7 @@ ecore_x_screensaver_blank_get(void) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pblank; } @@ -102,6 +109,7 @@ ecore_x_screensaver_expose_set(int expose) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, pint, pblank, expose); } @@ -111,6 +119,7 @@ ecore_x_screensaver_expose_get(void) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pexpo; } @@ -120,6 +129,7 @@ ecore_x_screensaver_interval_set(int interval) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); XSetScreenSaver(_ecore_x_disp, pto, interval, pblank, pexpo); } @@ -129,6 +139,7 @@ ecore_x_screensaver_interval_get(void) { int pto, pint, pblank, pexpo; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XGetScreenSaver(_ecore_x_disp, &pto, &pint, &pblank, &pexpo); return pint; } @@ -139,6 +150,7 @@ ecore_x_screensaver_event_listen_set(int on) #ifdef ECORE_XSS Ecore_X_Window root; + LOGFN(__FILE__, __LINE__, __FUNCTION__); root = DefaultRootWindow(_ecore_x_disp); if (on) XScreenSaverSelectInput(_ecore_x_disp, root, ScreenSaverNotifyMask); diff --git a/src/lib/ecore_x/xlib/ecore_x_selection.c b/src/lib/ecore_x/xlib/ecore_x_selection.c index ff77145..3f5ff2e 100644 --- a/src/lib/ecore_x/xlib/ecore_x_selection.c +++ b/src/lib/ecore_x/xlib/ecore_x_selection.c @@ -163,6 +163,7 @@ _ecore_x_selection_set(Window w, const void *data, int size, Ecore_X_Atom select EAPI int ecore_x_selection_primary_set(Ecore_X_Window w, const void *data, int size) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_PRIMARY); } @@ -175,6 +176,7 @@ ecore_x_selection_primary_set(Ecore_X_Window w, const void *data, int size) EAPI int ecore_x_selection_primary_clear(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_PRIMARY); } @@ -189,6 +191,7 @@ ecore_x_selection_primary_clear(void) EAPI int ecore_x_selection_secondary_set(Ecore_X_Window w, const void *data, int size) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_SECONDARY); } @@ -201,6 +204,7 @@ ecore_x_selection_secondary_set(Ecore_X_Window w, const void *data, int size) EAPI int ecore_x_selection_secondary_clear(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_SECONDARY); } @@ -215,6 +219,7 @@ ecore_x_selection_secondary_clear(void) EAPI int ecore_x_selection_xdnd_set(Ecore_X_Window w, const void *data, int size) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_XDND); } @@ -227,6 +232,7 @@ ecore_x_selection_xdnd_set(Ecore_X_Window w, const void *data, int size) EAPI int ecore_x_selection_xdnd_clear(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_XDND); } @@ -244,6 +250,7 @@ ecore_x_selection_xdnd_clear(void) EAPI int ecore_x_selection_clipboard_set(Ecore_X_Window w, const void *data, int size) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(w, data, size, ECORE_X_ATOM_SELECTION_CLIPBOARD); } @@ -256,6 +263,7 @@ ecore_x_selection_clipboard_set(Ecore_X_Window w, const void *data, int size) EAPI int ecore_x_selection_clipboard_clear(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_selection_set(None, NULL, 0, ECORE_X_ATOM_SELECTION_CLIPBOARD); } @@ -322,12 +330,14 @@ _ecore_x_selection_request(Ecore_X_Window w, Ecore_X_Atom selection, const char EAPI void ecore_x_selection_primary_request(Ecore_X_Window w, const char *target) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_PRIMARY, target); } EAPI void ecore_x_selection_secondary_request(Ecore_X_Window w, const char *target) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_SECONDARY, target); } @@ -337,6 +347,7 @@ ecore_x_selection_xdnd_request(Ecore_X_Window w, const char *target) Ecore_X_Atom atom; Ecore_X_DND_Target *_target; + LOGFN(__FILE__, __LINE__, __FUNCTION__); _target = _ecore_x_dnd_target_get(); atom = _ecore_x_selection_target_atom_get(target); XConvertSelection(_ecore_x_disp, ECORE_X_ATOM_SELECTION_XDND, atom, @@ -347,6 +358,7 @@ ecore_x_selection_xdnd_request(Ecore_X_Window w, const char *target) EAPI void ecore_x_selection_clipboard_request(Ecore_X_Window w, const char *target) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_selection_request(w, ECORE_X_ATOM_SELECTION_CLIPBOARD, target); } @@ -356,6 +368,7 @@ ecore_x_selection_converter_atom_add(Ecore_X_Atom target, { Ecore_X_Selection_Converter *cnv; + LOGFN(__FILE__, __LINE__, __FUNCTION__); cnv = converters; if (converters) { @@ -393,6 +406,7 @@ ecore_x_selection_converter_add(char *target, if (!func || !target) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); x_target = _ecore_x_selection_target_atom_get(target); ecore_x_selection_converter_atom_add(x_target, func); @@ -403,6 +417,7 @@ ecore_x_selection_converter_atom_del(Ecore_X_Atom target) { Ecore_X_Selection_Converter *cnv, *prev_cnv; + LOGFN(__FILE__, __LINE__, __FUNCTION__); prev_cnv = NULL; cnv = converters; @@ -431,6 +446,7 @@ ecore_x_selection_converter_del(char *target) if (!target) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); x_target = _ecore_x_selection_target_atom_get(target); ecore_x_selection_converter_atom_del(x_target); } @@ -441,6 +457,7 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor, Ecore_X_Atom selection, XEvent xev; XSelectionEvent xnotify; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xnotify.type = SelectionNotify; xnotify.display = _ecore_x_disp; xnotify.requestor = requestor; @@ -465,6 +482,7 @@ ecore_x_selection_convert(Ecore_X_Atom selection, Ecore_X_Atom target, void **da int size; char *tgt_str; + LOGFN(__FILE__, __LINE__, __FUNCTION__); sel = _ecore_x_selection_get(selection); tgt_str = _ecore_x_selection_target_get(target); @@ -509,6 +527,7 @@ _ecore_x_selection_converter_text(char *target, void *data, int size, void **dat if (!data || !size) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strcmp(target, ECORE_X_SELECTION_TARGET_TEXT)) style = XTextStyle; else if (!strcmp(target, ECORE_X_SELECTION_TARGET_COMPOUND_TEXT)) @@ -564,6 +583,7 @@ ecore_x_selection_parser_add(const char *target, if (!target) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); prs = parsers; if (parsers) { @@ -597,6 +617,7 @@ ecore_x_selection_parser_del(const char *target) if (!target) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); prev_prs = NULL; prs = parsers; diff --git a/src/lib/ecore_x/xlib/ecore_x_sync.c b/src/lib/ecore_x/xlib/ecore_x_sync.c index 0757e9b..451ce98 100644 --- a/src/lib/ecore_x/xlib/ecore_x_sync.c +++ b/src/lib/ecore_x/xlib/ecore_x_sync.c @@ -22,6 +22,7 @@ ecore_x_sync_alarm_new(Ecore_X_Sync_Counter counter) XSyncAlarmAttributes values; XSyncValue init; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&init, 0); XSyncSetCounter(_ecore_x_disp, counter, init); @@ -50,21 +51,23 @@ ecore_x_sync_alarm_new(Ecore_X_Sync_Counter counter) EAPI int ecore_x_sync_alarm_free(Ecore_X_Sync_Alarm alarm) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return XSyncDestroyAlarm(_ecore_x_disp, alarm); } EAPI int ecore_x_sync_counter_query(Ecore_X_Sync_Counter counter, unsigned int *val) { - XSyncValue value; - - if (XSyncQueryCounter(_ecore_x_disp, counter, &value)) - { - *val = (unsigned int) XSyncValueLow32(value); - return 1; - } - - return 0; + XSyncValue value; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (XSyncQueryCounter(_ecore_x_disp, counter, &value)) + { + *val = (unsigned int) XSyncValueLow32(value); + return 1; + } + + return 0; } EAPI Ecore_X_Sync_Counter @@ -73,6 +76,7 @@ ecore_x_sync_counter_new(int val) XSyncCounter counter; XSyncValue v; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&v, val); counter = XSyncCreateCounter(_ecore_x_disp, v); return counter; @@ -81,6 +85,7 @@ ecore_x_sync_counter_new(int val) EAPI void ecore_x_sync_counter_free(Ecore_X_Sync_Counter counter) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncDestroyCounter(_ecore_x_disp, counter); } @@ -89,6 +94,7 @@ ecore_x_sync_counter_inc(Ecore_X_Sync_Counter counter, int by) { XSyncValue v; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&v, by); XSyncChangeCounter(_ecore_x_disp, counter, v); } @@ -99,6 +105,7 @@ ecore_x_sync_counter_val_wait(Ecore_X_Sync_Counter counter, int val) XSyncWaitCondition cond; XSyncValue v, v2; + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncQueryCounter(_ecore_x_disp, counter, &v); XSyncIntToValue(&v, val); XSyncIntToValue(&v2, val + 1); diff --git a/src/lib/ecore_x/xlib/ecore_x_test.c b/src/lib/ecore_x/xlib/ecore_x_test.c index 2df45f8..415b6a2 100644 --- a/src/lib/ecore_x/xlib/ecore_x_test.c +++ b/src/lib/ecore_x/xlib/ecore_x_test.c @@ -24,6 +24,7 @@ ecore_x_test_fake_key_down(const char *key) KeyCode keycode = 0; KeySym keysym; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strncmp(key, "Keycode-", 8)) keycode = atoi(key + 8); else @@ -46,6 +47,7 @@ ecore_x_test_fake_key_up(const char *key) KeyCode keycode = 0; KeySym keysym; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strncmp(key, "Keycode-", 8)) keycode = atoi(key + 8); else @@ -69,6 +71,7 @@ ecore_x_test_fake_key_press(const char *key) KeySym keysym = 0; int shift = 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!strncmp(key, "Keycode-", 8)) keycode = atoi(key + 8); else diff --git a/src/lib/ecore_x/xlib/ecore_x_window.c b/src/lib/ecore_x/xlib/ecore_x_window.c index 701eb5f..eed980a 100644 --- a/src/lib/ecore_x/xlib/ecore_x_window.c +++ b/src/lib/ecore_x/xlib/ecore_x_window.c @@ -41,6 +41,7 @@ ecore_x_window_new(Ecore_X_Window parent, int x, int y, int w, int h) Window win; XSetWindowAttributes attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (parent == 0) parent = DefaultRootWindow(_ecore_x_disp); attr.backing_store = NotUseful; attr.override_redirect = False; @@ -101,6 +102,7 @@ ecore_x_window_override_new(Ecore_X_Window parent, int x, int y, int w, int h) Window win; XSetWindowAttributes attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (parent == 0) parent = DefaultRootWindow(_ecore_x_disp); attr.backing_store = NotUseful; attr.override_redirect = True; @@ -159,6 +161,7 @@ ecore_x_window_input_new(Ecore_X_Window parent, int x, int y, int w, int h) Window win; XSetWindowAttributes attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (parent == 0) parent = DefaultRootWindow(_ecore_x_disp); attr.override_redirect = True; attr.do_not_propagate_mask = NoEventMask; @@ -216,6 +219,7 @@ ecore_x_window_defaults_set(Ecore_X_Window win) char **argv; XTextProperty xprop; + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* * Set WM_CLIENT_MACHINE. */ @@ -253,8 +257,9 @@ ecore_x_window_configure(Ecore_X_Window win, { XWindowChanges xwc; - if (!win) - return; + if (!win) return; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); xwc.x = x; xwc.y = y; @@ -284,8 +289,8 @@ ecore_x_window_free(Ecore_X_Window win) /* sorry sir, deleting the root window doesn't sound like * a smart idea. */ - if (win) - XDestroyWindow(_ecore_x_disp, win); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (win) XDestroyWindow(_ecore_x_disp, win); } /** @@ -298,6 +303,7 @@ ecore_x_window_ignore_set(Ecore_X_Window win, int ignore) { int i, j; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (ignore) { if (ignore_list) @@ -357,9 +363,9 @@ ecore_x_window_delete_request_send(Ecore_X_Window win) /* sorry sir, deleting the root window doesn't sound like * a smart idea. */ - if (!win) - return; + if (!win) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); xev.xclient.type = ClientMessage; xev.xclient.display = _ecore_x_disp; xev.xclient.window = win; @@ -388,6 +394,7 @@ ecore_x_window_delete_request_send(Ecore_X_Window win) EAPI void ecore_x_window_show(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XMapWindow(_ecore_x_disp, win); } @@ -408,6 +415,7 @@ ecore_x_window_hide(Ecore_X_Window win) unsigned int uidum; /* ICCCM: SEND unmap event... */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); root = win; if (ScreenCount(_ecore_x_disp) == 1) root = DefaultRootWindow(_ecore_x_disp); @@ -445,6 +453,7 @@ ecore_x_window_hide(Ecore_X_Window win) EAPI void ecore_x_window_move(Ecore_X_Window win, int x, int y) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XMoveWindow(_ecore_x_disp, win, x, y); } @@ -458,6 +467,7 @@ ecore_x_window_move(Ecore_X_Window win, int x, int y) EAPI void ecore_x_window_resize(Ecore_X_Window win, int w, int h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (w < 1) w = 1; if (h < 1) h = 1; XResizeWindow(_ecore_x_disp, win, w, h); @@ -475,6 +485,7 @@ ecore_x_window_resize(Ecore_X_Window win, int w, int h) EAPI void ecore_x_window_move_resize(Ecore_X_Window win, int x, int y, int w, int h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (w < 1) w = 1; if (h < 1) h = 1; XMoveResizeWindow(_ecore_x_disp, win, x, y, w, h); @@ -494,6 +505,7 @@ ecore_x_window_move_resize(Ecore_X_Window win, int x, int y, int w, int h) EAPI void ecore_x_window_focus(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); // XSetInputFocus(_ecore_x_disp, win, RevertToNone, CurrentTime); // XSetInputFocus(_ecore_x_disp, win, RevertToPointerRoot, CurrentTime); @@ -509,6 +521,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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); // XSetInputFocus(_ecore_x_disp, win, RevertToNone, t); // XSetInputFocus(_ecore_x_disp, win, PointerRoot, t); @@ -526,8 +539,8 @@ ecore_x_window_focus_get(void) Window win; int revert_mode; + LOGFN(__FILE__, __LINE__, __FUNCTION__); win = 0; - XGetInputFocus(_ecore_x_disp, &win, &revert_mode); return win; } @@ -546,6 +559,7 @@ ecore_x_window_focus_get(void) EAPI void ecore_x_window_raise(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XRaiseWindow(_ecore_x_disp, win); } @@ -557,6 +571,7 @@ ecore_x_window_raise(Ecore_X_Window win) EAPI void ecore_x_window_lower(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XLowerWindow(_ecore_x_disp, win); } @@ -577,6 +592,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (new_parent == 0) new_parent = DefaultRootWindow(_ecore_x_disp); XReparentWindow(_ecore_x_disp, win, new_parent, x, y); } @@ -593,9 +609,8 @@ ecore_x_window_size_get(Ecore_X_Window win, int *w, int *h) { int dummy_x, dummy_y; - if (win == 0) - win = DefaultRootWindow(_ecore_x_disp); - + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (win == 0) win = DefaultRootWindow(_ecore_x_disp); ecore_x_drawable_geometry_get(win, &dummy_x, &dummy_y, w, h); } @@ -611,9 +626,8 @@ ecore_x_window_size_get(Ecore_X_Window win, int *w, int *h) EAPI void ecore_x_window_geometry_get(Ecore_X_Window win, int *x, int *y, int *w, int *h) { - if (!win) - win = DefaultRootWindow(_ecore_x_disp); - + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (!win) win = DefaultRootWindow(_ecore_x_disp); ecore_x_drawable_geometry_get(win, x, y, w, h); } @@ -626,10 +640,9 @@ ecore_x_window_geometry_get(Ecore_X_Window win, int *x, int *y, int *w, int *h) EAPI int ecore_x_window_border_width_get(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* doesn't make sense to call this on a root window */ - if (!win) - return 0; - + if (!win) return 0; return ecore_x_drawable_border_width_get(win); } @@ -642,10 +655,9 @@ ecore_x_window_border_width_get(Ecore_X_Window win) EAPI void ecore_x_window_border_width_set(Ecore_X_Window win, int width) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* doesn't make sense to call this on a root window */ - if (!win) - return; - + if (!win) return; XSetWindowBorderWidth (_ecore_x_disp, win, width); } @@ -657,6 +669,7 @@ ecore_x_window_border_width_set(Ecore_X_Window win, int width) EAPI int ecore_x_window_depth_get(Ecore_X_Window win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_drawable_depth_get(win); } @@ -668,6 +681,7 @@ ecore_x_window_depth_get(Ecore_X_Window win) EAPI void ecore_x_window_cursor_show(Ecore_X_Window win, int show) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); if (!show) { @@ -698,6 +712,7 @@ ecore_x_window_cursor_show(Ecore_X_Window win, int show) EAPI void ecore_x_window_cursor_set(Ecore_X_Window win, Ecore_X_Cursor c) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (c == 0) XUndefineCursor(_ecore_x_disp, win); else @@ -715,6 +730,7 @@ ecore_x_window_visible_get(Ecore_X_Window win) { XWindowAttributes attr; + LOGFN(__FILE__, __LINE__, __FUNCTION__); return (XGetWindowAttributes(_ecore_x_disp, win, &attr) && (attr.map_state == IsViewable)); } @@ -976,6 +992,7 @@ _ecore_x_window_shadow_tree_at_xy_get(Window base, int bx, int by, int x, int y, 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 *skip, int skip_num) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_window_shadow_tree_at_xy_get(base, 0, 0, x, y, skip, skip_num); } @@ -993,6 +1010,7 @@ ecore_x_window_shadow_parent_get(Ecore_X_Window root, Ecore_X_Window win) Shadow *s; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!shadow_base) { _ecore_x_window_tree_shadow_populate(); @@ -1018,6 +1036,7 @@ ecore_x_window_shadow_parent_get(Ecore_X_Window root, Ecore_X_Window win) EAPI void ecore_x_window_shadow_tree_flush(void) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_window_tree_shadow_free(); } @@ -1032,6 +1051,7 @@ ecore_x_window_root_get(Ecore_X_Window win) { XWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetWindowAttributes(_ecore_x_disp, win, &att)) return 0; return att.root; } @@ -1045,9 +1065,11 @@ _ecore_x_window_at_xy_get(Window base, int bx, int by, int x, int y, int i, j, wx, wy, ww, wh; unsigned int num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ecore_x_window_visible_get(base)) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_geometry_get(base, &wx, &wy, &ww, &wh); wx += bx; wy += by; @@ -1055,6 +1077,7 @@ _ecore_x_window_at_xy_get(Window base, int bx, int by, int x, int y, if (!((x >= wx) && (y >= wy) && (x < (wx + ww)) && (y < (wy + wh)))) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XQueryTree(_ecore_x_disp, base, &root_win, &parent_win, &list, &num)) return base; @@ -1104,6 +1127,7 @@ ecore_x_window_at_xy_get(int x, int y) { Ecore_X_Window win, root; + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* FIXME: Proper function to determine current root/virtual root * window missing here */ root = DefaultRootWindow(_ecore_x_disp); @@ -1128,6 +1152,7 @@ ecore_x_window_at_xy_with_skip_get(int x, int y, Ecore_X_Window *skip, int skip_ { Ecore_X_Window win, root; + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* FIXME: Proper function to determine current root/virtual root * window missing here */ root = DefaultRootWindow(_ecore_x_disp); @@ -1144,6 +1169,7 @@ ecore_x_window_at_xy_begin_get(Ecore_X_Window begin, int x, int y) { Ecore_X_Window win; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_grab(); win = _ecore_x_window_at_xy_get(begin, 0, 0, x, y, NULL, 0); ecore_x_ungrab(); @@ -1163,6 +1189,7 @@ ecore_x_window_parent_get(Ecore_X_Window win) Window root, parent, *children = NULL; unsigned int num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XQueryTree(_ecore_x_disp, win, &root, &parent, &children, &num)) return 0; if (children) @@ -1186,6 +1213,7 @@ ecore_x_window_background_color_set(Ecore_X_Window win, unsigned short r, Colormap map; XColor col; + LOGFN(__FILE__, __LINE__, __FUNCTION__); col.red = r; col.green = g; col.blue = b; @@ -1202,6 +1230,7 @@ ecore_x_window_gravity_set(Ecore_X_Window win, Ecore_X_Gravity grav) { XSetWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); att.win_gravity = grav; XChangeWindowAttributes(_ecore_x_disp, win, CWWinGravity, &att); } @@ -1211,6 +1240,7 @@ ecore_x_window_pixel_gravity_set(Ecore_X_Window win, Ecore_X_Gravity grav) { XSetWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); att.bit_gravity = grav; XChangeWindowAttributes(_ecore_x_disp, win, CWBitGravity, &att); } @@ -1218,18 +1248,21 @@ ecore_x_window_pixel_gravity_set(Ecore_X_Window win, Ecore_X_Gravity grav) EAPI void ecore_x_window_pixmap_set(Ecore_X_Window win, Ecore_X_Pixmap pmap) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSetWindowBackgroundPixmap(_ecore_x_disp, win, pmap); } EAPI void ecore_x_window_area_clear(Ecore_X_Window win, int x, int y, int w, int h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XClearArea(_ecore_x_disp, win, x, y, w, h, False); } EAPI void ecore_x_window_area_expose(Ecore_X_Window win, int x, int y, int w, int h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XClearArea(_ecore_x_disp, win, x, y, w, h, True); } @@ -1238,6 +1271,7 @@ ecore_x_window_override_set(Ecore_X_Window win, int override) { XSetWindowAttributes att; + LOGFN(__FILE__, __LINE__, __FUNCTION__); att.override_redirect = override; XChangeWindowAttributes(_ecore_x_disp, win, CWOverrideRedirect, &att); } @@ -1374,6 +1408,7 @@ EAPI Ecore_X_Window ecore_x_window_manager_argb_new(Ecore_X_Window parent, int x, int y, int w, int h) { #ifdef ECORE_XRENDER + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 1, 0); #else return 0; @@ -1395,6 +1430,7 @@ EAPI Ecore_X_Window ecore_x_window_argb_new(Ecore_X_Window parent, int x, int y, int w, int h) { #ifdef ECORE_XRENDER + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 0, 0); #else return 0; @@ -1416,6 +1452,7 @@ EAPI Ecore_X_Window ecore_x_window_override_argb_new(Ecore_X_Window parent, int x, int y, int w, int h) { #ifdef ECORE_XRENDER + LOGFN(__FILE__, __LINE__, __FUNCTION__); return _ecore_x_window_argb_internal_new(parent, x, y, w, h, 1, 0); #else return 0; diff --git a/src/lib/ecore_x/xlib/ecore_x_window_prop.c b/src/lib/ecore_x/xlib/ecore_x_window_prop.c index a091328..cf81c3c 100644 --- a/src/lib/ecore_x/xlib/ecore_x_window_prop.c +++ b/src/lib/ecore_x/xlib/ecore_x_window_prop.c @@ -33,6 +33,7 @@ ecore_x_window_prop_card32_set(Ecore_X_Window win, Ecore_X_Atom atom, long *v2; unsigned int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); v2 = malloc(num * sizeof(long)); if (!v2) return; @@ -62,6 +63,7 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win, Ecore_X_Atom atom, unsigned int i; int num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); prop_ret = NULL; if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False, XA_CARDINAL, &type_ret, &format_ret, &num_ret, @@ -108,6 +110,7 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win, Ecore_X_Atom atom, unsigned int i, *val; int num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); *plst = NULL; prop_ret = NULL; if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False, @@ -152,6 +155,7 @@ ecore_x_window_prop_xid_set(Ecore_X_Window win, Ecore_X_Atom atom, unsigned long *pl; unsigned int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); pl = malloc(num * sizeof(long)); if (!pl) return; @@ -183,6 +187,7 @@ ecore_x_window_prop_xid_get(Ecore_X_Window win, Ecore_X_Atom atom, int num; unsigned i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); prop_ret = NULL; if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &num_ret, @@ -231,6 +236,7 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win, Ecore_X_Atom atom, int num; unsigned i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); *val = NULL; prop_ret = NULL; if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False, @@ -270,6 +276,7 @@ ecore_x_window_prop_xid_list_change(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_ID *lst; int i, num; + LOGFN(__FILE__, __LINE__, __FUNCTION__); num = ecore_x_window_prop_xid_list_get(win, atom, type, &lst); if (num < 0) return; /* Error - assuming invalid window */ @@ -316,6 +323,7 @@ EAPI void ecore_x_window_prop_atom_set(Ecore_X_Window win, 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); } @@ -331,6 +339,7 @@ EAPI int ecore_x_window_prop_atom_get(Ecore_X_Window win, 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); } @@ -346,6 +355,7 @@ EAPI int ecore_x_window_prop_atom_list_get(Ecore_X_Window win, 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); } @@ -356,6 +366,7 @@ EAPI void ecore_x_window_prop_atom_list_change(Ecore_X_Window win, 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); } @@ -366,6 +377,7 @@ EAPI void ecore_x_window_prop_window_set(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Window * lst, unsigned int num) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_window_prop_xid_set(win, atom, XA_WINDOW, lst, num); } @@ -381,6 +393,7 @@ EAPI int ecore_x_window_prop_window_get(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Window * lst, unsigned int len) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); return ecore_x_window_prop_xid_get(win, atom, XA_WINDOW, lst, len); } @@ -396,6 +409,7 @@ EAPI int 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); } @@ -418,6 +432,7 @@ 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) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); if (size != 32) XChangeProperty(_ecore_x_disp, win, property, type, size, PropModeReplace, @@ -459,6 +474,7 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor else /* we can't store the retrieved data, so just return */ return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!win) win = DefaultRootWindow(_ecore_x_disp); ret = XGetWindowProperty(_ecore_x_disp, win, property, 0, LONG_MAX, @@ -502,6 +518,7 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor EAPI void ecore_x_window_prop_property_del(Ecore_X_Window win, Ecore_X_Atom property) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XDeleteProperty(_ecore_x_disp, win, property); } @@ -512,6 +529,7 @@ ecore_x_window_prop_list(Ecore_X_Window win, int *num_ret) Atom *atom_ret; int num = 0, i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num_ret) *num_ret = 0; atom_ret = XListProperties(_ecore_x_disp, win, &num); @@ -540,6 +558,7 @@ ecore_x_window_prop_string_set(Ecore_X_Window win, Ecore_X_Atom type, const char { XTextProperty xtp; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); xtp.value = (unsigned char *)str; xtp.format = 8; @@ -561,6 +580,7 @@ ecore_x_window_prop_string_get(Ecore_X_Window win, Ecore_X_Atom type) XTextProperty xtp; char *str = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (win == 0) win = DefaultRootWindow(_ecore_x_disp); if (XGetTextProperty(_ecore_x_disp, win, &xtp, type)) { @@ -609,6 +629,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); proto = _ecore_x_atoms_wm_protocols[protocol]; if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count)) @@ -638,6 +659,7 @@ ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, int *num_ret) int i, protos_count = 0; Ecore_X_WM_Protocol *prot_ret = NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!XGetWMProtocols(_ecore_x_disp, win, &protos, &protos_count)) return NULL; diff --git a/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/src/lib/ecore_x/xlib/ecore_x_window_shape.c index ca92726..c6c0314 100644 --- a/src/lib/ecore_x/xlib/ecore_x_window_shape.c +++ b/src/lib/ecore_x/xlib/ecore_x_window_shape.c @@ -29,18 +29,21 @@ EAPI void ecore_x_window_shape_mask_set(Ecore_X_Window win, Ecore_X_Pixmap mask) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineMask(_ecore_x_disp, win, ShapeBounding, 0, 0, mask, ShapeSet); } EAPI void ecore_x_window_shape_window_set(Ecore_X_Window win, Ecore_X_Window shape_win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, ShapeBounding, 0, 0, shape_win, ShapeBounding, ShapeSet); } EAPI void ecore_x_window_shape_window_set_xy(Ecore_X_Window win, Ecore_X_Window shape_win, int x, int y) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, ShapeBounding, x, y, shape_win, ShapeBounding, ShapeSet); } @@ -49,6 +52,7 @@ ecore_x_window_shape_rectangle_set(Ecore_X_Window win, int x, int y, int w, int { XRectangle rect; + LOGFN(__FILE__, __LINE__, __FUNCTION__); rect.x = x; rect.y = y; rect.width = w; @@ -62,6 +66,7 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects XRectangle *rect = NULL; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num > 0) { rect = malloc(sizeof(XRectangle) * num); @@ -85,12 +90,14 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects EAPI void ecore_x_window_shape_window_add(Ecore_X_Window win, Ecore_X_Window shape_win) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, ShapeBounding, 0, 0, shape_win, ShapeBounding, ShapeUnion); } EAPI void ecore_x_window_shape_window_add_xy(Ecore_X_Window win, Ecore_X_Window shape_win, int x, int y) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, ShapeBounding, x, y, shape_win, ShapeBounding, ShapeUnion); } @@ -99,6 +106,7 @@ ecore_x_window_shape_rectangle_add(Ecore_X_Window win, int x, int y, int w, int { XRectangle rect; + LOGFN(__FILE__, __LINE__, __FUNCTION__); rect.x = x; rect.y = y; rect.width = w; @@ -111,6 +119,7 @@ ecore_x_window_shape_rectangle_clip(Ecore_X_Window win, int x, int y, int w, int { XRectangle rect; + LOGFN(__FILE__, __LINE__, __FUNCTION__); rect.x = x; rect.y = y; rect.width = w; @@ -124,6 +133,7 @@ ecore_x_window_shape_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle *rects XRectangle *rect = NULL; int i; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (num > 0) { rect = malloc(sizeof(XRectangle) * num); @@ -151,6 +161,7 @@ ecore_x_window_shape_rectangles_get(Ecore_X_Window win, int *num_ret) Ecore_X_Rectangle *rects = NULL; int i, num = 0, ord; + LOGFN(__FILE__, __LINE__, __FUNCTION__); rect = XShapeGetRectangles(_ecore_x_disp, win, ShapeBounding, &num, &ord); if (rect) { @@ -174,6 +185,7 @@ ecore_x_window_shape_rectangles_get(Ecore_X_Window win, int *num_ret) EAPI void ecore_x_window_shape_events_select(Ecore_X_Window win, int on) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (on) XShapeSelectInput(_ecore_x_disp, win, ShapeNotifyMask); else @@ -190,6 +202,7 @@ ecore_x_window_shape_events_select(Ecore_X_Window win, int on) EAPI void ecore_x_window_shape_input_mask_set(Ecore_X_Window win, Ecore_X_Pixmap mask) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ShapeInput XShapeCombineMask(_ecore_x_disp, win, ShapeInput, 0, 0, mask, ShapeSet); #else diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c index edec0ba..5812728 100644 --- a/src/lib/ecore_x/xlib/ecore_x_xi2.c +++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c @@ -135,6 +135,7 @@ ecore_x_input_multi_select(Ecore_X_Window win) if (!_ecore_x_xi2_devs) return 0; + LOGFN(__FILE__, __LINE__, __FUNCTION__); for (i = 0; i < _ecore_x_xi2_num; i++) { XIDeviceInfo *dev = &(_ecore_x_xi2_devs[i]); diff --git a/src/lib/ecore_x/xlib/ecore_x_xinerama.c b/src/lib/ecore_x/xlib/ecore_x_xinerama.c index 5be0b16..cb6c8db 100644 --- a/src/lib/ecore_x/xlib/ecore_x_xinerama.c +++ b/src/lib/ecore_x/xlib/ecore_x_xinerama.c @@ -26,6 +26,7 @@ ecore_x_xinerama_screen_count_get(void) #ifdef ECORE_XINERAMA int event_base, error_base; + LOGFN(__FILE__, __LINE__, __FUNCTION__); if (_xin_info) XFree(_xin_info); _xin_info = NULL; if (XineramaQueryExtension(_ecore_x_disp, &event_base, &error_base)) @@ -40,6 +41,7 @@ ecore_x_xinerama_screen_count_get(void) EAPI int ecore_x_xinerama_screen_geometry_get(int screen, int *x, int *y, int *w, int *h) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ECORE_XINERAMA if (_xin_info) { -- 2.7.4