frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cygwin/X: Rather than storing calculated physical display sizes, calculate them when needed 

(This stored calculation was wrong if -dpi came after -screen on the command
line, anyhow)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2010-04-01 21:00:43 +01:00
parent df51800127
commit a46146af5f
4 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/win.h
View File

@ -395,8 +395,6 @@ typedef struct
DWORD dwUserHeight; DWORD dwUserHeight;
DWORD dwWidth; DWORD dwWidth;
DWORD dwHeight; DWORD dwHeight;
DWORD dwWidth_mm;
DWORD dwHeight_mm;
DWORD dwPaddedWidth; DWORD dwPaddedWidth;
/* Did the user specify a screen position? */ /* Did the user specify a screen position? */

13
hw/xwin/winprocarg.c
View File

@ -174,8 +174,6 @@ winInitializeScreenDefaults(void)
defaultScreenInfo.fScrollbars = FALSE; defaultScreenInfo.fScrollbars = FALSE;
defaultScreenInfo.fNoTrayIcon = FALSE; defaultScreenInfo.fNoTrayIcon = FALSE;
defaultScreenInfo.iE3BTimeout = WIN_E3B_OFF; defaultScreenInfo.iE3BTimeout = WIN_E3B_OFF;
defaultScreenInfo.dwWidth_mm = (dwWidth / WIN_DEFAULT_DPI) * 25.4;
defaultScreenInfo.dwHeight_mm = (dwHeight / WIN_DEFAULT_DPI) * 25.4;
defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL; defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;
defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL; defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;
defaultScreenInfo.fIgnoreInput = FALSE; defaultScreenInfo.fIgnoreInput = FALSE;
@ -500,17 +498,6 @@ ddxProcessArgument (int argc, char *argv[], int i)
g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
} }
/* Calculate the screen width and height in millimeters */
if (g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth)
{
g_ScreenInfo[nScreenNum].dwWidth_mm
= (g_ScreenInfo[nScreenNum].dwWidth
/ monitorResolution) * 25.4;
g_ScreenInfo[nScreenNum].dwHeight_mm
= (g_ScreenInfo[nScreenNum].dwHeight
/ monitorResolution) * 25.4;
}
/* Flag that this screen was explicity specified by the user */ /* Flag that this screen was explicity specified by the user */
g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE; g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;

4
hw/xwin/winrandr.c
View File

@ -86,8 +86,8 @@ winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
pSize = RRRegisterSize (pScreen, pSize = RRRegisterSize (pScreen,
pScreenInfo->dwWidth, pScreenInfo->dwWidth,
pScreenInfo->dwHeight, pScreenInfo->dwHeight,
pScreenInfo->dwWidth_mm, (pScreenInfo->dwWidth / monitorResolution) * 25.4,
pScreenInfo->dwHeight_mm); (pScreenInfo->dwHeight / monitorResolution) * 25.4);
/* Tell RandR what the current config is */ /* Tell RandR what the current config is */
RRSetCurrentConfig (pScreen, RRSetCurrentConfig (pScreen,

4
hw/xwin/winscrinit.c
View File

@ -190,10 +190,6 @@ winScreenInit (int index,
{ {
pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN); pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN); pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
pScreenInfo->dwWidth_mm = (pScreenInfo->dwWidth /
WIN_DEFAULT_DPI) * 25.4;
pScreenInfo->dwHeight_mm = (pScreenInfo->dwHeight /
WIN_DEFAULT_DPI) * 25.4;
} }
} }
else else