Ticket #163: dummy-constant-dpi-option-ifdefed-constified.diff

src/dummy.h

@@ -51 +51 @@
     /* options */
     OptionInfoPtr Options;
     Bool swCursor;
+    Bool constantDPI;
     /* proc pointer */
     CloseScreenProcPtr CloseScreen;
     xf86CursorInfoPtr CursorInfo;

src/dummy_driver.c

@@ -34 +34 @@
 #include <X11/extensions/Xv.h>
 #endif
 
+#ifdef RANDR
+#include "randrstr.h"
+#define CONSTANT_DPI 96
+#endif
+
 /*
  * Driver data structures.
  */
@@ -118 +123 @@
 };
 
 typedef enum {
-    OPTION_SW_CURSOR
+    OPTION_SW_CURSOR,
+    OPTION_CONSTANT_DPI
 } DUMMYOpts;
 
 static const OptionInfoRec DUMMYOptions[] = {
     { OPTION_SW_CURSOR, "SWcursor",     OPTV_BOOLEAN,   {0}, FALSE },
+#ifdef RANDR
+    { OPTION_CONSTANT_DPI,      "ConstantDPI",  OPTV_BOOLEAN,   {0}, FALSE },
+#endif
     { -1,                  NULL,           OPTV_NONE,   {0}, FALSE }
 };
 
@@ -362 +371 @@
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, dPtr->Options);
 
     xf86GetOptValBool(dPtr->Options, OPTION_SW_CURSOR,&dPtr->swCursor);
+    xf86GetOptValBool(dPtr->Options, OPTION_CONSTANT_DPI, &dPtr->constantDPI);
 
     if (device->videoRam != 0) {
         pScrn->videoRam = device->videoRam;
@@ -666 +676 @@
 DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
 {
     SCRN_INFO_PTR(arg);
-    return dummyModeInit(pScrn, mode);
+    if (!dummyModeInit(pScrn, mode))
+        return FALSE;
+#ifdef RANDR
+    DUMMYPtr dPtr = DUMMYPTR(pScrn);
+    if (dPtr->constantDPI) {
+        pScrn->pScreen->mmWidth = mode->HDisplay * 254 / CONSTANT_DPI /10;
+        pScrn->pScreen->mmHeight = mode->VDisplay * 254 / CONSTANT_DPI /10;
+        RRScreenSizeNotify(pScrn->pScreen);
+        RRTellChanged(pScrn->pScreen);
+    }
+#endif
+    return TRUE;
 }
 
 /* Mandatory */