Commit 00c1f05e authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfig

Was 0,0 on every call...
parent 845ae6ea
...@@ -602,8 +602,7 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) ...@@ -602,8 +602,7 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen)
nxagentLaunchDialog(DIALOG_ENABLE_DESKTOP_RESIZE_MODE); nxagentLaunchDialog(DIALOG_ENABLE_DESKTOP_RESIZE_MODE);
nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height), nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height));
0, 0);
if (nxagentOption(ClientOs) == ClientOsWinnt) if (nxagentOption(ClientOs) == ClientOsWinnt)
{ {
...@@ -3451,7 +3450,7 @@ int nxagentHandleConfigureNotify(XEvent* X) ...@@ -3451,7 +3450,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
#endif #endif
nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentChangeScreenConfig(0, nxagentOption(Width),
nxagentOption(Height), 0, 0); nxagentOption(Height));
} }
} }
...@@ -3471,7 +3470,7 @@ int nxagentHandleConfigureNotify(XEvent* X) ...@@ -3471,7 +3470,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
nxagentChangeOption(RootHeight, X -> xconfigure.height); nxagentChangeOption(RootHeight, X -> xconfigure.height);
nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentChangeScreenConfig(0, nxagentOption(Width),
nxagentOption(Height), 0, 0); nxagentOption(Height));
return 1; return 1;
} }
......
...@@ -626,7 +626,7 @@ Bool nxagentReconnectSession(void) ...@@ -626,7 +626,7 @@ Bool nxagentReconnectSession(void)
if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True) if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True)
{ {
nxagentChangeScreenConfig(0, nxagentOption(RootWidth), nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
nxagentOption(RootHeight), 0, 0); nxagentOption(RootHeight));
nxagentResizeDesktopAtStartup = False; nxagentResizeDesktopAtStartup = False;
} }
......
...@@ -3834,13 +3834,13 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen) ...@@ -3834,13 +3834,13 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen)
RRScreenSizeNotify(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; ScreenPtr pScreen;
int r; int r;
#ifdef DEBUG #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 #endif
#ifdef TEST #ifdef TEST
...@@ -3885,10 +3885,10 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in ...@@ -3885,10 +3885,10 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in
pScreen = screenInfo.screens[screen] -> root -> drawable.pScreen; pScreen = screenInfo.screens[screen] -> root -> drawable.pScreen;
#ifdef TEST #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 #endif
r = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight); r = nxagentResizeScreen(pScreen, width, height, 0, 0);
if (r != 0) if (r != 0)
{ {
......
...@@ -110,7 +110,7 @@ Bool nxagentMagicPixelZone(int x, int y); ...@@ -110,7 +110,7 @@ Bool nxagentMagicPixelZone(int x, int y);
Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height, Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
int mmWidth, int mmHeight); 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); int nxagentAdjustRandRXinerama(ScreenPtr pScreen);
......
...@@ -952,7 +952,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) ...@@ -952,7 +952,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
if (nxagentOption(Shadow) == 0) if (nxagentOption(Shadow) == 0)
{ {
nxagentChangeScreenConfig(0, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), nxagentChangeScreenConfig(0, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)),
HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), 0, 0); HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)));
} }
else else
{ {
...@@ -1006,7 +1006,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) ...@@ -1006,7 +1006,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
if (nxagentOption(Shadow) == 0) if (nxagentOption(Shadow) == 0)
{ {
nxagentChangeScreenConfig(0, nxagentOption(RootWidth), nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
nxagentOption(RootHeight), 0, 0); nxagentOption(RootHeight));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment