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.44 by elmex, Fri Jun 2 16:32:12 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 title => "Autopickup configuration",
939 x => "center",
940 y => "center",
941 force_w => $WIDTH * 3/10,
942 force_h => $HEIGHT * 9/10;
943
944 my $tbl = new CFClient::UI::Table;
945 my $tblrow = 0;
946
947 $PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl, expand => 1);
948
949 for (
950 ["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE],
951 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
952 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
953 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
954 ["Weapons"],
955 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
956 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
957 ["Bows" => CFClient::Pickup::PU_BOW],
958 ["Arrows" => CFClient::Pickup::PU_ARROW],
959 ["Armour"],
960 ["Helmets" => CFClient::Pickup::PU_HELMET],
961 ["Shields" => CFClient::Pickup::PU_SHIELD],
962 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
963 ["Boots" => CFClient::Pickup::PU_BOOTS],
964 ["Gloves" => CFClient::Pickup::PU_GLOVES],
965 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
966 ["Readables"],
967 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
968 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
969 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
970 ["Misc"],
971 ["Food" => CFClient::Pickup::PU_FOOD],
972 ["Drinks" => CFClient::Pickup::PU_DRINK],
973 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
974 ["Keys" => CFClient::Pickup::PU_KEY],
975 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
976 ["Potions" => CFClient::Pickup::PU_POTION],
977 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
978 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
979 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
980 )
981 {
982 unless (defined $_->[1]) {
983 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0);
984 } else {
985 my $mask = $_->[1];
986 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1);
987 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
988 state => $CFG->{pickup} & $mask,
989 on_changed => sub {
990 my ($box, $value) = @_;
991 if ($value) {
992 $CFG->{pickup} |= $mask;
993 } else {
994 $CFG->{pickup} = $CFG->{pickup} & ~$mask;
995 }
996 $::CONN->send (sprintf "command pickup %u", $CFG->{pickup});
997 });
998 }
999 }
1000
1001 $PICKUP_CFG
1002}
1003
924sub make_inventory_window { 1004sub make_inventory_window {
925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
926 x => "center", 1006 x => "center",
927 y => "center", 1007 y => "center",
928 force_w => $WIDTH * 9/10, 1008 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10, 1009 force_h => $HEIGHT * 9/10,
930 title => "Inventory", 1010 title => "Inventory",
931 name => "inventory_window",
932 ; 1011 ;
933 1012
934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
935 1014
936 $hb->add (my $vb1 = new CFClient::UI::VBox); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948 1027
949 $invwin 1028 $invwin
950} 1029}
951 1030
1031sub make_spell_list {
1032 $SPELL_LIST = new CFClient::UI::SpellList
1033 force_w => $WIDTH * (9/10),
1034 force_h => $HEIGHT * (9/10);
1035 $SPELL_LIST
1036}
1037
952sub make_binding_window { 1038sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox; 1039 my $binding_list = new CFClient::UI::VBox;
954 1040
1041 my $refresh;
955 my $refresh = sub { 1042 $refresh = sub {
956 $binding_list->clear (); 1043 $binding_list->clear ();
957 1044
958 for my $mod (keys %{$::CFG->{bindings}}) { 1045 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1046 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1047 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1048 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962 1049
963 my $lbl = join "; ", @$cmds; 1050 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1051 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox); 1052 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button 1053 $hb->add (new CFClient::UI::Button
967 text => "delete", 1054 text => "delete",
1055 tooltip => "Deletes the binding",
968 on_activate => sub { 1056 on_activate => sub {
969 $binding_list->remove ($hb); 1057 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym}; 1058 delete $::CFG->{bindings}->{$mod}->{$sym};
971 }); 1059 });
1060
1061 $hb->add (new CFClient::UI::Button
1062 text => "edit",
1063 tooltip => "Edits the binding",
1064 on_activate => sub {
1065 $::BIND_EDITOR->set_binding (
1066 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1067 sub {
1068 my ($nmod, $nsym, $ncmds) = @_;
1069 delete $::CFG->{bindings}->{$mod}->{$sym};
1070 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1071 $refresh->();
1072 $::BIND_WINDOW->show;
1073 },
1074 sub {
1075 $::BIND_WINDOW->show;
1076 });
1077 $::BIND_EDITOR->show;
1078 $::BIND_WINDOW->hide;
1079 });
1080
972 $hb->add (new CFClient::UI::Label text => "($nam)"); 1081 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1082 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 } 1083 }
975 } 1084 }
976 }; 1085 };
977 1086
984 on_visibility_change => sub { 1093 on_visibility_change => sub {
985 my ($self, $visible) = @_; 1094 my ($self, $visible) = @_;
986 $refresh->() if $visible; 1095 $refresh->() if $visible;
987 }; 1096 };
988 1097
1098 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
989 $BIND_WINDOW->add ($binding_list); 1099 $vb->add ($binding_list);
1100 $vb->add (my $hb = new CFClient::UI::HBox);
1101 $hb->add (new CFClient::UI::Button
1102 text => "record new",
1103 expand => 1,
1104 tooltip => "This button opens the binding editor with an empty binding.",
1105 on_activate => sub {
1106 $::BIND_EDITOR->set_binding (undef, undef, [],
1107 sub {
1108 my ($mod, $sym, $cmds) = @_;
1109 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1110 $refresh->();
1111 $::BIND_WINDOW->show;
1112 },
1113 sub {
1114 $::BIND_WINDOW->show;
1115 });
1116 $::BIND_WINDOW->hide;
1117 $::BIND_EDITOR->show;
1118 },
1119 );
1120 $hb->add (new CFClient::UI::Button
1121 text => "close",
1122 tooltip => "Closes the binding window",
1123 expand => 1,
1124 on_activate => sub {
1125 $::BIND_WINDOW->hide;
1126 }
1127 );
1128
990 $refresh->(); 1129 $refresh->();
991 $BIND_WINDOW 1130 $BIND_WINDOW
992} 1131}
993 1132
994sub make_help_window { 1133sub make_help_window {
995 my $win = new CFClient::UI::FancyFrame 1134 my $win = new CFClient::UI::FancyFrame
1135 x => 'center',
1136 y => 'center',
1137 name => 'doc_browser',
996 def_w => int $WIDTH * 7/8, 1138 force_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8, 1139 force_h => int $HEIGHT * 7/8,
998 title => "Documentation"; 1140 title => "Documentation";
999 1141
1000 $win->add (my $vbox = new CFClient::UI::VBox); 1142 $win->add (my $vbox = new CFClient::UI::VBox);
1001 1143
1002 $vbox->add (my $buttons = new CFClient::UI::HBox); 1144 $vbox->add (my $buttons = new CFClient::UI::HBox);
1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1145 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1070 padding => 0, 1212 padding => 0,
1071 z => 100, 1213 z => 100,
1072 force_x => "max", 1214 force_x => "max",
1073 force_y => 0; 1215 force_y => 0;
1074 $DEBUG_STATUS->show; 1216 $DEBUG_STATUS->show;
1075 1217
1218 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1219
1076 $STATUSBOX = new CFClient::UI::Statusbox; 1220 $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]); 1221 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1078 1222
1079 (new CFClient::UI::Frame 1223 (new CFClient::UI::Frame
1080 bg => [0, 0, 0, 0.4], 1224 bg => [0, 0, 0, 0.4],
1082 force_y => "max", 1226 force_y => "max",
1083 child => $STATUSBOX, 1227 child => $STATUSBOX,
1084 )->show; 1228 )->show;
1085 1229
1086 CFClient::UI::FancyFrame->new ( 1230 CFClient::UI::FancyFrame->new (
1231 title => "Mini Map",
1232 name => "mapmap",
1087 x => 0, 1233 x => 0,
1088 y => $FONTSIZE + 8, 1234 y => $FONTSIZE + 8,
1089 border_bg => [1, 1, 1, 192/255], 1235 border_bg => [1, 1, 1, 192/255],
1090 bg => [1, 1, 1, 0], 1236 bg => [1, 1, 1, 0],
1091 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1237 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 1276 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 1277
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1278 $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."); 1279 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, 1280 $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 :)."); 1281 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1282 ."You can also hit the Tab-key to show/hide the Inventory.");
1136 1283
1137 $BUTTONBAR->add (new CFClient::UI::Button 1284 $BUTTONBAR->add (new CFClient::UI::Button
1138 text => "Save Config", 1285 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.", 1286 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 { 1287 on_activate => sub {
1148 tooltip => "View Documentation"); 1295 tooltip => "View Documentation");
1149 1296
1150 $BUTTONBAR->add (new CFClient::UI::Flopper 1297 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings", 1298 text => "Bindings",
1152 other => make_binding_window, 1299 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder" 1300 tooltip =>
1154 ); 1301 "Lets you define, edit and delete bindings."
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window, 1302 ."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"); 1303 ."with nothing set and the recording started. After doing the actions you "
1304 ."want to record press Insert and you will be asked to press a key-combo."
1305 ."After pressing the combo the binding will be saved automatically and the "
1306 ."binding editor closes");
1307
1308 $BUTTONBAR->add (new CFClient::UI::Flopper
1309 text => "Spells",
1310 other => make_spell_list,
1311 tooltip => "The spell list");
1312
1313 $BUTTONBAR->add (new CFClient::UI::Flopper
1314 text => "Pickup",
1315 other => make_pickup_cfg_window,
1316 tooltip => "The pickup dialog");
1317
1157 1318
1158 $BUTTONBAR->add (new CFClient::UI::Button 1319 $BUTTONBAR->add (new CFClient::UI::Button
1159 text => "Quit", 1320 text => "Quit",
1160 tooltip => "Terminates the program", 1321 tooltip => "Terminates the program",
1161 on_activate => sub { 1322 on_activate => sub {
1246 1407
1247my %demo;#d# 1408my %demo;#d#
1248 1409
1249sub force_refresh { 1410sub force_refresh {
1250 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1411 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1251 debug sprintf "%3.2f", $fps; 1412 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1252 1413
1253 $CFClient::UI::ROOT->draw; 1414 $CFClient::UI::ROOT->draw;
1254 1415
1255 $WANT_REFRESH = 0; 1416 $WANT_REFRESH = 0;
1256 $CAN_REFRESH = 0; 1417 $CAN_REFRESH = 0;
1489=head1 USAGE 1650=head1 USAGE
1490 1651
1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1652cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1492fullscreen and interactively. 1653fullscreen and interactively.
1493 1654
1655=head1 DEBUGGING
1656
1657
1658CFPLUS_DEBUG - environment variable
1659
1660 1 draw borders around widgets
1661 2 add low-level widget info to tooltips
1662 4 show fps
1663 8 suppress tooltips
1664
1494=head1 AUTHOR 1665=head1 AUTHOR
1495 1666
1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1667Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1497 1668
1498 1669

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines