From 8984dc4633ccf743d65c3193b72fefeeb2a008c9 Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 13 Feb 2010 12:28:08 +0000 Subject: [PATCH] apply raster's changes to the xcb engine git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@46134 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/software_x11/evas_xcb_buffer.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/modules/engines/software_x11/evas_xcb_buffer.c b/src/modules/engines/software_x11/evas_xcb_buffer.c index 74516c9..c7e9c74 100644 --- a/src/modules/engines/software_x11/evas_xcb_buffer.c +++ b/src/modules/engines/software_x11/evas_xcb_buffer.c @@ -327,16 +327,21 @@ evas_software_xcb_x_output_buffer_new(xcb_connection_t *c, /* XErrorHandler ph; */ /* EventHandlers eh; */ - - free(xcb_get_input_focus_reply(c, xcb_get_input_focus_unchecked(c), NULL)); - _xcb_err = 0; - /* ph = XSetErrorHandler((XErrorHandler) */ - /* x_output_tmp_x_err); */ + + if (try_shm == 2) // only needed during testing + { + free(xcb_get_input_focus_reply(c, xcb_get_input_focus_unchecked(c), NULL)); + _xcb_err = 0; + /* ph = XSetErrorHandler((XErrorHandler) */ + } xcb_shm_attach(c, xcbob->shm_info->shmseg, xcbob->shm_info->shmid, 0); - free(xcb_get_input_focus_reply(c, xcb_get_input_focus_unchecked(c), NULL)); - /* XSetErrorHandler((XErrorHandler)ph); */ + if (try_shm == 2) // only needed during testing + { + free(xcb_get_input_focus_reply(c, xcb_get_input_focus_unchecked(c), NULL)); + /* XSetErrorHandler((XErrorHandler)ph); */ + } if (!_xcb_err) { xcbob->bpl = xcbob->image->stride; -- 2.7.4