re-sync after the big svn loss

1 files changed, 0 insertions, 205 deletions

diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
deleted file mode 100644
index 71062a093..000000000
--- a/perl-install/Xconfig/parse.pm
+++ /dev/null
@@ -1,205 +0,0 @@
-package Xconfig::parse; # $Id$
-
-use diagnostics;
-use strict;
-
-use common;
-
-
-sub read_XF86Config {
-    my ($file) = @_;
-    my $raw_X = raw_from_file($file);
-    from_raw(@$raw_X);
-    $raw_X;
-}
-
-sub prepare_write_XF86Config {
-    my ($raw_X) = @_;
-    map { raw_to_string(before_to_string({ %$_ }, 0)) } @$raw_X;
-}
-
-sub write_XF86Config {
-    my ($raw_X, $file) = @_;
-    my @blocks = prepare_write_XF86Config($raw_X);
-    @blocks ? output($file, @blocks) : unlink $file;
-}
-
-sub read_XF86Config_from_string {
-    my ($s) = @_;
-    my $raw_X = raw_from_file('-', [ split "\n", $s ]);
-    from_raw(@$raw_X);
-    $raw_X;
-}
-
-#-###############################################################################
-#- raw reading/saving
-#-###############################################################################
-sub raw_from_file { #- internal
-    my ($file, $o_lines) = @_;
-    my $raw_X = [];
-
-    my $lines = $o_lines || [ cat_($file) ];
-    my $line;
-
-    my ($comment, $obj, @objs);
-
-    my $attach_comment = sub {
-	$obj || @objs or warn "$file:$line: can not attach comment\n";
-	if ($comment) {
-	    $comment =~ s/\n+$/\n/;
-	    ($obj || $objs[0])->{$_[0] . '_comment'} = $comment;
-	    $comment = '';
-	}
-    };
-
-    foreach (@$lines) {
-	$line++;
-	s/^\s*//; s/\s*$//;
-
-	if (/^$/) {
-	    $comment .= "\n" if $comment;
-	    next;
-	} elsif (@objs ? m/^#\W/ || /^#$/ : /^#/) {
-	    s/^#\s+/# /;
-	    $comment .= "$_\n";
-	    next;
-	}
-
-	if (/^Section\s+"(.*)"/i) {
-	    die "$file:$line: missing EndSection\n" if @objs;
-	    my $e = { name => $1, l => [], kind => 'Section' };
-	    push @$raw_X, $e;
-	    unshift @objs, $e; $obj = '';
-	    $attach_comment->('pre');
-	} elsif (/^Subsection\s+"(.*)"/i) {
-	    die "$file:$line: missing EndSubsection\n" if  @objs && $objs[0]{kind} eq 'Subsection';
-	    die "$file:$line: not in Section\n"        if !@objs || $objs[0]{kind} ne 'Section';
-	    my $e = { name => $1, l => [], kind => 'Subsection' };
-	    push @{$objs[0]{l}}, $e;
-	    unshift @objs, $e; $obj = '';
-	    $attach_comment->('pre');
-	} elsif (/^EndSection/i) {
-	    die "$file:$line: not in Section\n"        if !@objs || $objs[0]{kind} ne 'Section';
-	    $attach_comment->('post');
-	    shift @objs; $obj = '';
-	} elsif (/^EndSubsection/i) {
-	    die "$file:$line: not in Subsection\n"     if !@objs || $objs[0]{kind} ne 'Subsection';
-	    $attach_comment->('post');
-	    shift @objs; $obj = '';
-	} else {
-	    die "$file:$line: not in Section\n" if !@objs;
-
-	    my $commented = s/^#//;
-
-	    my $comment_on_line;
-	    s/(\s*#.*)/$comment_on_line = $1; ''/e;
-
-	    if (/^$/) {
-		die "$file:$line: weird";
-	    }
-
-	    (my $name, my $Option, $_)  = 
- 	      /^Option\s*"(.*?)"(.*)/ ? ($1, 1, $2) : /^(\S+)(.*)/ ? ($1, 0, $2) : internal_error($_);
-	    my ($val) = /(\S.*)/;
-
-	    my %e = (Option => $Option, commented => $commented, comment_on_line => $comment_on_line, pre_comment => $comment);
-	    $comment = '';
-	    $obj = { name => $name, val => $val };
-	    $e{$_} and $obj->{$_} = $e{$_} foreach keys %e;
-
-	    push @{$objs[0]{l}}, $obj;
-	}
-    }
-    $raw_X;
-}
-
-sub raw_to_string {
-    my ($e, $b_want_spacing) = @_;
-    my $s = do {
-	if ($e->{l}) {
-	    my $inside = join('', map_index { raw_to_string($_, $::i) } @{$e->{l}});
-	    $inside .= $e->{post_comment} || '';
-	    $inside =~ s/^/    /mg;
-	    qq(\n$e->{kind} "$e->{name}"\n) . $inside . "End$e->{kind}";
-	} else {
-	    ($e->{commented} ? '#' : '') .
-	      ($e->{Option} ? qq(Option "$e->{name}") : $e->{name}) .
-	      (defined $e->{val} ? ($e->{Option} && $e->{val} !~ /^"/ ? qq( "$e->{val}") : qq( $e->{val})) : '');
-	}
-    };
-    ($e->{pre_comment} ? ($b_want_spacing ? "\n" : '') . $e->{pre_comment} : '') . $s . ($e->{comment_on_line} || '') . "\n" . (!$e->{l} && $e->{post_comment} || '');
-}
-
-#-###############################################################################
-#- refine the data structure for easier use
-#-###############################################################################
-my %kind_names = (
-    Pointer  => [ qw(Protocol Device Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ],
-    Mouse    => [ qw(DeviceName Protocol Device AlwaysCore Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ], # Subsection in XInput
-    Keyboard => [ qw(Protocol Driver XkbModel XkbLayout XkbDisable) ],
-    Monitor  => [ qw(Identifier VendorName ModelName HorizSync VertRefresh) ],
-    Device   => [ qw(Identifier VendorName BoardName Chipset Driver VideoRam Screen BusID DPMS power_saver) ],
-    Display  => [ qw(Depth Modes Virtual) ], # Subsection in Device
-    Screen   => [ qw(Identifier Driver Device Monitor DefaultDepth DefaultColorDepth) ],
-    InputDevice => [ qw(Identifier Driver Protocol Device Type Mode XkbModel XkbLayout XkbDisable Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ],
-    WacomCursor => [ qw(Port) ], #-\
-    WacomStylus => [ qw(Port) ], #--> Port must be first
-    WacomEraser => [ qw(Port) ], #-/
-    ServerLayout => [ qw(Identifier) ],
-);
-my @want_string = qw(Identifier DeviceName VendorName ModelName BoardName Driver Device Chipset Monitor Protocol XkbModel XkbLayout XkbOptions XkbCompat Load BusID);
-
-%kind_names = map_each { lc $::a => [ map { lc } @$::b ] } %kind_names;
-@want_string = map { lc } @want_string;
-
-sub from_raw {
-    sub from_raw__rec {
-	my ($current, $e) = @_;
-	if ($e->{l}) {
-	    from_raw($e);
-	    push @{$current->{l}{$e->{name}}}, $e;
-	} else {
-	    if (member(lc $e->{name}, @want_string)) {
-		$e->{val} =~ s/^"(.*)"$/$1/ or warn "$e->{name} $e->{val} has no quote\n";
-	    }
-
-	    if (member(lc $e->{name}, @{$kind_names{lc $current->{name}} || []})) {
-		if ($current->{l}{$e->{name}} && !$current->{l}{$e->{name}}{commented}) {
-		    warn "skipping conflicting line for $e->{name} in $current->{name}\n" if !$e->{commented};
-		} else {
-		    $current->{l}{$e->{name}} = $e;
-		}
-	    } else {
-		push @{$current->{l}{$e->{name}}}, $e;
-	    }
-	}
-	delete $e->{name};
-    }
-
-    foreach my $e (@_) {
-	($e->{l}, my $l) = ({}, $e->{l});
-	from_raw__rec($e, $_) foreach @$l;
-
-	delete $e->{kind};
-    }
-}
-
-sub before_to_string {
-    my ($e, $depth) = @_;
-
-    if ($e->{l}) {
-	$e->{kind} = $depth ? 'Subsection' : 'Section';
-
-	my %rated = map_index { $_ => $::i + 1 } @{$kind_names{lc $e->{name}} || []};
-	my @sorted = sort { ($rated{lc $a} || 99) <=> ($rated{lc $b} || 99) } keys %{$e->{l}};
-	$e->{l} = [ map {		  
-	    my $name = $_;
-	    map { 
-		before_to_string({ name => $name, %$_ }, $depth+1);
-	    } deref_array($e->{l}{$name});
-	} @sorted ];
-    } elsif (member(lc $e->{name}, @want_string)) {
-	$e->{val} = qq("$e->{val}");
-    }
-    $e;
-}