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 2f0ab97c5795b0912a6a576423c68af4332d0cff (commit)
discards d1a4982d64fabf99e70ed1e184506d446168d550 (commit)
discards 218ac7adec8b20edbb4582120f26f68bc22586e9 (commit)
discards b2e193d36c222dbcfa5b0ccfa3fb5cbc436a06fa (commit)
discards 22bbf99201a8c17eb0d36c3914a267382d0ba659 (commit)
discards b61141322db2aba56dcf18b748dd45f7dec9dab0 (commit)
via a3f2e4b87da3339803e56255b3cfa963ea662958 (commit)
via 73e0a088b692f5fa04842c6d1571526e16bf10fb (commit)
via 424144254ea7d3b73606e00d3d4ed3a566afc121 (commit)
via 415a436f77e31a5962c8ff8b9d2ff31f9cc22834 (commit)
via 2f702495702ed26ba05181ddac6d18d8fee67ba0 (commit)
via 3dcd0df42c743098a6b8f5c65889c62d093814f6 (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 (2f0ab97c5795b0912a6a576423c68af4332d0cff)
N -- N -- N (a3f2e4b87da3339803e56255b3cfa963ea662958)
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/a3f2e4b87da3339803e56255b3cfa963ea662958
commit a3f2e4b87da3339803e56255b3cfa963ea662958
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:44 2014 +0100
util: remove local constants GLOBAL_DEFAULTS_SUBDIR that are not used
As pointed by gcc, this macro is not used anywhere in the 2 files. Because
the code also suggests that they should be inherited from any other place
anyway, remove them from the file to prevent them from being used in the
future.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/util/getstyle.c b/util/getstyle.c
index da211acb..f0de4c49 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -54,9 +54,6 @@
#include "../src/wconfig.h"
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
/* table of style related options */
static char *options[] = {
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index aee1b567..7253517e 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -53,9 +53,6 @@
#include "../src/wconfig.h"
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
#include <WINGs/WINGs.h>
#include <wraster.h>
http://repo.or.cz/w/wmaker-crm.git/commit/73e0a088b692f5fa04842c6d1571526e16bf10fb
commit 73e0a088b692f5fa04842c6d1571526e16bf10fb
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:43 2014 +0100
WPrefs: remove unused constants ICON_TITLE_*FONT
Apparently, there was a time when it was though to add a label below (?)
the icons of the list of panels, but this has never been finished and the
unfinished code to do this was even removed in commit
0e01e6920572b3d3a7a8df2872513144225440a8
So, as it is unlikely that the "feature" will return, and if it did the
font should be handled in a better way, this patch removes the definition
of the constants with the names for the font used for those labels.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index c3274ee3..02b06d0e 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -29,9 +29,6 @@
#endif
-#define ICON_TITLE_FONT "sans serif:pixelsize=9"
-#define ICON_TITLE_VFONT "sans serif:pixelsize=9:weight=100"
-
#define MAX_SECTIONS 16
typedef struct _WPrefs {
http://repo.or.cz/w/wmaker-crm.git/commit/424144254ea7d3b73606e00d3d4ed3a566afc121
commit 424144254ea7d3b73606e00d3d4ed3a566afc121
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:42 2014 +0100
wmaker: comment out definition of wm-spec constant that we do not use
Include a comment to explain what their aim is, and why WindowMaker is not
making use of them. They are not simply removed because it is informative
for future contributors that we know about them and we purposedly decided
to not use them.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/src/wmspec.c b/src/wmspec.c
index d6bb61c6..89d8fac6 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -217,6 +217,22 @@ static atomitem_t atomNames[] = {
#define _NET_WM_STATE_ADD 1
#define _NET_WM_STATE_TOGGLE 2
+#if 0
+/*
+ * These constant provide information on the kind of window move/resize when
+ * it is initiated by the application instead of by WindowMaker. They are
+ * parameter for the client message _NET_WM_MOVERESIZE, as defined by the
+ * FreeDesktop wm-spec standard:
+ * http://standards.freedesktop.org/wm-spec/1.5/ar01s04.html
+ *
+ * Today, WindowMaker does not support this at all (the corresponding Atom
+ * is not added to the list in setSupportedHints), probably because there is
+ * nothing it needs to do about it, the application is assumed to know what
+ * it is doing, and WindowMaker won't get in the way.
+ *
+ * The definition of the constants (taken from the standard) are disabled to
+ * avoid a spurious warning (-Wunused-macros).
+ */
#define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0
#define _NET_WM_MOVERESIZE_SIZE_TOP 1
#define _NET_WM_MOVERESIZE_SIZE_TOPRIGHT 2
@@ -228,6 +244,7 @@ static atomitem_t atomNames[] = {
#define _NET_WM_MOVERESIZE_MOVE 8 /* movement only */
#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 /* size via keyboard */
#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */
+#endif
static void observer(void *self, WMNotification *notif);
static void wsobserver(void *self, WMNotification *notif);
http://repo.or.cz/w/wmaker-crm.git/commit/415a436f77e31a5962c8ff8b9d2ff31f9cc22834
commit 415a436f77e31a5962c8ff8b9d2ff31f9cc22834
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:41 2014 +0100
wmaker: remove parameter 'which' from local function 'restoreMenu'
This parameter is given always the same value, so there is not reason to
keep it. The code is updated to take this value into account, and the
related constants are removed.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/src/menu.c b/src/menu.c
index e573b395..8322dbb1 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,10 +56,6 @@
/***** Local Stuff ******/
-#define WSS_ROOTMENU (1<<0)
-#define WSS_SWITCHMENU (1<<1)
-#define WSS_WSMENU (1<<2)
-
static struct {
int steps;
int delay;
@@ -2382,7 +2378,7 @@ static Bool getMenuInfo(WMPropList * info, int *x, int
*y, Bool * lowered)
return True;
}
-static int restoreMenu(WScreen * scr, WMPropList * menu, int which)
+static int restoreMenu(WScreen *scr, WMPropList *menu)
{
int x, y;
Bool lowered = False;
@@ -2394,10 +2390,8 @@ static int restoreMenu(WScreen * scr, WMPropList * menu,
int which)
if (!getMenuInfo(menu, &x, &y, &lowered))
return False;
- if (which & WSS_SWITCHMENU) {
- OpenSwitchMenu(scr, x, y, False);
- pmenu = scr->switch_menu;
- }
+ OpenSwitchMenu(scr, x, y, False);
+ pmenu = scr->switch_menu;
if (pmenu) {
int width = MENUW(pmenu);
@@ -2508,7 +2502,7 @@ void wMenuRestoreState(WScreen * scr)
skey = WMCreatePLString("SwitchMenu");
menu = WMGetFromPLDictionary(menus, skey);
WMReleasePropList(skey);
- restoreMenu(scr, menu, WSS_SWITCHMENU);
+ restoreMenu(scr, menu);
if (!scr->root_menu) {
OpenRootMenu(scr, scr->scr_width * 2, 0, False);
http://repo.or.cz/w/wmaker-crm.git/commit/2f702495702ed26ba05181ddac6d18d8fee67ba0
commit 2f702495702ed26ba05181ddac6d18d8fee67ba0
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:40 2014 +0100
wmaker: remove constants HORIZONTAL and VERTICAL from moveres.c
These 2 constants have been defined at the beginning of the project, but
where never used later. As the use of the associated constants suggests
that they are not bringing anything useful, this patch simply removes them.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/src/moveres.c b/src/moveres.c
index 8640511c..b271f324 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -50,10 +50,8 @@
#define LEFT 1
#define RIGHT 2
-#define HORIZONTAL (LEFT|RIGHT)
#define UP 4
#define DOWN 8
-#define VERTICAL (UP|DOWN)
/* True if window currently has a border. This also includes borderless
* windows which are currently selected
@@ -2268,10 +2266,8 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
#undef LEFT
#undef RIGHT
-#undef HORIZONTAL
#undef UP
#undef DOWN
-#undef VERTICAL
#undef HCONSTRAIN
#undef RESIZEBAR
http://repo.or.cz/w/wmaker-crm.git/commit/3dcd0df42c743098a6b8f5c65889c62d093814f6
commit 3dcd0df42c743098a6b8f5c65889c62d093814f6
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Dec 8 22:42:39 2014 +0100
wmaker: add code to explicitly ignore Motif-WM flags we don't want to handle
The goal is to explain the reason why we don't do anything about them, so
people looking at the code in the future will know why it is this way. The
expected side effect is also to silent warnings [-Wunused-macros] from gcc.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/src/motif.c b/src/motif.c
index 5fca916b..7eaba31c 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -92,6 +92,16 @@ static void setupMWMHints(WWindow *wwin, MWMHints *mwm_hints)
WSETUFLAG(wwin, no_resizable, 0);
}
+ if (mwm_hints->decorations & MWM_DECOR_BORDER) {
+ /*
+ * WindowMaker is drawing only a discreet 1 pixel
border without
+ * any decoration like a few other X window managers
used to do, so
+ * we assume it is not worth spending the time to add
extra
+ * complexity to handle this special request,
considering also that
+ * the Motif toolkit is not used anymore nowadays.
+ */
+ }
+
if (mwm_hints->decorations & MWM_DECOR_RESIZEH)
WSETUFLAG(wwin, no_resizebar, 0);
@@ -101,10 +111,26 @@ static void setupMWMHints(WWindow *wwin, MWMHints
*mwm_hints)
WSETUFLAG(wwin, no_closable, 0);
}
+ if (mwm_hints->decorations * MWM_DECOR_MENU) {
+ /*
+ * WindowMaker does not include a button to display the
menu
+ * for windows, this is done using right mouse button
on the
+ * title bar. As a consequence, we ignore this flag
because we
+ * have nothing to hide.
+ */
+ }
+
if (mwm_hints->decorations & MWM_DECOR_MINIMIZE) {
WSETUFLAG(wwin, no_miniaturize_button, 0);
WSETUFLAG(wwin, no_miniaturizable, 0);
}
+
+ if (mwm_hints->decorations & MWM_DECOR_MAXIMIZE) {
+ /*
+ * WindowMaker does not display a button to maximize
windows,
+ * so we don't need to hide anything more for that flag
+ */
+ }
}
if (mwm_hints->flags & MWM_HINTS_FUNCTIONS) {
@@ -120,6 +146,13 @@ static void setupMWMHints(WWindow *wwin, MWMHints
*mwm_hints)
if (mwm_hints->functions & MWM_FUNC_RESIZE)
WSETUFLAG(wwin, no_resizable, 0);
+ if (mwm_hints->functions & MWM_FUNC_MOVE) {
+ /*
+ * WindowMaker does not allow a window to not be moved,
and this
+ * is a good thing, so we explicitly ignore this flag.
+ */
+ }
+
if (mwm_hints->functions & MWM_FUNC_MINIMIZE)
WSETUFLAG(wwin, no_miniaturizable, 0);
-----------------------------------------------------------------------
Summary of changes:
src/motif.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
