>From 87f1045ca76397d8a1d14eccb60a2b602f224b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 1 Oct 2012 23:53:06 +0200
Subject: [PATCH 8/9] wIcon* functions renamed
These functiosn were renamed:
wIconCreateCore to icon_create_core
wIconCreateWithIconFile to icon_create_for_dock
wIconCreate to icon_create_for_wwindow
---
src/actions.c | 2 +-
src/appicon.c | 5 ++---
src/icon.c | 12 ++++++------
src/icon.h | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index 0d4cff1..13ed426 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1112,7 +1112,7 @@ void wIconifyWindow(WWindow * wwin)
if (!wwin->flags.icon_moved)
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;
}
diff --git a/src/appicon.c b/src/appicon.c
index b1948bb..45911b8 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -130,7 +130,7 @@ WAppIcon *wAppIconCreateForDock(WScreen *scr, char
*command, char *wm_instance,
/* Search the icon using instance and class, without default icon */
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)
wfree(path);
#ifdef XDND
@@ -235,7 +235,6 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
aicon = wmalloc(sizeof(WAppIcon));
wretain(aicon);
-
aicon->yindex = -1;
aicon->xindex = -1;
@@ -251,7 +250,7 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
if (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
wXDNDMakeAwareness(aicon->icon->core->window);
#endif
diff --git a/src/icon.c b/src/icon.c
index efcc2b5..73592bc 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -58,7 +58,7 @@ static void miniwindowExpose(WObjDescriptor * desc, XEvent *
event);
static void miniwindowMouseDown(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);
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);
}
-WIcon *wIconCreate(WWindow *wwin)
+WIcon *icon_create_for_wwindow(WWindow *wwin)
{
WScreen *scr = wwin->screen_ptr;
WIcon *icon;
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;
if (wwin->wm_hints && (wwin->wm_hints->flags & IconWindowHint)) {
@@ -151,11 +151,11 @@ WIcon *wIconCreate(WWindow *wwin)
return icon;
}
-WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
+WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile)
{
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 = wstrdup(iconfile);
@@ -170,7 +170,7 @@ WIcon *wIconCreateWithIconFile(WScreen *scr, char
*iconfile, int tile)
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;
unsigned long vmask = 0;
diff --git a/src/icon.h b/src/icon.h
index 96bb7d0..7de9e50 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -54,8 +54,8 @@ typedef struct WIcon {
* color */
} WIcon;
-WIcon * wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile);
-WIcon * wIconCreate(WWindow *wwin);
+WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile);
+WIcon *icon_create_for_wwindow(WWindow *wwin);
void wIconDestroy(WIcon *icon);
void wIconPaint(WIcon *icon);
--
1.7.10.4
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 87f1045ca76397d8a1d14eccb60a2b602f224b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 1 Oct 2012 23:53:06 +0200
Subject: [PATCH 8/9] wIcon* functions renamed
These functiosn were renamed:
wIconCreateCore to icon_create_core
wIconCreateWithIconFile to icon_create_for_dock
wIconCreate to icon_create_for_wwindow
---
src/actions.c | 2 +-
src/appicon.c | 5 ++---
src/icon.c | 12 ++++++------
src/icon.h | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index 0d4cff1..13ed426 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1112,7 +1112,7 @@ void wIconifyWindow(WWindow * wwin)
if (!wwin->flags.icon_moved)
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;
}
diff --git a/src/appicon.c b/src/appicon.c
index b1948bb..45911b8 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -130,7 +130,7 @@ WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
/* Search the icon using instance and class, without default icon */
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)
wfree(path);
#ifdef XDND
@@ -235,7 +235,6 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
aicon = wmalloc(sizeof(WAppIcon));
wretain(aicon);
-
aicon->yindex = -1;
aicon->xindex = -1;
@@ -251,7 +250,7 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
if (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
wXDNDMakeAwareness(aicon->icon->core->window);
#endif
diff --git a/src/icon.c b/src/icon.c
index efcc2b5..73592bc 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -58,7 +58,7 @@ static void miniwindowExpose(WObjDescriptor * desc, XEvent * event);
static void miniwindowMouseDown(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);
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);
}
-WIcon *wIconCreate(WWindow *wwin)
+WIcon *icon_create_for_wwindow(WWindow *wwin)
{
WScreen *scr = wwin->screen_ptr;
WIcon *icon;
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;
if (wwin->wm_hints && (wwin->wm_hints->flags & IconWindowHint)) {
@@ -151,11 +151,11 @@ WIcon *wIconCreate(WWindow *wwin)
return icon;
}
-WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
+WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile)
{
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 = wstrdup(iconfile);
@@ -170,7 +170,7 @@ WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
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;
unsigned long vmask = 0;
diff --git a/src/icon.h b/src/icon.h
index 96bb7d0..7de9e50 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -54,8 +54,8 @@ typedef struct WIcon {
* color */
} WIcon;
-WIcon * wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile);
-WIcon * wIconCreate(WWindow *wwin);
+WIcon *icon_create_for_dock(WScreen *scr, char *iconfile, int tile);
+WIcon *icon_create_for_wwindow(WWindow *wwin);
void wIconDestroy(WIcon *icon);
void wIconPaint(WIcon *icon);
--
1.7.10.4
