summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gnome/50-compiz-desktop-key.xml.in10
-rw-r--r--gtk/window-decorator/gtk-window-decorator.c50
-rw-r--r--include/core/atoms.h2
-rw-r--r--kde/window-decorator-kde4/decorator.cpp9
-rw-r--r--kde/window-decorator-kde4/utils.cpp6
-rw-r--r--kde/window-decorator-kde4/utils.h2
-rw-r--r--metadata/core.xml.in39
-rw-r--r--src/actions.cpp65
-rw-r--r--src/atoms.cpp6
-rw-r--r--src/privatescreen.h126
-rw-r--r--src/screen.cpp11
11 files changed, 65 insertions, 261 deletions
diff --git a/gtk/gnome/50-compiz-desktop-key.xml.in b/gtk/gnome/50-compiz-desktop-key.xml.in
index 1559d03..083d5e1 100644
--- a/gtk/gnome/50-compiz-desktop-key.xml.in
+++ b/gtk/gnome/50-compiz-desktop-key.xml.in
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/options/run_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/main_menu_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/options/main_menu_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_screenshot_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_window_screenshot_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_terminal_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
</KeyListEntries>
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index cdcc4d6..b34c06e 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -319,10 +319,6 @@ static Atom toolkit_action_run_dialog_atom;
static Atom toolkit_action_window_menu_atom;
static Atom toolkit_action_force_quit_dialog_atom;
-static Atom panel_action_atom;
-static Atom panel_action_main_menu_atom;
-static Atom panel_action_run_dialog_atom;
-
static Time dm_sn_timestamp;
#define C(name) { 0, XC_ ## name }
@@ -4944,27 +4940,6 @@ bottom_right_event (WnckWindow *win,
}
static void
-panel_action (Display *xdisplay,
- Window root,
- Atom panel_action,
- Time event_time)
-{
- XEvent ev;
-
- ev.type = ClientMessage;
- ev.xclient.window = root;
- ev.xclient.message_type = panel_action_atom;
- ev.xclient.format = 32;
- ev.xclient.data.l[0] = panel_action;
- ev.xclient.data.l[1] = event_time;
- ev.xclient.data.l[2] = 0;
- ev.xclient.data.l[3] = 0;
- ev.xclient.data.l[4] = 0;
-
- XSendEvent (xdisplay, root, FALSE, StructureNotifyMask, &ev);
-}
-
-static void
force_quit_dialog_realize (GtkWidget *dialog,
void *data)
{
@@ -5253,19 +5228,7 @@ event_filter_func (GdkXEvent *gdkxevent,
long action;
action = xevent->xclient.data.l[0];
- if (action == toolkit_action_main_menu_atom)
- {
- panel_action (xdisplay, xevent->xclient.window,
- panel_action_main_menu_atom,
- xevent->xclient.data.l[1]);
- }
- else if (action == toolkit_action_run_dialog_atom)
- {
- panel_action (xdisplay, xevent->xclient.window,
- panel_action_run_dialog_atom,
- xevent->xclient.data.l[1]);
- }
- else if (action == toolkit_action_window_menu_atom)
+ if (action == toolkit_action_window_menu_atom)
{
WnckWindow *win;
@@ -7004,23 +6967,12 @@ main (int argc, char *argv[])
toolkit_action_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION", FALSE);
- toolkit_action_main_menu_atom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", FALSE);
- toolkit_action_run_dialog_atom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", FALSE);
toolkit_action_window_menu_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", FALSE);
toolkit_action_force_quit_dialog_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
FALSE);
- panel_action_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION", FALSE);
- panel_action_main_menu_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION_MAIN_MENU", FALSE);
- panel_action_run_dialog_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION_RUN_DIALOG", FALSE);
-
status = decor_acquire_dm_session (xdisplay,
gdk_screen_get_number (gdkscreen),
"gwd", replace, &dm_sn_timestamp);
diff --git a/include/core/atoms.h b/include/core/atoms.h
index 86f2678..6cd0b50 100644
--- a/include/core/atoms.h
+++ b/include/core/atoms.h
@@ -135,8 +135,6 @@ namespace Atoms {
extern Atom xBackground[2];
extern Atom toolkitAction;
- extern Atom toolkitActionMainMenu;
- extern Atom toolkitActionRunDialog;
extern Atom toolkitActionWindowMenu;
extern Atom toolkitActionForceQuitDialog;
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 70f5d8a..f2a5bb1 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -648,15 +648,6 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
client->showWindowMenu (pos);
}
}
- else if (action == Atoms::toolkitActionMainMenuAtom)
- {
- }
- else if (action == Atoms::toolkitActionRunDialogAtom)
- {
- QDBusInterface krunner ("org.kde.krunner", "/App",
- "org.kde.krunner.App");
- krunner.call ("display");
- }
else if (action == Atoms::toolkitActionForceQuitDialogAtom)
{
if (mClients.contains (xevent->xclient.window))
diff --git a/kde/window-decorator-kde4/utils.cpp b/kde/window-decorator-kde4/utils.cpp
index 396c08d..a9ef8e4 100644
--- a/kde/window-decorator-kde4/utils.cpp
+++ b/kde/window-decorator-kde4/utils.cpp
@@ -50,8 +50,6 @@ namespace KWD
Atom wmProtocols;
Atom toolkitActionAtom;
Atom toolkitActionWindowMenuAtom;
- Atom toolkitActionMainMenuAtom;
- Atom toolkitActionRunDialogAtom;
Atom toolkitActionForceQuitDialogAtom;
Atom compizWindowBlurDecor;
}
@@ -205,10 +203,6 @@ KWD::Atoms::init (void)
toolkitActionAtom = XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION", false);
toolkitActionWindowMenuAtom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", false);
- toolkitActionMainMenuAtom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", false);
- toolkitActionRunDialogAtom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", false);
toolkitActionForceQuitDialogAtom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
false);
diff --git a/kde/window-decorator-kde4/utils.h b/kde/window-decorator-kde4/utils.h
index e43bb6f..eb0e2af 100644
--- a/kde/window-decorator-kde4/utils.h
+++ b/kde/window-decorator-kde4/utils.h
@@ -46,8 +46,6 @@ namespace KWD
extern Atom wmProtocols;
extern Atom toolkitActionAtom;
extern Atom toolkitActionWindowMenuAtom;
- extern Atom toolkitActionMainMenuAtom;
- extern Atom toolkitActionRunDialogAtom;
extern Atom toolkitActionForceQuitDialogAtom;
extern Atom compizWindowBlurDecor;
diff --git a/metadata/core.xml.in b/metadata/core.xml.in
index 5e1bdaa..6eed452 100644
--- a/metadata/core.xml.in
+++ b/metadata/core.xml.in
@@ -44,16 +44,6 @@
<_short>Close Window</_short>
<_long>Close active window</_long>
</option>
- <option name="main_menu_key" type="key">
- <_short>Show Main Menu</_short>
- <_long>Show the main menu</_long>
- <default>&lt;Alt&gt;F1</default>
- </option>
- <option name="run_key" type="key">
- <_short>Run Dialog</_short>
- <_long>Show Run Application dialog</_long>
- <default>&lt;Alt&gt;F2</default>
- </option>
<option name="command0" type="string">
<_short>Command line 0</_short>
<_long>Command line to be executed in shell when run_command0 is invoked</_long>
@@ -207,26 +197,6 @@
<_short>Maximize Window Vertically</_short>
<_long>Maximize active window vertically</_long>
</option>
- <option name="command_screenshot" type="string">
- <_short>Screenshot command line</_short>
- <_long>Screenshot command line</_long>
- <default>gnome-screenshot</default>
- </option>
- <option name="run_command_screenshot_key" type="key">
- <_short>Take a screenshot</_short>
- <_long>Take a screenshot</_long>
- <default>Print</default>
- </option>
- <option name="command_window_screenshot" type="string">
- <_short>Window screenshot command line</_short>
- <_long>Window screenshot command line</_long>
- <default>gnome-screenshot --window</default>
- </option>
- <option name="run_command_window_screenshot_key" type="key">
- <_short>Take a screenshot of a window</_short>
- <_long>Take a screenshot of a window</_long>
- <default>&lt;Alt&gt;Print</default>
- </option>
<option name="window_menu_button" type="button">
<_short>Window Menu</_short>
<_long>Window menu button binding</_long>
@@ -288,15 +258,6 @@
<_long>Ignore size increment and aspect hints when window is maximized</_long>
<default>true</default>
</option>
- <option name="command_terminal" type="string">
- <_short>Terminal command line</_short>
- <_long>Terminal command line</_long>
- <default></default>
- </option>
- <option name="run_command_terminal_key" type="key">
- <_short>Open a terminal</_short>
- <_long>Open a terminal</_long>
- </option>
<option name="ping_delay" type="int">
<_short>Ping Delay</_short>
<_long>Interval between ping messages</_long>
diff --git a/src/actions.cpp b/src/actions.cpp
index 18f41b2..8fbf6a7 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -51,38 +51,6 @@ CompScreen::closeWin (CompAction *action,
}
bool
-CompScreen::mainMenu (CompAction *action,
- CompAction::State state,
- CompOption::Vector &options)
-{
- unsigned int time;
-
- time = CompOption::getIntOptionNamed (options, "time", CurrentTime);
-
- if (screen->priv->grabs.empty ())
- screen->toolkitAction (Atoms::toolkitActionMainMenu, time,
- screen->priv->root, 0, 0, 0);
-
- return true;
-}
-
-bool
-CompScreen::runDialog (CompAction *action,
- CompAction::State state,
- CompOption::Vector &options)
-{
- unsigned int time;
-
- time = CompOption::getIntOptionNamed (options, "time", CurrentTime);
-
- if (screen->priv->grabs.empty ())
- screen->toolkitAction (Atoms::toolkitActionRunDialog, time,
- screen->priv->root , 0, 0, 0);
-
- return true;
-}
-
-bool
CompScreen::unmaximizeWin (CompAction *action,
CompAction::State state,
CompOption::Vector &options)
@@ -241,39 +209,6 @@ CompScreen::runCommandDispatch (CompAction *action,
}
bool
-CompScreen::runCommandScreenshot (CompAction *action,
- CompAction::State state,
- CompOption::Vector &options)
-{
- screen->runCommand (
- screen->priv->opt[COMP_OPTION_SCREENSHOT].value ().s ());
-
- return true;
-}
-
-bool
-CompScreen::runCommandWindowScreenshot (CompAction *action,
- CompAction::State state,
- CompOption::Vector &options)
-{
- screen->runCommand (
- screen->priv->opt[COMP_OPTION_WINDOW_SCREENSHOT].value ().s ());
-
- return true;
-}
-
-bool
-CompScreen::runCommandTerminal (CompAction *action,
- CompAction::State state,
- CompOption::Vector &options)
-{
- screen->runCommand (
- screen->priv->opt[COMP_OPTION_TERMINAL].value ().s ());
-
- return true;
-}
-
-bool
CompScreen::windowMenu (CompAction *action,
CompAction::State state,
CompOption::Vector &options)
diff --git a/src/atoms.cpp b/src/atoms.cpp
index e612250..6c7310e 100644
--- a/src/atoms.cpp
+++ b/src/atoms.cpp
@@ -132,8 +132,6 @@ namespace Atoms {
Atom xBackground[2];
Atom toolkitAction;
- Atom toolkitActionMainMenu;
- Atom toolkitActionRunDialog;
Atom toolkitActionWindowMenu;
Atom toolkitActionForceQuitDialog;
@@ -300,10 +298,6 @@ namespace Atoms {
toolkitAction =
XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION", 0);
- toolkitActionMainMenu =
- XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", 0);
- toolkitActionRunDialog =
- XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", 0);
toolkitActionWindowMenu =
XInternAtom (dpy, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", 0);
toolkitActionForceQuitDialog =
diff --git a/src/privatescreen.h b/src/privatescreen.h
index f5699b1..407d72c 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -55,73 +55,65 @@ extern bool useDesktopHints;
#define COMP_OPTION_AUTORAISE_DELAY 3
#define COMP_OPTION_CLOSE_WINDOW_KEY 4
#define COMP_OPTION_CLOSE_WINDOW_BUTTON 5
-#define COMP_OPTION_MAIN_MENU_KEY 6
-#define COMP_OPTION_RUN_DIALOG_KEY 7
-#define COMP_OPTION_COMMAND0 8
-#define COMP_OPTION_COMMAND1 9
-#define COMP_OPTION_COMMAND2 10
-#define COMP_OPTION_COMMAND3 11
-#define COMP_OPTION_COMMAND4 12
-#define COMP_OPTION_COMMAND5 13
-#define COMP_OPTION_COMMAND6 14
-#define COMP_OPTION_COMMAND7 15
-#define COMP_OPTION_COMMAND8 16
-#define COMP_OPTION_COMMAND9 17
-#define COMP_OPTION_COMMAND10 18
-#define COMP_OPTION_COMMAND11 19
-#define COMP_OPTION_RUN_COMMAND0_KEY 20
-#define COMP_OPTION_RUN_COMMAND1_KEY 21
-#define COMP_OPTION_RUN_COMMAND2_KEY 22
-#define COMP_OPTION_RUN_COMMAND3_KEY 23
-#define COMP_OPTION_RUN_COMMAND4_KEY 24
-#define COMP_OPTION_RUN_COMMAND5_KEY 25
-#define COMP_OPTION_RUN_COMMAND6_KEY 26
-#define COMP_OPTION_RUN_COMMAND7_KEY 27
-#define COMP_OPTION_RUN_COMMAND8_KEY 28
-#define COMP_OPTION_RUN_COMMAND9_KEY 29
-#define COMP_OPTION_RUN_COMMAND10_KEY 30
-#define COMP_OPTION_RUN_COMMAND11_KEY 31
-#define COMP_OPTION_RAISE_WINDOW_KEY 32
-#define COMP_OPTION_RAISE_WINDOW_BUTTON 33
-#define COMP_OPTION_LOWER_WINDOW_KEY 34
-#define COMP_OPTION_LOWER_WINDOW_BUTTON 35
-#define COMP_OPTION_UNMAXIMIZE_WINDOW_KEY 36
-#define COMP_OPTION_MINIMIZE_WINDOW_KEY 37
-#define COMP_OPTION_MINIMIZE_WINDOW_BUTTON 38
-#define COMP_OPTION_MAXIMIZE_WINDOW_KEY 39
-#define COMP_OPTION_MAXIMIZE_WINDOW_HORZ_KEY 40
-#define COMP_OPTION_MAXIMIZE_WINDOW_VERT_KEY 41
-#define COMP_OPTION_SCREENSHOT 42
-#define COMP_OPTION_RUN_SCREENSHOT_KEY 43
-#define COMP_OPTION_WINDOW_SCREENSHOT 44
-#define COMP_OPTION_RUN_WINDOW_SCREENSHOT_KEY 45
-#define COMP_OPTION_WINDOW_MENU_BUTTON 46
-#define COMP_OPTION_WINDOW_MENU_KEY 47
-#define COMP_OPTION_SHOW_DESKTOP_KEY 48
-#define COMP_OPTION_SHOW_DESKTOP_EDGE 49
-#define COMP_OPTION_RAISE_ON_CLICK 50
-#define COMP_OPTION_AUDIBLE_BELL 51
-#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_KEY 52
-#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_BUTTON 53
-#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ_KEY 54
-#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT_KEY 55
-#define COMP_OPTION_HIDE_SKIP_TASKBAR_WINDOWS 56
-#define COMP_OPTION_TOGGLE_WINDOW_SHADED_KEY 57
-#define COMP_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED 58
-#define COMP_OPTION_TERMINAL 59
-#define COMP_OPTION_RUN_TERMINAL_KEY 60
-#define COMP_OPTION_PING_DELAY 61
-#define COMP_OPTION_EDGE_DELAY 62
-#define COMP_OPTION_HSIZE 63
-#define COMP_OPTION_VSIZE 64
-#define COMP_OPTION_DEFAULT_ICON 65
-#define COMP_OPTION_NUMBER_OF_DESKTOPS 66
-#define COMP_OPTION_DETECT_OUTPUTS 67
-#define COMP_OPTION_OUTPUTS 68
-#define COMP_OPTION_OVERLAPPING_OUTPUTS 69
-#define COMP_OPTION_FOCUS_PREVENTION_LEVEL 70
-#define COMP_OPTION_FOCUS_PREVENTION_MATCH 71
-#define COMP_OPTION_NUM 72
+#define COMP_OPTION_COMMAND0 6
+#define COMP_OPTION_COMMAND1 7
+#define COMP_OPTION_COMMAND2 8
+#define COMP_OPTION_COMMAND3 9
+#define COMP_OPTION_COMMAND4 10
+#define COMP_OPTION_COMMAND5 11
+#define COMP_OPTION_COMMAND6 12
+#define COMP_OPTION_COMMAND7 13
+#define COMP_OPTION_COMMAND8 14
+#define COMP_OPTION_COMMAND9 15
+#define COMP_OPTION_COMMAND10 16
+#define COMP_OPTION_COMMAND11 17
+#define COMP_OPTION_RUN_COMMAND0_KEY 18
+#define COMP_OPTION_RUN_COMMAND1_KEY 19
+#define COMP_OPTION_RUN_COMMAND2_KEY 20
+#define COMP_OPTION_RUN_COMMAND3_KEY 21
+#define COMP_OPTION_RUN_COMMAND4_KEY 22
+#define COMP_OPTION_RUN_COMMAND5_KEY 23
+#define COMP_OPTION_RUN_COMMAND6_KEY 24
+#define COMP_OPTION_RUN_COMMAND7_KEY 25
+#define COMP_OPTION_RUN_COMMAND8_KEY 26
+#define COMP_OPTION_RUN_COMMAND9_KEY 27
+#define COMP_OPTION_RUN_COMMAND10_KEY 28
+#define COMP_OPTION_RUN_COMMAND11_KEY 29
+#define COMP_OPTION_RAISE_WINDOW_KEY 30
+#define COMP_OPTION_RAISE_WINDOW_BUTTON 31
+#define COMP_OPTION_LOWER_WINDOW_KEY 32
+#define COMP_OPTION_LOWER_WINDOW_BUTTON 33
+#define COMP_OPTION_UNMAXIMIZE_WINDOW_KEY 34
+#define COMP_OPTION_MINIMIZE_WINDOW_KEY 35
+#define COMP_OPTION_MINIMIZE_WINDOW_BUTTON 36
+#define COMP_OPTION_MAXIMIZE_WINDOW_KEY 37
+#define COMP_OPTION_MAXIMIZE_WINDOW_HORZ_KEY 38
+#define COMP_OPTION_MAXIMIZE_WINDOW_VERT_KEY 39
+#define COMP_OPTION_WINDOW_MENU_BUTTON 40
+#define COMP_OPTION_WINDOW_MENU_KEY 41
+#define COMP_OPTION_SHOW_DESKTOP_KEY 42
+#define COMP_OPTION_SHOW_DESKTOP_EDGE 43
+#define COMP_OPTION_RAISE_ON_CLICK 44
+#define COMP_OPTION_AUDIBLE_BELL 45
+#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_KEY 46
+#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_BUTTON 47
+#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ_KEY 48
+#define COMP_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT_KEY 49
+#define COMP_OPTION_HIDE_SKIP_TASKBAR_WINDOWS 50
+#define COMP_OPTION_TOGGLE_WINDOW_SHADED_KEY 51
+#define COMP_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED 52
+#define COMP_OPTION_PING_DELAY 53
+#define COMP_OPTION_EDGE_DELAY 54
+#define COMP_OPTION_HSIZE 55
+#define COMP_OPTION_VSIZE 56
+#define COMP_OPTION_DEFAULT_ICON 57
+#define COMP_OPTION_NUMBER_OF_DESKTOPS 58
+#define COMP_OPTION_DETECT_OUTPUTS 59
+#define COMP_OPTION_OUTPUTS 60
+#define COMP_OPTION_OVERLAPPING_OUTPUTS 61
+#define COMP_OPTION_FOCUS_PREVENTION_LEVEL 62
+#define COMP_OPTION_FOCUS_PREVENTION_MATCH 63
+#define COMP_OPTION_NUM 64
extern bool inHandleEvent;
diff --git a/src/screen.cpp b/src/screen.cpp
index 4e492bd..6f7efa5 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -507,8 +507,6 @@ const CompMetadata::OptionInfo coreOptionInfo[COMP_OPTION_NUM] = {
{ "autoraise_delay", "int", 0, 0, 0 },
{ "close_window_key", "key", 0, CompScreen::closeWin, 0 },
{ "close_window_button", "button", 0, CompScreen::closeWin, 0 },
- { "main_menu_key", "key", 0, CompScreen::mainMenu, 0 },
- { "run_key", "key", 0, CompScreen::runDialog, 0 },
{ "command0", "string", 0, 0, 0 },
{ "command1", "string", 0, 0, 0 },
{ "command2", "string", 0, 0, 0 },
@@ -545,12 +543,6 @@ const CompMetadata::OptionInfo coreOptionInfo[COMP_OPTION_NUM] = {
CompScreen::maximizeWinHorizontally, 0 },
{ "maximize_window_vertically_key", "key", 0,
CompScreen::maximizeWinVertically, 0 },
- { "command_screenshot", "string", 0, 0, 0 },
- { "run_command_screenshot_key", "key", 0,
- CompScreen::runCommandScreenshot, 0 },
- { "command_window_screenshot", "string", 0, 0, 0 },
- { "run_command_window_screenshot_key", "key", 0,
- CompScreen::runCommandWindowScreenshot, 0 },
{ "window_menu_button", "button", 0, CompScreen::windowMenu, 0 },
{ "window_menu_key", "key", 0, CompScreen::windowMenu, 0 },
{ "show_desktop_key", "key", 0, CompScreen::showDesktop, 0 },
@@ -568,9 +560,6 @@ const CompMetadata::OptionInfo coreOptionInfo[COMP_OPTION_NUM] = {
{ "hide_skip_taskbar_windows", "bool", 0, 0, 0 },
{ "toggle_window_shaded_key", "key", 0, CompScreen::shadeWin, 0 },
{ "ignore_hints_when_maximized", "bool", 0, 0, 0 },
- { "command_terminal", "string", 0, 0, 0 },
- { "run_command_terminal_key", "key", 0,
- CompScreen::runCommandTerminal, 0 },
{ "ping_delay", "int", "<min>1000</min>", 0, 0 },
{ "edge_delay", "int", "<min>0</min>", 0, 0 },
{ "hsize", "int", "<min>1</min><max>32</max>", 0, 0 },