summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2009-02-26 07:04:15 +0100
committerDanny Baumann <dannybaumann@web.de>2009-02-26 07:04:15 +0100
commit839873fe09e0f109c530af79ad9470fc63c42bed (patch)
tree58cdffa2a5bfbd92487949f9d45d8d5d6883a977 /src
parent10810881d574355422a536fcee9e54d257a3788b (diff)
downloadunity-window-decorator-839873fe09e0f109c530af79ad9470fc63c42bed.tar.gz
unity-window-decorator-839873fe09e0f109c530af79ad9470fc63c42bed.tar.bz2
Adapt core for gnomecompat plugin addition.
Diffstat (limited to 'src')
-rw-r--r--src/actions.cpp65
-rw-r--r--src/atoms.cpp6
-rw-r--r--src/privatescreen.h126
-rw-r--r--src/screen.cpp11
4 files changed, 59 insertions, 149 deletions
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 },