summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2008-08-13 16:52:58 +0200
committerDennis kasprzyk <onestone@opencompositing.org>2008-08-13 16:52:58 +0200
commitc9b8f6dff3c7457f5e05802335327200fa169110 (patch)
tree918f736a25b802c1b1fbc481a200ed7533615c87 /src
parent343a9b678681205c7c2883d4824263da6a3c81cf (diff)
downloadzcomp-c9b8f6dff3c7457f5e05802335327200fa169110.tar.gz
zcomp-c9b8f6dff3c7457f5e05802335327200fa169110.tar.bz2
Moved definitions from compiz-core.h to the right headers.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
-rw-r--r--src/privatedisplay.h71
-rw-r--r--src/privatescreen.h37
-rw-r--r--src/window.cpp1
4 files changed, 111 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3629c88..8f06e24 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,6 +35,8 @@
#include <sys/wait.h>
#include <compiz-core.h>
+#include "privatedisplay.h"
+#include "privatescreen.h"
char *programName;
char **programArgv;
diff --git a/src/privatedisplay.h b/src/privatedisplay.h
index 9b96aa6..a826a2b 100644
--- a/src/privatedisplay.h
+++ b/src/privatedisplay.h
@@ -4,6 +4,77 @@
#include <compiz-core.h>
#include <compdisplay.h>
+#define COMP_DISPLAY_OPTION_ABI 0
+#define COMP_DISPLAY_OPTION_ACTIVE_PLUGINS 1
+#define COMP_DISPLAY_OPTION_TEXTURE_FILTER 2
+#define COMP_DISPLAY_OPTION_CLICK_TO_FOCUS 3
+#define COMP_DISPLAY_OPTION_AUTORAISE 4
+#define COMP_DISPLAY_OPTION_AUTORAISE_DELAY 5
+#define COMP_DISPLAY_OPTION_CLOSE_WINDOW_KEY 6
+#define COMP_DISPLAY_OPTION_CLOSE_WINDOW_BUTTON 7
+#define COMP_DISPLAY_OPTION_MAIN_MENU_KEY 8
+#define COMP_DISPLAY_OPTION_RUN_DIALOG_KEY 9
+#define COMP_DISPLAY_OPTION_COMMAND0 10
+#define COMP_DISPLAY_OPTION_COMMAND1 11
+#define COMP_DISPLAY_OPTION_COMMAND2 12
+#define COMP_DISPLAY_OPTION_COMMAND3 13
+#define COMP_DISPLAY_OPTION_COMMAND4 14
+#define COMP_DISPLAY_OPTION_COMMAND5 15
+#define COMP_DISPLAY_OPTION_COMMAND6 16
+#define COMP_DISPLAY_OPTION_COMMAND7 17
+#define COMP_DISPLAY_OPTION_COMMAND8 18
+#define COMP_DISPLAY_OPTION_COMMAND9 19
+#define COMP_DISPLAY_OPTION_COMMAND10 20
+#define COMP_DISPLAY_OPTION_COMMAND11 21
+#define COMP_DISPLAY_OPTION_RUN_COMMAND0_KEY 22
+#define COMP_DISPLAY_OPTION_RUN_COMMAND1_KEY 23
+#define COMP_DISPLAY_OPTION_RUN_COMMAND2_KEY 24
+#define COMP_DISPLAY_OPTION_RUN_COMMAND3_KEY 25
+#define COMP_DISPLAY_OPTION_RUN_COMMAND4_KEY 26
+#define COMP_DISPLAY_OPTION_RUN_COMMAND5_KEY 27
+#define COMP_DISPLAY_OPTION_RUN_COMMAND6_KEY 28
+#define COMP_DISPLAY_OPTION_RUN_COMMAND7_KEY 29
+#define COMP_DISPLAY_OPTION_RUN_COMMAND8_KEY 30
+#define COMP_DISPLAY_OPTION_RUN_COMMAND9_KEY 31
+#define COMP_DISPLAY_OPTION_RUN_COMMAND10_KEY 32
+#define COMP_DISPLAY_OPTION_RUN_COMMAND11_KEY 33
+#define COMP_DISPLAY_OPTION_SLOW_ANIMATIONS_KEY 34
+#define COMP_DISPLAY_OPTION_RAISE_WINDOW_KEY 35
+#define COMP_DISPLAY_OPTION_RAISE_WINDOW_BUTTON 36
+#define COMP_DISPLAY_OPTION_LOWER_WINDOW_KEY 37
+#define COMP_DISPLAY_OPTION_LOWER_WINDOW_BUTTON 38
+#define COMP_DISPLAY_OPTION_UNMAXIMIZE_WINDOW_KEY 39
+#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_KEY 40
+#define COMP_DISPLAY_OPTION_MINIMIZE_WINDOW_BUTTON 41
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_KEY 42
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_HORZ_KEY 43
+#define COMP_DISPLAY_OPTION_MAXIMIZE_WINDOW_VERT_KEY 44
+#define COMP_DISPLAY_OPTION_SCREENSHOT 45
+#define COMP_DISPLAY_OPTION_RUN_SCREENSHOT_KEY 46
+#define COMP_DISPLAY_OPTION_WINDOW_SCREENSHOT 47
+#define COMP_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY 48
+#define COMP_DISPLAY_OPTION_WINDOW_MENU_BUTTON 49
+#define COMP_DISPLAY_OPTION_WINDOW_MENU_KEY 50
+#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_KEY 51
+#define COMP_DISPLAY_OPTION_SHOW_DESKTOP_EDGE 52
+#define COMP_DISPLAY_OPTION_RAISE_ON_CLICK 53
+#define COMP_DISPLAY_OPTION_AUDIBLE_BELL 54
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_KEY 55
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_BUTTON 56
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ_KEY 57
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT_KEY 58
+#define COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS 59
+#define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_SHADED_KEY 60
+#define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED 61
+#define COMP_DISPLAY_OPTION_TERMINAL 62
+#define COMP_DISPLAY_OPTION_RUN_TERMINAL_KEY 63
+#define COMP_DISPLAY_OPTION_PING_DELAY 64
+#define COMP_DISPLAY_OPTION_EDGE_DELAY 65
+#define COMP_DISPLAY_OPTION_NUM 66
+
+extern const CompMetadataOptionInfo
+coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM];
+
class PrivateDisplay {
public:
diff --git a/src/privatescreen.h b/src/privatescreen.h
index ae3da92..cc2b2d8 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -7,6 +7,43 @@
#include <comppoint.h>
#include <comptexture.h>
+#define COMP_SCREEN_OPTION_DETECT_REFRESH_RATE 0
+#define COMP_SCREEN_OPTION_LIGHTING 1
+#define COMP_SCREEN_OPTION_REFRESH_RATE 2
+#define COMP_SCREEN_OPTION_HSIZE 3
+#define COMP_SCREEN_OPTION_VSIZE 4
+#define COMP_SCREEN_OPTION_OPACITY_STEP 5
+#define COMP_SCREEN_OPTION_UNREDIRECT_FS 6
+#define COMP_SCREEN_OPTION_DEFAULT_ICON 7
+#define COMP_SCREEN_OPTION_SYNC_TO_VBLANK 8
+#define COMP_SCREEN_OPTION_NUMBER_OF_DESKTOPS 9
+#define COMP_SCREEN_OPTION_DETECT_OUTPUTS 10
+#define COMP_SCREEN_OPTION_OUTPUTS 11
+#define COMP_SCREEN_OPTION_OVERLAPPING_OUTPUTS 12
+#define COMP_SCREEN_OPTION_FOCUS_PREVENTION_LEVEL 13
+#define COMP_SCREEN_OPTION_FOCUS_PREVENTION_MATCH 14
+#define COMP_SCREEN_OPTION_TEXTURE_COMPRESSION 15
+#define COMP_SCREEN_OPTION_FORCE_INDEPENDENT 16
+#define COMP_SCREEN_OPTION_NUM 17
+
+#define OUTPUT_OVERLAP_MODE_SMART 0
+#define OUTPUT_OVERLAP_MODE_PREFER_LARGER 1
+#define OUTPUT_OVERLAP_MODE_PREFER_SMALLER 2
+#define OUTPUT_OVERLAP_MODE_LAST OUTPUT_OVERLAP_MODE_PREFER_SMALLER
+
+#define FOCUS_PREVENTION_LEVEL_NONE 0
+#define FOCUS_PREVENTION_LEVEL_LOW 1
+#define FOCUS_PREVENTION_LEVEL_HIGH 2
+#define FOCUS_PREVENTION_LEVEL_VERYHIGH 3
+#define FOCUS_PREVENTION_LEVEL_LAST FOCUS_PREVENTION_LEVEL_VERYHIGH
+
+#define COMP_SCREEN_DAMAGE_PENDING_MASK (1 << 0)
+#define COMP_SCREEN_DAMAGE_REGION_MASK (1 << 1)
+#define COMP_SCREEN_DAMAGE_ALL_MASK (1 << 2)
+
+extern const CompMetadataOptionInfo
+coreScreenOptionInfo[COMP_SCREEN_OPTION_NUM];
+
class PrivateScreen {
public:
diff --git a/src/window.cpp b/src/window.cpp
index 314783d..d0cbadb 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -43,6 +43,7 @@
#include <comptexture.h>
#include <compicon.h>
#include "privatewindow.h"
+#include "privatescreen.h"
CompObject::indices windowPrivateIndices (0);