NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore-x changes for shot module "because devilhorns said so" 

SVN revision: 74185
This commit is contained in:
Mike Blumenkrantz 2012-07-19 13:00:50 +00:00
parent 5467c60cf6
commit c2ac400f8c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/shot/e_mod_main.c
View File

@ -548,7 +548,6 @@ static void
_shot_now(E_Zone *zone, E_Border *bd) _shot_now(E_Zone *zone, E_Border *bd)
{ {
Ecore_X_Image *img; Ecore_X_Image *img;
Ecore_X_Window_Attributes att;
unsigned char *src; unsigned char *src;
unsigned int *dst; unsigned int *dst;
int bpl = 0, rows = 0, bpp = 0, sw, sh; int bpl = 0, rows = 0, bpp = 0, sw, sh;
@ -558,8 +557,10 @@ _shot_now(E_Zone *zone, E_Border *bd)
Evas_Modifier_Mask mask; Evas_Modifier_Mask mask;
Ecore_X_Window xwin, root; Ecore_X_Window xwin, root;
E_Radio_Group *rg; E_Radio_Group *rg;
Ecore_X_Visual visual;
Ecore_X_Display *display;
Ecore_X_Screen *scr;
memset(&att, 0, sizeof(Ecore_X_Window_Attributes));
if (zone) if (zone)
{ {
sman = zone->container->manager; sman = zone->container->manager;
@ -579,14 +580,19 @@ _shot_now(E_Zone *zone, E_Border *bd)
} }
ecore_x_window_geometry_get(xwin, NULL, NULL, &sw, &sh); ecore_x_window_geometry_get(xwin, NULL, NULL, &sw, &sh);
} }
ecore_x_window_attributes_get(xwin, &att); display = ecore_x_display_get();
img = ecore_x_image_new(sw, sh, att.visual, att.depth); scr = ecore_x_default_screen_get();
visual = ecore_x_default_visual_get(display, scr);
img = ecore_x_image_new(sw, sh, visual, ecore_x_window_depth_get(xwin));
ecore_x_image_get(img, xwin, 0, 0, 0, 0, sw, sh); ecore_x_image_get(img, xwin, 0, 0, 0, 0, sw, sh);
src = ecore_x_image_data_get(img, &bpl, &rows, &bpp); src = ecore_x_image_data_get(img, &bpl, &rows, &bpp);
if (!ecore_x_image_is_argb32_get(img)) if (!ecore_x_image_is_argb32_get(img))
{ {
Ecore_X_Colormap colormap;
colormap = ecore_x_default_colormap_get(display, scr);
dst = malloc(sw * sh * sizeof(int)); dst = malloc(sw * sh * sizeof(int));
ecore_x_image_to_argb_convert(src, bpp, bpl, att.colormap, att.visual, ecore_x_image_to_argb_convert(src, bpp, bpl, colormap, visual,
0, 0, sw, sh, 0, 0, sw, sh,
dst, (sw * sizeof(int)), 0, 0); dst, (sw * sizeof(int)), 0, 0);
} }