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 b9caaa8729fe39848308ce13e5a140f18f0b9102 (commit)
via 73d75fa848ce44ce3727de6018f991242c1fad10 (commit)
via cba94da2cf97dddb190275cde367dbd471a5381e (commit)
via 68208a01a0ae6200ef594fc8880430eff6f37882 (commit)
via b71f2c30fdb0b9e337987379a22bdde03c5bfd84 (commit)
via c058af6d354fd57ddc4dcae829a407c11de9a2ea (commit)
from 0b74ae41944dbec80e7a26bd02312d4ae6cebff7 (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/b9caaa8729fe39848308ce13e5a140f18f0b9102
commit b9caaa8729fe39848308ce13e5a140f18f0b9102
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Tue Jan 8 16:58:04 2013 +0100
WINGs: New function W_setconf_doubleClickDelay
The new function W_setconf_doubleClickDelay() sets the value for
WPreferences.W_setconf_doubleClickDelay(), therefore the private
data of WPreferences struct is not used.
This call is used at defaults.c to set the doubleClickDelay().
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index d9aba8c..5682dfa 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1833,6 +1833,7 @@ WMFont* WMGetFontPanelFont(WMFontPanel *panel);
/* ---[ WINGs/configuration.c ]------------------------------------------- */
unsigned W_getconf_mouseWheelUp(void);
unsigned W_getconf_mouseWheelDown(void);
+void W_setconf_doubleClickDelay(int value);
#ifdef __cplusplus
}
diff --git a/WINGs/configuration.c b/WINGs/configuration.c
index 2f56aa8..8e53ba6 100644
--- a/WINGs/configuration.c
+++ b/WINGs/configuration.c
@@ -125,3 +125,8 @@ unsigned W_getconf_mouseWheelDown(void)
{
return WINGsConfiguration.mouseWheelDown;
}
+
+void W_setconf_doubleClickDelay(int value)
+{
+ WINGsConfiguration.doubleClickDelay = value;
+}
diff --git a/src/defaults.c b/src/defaults.c
index 13c5d69..f04e9be 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2985,22 +2985,12 @@ static int setModifierKeyLabels(WScreen * scr,
WDefaultEntry * entry, WMPropList
return 0;
}
-/*
- * Very ugly kluge.
- * Need access to the double click variables, so that all widgets in
- * wmaker panels will have the same dbl-click values.
- * TODO: figure a better way of dealing with it.
- */
-#include <WINGs/WINGsP.h>
-
-static int setDoubleClick(WScreen * scr, WDefaultEntry * entry, int *value,
void *foo)
+static int setDoubleClick(WScreen *scr, WDefaultEntry *entry, int *value, void
*foo)
{
- extern _WINGsConfiguration WINGsConfiguration;
-
if (*value <= 0)
*(int *)foo = 1;
- WINGsConfiguration.doubleClickDelay = *value;
+ W_setconf_doubleClickDelay(*value);
return 0;
}
http://repo.or.cz/w/wmaker-crm.git/commit/73d75fa848ce44ce3727de6018f991242c1fad10
commit 73d75fa848ce44ce3727de6018f991242c1fad10
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Tue Jan 8 16:58:03 2013 +0100
Don't access to private WINGs info
From the BALATON Zoltan comment:
If the P in WINGsP.h stands for Private then no files outside of WINGs
should include it. If WINGsConfiguration is an internal structure of
WINGs then only accessor methods should be used outside of WINGs.
This patch uses the new functions to read the WINGs configuration, not
using the internal library data.
diff --git a/src/window.c b/src/window.c
index 47d280c..6c2ae26 100644
--- a/src/window.c
+++ b/src/window.c
@@ -36,7 +36,7 @@
#include <math.h>
/* For getting mouse wheel mappings from WINGs */
-#include <WINGs/WINGsP.h>
+#include <WINGs/WINGs.h>
#include "WindowMaker.h"
#include "GNUstep.h"
@@ -2735,9 +2735,9 @@ static void titlebarDblClick(WCoreWindow *sender, void
*data, XEvent *event)
wHideOtherApplications(wwin);
} else if (event->xbutton.button == Button2) {
wSelectWindow(wwin, !wwin->flags.selected);
- } else if (event->xbutton.button == WINGsConfiguration.mouseWheelUp) {
+ } else if (event->xbutton.button == W_getconf_mouseWheelUp()) {
wShadeWindow(wwin);
- } else if (event->xbutton.button == WINGsConfiguration.mouseWheelDown) {
+ } else if (event->xbutton.button == W_getconf_mouseWheelDown()) {
wUnshadeWindow(wwin);
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/cba94da2cf97dddb190275cde367dbd471a5381e
commit cba94da2cf97dddb190275cde367dbd471a5381e
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Tue Jan 8 16:58:02 2013 +0100
WINGs: Functions to read the Mouse Wheel conf
These new functions:
unsigned W_getconf_mouseWheelUp(void);
unsigned W_getconf_mouseWheelDown(void);
returns the WINGs configuration for the Mouse Wheel Up and Down
values.
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 1e82e40..d9aba8c 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1830,6 +1830,10 @@ void WMSetFontPanelFont(WMFontPanel *panel, char
*fontName);
WMFont* WMGetFontPanelFont(WMFontPanel *panel);
+/* ---[ WINGs/configuration.c ]------------------------------------------- */
+unsigned W_getconf_mouseWheelUp(void);
+unsigned W_getconf_mouseWheelDown(void);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/WINGs/configuration.c b/WINGs/configuration.c
index c354ebc..2f56aa8 100644
--- a/WINGs/configuration.c
+++ b/WINGs/configuration.c
@@ -115,3 +115,13 @@ void W_ReadConfigurations(void)
}
}
+
+unsigned W_getconf_mouseWheelUp(void)
+{
+ return WINGsConfiguration.mouseWheelUp;
+}
+
+unsigned W_getconf_mouseWheelDown(void)
+{
+ return WINGsConfiguration.mouseWheelDown;
+}
http://repo.or.cz/w/wmaker-crm.git/commit/68208a01a0ae6200ef594fc8880430eff6f37882
commit 68208a01a0ae6200ef594fc8880430eff6f37882
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Tue Jan 8 09:08:26 2013 +0100
New shutdown.h file
The new shutdown.h file includes the shutdown modes and the functions
to shutdown Window Maker.
The function definitios were moved from funcs.h and the struct WShutdownMode
from WindowMaker.h.
Now, externs are not needed, only include shutdown.h
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ee6dbf9..039a67b 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -87,16 +87,6 @@ typedef struct WObjDescriptor {
void *parent; /* parent object (WWindow or WMenu) */
} WObjDescriptor;
-
-/* shutdown modes */
-typedef enum {
- WSExitMode,
- WSLogoutMode,
- WSKillMode,
- WSRestartPreparationMode
-} WShutdownMode;
-
-
/* internal buttons */
#define WBUT_CLOSE 0
#define WBUT_BROKENCLOSE 1
diff --git a/src/event.c b/src/event.c
index 2ac11f3..ace2a3c 100644
--- a/src/event.c
+++ b/src/event.c
@@ -69,6 +69,7 @@
#include "rootmenu.h"
#include "colormap.h"
#include "screen.h"
+#include "shutdown.h"
/******** Global Variables **********/
extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index 24c6c94..a7df6cb 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -30,8 +30,6 @@
typedef void (WCallBack)(void *cdata);
typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-void Shutdown(WShutdownMode mode);
-void RestoreDesktop(WScreen *scr);
void DispatchEvent(XEvent *event);
void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
diff --git a/src/main.c b/src/main.c
index 51808b0..f63b1a6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -50,6 +50,7 @@
#include "keybind.h"
#include "xmodifier.h"
#include "session.h"
+#include "shutdown.h"
#include "dialog.h"
#include <WINGs/WUtil.h>
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 2fcd0ae..0b263cd 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -50,6 +50,7 @@
#include "defaults.h"
#include "framewin.h"
#include "session.h"
+#include "shutdown.h"
#include "xmodifier.h"
#include <WINGs/WUtil.h>
diff --git a/src/shutdown.c b/src/shutdown.c
index d86bd0d..67c39ab 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -37,6 +37,7 @@
#include "winspector.h"
#include "wmspec.h"
#include "colormap.h"
+#include "shutdown.h"
extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
diff --git a/src/shutdown.h b/src/shutdown.h
new file mode 100644
index 0000000..a88398f
--- /dev/null
+++ b/src/shutdown.h
@@ -0,0 +1,31 @@
+/* shutdown.c - Shutdown functions
+ *
+ * Window Maker window manager
+ *
+ * Copyright (c) 2013 Window Maker Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
+ */
+
+/* shutdown modes */
+typedef enum {
+ WSExitMode,
+ WSLogoutMode,
+ WSKillMode,
+ WSRestartPreparationMode
+} WShutdownMode;
+
+void Shutdown(WShutdownMode mode);
+void RestoreDesktop(WScreen *scr);
http://repo.or.cz/w/wmaker-crm.git/commit/b71f2c30fdb0b9e337987379a22bdde03c5bfd84
commit b71f2c30fdb0b9e337987379a22bdde03c5bfd84
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Tue Jan 8 09:08:24 2013 +0100
Removed XRANDR externs
This patch moves the XRANDR variable definitions to screen.h, because
xrandr is related to screen behavior. Then, the definition externs
can be removed.
This patch also changes (in event.c) the ConfigureNotify event processing
to avoid call the "if" block if XRANDR is not enabled. I chose the option of
move the if into the HAVE_XRANDR block instead of include the
ConfigureNotify case inside of the HAVE_XRANDR block (proposed by
BALATON Zoltan) to avoid call the default option if not needed.
diff --git a/src/event.c b/src/event.c
index 53d5acf..2ac11f3 100644
--- a/src/event.c
+++ b/src/event.c
@@ -68,6 +68,7 @@
#include "wmspec.h"
#include "rootmenu.h"
#include "colormap.h"
+#include "screen.h"
/******** Global Variables **********/
extern XContext wWinContext;
@@ -104,14 +105,6 @@ extern int wShapeEventBase;
extern int wXkbEventBase;
#endif
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
-/* special flags */
-/*extern char WDelayedActionSet;*/
-
/************ Local stuff ***********/
static void saveTimestamp(XEvent *event);
@@ -301,11 +294,10 @@ void DispatchEvent(XEvent * event)
break;
case ConfigureNotify:
- if (event->xconfigure.window == DefaultRootWindow(dpy)) {
#ifdef HAVE_XRANDR
- XRRUpdateConfiguration(event);
+ if (event->xconfigure.window == DefaultRootWindow(dpy))
+ XRRUpdateConfiguration(event);
#endif
- }
break;
default:
diff --git a/src/main.c b/src/main.c
index b09b6ef..51808b0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -139,11 +139,6 @@ Bool wXkbSupported;
int wXkbEventBase;
#endif
-#ifdef HAVE_XRANDR
-Bool has_randr;
-int randr_event_base;
-#endif
-
/* special flags */
char WProgramSigState = 0;
char WProgramState = WSTATE_NORMAL;
diff --git a/src/screen.c b/src/screen.c
index ecdb498..bc8f3fa 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -80,9 +80,6 @@ extern int wScreenCount;
#ifdef KEEP_XKB_LOCK_STATUS
extern int wXkbSupported;
#endif
-#ifdef HAVE_XRANDR
-extern int has_randr;
-#endif
extern WDDomain *WDWindowMaker;
diff --git a/src/screen.h b/src/screen.h
index dfdbd63..52a0c42 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -35,6 +35,10 @@
#define WTB_PFOCUSED 4
#define WTB_MENU 6
+#ifdef HAVE_XRANDR
+Bool has_randr;
+int randr_event_base;
+#endif
typedef struct {
WMRect *screens;
diff --git a/src/startup.c b/src/startup.c
index ac7baa4..e140026 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -99,11 +99,6 @@ extern Bool wXkbSupported;
extern int wXkbEventBase;
#endif
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
/* contexts */
extern XContext wWinContext;
extern XContext wAppWinContext;
http://repo.or.cz/w/wmaker-crm.git/commit/c058af6d354fd57ddc4dcae829a407c11de9a2ea
commit c058af6d354fd57ddc4dcae829a407c11de9a2ea
Author: SJS <[email protected]>
Date: Tue Jan 8 20:44:15 2013 +0000
README capitalization fix
Typo fix in the README.
diff --git a/README b/README
index cd00ea8..67c6f9e 100644
--- a/README
+++ b/README
@@ -70,7 +70,7 @@ Read before asking.
in the directories.
* INSTALL has installation instructions and some troubleshooting tips.
-You're meant to read it before installing. it was not written just to fill up
+You're meant to read it before installing. It was not written just to fill up
space in the package.
* FAQ: Frequently Asked Questions. READ IT!!! FAQ.I18N is for
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
WINGs/WINGs/WINGs.h | 5 +++++
WINGs/configuration.c | 15 +++++++++++++++
src/WindowMaker.h | 10 ----------
src/defaults.c | 14 ++------------
src/event.c | 15 ++++-----------
src/funcs.h | 2 --
src/main.c | 6 +-----
src/rootmenu.c | 1 +
src/screen.c | 3 ---
src/screen.h | 4 ++++
src/shutdown.c | 1 +
src/{motif.h => shutdown.h} | 25 ++++++++++++++-----------
src/startup.c | 5 -----
src/window.c | 6 +++---
15 files changed, 51 insertions(+), 63 deletions(-)
copy src/{motif.h => shutdown.h} (59%)
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].
