aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 09:43:11 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 09:43:11 +0200
commitc0f67abb494b6d61dc4a67284004072570b3c5e7 (patch)
tree8c91dd7ebdb3e19a62061e8b0f8f2eeabd02143a /nx-X11/programs/Xserver/hw/nxagent/Screen.h
parent985bed9545f20152599819155c67f8a403ae65bf (diff)
parent9138a9e3bf6f1b0962c20a29735c4f89dc80d572 (diff)
downloadnx-libs-c0f67abb494b6d61dc4a67284004072570b3c5e7.tar.gz
nx-libs-c0f67abb494b6d61dc4a67284004072570b3c5e7.tar.bz2
nx-libs-c0f67abb494b6d61dc4a67284004072570b3c5e7.zip
Merge branch 'uli42-pr/cleanup_window_hints' into 3.6.x
Attributes GH PR #689: https://github.com/ArcticaProject/nx-libs/pull/689
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
index 3df586fa8..2f93105ef 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
@@ -48,7 +48,7 @@ is" without express or implied warranty.
#define nxagentSetPrintGeometry(screen) \
nxagentPrintGeometryFlags = (1 << (screen));
-
+
extern int nxagentClients;
extern int nxagentAutoDisconnectTimeout;
@@ -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);
@@ -130,7 +130,9 @@ int nxagentShadowPoll(PixmapPtr, GCPtr, unsigned char, int, int, char *, int *,
void nxagentShadowSetWindowsSize(void);
-void nxagentSetWMNormalHints(int);
+void nxagentSetWMNormalHints(int, int, int);
+
+void nxagentSetWMNormalHintsMaxsize(ScreenPtr, int, int);
void nxagentShadowSetRatio(float, float);