[X2Go-Commits] [x2gokdrive] 04/09: x2gokdrive.c: White-space cleanup.
git-admin at x2go.org
git-admin at x2go.org
Tue Jul 16 23:43:43 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit 35a2182a4f00be20779b78ca539df0cc3f1af8ee
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jul 16 23:26:11 2019 +0200
x2gokdrive.c: White-space cleanup.
---
x2gokdrive.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/x2gokdrive.c b/x2gokdrive.c
index 39eb9d7..c2b871d 100644
--- a/x2gokdrive.c
+++ b/x2gokdrive.c
@@ -517,9 +517,6 @@ ephyrRandRSetConfig(ScreenPtr pScreen,
if (!ephyrMapFramebuffer(screen))
goto bail4;
-
-
-
/* FIXME below should go in own call */
if (oldshadow)
@@ -535,12 +532,14 @@ ephyrRandRSetConfig(ScreenPtr pScreen,
goto bail4;
}
else {
+
/* Without shadow fb ( non rotated ) we need
* to use damage to efficiently update display
* via signal regions what to copy from 'fb'.
*/
if (!ephyrSetInternalDamage(screen->pScreen))
goto bail4;
+
}
/*
@@ -584,7 +583,6 @@ ephyrRandRSetConfig(ScreenPtr pScreen,
//
// EPHYR_DBG("new size registered");
-
randr = KdSubRotation(scrpriv->randr, screen->randr);
EPHYR_DBG("Sub Rotation done");
@@ -634,14 +632,11 @@ ephyrRandRSetConfig(ScreenPtr pScreen,
}
}
-
-
// RRSetCurrentConfig(pScreen, randr, 0, pSize);
RRScreenSetSizeRange(pScreen, screen->width, screen->height, screen->width, screen->height);
RRScreenSizeNotify(pScreen);
RRSendConfigNotify(pScreen);
-
// EPHYR_DBG("OUTPUTS: %d, CRTCS: %d, SIZES: %d, MODES %d" , pScrPriv->numOutputs,
// pScrPriv->numCrtcs, pScrPriv->nSizes, pScrPriv->outputs[0]->numModes);
@@ -652,7 +647,7 @@ ephyrRandRSetConfig(ScreenPtr pScreen,
return TRUE;
- bail4:
+bail4:
EPHYR_LOG("bailed");
ephyrUnmapFramebuffer(screen);
@@ -699,7 +694,6 @@ void setOutput(ScreenPtr pScreen, RROutputPtr output, RRCrtcPtr crtc, int width,
modeInfo.nameLength = strlen(modename);
mode = RRModeGet(&modeInfo, modename);
-
if (!mode)
{
EPHYR_DBG("can't create mode %s",modename);
@@ -724,8 +718,6 @@ void setOutput(ScreenPtr pScreen, RROutputPtr output, RRCrtcPtr crtc, int width,
// output->numPreferred=0;
-
-
RROutputSetPhysicalSize(output, width*pScreen->mmWidth/pScreen->width, height*pScreen->mmHeight/pScreen->height);
EPHYR_DBG("RANDR SIZES - SCREEN %dx%d - %dx%d, OUTPUT %dx%d - %dx%d", pScreen->width, pScreen->height, pScreen->mmWidth, pScreen->mmHeight, width, height,
@@ -765,7 +757,6 @@ void updateOutput(ScreenPtr pScreen, RROutputPtr output, int width, int height,
terminateServer(-1);
}
-
setOutput(pScreen, output, output->crtcs[0], width, height, x, y, primary, connected);
}
@@ -799,8 +790,6 @@ void addOutput(ScreenPtr pScreen, char* name, int width, int height, int x, int
setOutput(pScreen, output, crtc, width, height, x, y, primary, connected);
}
-
-
Bool
ephyrRandRInit(ScreenPtr pScreen)
{
@@ -877,7 +866,6 @@ ephyrResizeScreen (ScreenPtr pScreen,
size.width = newwidth;
size.height = newheight;
-
scrpriv->localRandrCall=TRUE;
ret = ephyrRandRSetConfig (pScreen, screen->randr, 0, &size );
// if (ret) {
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
More information about the x2go-commits
mailing list