summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/cube.c
diff options
context:
space:
mode:
authorkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-18 19:10:33 +0000
committerkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-18 19:10:33 +0000
commit726a8665264db136e0464fe9da46c6d3ee3083b4 (patch)
tree954cf0e008f85bde50bc21cb3f227610ffb9d3f4 /beryl-plugins/src/cube.c
parent3aa6e7d2109e3d10608bdc65432a61648696f613 (diff)
downloadmarex-dev-726a8665264db136e0464fe9da46c6d3ee3083b4.tar.gz
marex-dev-726a8665264db136e0464fe9da46c6d3ee3083b4.tar.bz2
plugins: Remove automatic and multiscreen mode for multihead.
They were both either broken or redundant. git-svn-id: file:///beryl/trunk@2857 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/cube.c')
-rw-r--r--beryl-plugins/src/cube.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index 7d79553..40c6c41 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -64,21 +64,17 @@ char *imagesRotateModes[] = {
typedef enum _MultiMonitorMode
{
- Automatic,
- Multiscreen,
Multiple,
OneBig,
} MultiMonitorMode;
char *multiMonitorModes[] = {
- N_("Automatic"),
- N_("Multiscreen cube"),
N_("Multiple cubes"),
N_("One big cube")
};
-#define MULTIMONITOR_MODE_DEFAULT Multiple
-#define NUM_MULTIMONITOR_MODES 4
+#define MULTIMONITOR_MODE_DEFAULT OneBig
+#define NUM_MULTIMONITOR_MODES 2
#define CUBE_IN_DEFAULT FALSE
@@ -514,7 +510,7 @@ static void cubeUpdateOutputs(CompScreen * s)
if (cs->mmMode == OneBig)
k = 1;
- if (cs->mmMode == Multiscreen || cs->mmMode == Multiple)
+ if (cs->mmMode == Multiple)
k = s->nOutputDev;
@@ -910,7 +906,7 @@ cubeSetScreenOption(CompScreen * screen, char *name, CompOptionValue * value)
if (strcmp(multiMonitorModes[i], o->value.s) == 0)
mode = (MultiMonitorMode) i;
cs->mmMode = mode;
- if (cs->mmMode == OneBig || cs->mmMode == Multiscreen)
+ if (cs->mmMode == OneBig)
screen->projectionStyle = COMP_PERSPECTIVE_GLOBAL;
else
screen->projectionStyle = COMP_PERSPECTIVE_LOCAL;
@@ -1608,7 +1604,7 @@ cubePaintScreen(CompScreen * s,
glPushMatrix();
- if (cs->mmMode == OneBig || cs->mmMode == Multiscreen)
+ if (cs->mmMode == OneBig)
{
glScalef(cs->outputXScale, cs->outputYScale, 1);
glTranslatef(cs->outputXOffset / cs->outputXScale,
@@ -1909,7 +1905,7 @@ cubePaintTransformedScreen(CompScreen * s,
glPushMatrix();
- if (cs->mmMode == OneBig || cs->mmMode == Multiscreen)
+ if (cs->mmMode == OneBig)
{
glScalef(cs->outputXScale, cs->outputYScale, 1);
glTranslatef(cs->outputXOffset / cs->outputXScale,
@@ -2894,7 +2890,7 @@ static Bool cubeInitScreen(CompPlugin * p, CompScreen * s)
cs->desktopOpacity = OPAQUE;
cs->noManaged = FALSE;
- if (cs->mmMode == OneBig || cs->mmMode == Multiscreen)
+ if (cs->mmMode == OneBig)
s->projectionStyle = COMP_PERSPECTIVE_GLOBAL;
else
s->projectionStyle = COMP_PERSPECTIVE_LOCAL;