This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 00c1f05efd043fb6f2dba342694c7091dad342cb
Author: Ulrich Sibiller <ul...@gmx.de>
Date: Wed Apr 11 00:39:40 2018 +0200
nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfig
Was 0,0 on every call...
---
nx-X11/programs/Xserver/hw/nxagent/Events.c | 7 +++----
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Screen.c | 8 ++++----
nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Window.c | 4 ++--
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c
b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 0408c4e..34d1d31 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -602,8 +602,7 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen)
nxagentLaunchDialog(DIALOG_ENABLE_DESKTOP_RESIZE_MODE);
- nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height),
- 0, 0);
+ nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height));
if (nxagentOption(ClientOs) == ClientOsWinnt)
{
@@ -3451,7 +3450,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
#endif
nxagentChangeScreenConfig(0, nxagentOption(Width),
- nxagentOption(Height), 0, 0);
+ nxagentOption(Height));
}
}
@@ -3471,7 +3470,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
nxagentChangeOption(RootHeight, X -> xconfigure.height);
nxagentChangeScreenConfig(0, nxagentOption(Width),
- nxagentOption(Height), 0, 0);
+ nxagentOption(Height));
return 1;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 56ac017..9a6cbf2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -626,7 +626,7 @@ Bool nxagentReconnectSession(void)
if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True ||
nxagentOption(Xinerama) == True)
{
nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
- nxagentOption(RootHeight), 0, 0);
+ nxagentOption(RootHeight));
nxagentResizeDesktopAtStartup = False;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 75ecbfa..c29df92 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3834,13 +3834,13 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen)
RRScreenSizeNotify(pScreen);
}
-int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth,
int mmHeight)
+int nxagentChangeScreenConfig(int screen, int width, int height)
{
ScreenPtr pScreen;
int r;
#ifdef DEBUG
- fprintf(stderr, "nxagentChangeScreenConfig: called for screen [%d], width
[%d] height [%d] mmWidth [%d] mmHeight [%d]\n", screen, width, height, mmWidth,
mmHeight);
+ fprintf(stderr, "nxagentChangeScreenConfig: called for screen [%d], width
[%d] height [%d]\n", screen, width, height);
#endif
#ifdef TEST
@@ -3885,10 +3885,10 @@ int nxagentChangeScreenConfig(int screen, int width,
int height, int mmWidth, in
pScreen = screenInfo.screens[screen] -> root -> drawable.pScreen;
#ifdef TEST
- fprintf(stderr, "nxagentChangeScreenConfig: Changing config to %d x %d (%dmm
x %dmm).\n", width, height, mmWidth, mmHeight);
+ fprintf(stderr, "nxagentChangeScreenConfig: Changing config to %d x %d\n",
width, height);
#endif
- r = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight);
+ r = nxagentResizeScreen(pScreen, width, height, 0, 0);
if (r != 0)
{
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
index 8e5865f..14b20a7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
@@ -110,7 +110,7 @@ Bool nxagentMagicPixelZone(int x, int y);
Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
int mmWidth, int mmHeight);
-int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth,
int mmHeight);
+int nxagentChangeScreenConfig(int screen, int width, int height);
int nxagentAdjustRandRXinerama(ScreenPtr pScreen);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c
b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index ca0de46..b12fe76 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -952,7 +952,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool
switchOn)
if (nxagentOption(Shadow) == 0)
{
nxagentChangeScreenConfig(0,
WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)),
-
HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), 0, 0);
+
HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)));
}
else
{
@@ -1006,7 +1006,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool
switchOn)
if (nxagentOption(Shadow) == 0)
{
nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
- nxagentOption(RootHeight), 0, 0);
+ nxagentOption(RootHeight));
}
}
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/nx-libs.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
