ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.32 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.43 by elmex, Fri Jun 2 16:27:28 2006 UTC

81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
86our $SERVER_SETUP; 87our $SERVER_SETUP;
87 88
88our $FLOORBOX; 89our $FLOORBOX;
89our $GAUGES; 90our $GAUGES;
90our $STATWIDS; 91our $STATWIDS;
104our $INV; 105our $INV;
105our $INVR; 106our $INVR;
106our $INV_RIGHT_HB; 107our $INV_RIGHT_HB;
107 108
108our $BIND_WINDOW; 109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113our $PICKUP_CFG;
109 114
110sub status { 115sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 116 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 117}
113 118
625 630
626 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 631 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
627 for keys %tbl; 632 for keys %tbl;
628} 633}
629 634
630sub metaserver_dialog {
631 my $dialog = new CFClient::UI::FancyFrame
632 title => "Server List",
633 child => (my $vbox = new CFClient::UI::VBox);
634
635 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
636
637 $dialog
638}
639
640my $METASERVER_ATIME; 635my $METASERVER_ATIME;
641 636
642sub update_metaserver { 637sub update_metaserver {
643 my ($HOST) = @_;
644
645 return if $METASERVER_ATIME > time; 638 return if $METASERVER_ATIME > time;
646 $METASERVER_ATIME = time + 60; 639 $METASERVER_ATIME = time + 60;
647 640
648 my $table = $METASERVER->{table}; 641 my $table = $METASERVER->{table};
649 $table->clear; 642 $table->clear;
701 694
702 $y++; 695 $y++;
703 696
704 $table->add (0, $y, new CFClient::UI::VBox children => [ 697 $table->add (0, $y, new CFClient::UI::VBox children => [
705 (new CFClient::UI::Button text => "Use", on_activate => sub { 698 (new CFClient::UI::Button text => "Use", on_activate => sub {
706 $HOST->set_text ($CFG->{host} = $host); 699 $HOST_ENTRY->set_text ($CFG->{host} = $host);
700 $METASERVER->toggle_visibility;
707 }), 701 }),
708 (new CFClient::UI::Empty expand => 1), 702 (new CFClient::UI::Empty expand => 1),
709 ]); 703 ]);
710 704
711 $table->add ($_ + 1, $y, new CFClient::UI::Label 705 $table->add ($_ + 1, $y, new CFClient::UI::Label
714 } 708 }
715 } 709 }
716 }); 710 });
717} 711}
718 712
713sub metaserver_dialog {
714 my $dialog = new CFClient::UI::FancyFrame
715 title => "Server List",
716 name => 'metaserver_dialog',
717 x => 'center',
718 y => 'center',
719 child => (my $vbox = new CFClient::UI::VBox),
720 on_visibility_change => sub {
721 update_metaserver if $_[1];
722 },
723 ;
724
725 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
726
727 $dialog
728}
729
719sub server_setup { 730sub server_setup {
720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 731 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
721 x => "center", 732 x => "center",
722 y => "center", 733 y => "center",
723 name => "server_setup", 734 name => "server_setup",
730 741
731 { 742 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 743 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733 744
734 $vbox->add ( 745 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 746 $HOST_ENTRY = new CFClient::UI::Entry
736 expand => 1, 747 expand => 1,
737 text => $CFG->{host}, 748 text => $CFG->{host},
738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 749 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739 on_changed => sub { 750 on_changed => sub {
740 my ($self, $value) = @_; 751 my ($self, $value) = @_;
742 } 753 }
743 ); 754 );
744 755
745 $METASERVER = metaserver_dialog; 756 $METASERVER = metaserver_dialog;
746 757
747 $vbox->add (new CFClient::UI::Flopper 758 $vbox->add (new CFClient::UI::Button
748 expand => 1, 759 expand => 1,
749 text => "Server List", 760 text => "Server List",
750 other => $METASERVER, 761 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 762 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 763 on_activate => sub { $METASERVER->toggle_visibility },
753 update_metaserver $HOST;
754 }
755 ); 764 );
756 } 765 }
757 766
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 767 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 768 $table->add (1, 4, new CFClient::UI::Entry
863 on_activate => sub { 872 on_activate => sub {
864 my ($input, $text) = @_; 873 my ($input, $text) = @_;
865 $input->set_text (''); 874 $input->set_text ('');
866 875
867 if ($text =~ /^\/bind\s+(.*)$/) { 876 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]); 877 CFClient::Binder::open_binding_dialog (sub {
878 my ($mod, $sym) = @_;
879 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
880 });
869 } elsif ($text =~ /^\/(.*)/) { 881 } elsif ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1); 882 $::CONN->user_send ($1);
871 } else { 883 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say'; 884 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text"); 885 $::CONN->user_send ("$say_cmd $text");
919 } 931 }
920 932
921 $QUIT_DIALOG->show; 933 $QUIT_DIALOG->show;
922} 934}
923 935
936sub make_pickup_cfg_window {
937 $PICKUP_CFG = new CFClient::UI::FancyFrame
938 x => "center",
939 y => "center",
940 force_w => $WIDTH * 3/10,
941 force_h => $HEIGHT * 9/10;
942
943 my $tbl = new CFClient::UI::Table;
944 my $tblrow = 0;
945 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl);
946
947 for (
948 ["General"],
949 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE],
950 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
951 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
952 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
953 ["Weapons"],
954 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
955 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
956 ["Bows" => CFClient::Pickup::PU_BOW],
957 ["Arrows" => CFClient::Pickup::PU_ARROW],
958 ["Armour"],
959 ["Helmets" => CFClient::Pickup::PU_HELMET],
960 ["Shields" => CFClient::Pickup::PU_SHIELD],
961 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
962 ["Boots" => CFClient::Pickup::PU_BOOTS],
963 ["Gloves" => CFClient::Pickup::PU_GLOVES],
964 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
965 ["Readables"],
966 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
967 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
968 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
969 ["Misc"],
970 ["Food" => CFClient::Pickup::PU_FOOD],
971 ["Drinks" => CFClient::Pickup::PU_DRINK],
972 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
973 ["Keys" => CFClient::Pickup::PU_KEY],
974 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
975 ["Potions" => CFClient::Pickup::PU_POTION],
976 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
977 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
978 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
979 )
980 {
981 unless (defined $_->[1]) {
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0);
983 } else {
984 my $mask = $_->[1];
985 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1);
986 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask,
988 on_changed => sub {
989 my ($box, $value) = @_;
990 if ($value) {
991 $CFG->{pickup} |= $mask;
992 } else {
993 $CFG->{pickup} = $CFG->{pickup} & ~$mask;
994 }
995 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup});
996 });
997 }
998 }
999
1000 $PICKUP_CFG
1001}
1002
924sub make_inventory_window { 1003sub make_inventory_window {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
926 x => "center", 1005 x => "center",
927 y => "center", 1006 y => "center",
928 force_w => $WIDTH * 9/10, 1007 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10, 1008 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1009 title => "Inventory",
931 name => "inventory_window",
932 ; 1010 ;
933 1011
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
935 1013
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1014 $hb->add (my $vb1 = new CFClient::UI::VBox);
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948 1026
949 $invwin 1027 $invwin
950} 1028}
951 1029
1030sub make_spell_list {
1031 $SPELL_LIST = new CFClient::UI::SpellList
1032 force_w => $WIDTH * (9/10),
1033 force_h => $HEIGHT * (9/10);
1034 $SPELL_LIST
1035}
1036
952sub make_binding_window { 1037sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox; 1038 my $binding_list = new CFClient::UI::VBox;
954 1039
1040 my $refresh;
955 my $refresh = sub { 1041 $refresh = sub {
956 $binding_list->clear (); 1042 $binding_list->clear ();
957 1043
958 for my $mod (keys %{$::CFG->{bindings}}) { 1044 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962 1048
963 my $lbl = join "; ", @$cmds; 1049 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox); 1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button 1052 $hb->add (new CFClient::UI::Button
967 text => "delete", 1053 text => "delete",
1054 tooltip => "Deletes the binding",
968 on_activate => sub { 1055 on_activate => sub {
969 $binding_list->remove ($hb); 1056 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym}; 1057 delete $::CFG->{bindings}->{$mod}->{$sym};
971 }); 1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $::BIND_WINDOW->show;
1072 },
1073 sub {
1074 $::BIND_WINDOW->show;
1075 });
1076 $::BIND_EDITOR->show;
1077 $::BIND_WINDOW->hide;
1078 });
1079
972 $hb->add (new CFClient::UI::Label text => "($nam)"); 1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 } 1082 }
975 } 1083 }
976 }; 1084 };
977 1085
984 on_visibility_change => sub { 1092 on_visibility_change => sub {
985 my ($self, $visible) = @_; 1093 my ($self, $visible) = @_;
986 $refresh->() if $visible; 1094 $refresh->() if $visible;
987 }; 1095 };
988 1096
1097 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
989 $BIND_WINDOW->add ($binding_list); 1098 $vb->add ($binding_list);
1099 $vb->add (my $hb = new CFClient::UI::HBox);
1100 $hb->add (new CFClient::UI::Button
1101 text => "record new",
1102 expand => 1,
1103 tooltip => "This button opens the binding editor with an empty binding.",
1104 on_activate => sub {
1105 $::BIND_EDITOR->set_binding (undef, undef, [],
1106 sub {
1107 my ($mod, $sym, $cmds) = @_;
1108 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1109 $refresh->();
1110 $::BIND_WINDOW->show;
1111 },
1112 sub {
1113 $::BIND_WINDOW->show;
1114 });
1115 $::BIND_WINDOW->hide;
1116 $::BIND_EDITOR->show;
1117 },
1118 );
1119 $hb->add (new CFClient::UI::Button
1120 text => "close",
1121 tooltip => "Closes the binding window",
1122 expand => 1,
1123 on_activate => sub {
1124 $::BIND_WINDOW->hide;
1125 }
1126 );
1127
990 $refresh->(); 1128 $refresh->();
991 $BIND_WINDOW 1129 $BIND_WINDOW
992} 1130}
993 1131
994sub make_help_window { 1132sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1133 my $win = new CFClient::UI::FancyFrame
1134 x => 'center',
1135 y => 'center',
1136 name => 'doc_browser',
996 def_w => int $WIDTH * 7/8, 1137 force_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8, 1138 force_h => int $HEIGHT * 7/8,
998 title => "Documentation"; 1139 title => "Documentation";
999 1140
1000 $win->add (my $vbox = new CFClient::UI::VBox); 1141 $win->add (my $vbox = new CFClient::UI::VBox);
1001 1142
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1143 $vbox->add (my $buttons = new CFClient::UI::HBox);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1144 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1070 padding => 0, 1211 padding => 0,
1071 z => 100, 1212 z => 100,
1072 force_x => "max", 1213 force_x => "max",
1073 force_y => 0; 1214 force_y => 0;
1074 $DEBUG_STATUS->show; 1215 $DEBUG_STATUS->show;
1075 1216
1217 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1218
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1219 $STATUSBOX = new CFClient::UI::Statusbox;
1077 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1220 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1078 1221
1079 (new CFClient::UI::Frame 1222 (new CFClient::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1223 bg => [0, 0, 0, 0.4],
1082 force_y => "max", 1225 force_y => "max",
1083 child => $STATUSBOX, 1226 child => $STATUSBOX,
1084 )->show; 1227 )->show;
1085 1228
1086 CFClient::UI::FancyFrame->new ( 1229 CFClient::UI::FancyFrame->new (
1230 title => "Mini Map",
1231 name => "mapmap",
1087 x => 0, 1232 x => 0,
1088 y => $FONTSIZE + 8, 1233 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1234 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1235 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1236 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1130 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1275 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1131 1276
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1277 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1133 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1278 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1134 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1279 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1135 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1280 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1281 ."You can also hit the Tab-key to show/hide the Inventory.");
1136 1282
1137 $BUTTONBAR->add (new CFClient::UI::Button 1283 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1284 text => "Save Config",
1139 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1285 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1140 on_activate => sub { 1286 on_activate => sub {
1148 tooltip => "View Documentation"); 1294 tooltip => "View Documentation");
1149 1295
1150 $BUTTONBAR->add (new CFClient::UI::Flopper 1296 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings", 1297 text => "Bindings",
1152 other => make_binding_window, 1298 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder" 1299 tooltip =>
1154 ); 1300 "Lets you define, edit and delete bindings."
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1301 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys"); 1302 ."with nothing set and the recording started. After doing the actions you "
1303 ."want to record press Insert and you will be asked to press a key-combo."
1304 ."After pressing the combo the binding will be saved automatically and the "
1305 ."binding editor closes");
1306
1307 $BUTTONBAR->add (new CFClient::UI::Flopper
1308 text => "Spells",
1309 other => make_spell_list,
1310 tooltip => "The spell list");
1311
1312 $BUTTONBAR->add (new CFClient::UI::Flopper
1313 text => "Pickup",
1314 other => make_pickup_cfg_window,
1315 tooltip => "The pickup dialog");
1316
1157 1317
1158 $BUTTONBAR->add (new CFClient::UI::Button 1318 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1319 text => "Quit",
1160 tooltip => "Terminates the program", 1320 tooltip => "Terminates the program",
1161 on_activate => sub { 1321 on_activate => sub {
1246 1406
1247my %demo;#d# 1407my %demo;#d#
1248 1408
1249sub force_refresh { 1409sub force_refresh {
1250 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1410 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1251 debug sprintf "%3.2f", $fps; 1411 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1252 1412
1253 $CFClient::UI::ROOT->draw; 1413 $CFClient::UI::ROOT->draw;
1254 1414
1255 $WANT_REFRESH = 0; 1415 $WANT_REFRESH = 0;
1256 $CAN_REFRESH = 0; 1416 $CAN_REFRESH = 0;
1489=head1 USAGE 1649=head1 USAGE
1490 1650
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1651cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1652fullscreen and interactively.
1493 1653
1654=head1 DEBUGGING
1655
1656
1657CFPLUS_DEBUG - environment variable
1658
1659 1 draw borders around widgets
1660 2 add low-level widget info to tooltips
1661 4 show fps
1662 8 suppress tooltips
1663
1494=head1 AUTHOR 1664=head1 AUTHOR
1495 1665
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1666Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1667
1498 1668

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines