gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Coding style cleanup in wmspec.c

Browse Source 
This commit cleans the source a bit and adds some comments.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-03-04 12:26:33 +01:00
committed by Carlos R. Mafra
parent fe3cbb0dc4
commit f550333474
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/wmspec.c
View File

@@ -404,18 +404,10 @@ static RImage *makeRImageFromARGBData(unsigned long *data)
for (imgdata = image->data, i = 2; i < size + 2; i++, imgdata += 4) { for (imgdata = image->data, i = 2; i < size + 2; i++, imgdata += 4) {
pixel = data[i]; pixel = data[i];
#if 0//BYTE_ORDER == BIG_ENDIAN
imgdata[2] = (pixel >> 24) & 0xff; /* A */
imgdata[1] = (pixel >> 16) & 0xff; /* R */
imgdata[0] = (pixel >> 8) & 0xff; /* G */
imgdata[3] = (pixel >> 0) & 0xff; /* B */
#else /* Little endian */
imgdata[3] = (pixel >> 24) & 0xff; /* A */ imgdata[3] = (pixel >> 24) & 0xff; /* A */
imgdata[0] = (pixel >> 16) & 0xff; /* R */ imgdata[0] = (pixel >> 16) & 0xff; /* R */
imgdata[1] = (pixel >> 8) & 0xff; /* G */ imgdata[1] = (pixel >> 8) & 0xff; /* G */
imgdata[2] = (pixel >> 0) & 0xff; /* B */ imgdata[2] = (pixel >> 0) & 0xff; /* B */
#endif /* endianness */
} }
return image; return image;
@@ -428,34 +420,41 @@ static void updateIconImage(WWindow * wwin)
Atom type; Atom type;
int format; int format;
/* Refresh icon image from X11 */
if (wwin->net_icon_image) if (wwin->net_icon_image)
RReleaseImage(wwin->net_icon_image); RReleaseImage(wwin->net_icon_image);
wwin->net_icon_image = NULL; wwin->net_icon_image = NULL;
if (XGetWindowProperty(dpy, wwin->client_win, net_wm_icon, 0L, LONG_MAX, if (XGetWindowProperty(dpy, wwin->client_win, net_wm_icon, 0L, LONG_MAX,
False, XA_CARDINAL, &type, &format, &items, &rest, False, XA_CARDINAL, &type, &format, &items, &rest,
(unsigned char **)&property) != Success || !property) { (unsigned char **)&property) != Success || !property)
return; return;
}
if (type != XA_CARDINAL || format != 32 || items < 2) { if (type != XA_CARDINAL || format != 32 || items < 2) {
XFree(property); XFree(property);
return; return;
} }
/* Find the best icon */
data = findBestIcon(property, items); data = findBestIcon(property, items);
if (!data) { if (!data) {
XFree(property); XFree(property);
return; return;
} }
/* Save the best icon in the X11 icon */
wwin->net_icon_image = makeRImageFromARGBData(data); wwin->net_icon_image = makeRImageFromARGBData(data);
XFree(property); XFree(property);
if (wwin->icon) wIconUpdate(wwin->icon); /* Refresh the Window Icon */
if (wwin->icon)
wIconUpdate(wwin->icon);
/* Refresh the application icon */
WApplication *app = wApplicationOf(wwin->main_window); WApplication *app = wApplicationOf(wwin->main_window);
if (app && app->app_icon){ if (app && app->app_icon) {
wIconUpdate(app->app_icon->icon); wIconUpdate(app->app_icon->icon);
wAppIconPaint(app->app_icon); wAppIconPaint(app->app_icon);
} }