diff --git a/src/event.c b/src/event.c index d31ba352..be98466d 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 48fd5b3c..598f6029 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 f4383856..6231e067 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 e7ed8557..497b5267 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 27decbde..c9ae4c56 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 91ad63f5..c7f41d0b 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"