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 6bdc1318c1c5abdeca449c0c6ace3f78eac4dbb0 (commit)
via ebbc5c48ba5ec97f2afb4c789f120626b0415fea (commit)
via da4e4128b363592cdcf966210bb34dfc021c8d66 (commit)
from 254c00ba6f95362487369a2453b8bc88fc6bd117 (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/6bdc1318c1c5abdeca449c0c6ace3f78eac4dbb0
commit 6bdc1318c1c5abdeca449c0c6ace3f78eac4dbb0
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jun 24 12:35:24 2012 +0200
Moving header functions to main.h
The functions of main.c should be included in main.h, not in funcs.h.
This patch adds the main.h file and moves the function prototypes to
this file.
The not needed "include funcs.h" are removed.
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 745cd42..5388fdd 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -448,19 +448,12 @@ typedef struct WPreferences {
} flags; /* internal flags */
} WPreferences;
-
-
/****** Global Variables ******/
extern Display *dpy;
extern unsigned int ValidModMask;
extern char WProgramState;
extern char WProgramSigState;
-
-/****** Global Functions ******/
-extern void wAbort(Bool dumpCore);
-
-
/****** Notifications ******/
extern const char *WMNManaged;
extern const char *WMNUnmanaged;
@@ -477,4 +470,3 @@ extern const char *WMNWorkspaceNameChanged;
extern const char *WMNResetStacking;
#endif
-
diff --git a/src/appicon.c b/src/appicon.c
index 6e6b87a..546c3ac 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -38,7 +38,7 @@
#include "actions.h"
#include "stacking.h"
#include "dock.h"
-#include "funcs.h"
+#include "main.h"
#include "defaults.h"
#include "workspace.h"
#include "superfluous.h"
diff --git a/src/defaults.c b/src/defaults.c
index 86edfa4..e512a8b 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -56,7 +56,7 @@
#include "keybind.h"
#include "xmodifier.h"
#include "icon.h"
-#include "funcs.h"
+#include "main.h"
#include "actions.h"
#include "dock.h"
#include "workspace.h"
diff --git a/src/dock.c b/src/dock.c
index 193bc01..d5d5003 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -45,7 +45,7 @@
#include "dock.h"
#include "dockedapp.h"
#include "dialog.h"
-#include "funcs.h"
+#include "main.h"
#include "properties.h"
#include "menu.h"
#include "client.h"
diff --git a/src/event.c b/src/event.c
index be98466..8e287d1 100644
--- a/src/event.c
+++ b/src/event.c
@@ -54,7 +54,7 @@
#include "window.h"
#include "actions.h"
#include "client.h"
-#include "funcs.h"
+#include "main.h"
#include "keybind.h"
#include "application.h"
#include "stacking.h"
diff --git a/src/funcs.h b/src/funcs.h
index 598f602..ff6ee6c 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -32,9 +32,6 @@ typedef void (WDeathHandler)(pid_t pid, unsigned int status,
void *cdata);
void Shutdown(WShutdownMode mode);
void RestoreDesktop(WScreen *scr);
-void Exit(int status) __attribute__((noreturn));
-void Restart(char *manager, Bool abortOnFailure);
-void SetupEnvironment(WScreen *scr);
void DispatchEvent(XEvent *event);
void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
@@ -52,8 +49,6 @@ void PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int
head);
void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool
class_only);
void SendHelperMessage(WScreen *scr, char type, int workspace, char *msg);
void UnescapeWM_CLASS(char *str, char **name, char **class);
-void ExecuteShellCommand(WScreen *scr, char *command);
-void ExecExitScript();
void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned int width, unsigned int height);
@@ -84,7 +79,6 @@ char * FindImage(char *paths, char *file);
char * GetShortcutString(char *text);
char * EscapeWM_CLASS(char *name, char *class);
-Bool RelaunchWindow(WWindow *wwin);
Bool IsDoubleClick(WScreen *scr, XEvent *event);
Bool UpdateDomainFile(WDDomain *domain);
diff --git a/src/main.c b/src/main.c
index 431d41b..169f830 100644
--- a/src/main.c
+++ b/src/main.c
@@ -485,7 +485,7 @@ void wAbort(Bool dumpCore)
exit(1);
}
-void print_help()
+static void print_help(void)
{
printf(_("Usage: %s [options]n"), ProgName);
puts(_("The Window Maker window manager for the X window system"));
@@ -511,7 +511,7 @@ void print_help()
puts(_(" --help show this message"));
}
-void check_defaults()
+static void check_defaults(void)
{
char *path;
@@ -537,7 +537,7 @@ void check_defaults()
* files have changed, using linux kernel inotify mechanism
*/
-static void inotifyWatchConfig()
+static void inotifyWatchConfig(void)
{
char *watchPath = NULL;
inotifyFD = inotify_init(); /* Initialise an inotify instance */
@@ -563,7 +563,7 @@ static void inotifyWatchConfig()
}
#endif /* HAVE_INOTIFY */
-static void execInitScript()
+static void execInitScript(void)
{
char *file, *paths;
@@ -581,7 +581,7 @@ static void execInitScript()
}
}
-void ExecExitScript()
+void ExecExitScript(void)
{
char *file, *paths;
diff --git a/src/main.h b/src/main.h
new file mode 100644
index 0000000..d40a743
--- /dev/null
+++ b/src/main.h
@@ -0,0 +1,33 @@
+/*
+ * Window Maker window manager
+ *
+ * Copyright (c) 1997-2003 Alfredo K. Kojima
+ * Copyright (c) 1998-2003 Dan Pascu
+ *
+ * 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.
+ */
+
+#ifndef WMMAIN_H_
+#define WMMAIN_H_
+
+void Exit(int status) __attribute__((noreturn));
+void Restart(char *manager, Bool abortOnFailure);
+void SetupEnvironment(WScreen *scr);
+void ExecuteShellCommand(WScreen *scr, char *command);
+Bool RelaunchWindow(WWindow *wwin);
+void wAbort(Bool dumpCore);
+void ExecExitScript(void);
+
+#endif
diff --git a/src/monitor.c b/src/monitor.c
index 355aba9..ecf05b9 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -37,7 +37,7 @@
#include "screen.h"
#include "window.h"
#include "dialog.h"
-#include "funcs.h"
+#include "main.h"
/****** Global Variables ******/
extern WPreferences wPreferences;
diff --git a/src/rootmenu.c b/src/rootmenu.c
index c32411d..6c4bb2d 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -42,6 +42,7 @@
#include "actions.h"
#include "menu.h"
#include "funcs.h"
+#include "main.h"
#include "dialog.h"
#include "keybind.h"
#include "stacking.h"
diff --git a/src/screen.c b/src/screen.c
index c9ae4c5..2efe7c3 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -46,6 +46,7 @@
#include "pixmap.h"
#include "menu.h"
#include "funcs.h"
+#include "main.h"
#include "actions.h"
#include "properties.h"
#include "dock.h"
diff --git a/src/session.c b/src/session.c
index 421150b..703b5fa 100644
--- a/src/session.c
+++ b/src/session.c
@@ -76,7 +76,7 @@
#include "session.h"
#include "framewin.h"
#include "workspace.h"
-#include "funcs.h"
+#include "main.h"
#include "properties.h"
#include "application.h"
#include "appicon.h"
diff --git a/src/shutdown.c b/src/shutdown.c
index 0cf9ab7..6d87306 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -31,6 +31,7 @@
#include "window.h"
#include "client.h"
#include "funcs.h"
+#include "main.h"
#include "properties.h"
#include "session.h"
#include "winspector.h"
diff --git a/src/startup.c b/src/startup.c
index 190cd92..ac7baa4 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -55,7 +55,7 @@
#include "window.h"
#include "actions.h"
#include "client.h"
-#include "funcs.h"
+#include "main.h"
#include "dock.h"
#include "workspace.h"
#include "keybind.h"
diff --git a/src/winmenu.c b/src/winmenu.c
index 4e2b64f..96609aa 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -33,7 +33,7 @@
#include "WindowMaker.h"
#include "actions.h"
#include "menu.h"
-#include "funcs.h"
+#include "main.h"
#include "window.h"
#include "client.h"
#include "application.h"
http://repo.or.cz/w/wmaker-crm.git/commit/ebbc5c48ba5ec97f2afb4c789f120626b0415fea
commit ebbc5c48ba5ec97f2afb4c789f120626b0415fea
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jun 24 11:11:46 2012 +0200
XKeycodeToKeysym deprecated function
The function XKeycodeToKeysym is deprecated and should be replaced
by XkbKeycodeToKeysym.
diff --git a/src/winmenu.c b/src/winmenu.c
index c967164..4e2b64f 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -28,6 +28,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/XKBlib.h>
#include "WindowMaker.h"
#include "actions.h"
@@ -246,7 +247,7 @@ static void updateWorkspaceMenu(WMenu * menu)
static char *getShortcutString(WShortKey key)
{
char *tmp = NULL;
- char *k = XKeysymToString(XKeycodeToKeysym(dpy, key.keycode, 0));
+ char *k = XKeysymToString(XkbKeycodeToKeysym(dpy, key.keycode, 0, 0));
if (!k) return NULL;
char **m = wPreferences.modifier_labels;
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 7bae013..7642443 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -33,6 +33,7 @@ Perpetrator: Sudish Joseph <[email protected]>, Sept.
1997. */
#include <strings.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
+#include <X11/XKBlib.h>
#include <WINGs/WUtil.h>
#include "xmodifier.h"
@@ -160,7 +161,7 @@ static void x_reset_modifier_mapping(Display * display)
for (column = 0; column < 4; column += 2) {
KeyCode code =
x_modifier_keymap->modifiermap[modifier_index * mkpm
+
modifier_key];
- KeySym sym = (code ? XKeycodeToKeysym(display,
code, column) : 0);
+ KeySym sym = (code ?
XkbKeycodeToKeysym(display, code, 0, column) : 0);
if (sym == last_sym)
continue;
last_sym = sym;
http://repo.or.cz/w/wmaker-crm.git/commit/da4e4128b363592cdcf966210bb34dfc021c8d66
commit da4e4128b363592cdcf966210bb34dfc021c8d66
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jun 24 10:48:22 2012 +0200
rootmenu header file updated
The contents of the rootmenu.h file are not used and can be removed,
but the prototypes of rootmenu.c are in funcs.h and should be moved
to the correct (rootmenu.h) file.
diff --git a/src/event.c b/src/event.c
index d31ba35..be98466 100644
--- a/src/event.c
+++ b/src/event.c
@@ -66,6 +66,7 @@
#include "balloon.h"
#include "xinerama.h"
#include "wmspec.h"
+#include "rootmenu.h"
/******** Global Variables **********/
extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index 48fd5b3..598f602 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -37,8 +37,6 @@ void Restart(char *manager, Bool abortOnFailure);
void SetupEnvironment(WScreen *scr);
void DispatchEvent(XEvent *event);
void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
-void wRootMenuBindShortcuts(Window window);
-void OpenRootMenu(WScreen *scr, int x, int y, int keyboard);
void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
void InitializeSwitchMenu(void);
void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
@@ -86,7 +84,6 @@ char * FindImage(char *paths, char *file);
char * GetShortcutString(char *text);
char * EscapeWM_CLASS(char *name, char *class);
-Bool wRootMenuPerformShortcut(XEvent *event);
Bool RelaunchWindow(WWindow *wwin);
Bool IsDoubleClick(WScreen *scr, XEvent *event);
Bool UpdateDomainFile(WDDomain *domain);
diff --git a/src/menu.c b/src/menu.c
index f438385..6231e06 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -42,6 +42,7 @@
#include "xinerama.h"
#include "workspace.h"
#include "dialog.h"
+#include "rootmenu.h"
/****** Global Variables ******/
diff --git a/src/rootmenu.h b/src/rootmenu.h
index e7ed855..497b526 100644
--- a/src/rootmenu.h
+++ b/src/rootmenu.h
@@ -22,23 +22,8 @@
#ifndef WMROOTMENU_H
#define WMROOTMENU_H
-#include "WindowMaker.h"
-
-
-typedef void *WRootMenuData;
-
-
-typedef struct _WRootMenuReader {
- Bool (*checkMenuChange)(char *path, time_t lastAccessTime);
-
- WRootMenuData (*openMenuFile)(char *path);
- Bool (*hasMoreData)(WRootMenuData *data);
- Bool (*nextCommand)(WRootMenuData *data,
- char **title,
- char **command,
- char **parameter,
- char **shortcut);
- void (*closeMenuFile)(WRootMenuData *data);
-} WRootMenuReader;
+Bool wRootMenuPerformShortcut(XEvent * event);
+void wRootMenuBindShortcuts(Window window);
+void OpenRootMenu(WScreen * scr, int x, int y, int keyboard);
#endif /* WMROOTMENU_H */
diff --git a/src/screen.c b/src/screen.c
index 27decbd..c9ae4c5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -55,6 +55,7 @@
#include "balloon.h"
#include "geomview.h"
#include "wmspec.h"
+#include "rootmenu.h"
#include "xinerama.h"
diff --git a/src/window.c b/src/window.c
index 91ad63f..c7f41d0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -58,6 +58,7 @@
#include "appmenu.h"
#include "appicon.h"
#include "superfluous.h"
+#include "rootmenu.h"
#ifdef MWM_HINTS
# include "motif.h"
-----------------------------------------------------------------------
Summary of changes:
src/WindowMaker.h | 8 --------
src/appicon.c | 2 +-
src/defaults.c | 2 +-
src/dock.c | 2 +-
src/event.c | 3 ++-
src/funcs.h | 9 ---------
src/main.c | 10 +++++-----
src/{resources.h => main.h} | 14 ++++++++++----
src/menu.c | 1 +
src/monitor.c | 2 +-
src/rootmenu.c | 1 +
src/rootmenu.h | 21 +++------------------
src/screen.c | 2 ++
src/session.c | 2 +-
src/shutdown.c | 1 +
src/startup.c | 2 +-
src/window.c | 1 +
src/winmenu.c | 5 +++--
src/xmodifier.c | 3 ++-
19 files changed, 37 insertions(+), 54 deletions(-)
copy src/{resources.h => main.h} (69%)
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].
