forked from pool/xorg-x11-server
Stefan Dirsch
c8690bb170
This submit is just for preparing the final 13.0 release, please have a look at it and comment so i can fix things up until the final 13.0 release for 12.3! #3 OBS-URL: https://build.opensuse.org/request/show/131324 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=408
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
Index: hw/xfree86/common/xf86Helper.c
|
|
===================================================================
|
|
--- hw/xfree86/common/xf86Helper.c.orig
|
|
+++ hw/xfree86/common/xf86Helper.c
|
|
@@ -922,12 +922,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int
|
|
else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {
|
|
from = X_CONFIG;
|
|
if (pScrn->widthmm > 0) {
|
|
- pScrn->xDpi =
|
|
- (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
|
|
+ if (pScrn->modes && pScrn->modes->HDisplay > 0) {
|
|
+ pScrn->xDpi =
|
|
+ (int)((double) pScrn->modes->HDisplay * MMPERINCH / pScrn->widthmm);
|
|
+ } else {
|
|
+ pScrn->xDpi =
|
|
+ (int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
|
|
+ }
|
|
}
|
|
if (pScrn->heightmm > 0) {
|
|
- pScrn->yDpi =
|
|
- (int) ((double) pScrn->virtualY * MMPERINCH / pScrn->heightmm);
|
|
+ if (pScrn->modes && pScrn->modes->VDisplay > 0) {
|
|
+ pScrn->yDpi =
|
|
+ (int)((double)pScrn->modes->VDisplay * MMPERINCH / pScrn->heightmm);
|
|
+ } else {
|
|
+ pScrn->yDpi =
|
|
+ (int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
|
|
+ }
|
|
}
|
|
if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
|
|
pScrn->yDpi = pScrn->xDpi;
|
|
@@ -966,12 +976,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int
|
|
pScrn->widthmm = ddcWidthmm;
|
|
pScrn->heightmm = ddcHeightmm;
|
|
if (pScrn->widthmm > 0) {
|
|
- pScrn->xDpi =
|
|
- (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
|
|
+ if (pScrn->modes && pScrn->modes->HDisplay > 0) {
|
|
+ pScrn->xDpi =
|
|
+ (int)((double) pScrn->modes->HDisplay * MMPERINCH / pScrn->widthmm);
|
|
+ } else {
|
|
+ pScrn->xDpi =
|
|
+ (int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
|
|
+ }
|
|
}
|
|
if (pScrn->heightmm > 0) {
|
|
- pScrn->yDpi =
|
|
- (int) ((double) pScrn->virtualY * MMPERINCH / pScrn->heightmm);
|
|
+ if (pScrn->modes && pScrn->modes->VDisplay > 0) {
|
|
+ pScrn->yDpi =
|
|
+ (int)((double)pScrn->modes->VDisplay * MMPERINCH / pScrn->heightmm);
|
|
+ } else {
|
|
+ pScrn->yDpi =
|
|
+ (int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
|
|
+ }
|
|
}
|
|
if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
|
|
pScrn->yDpi = pScrn->xDpi;
|