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.36 by elmex, Tue May 30 14:59:26 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
… …
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
86our $SERVER_SETUP; 88our $HOST_ENTRY;
87 89
90our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER;
93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
88our $FLOORBOX; 98our $FLOORBOX;
89our $GAUGES; 99our $GAUGES;
90our $STATWIDS; 100our $STATWIDS;
91 101
92our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
103our $INV_WINDOW; 113our $INV_WINDOW;
104our $INV; 114our $INV;
105our $INVR; 115our $INVR;
106our $INV_RIGHT_HB; 116our $INV_RIGHT_HB;
107 117
108our $BIND_WINDOW;
109our $BIND_EDITOR; 118our $BIND_EDITOR;
119
120our $PICKUP_CFG;
110 121
111sub status { 122sub status {
112 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
113} 124}
114 125
115sub debug { 126sub debug {
116 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
117} 128}
118 129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
309}
310
119sub start_game { 311sub start_game {
120 status "logging in..."; 312 status "logging in...";
121 313
122 $LOGIN_BUTTON->set_text ("Logout"); 314 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide; 315 $SETUP_DIALOG->hide;
124 316
125 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 317 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
126 318
127 my ($host, $port) = split /:/, $CFG->{host}; 319 my ($host, $port) = split /:/, $CFG->{host};
128 320
… …
140 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
141 logview => $LOGVIEW, 333 logview => $LOGVIEW,
142 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
143 map => $MAP, 335 map => $MAP,
144 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
145 338
146 sound_play => sub { 339 sound_play => sub {
147 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
148 341
149 $SDL_MIXER 342 $SDL_MIXER
… …
166 } 359 }
167} 360}
168 361
169sub stop_game { 362sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login"); 363 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show; 364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show;
172 $INV_WINDOW->hide; 366 $INV_WINDOW->hide;
173 $LOGVIEW->hide;
174 367
175 return unless $CONN; 368 return unless $CONN;
176 369
177 status "connection closed"; 370 status "connection closed";
178 371
372 destroy_query_dialog $CONN;
179 $CONN->destroy; 373 $CONN->destroy;
180 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
181} 375}
182 376
183sub client_setup { 377sub graphics_setup {
184 my $dialog = new CFClient::UI::FancyFrame
185 x => 1,
186 y => $HEIGHT * (1/8),
187 name => "client_setup",
188 title => "Client Setup",
189 child => (my $vbox = new CFClient::UI::VBox); 378 my $vbox = new CFClient::UI::VBox;
190 379
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 380 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
192 381
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 382 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
318 on_activate => sub { 507 on_activate => sub {
319 video_shutdown (); 508 video_shutdown ();
320 video_init (); 509 video_init ();
321 } 510 }
322 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
323 522
324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
327 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 526 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
… …
358 audio_shutdown (); 557 audio_shutdown ();
359 audio_init (); 558 audio_init ();
360 } 559 }
361 ); 560 );
362 561
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 562 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376} 563}
377 564
378sub set_stats_window_fontsize { 565sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) { 566 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize}); 567 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
439 626
440 $win 627 $win
441} 628}
442 629
443 630
444sub make_stats_window { 631sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 632 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8), 633 y => $HEIGHT * (2/8),
447 x => "max", 634 x => "max",
448 title => "Stats", 635 title => "Stats",
449 name => "stats_window"; 636 name => "stats_window";
… …
553 update_stats_window ({}); 740 update_stats_window ({});
554 741
555 $tgw 742 $tgw
556} 743}
557 744
558sub formsep { 745sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 747}
561 748
562sub update_stats_window { 749sub update_stats_window {
563 my ($stats) = @_; 750 my ($stats) = @_;
564 751
… …
626 813
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 815 for keys %tbl;
629} 816}
630 817
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639}
640
641my $METASERVER_ATIME; 818my $METASERVER_ATIME;
642 819
643sub update_metaserver { 820sub update_metaserver {
644 my ($HOST) = @_;
645
646 return if $METASERVER_ATIME > time; 821 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 822 $METASERVER_ATIME = time + 60;
648 823
649 my $table = $METASERVER->{table}; 824 my $table = $METASERVER->{table};
650 $table->clear; 825 $table->clear;
… …
702 877
703 $y++; 878 $y++;
704 879
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 880 $table->add (0, $y, new CFClient::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 881 (new CFClient::UI::Button text => "Use", on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 882 $HOST_ENTRY->set_text ($CFG->{host} = $host);
883 $METASERVER->toggle_visibility;
708 }), 884 }),
709 (new CFClient::UI::Empty expand => 1), 885 (new CFClient::UI::Empty expand => 1),
710 ]); 886 ]);
711 887
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 888 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
715 } 891 }
716 } 892 }
717 }); 893 });
718} 894}
719 895
896sub metaserver_dialog {
897 my $dialog = new CFClient::UI::FancyFrame
898 title => "Server List",
899 name => 'metaserver_dialog',
900 x => 'center',
901 y => 'center',
902 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox),
904 on_visibility_change => sub {
905 update_metaserver if $_[1];
906 },
907 ;
908
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910
911 $dialog
912}
913
720sub server_setup { 914sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
724 name => "server_setup",
725 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 915 my $vbox = new CFClient::UI::VBox;
727 ;
728 916
729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 917 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 918 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
731 919
732 { 920 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 922
735 $vbox->add ( 923 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 924 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 925 expand => 1,
738 text => $CFG->{host}, 926 text => $CFG->{host},
739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 927 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740 on_changed => sub { 928 on_changed => sub {
741 my ($self, $value) = @_; 929 my ($self, $value) = @_;
… …
743 } 931 }
744 ); 932 );
745 933
746 $METASERVER = metaserver_dialog; 934 $METASERVER = metaserver_dialog;
747 935
748 $vbox->add (new CFClient::UI::Flopper 936 $vbox->add (new CFClient::UI::Button
749 expand => 1, 937 expand => 1,
750 text => "Server List", 938 text => "Server List",
751 other => $METASERVER, 939 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 940 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 941 on_activate => sub { $METASERVER->toggle_visibility },
754 update_metaserver $HOST;
755 }
756 ); 942 );
757 } 943 }
758 944
759 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 945 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
760 $table->add (1, 4, new CFClient::UI::Entry 946 $table->add (1, 4, new CFClient::UI::Entry
… …
827 $CONN ? stop_game 1013 $CONN ? stop_game
828 : start_game; 1014 : start_game;
829 }, 1015 },
830 ); 1016 );
831 1017
832 $dialog 1018 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1020 text => $CFG->{say_command},
1021 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1022 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024 on_changed => sub {
1025 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value;
1027 }
1028 );
1029
1030 $vbox
833} 1031}
834 1032
835sub message_window { 1033sub message_window {
836 my $window = new CFClient::UI::FancyFrame 1034 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 1035 name => "message_window",
838 title => "Messages", 1036 title => "Messages",
839 border_bg => [1, 1, 1, 1], 1037 border_bg => [1, 1, 1, 1],
840 bg => [0, 0, 0, 0.75], 1038 bg => [0, 0, 0, 0.75],
841 x => "max", 1039 x => "max",
842 y => 0, 1040 y => 0,
843 force_w => $::WIDTH / 3, 1041 force_w => $::WIDTH * 0.4,
844 force_h => $::HEIGHT / 5, 1042 force_h => $::HEIGHT * 0.5,
845 child => (my $vbox = new CFClient::UI::VBox); 1043 child => (my $vbox = new CFClient::UI::VBox);
846 1044
847 $vbox->add ($LOGVIEW); 1045 $vbox->add ($LOGVIEW);
848 1046
849 $vbox->add (my $input = new CFClient::UI::Entry 1047 $vbox->add (my $input = new CFClient::UI::Entry
… …
863 }, 1061 },
864 on_activate => sub { 1062 on_activate => sub {
865 my ($input, $text) = @_; 1063 my ($input, $text) = @_;
866 $input->set_text (''); 1064 $input->set_text ('');
867 1065
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
873 } elsif ($text =~ /^\/(.*)/) { 1066 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 1067 $::CONN->user_send ($1);
875 } else { 1068 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 1069 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 1070 $::CONN->user_send ("$say_cmd $text");
878 } 1071 }
… …
897sub open_quit_dialog { 1090sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 1091 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 1093 x => "center",
901 y => "center", 1094 y => "center",
1095 z => 50,
902 title => "Really Quit?", 1096 title => "Really Quit?",
903 ; 1097 ;
904 1098
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 1100
… …
923 } 1117 }
924 1118
925 $QUIT_DIALOG->show; 1119 $QUIT_DIALOG->show;
926} 1120}
927 1121
1122sub autopickup_setup {
1123 my $table = new CFClient::UI::Table;
1124
1125 for (
1126 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG],
1131 ],
1132 ["Weapons", 0, 6,
1133 ["All weapons" => PICKUP_ALLWEAPON],
1134 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1135 ["Bows" => PICKUP_BOW],
1136 ["Arrows" => PICKUP_ARROW],
1137 ],
1138 ["Armour", 0, 12,
1139 ["Helmets" => PICKUP_HELMET],
1140 ["Shields" => PICKUP_SHIELD],
1141 ["Body Armour" => PICKUP_ARMOUR],
1142 ["Boots" => PICKUP_BOOTS],
1143 ["Gloves" => PICKUP_GLOVES],
1144 ["Cloaks" => PICKUP_CLOAK],
1145 ],
1146
1147 ["Readables", 2, 2,
1148 ["Spellbooks" => PICKUP_SPELLBOOK],
1149 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1150 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ],
1152 ["Misc", 2, 7,
1153 ["Food" => PICKUP_FOOD],
1154 ["Drinks" => PICKUP_DRINK],
1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1156 ["Keys" => PICKUP_KEY],
1157 ["Magical Items" => PICKUP_MAGICAL],
1158 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS],
1162 ],
1163 )
1164 {
1165 my ($title, $x, $y, @bits) = @$_;
1166 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167
1168 for (@bits) {
1169 ++$y;
1170
1171 my $mask = $_->[1];
1172 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1174 state => $CFG->{pickup} & $mask,
1175 on_changed => sub {
1176 my ($box, $value) = @_;
1177 if ($value) {
1178 $::CFG->{pickup} |= $mask;
1179 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
1181 }
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
1183 if defined $::CONN;
1184 });
1185 }
1186 }
1187
1188 $table
1189}
1190
928sub make_inventory_window { 1191sub inventory_window {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1192 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1193 x => "center",
931 y => "center", 1194 y => "center",
932 force_w => $WIDTH * 9/10, 1195 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1196 force_h => $HEIGHT * 9/10,
934 title => "Inventory", 1197 title => "Inventory",
935 name => "inventory_window",
936 ; 1198 ;
937 1199
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1200 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
939 1201
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1202 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952 1214
953 $invwin 1215 $invwin
954} 1216}
955 1217
956sub make_binding_window { 1218sub spell_setup {
1219 new CFClient::UI::SpellList
1220}
1221
1222sub keyboard_setup {
957 my $binding_list = new CFClient::UI::VBox; 1223 my $binding_list = new CFClient::UI::VBox;
958 1224
959 my $refresh; 1225 my $refresh;
960 $refresh = sub { 1226 $refresh = sub {
961 $binding_list->clear (); 1227 $binding_list->clear ();
… …
985 sub { 1251 sub {
986 my ($nmod, $nsym, $ncmds) = @_; 1252 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym}; 1253 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->(); 1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
990 $::BIND_WINDOW->show; 1257 $SETUP_DIALOG->show;
991 }, 1258 },
992 sub { 1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
993 $::BIND_WINDOW->show; 1261 $SETUP_DIALOG->show;
994 }); 1262 });
995 $::BIND_EDITOR->show; 1263 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide; 1264 $SETUP_DIALOG->hide;
997 }); 1265 });
998 1266
999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1001 } 1269 }
1002 } 1270 }
1003 }; 1271 };
1004 1272
1005 $BIND_WINDOW = new CFClient::UI::FancyFrame
1006 title => "Bindings",
1007 x => "center",
1008 y => "center",
1009 def_w => int $WIDTH * 9/10,
1010 def_h => int $HEIGHT * 9/10,
1011 on_visibility_change => sub {
1012 my ($self, $visible) = @_;
1013 $refresh->() if $visible;
1014 };
1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1273 my $vb = new CFClient::UI::VBox;
1017 $vb->add ($binding_list); 1274 $vb->add ($binding_list);
1018 $vb->add (my $hb = new CFClient::UI::HBox); 1275 $vb->add (my $hb = new CFClient::UI::HBox);
1276
1019 $hb->add (new CFClient::UI::Button 1277 $hb->add (new CFClient::UI::Button
1020 text => "record new", 1278 text => "record new",
1021 expand => 1, 1279 expand => 1,
1022 tooltip => "This button opens the binding editor with an empty binding.", 1280 tooltip => "This button opens the binding editor with an empty binding.",
1023 on_activate => sub { 1281 on_activate => sub {
1024 $::BIND_EDITOR->set_binding (undef, undef, [], 1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1025 sub { 1283 sub {
1026 my ($mod, $sym, $cmds) = @_; 1284 my ($mod, $sym, $cmds) = @_;
1027 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1028 $refresh->(); 1286 $refresh->();
1029 $::BIND_WINDOW->show; 1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1030 }, 1289 },
1031 sub { 1290 sub {
1032 $::BIND_WINDOW->show; 1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1033 }); 1293 },
1034 $::BIND_WINDOW->hide; 1294 );
1295 $SETUP_DIALOG->hide;
1035 $::BIND_EDITOR->show; 1296 $::BIND_EDITOR->show;
1036 }, 1297 },
1037 ); 1298 );
1299
1038 $hb->add (new CFClient::UI::Button 1300 $hb->add (new CFClient::UI::Button
1039 text => "close", 1301 text => "close",
1040 tooltip => "Closes the binding window", 1302 tooltip => "Closes the binding window",
1041 expand => 1, 1303 expand => 1,
1042 on_activate => sub { 1304 on_activate => sub {
1043 $::BIND_WINDOW->hide; 1305 $SETUP_DIALOG->hide;
1044 } 1306 }
1045 ); 1307 );
1046 1308
1047 $refresh->(); 1309 $refresh->();
1048 $BIND_WINDOW 1310
1311 $vb
1049} 1312}
1050 1313
1051sub make_help_window { 1314sub make_help_window {
1052 my $win = new CFClient::UI::FancyFrame 1315 my $win = new CFClient::UI::FancyFrame
1316 x => 'center',
1317 y => 'center',
1318 z => 2,
1319 name => 'doc_browser',
1053 def_w => int $WIDTH * 7/8, 1320 force_w => int $WIDTH * 7/8,
1054 def_h => int $HEIGHT * 7/8, 1321 force_h => int $HEIGHT * 7/8,
1055 title => "Documentation"; 1322 title => "Documentation";
1056 1323
1057 $win->add (my $vbox = new CFClient::UI::VBox); 1324 $win->add (my $vbox = new CFClient::UI::VBox);
1058 1325
1059 $vbox->add (my $buttons = new CFClient::UI::HBox); 1326 $vbox->add (my $buttons = new CFClient::UI::HBox);
1060 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
1068 my ($pod, $label) = @$_; 1335 my ($pod, $label) = @$_;
1069 1336
1070 $buttons->add (new CFClient::UI::Button 1337 $buttons->add (new CFClient::UI::Button
1071 text => $label, 1338 text => $label,
1072 on_activate => sub { 1339 on_activate => sub {
1073 my $parser = new Pod::POM; 1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1074 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1075 1342
1076 $viewer->clear; 1343 $viewer->clear;
1077 1344
1078 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1079 for @{ CFClient::pod_to_pango_list $pom }; 1346 for @$pom;
1080 1347
1081 $viewer->set_offset (0); 1348 $viewer->set_offset (0);
1082 }, 1349 },
1083 ); 1350 );
1084 } 1351 }
… …
1131 $DEBUG_STATUS->show; 1398 $DEBUG_STATUS->show;
1132 1399
1133 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1134 1401
1135 $STATUSBOX = new CFClient::UI::Statusbox; 1402 $STATUSBOX = new CFClient::UI::Statusbox;
1136 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1137 1404
1138 (new CFClient::UI::Frame 1405 (new CFClient::UI::Frame
1139 bg => [0, 0, 0, 0.4], 1406 bg => [0, 0, 0, 0.4],
1140 force_x => 0, 1407 force_x => 0,
1141 force_y => "max", 1408 force_y => "max",
1142 child => $STATUSBOX, 1409 child => $STATUSBOX,
1143 )->show; 1410 )->show;
1144 1411
1145 CFClient::UI::FancyFrame->new ( 1412 CFClient::UI::FancyFrame->new (
1413 title => "Map",
1414 name => "mapmap",
1146 x => 0, 1415 x => 0,
1147 y => $FONTSIZE + 8, 1416 y => $FONTSIZE + 8,
1148 border_bg => [1, 1, 1, 192/255], 1417 border_bg => [1, 1, 1, 192/255],
1149 bg => [1, 1, 1, 0], 1418 bg => [1, 1, 1, 0],
1150 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1419 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1175 can_hover => 1, 1444 can_hover => 1,
1176 can_events => 1, 1445 can_events => 1,
1177 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1446 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1178 ; 1447 ;
1179 1448
1449 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1450 title => "Setup",
1451 name => "setup_dialog",
1452 x => 'center',
1453 y => 'center',
1454 z => 2,
1455 force_w => $::WIDTH * 0.6,
1456 force_h => $::HEIGHT * 0.6,
1457 ;
1458
1459 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1460 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1461
1462 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1463 "Configure the server to play on, your username, password and other server-related options.");
1464 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1465 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1466 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1467 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1468 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1469 "Configure the use of audio, sound effects and background music.");
1470 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1471 "Lets you define, edit and delete bindings."
1472 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1473 . "with nothing set and the recording started. After doing the actions you "
1474 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1475 . "After pressing the combo the binding will be saved automatically and the "
1476 . "binding editor closes");
1477 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1478 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1479
1180 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1480 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1181 1481
1182 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1482 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1183 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1483 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1184 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1484
1185 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1186 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1485 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1187 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1486 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1188 1487
1189 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 1488 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
1190 1489
1191 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1490 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1192 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1491 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1193 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1492 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1194 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1493 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1195 ."You can also hit the Tab-key to show/hide the Inventory."); 1494 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1196 1495
1197 $BUTTONBAR->add (new CFClient::UI::Button 1496 $BUTTONBAR->add (new CFClient::UI::Button
1198 text => "Save Config", 1497 text => "Save Config",
1199 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1498 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1200 on_activate => sub { 1499 on_activate => sub {
… …
1204 }, 1503 },
1205 ); 1504 );
1206 1505
1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1506 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1208 tooltip => "View Documentation"); 1507 tooltip => "View Documentation");
1209
1210 $BUTTONBAR->add (new CFClient::UI::Flopper
1211 text => "Bindings",
1212 other => make_binding_window,
1213 tooltip =>
1214 "Lets you define, edit and delete bindings."
1215 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1216 ."with nothing set and the recording started. After doing the actions you "
1217 ."want to record press Insert and you will be asked to press a key-combo."
1218 ."After pressing the combo the binding will be saved automatically and the "
1219 ."binding editor closes"
1220 );
1221 1508
1222 $BUTTONBAR->add (new CFClient::UI::Button 1509 $BUTTONBAR->add (new CFClient::UI::Button
1223 text => "Quit", 1510 text => "Quit",
1224 tooltip => "Terminates the program", 1511 tooltip => "Terminates the program",
1225 on_activate => sub { 1512 on_activate => sub {
… …
1230 } 1517 }
1231 }, 1518 },
1232 ); 1519 );
1233 1520
1234 $BUTTONBAR->show; 1521 $BUTTONBAR->show;
1235 $SERVER_SETUP->show; 1522 $SETUP_DIALOG->show;
1236
1237 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1238 } 1523 }
1524
1525 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1239} 1526}
1240 1527
1241sub video_shutdown { 1528sub video_shutdown {
1242 undef $SDL_ACTIVE; 1529 undef $SDL_ACTIVE;
1243} 1530}
… …
1375}; 1662};
1376 1663
1377 CFClient::SDL_GL_SwapBuffers; 1664 CFClient::SDL_GL_SwapBuffers;
1378} 1665}
1379 1666
1380my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1667my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1381 $NOW = time; 1668 $NOW = time;
1382 1669
1383 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1670 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1384 for CFClient::SDL_PollEvent; 1671 for CFClient::SDL_PollEvent;
1385 1672
… …
1452############################################################################# 1739#############################################################################
1453 1740
1454$SIG{INT} = $SIG{TERM} = sub { exit }; 1741$SIG{INT} = $SIG{TERM} = sub { exit };
1455 1742
1456{ 1743{
1457 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1744 local $SIG{__DIE__} = sub {
1745 return unless defined $^S && !$^S;
1746 Carp::confess $_[1];#d#TODO: remove when stable
1747 CFClient::fatal $_[0];
1748 };
1458 1749
1459 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1750 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1460 CFClient::UI::set_layout ($::CFG->{layout}); 1751 CFClient::UI::set_layout ($::CFG->{layout});
1461 1752
1462 my %DEF_CFG = ( 1753 my %DEF_CFG = (
… …
1468 map_scale => 1, 1759 map_scale => 1,
1469 fow_enable => 1, 1760 fow_enable => 1,
1470 fow_intensity => 0.45, 1761 fow_intensity => 0.45,
1471 fow_smooth => 0, 1762 fow_smooth => 0,
1472 gui_fontsize => 1, 1763 gui_fontsize => 1,
1473 log_fontsize => 1, 1764 log_fontsize => 0.7,
1474 gauge_fontsize=> 1, 1765 gauge_fontsize=> 1,
1475 gauge_size => 0.35, 1766 gauge_size => 0.35,
1476 stat_fontsize => 1, 1767 stat_fontsize => 0.7,
1477 mapsize => 100, 1768 mapsize => 100,
1478 host => "crossfire.schmorp.de", 1769 host => "crossfire.schmorp.de",
1479 say_command => 'say', 1770 say_command => 'say',
1480 audio_enable => 1, 1771 audio_enable => 1,
1481 bgm_enable => 1, 1772 bgm_enable => 1,
… …
1553=head1 USAGE 1844=head1 USAGE
1554 1845
1555cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 1846cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1556fullscreen and interactively. 1847fullscreen and interactively.
1557 1848
1849=head1 DEBUGGING
1850
1851
1852CFPLUS_DEBUG - environment variable
1853
1854 1 draw borders around widgets
1855 2 add low-level widget info to tooltips
1856 4 show fps
1857 8 suppress tooltips
1858
1558=head1 AUTHOR 1859=head1 AUTHOR
1559 1860
1560Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1861Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1561 1862
1562 1863

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines