aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-27 09:33:19 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 09:33:19 +0100
commit6d4049640ed1de6a29b7108ebde89947877d5d27 (patch)
tree1ee4f2f134b971766d6b7eceb4e254f7f420c67f /nx-X11/programs
parenta88ca271751c1bcf90b352b8c5a79631263c56aa (diff)
parent29c166dbed16cbc3112b4915f4e6938b92983999 (diff)
downloadnx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.tar.gz
nx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.tar.bz2
nx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.zip
Merge branch 'sunweaver-pr/autodetect-dpi' into 3.6.x
Attributes GH PR #522: https://github.com/ArcticaProject/nx-libs/pull/522
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c27
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Extensions.c17
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c42
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.18
4 files changed, 88 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 63433f4da..c31acc26a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -130,6 +130,8 @@ char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH];
Bool nxagentSynchronize = False;
Bool nxagentRealWindowProp = False;
+Bool nxagentAutoDPI = False;
+
char nxagentShadowDisplayName[NXAGENTSHADOWDISPLAYNAMELENGTH] = {0};
char nxagentWindowName[NXAGENTWINDOWNAMELENGTH];
@@ -743,6 +745,11 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 1;
}
+ if (!strcmp(argv[i], "-autodpi")) {
+ nxagentAutoDPI = True;
+ return 1;
+ }
+
/*
* The original -noreset option, disabling
* dispatchExceptionAtReset, is the default.
@@ -1271,6 +1278,25 @@ static void nxagentParseOptions(char *name, char *value)
return;
}
+ else if (!strcmp(name, "autodpi"))
+ {
+ if (nxagentReconnectTrap == True)
+ {
+ #ifdef DEBUG
+ fprintf(stderr, "nxagentParseOptions: Ignoring option 'autodpi' at reconnection.\n");
+ #endif
+ }
+ else if (!strcmp(value, "0"))
+ {
+ nxagentAutoDPI = False;
+ }
+ else
+ {
+ nxagentAutoDPI = True;
+ }
+
+ return;
+ }
else if (strcmp(name, "shadowuid") == 0)
{
nxagentShadowUid = atoi(value);
@@ -2091,6 +2117,7 @@ void ddxUseMsg(void)
ErrorF("-class string default visual class\n");
ErrorF("-depth int default depth\n");
ErrorF("-geometry WxH+X+Y window size and position\n");
+ ErrorF("-autodpi detect real server's DPI and use that in the session\n");
ErrorF("-bw int window border width\n");
ErrorF("-name string window name\n");
ErrorF("-scrns int number of screens to generate\n");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
index 211af8ccf..05a4b4f13 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
@@ -338,15 +338,26 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen)
width = w[i];
height = h[i];
- mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ if (monitorResolution < 0)
+ {
+ mmWidth = width * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) /
+ DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay));
+
+ mmHeight = height * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) /
+ DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay));
+ }
+ else
+ {
+ mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10);
+
+ }
if (mmWidth < 1)
{
mmWidth = 1;
}
- mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10);
-
if (mmHeight < 1)
{
mmHeight = 1;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 36da8b905..d4a083a1b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -210,6 +210,9 @@ void nxagentShadowAdaptDepth(unsigned int, unsigned int, unsigned int, char **);
RegionRec nxagentShadowUpdateRegion;
#define NXAGENT_DEFAULT_DPI 75
+#define NXAGENT_AUTO_DPI -1
+
+extern Bool nxagentAutoDPI;
/*
* From randr/randr.c. This was originally static
@@ -1327,10 +1330,14 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
rootDepth, (long unsigned int)defaultVisual);
#endif
- if (monitorResolution < 1)
+ if ((monitorResolution < 1) && (nxagentAutoDPI == False))
{
monitorResolution = NXAGENT_DEFAULT_DPI;
}
+ else if ((monitorResolution < 1) && (nxagentAutoDPI == True))
+ {
+ monitorResolution = NXAGENT_AUTO_DPI;
+ }
if (!fbScreenInit(pScreen, pFrameBufferBits, nxagentOption(RootWidth), nxagentOption(RootHeight),
monitorResolution, monitorResolution, PixmapBytePad(nxagentOption(RootWidth), rootDepth), bitsPerPixel))
@@ -1474,6 +1481,17 @@ N/A
* return FALSE;
*/
+ if (monitorResolution < 0)
+ {
+ pScreen->mmWidth = nxagentOption(RootWidth) * DisplayWidthMM(nxagentDisplay,
+ DefaultScreen(nxagentDisplay)) / DisplayWidth(nxagentDisplay,
+ DefaultScreen(nxagentDisplay));
+
+ pScreen->mmHeight = nxagentOption(RootHeight) * DisplayHeightMM(nxagentDisplay,
+ DefaultScreen(nxagentDisplay)) / DisplayHeight(nxagentDisplay,
+ DefaultScreen(nxagentDisplay));
+ }
+
pScreen->defColormap = (Colormap) FakeClientID(0);
pScreen->minInstalledCmaps = MINCMAPS;
pScreen->maxInstalledCmaps = MAXCMAPS;
@@ -2294,22 +2312,40 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
if (mmWidth == 0)
{
- mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ if (monitorResolution < 0)
+ {
+ mmWidth = width * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) /
+ DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay));
+ }
+ else
+ {
+ mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ }
if (mmWidth < 1)
{
mmWidth = 1;
}
+
}
if (mmHeight == 0)
{
- mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ if (monitorResolution < 0)
+ {
+ mmHeight = height * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) /
+ DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay));
+ }
+ else
+ {
+ mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10);
+ }
if (mmHeight < 1)
{
mmHeight = 1;
}
+
}
pScreen -> mmWidth = mmWidth;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index d6ed4d0fe..d3069bffd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -393,6 +393,9 @@ auto-disconnect timeout in seconds (minimum allowed: 60)
.B \-norootlessexit
don't exit if there are no clients in rootless mode
.TP 8
+.B \-autodpi
+detect real server's DPI and set it in the agent session; the \fI-dpi <dpi>\fR cmdline option overrides \fI-autodpi\fR
+.TP 8
.B \-nomagicpixel
disable magic pixel support at session startup, can be re-enabled via nx/nx option on session
resumption
@@ -603,6 +606,11 @@ proxy <-> agent remote sessions)
.B magicpixel=<bool>
enable/disable magic pixel support in fullscreen mode (default: 1, enabled)
.TP 8
+.B autodpi=<bool>
+enable/disable deriving session DPI automatically from real server
+(default: 0, disabled); only takes effect on session startups, gets
+ignored when reconnecting to a suspended session
+.TP 8
.B sleep=<int>
delay X server operations when suspended (provided in msec), set to
\fI0\fR to keep \fBnxagent\fR session fully functional when suspended