unsigned int foreground;
Ecore_X_GC gc;
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ 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);
foreground = 0;
gc = ecore_x_gc_new(ee->engine.x.mask,
&foreground);
ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc,
0, 0, ee->w, ee->h);
- ecore_x_gc_del(gc);
+ ecore_x_gc_free(gc);
einfo->info.mask = ee->engine.x.mask;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
unsigned int foreground;
Ecore_X_GC gc;
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ 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);
foreground = 0;
ecore_x_gc_new(ee->engine.x.mask,
&foreground);
ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc,
0, 0, ee->w, ee->h);
- ecore_x_gc_del(gc);
+ ecore_x_gc_free(gc);
einfo->info.mask = ee->engine.x.mask;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
GC gc;
XGCValues gcv;
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ 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->info.mask = ee->engine.x.mask;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
_ecore_evas_x_free(Ecore_Evas *ee)
{
ecore_x_window_free(ee->prop.window);
- if (ee->engine.x.pmap) ecore_x_pixmap_del(ee->engine.x.pmap);
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
- if (ee->engine.x.gc) ecore_x_gc_del(ee->engine.x.gc);
+ 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);
+ if (ee->engine.x.gc) ecore_x_gc_free(ee->engine.x.gc);
#ifdef HAVE_ECORE_X_XCB
# warning [XCB] No Region code
#else
&foreground);
ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc,
0, 0, ee->w, ee->h);
- ecore_x_gc_del(gc);
+ ecore_x_gc_free(gc);
einfo->info.mask = ee->engine.x.mask;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
else
{
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
einfo->info.mask = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
&foreground);
ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc,
0, 0, ee->w, ee->h);
- ecore_x_gc_del(gc);
+ ecore_x_gc_free(gc);
einfo->info.mask = ee->engine.x.mask;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
else
{
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
einfo->info.mask = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
}
else
{
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
einfo->info.mask = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
ee->prop.window = ecore_x_window_override_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
else
ee->prop.window = ecore_x_window_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
ecore_x_window_shape_input_mask_set(ee->prop.window, 0);
}
einfo->info.depth = att.depth;
# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */
-// if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
// ee->engine.x.mask = 0;
einfo->info.mask = ee->engine.x.mask;
einfo->info.drawable = ee->prop.window;
ee->prop.window = ecore_x_window_override_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
else
ee->prop.window = ecore_x_window_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
ecore_x_window_shape_input_mask_set(ee->prop.window, 0);
}
einfo->info.visual = att.visual;
# endif /* ! BUILD_ECORE_EVAS_XRENDER_XCB */
-// if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
// ee->engine.x.mask = 0;
einfo->info.mask = ee->engine.x.mask;
einfo->info.drawable = ee->prop.window;
ee->prop.window = ecore_x_window_override_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
else
ee->prop.window = ecore_x_window_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
- if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+ if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
ee->engine.x.mask = 0;
ecore_x_window_shape_input_mask_set(ee->prop.window, 0);
}
# endif /* XXX no alpha window support for software_16_x11 */
# if 0 /* XXX no shaped window support for software_16_x11 */
-// if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
+// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
// ee->engine.x.mask = 0;
einfo->info.mask = ee->engine.x.mask;
# endif /* XXX no shaped window support for software_16_x11 */
}
else
{
- if (ee->engine.x.pmap) ecore_x_pixmap_del(ee->engine.x.pmap);
- if (ee->engine.x.gc) ecore_x_gc_del(ee->engine.x.gc);
+ if (ee->engine.x.pmap) ecore_x_pixmap_free(ee->engine.x.pmap);
+ if (ee->engine.x.gc) ecore_x_gc_free(ee->engine.x.gc);
if (ee->engine.x.using_bg_pixmap)
{
ecore_x_window_pixmap_set(ee->prop.window, 0);
}
else
{
- if (ee->engine.x.pmap) ecore_x_pixmap_del(ee->engine.x.pmap);
- if (ee->engine.x.gc) ecore_x_gc_del(ee->engine.x.gc);
+ if (ee->engine.x.pmap) ecore_x_pixmap_free(ee->engine.x.pmap);
+ if (ee->engine.x.gc) ecore_x_gc_free(ee->engine.x.gc);
if (ee->engine.x.using_bg_pixmap)
{
ecore_x_window_pixmap_set(ee->prop.window, 0);
EAPI void ecore_x_window_shape_input_mask_set(Ecore_X_Window win, Ecore_X_Pixmap mask);
EAPI Ecore_X_Pixmap ecore_x_pixmap_new(Ecore_X_Window win, int w, int h, int dep);
-EAPI void ecore_x_pixmap_del(Ecore_X_Pixmap pmap);
+EAPI void ecore_x_pixmap_free(Ecore_X_Pixmap pmap);
EAPI void 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);
EAPI void 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);
EAPI Ecore_X_GC ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, const unsigned int *value_list);
-EAPI void ecore_x_gc_del(Ecore_X_GC gc);
+EAPI void ecore_x_gc_free(Ecore_X_GC gc);
EAPI int 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);
EAPI int ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom type, const void *data, int len);
EAPI Ecore_X_Region ecore_x_region_new_from_window(Ecore_X_Window win, Ecore_X_Region_Type type);
EAPI Ecore_X_Region ecore_x_region_new_from_gc(Ecore_X_GC gc);
EAPI Ecore_X_Region ecore_x_region_new_from_picture(Ecore_X_Picture picture);
-EAPI void ecore_x_region_del(Ecore_X_Region region);
+EAPI void ecore_x_region_free(Ecore_X_Region region);
EAPI void ecore_x_region_set(Ecore_X_Region region, Ecore_X_Rectangle *rects, int num);
EAPI void ecore_x_region_copy(Ecore_X_Region dest, Ecore_X_Region source);
EAPI void ecore_x_region_combine(Ecore_X_Region dest, Ecore_X_Region source1, Ecore_X_Region source2);
EAPI int ecore_x_damage_query(void);
EAPI Ecore_X_Damage ecore_x_damage_new(Ecore_X_Drawable d, Ecore_X_Damage_Report_Level level);
-EAPI void ecore_x_damage_del(Ecore_X_Damage damage);
+EAPI void ecore_x_damage_free(Ecore_X_Damage damage);
EAPI void ecore_x_damage_subtract(Ecore_X_Damage damage, Ecore_X_Region repair, Ecore_X_Region parts);
EAPI int ecore_x_screen_is_composited(int screen);