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
discards ff3c50351f2c3ce58becbbce30db3ba51f760eb7 (commit)
discards 4a1bc8da45a5080c42d2240d1d85da8ea6a3b08e (commit)
discards c32c2427c155b2b97a55e31953ddb2ef5f4d855c (commit)
discards 253483a8447ebf4955dee890013c207ca9bfa4b2 (commit)
discards a7e5de4407e91a25c911427fe4ad0897c7bc9e65 (commit)
discards d9e3409c050657d3d57ce63e7bc31d0f9565ff46 (commit)
discards e3f8f27e0816127fc36e966f641ced755da5b9f8 (commit)
discards 64648f9a7fe6e61a587f0812f0090923321bb1fe (commit)
discards 1193d0faf5b05a533542747cb6330d9a63435464 (commit)
via 4e70bdb5cd1029ec576800f27ce8b3822cb412d1 (commit)
via ecfeb8bc1c628359a902f82ea1c6c1b63b4fcab3 (commit)
via 101e24b0be12dd6b82260da11e82cd580f370bc3 (commit)
via 1644eec5ecdda1682cd3bbf517ccbebb01a21d4d (commit)
via 6a7fcb98efd33effd6b54140f7565ae126af6016 (commit)
via 2c5dbae44450631f4cd060afc859b5f63896e952 (commit)
via 288943c813ff68081ae0817db25cc131a75503a0 (commit)
via 2e0d2f3df935fc957b5b235a4a3ed756207e0c01 (commit)
via 3b97d33d0ac9d8c0fc2cddde6a5e1a58356a43ee (commit)
via 201ea95e9da043391b792a1e2ab91c9ec3872e59 (commit)
via 0bb96cdfe7c741aba87b66ec0a34c2a67be2c463 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (ff3c50351f2c3ce58becbbce30db3ba51f760eb7)
N -- N -- N (4e70bdb5cd1029ec576800f27ce8b3822cb412d1)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/4e70bdb5cd1029ec576800f27ce8b3822cb412d1
commit 4e70bdb5cd1029ec576800f27ce8b3822cb412d1
Author: Christophe CURIS <[email protected]>
Date: Wed Feb 12 23:35:09 2014 +0100
WPrefs: Removed n from label as the widget does at better job at splitting
lines
This explicit n caused a bad line split in the displayed text; without it
the natural line splitting keeps the text on 2 lines instead of 3.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c
index c261067b..7bd20795 100644
--- a/WPrefs.app/WindowHandling.c
+++ b/WPrefs.app/WindowHandling.c
@@ -499,7 +499,7 @@ static void createPanel(Panel * p)
panel->tranB = WMCreateSwitchButton(panel->tranF);
WMMoveWidget(panel->tranB, 10, 5);
WMResizeWidget(panel->tranB, 250, 30);
- WMSetButtonText(panel->tranB, _("Open dialogs in the same workspacenas
their owners"));
+ WMSetButtonText(panel->tranB, _("Open dialogs in the same workspace as
their owners"));
WMMapSubwidgets(panel->tranF);
diff --git a/WPrefs.app/po/bg.po b/WPrefs.app/po/bg.po
index 5d7c5443..c795f015 100644
--- a/WPrefs.app/po/bg.po
+++ b/WPrefs.app/po/bg.po
@@ -2404,11 +2404,9 @@ msgstr ""
"личане"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr ""
-"Диалоговите прозорци да са на работнотоn"
+"Диалоговите прозорци да са на работното "
"място, на владеещия ги прозорец."
# ../../WPrefs.app/WindowHandling.c:442
diff --git a/WPrefs.app/po/ca.po b/WPrefs.app/po/ca.po
index df71a309..74a20369 100644
--- a/WPrefs.app/po/ca.po
+++ b/WPrefs.app/po/ca.po
@@ -2085,11 +2085,9 @@ msgid "Attract"
msgstr "Atreu"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr ""
-"Obrir els quadres de diàleg a la mateixan"
+"Obrir els quadres de diàleg a la mateixa "
"àrea de treball que els seus propietaris."
#: ../../WPrefs.app/WindowHandling.c:450
diff --git a/WPrefs.app/po/cs.po b/WPrefs.app/po/cs.po
index a68559a6..02c16e2f 100644
--- a/WPrefs.app/po/cs.po
+++ b/WPrefs.app/po/cs.po
@@ -1945,12 +1945,8 @@ msgid "Attract"
msgstr "Ne"
#: ../WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
-msgstr ""
-"Otevřít dialogy na stejné plošen"
-"jako je vlastník"
+msgid "Open dialogs in same workspace as their owners"
+msgstr "Otevřít dialogy na stejné ploše jako je vlastník"
#: ../WindowHandling.c:450
msgid "Window Handling Preferences"
diff --git a/WPrefs.app/po/de.po b/WPrefs.app/po/de.po
index 5f88a58a..43dd2a42 100644
--- a/WPrefs.app/po/de.po
+++ b/WPrefs.app/po/de.po
@@ -1971,12 +1971,8 @@ msgid "Attract"
msgstr "Zug"
#: ../../WPrefs.app/WindowHandling.c:441
-msgid ""
-"Open dialogs in the same workspacen"
-"as their owners"
-msgstr ""
-"Dialoge auf Arbeitsfläche desn"
-"Eigentümers öffnen"
+msgid "Open dialogs in the same workspace as their owners"
+msgstr "Dialoge auf Arbeitsfläche des Eigentümers öffnen"
#: ../../WPrefs.app/WindowHandling.c:464
msgid "Window Handling Preferences"
diff --git a/WPrefs.app/po/es.po b/WPrefs.app/po/es.po
index e64eb200..8a79a00b 100644
--- a/WPrefs.app/po/es.po
+++ b/WPrefs.app/po/es.po
@@ -1993,12 +1993,8 @@ msgid "Attract"
msgstr "Atraer"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
-msgstr ""
-"Abrir diálogos en la misma árean"
-"que sus padres"
+msgid "Open dialogs in same workspace as their owners"
+msgstr "Abrir diálogos en la misma área que sus padres"
#: ../../WPrefs.app/WindowHandling.c:450
msgid "Window Handling Preferences"
diff --git a/WPrefs.app/po/fi.po b/WPrefs.app/po/fi.po
index 446271f5..4c233bf9 100644
--- a/WPrefs.app/po/fi.po
+++ b/WPrefs.app/po/fi.po
@@ -2027,12 +2027,8 @@ msgid "Attract"
msgstr "Veto"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
-msgstr ""
-"Avaa valintaikkunatn"
-"omistajansa työtilassa"
+msgid "Open dialogs in same workspace as their owners"
+msgstr "Avaa valintaikkunat omistajansa työtilassa"
#: ../../WPrefs.app/WindowHandling.c:450
msgid "Window Handling Preferences"
diff --git a/WPrefs.app/po/fr.po b/WPrefs.app/po/fr.po
index b989830e..40acd802 100644
--- a/WPrefs.app/po/fr.po
+++ b/WPrefs.app/po/fr.po
@@ -2106,11 +2106,9 @@ msgid "Attract"
msgstr "Attirer"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr ""
-"Ouvrir les boîtes de dialogue sur len"
+"Ouvrir les boîtes de dialogue sur le "
"même bureau que leurs propriétaires."
#: ../../WPrefs.app/WindowHandling.c:450
diff --git a/WPrefs.app/po/it.po b/WPrefs.app/po/it.po
index 4c7d8506..c5191d8a 100644
--- a/WPrefs.app/po/it.po
+++ b/WPrefs.app/po/it.po
@@ -2037,11 +2037,9 @@ msgid "Attract"
msgstr "Attrai"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr ""
-"Apri le finestre di dialogo nellan"
+"Apri le finestre di dialogo nella "
"stessa area di lavoro dei proprietari."
#: ../../WPrefs.app/WindowHandling.c:450
diff --git a/WPrefs.app/po/ja.po b/WPrefs.app/po/ja.po
index 7e94580e..2775bcf1 100644
--- a/WPrefs.app/po/ja.po
+++ b/WPrefs.app/po/ja.po
@@ -1977,12 +1977,9 @@ msgid "Attract"
msgstr "ひっつく"
#: ../../WPrefs.app/WindowHandling.c:482
-msgid ""
-"Open dialogs in the same workspacen"
-"as their owners"
+msgid "Open dialogs in the same workspace as their owners"
msgstr ""
-"ダイアログはオーナーと同じn"
-"ワークスペースに表示する"
+"ダイアログはオーナーと同じ ワークスペースに表示する"
#: ../../WPrefs.app/WindowHandling.c:505
msgid "Window Handling Preferences"
diff --git a/WPrefs.app/po/ko.po b/WPrefs.app/po/ko.po
index 197ed3fd..062be052 100644
--- a/WPrefs.app/po/ko.po
+++ b/WPrefs.app/po/ko.po
@@ -2168,9 +2168,7 @@ msgid "Attract"
msgstr "당김"
#: ../../WPrefs.app/WindowHandling.c:493
-msgid ""
-"Open dialogs in the same workspacen"
-"as their owners"
+msgid "Open dialogs in the same workspace as their owners"
msgstr "같은 작업 공간에서 소유자로서 대화창 열기"
#: ../../WPrefs.app/WindowHandling.c:515
diff --git a/WPrefs.app/po/ru.po b/WPrefs.app/po/ru.po
index 6f65539f..cd07b6fc 100644
--- a/WPrefs.app/po/ru.po
+++ b/WPrefs.app/po/ru.po
@@ -1920,11 +1920,9 @@ msgid "Attract"
msgstr "Притягиваться"
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr ""
-"Открывать диалоги в одном рабочемn"
+"Открывать диалоги в одном рабочем "
"пространстве с их родителями"
#: ../../WPrefs.app/WindowHandling.c:450
diff --git a/WPrefs.app/po/sk.po b/WPrefs.app/po/sk.po
index e8c56967..66ac09fa 100644
--- a/WPrefs.app/po/sk.po
+++ b/WPrefs.app/po/sk.po
@@ -1991,9 +1991,7 @@ msgid "Attract"
msgstr "Priťah."
#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspacen"
-"as their owners"
+msgid "Open dialogs in same workspace as their owners"
msgstr "Otvárať dialógy na ploche vlastníka"
#: ../../WPrefs.app/WindowHandling.c:450
diff --git a/WPrefs.app/po/zh_TW.po b/WPrefs.app/po/zh_TW.po
index eeb2642e..f710a6b4 100644
--- a/WPrefs.app/po/zh_TW.po
+++ b/WPrefs.app/po/zh_TW.po
@@ -1914,9 +1914,7 @@ msgid "Attract"
msgstr "吸引"
#: ../../WPrefs.app/WindowHandling.c:421
-msgid ""
-"Open dialogs in the same workspacen"
-"as their owners"
+msgid "Open dialogs in the same workspace as their owners"
msgstr "開啟對話視窗在其擁有者之相同工作區"
#: ../../WPrefs.app/WindowHandling.c:448
http://repo.or.cz/w/wmaker-crm.git/commit/ecfeb8bc1c628359a902f82ea1c6c1b63b4fcab3
commit ecfeb8bc1c628359a902f82ea1c6c1b63b4fcab3
Author: Christophe CURIS <[email protected]>
Date: Wed Feb 12 23:35:08 2014 +0100
WPrefs: Resized frames inside Mouse Settings panel to avoid label truncated
Some labels were truncated because the frame containing them was a bit
short; now the frames on the left have been shrunk (they had too much
margin) so the frames on the right can be expanded to have the labels fully
visible.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index d345f740..2aa500bf 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -436,13 +436,13 @@ static void createPanel(Panel * p)
/**************** Mouse Speed ****************/
panel->speedF = WMCreateFrame(panel->box);
- WMResizeWidget(panel->speedF, 245, 100);
+ WMResizeWidget(panel->speedF, 225, 100);
WMMoveWidget(panel->speedF, 15, 5);
WMSetFrameTitle(panel->speedF, _("Mouse Speed"));
panel->speedL = WMCreateLabel(panel->speedF);
WMResizeWidget(panel->speedL, 40, 46);
- WMMoveWidget(panel->speedL, 15, 14);
+ WMMoveWidget(panel->speedL, 10, 14);
WMSetLabelImagePosition(panel->speedL, WIPImageOnly);
path = LocateImage(SPEED_ICON_FILE);
if (path) {
@@ -457,33 +457,33 @@ static void createPanel(Panel * p)
}
panel->speedS = WMCreateSlider(panel->speedF);
- WMResizeWidget(panel->speedS, 160, 15);
- WMMoveWidget(panel->speedS, 70, 35);
+ WMResizeWidget(panel->speedS, 150, 15);
+ WMMoveWidget(panel->speedS, 60, 35);
WMSetSliderMinValue(panel->speedS, 0);
WMSetSliderMaxValue(panel->speedS, 40);
WMSetSliderContinuous(panel->speedS, False);
WMSetSliderAction(panel->speedS, speedChange, panel);
panel->acceL = WMCreateLabel(panel->speedF);
- WMResizeWidget(panel->acceL, 70, 16);
+ WMResizeWidget(panel->acceL, 50, 16);
WMMoveWidget(panel->acceL, 10, 67);
WMSetLabelTextAlignment(panel->acceL, WARight);
- WMSetLabelText(panel->acceL, _("Acceler.:"));
+ WMSetLabelText(panel->acceL, _("Accel.:"));
panel->acceT = WMCreateTextField(panel->speedF);
WMResizeWidget(panel->acceT, 40, 20);
- WMMoveWidget(panel->acceT, 80, 65);
+ WMMoveWidget(panel->acceT, 60, 65);
WMAddNotificationObserver(returnPressed, panel,
WMTextDidEndEditingNotification, panel->acceT);
panel->threL = WMCreateLabel(panel->speedF);
WMResizeWidget(panel->threL, 80, 16);
- WMMoveWidget(panel->threL, 120, 67);
+ WMMoveWidget(panel->threL, 100, 67);
WMSetLabelTextAlignment(panel->threL, WARight);
WMSetLabelText(panel->threL, _("Threshold:"));
panel->threT = WMCreateTextField(panel->speedF);
WMResizeWidget(panel->threT, 30, 20);
- WMMoveWidget(panel->threT, 200, 65);
+ WMMoveWidget(panel->threT, 180, 65);
WMAddNotificationObserver(returnPressed, panel,
WMTextDidEndEditingNotification, panel->threT);
WMMapSubwidgets(panel->speedF);
@@ -491,7 +491,7 @@ static void createPanel(Panel * p)
/***************** Doubleclick Delay ****************/
panel->ddelaF = WMCreateFrame(panel->box);
- WMResizeWidget(panel->ddelaF, 245, 105);
+ WMResizeWidget(panel->ddelaF, 225, 105);
WMMoveWidget(panel->ddelaF, 15, 115);
WMSetFrameTitle(panel->ddelaF, _("Double-Click Delay"));
@@ -501,7 +501,7 @@ static void createPanel(Panel * p)
for (i = 0; i < 5; i++) {
panel->ddelaB[i] = WMCreateCustomButton(panel->ddelaF,
WBBStateChangeMask);
WMResizeWidget(panel->ddelaB[i], 25, 25);
- WMMoveWidget(panel->ddelaB[i], 30 + (40 * i), 25);
+ WMMoveWidget(panel->ddelaB[i], 20 + (40 * i), 25);
WMSetButtonBordered(panel->ddelaB[i], False);
WMSetButtonImagePosition(panel->ddelaB[i], WIPImageOnly);
WMSetButtonAction(panel->ddelaB[i], doubleClick, panel);
@@ -538,15 +538,15 @@ static void createPanel(Panel * p)
panel->tester = CreateDoubleTest(panel->ddelaF, _("Test"));
WMResizeWidget(panel->tester, 84, 29);
- WMMoveWidget(panel->tester, 35, 60);
+ WMMoveWidget(panel->tester, 25, 60);
panel->ddelaT = WMCreateTextField(panel->ddelaF);
WMResizeWidget(panel->ddelaT, 40, 20);
- WMMoveWidget(panel->ddelaT, 140, 65);
+ WMMoveWidget(panel->ddelaT, 130, 65);
panel->ddelaL = WMCreateLabel(panel->ddelaF);
WMResizeWidget(panel->ddelaL, 40, 16);
- WMMoveWidget(panel->ddelaL, 185, 70);
+ WMMoveWidget(panel->ddelaL, 175, 70);
{
WMFont *font;
WMColor *color;
@@ -564,8 +564,8 @@ static void createPanel(Panel * p)
/* ************** Workspace Action Buttons **************** */
panel->menuF = WMCreateFrame(panel->box);
- WMResizeWidget(panel->menuF, 240, 160);
- WMMoveWidget(panel->menuF, 270, 5);
+ WMResizeWidget(panel->menuF, 260, 160);
+ WMMoveWidget(panel->menuF, 250, 5);
WMSetFrameTitle(panel->menuF, _("Workspace Mouse Actions"));
panel->disaB = WMCreateSwitchButton(panel->menuF);
@@ -574,44 +574,44 @@ static void createPanel(Panel * p)
WMSetButtonText(panel->disaB, _("Disable mouse actions"));
panel->button1L = WMCreateLabel(panel->menuF);
- WMResizeWidget(panel->button1L, 87, 20);
+ WMResizeWidget(panel->button1L, 107, 20);
WMMoveWidget(panel->button1L, 5, 45);
WMSetLabelTextAlignment(panel->button1L, WARight);
WMSetLabelText(panel->button1L, _("Left Button"));
panel->button1P = WMCreatePopUpButton(panel->menuF);
WMResizeWidget(panel->button1P, 135, 20);
- WMMoveWidget(panel->button1P, 95, 45);
+ WMMoveWidget(panel->button1P, 115, 45);
panel->button2L = WMCreateLabel(panel->menuF);
- WMResizeWidget(panel->button2L, 87, 20);
+ WMResizeWidget(panel->button2L, 107, 20);
WMMoveWidget(panel->button2L, 5, 73);
WMSetLabelTextAlignment(panel->button2L, WARight);
WMSetLabelText(panel->button2L, _("Middle Button"));
panel->button2P = WMCreatePopUpButton(panel->menuF);
WMResizeWidget(panel->button2P, 135, 20);
- WMMoveWidget(panel->button2P, 95, 73);
+ WMMoveWidget(panel->button2P, 115, 73);
panel->button3L = WMCreateLabel(panel->menuF);
- WMResizeWidget(panel->button3L, 87, 20);
+ WMResizeWidget(panel->button3L, 107, 20);
WMMoveWidget(panel->button3L, 5, 101);
WMSetLabelTextAlignment(panel->button3L, WARight);
WMSetLabelText(panel->button3L, _("Right Button"));
panel->button3P = WMCreatePopUpButton(panel->menuF);
WMResizeWidget(panel->button3P, 135, 20);
- WMMoveWidget(panel->button3P, 95, 101);
+ WMMoveWidget(panel->button3P, 115, 101);
panel->wheelL = WMCreateLabel(panel->menuF);
- WMResizeWidget(panel->wheelL, 87, 20);
+ WMResizeWidget(panel->wheelL, 107, 20);
WMMoveWidget(panel->wheelL, 5, 129);
WMSetLabelTextAlignment(panel->wheelL, WARight);
WMSetLabelText(panel->wheelL, _("Mouse Wheel"));
panel->wheelP = WMCreatePopUpButton(panel->menuF);
WMResizeWidget(panel->wheelP, 135, 20);
- WMMoveWidget(panel->wheelP, 95, 129);
+ WMMoveWidget(panel->wheelP, 115, 129);
for (i = 0; i < wlengthof(buttonActions); i++) {
WMAddPopUpButtonItem(panel->button1P, buttonActions[i]);
@@ -627,8 +627,8 @@ static void createPanel(Panel * p)
/* ************** Grab Modifier **************** */
panel->grabF = WMCreateFrame(panel->box);
- WMResizeWidget(panel->grabF, 240, 50);
- WMMoveWidget(panel->grabF, 270, 170);
+ WMResizeWidget(panel->grabF, 260, 50);
+ WMMoveWidget(panel->grabF, 250, 170);
WMSetFrameTitle(panel->grabF, _("Mouse Grab Modifier"));
WMSetBalloonTextForView(_("Keyboard modifier to use for actions thatn"
@@ -637,7 +637,7 @@ static void createPanel(Panel * p)
panel->grabP = WMCreatePopUpButton(panel->grabF);
WMResizeWidget(panel->grabP, 160, 20);
- WMMoveWidget(panel->grabP, 40, 20);
+ WMMoveWidget(panel->grabP, 50, 20);
fillModifierPopUp(panel->grabP);
http://repo.or.cz/w/wmaker-crm.git/commit/101e24b0be12dd6b82260da11e82cd580f370bc3
commit 101e24b0be12dd6b82260da11e82cd580f370bc3
Author: Christophe CURIS <[email protected]>
Date: Wed Feb 12 22:54:32 2014 +0100
Fixed xinerama detection
As reported by David Maciejak, when libXinerama was not found on the
system, the configure script still tried to search for associated
header and stopped all with unclear message.
The proper behaviour that was expected is to accept silently that
libXinerama may not be missing, and only stop compilation when the lib
is present but not its header.
diff --git a/m4/wm_xext_check.m4 b/m4/wm_xext_check.m4
index 51da16f4..9b50a0ef 100644
--- a/m4/wm_xext_check.m4
+++ b/m4/wm_xext_check.m4
@@ -145,20 +145,23 @@ sed -e 's,^[[^%]]*% *,,' | sed -e 's, *%.*$,,' `" dnl
break])
done
LIBS="$wm_save_LIBS"
- AS_IF([test "x$enable_xinerama$wm_cv_xext_xinerama" = "xyesno"],
- [AC_MSG_ERROR([explicit Xinerama support requested but no library
found])])
- dnl
- dnl A library was found, check if header is available and compile
- wm_save_CFLAGS="$CFLAGS"
- AS_CASE([`echo "$wm_cv_xext_xinerama" | sed -e 's,^[[^%]]*,,' `],
- [*solaris*], [wm_header="X11/extensions/xinerama.h" ;
wm_fct="XineramaGetInfo(NULL, 0, NULL, NULL, &intval)"],
- [wm_header="X11/extensions/Xinerama.h" ;
wm_fct="XineramaQueryScreens(NULL, &intval)"])
- AS_IF([wm_fn_lib_try_compile "$wm_header" "int intval;" "$wm_fct" ""],
- [],
- [AC_MSG_ERROR([found $wm_cv_xext_xinerama but cannot compile with
the header])])
- AS_UNSET([wm_header])
- AS_UNSET([wm_fct])
- CFLAGS="$wm_save_CFLAGS"])
+ AS_IF([test "x$wm_cv_xext_xinerama" = "xno"],
+ [AS_IF([test "x$enable_xinerama" = "xyesno"],
+ [AC_MSG_ERROR([explicit Xinerama support requested but no
library found])])],
+ [dnl
+ dnl A library was found, check if header is available and
compiles
+ wm_save_CFLAGS="$CFLAGS"
+ AS_CASE([`echo "$wm_cv_xext_xinerama" | sed -e 's,^[[^%]]*,,' `],
+ [*solaris*], [wm_header="X11/extensions/xinerama.h" ;
wm_fct="XineramaGetInfo(NULL, 0, NULL, NULL, &intval)"],
+ [wm_header="X11/extensions/Xinerama.h" ;
wm_fct="XineramaQueryScreens(NULL, &intval)"])
+ AS_IF([wm_fn_lib_try_compile "$wm_header" "int intval;"
"$wm_fct" ""],
+ [],
+ [AC_MSG_ERROR([found $wm_cv_xext_xinerama but cannot compile
with the header])])
+ AS_UNSET([wm_header])
+ AS_UNSET([wm_fct])
+ CFLAGS="$wm_save_CFLAGS" dnl
+ ]) dnl
+ ])
AS_IF([test "x$wm_cv_xext_xinerama" = "xno"],
[unsupported="$unsupported Xinerama"
enable_xinerama="no"],
http://repo.or.cz/w/wmaker-crm.git/commit/1644eec5ecdda1682cd3bbf517ccbebb01a21d4d
commit 1644eec5ecdda1682cd3bbf517ccbebb01a21d4d
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed Feb 12 23:22:29 2014 +0100
Fixed compiler warnings in dock.c
This patch removes unused variables as reported by the compiler in
the file dock.c
diff --git a/src/dock.c b/src/dock.c
index 222627f9..343798e6 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,19 +4573,17 @@ 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) {
+ for (dc = scr->drawers; dc != NULL; dc = dc->next)
swapDrawer(dc->adrawer, new_x);
- assert(dc->adrawer->on_right_side == on_right_side);
- }
}
http://repo.or.cz/w/wmaker-crm.git/commit/6a7fcb98efd33effd6b54140f7565ae126af6016
commit 6a7fcb98efd33effd6b54140f7565ae126af6016
Author: David Maciejak <[email protected]>
Date: Wed Feb 12 23:53:25 2014 +0800
WPrefs: Fixed label display truncated for delays in ms for autocollapsing
clips
diff --git a/WPrefs.app/Docks.c b/WPrefs.app/Docks.c
index 91fa3380..e85f5dfb 100644
--- a/WPrefs.app/Docks.c
+++ b/WPrefs.app/Docks.c
@@ -169,7 +169,7 @@ static void createPanel(Panel *p)
for (k = 0; k < 2; k++)
{
panel->autoDelayF[k] = WMCreateFrame(panel->box);
- WMResizeWidget(panel->autoDelayF[k], 365, 100);
+ WMResizeWidget(panel->autoDelayF[k], 370, 100);
WMMoveWidget(panel->autoDelayF[k], 15, 10 + k * 110);
if (k == 0)
WMSetFrameTitle(panel->autoDelayF[k], _("Delays in
milliseconds for autocollapsing clips"));
@@ -179,7 +179,7 @@ static void createPanel(Panel *p)
for (i = 0; i < 2; i++)
{
panel->autoDelayL[i + k * 2] =
WMCreateLabel(panel->autoDelayF[k]);
- WMResizeWidget(panel->autoDelayL[i + k * 2], 165, 20);
+ WMResizeWidget(panel->autoDelayL[i + k * 2], 175, 20);
WMMoveWidget(panel->autoDelayL[i + k * 2], 10, 27 + 40
* i);
WMSetLabelText(panel->autoDelayL[i + k * 2],
_(auto_delay[i + k * 2].string));
WMSetLabelTextAlignment(panel->autoDelayL[i + k * 2],
WARight);
@@ -188,7 +188,7 @@ static void createPanel(Panel *p)
{
panel->autoDelayB[i + k * 2][j] =
WMCreateCustomButton(panel->autoDelayF[k], WBBStateChangeMask);
WMResizeWidget(panel->autoDelayB[i + k * 2][j],
25, 25);
- WMMoveWidget(panel->autoDelayB[i + k * 2][j],
175 + (25 * j), 25 + 40 * i);
+ WMMoveWidget(panel->autoDelayB[i + k * 2][j],
185 + (25 * j), 25 + 40 * i);
WMSetButtonBordered(panel->autoDelayB[i + k *
2][j], False);
WMSetButtonImagePosition(panel->autoDelayB[i +
k * 2][j], WIPImageOnly);
WMSetButtonAction(panel->autoDelayB[i + k *
2][j], pushAutoDelayButton, panel);
@@ -213,8 +213,8 @@ static void createPanel(Panel *p)
}
panel->autoDelayT[i + k * 2] =
WMCreateTextField(panel->autoDelayF[k]);
- WMResizeWidget(panel->autoDelayT[i + k * 2], 36, 20);
- WMMoveWidget(panel->autoDelayT[i + k * 2], 310, 27 + 40
* i);
+ WMResizeWidget(panel->autoDelayT[i + k * 2], 40, 20);
+ WMMoveWidget(panel->autoDelayT[i + k * 2], 315, 27 + 40
* i);
WMAddNotificationObserver(autoDelayChanged, panel,
WMTextDidChangeNotification, panel->autoDelayT[i + k * 2]);
}
http://repo.or.cz/w/wmaker-crm.git/commit/2c5dbae44450631f4cd060afc859b5f63896e952
commit 2c5dbae44450631f4cd060afc859b5f63896e952
Author: David Maciejak <[email protected]>
Date: Wed Feb 12 21:20:52 2014 +0800
WINGs/Examples: Removed refs to connect and server examples
diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 98836c00..4ddaaf2c 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS =
-noinst_PROGRAMS = connect server fontl puzzle colorpick
+noinst_PROGRAMS = fontl puzzle colorpick
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
@@ -16,14 +16,6 @@ fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
-
-connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@
@INTLIBS@
-
-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
-
-server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@
@INTLIBS@
-
AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
-DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@
diff --git a/WINGs/Examples/README b/WINGs/Examples/README
index ab8aa3fe..fead3db2 100644
--- a/WINGs/Examples/README
+++ b/WINGs/Examples/README
@@ -3,14 +3,7 @@
Files:
-----
-server - server example of using WMConnection. It keeps a database of
- timeouts for a group of users, allowing one to add/remove
- users and update the timeouts associated with them.
-
-connect - client example of using WMConnection. Works with the
server
- program above. Just start both without any parameter and
- type help in the client to find out how to operate them.
- Rest is self explanatory.
+colorpick - a color picker
puzzle - a nice zuPzel =)
http://repo.or.cz/w/wmaker-crm.git/commit/288943c813ff68081ae0817db25cc131a75503a0
commit 288943c813ff68081ae0817db25cc131a75503a0
Author: Brad Jorsch <[email protected]>
Date: Tue Feb 11 18:22:01 2014 -0500
Add _NET_WM_WINDOW_TYPEs added in EWMH 1.3
EWMH 1.3 added various window types: dropdown_menu, popup_menu, tooltip,
notification, combo, and dnd. We may as well set appropriate defaults if
these types get set on a window that isn't override-redirect.
I'm not terribly attached to these defaults, except that the ones for
'notification' are what I set manually for xfce4-notifyd before deciding
to patch wmaker.
diff --git a/src/wmspec.c b/src/wmspec.c
index 2e5ec3f3..779a9efc 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -85,6 +85,12 @@ static Atom net_wm_window_type_menu;
static Atom net_wm_window_type_utility;
static Atom net_wm_window_type_splash;
static Atom net_wm_window_type_dialog;
+static Atom net_wm_window_type_dropdown_menu;
+static Atom net_wm_window_type_popup_menu;
+static Atom net_wm_window_type_tooltip;
+static Atom net_wm_window_type_notification;
+static Atom net_wm_window_type_combo;
+static Atom net_wm_window_type_dnd;
static Atom net_wm_window_type_normal;
static Atom net_wm_state;
static Atom net_wm_state_modal; /* XXX: what is this?!? */
@@ -161,6 +167,12 @@ static atomitem_t atomNames[] = {
{"_NET_WM_WINDOW_TYPE_UTILITY", &net_wm_window_type_utility},
{"_NET_WM_WINDOW_TYPE_SPLASH", &net_wm_window_type_splash},
{"_NET_WM_WINDOW_TYPE_DIALOG", &net_wm_window_type_dialog},
+ {"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
&net_wm_window_type_dropdown_menu},
+ {"_NET_WM_WINDOW_TYPE_POPUP_MENU", &net_wm_window_type_popup_menu},
+ {"_NET_WM_WINDOW_TYPE_TOOLTIP", &net_wm_window_type_tooltip},
+ {"_NET_WM_WINDOW_TYPE_NOTIFICATION", &net_wm_window_type_notification},
+ {"_NET_WM_WINDOW_TYPE_COMBO", &net_wm_window_type_combo},
+ {"_NET_WM_WINDOW_TYPE_DND", &net_wm_window_type_dnd},
{"_NET_WM_WINDOW_TYPE_NORMAL", &net_wm_window_type_normal},
{"_NET_WM_STATE", &net_wm_state},
{"_NET_WM_STATE_MODAL", &net_wm_state_modal},
@@ -263,6 +275,12 @@ static void setSupportedHints(WScreen *scr)
atom[i++] = net_wm_window_type_utility;
atom[i++] = net_wm_window_type_splash;
atom[i++] = net_wm_window_type_dialog;
+ atom[i++] = net_wm_window_type_dropdown_menu;
+ atom[i++] = net_wm_window_type_popup_menu;
+ atom[i++] = net_wm_window_type_tooltip;
+ atom[i++] = net_wm_window_type_notification;
+ atom[i++] = net_wm_window_type_combo;
+ atom[i++] = net_wm_window_type_dnd;
atom[i++] = net_wm_window_type_normal;
atom[i++] = net_wm_state;
@@ -959,6 +977,16 @@ static int getWindowLayer(WWindow *wwin)
layer = WMNormalLevel;
}
/* //layer = WMPopUpLevel; // this seems a bad idea -Dan */
+ } else if (wwin->type == net_wm_window_type_dropdown_menu) {
+ layer = WMSubmenuLevel;
+ } else if (wwin->type == net_wm_window_type_popup_menu) {
+ layer = WMSubmenuLevel;
+ } else if (wwin->type == net_wm_window_type_tooltip) {
+ } else if (wwin->type == net_wm_window_type_notification) {
+ layer = WMPopUpLevel;
+ } else if (wwin->type == net_wm_window_type_combo) {
+ layer = WMSubmenuLevel;
+ } else if (wwin->type == net_wm_window_type_dnd) {
} else if (wwin->type == net_wm_window_type_normal) {
}
@@ -1133,7 +1161,10 @@ static Bool handleWindowType(WWindow *wwin, Atom type,
int *layer)
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1;
wwin->client_flags.no_appicon = 1;
- } else if (type == net_wm_window_type_menu) {
+ } else if (type == net_wm_window_type_menu ||
+ type == net_wm_window_type_dropdown_menu ||
+ type == net_wm_window_type_popup_menu ||
+ type == net_wm_window_type_combo) {
wwin->client_flags.no_titlebar = 1;
wwin->client_flags.no_resizable = 1;
wwin->client_flags.no_miniaturizable = 1;
@@ -1162,6 +1193,46 @@ static Bool handleWindowType(WWindow *wwin, Atom type,
int *layer)
// wwin->client_flags.skip_window_list = 1;
// wwin->client_flags.no_appicon = 1;
*/
+ } else if (wwin->type == net_wm_window_type_tooltip) {
+ wwin->client_flags.no_titlebar = 1;
+ wwin->client_flags.no_resizable = 1;
+ wwin->client_flags.no_miniaturizable = 1;
+ wwin->client_flags.no_resizebar = 1;
+ wwin->client_flags.no_shadeable = 1;
+ wwin->client_flags.no_movable = 1;
+ wwin->client_flags.skip_window_list = 1;
+ wwin->client_flags.skip_switchpanel = 1;
+ wwin->client_flags.dont_move_off = 1;
+ wwin->client_flags.no_appicon = 1;
+ wwin->flags.net_skip_pager = 1;
+ } else if (wwin->type == net_wm_window_type_notification) {
+ wwin->client_flags.no_titlebar = 1;
+ wwin->client_flags.no_resizable = 1;
+ wwin->client_flags.no_miniaturizable = 1;
+ wwin->client_flags.no_border = 1;
+ wwin->client_flags.no_resizebar = 1;
+ wwin->client_flags.no_shadeable = 1;
+ wwin->client_flags.no_movable = 1;
+ wwin->client_flags.omnipresent = 1;
+ wwin->client_flags.skip_window_list = 1;
+ wwin->client_flags.skip_switchpanel = 1;
+ wwin->client_flags.dont_move_off = 1;
+ wwin->client_flags.no_hide_others= 1;
+ wwin->client_flags.no_appicon = 1;
+ wwin->flags.net_skip_pager = 1;
+ } else if (wwin->type == net_wm_window_type_dnd) {
+ wwin->client_flags.no_titlebar = 1;
+ wwin->client_flags.no_resizable = 1;
+ wwin->client_flags.no_miniaturizable = 1;
+ wwin->client_flags.no_border = 1;
+ wwin->client_flags.no_resizebar = 1;
+ wwin->client_flags.no_shadeable = 1;
+ wwin->client_flags.no_movable = 1;
+ wwin->client_flags.skip_window_list = 1;
+ wwin->client_flags.skip_switchpanel = 1;
+ wwin->client_flags.dont_move_off = 1;
+ wwin->client_flags.no_appicon = 1;
+ wwin->flags.net_skip_pager = 1;
} else if (type == net_wm_window_type_normal) {
} else {
ret = False;
@@ -1327,6 +1398,7 @@ void wNETWMCheckInitialClientState(WWindow *wwin)
wNETWMShowingDesktop(wwin->screen_ptr, False);
+ updateWindowType(wwin);
updateNetIconInfo(wwin);
updateIconImage(wwin);
}
http://repo.or.cz/w/wmaker-crm.git/commit/2e0d2f3df935fc957b5b235a4a3ed756207e0c01
commit 2e0d2f3df935fc957b5b235a4a3ed756207e0c01
Author: Brad Jorsch <[email protected]>
Date: Tue Feb 11 17:23:54 2014 -0500
Minimal support for _NET_WM_WINDOW_OPACITY
While we don't provide compositing ourselves, add-on compositors such as
xcompmgr need us to copy the _NET_WM_WINDOW_OPACITY property from the
client window to the frame window.
We can do this easily enough.
diff --git a/src/window.c b/src/window.c
index 3c76d6ae..9a6adbdd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1079,6 +1079,8 @@ WWindow *wManageWindow(WScreen *scr, Window window)
wwin->frame->flags.is_client_window_frame = 1;
wwin->frame->flags.justification = wPreferences.title_justification;
+ wNETWMCheckInitialFrameState(wwin);
+
/* setup button images */
wWindowUpdateButtonImages(wwin);
diff --git a/src/wmspec.c b/src/wmspec.c
index d6851d79..2e5ec3f3 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -115,6 +115,7 @@ static Atom net_wm_icon_geometry; /* FIXME: should work
together with net_wm_han
static Atom net_wm_icon;
static Atom net_wm_pid; /* TODO */
static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
+static Atom net_wm_window_opacity;
static Atom net_frame_extents;
@@ -190,6 +191,7 @@ static atomitem_t atomNames[] = {
{"_NET_WM_ICON", &net_wm_icon},
{"_NET_WM_PID", &net_wm_pid},
{"_NET_WM_HANDLED_ICONS", &net_wm_handled_icons},
+ {"_NET_WM_WINDOW_OPACITY", &net_wm_window_opacity},
{"_NET_FRAME_EXTENTS", &net_frame_extents},
@@ -292,6 +294,7 @@ static void setSupportedHints(WScreen *scr)
atom[i++] = net_wm_icon_geometry;
atom[i++] = net_wm_icon;
atom[i++] = net_wm_handled_icons;
+ atom[i++] = net_wm_window_opacity;
atom[i++] = net_frame_extents;
@@ -472,6 +475,34 @@ static void updateIconImage(WWindow *wwin)
}
}
+static void updateWindowOpacity(WWindow *wwin)
+{
+ Atom type;
+ int format;
+ unsigned long items, rest;
+ unsigned long *property;
+
+ if (!wwin->frame)
+ return;
+
+ /* We don't care about this ourselves, but other programs need us to
copy
+ * this to the frame window. */
+ if (XGetWindowProperty(dpy, wwin->client_win, net_wm_window_opacity,
0L, 1L,
+ False, XA_CARDINAL, &type, &format, &items,
&rest,
+ (unsigned char **)&property) != Success)
+ return;
+
+ if (type == None) {
+ XDeleteProperty(dpy, wwin->frame->core->window,
net_wm_window_opacity);
+ } else if (type == XA_CARDINAL && format == 32 && items == 1 &&
property) {
+ XChangeProperty(dpy, wwin->frame->core->window,
net_wm_window_opacity,
+ XA_CARDINAL, 32, PropModeReplace, (unsigned
char *)property, 1L);
+ }
+
+ if (property)
+ XFree(property);
+}
+
static void updateShowDesktop(WScreen *scr, Bool show)
{
long foo;
@@ -1300,6 +1331,15 @@ void wNETWMCheckInitialClientState(WWindow *wwin)
updateIconImage(wwin);
}
+void wNETWMCheckInitialFrameState(WWindow *wwin)
+{
+#ifdef DEBUG_WMSPEC
+ wmessage("wNETWMCheckInitialFrameState");
+#endif
+
+ updateWindowOpacity(wwin);
+}
+
static void handleDesktopNames(WScreen *scr)
{
unsigned long nitems_ret, bytes_after_ret;
@@ -1470,6 +1510,8 @@ void wNETWMCheckClientHintChange(WWindow *wwin,
XPropertyEvent *event)
}
} else if (event->atom == net_wm_icon) {
updateIconImage(wwin);
+ } else if (event->atom == net_wm_window_opacity) {
+ updateWindowOpacity(wwin);
}
}
diff --git a/src/wmspec.h b/src/wmspec.h
index 5bb26f0f..011a6e9d 100644
--- a/src/wmspec.h
+++ b/src/wmspec.h
@@ -33,6 +33,7 @@ void wNETWMCleanup(WScreen *scr);
void wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea);
Bool wNETWMGetUsableArea(WScreen *scr, int head, WArea *area);
void wNETWMCheckInitialClientState(WWindow *wwin);
+void wNETWMCheckInitialFrameState(WWindow *wwin);
Bool wNETWMProcessClientMessage(XClientMessageEvent *event);
void wNETWMCheckClientHints(WWindow *wwin, int *layer, int *workspace);
void wNETWMCheckClientHintChange(WWindow *wwin, XPropertyEvent *event);
http://repo.or.cz/w/wmaker-crm.git/commit/3b97d33d0ac9d8c0fc2cddde6a5e1a58356a43ee
commit 3b97d33d0ac9d8c0fc2cddde6a5e1a58356a43ee
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 21:31:26 2014 +0100
WINGS: removed compiler warnings.
This patch removes compiler warnings.
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 26ca1fcb..29777027 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -340,7 +340,6 @@ static void colorListPaintItem(WMList * lPtr, int index,
Drawable d, char *text,
static void colorListSelect(WMWidget * w, void *data);
static void colorListColorMenuCallback(WMWidget * w, void *data);
static void colorListListMenuCallback(WMWidget * w, void *data);
-static void colorListListMenuNew(W_ColorPanel * panel);
static void wheelInit(W_ColorPanel * panel);
static void grayInit(W_ColorPanel * panel);
@@ -3238,8 +3237,6 @@ static void colorListListMenuCallback(WMWidget * w, void
*data)
switch (item) {
case CLmenuAdd:
- /* New Color List */
- colorListListMenuNew(panel);
break;
case CLmenuRename:
break;
@@ -3248,11 +3245,6 @@ static void colorListListMenuCallback(WMWidget * w, void
*data)
}
}
-static void colorListListMenuNew(W_ColorPanel * panel)
-{
-
-}
-
/*************** Panel Initialisation Functions *****************/
static void wheelInit(W_ColorPanel * panel)
diff --git a/WINGs/wcolorwell.c b/WINGs/wcolorwell.c
index a4b94ff5..ace85cd0 100644
--- a/WINGs/wcolorwell.c
+++ b/WINGs/wcolorwell.c
@@ -111,21 +111,6 @@ static void updateColorCallback(void *self, void *data)
WMPostNotificationName(WMColorWellDidChangeNotification, cPtr, NULL);
}
-static void activatedObserver(void *data, WMNotification * notification)
-{
- /*
- WMColorWell *cPtr = (WMColorWell*)data;
-
- if (!cPtr->flags.active || WMGetNotificationObject(notification) ==
cPtr)
- return;
-
- W_SetViewBackgroundColor(cPtr->view, WMWidgetScreen(cPtr)->gray);
- paintColorWell(cPtr);
-
- cPtr->flags.active = 0;
- */
-}
-
static WMArray *getXdndTypeArray(void)
{
WMArray *types = WMCreateArray(1);
@@ -173,8 +158,6 @@ WMColorWell *WMCreateColorWell(WMWidget * parent)
W_ResizeView(cPtr->view, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- WMAddNotificationObserver(activatedObserver, cPtr,
_ColorWellActivatedNotification, NULL);
-
cPtr->color = WMBlackColor(WMWidgetScreen(cPtr));
WMAddNotificationObserver(colorChangedObserver, cPtr,
WMColorPanelColorChangedNotification, NULL);
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 10eea336..6dc8babb 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -470,11 +470,6 @@ static char *get_name_from_path(const char *path)
return wstrdup(&(path[size]));
}
-static Bool filterFileName(WMFilePanel * panel, const char *file, Bool
isDirectory)
-{
- return True;
-}
-
#define CAST(item) (*((WMListItem**)item))
static int comparer(const void *a, const void *b)
{
@@ -535,9 +530,7 @@ static void listDirectoryOnColumn(WMFilePanel * panel, int
column, const char *p
int isDirectory;
isDirectory = S_ISDIR(stat_buf.st_mode);
-
- if (filterFileName(panel, dentry->d_name, isDirectory))
- WMInsertBrowserItem(bPtr, column, -1,
dentry->d_name, isDirectory);
+ WMInsertBrowserItem(bPtr, column, -1, dentry->d_name,
isDirectory);
}
}
WMSortBrowserColumnWithComparer(bPtr, column, comparer);
@@ -738,6 +731,9 @@ out:
static void goUnmount(WMWidget *widget, void *p_panel)
{
+ /* Not implemented yet */
+ (void) widget;
+ (void) p_panel;
}
static void goFloppy(WMWidget *widget, void *p_panel)
diff --git a/WINGs/wprogressindicator.c b/WINGs/wprogressindicator.c
index 374df5e0..61b4e2e7 100644
--- a/WINGs/wprogressindicator.c
+++ b/WINGs/wprogressindicator.c
@@ -141,6 +141,8 @@ static void didResizeProgressIndicator(W_ViewDelegate *
self, WMView * view)
/* Parameter not used, but tell the compiler that it is ok */
(void) self;
+ (void) width;
+ (void) height;
assert(width > 0);
assert(height > 0);
diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c
index 38b2cb39..60d86015 100644
--- a/WINGs/wsplitview.c
+++ b/WINGs/wsplitview.c
@@ -775,10 +775,12 @@ void WMSetSplitViewVertical(WMSplitView * sPtr, Bool flag)
*/
}
-int WMGetSplitViewDividerThickness(WMSplitView * sPtr)
+int WMGetSplitViewDividerThickness(WMSplitView *sPtr)
{
CHECK_CLASS(sPtr, WC_SplitView);
+ (void) sPtr;
+
return (DIVIDER_THICKNESS);
}
http://repo.or.cz/w/wmaker-crm.git/commit/201ea95e9da043391b792a1e2ab91c9ec3872e59
commit 201ea95e9da043391b792a1e2ab91c9ec3872e59
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:55:32 2014 +0100
remove wtest compiler warnings.
This patch removes the wtest compiler warnings.
diff --git a/test/wtest.c b/test/wtest.c
index 8490e9ca..c886c5b9 100644
--- a/test/wtest.c
+++ b/test/wtest.c
@@ -29,18 +29,24 @@ Display *dpy;
Window leader;
WMAppContext *app;
-static void callback(void *foo, int item, Time time)
+static void callback(int item)
{
+ (void) item;
+
printf("pushed item %in", item);
}
-static void quit(void *foo, int item, Time time)
+static void quit(int item)
{
+ (void) item;
+
exit(0);
}
-static void hide(void *foo, int item, Time time)
+static void hide(int item)
{
+ (void) item;
+
WMHideApplication(app);
}
@@ -52,11 +58,12 @@ WMMenu *menu;
WMMenu *submenu;
int wincount = 0;
-static void newwin(void *foo, int item, Time time)
+static void newwin(int item)
{
Window win;
XClassHint classhint;
char title[100];
+ (void) item;
wincount++;
win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10 * wincount,
10 * wincount, 200, 100, 0, 0, 0);
@@ -76,10 +83,6 @@ static void newwin(void *foo, int item, Time time)
attr.miniaturize_pixmap = XCreateBitmapFromData(dpy,
DefaultRootWindow(dpy), bits, 10, 10);
attr.miniaturize_mask = XCreateBitmapFromData(dpy,
DefaultRootWindow(dpy), mbits, 10, 10);
- /*
- attr.flags |= GSWindowStyleAttr;
- attr.window_style = NSTitledWindowMask|NSClosableWindowMask;
- */
WMSetWindowAttributes(dpy, win, &attr);
@@ -106,6 +109,7 @@ int main(int argc, char **argv)
miniaturize_win = XInternAtom(dpy, "_GNUSTEP_WM_MINIATURIZE_WINDOW",
False);
leader = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, 10,
10, 0, 0, 0);
+
/* set class hint */
classhint.res_name = "test";
classhint.res_class = "Test";
@@ -138,7 +142,7 @@ int main(int argc, char **argv)
XSetCommand(dpy, leader, argv, argc);
/* create first window */
- newwin(NULL, 0, 0);
+ newwin(0);
XFlush(dpy);
puts("Run xprop on the test window to see the properties defined");
http://repo.or.cz/w/wmaker-crm.git/commit/0bb96cdfe7c741aba87b66ec0a34c2a67be2c463
commit 0bb96cdfe7c741aba87b66ec0a34c2a67be2c463
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 3735fc04..1511876f 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;
- }
}
}
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/MouseSettings.c | 54 +++++++++++++++++++++---------------------
WPrefs.app/WindowHandling.c | 2 +-
WPrefs.app/po/bg.po | 6 +---
WPrefs.app/po/ca.po | 6 +---
WPrefs.app/po/cs.po | 8 +----
WPrefs.app/po/de.po | 8 +----
WPrefs.app/po/es.po | 8 +----
WPrefs.app/po/fi.po | 8 +----
WPrefs.app/po/fr.po | 6 +---
WPrefs.app/po/it.po | 6 +---
WPrefs.app/po/ja.po | 7 +----
WPrefs.app/po/ko.po | 4 +--
WPrefs.app/po/ru.po | 6 +---
WPrefs.app/po/sk.po | 4 +--
WPrefs.app/po/zh_TW.po | 4 +--
m4/wm_xext_check.m4 | 31 +++++++++++++-----------
src/dock.c | 4 +--
17 files changed, 69 insertions(+), 103 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].
