summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-19 23:41:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-19 23:41:22 +0000
commit38f909d3e8a127a0b999d4a870e0a6bacd245dcc (patch)
treea51d58c2f5ea3ca91c6b03d4e8936b372bd0f2b5
parent17760764b7784b1d23505a7ea75112145edb8267 (diff)
downloaddrakx-backup-do-not-use-38f909d3e8a127a0b999d4a870e0a6bacd245dcc.tar
drakx-backup-do-not-use-38f909d3e8a127a0b999d4a870e0a6bacd245dcc.tar.gz
drakx-backup-do-not-use-38f909d3e8a127a0b999d4a870e0a6bacd245dcc.tar.bz2
drakx-backup-do-not-use-38f909d3e8a127a0b999d4a870e0a6bacd245dcc.tar.xz
drakx-backup-do-not-use-38f909d3e8a127a0b999d4a870e0a6bacd245dcc.zip
read monitor's VendorName & ModelName
-rw-r--r--perl-install/Xconfig.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index d5a4ec8d7..1e867e384 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -94,6 +94,8 @@ sub getinfoFromXF86Config {
} elsif (/^Section "Monitor"/ .. /^EndSection/) {
$monitor{hsyncrange} ||= $1 if /^\s*HorizSync\s+(.*)/;
$monitor{vsyncrange} ||= $1 if /^\s*VertRefresh\s+(.*)/;
+ $monitor{VendorName} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
+ $monitor{ModelName} ||= $1 if /^\s*ModelName\s+"(.*?)"/;
$monitor{ModeLines} .= $_ if /^\s*Mode[lL]ine\s+(\S+)\s+(\S+)\s+/;
} elsif (my $s = /^Section "Screen"/ .. /^EndSection/) {
$card{default_depth} ||= $1 if /^\s*DefaultColorDepth\s+(\d+)/;
@@ -126,6 +128,8 @@ sub getinfoFromXF86Config {
} elsif (/^Section "Monitor"/ .. /^EndSection/) {
$monitor{hsyncrange} ||= $1 if /^\s*HorizSync\s+(.*)/;
$monitor{vsyncrange} ||= $1 if /^\s*VertRefresh\s+(.*)/;
+ $monitor{VendorName} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
+ $monitor{ModelName} ||= $1 if /^\s*ModelName\s+"(.*?)"/;
$monitor{ModeLines_xf3} .= $_ if /^\s*Mode[lL]ine\s+(\S+)\s+(\S+)\s+/;
} elsif (my $i = /^Section "Device"/ .. /^EndSection/) {
%c = () if $i == 1;