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

wIcon* functions renamed

Browse Source 
These functiosn were renamed:

wIconCreateCore to icon_create_core
wIconCreateWithIconFile to icon_create_for_dock
wIconCreate to icon_create_for_wwindow
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-01 23:53:06 +02:00
committed by Carlos R. Mafra
parent adfb761021
commit 97f74548ef
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.c
View File

@@ -1112,7 +1112,7 @@ void wIconifyWindow(WWindow * wwin)
if (!wwin->flags.icon_moved) if (!wwin->flags.icon_moved)
PlaceIcon(wwin->screen_ptr, &wwin->icon_x, &wwin->icon_y, wGetHeadForWindow(wwin)); PlaceIcon(wwin->screen_ptr, &wwin->icon_x, &wwin->icon_y, wGetHeadForWindow(wwin));
wwin->icon = wIconCreate(wwin); wwin->icon = icon_create_for_wwindow(wwin);
wwin->icon->mapped = 1; wwin->icon->mapped = 1;
} }

5
src/appicon.c
View File

@@ -130,7 +130,7 @@ WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
/* Search the icon using instance and class, without default icon */ /* Search the icon using instance and class, without default icon */
path = get_default_icon_filename(scr, wm_instance, wm_class, command, False); path = get_default_icon_filename(scr, wm_instance, wm_class, command, False);
aicon->icon = wIconCreateWithIconFile(scr, path, tile); aicon->icon = icon_create_for_dock(scr, path, tile);
if (path) if (path)
wfree(path); wfree(path);
#ifdef XDND #ifdef XDND
@@ -235,7 +235,6 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
aicon = wmalloc(sizeof(WAppIcon)); aicon = wmalloc(sizeof(WAppIcon));
wretain(aicon); wretain(aicon);
aicon->yindex = -1; aicon->yindex = -1;
aicon->xindex = -1; aicon->xindex = -1;
@@ -251,7 +250,7 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
if (leader_win->wm_instance) if (leader_win->wm_instance)
aicon->wm_instance = wstrdup(leader_win->wm_instance); aicon->wm_instance = wstrdup(leader_win->wm_instance);
aicon->icon = wIconCreate(leader_win); aicon->icon = icon_create_for_wwindow(leader_win);
#ifdef XDND #ifdef XDND
wXDNDMakeAwareness(aicon->icon->core->window); wXDNDMakeAwareness(aicon->icon->core->window);
#endif #endif

12
src/icon.c
View File

@@ -58,7 +58,7 @@ static void miniwindowExpose(WObjDescriptor * desc, XEvent * event);
static void miniwindowMouseDown(WObjDescriptor * desc, XEvent * event); static void miniwindowMouseDown(WObjDescriptor * desc, XEvent * event);
static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event); static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event);
static WIcon *wIconCreateCore(WScreen *scr, int coord_x, int coord_y); static WIcon *icon_create_core(WScreen *scr, int coord_x, int coord_y);
void get_pixmap_icon_from_icon_win(WIcon *icon); void get_pixmap_icon_from_icon_win(WIcon *icon);
int get_pixmap_icon_from_wm_hints(WScreen *scr, WWindow *wwin, WIcon *icon); int get_pixmap_icon_from_wm_hints(WScreen *scr, WWindow *wwin, WIcon *icon);
@@ -101,13 +101,13 @@ INLINE static void getSize(Drawable d, unsigned int *w, unsigned int *h, unsigne
XGetGeometry(dpy, d, &rjunk, &xjunk, &yjunk, w, h, &bjunk, dep); XGetGeometry(dpy, d, &rjunk, &xjunk, &yjunk, w, h, &bjunk, dep);
} }
WIcon *wIconCreate(WWindow *wwin) WIcon *icon_create_for_wwindow(WWindow *wwin)
{ {
WScreen *scr = wwin->screen_ptr; WScreen *scr = wwin->screen_ptr;
WIcon *icon; WIcon *icon;
char *file; char *file;
icon = wIconCreateCore(scr, wwin->icon_x, wwin->icon_y); icon = icon_create_core(scr, wwin->icon_x, wwin->icon_y);
icon->owner = wwin; icon->owner = wwin;
if (wwin->wm_hints && (wwin->wm_hints->flags & IconWindowHint)) { if (wwin->wm_hints && (wwin->wm_hints->flags & IconWindowHint)) {
@@ -151,11 +151,11 @@ WIcon *wIconCreate(WWindow *wwin)
return icon; return icon;
} }
WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile) WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile)
{ {
WIcon *icon; WIcon *icon;
icon = wIconCreateCore(scr, 0, 0); icon = icon_create_core(scr, 0, 0);
icon->file_image = get_default_icon_rimage(scr, iconfile, wPreferences.icon_size); icon->file_image = get_default_icon_rimage(scr, iconfile, wPreferences.icon_size);
icon->file = wstrdup(iconfile); icon->file = wstrdup(iconfile);
@@ -170,7 +170,7 @@ WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
return icon; return icon;
} }
static WIcon *wIconCreateCore(WScreen *scr, int coord_x, int coord_y) static WIcon *icon_create_core(WScreen *scr, int coord_x, int coord_y)
{ {
WIcon *icon; WIcon *icon;
unsigned long vmask = 0; unsigned long vmask = 0;

4
src/icon.h
View File

@@ -54,8 +54,8 @@ typedef struct WIcon {
* color */ * color */
} WIcon; } WIcon;
WIcon * wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile); WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile);
WIcon * wIconCreate(WWindow *wwin); WIcon *icon_create_for_wwindow(WWindow *wwin);
void wIconDestroy(WIcon *icon); void wIconDestroy(WIcon *icon);
void wIconPaint(WIcon *icon); void wIconPaint(WIcon *icon);