Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGE

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/lisp.c b/lisp/lisp.c
index 15226f6..d21b4b4 100644
--- a/lisp/lisp.c
+++ b/lisp/lisp.c
@@ -46,7 +46,6 @@
 #endif
 
 #if defined(linux)
-#include <asm/page.h>  /* for PAGE_SIZE */
 #define HAS_GETPAGESIZE
 #define HAS_SC_PAGESIZE	/* _SC_PAGESIZE may be an enum for Linux */
 #endif
diff --git a/print.c b/print.c
index f068afe..54f5a29 100644
--- a/print.c
+++ b/print.c
@@ -305,6 +305,10 @@ void DoPrintTextSource(const char *programname,
     apd->jobtitle = jobtitle;
 
     n = 0;
+    /* Override any geometry resource settings as XawPrintShell adjusts it's size
+     * to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
+     * |XawPrintLAYOUTMODE_PAGESIZE| are used. */
+    XtSetArg(args[n], XtNgeometry,    "+0+0");                          n++;
     XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
     apd->printshell = CreatePrintShell(toplevel, apd->pscreen, "printshell", args, n);