From a279e13ecd8a9b7570ed49e02440b9edeba1f3d2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 13 Jan 2014 12:14:50 -0500 Subject: [PATCH] ecore-x present fixups --- src/lib/ecore_x/xcb/ecore_xcb_present.c | 6 ++++++ src/lib/ecore_x/xlib/ecore_x_present.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/lib/ecore_x/xcb/ecore_xcb_present.c b/src/lib/ecore_x/xcb/ecore_xcb_present.c index b5b426ba28..f722fb461f 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_present.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_present.c @@ -134,7 +134,9 @@ _ecore_xcb_event_handle_present_event(xcb_ge_event_t *ev) EAPI void ecore_x_present_select_events(Ecore_X_Window win, unsigned int events) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ECORE_XCB_XPRESENT + CHECK_XCB_CONN; xcb_present_select_input(_ecore_xcb_conn, _ecore_xcb_event_xpresent, win, events); #else (void)win; @@ -145,7 +147,9 @@ ecore_x_present_select_events(Ecore_X_Window win, unsigned int events) EAPI void ecore_x_present_notify_msc(Ecore_X_Window win, unsigned int serial, unsigned long long target_msc, unsigned long long divisor, unsigned long long remainder) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ECORE_XCB_XPRESENT + CHECK_XCB_CONN; xcb_present_notify_msc(_ecore_xcb_conn, win, serial, target_msc, divisor, remainder); #else (void)win; @@ -163,7 +167,9 @@ ecore_x_present_pixmap(Ecore_X_Window win, Ecore_X_Pixmap pixmap, unsigned int s unsigned long long target_msc, unsigned long long divisor, unsigned long long remainder, Ecore_X_Present *notifies, int num_notifies) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); #ifdef ECORE_XCB_XPRESENT + CHECK_XCB_CONN; xcb_present_pixmap(_ecore_xcb_conn, win, pixmap, serial, valid, update, x_off, y_off, target_crtc, wait_fence, idle_fence, options, target_msc, divisor, remainder, num_notifies, (xcb_present_notify_t*)notifies); diff --git a/src/lib/ecore_x/xlib/ecore_x_present.c b/src/lib/ecore_x/xlib/ecore_x_present.c index 9e6a398e4b..eb190b7560 100644 --- a/src/lib/ecore_x/xlib/ecore_x_present.c +++ b/src/lib/ecore_x/xlib/ecore_x_present.c @@ -111,6 +111,7 @@ ecore_x_present_select_events(Ecore_X_Window win, unsigned int events) { #ifdef ECORE_XPRESENT XPresentSelectInput(_ecore_x_disp, win, events); + if (_ecore_xlib_sync) ecore_x_sync(); #else (void)win; (void)events; @@ -122,6 +123,7 @@ ecore_x_present_notify_msc(Ecore_X_Window win, unsigned int serial, unsigned lon { #ifdef ECORE_XPRESENT XPresentNotifyMSC(_ecore_x_disp, win, serial, target_msc, divisor, remainder); + if (_ecore_xlib_sync) ecore_x_sync(); #else (void)win; (void)serial; @@ -142,6 +144,7 @@ ecore_x_present_pixmap(Ecore_X_Window win, Ecore_X_Pixmap pixmap, unsigned int s XPresentPixmap(_ecore_x_disp, win, pixmap, serial, valid, update, x_off, y_off, target_crtc, wait_fence, idle_fence, options, target_msc, divisor, remainder, (XPresentNotify*)notifies, num_notifies); + if (_ecore_xlib_sync) ecore_x_sync(); #else (void)win; (void)pixmap;