-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <string.h>
-
-#include <Ecore.h>
-#include <Ecore_Input.h>
-#include <Ecore_Input_Evas.h>
-#ifdef BUILD_ECORE_EVAS_X11
-# include <Ecore_X.h>
-# include <Ecore_X_Atoms.h>
-#else
-# undef BUILD_ECORE_EVAS_OPENGL_X11
-# undef BUILD_ECORE_EVAS_SOFTWARE_X11
-#endif
-
-#ifndef HAVE_ECORE_X_XCB
-# undef BUILD_ECORE_EVAS_SOFTWARE_XCB
-#endif
-
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
leader_ref++;
if (leader_ref == 1)
{
- leader_win = ecore_x_window_override_new(ee->engine.x.win_root, 1234, 5678, 1, 2);
+ char *id = NULL;
+
+ leader_win =
+ ecore_x_window_override_new(ee->engine.x.win_root, 1234, 5678, 1, 2);
ecore_x_window_defaults_set(leader_win);
- if (getenv("DESKTOP_STARTUP_ID"))
- ecore_x_netwm_startup_id_set(leader_win,
- getenv("DESKTOP_STARTUP_ID"));
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
+ ecore_x_netwm_startup_id_set(leader_win,id);
ecore_x_icccm_client_leader_set(leader_win, leader_win);
}
ee->engine.x.leader = leader_win;
static void
_ecore_evas_x_group_leader_unset(Ecore_Evas *ee)
{
- ecore_x_window_prop_property_del(ee->prop.window, ECORE_X_ATOM_WM_CLIENT_LEADER);
+ ecore_x_window_prop_property_del(ee->prop.window,
+ ECORE_X_ATOM_WM_CLIENT_LEADER);
if (ee->engine.x.leader == leader_win)
{
leader_ref--;
_ecore_evas_x_protocols_set(Ecore_Evas *ee)
{
Ecore_X_Atom protos[10];
- int num = 0;
+ unsigned int num = 0, tmp = 0;
if (ee->func.fn_delete_request)
protos[num++] = ECORE_X_ATOM_WM_DELETE_WINDOW;
if (!ee->engine.x.netwm_sync_counter)
ee->engine.x.netwm_sync_counter = ecore_x_sync_counter_new(0);
- ////////
- {
- unsigned int tmp = ee->engine.x.netwm_sync_counter;
- ecore_x_window_prop_card32_set(ee->prop.window,
- ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER,
- &tmp, 1);
- }
+
+ tmp = ee->engine.x.netwm_sync_counter;
+ ecore_x_window_prop_card32_set(ee->prop.window,
+ ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER,
+ &tmp, 1);
}
static void
ee->engine.x.sync_counter = 0;
}
-#ifdef HAVE_ECORE_X_XCB
-static xcb_visualtype_t *
-xcb_visualtype_get(xcb_screen_t *screen, xcb_visualid_t visual)
-{
- xcb_depth_iterator_t iter_depth;
-
- if (!screen) return NULL;
-
- iter_depth = xcb_screen_allowed_depths_iterator(screen);
- for (; iter_depth.rem; xcb_depth_next (&iter_depth))
- {
- xcb_visualtype_iterator_t iter_vis;
-
- iter_vis = xcb_depth_visuals_iterator(iter_depth.data);
- for (; iter_vis.rem; --screen, xcb_visualtype_next (&iter_vis))
- {
- if (visual == iter_vis.data->visual_id)
- return iter_vis.data;
- }
- }
-
- return NULL;
-}
-#endif /* HAVE_ECORE_X_XCB */
-
-#ifdef BUILD_ECORE_EVAS_OPENGL_X11
-# ifdef HAVE_ECORE_X_XCB
-/* noop */
-# else
+# ifdef BUILD_ECORE_EVAS_OPENGL_X11
static Ecore_X_Window
_ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, int w, int h, int override, int argb, const int *opt)
{
einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
- XSetWindowAttributes attr;
int screen;
if (opt)
}
/* FIXME: this is inefficient as its 1 or more round trips */
- screen = DefaultScreen(ecore_x_display_get());
- if (ScreenCount(ecore_x_display_get()) > 1)
+ screen = ecore_x_screen_index_get(ecore_x_default_screen_get());
+ if (ecore_x_screen_count_get() > 1)
{
Ecore_X_Window *roots;
int num, i;
roots = ecore_x_window_root_list(&num);
if (roots)
{
- XWindowAttributes at;
+ Ecore_X_Window root;
- if (XGetWindowAttributes(ecore_x_display_get(),
- parent, &at))
+ root = ecore_x_window_root_get(parent);
+ for (i = 0; i < num; i++)
{
- for (i = 0; i < num; i++)
+ if (root == roots[i])
{
- if (at.root == roots[i])
- {
- screen = i;
- break;
- }
+ screen = i;
+ break;
}
}
free(roots);
}
}
- einfo->info.display = ecore_x_display_get();
- einfo->info.screen = screen;
+
+ einfo->info.display = ecore_x_display_get();
+ einfo->info.screen = screen;
einfo->info.destination_alpha = argb;
- einfo->info.visual = einfo->func.best_visual_get(einfo);
+ einfo->info.visual = einfo->func.best_visual_get(einfo);
einfo->info.colormap = einfo->func.best_colormap_get(einfo);
- einfo->info.depth = einfo->func.best_depth_get(einfo);
-
+ einfo->info.depth = einfo->func.best_depth_get(einfo);
- if ((!einfo->info.visual) ||
- (!einfo->info.colormap) ||
- (!einfo->info.depth))
+ if ((!einfo->info.visual) ||
+ (!einfo->info.colormap) || (!einfo->info.depth))
{
WRN("OpenGL X11 init engine '%s' failed - no visual, colormap or depth.", ee->driver);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
}
}
- attr.backing_store = NotUseful;
- attr.override_redirect = override;
- attr.colormap = einfo->info.colormap;
- attr.border_pixel = 0;
- attr.background_pixmap = None;
- attr.event_mask =
- KeyPressMask | KeyReleaseMask |
- ExposureMask | ButtonPressMask | ButtonReleaseMask |
- EnterWindowMask | LeaveWindowMask |
- PointerMotionMask | StructureNotifyMask | VisibilityChangeMask |
- FocusChangeMask | PropertyChangeMask | ColormapChangeMask;
- attr.bit_gravity = ForgetGravity;
-
- win =
- XCreateWindow(einfo->info.display, parent, x, y, w, h, 0,
- einfo->info.depth, InputOutput, einfo->info.visual,
- CWBackingStore | CWColormap | CWBackPixmap |
- CWBorderPixel | CWBitGravity | CWEventMask |
- CWOverrideRedirect, &attr);
+ if (argb)
+ {
+ if (override)
+ win = ecore_x_window_override_argb_new(parent, x, y, w, h);
+ else
+ win = ecore_x_window_argb_new(parent, x, y, w, h);
+ }
+ else
+ {
+ if (override)
+ win = ecore_x_window_override_new(parent, x, y, w, h);
+ else
+ win = ecore_x_window_new(parent, x, y, w, h);
+ }
+
+ ecore_x_window_pixel_gravity_set(win, ECORE_X_GRAVITY_FORGET);
+
+ /* attr.backing_store = NotUseful; */
+ /* attr.override_redirect = override; */
+ /* attr.colormap = einfo->info.colormap; */
+ /* attr.border_pixel = 0; */
+ /* attr.background_pixmap = None; */
+ /* attr.event_mask = */
+ /* KeyPressMask | KeyReleaseMask | */
+ /* ExposureMask | ButtonPressMask | ButtonReleaseMask | */
+ /* EnterWindowMask | LeaveWindowMask | */
+ /* PointerMotionMask | StructureNotifyMask | VisibilityChangeMask | */
+ /* FocusChangeMask | PropertyChangeMask | ColormapChangeMask; */
+ /* attr.bit_gravity = ForgetGravity; */
+
+ /* win = */
+ /* XCreateWindow(einfo->info.display, parent, x, y, w, h, 0, */
+ /* einfo->info.depth, InputOutput, einfo->info.visual, */
+ /* CWBackingStore | CWColormap | CWBackPixmap | */
+ /* CWBorderPixel | CWBitGravity | CWEventMask | */
+ /* CWOverrideRedirect, &attr); */
+
einfo->info.drawable = win;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
- XDestroyWindow(einfo->info.display, win);
+ ecore_x_window_free(win);
return 0;
}
- }
- else
- {
- win = 0;
}
+ else
+ win = 0;
+
return win;
}
-#endif /* HAVE_ECORE_X_XCB */
#endif
static int
ECORE_X_EVENT_MASK_WINDOW_COLORMAP
);
if ((ee->shaped) && (updates))
- ecore_x_window_shape_mask_set(ee->prop.window, ee->engine.x.mask);
+ ecore_x_window_shape_mask_set(ee->prop.window,
+ ee->engine.x.mask);
/* and re-enable them again */
ecore_x_event_mask_set(ee->prop.window,
ECORE_X_EVENT_MASK_KEY_DOWN |
ECORE_X_EVENT_MASK_WINDOW_COLORMAP
);
ecore_x_xregion_set(ee->engine.x.damages, ee->engine.x.gc);
+
/* debug rendering */
/*
XSetForeground(ecore_x_display_get(), ee->engine.x.gc, rand());
usleep(20000);
XSync(ecore_x_display_get(), False);
*/
- ecore_x_pixmap_paste(ee->engine.x.pmap, ee->prop.window, ee->engine.x.gc,
- 0, 0, ee->w, ee->h, 0, 0);
+
+ ecore_x_pixmap_paste(ee->engine.x.pmap, ee->prop.window,
+ ee->engine.x.gc, 0, 0, ee->w, ee->h,
+ 0, 0);
ecore_x_xregion_free(ee->engine.x.damages);
ee->engine.x.damages = NULL;
}
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
- unsigned int foreground;
- Ecore_X_GC gc;
+ unsigned int foreground;
+ Ecore_X_GC gc;
if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
einfo = (Evas_Engine_Info_Software_8_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
- unsigned int foreground;
- Ecore_X_GC gc;
+ unsigned int foreground;
+ Ecore_X_GC gc;
if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
{
unsigned int i, num;
Ecore_X_Window_State *state;
- int sticky;
-
-#ifdef HAVE_ECORE_X_XCB
- ecore_x_netwm_window_state_get_prefetch(e->win);
-#endif /* HAVE_ECORE_X_XCB */
- sticky = 0;
+ int sticky = 0;
/* TODO: we need to move those to the end, with if statements */
ee->engine.x.state.modal = 0;
ee->engine.x.state.above = 0;
ee->engine.x.state.below = 0;
-#ifdef HAVE_ECORE_X_XCB
- ecore_x_netwm_window_state_get_fetch();
-#endif /* HAVE_ECORE_X_XCB */
ecore_x_netwm_window_state_get(e->win, &state, &num);
if (state)
{
}
free(state);
}
-#ifdef HAVE_ECORE_X_XCB
- ecore_xcb_reply_free();
-#endif /* HAVE_ECORE_X_XCB */
- if (ee->prop.sticky && !sticky)
+ if ((ee->prop.sticky) && (!sticky))
{
ee->prop.sticky = 0;
ee->engine.x.state.sticky = 0;
if (!ecore_x_screen_is_composited(ee->engine.x.screen_num))
ee->draw_ok = 0;
}
- else ee->draw_ok = 1;
+ else
+ ee->draw_ok = 1;
return ECORE_CALLBACK_PASS_ON;
}
{
ee = ecore_event_window_match(e->data.l[0]);
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (e->data.l[0] != (long)ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
if (!ee->engine.x.sync_began)
{
// qeue a damage + draw. work around an event re-ordering thing.
{
ee = ecore_event_window_match(e->data.l[0]);
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (e->data.l[0] != (long)ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
ee->engine.x.sync_began = 0;
ee->engine.x.sync_cancel = 0;
}
{
ee = ecore_event_window_match(e->data.l[0]);
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
- if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+ if (e->data.l[0] != (long)ee->prop.window)
+ return ECORE_CALLBACK_PASS_ON;
ee->engine.x.sync_began = 0;
ee->engine.x.sync_cancel = 1;
}
if (ee->prop.avoid_damage)
{
Ecore_X_Rectangle rect;
- Ecore_X_XRegion *tmpr;
+ Ecore_X_XRegion *tmpr;
- if (!ee->engine.x.damages) ee->engine.x.damages = ecore_x_xregion_new();
+ if (!ee->engine.x.damages)
+ ee->engine.x.damages = ecore_x_xregion_new();
tmpr = ecore_x_xregion_new();
rect.x = e->x;
rect.y = e->y;
else
{
if (ee->rotation == 0)
- evas_damage_rectangle_add(ee->evas,
- e->x,
- e->y,
- e->w, e->h);
+ evas_damage_rectangle_add(ee->evas, e->x, e->y, e->w, e->h);
else if (ee->rotation == 90)
evas_damage_rectangle_add(ee->evas,
- ee->h - e->y - e->h,
- e->x,
- e->h, e->w);
+ ee->h - e->y - e->h, e->x, e->h, e->w);
else if (ee->rotation == 180)
- evas_damage_rectangle_add(ee->evas,
- ee->w - e->x - e->w,
- ee->h - e->y - e->h,
- e->w, e->h);
+ evas_damage_rectangle_add(ee->evas, ee->w - e->x - e->w,
+ ee->h - e->y - e->h, e->w, e->h);
else if (ee->rotation == 270)
- evas_damage_rectangle_add(ee->evas,
- e->y,
- ee->w - e->x - e->w,
+ evas_damage_rectangle_add(ee->evas, e->y, ee->w - e->x - e->w,
e->h, e->w);
}
return ECORE_CALLBACK_PASS_ON;
}
if ((ee->shaped) || (ee->alpha))
_ecore_evas_x_resize_shape(ee);
- if ((ee->expecting_resize.w > 0) &&
- (ee->expecting_resize.h > 0))
+ if ((ee->expecting_resize.w > 0) && (ee->expecting_resize.h > 0))
{
if ((ee->expecting_resize.w == ee->w) &&
(ee->expecting_resize.h == ee->h))
}
if (first_map_bug < 0)
{
- if (getenv("ECORE_EVAS_GL_FIRST_MAP_BUG"))
- first_map_bug = atoi(getenv("ECORE_EVAS_GL_FIRST_MAP_BUG"));
+ char *bug = NULL;
+
+ if ((bug = getenv("ECORE_EVAS_GL_FIRST_MAP_BUG")))
+ first_map_bug = atoi(bug);
else
- first_map_bug = 0;
+ first_map_bug = 0;
}
- if ((first_map_bug) &&
- (!strcmp(ee->driver, "opengl_x11")))
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
if (ee->visible) return ECORE_CALLBACK_DONE;
// printf("SHOW EVENT %p\n", ee);
ee->visible = 1;
static void
_ecore_evas_x_size_pos_hints_update(Ecore_Evas *ee)
{
-# ifdef HAVE_ECORE_X_XCB
- ecore_x_icccm_size_pos_hints_get_prefetch(ee->prop.window);
- ecore_x_icccm_size_pos_hints_get_fetch();
-# endif /* HAVE_ECORE_X_XCB */
ecore_x_icccm_size_pos_hints_set(ee->prop.window,
ee->prop.request_pos /*request_pos */,
ECORE_X_GRAVITY_NW /* gravity */,
ee->prop.step.h /* step_y */,
0 /* min_aspect */,
0 /* max_aspect */);
-# ifdef HAVE_ECORE_X_XCB
- ecore_xcb_reply_free();
-# endif /* HAVE_ECORE_X_XCB */
}
/* FIXME, should be in idler */
_ecore_evas_x_state_update(Ecore_Evas *ee)
{
Ecore_X_Window_State state[10];
- int num;
-
- num = 0;
+ int num = 0;
/*
if (bd->client.netwm.state.modal)
{
_ecore_evas_init_count++;
if (_ecore_evas_init_count > 1) return _ecore_evas_init_count;
- ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _ecore_evas_x_event_mouse_in, NULL);
- ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _ecore_evas_x_event_mouse_out, NULL);
- ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, _ecore_evas_x_event_window_focus_in, NULL);
- ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, _ecore_evas_x_event_window_focus_out, NULL);
- ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DAMAGE, _ecore_evas_x_event_window_damage, NULL);
- ecore_evas_event_handlers[5] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, _ecore_evas_x_event_window_destroy, NULL);
- ecore_evas_event_handlers[6] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, _ecore_evas_x_event_window_configure, NULL);
- ecore_evas_event_handlers[7] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_x_event_window_delete_request, NULL);
- ecore_evas_event_handlers[8] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, _ecore_evas_x_event_window_show, NULL);
- ecore_evas_event_handlers[9] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, _ecore_evas_x_event_window_hide, NULL);
- ecore_evas_event_handlers[10] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, _ecore_evas_x_event_property_change, NULL);
- ecore_evas_event_handlers[11] = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, _ecore_evas_x_event_visibility_change, NULL);
- ecore_evas_event_handlers[12] = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _ecore_evas_x_event_client_message, NULL);
+ ecore_evas_event_handlers[0] =
+ ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
+ _ecore_evas_x_event_mouse_in, NULL);
+ ecore_evas_event_handlers[1] =
+ ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT,
+ _ecore_evas_x_event_mouse_out, NULL);
+ ecore_evas_event_handlers[2] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN,
+ _ecore_evas_x_event_window_focus_in, NULL);
+ ecore_evas_event_handlers[3] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT,
+ _ecore_evas_x_event_window_focus_out, NULL);
+ ecore_evas_event_handlers[4] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DAMAGE,
+ _ecore_evas_x_event_window_damage, NULL);
+ ecore_evas_event_handlers[5] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY,
+ _ecore_evas_x_event_window_destroy, NULL);
+ ecore_evas_event_handlers[6] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
+ _ecore_evas_x_event_window_configure, NULL);
+ ecore_evas_event_handlers[7] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
+ _ecore_evas_x_event_window_delete_request, NULL);
+ ecore_evas_event_handlers[8] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW,
+ _ecore_evas_x_event_window_show, NULL);
+ ecore_evas_event_handlers[9] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE,
+ _ecore_evas_x_event_window_hide, NULL);
+ ecore_evas_event_handlers[10] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY,
+ _ecore_evas_x_event_property_change, NULL);
+ ecore_evas_event_handlers[11] =
+ ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
+ _ecore_evas_x_event_visibility_change, NULL);
+ ecore_evas_event_handlers[12] =
+ ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
+ _ecore_evas_x_event_client_message, NULL);
ecore_event_evas_init();
return _ecore_evas_init_count;
}
{
_ecore_evas_x_group_leader_unset(ee);
_ecore_evas_x_sync_set(ee);
- if (ee->engine.x.win_shaped_input) ecore_x_window_free(ee->engine.x.win_shaped_input);
+ if (ee->engine.x.win_shaped_input)
+ ecore_x_window_free(ee->engine.x.win_shaped_input);
ecore_x_window_free(ee->prop.window);
if (ee->engine.x.pmap) ecore_x_pixmap_free(ee->engine.x.pmap);
if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
Ecore_X_Window *winp;
winp = ee->engine.x.win_extra->data;
- ee->engine.x.win_extra = eina_list_remove_list(ee->engine.x.win_extra, ee->engine.x.win_extra);
+ ee->engine.x.win_extra =
+ eina_list_remove_list(ee->engine.x.win_extra, ee->engine.x.win_extra);
ecore_event_window_unregister(*winp);
free(winp);
}
einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
- _ecore_evas_x_rotation_set_internal
- (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+ _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
+ (Evas_Engine_Info *)einfo);
# if _USE_WIN_ROT_EFFECT
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
# else
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
# endif
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
- _ecore_evas_x_rotation_set_internal
- (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+ _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
+ (Evas_Engine_Info *)einfo);
# if _USE_WIN_ROT_EFFECT
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
# else
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
# endif
einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
- _ecore_evas_x_rotation_set_internal
- (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+ _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
+ (Evas_Engine_Info *)einfo);
# if _USE_WIN_ROT_EFFECT
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
# else
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
# endif
einfo = (Evas_Engine_Info_Software_8_X11 *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
- _ecore_evas_x_rotation_set_internal
- (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+ _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
+ (Evas_Engine_Info *)einfo);
# if _USE_WIN_ROT_EFFECT
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
# else
- ecore_x_window_prop_property_set (ee->prop.window,
+ ecore_x_window_prop_property_set(ee->prop.window,
ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
# endif
static void
_ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped)
{
- if (((ee->shaped) && (shaped)) || ((!ee->shaped) && (!shaped)))
- return;
+ if ((ee->shaped == shaped)) return;
if (!strcmp(ee->driver, "opengl_x11")) return;
if (!strcmp(ee->driver, "software_x11"))
{
{
if (ee->shaped)
{
- unsigned int foreground;
- Ecore_X_GC gc;
+ unsigned int foreground;
+ Ecore_X_GC gc;
if (!ee->engine.x.mask)
ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
{
if (ee->shaped)
{
- GC gc;
- XGCValues gcv;
-
- ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
+ ee->engine.x.mask =
+ ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
einfo->info.mask = ee->engine.x.mask;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
{
if (ee->shaped)
{
- unsigned int foreground;
- Ecore_X_GC gc;
+ unsigned int foreground;
+ Ecore_X_GC gc;
if (!ee->engine.x.mask)
ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
static void
_ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
{
-# ifdef HAVE_ECORE_X_XCB
- xcb_get_geometry_cookie_t cookie_geom;
- xcb_get_window_attributes_cookie_t cookie_attr;
- xcb_get_geometry_reply_t *reply_geom;
- xcb_get_window_attributes_reply_t *reply_attr;
-#else
- XWindowAttributes att;
-#endif /* ! HAVE_ECORE_X_XCB */
+ Ecore_X_Window_Attributes att;
+ char *id = NULL;
- if (((ee->alpha) && (alpha)) || ((!ee->alpha) && (!alpha)))
- return;
+ if ((ee->alpha == alpha)) return;
if (!strcmp(ee->driver, "software_x11"))
{
einfo->info.destination_alpha = alpha;
-# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
- cookie_geom = xcb_get_geometry_unchecked(ecore_x_connection_get(), ee->prop.window);
- cookie_attr = xcb_get_window_attributes_unchecked(ecore_x_connection_get(), ee->prop.window);
-
- reply_geom = xcb_get_geometry_reply(ecore_x_connection_get(), cookie_geom, NULL);
- reply_attr = xcb_get_window_attributes_reply(ecore_x_connection_get(), cookie_attr, NULL);
- einfo->info.visual = xcb_visualtype_get(ecore_x_default_screen_get(), reply_attr->visual);
- einfo->info.colormap = reply_attr->colormap;
- einfo->info.depth = reply_geom->depth;
- free(reply_geom);
- free(reply_attr);
-# else
- XGetWindowAttributes(ecore_x_display_get(), ee->prop.window, &att);
+ ecore_x_window_attributes_get(ee->prop.window, &att);
einfo->info.visual = att.visual;
einfo->info.colormap = att.colormap;
einfo->info.depth = att.depth;
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
// ee->engine.x.mask = 0;
_ecore_evas_x_protocols_set(ee);
_ecore_evas_x_sync_set(ee);
#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
/* FIXME: round trip in ecore_x_window_argb_get */
if (ecore_x_window_argb_get(ee->engine.x.win_root))
{
- ee->prop.window = _ecore_evas_x_gl_window_new
- (ee, ee->engine.x.win_root,
- ee->req.x, ee->req.y, ee->req.w, ee->req.h,
- ee->prop.override, 1, NULL);
+ ee->prop.window =
+ _ecore_evas_x_gl_window_new(ee, ee->engine.x.win_root,
+ ee->req.x, ee->req.y,
+ ee->req.w, ee->req.h,
+ ee->prop.override, 1, NULL);
+ }
+ else
+ {
+ ee->prop.window =
+ _ecore_evas_x_gl_window_new(ee, ee->engine.x.win_root,
+ ee->req.x, ee->req.y,
+ ee->req.w, ee->req.h,
+ ee->prop.override, ee->alpha,
+ NULL);
}
- else
- ee->prop.window = _ecore_evas_x_gl_window_new
- (ee, ee->engine.x.win_root,
- ee->req.x, ee->req.y, ee->req.w, ee->req.h,
- ee->prop.override, ee->alpha, NULL);
}
- else
- ee->prop.window = _ecore_evas_x_gl_window_new
- (ee, ee->engine.x.win_root,
- ee->req.x, ee->req.y, ee->req.w, ee->req.h,
- ee->prop.override, ee->alpha, NULL);
- if (!ee->prop.window)
+ else
{
- return;
+ ee->prop.window =
+ _ecore_evas_x_gl_window_new(ee, ee->engine.x.win_root,
+ ee->req.x, ee->req.y,
+ ee->req.w, ee->req.h,
+ ee->prop.override, ee->alpha, NULL);
}
+
+ if (!ee->prop.window) return;
/*
if (ee->alpha)
{
}
*/
- XGetWindowAttributes(ecore_x_display_get(), ee->prop.window, &att);
+ ecore_x_window_attributes_get(ee->prop.window, &att);
einfo->info.visual = att.visual;
einfo->info.colormap = att.colormap;
einfo->info.depth = att.depth;
_ecore_evas_x_protocols_set(ee);
_ecore_evas_x_sync_set(ee);
#endif /* BUILD_ECORE_EVAS_OPENGL_X11 */
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
_ecore_evas_x_protocols_set(ee);
_ecore_evas_x_sync_set(ee);
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
einfo->info.destination_alpha = alpha;
- cookie_geom = xcb_get_geometry_unchecked(ecore_x_connection_get(), ee->prop.window);
- cookie_attr = xcb_get_window_attributes_unchecked(ecore_x_connection_get(), ee->prop.window);
-
- reply_geom = xcb_get_geometry_reply(ecore_x_connection_get(), cookie_geom, NULL);
- reply_attr = xcb_get_window_attributes_reply(ecore_x_connection_get(), cookie_attr, NULL);
- einfo->info.visual = xcb_visualtype_get(ecore_x_default_screen_get(), reply_attr->visual);
- einfo->info.colormap = reply_attr->colormap;
- einfo->info.depth = reply_geom->depth;
- free(reply_geom);
- free(reply_attr);
+ ecore_x_window_attributes_get(ee->prop.window, &att);
+ einfo->info.visual = att.visual;
+ einfo->info.colormap = att.colormap;
+ einfo->info.depth = att.depth;
// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
// ee->engine.x.mask = 0;
_ecore_evas_x_protocols_set(ee);
_ecore_evas_x_sync_set(ee);
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
static void
_ecore_evas_x_transparent_set(Ecore_Evas *ee, int transparent)
{
- if (((ee->transparent) && (transparent)) ||
- ((!ee->transparent) && (!transparent)))
- return;
+ if ((ee->transparent == transparent)) return;
if (!strcmp(ee->driver, "software_x11"))
{
static void
_ecore_evas_x_raise(Ecore_Evas *ee)
{
- if (!ee->prop.fullscreen)
- ecore_x_window_raise(ee->prop.window);
- else
- ecore_x_window_raise(ee->prop.window);
+ ecore_x_window_raise(ee->prop.window);
}
static void
_ecore_evas_x_lower(Ecore_Evas *ee)
{
- if (!ee->prop.fullscreen)
- ecore_x_window_lower(ee->prop.window);
- else
- ecore_x_window_lower(ee->prop.window);
+ ecore_x_window_lower(ee->prop.window);
}
static void
Ecore_Evas *ee;
ee = data;
- if (ee)
- ee->prop.cursor.object = NULL;
+ if (ee) ee->prop.cursor.object = NULL;
}
static void
static void
_ecore_evas_x_iconified_set(Ecore_Evas *ee, int on)
{
-// if (((ee->prop.iconified) && (on)) ||
-// ((!ee->prop.iconified) && (!on))) return;
+ if (ee->prop.iconified == on) return;
ee->prop.iconified = on;
if (on)
{
static void
_ecore_evas_x_borderless_set(Ecore_Evas *ee, int on)
{
- if (((ee->prop.borderless) && (on)) ||
- ((!ee->prop.borderless) && (!on))) return;
+ if (ee->prop.borderless == on) return;
ee->prop.borderless = on;
ecore_x_mwm_borderless_set(ee->prop.window, ee->prop.borderless);
}
{
Ecore_X_Window_State_Hint hint;
- if ((ee->prop.withdrawn && withdrawn) ||
- (!ee->prop.withdrawn && !withdrawn)) return;
+ if (ee->prop.withdrawn == withdrawn) return;
ee->prop.withdrawn = withdrawn;
if (withdrawn)
static void
_ecore_evas_x_sticky_set(Ecore_Evas *ee, int sticky)
{
- if ((ee->prop.sticky && sticky) ||
- (!ee->prop.sticky && !sticky)) return;
+ if (ee->prop.sticky == sticky) return;
/* We dont want to set prop.sticky here as it will cause
* the sticky callback not to get called. Its set on the
static void
_ecore_evas_x_ignore_events_set(Ecore_Evas *ee, int ignore)
{
- if ((ee->ignore_events && ignore) ||
- (!ee->ignore_events && !ignore)) return;
+ if (ee->ignore_events == ignore) return;
- if (ignore)
- {
- ee->ignore_events = 1;
- if (ee->prop.window)
- ecore_x_window_ignore_set(ee->prop.window, 1);
- }
- else
- {
- ee->ignore_events = 0;
- if (ee->prop.window)
- ecore_x_window_ignore_set(ee->prop.window, 0);
- }
+ ee->ignore_events = ignore;
+ if (ee->prop.window)
+ ecore_x_window_ignore_set(ee->prop.window, ignore);
}
/*
static void
_ecore_evas_x_override_set(Ecore_Evas *ee, int on)
{
- if (((ee->prop.override) && (on)) ||
- ((!ee->prop.override) && (!on))) return;
+ if (ee->prop.override == on) return;
ecore_x_window_hide(ee->prop.window);
ecore_x_window_override_set(ee->prop.window, on);
if (ee->visible) ecore_x_window_show(ee->prop.window);
static void
_ecore_evas_x_fullscreen_set(Ecore_Evas *ee, int on)
{
- if ((ee->prop.fullscreen && on) ||
- (!ee->prop.fullscreen && !on)) return;
+ if (ee->prop.fullscreen == on) return;
/* FIXME: Detect if WM is EWMH compliant and handle properly if not,
* i.e. reposition, resize, and change borderless hint */
{
#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
Evas_Engine_Info_Software_16_X11 *einfo;
- ee->prop.avoid_damage = on;
+ ee->prop.avoid_damage = on;
einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
{
Ecore_Evas *ee = data;
- if ((!ee->no_comp_sync) &&
- (_ecore_evas_app_comp_sync) &&
+ if ((!ee->no_comp_sync) && (_ecore_evas_app_comp_sync) &&
(!ee->gl_sync_draw_done)) // added by gl77.lee
{
if (ee->engine.x.sync_counter)
{
Evas_Engine_Info_Software_X11 *einfo;
Ecore_Evas *ee;
- int argb = 0;
- int rmethod;
+ int argb = 0, rmethod;
static int redraw_debug = -1;
+ char *id = NULL;
rmethod = evas_render_method_lookup("software_x11");
if (!rmethod) return NULL;
/* init evas here */
ee->evas = evas_new();
- evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, _ecore_evas_x_flush_pre, ee);
- evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_POST, _ecore_evas_x_flush_post, ee);
+ evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
+ _ecore_evas_x_flush_pre, ee);
+ evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_POST,
+ _ecore_evas_x_flush_post, ee);
evas_data_attach_set(ee->evas, ee);
evas_output_method_set(ee->evas, rmethod);
evas_output_size_set(ee->evas, w, h);
}
else
ee->prop.window = ecore_x_window_new(parent, x, y, w, h);
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
-# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
- xcb_screen_iterator_t iter;
- xcb_screen_t *screen;
-# else
- int screen;
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
+ Ecore_X_Screen *screen;
+ Ecore_X_Window_Attributes at;
- /* FIXME: this is inefficient as its a round trip */
-# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
+ /* FIXME: this is inefficient as its 1 or more round trips */
screen = ecore_x_default_screen_get();
- iter = xcb_setup_roots_iterator (xcb_get_setup (ecore_x_connection_get()));
- if (iter.rem > 1)
- {
- xcb_get_geometry_cookie_t cookie;
- xcb_get_geometry_reply_t *reply;
- Ecore_X_Window *roots;
- int num;
- uint8_t i;
-
- num = 0;
- cookie = xcb_get_geometry_unchecked(ecore_x_connection_get(), parent);
- roots = ecore_x_window_root_list(&num);
- if (roots)
- {
- reply = xcb_get_geometry_reply(ecore_x_connection_get(), cookie, NULL);
-
- if (reply)
- {
- for (i = 0; i < num; xcb_screen_next (&iter), i++)
- {
- if (reply->root == roots[i])
- {
- screen = iter.data;
- break;
- }
- }
- free(reply);
- }
- free(roots);
- }
- else
- {
- reply = xcb_get_geometry_reply(ecore_x_connection_get(), cookie, NULL);
- if (reply) free(reply);
- }
- }
-# else
- screen = DefaultScreen(ecore_x_display_get());
- if (ScreenCount(ecore_x_display_get()) > 1)
+ if (ecore_x_screen_count_get() > 1)
{
Ecore_X_Window *roots;
int num, i;
roots = ecore_x_window_root_list(&num);
if (roots)
{
- XWindowAttributes at;
+ Ecore_X_Window root;
- if (XGetWindowAttributes(ecore_x_display_get(),
- parent, &at))
+ root = ecore_x_window_root_get(parent);
+ for (i = 0; i < num; i++)
{
- for (i = 0; i < num; i++)
+ if (root == roots[i])
{
- if (at.root == roots[i])
- {
- screen = i;
- break;
- }
+ screen = ecore_x_screen_get(i);
+ break;
}
}
free(roots);
}
}
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
+
+ einfo->info.destination_alpha = argb;
if (redraw_debug < 0)
{
else
redraw_debug = 0;
}
+
# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB;
einfo->info.connection = ecore_x_connection_get();
einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB;
einfo->info.connection = ecore_x_display_get();
einfo->info.screen = NULL;
-#ifdef EVAS_FRAME_QUEUING
- {
- char *render_mode;
- render_mode = getenv("EVAS_RENDER_MODE");
- if (render_mode && !strcmp(render_mode, "non-blocking"))
- {
- einfo->render_mode = EVAS_RENDER_MODE_NONBLOCKING;
- }
- }
-#endif
-
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
+# endif
einfo->info.drawable = ee->prop.window;
- if (argb)
- {
- /* FIXME: round trip */
-# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
- xcb_get_geometry_cookie_t cookie_geom;
- xcb_get_window_attributes_cookie_t cookie_attr;
- xcb_get_geometry_reply_t *reply_geom;
- xcb_get_window_attributes_reply_t *reply_attr;
- cookie_geom = xcb_get_geometry_unchecked(ecore_x_connection_get(), ee->prop.window);
- cookie_attr = xcb_get_window_attributes_unchecked(ecore_x_connection_get(), ee->prop.window);
+# ifdef EVAS_FRAME_QUEUING
+ {
+ char *render_mode;
- reply_geom = xcb_get_geometry_reply(ecore_x_connection_get(), cookie_geom, NULL);
- reply_attr = xcb_get_window_attributes_reply(ecore_x_connection_get(), cookie_attr, NULL);
- if (reply_attr && reply_geom)
- {
- einfo->info.visual = xcb_visualtype_get(ecore_x_default_screen_get(), reply_attr->visual);
- einfo->info.colormap = reply_attr->colormap;
- einfo->info.depth = reply_geom->depth;
- einfo->info.destination_alpha = 1;
- free(reply_geom);
- free(reply_attr);
- }
-# else
- XWindowAttributes at;
+ render_mode = getenv("EVAS_RENDER_MODE");
+ if ((render_mode) && (!strcmp(render_mode, "non-blocking")))
+ einfo->render_mode = EVAS_RENDER_MODE_NONBLOCKING;
+ }
+# endif
- if (XGetWindowAttributes(ecore_x_display_get(), ee->prop.window,
- &at))
- {
- einfo->info.visual = at.visual;
- einfo->info.colormap = at.colormap;
- einfo->info.depth = at.depth;
- einfo->info.destination_alpha = 1;
- }
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
+ if (argb)
+ {
+ ecore_x_window_attributes_get(ee->prop.window, &at);
+ einfo->info.visual = at.visual;
+ einfo->info.colormap = at.colormap;
+ einfo->info.depth = at.depth;
+ einfo->info.destination_alpha = 1;
}
else
{
-# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB
- xcb_screen_t *screen;
-
- screen = ecore_x_default_screen_get();
- einfo->info.visual = xcb_visualtype_get(screen, screen->root_visual);
- einfo->info.colormap = screen->default_colormap;
- einfo->info.depth = screen->root_depth;
-#else
- einfo->info.visual = DefaultVisual(ecore_x_display_get(), screen);
- einfo->info.colormap = DefaultColormap(ecore_x_display_get(), screen);
- einfo->info.depth = DefaultDepth(ecore_x_display_get(), screen);
-# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
+ einfo->info.visual =
+ ecore_x_default_visual_get(einfo->info.connection, screen);
+ einfo->info.colormap =
+ ecore_x_default_colormap_get(einfo->info.connection, screen);
+ einfo->info.depth =
+ ecore_x_default_depth_get(einfo->info.connection, screen);
einfo->info.destination_alpha = 0;
}
+
einfo->info.rotation = 0;
- einfo->info.debug = redraw_debug;
+ einfo->info.debug = redraw_debug;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
{
return ecore_evas_gl_x11_options_new(disp_name, parent, x, y, w, h, NULL);
}
+
EAPI Ecore_Evas *
ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h, const int *opt)
{
-# ifdef HAVE_ECORE_X_XCB
- Ecore_Evas *ee = NULL;
-# else
Ecore_Evas *ee;
int rmethod;
+ char *id = NULL;
rmethod = evas_render_method_lookup("gl_x11");
if (!rmethod) return NULL;
(ee, ee->engine.x.win_root, x, y, w, h, 0, 0, opt);
if (!ee->prop.window)
{
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
- if (getenv("DESKTOP_STARTUP_ID"))
+ if ((id = getenv("DESKTOP_STARTUP_ID")))
{
- ecore_x_netwm_startup_id_set(ee->prop.window,
- getenv("DESKTOP_STARTUP_ID"));
+ ecore_x_netwm_startup_id_set(ee->prop.window, id);
/* NB: on linux this may simply empty the env as opposed to completely
* unset it to being empty - unsure as solartis libc crashes looking
* for the '=' char */
(Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
(Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
(Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
-# endif /* HAVE_ECORE_X_XCB */
return ee;
}
return NULL;
}
}
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ ecore_evas_free(ee);
+ return NULL;
+ }
ecore_x_icccm_hints_set(ee->prop.window,
1 /* accepts_focus */,
return NULL;
}
}
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ ecore_evas_free(ee);
+ return NULL;
+ }
ecore_x_icccm_hints_set(ee->prop.window,
1 /* accepts_focus */,
static Eina_Bool
_ecore_evas_x11_convert_rectangle_with_angle(Ecore_Evas *ee, Ecore_X_Rectangle *dst_rect, Ecore_X_Rectangle *src_rect)
{
- if (!src_rect || !dst_rect) return 0;
+ if ((!src_rect) || (!dst_rect)) return 0;
if (ee->rotation == 0)
{
src_rect.width = w;
src_rect.height = h;
+ dst_rect.x = 0;
+ dst_rect.y = 0;
+ dst_rect.width = 0;
+ dst_rect.height = 0;
+
ret = _ecore_evas_x11_convert_rectangle_with_angle(ee, &dst_rect, &src_rect);
if (!ee->engine.x.win_shaped_input)
- ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root, 0, 0, 1, 1);
+ ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root,
+ 0, 0, 1, 1);
if (ret)
- ecore_x_window_shape_input_rectangle_set(ee->engine.x.win_shaped_input, dst_rect.x, dst_rect.y, dst_rect.width, dst_rect.height);
+ ecore_x_window_shape_input_rectangle_set(ee->engine.x.win_shaped_input,
+ dst_rect.x, dst_rect.y,
+ dst_rect.width, dst_rect.height);
#else
return;
ee = NULL;
src_rect.width = w;
src_rect.height = h;
+ dst_rect.x = 0;
+ dst_rect.y = 0;
+ dst_rect.width = 0;
+ dst_rect.height = 0;
+
ret = _ecore_evas_x11_convert_rectangle_with_angle(ee, &dst_rect, &src_rect);
if (!ee->engine.x.win_shaped_input)
- ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root, 0, 0, 1, 1);
+ ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root,
+ 0, 0, 1, 1);
if (ret)
- ecore_x_window_shape_input_rectangle_add(ee->engine.x.win_shaped_input, dst_rect.x, dst_rect.y, dst_rect.width, dst_rect.height);
+ ecore_x_window_shape_input_rectangle_add(ee->engine.x.win_shaped_input,
+ dst_rect.x, dst_rect.y,
+ dst_rect.width, dst_rect.height);
#else
return;
ee = NULL;
src_rect.width = w;
src_rect.height = h;
+ dst_rect.x = 0;
+ dst_rect.y = 0;
+ dst_rect.width = 0;
+ dst_rect.height = 0;
+
ret = _ecore_evas_x11_convert_rectangle_with_angle(ee, &dst_rect, &src_rect);
if (!ee->engine.x.win_shaped_input)
- ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root, 0, 0, 1, 1);
+ ee->engine.x.win_shaped_input = ecore_x_window_override_new(ee->engine.x.win_root,
+ 0, 0, 1, 1);
if (ret)
- ecore_x_window_shape_input_rectangle_subtract(ee->engine.x.win_shaped_input, dst_rect.x, dst_rect.y, dst_rect.width, dst_rect.height);
+ ecore_x_window_shape_input_rectangle_subtract(ee->engine.x.win_shaped_input,
+ dst_rect.x, dst_rect.y,
+ dst_rect.width, dst_rect.height);
#else
return;
ee = NULL;
ee = NULL;
#endif
}
-
projects / profile / ivi / ecore.git / blobdiff