diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-17 19:22:12 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-17 19:22:12 +0000 |
| commit | de320416512c9e5fd4b28bcf65bea3e3194b6682 (patch) | |
| tree | 8d8752c14915a20da131db5c4962fa98c4fb2eff | |
| parent | 55887a93579543eda0222082028538cf2d527909 (diff) | |
45. Readding Monitor information obtained by DDC to the config file in
commented out form (Egbert Eich).
44. Making a log message by the mouse driver more meaningful (Egbert Eich).
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 10 | ||||
| -rw-r--r-- | hw/xfree86/parser/Monitor.c | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index d23747f2c..81ce26eec 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -742,6 +742,16 @@ configureDDCMonitorSection (int screennum) case DS_ASCII_STR: case DS_SERIAL: case DS_RANGES: + ptr->mon_hsync[ptr->mon_n_hsync].lo = + ConfiguredMonitor->det_mon[i].section.ranges.min_h; + ptr->mon_hsync[ptr->mon_n_hsync].hi = + ConfiguredMonitor->det_mon[i].section.ranges.max_h; + ptr->mon_n_vrefresh = 1; + ptr->mon_vrefresh[ptr->mon_n_hsync].lo = + ConfiguredMonitor->det_mon[i].section.ranges.min_v; + ptr->mon_vrefresh[ptr->mon_n_hsync].hi = + ptr->mon_n_hsync++; + ConfiguredMonitor->det_mon[i].section.ranges.max_v; default: break; } diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index 942b199d2..faafa1a7f 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -671,15 +671,17 @@ xf86printMonitorSection (FILE * cf, XF86ConfMonitorPtr ptr) fprintf (cf, "\tDisplaySize %d\t%d\n", ptr->mon_width, ptr->mon_height); + if ( ptr->mon_n_hsync || ptr->mon_n_vrefresh ) + fprintf(cf," ### Uncomment if you don't want to default to DDC:\n"); for (i = 0; i < ptr->mon_n_hsync; i++) { - fprintf (cf, "\tHorizSync %2.1f - %2.1f\n", + fprintf (cf, "#\tHorizSync %2.1f - %2.1f\n", ptr->mon_hsync[i].lo, ptr->mon_hsync[i].hi); } for (i = 0; i < ptr->mon_n_vrefresh; i++) { - fprintf (cf, "\tVertRefresh %2.1f - %2.1f\n", + fprintf (cf, "#\tVertRefresh %2.1f - %2.1f\n", ptr->mon_vrefresh[i].lo, ptr->mon_vrefresh[i].hi); } |