This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via dc0062f37a818fc708a85e43ed782b1f16b43e51 (commit)
via 5301e61945cc472324df0821b61b4b579d551b82 (commit)
via e90c0d3d754fd1665c213423b61cd0de2b63e923 (commit)
via 4a2c07c36521eed4e1be96abb2fab93dd3d20265 (commit)
via 498909704967f0339042ef50487f3046484e1fa9 (commit)
via 3919363aa32c911079502576f89794d270bbd972 (commit)
via 0e01e6920572b3d3a7a8df2872513144225440a8 (commit)
from d30b942b9eec56b12cef6be01de4ecfc70796e4e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/dc0062f37a818fc708a85e43ed782b1f16b43e51
commit dc0062f37a818fc708a85e43ed782b1f16b43e51
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:03 2014 +0100
Removed unused code in screen.c
This patch removes the unused code in screen.c.
The variable "dock_head", is defined, but not used. When we removes
the variable, then we can see that a lot of code is not used! so we
can remove it :-)
This patch also removes some extra curly brackets and join the variable
definition and the initialization in one line for some variables.
diff --git a/src/screen.c b/src/screen.c
index 3735fc0..1511876 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -673,7 +673,7 @@ WScreen *wScreenInit(int screen_number)
return scr;
}
-void wScreenUpdateUsableArea(WScreen * scr)
+void wScreenUpdateUsableArea(WScreen *scr)
{
/*
* scr->totalUsableArea[] will become the usableArea used for
Windowplacement,
@@ -682,23 +682,10 @@ void wScreenUpdateUsableArea(WScreen * scr)
*/
WArea area;
- int i, dock_head;
- unsigned long best_area, tmp_area;
- unsigned int size, position;
-
- dock_head = scr->xine_info.primary_head;
- best_area = 0;
- size = wPreferences.workspace_border_size;
- position = wPreferences.workspace_border_position;
-
- if (scr->dock) {
- WMRect rect;
- rect.pos.x = scr->dock->x_pos;
- rect.pos.y = scr->dock->y_pos;
- rect.size.width = wPreferences.icon_size;
- rect.size.height = wPreferences.icon_size;
- dock_head = wGetHeadForRect(scr, rect);
- }
+ int i;
+ unsigned long tmp_area, best_area = 0;
+ unsigned int size = wPreferences.workspace_border_size;
+ unsigned int position = wPreferences.workspace_border_position;
for (i = 0; i < wXineramaHeads(scr); ++i) {
WMRect rect = wGetRectForHead(scr, i);
@@ -716,23 +703,17 @@ void wScreenUpdateUsableArea(WScreen * scr)
scr->usableArea[i] = scr->totalUsableArea[i];
-#if 0
- printf("usableArea[%d]: %d %d %d %dn", i,
- scr->usableArea[i].x1, scr->usableArea[i].x2,
scr->usableArea[i].y1, scr->usableArea[i].y2);
-#endif
if (wPreferences.no_window_over_icons) {
if (wPreferences.icon_yard & IY_VERT) {
- if (wPreferences.icon_yard & IY_RIGHT) {
+ if (wPreferences.icon_yard & IY_RIGHT)
scr->totalUsableArea[i].x2 -=
wPreferences.icon_size;
- } else {
+ else
scr->totalUsableArea[i].x1 +=
wPreferences.icon_size;
- }
} else {
- if (wPreferences.icon_yard & IY_TOP) {
+ if (wPreferences.icon_yard & IY_TOP)
scr->totalUsableArea[i].y1 +=
wPreferences.icon_size;
- } else {
+ else
scr->totalUsableArea[i].y2 -=
wPreferences.icon_size;
- }
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/5301e61945cc472324df0821b61b4b579d551b82
commit 5301e61945cc472324df0821b61b4b579d551b82
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:02 2014 +0100
Removed compiler warnings in dock.c
This patch removes the compiler warnings for unused variables in the
file dock.c
diff --git a/src/dock.c b/src/dock.c
index 222627f..ef3611f 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -121,7 +121,7 @@ static void removeDrawerCallback(WMenu *menu, WMenuEntry
*entry);
static void drawerAppendToChain(WScreen *scr, WDock *drawer);
static char *findUniqueName(WScreen *scr, const char *instance_basename);
static void addADrawerCallback(WMenu *menu, WMenuEntry *entry);
-static void swapDrawers(WScreen *scr, int on_right_side, int new_x);
+static void swapDrawers(WScreen *scr, int new_x);
static WDock* getDrawer(WScreen *scr, int y_index);
static int indexOfHole(WDock *drawer, WAppIcon *moving_aicon, int redocking);
static void drawerConsolidateIcons(WDock *drawer);
@@ -3015,7 +3015,7 @@ static void swapDock(WDock *dock)
else
x = dock->x_pos = DOCK_EXTRA_SPACE;
- swapDrawers(scr, dock->on_right_side, x);
+ swapDrawers(scr, x);
for (i = 0; i < dock->max_icons; i++) {
btn = dock->icon_array[i];
@@ -4031,6 +4031,9 @@ static void clipEnterNotify(WObjDescriptor *desc, XEvent
*event)
WDock *dock, *tmp;
WScreen *scr;
+ /* Parameter not used, but tell the compiler that it is ok */
+ (void) event;
+
assert(event->type == EnterNotify);
if (desc->parent_type != WCLASS_DOCK_ICON)
@@ -4111,6 +4114,9 @@ static void clipLeaveNotify(WObjDescriptor *desc, XEvent
*event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
+ /* Parameter not used, but tell the compiler that it is ok */
+ (void) event;
+
assert(event->type == LeaveNotify);
if (desc->parent_type != WCLASS_DOCK_ICON)
@@ -4567,13 +4573,13 @@ static void swapDrawer(WDock *drawer, int new_x)
}
-static void swapDrawers(WScreen *scr, int on_right_side, int new_x)
+static void swapDrawers(WScreen *scr, int new_x)
{
WDrawerChain *dc;
- if (scr->drawer_tile) {
+ if (scr->drawer_tile)
RReleaseImage(scr->drawer_tile);
- }
+
scr->drawer_tile = wDrawerMakeTile(scr, scr->icon_tile);
for (dc = scr->drawers; dc != NULL; dc = dc->next) {
http://repo.or.cz/w/wmaker-crm.git/commit/e90c0d3d754fd1665c213423b61cd0de2b63e923
commit e90c0d3d754fd1665c213423b61cd0de2b63e923
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:01 2014 +0100
Remove compiler warnings in defaults.c
This patch removes these warnings:
defaults.c: In function ‘getFont’:
defaults.c:2011:84: warning: unused parameter ‘addr’ [-Wunused-parameter]
static int getFont(WScreen * scr, WDefaultEntry * entry, WMPropList *
value, void *addr, void **ret)
^
defaults.c: In function ‘getColor’:
defaults.c:2036:85: warning: unused parameter ‘addr’ [-Wunused-parameter]
static int getColor(WScreen * scr, WDefaultEntry * entry, WMPropList *
value, void *addr, void **ret)
diff --git a/src/defaults.c b/src/defaults.c
index 5bf8267..c5fd853 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2032,6 +2032,8 @@ static int getFont(WScreen * scr, WDefaultEntry * entry,
WMPropList * value, voi
static WMFont *font;
const char *val;
+ (void) addr;
+
GET_STRING_OR_DEFAULT("Font", val);
font = WMCreateFont(scr->wmscreen, val);
@@ -2058,6 +2060,8 @@ static int getColor(WScreen * scr, WDefaultEntry * entry,
WMPropList * value, vo
const char *val;
int second_pass = 0;
+ (void) addr;
+
GET_STRING_OR_DEFAULT("Color", val);
again:
http://repo.or.cz/w/wmaker-crm.git/commit/4a2c07c36521eed4e1be96abb2fab93dd3d20265
commit 4a2c07c36521eed4e1be96abb2fab93dd3d20265
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:07:58 2014 +0100
createPanel variable initialization
This patch initialize the variable "state" to avoid compiler warnings.
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index e939df0..c441612 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -102,7 +102,7 @@ static void createPanel(Panel * p)
WMScrollView *sv;
WMFrame *f;
WMUserDefaults *udb;
- int i, state;
+ int i, state = 0;
panel->box = WMCreateBox(panel->parent);
WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
http://repo.or.cz/w/wmaker-crm.git/commit/498909704967f0339042ef50487f3046484e1fa9
commit 498909704967f0339042ef50487f3046484e1fa9
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:07:57 2014 +0100
GetWindow function, argument not used
The argument "panel" in the function GetWindow() is not used.
This patch removes this argument to avoid compiler warnings.
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 32886db..d345f74 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -117,7 +117,7 @@ static void speedChange(WMWidget * w, void *data)
tmp = WMGetTextFieldText(panel->acceT);
if (sscanf(tmp, "%f", &accel) != 1 || accel < 0) {
- WMRunAlertPanel(WMWidgetScreen(panel->acceT),
GetWindow(panel),
+ WMRunAlertPanel(WMWidgetScreen(panel->acceT),
GetWindow(),
_("Error"),
_("Invalid mouse acceleration value.
Must be a positive real value."),
_("OK"), NULL, NULL);
@@ -137,7 +137,7 @@ static void speedChange(WMWidget * w, void *data)
tmp = WMGetTextFieldText(panel->threT);
if (sscanf(tmp, "%i", &threshold) != 1 || threshold < 0 || threshold >
panel->maxThreshold) {
- WMRunAlertPanel(WMWidgetScreen(panel->parent),
GetWindow(panel), _("Error"),
+ WMRunAlertPanel(WMWidgetScreen(panel->parent), GetWindow(),
_("Error"),
_
("Invalid mouse acceleration threshold value.
Must be the number of pixels to travel before accelerating."),
_("OK"), NULL, NULL);
diff --git a/WPrefs.app/Themes.c b/WPrefs.app/Themes.c
index a8ce4d1..66ba311 100644
--- a/WPrefs.app/Themes.c
+++ b/WPrefs.app/Themes.c
@@ -80,7 +80,7 @@ static pid_t downloadFile(WMScreen * scr, _Panel * panel,
const char *file)
if (pid < 0) {
werror("could not fork() process");
- WMRunAlertPanel(scr, GetWindow(panel), _("Error"),
+ WMRunAlertPanel(scr, GetWindow(), _("Error"),
"Could not start download. fork() failed",
_("OK"), NULL, NULL);
return -1;
}
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index d788e06..de59cdf 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -610,7 +610,7 @@ void Initialize(WMScreen * scr)
WMSetLabelText(WPrefs.statusL, "");
}
-WMWindow *GetWindow(Panel * panel)
+WMWindow *GetWindow(void)
{
return WPrefs.win;
}
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index b72d1a7..4fbd8ee 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -84,7 +84,7 @@ void SetButtonAlphaImage(WMScreen *scr, WMButton *bPtr, const
char *file);
void CreateImages(WMScreen *scr, RContext *rc, RImage *xis, const char *file,
WMPixmap **icon_normal, WMPixmap **icon_greyed);
-WMWindow *GetWindow(Panel *panel);
+WMWindow *GetWindow(void);
/* manipulate the dictionary for the WindowMaker domain */
http://repo.or.cz/w/wmaker-crm.git/commit/3919363aa32c911079502576f89794d270bbd972
commit 3919363aa32c911079502576f89794d270bbd972
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:07:56 2014 +0100
Arguments not used in SetButtonAlphaImage
The arguments for SetButtonAlphaImage() are not used, so can be removed to
avoid compiler warnings.
This patch removes these arguments, so the code in SetButtonAlphaImage(),
not
used, can be removed too.
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index c9ff182..3bd571a 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1688,7 +1688,7 @@ static void createPanel(Panel * p)
WMSetButtonImagePosition(panel->newB, WIPAbove);
WMSetButtonText(panel->newB, _("New"));
WMSetButtonAction(panel->newB, newTexture, panel);
- SetButtonAlphaImage(scr, panel->newB, TNEW_FILE, NULL, NULL);
+ SetButtonAlphaImage(scr, panel->newB, TNEW_FILE);
WMSetBalloonTextForView(_("Create a new texture."),
WMWidgetView(panel->newB));
@@ -1699,7 +1699,7 @@ static void createPanel(Panel * p)
WMSetButtonImagePosition(panel->ripB, WIPAbove);
WMSetButtonText(panel->ripB, _("Extract..."));
WMSetButtonAction(panel->ripB, extractTexture, panel);
- SetButtonAlphaImage(scr, panel->ripB, TEXTR_FILE, NULL, NULL);
+ SetButtonAlphaImage(scr, panel->ripB, TEXTR_FILE);
WMSetBalloonTextForView(_("Extract texture(s) from a theme or a style
file."), WMWidgetView(panel->ripB));
@@ -1711,7 +1711,7 @@ static void createPanel(Panel * p)
WMSetButtonFont(panel->editB, font);
WMSetButtonImagePosition(panel->editB, WIPAbove);
WMSetButtonText(panel->editB, _("Edit"));
- SetButtonAlphaImage(scr, panel->editB, TEDIT_FILE, NULL, NULL);
+ SetButtonAlphaImage(scr, panel->editB, TEDIT_FILE);
WMSetButtonAction(panel->editB, editTexture, panel);
WMSetBalloonTextForView(_("Edit the highlighted texture."),
WMWidgetView(panel->editB));
@@ -1721,7 +1721,7 @@ static void createPanel(Panel * p)
WMSetButtonFont(panel->delB, font);
WMSetButtonImagePosition(panel->delB, WIPAbove);
WMSetButtonText(panel->delB, _("Delete"));
- SetButtonAlphaImage(scr, panel->delB, TDEL_FILE, NULL, NULL);
+ SetButtonAlphaImage(scr, panel->delB, TDEL_FILE);
WMSetButtonEnabled(panel->delB, False);
WMSetButtonAction(panel->delB, deleteTexture, panel);
WMSetBalloonTextForView(_("Delete the highlighted texture."),
WMWidgetView(panel->delB));
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index 138030f..d788e06 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -448,7 +448,7 @@ static WMPixmap *makeTitledIcon(WMPixmap *icon)
return WMRetainPixmap(icon);
}
-void SetButtonAlphaImage(WMScreen * scr, WMButton * bPtr, const char *file,
const char *title1, const char *title2)
+void SetButtonAlphaImage(WMScreen *scr, WMButton *bPtr, const char *file)
{
WMPixmap *icon;
WMPixmap *icon2;
@@ -517,26 +517,13 @@ void AddSection(Panel * panel, const char *iconFile)
WMHangData(bPtr, panel);
WMSetBalloonTextForView(((PanelRec *) panel)->description,
WMWidgetView(bPtr));
-
- {
- char *t1, *t2;
-
- t1 = wstrdup(((PanelRec *) panel)->sectionName);
- t2 = strchr(t1, ' ');
- if (t2) {
- *t2 = 0;
- t2++;
- }
- SetButtonAlphaImage(WMWidgetScreen(bPtr), bPtr, iconFile, t1,
t2);
- wfree(t1);
- }
+ SetButtonAlphaImage(WMWidgetScreen(bPtr), bPtr, iconFile);
WMMapWidget(bPtr);
WPrefs.sectionB[WPrefs.sectionCount] = bPtr;
- if (WPrefs.sectionCount > 0) {
+ if (WPrefs.sectionCount > 0)
WMGroupButtons(WPrefs.sectionB[0], bPtr);
- }
WPrefs.sectionCount++;
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 1db3a9b..b72d1a7 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -75,8 +75,7 @@ void AddSection(Panel *panel, const char *iconFile);
char *LocateImage(const char *name);
-void SetButtonAlphaImage(WMScreen *scr, WMButton *bPtr, const char *file,
- const char *title1, const char *title2);
+void SetButtonAlphaImage(WMScreen *scr, WMButton *bPtr, const char *file);
/* Loads `file' into `icon_normal'. If `icon_greyed' is not NULL,
* combine `icon_normal' with some grey and then optionally with image
http://repo.or.cz/w/wmaker-crm.git/commit/0e01e6920572b3d3a7a8df2872513144225440a8
commit 0e01e6920572b3d3a7a8df2872513144225440a8
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:07:55 2014 +0100
Removed unused code in makeTitledIcon
This patch removes the unused code in the function makeTitledIcon().
The arguments are not used, so are removed to avoid compiler warnings.
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index 7afa42e..138030f 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -443,71 +443,9 @@ void CreateImages(WMScreen *scr, RContext *rc, RImage
*xis, const char *file,
}
-static WMPixmap *makeTitledIcon(WMScreen * scr, WMPixmap * icon, const char
*title1, const char *title2)
+static WMPixmap *makeTitledIcon(WMPixmap *icon)
{
return WMRetainPixmap(icon);
-
-#if 0
- static GC gc = NULL;
- static XFontStruct *hfont = NULL;
- static XFontStruct *vfont = NULL;
- WMPixmap *tmp;
- Pixmap pix, mask;
- Display *dpy = WMScreenDisplay(scr);
- WMColor *black = WMBlackColor(scr);
- GC fgc;
- WMSize size = WMGetPixmapSize(icon);
-
- tmp = WMCreatePixmap(scr, 60, 60, WMScreenDepth(scr), True);
-
- pix = WMGetPixmapXID(tmp);
- mask = WMGetPixmapMaskXID(tmp);
-
- if (gc == NULL) {
- gc = XCreateGC(dpy, mask, 0, NULL);
-
- hfont = XLoadQueryFont(dpy, ICON_TITLE_FONT);
- vfont = XLoadQueryFont(dpy, ICON_TITLE_VFONT);
- }
-
- if (hfont == NULL) {
- return WMRetainPixmap(icon);
- }
-
- XSetForeground(dpy, gc, 0);
- XFillRectangle(dpy, mask, gc, 0, 0, 60, 60);
-
- fgc = WMColorGC(black);
-
- XSetForeground(dpy, gc, 1);
-
- XCopyArea(dpy, WMGetPixmapXID(icon), pix, fgc, 0, 0, size.width,
size.height, 12, 12);
-
- if (WMGetPixmapMaskXID(icon) != None)
- XCopyPlane(dpy, WMGetPixmapMaskXID(icon), mask, gc, 0, 0,
size.width, size.height, 12, 12, 1);
- else
- XFillRectangle(dpy, mask, gc, 12, 12, 48, 48);
-
- if (title1) {
- XSetFont(dpy, fgc, vfont->fid);
- XSetFont(dpy, gc, vfont->fid);
-
- XDrawString(dpy, pix, fgc, 0, vfont->ascent, title1,
strlen(title1));
-
- XDrawString(dpy, mask, gc, 0, vfont->ascent, title1,
strlen(title1));
- }
-
- if (title2) {
- XSetFont(dpy, fgc, hfont->fid);
- XSetFont(dpy, gc, hfont->fid);
-
- XDrawString(dpy, pix, fgc, (title1 ? 12 : 0), hfont->ascent,
title2, strlen(title2));
-
- XDrawString(dpy, mask, gc, (title1 ? 12 : 0), hfont->ascent,
title2, strlen(title2));
- }
-
- return tmp;
-#endif
}
void SetButtonAlphaImage(WMScreen * scr, WMButton * bPtr, const char *file,
const char *title1, const char *title2)
@@ -532,7 +470,7 @@ void SetButtonAlphaImage(WMScreen * scr, WMButton * bPtr,
const char *file, cons
}
if (icon) {
- icon2 = makeTitledIcon(scr, icon, title1, title2);
+ icon2 = makeTitledIcon(icon);
if (icon)
WMReleasePixmap(icon);
} else {
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Appearance.c | 8 ++--
WPrefs.app/Expert.c | 2 +-
WPrefs.app/MouseSettings.c | 4 +-
WPrefs.app/Themes.c | 2 +-
WPrefs.app/WPrefs.c | 87 +++-----------------------------------------
WPrefs.app/WPrefs.h | 5 +--
src/defaults.c | 4 ++
src/dock.c | 16 ++++++---
src/screen.c | 37 +++++--------------
9 files changed, 40 insertions(+), 125 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
