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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.196 by root, Tue Jul 31 02:03:13 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Pod::POM;
31use Event; 75use Event;
76use List::Util qw(max min);
32 77
33use Crossfire; 78use Crossfire;
34use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
35 80
36use Compress::LZF; 81use Compress::LZF;
37 82
38use CFClient; 83use CFPlus;
39use CFClient::OpenGL (); 84use CFPlus::OpenGL ();
40use CFClient::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
41use CFClient::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
92use CFPlus::Pod;
42use CFClient::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
43 95
96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
97$SIG{PIPE} = 'IGNORE';
98
99$Event::Eval = 1;
44$Event::DIED = sub { 100$Event::DIED = sub {
45 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
46 CFClient::error $_[1];
47}; 102};
48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50
51our $VERSION = '0.1';
52 103
53my $MAX_FPS = 60; 104my $MAX_FPS = 60;
54my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
55 106
56our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
57 108
58our $LAST_REFRESH; 109our $LAST_REFRESH;
59our $NOW; 110our $NOW;
60 111
61our $CFG; 112our $CFG;
62our $CONN; 113our $CONN;
114our $PROFILE; # current profile
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
64 116
65our $WANT_REFRESH; 117our $WANT_REFRESH;
66our $CAN_REFRESH; 118our $CAN_REFRESH;
67 119
… …
76 128
77our $MAP; 129our $MAP;
78our $MAPMAP; 130our $MAPMAP;
79our $MAPWIDGET; 131our $MAPWIDGET;
80our $BUTTONBAR; 132our $BUTTONBAR;
81our $LOGVIEW;
82our $CONSOLE;
83our $METASERVER; 133our $METASERVER;
84our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 135our $QUIT_DIALOG;
86our $SERVER_SETUP; 136our $HOST_ENTRY;
137our $FULLSCREEN_ENABLE;
138our $PICKUP_ENABLE;
139our $SERVER_INFO;
87 140
141our $SETUP_DIALOG;
142our $SETUP_NOTEBOOK;
143our $SETUP_SERVER;
144our $SETUP_KEYBOARD;
145
146our $PL_NOTEBOOK;
147our $PL_WINDOW;
148
149our $INVENTORY_PAGE;
150our $STATS_PAGE;
151our $SKILL_PAGE;
152our $SPELL_PAGE;
153our $SPELL_LIST;
154
155our $HELP_WINDOW;
156our $MESSAGE_WINDOW;
88our $FLOORBOX; 157our $FLOORBOX;
89our $GAUGES; 158our $GAUGES;
90our $STATWIDS; 159our $STATWIDS;
91 160
92our $SDL_ACTIVE; 161our $SDL_ACTIVE;
93our %SDL_CB; 162our %SDL_CB;
94 163
95our $SDL_MIXER; 164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music
167our @MUSIC_HAVE; # ambient music we want now
168our $MUSIC_START;
169our $MUSIC_PLAYING_DATA;
170our $MUSIC_PLAYING_META;
171our $MUSIC_PLAYER;
172our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
96our @SOUNDS; # event => file mapping 173our @SOUNDS; # event => file mapping
97our %AUDIO_CHUNKS; # audio files 174our %AUDIO_CHUNK; # audio files
98 175
99our $ALT_ENTER_MESSAGE; 176our $ALT_ENTER_MESSAGE;
100our $STATUSBOX; 177our $STATUSBOX;
101our $DEBUG_STATUS; 178our $DEBUG_STATUS;
102 179
103our $INV_WINDOW;
104our $INV; 180our $INV;
105our $INVR; 181our $INVR;
106our $INVR_LBL; 182our $INV_RIGHT_HB;
183
184our $PICKUP_CFG;
185
186#############################################################################
187#TODO: maybe move into own audio module...
188
189sub audio_channel_finished {
190 my ($channel) = @_;
191
192# warn "channel $channel finished\n";#d#
193}
194
195our %AUDIO_PLAY;
196our %AUDIO_CHUNK;
197
198sub audio_sound_push($) {
199 my ($face) = @_;
200
201 if (my $chunk = $AUDIO_CHUNK{$face}) {
202 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
203 my (undef, $dx, $dy, $vol) = @$_;
204
205 my $channel = CFPlus::Channel::find;
206 $channel->volume ($vol * 128 / 255);
207 $dx = $dx / 10 * 255;
208 $channel->set_panning (255 - $dx, 255 + $dx);
209
210# my $angle = $dx ? : $dx < 0 ?
211# my $distance = -$vol;
212# $channel->set_position ($angle, $distance);
213
214 $chunk->play ($channel);
215 }
216 } else {
217 # sound_meta not set means data is in flight either way
218 my $meta = $CONN->{sound_meta}{$face}
219 or return;
220
221 # fetch from database
222 CFPlus::DB::get res_data => $meta->{name}, sub {
223 my $rwops = new CFPlus::RW $_[0];
224 my $chunk = new CFPlus::MixChunk $rwops;
225 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
226 $AUDIO_CHUNK{$face} = $chunk;
227
228 audio_sound_push ($face);
229 };
230 }
231}
232
233sub audio_sound_play {
234 my ($face, $dx, $dy, $vol) = @_;
235
236 $SDL_MIXER
237 or return;
238
239 my $queue = $AUDIO_PLAY{$face} ||= [];
240 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
241 audio_sound_push $face
242 unless @$queue > 1;
243}
244
245sub audio_music_update_volume {
246 return unless $MUSIC_PLAYING_META;
247 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
248 my $base = $CFG->{bgm_volume};
249 CFPlus::MixMusic::volume $base * $volume * 128;
250}
251
252sub audio_music_push {
253 my @have =
254 grep $_,
255 map $CONN->{music_meta}{$_},
256 @$MUSIC_WANT;
257
258 if (@have) {
259 @MUSIC_HAVE = @have;
260 &audio_music_changed ();
261 }
262}
263
264sub audio_music_set_ambient {
265 my ($songs) = @_;
266
267 $MUSIC_WANT = $songs;
268
269 audio_music_push;
270}
271
272sub audio_music_start {
273 my $meta = $MUSIC_PLAYING_META;
274
275 CFPlus::DB::get res_data => $meta->{name}, sub {
276 return unless $SDL_MIXER;
277
278 # music might have changed...
279 $meta eq $MUSIC_PLAYING_META
280 or return &audio_music_start ();
281
282 audio_music_update_volume;
283
284 $MUSIC_PLAYING_DATA = \$_[0];
285
286 my $rwops = $meta->{path}
287 ? new_from_file CFPlus::RW $meta->{path}
288 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
289
290 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
291 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
292
293 my $NOW = time;
294
295 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
296 my $pos = $MUSIC_PLAYING_META->{stop_pos};
297 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
298 $MUSIC_START = time - $pos;
299 } else {
300 $MUSIC_PLAYER->play (0);
301 $MUSIC_START = time;
302 }
303
304 delete $MUSIC_PLAYING_META->{stop_time};
305 delete $MUSIC_PLAYING_META->{stop_pos};
306 }
307}
308
309sub audio_music_changed {
310 return unless $CFG->{bgm_enable};
311 return unless $SDL_MIXER;
312
313 # default MUSIC_HAVE == MUSIC_DEFAULT
314 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
315
316 # if the currently playing song is acceptable, let it continue
317 return if $MUSIC_PLAYING_META
318 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
319
320 my $NOW = time;
321
322 if ($MUSIC_PLAYING_META) {
323 $MUSIC_PLAYING_META->{stop_time} = $NOW;
324 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
325 CFPlus::MixMusic::fade_out 1000;
326 } else {
327 # sort by stop time, oldest first
328 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
329
330 # if the most recently-played piece played very recently,
331 # resume it, else choose the oldest piece for rotation.
332 $MUSIC_PLAYING_META =
333 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
334 ? $MUSIC_HAVE[-1]
335 : $MUSIC_HAVE[0];
336
337 audio_music_start;
338 }
339}
340
341sub audio_music_finished {
342 undef $MUSIC_PLAYER;
343 undef $MUSIC_PLAYING_META;
344 undef $MUSIC_PLAYING_DATA;
345
346 audio_music_changed;
347}
348
349#############################################################################
107 350
108sub status { 351sub status {
109 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 352 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110} 353}
111 354
112sub debug { 355sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 356 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request; 357}
115 $DEBUG_STATUS->move ($WIDTH - $w, 0); 358
359sub message {
360 my ($para) = @_;
361 $MESSAGE_WINDOW->message ($para);
362}
363
364sub destroy_query_dialog {
365 (delete $_[0]{query_dialog})->destroy
366 if $_[0]{query_dialog};
367}
368
369# FIXME: a very ugly hack to wait for stat update look below! #d#
370our $QUERY_TIMER; #d#
371
372# server query dialog
373sub server_query {
374 my ($conn, $flags, $prompt) = @_;
375
376 # FIXME: a very ugly hack to wait for stat update #d#
377 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
378 unless ($QUERY_TIMER) {
379 $QUERY_TIMER =
380 Event->timer (
381 after => 1,
382 cb => sub {
383 server_query ($conn, $flags, $prompt, 1);
384 $QUERY_TIMER = undef
385 }
386 );
387 return;
388 }
389 }
390
391 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
392 x => "center",
393 y => "center",
394 title => "Server Query",
395 child => my $vbox = new CFPlus::UI::VBox,
396 ;
397
398 my @dialog = my $label = new CFPlus::UI::Label
399 max_w => $::WIDTH * 0.8,
400 ellipsise => 0,
401 text => $prompt;
402
403 if ($flags & CS_QUERY_YESNO) {
404 push @dialog, my $hbox = new CFPlus::UI::HBox;
405
406 $hbox->add (new CFPlus::UI::Button
407 text => "No",
408 on_activate => sub {
409 $conn->send ("reply n");
410 $dialog->destroy;
411 0
412 }
413 );
414 $hbox->add (new CFPlus::UI::Button
415 text => "Yes",
416 on_activate => sub {
417 $conn->send ("reply y");
418 destroy_query_dialog $conn;
419 0
420 },
421 );
422
423 $dialog->grab_focus;
424
425 } elsif ($flags & CS_QUERY_SINGLECHAR) {
426 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
427 $dialog->{tooltip} = "#charcreation_focus";
428
429 unshift @dialog, new CFPlus::UI::Label
430 max_w => $::WIDTH * 0.8,
431 ellipsise => 0,
432 markup => "\nOr use your keyboard and the text entry below:\n";
433
434 unshift @dialog, my $table = new CFPlus::UI::Table;
435
436 $table->add_at (0, 0, new CFPlus::UI::Button
437 text => "Next Race",
438 on_activate => sub {
439 $conn->send ("reply n");
440 destroy_query_dialog $conn;
441 0
442 },
443 );
444 $table->add_at (2, 0, new CFPlus::UI::Button
445 text => "Accept",
446 on_activate => sub {
447 $conn->send ("reply d");
448 destroy_query_dialog $conn;
449 0
450 },
451 );
452
453 if ($conn->{chargen_race_description}) {
454 unshift @dialog, new CFPlus::UI::Label
455 max_w => $::WIDTH * 0.8,
456 ellipsise => 0,
457 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
458 ;
459 }
460
461 unshift @dialog, new CFPlus::UI::Face
462 face => $conn->{player}{face},
463 bg => [.2, .2, .2, 1],
464 min_w => 64,
465 min_h => 64,
466 ;
467
468 if ($conn->{chargen_race_title}) {
469 unshift @dialog, new CFPlus::UI::Label
470 allign => 1,
471 ellipsise => 0,
472 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
473 ;
474 }
475
476 unshift @dialog, new CFPlus::UI::Label
477 max_w => $::WIDTH * 0.4,
478 ellipsise => 0,
479 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
480 ;
481
482 } elsif ($prompt =~ /roll new stats/) {
483 if (my $stat = delete $conn->{stat_change_with}) {
484 $conn->send ("reply $stat");
485 destroy_query_dialog $conn;
486 return;
487 }
488
489 unshift @dialog, new CFPlus::UI::Label
490 max_w => $::WIDTH * 0.4,
491 ellipsise => 0,
492 markup => "\nOr use your keyboard and the text entry below:\n";
493
494 unshift @dialog, my $table = new CFPlus::UI::Table;
495
496 # left: re-roll
497 $table->add_at (0, 0, new CFPlus::UI::Button
498 text => "Roll Again",
499 on_activate => sub {
500 $conn->send ("reply y");
501 destroy_query_dialog $conn;
502 0
503 },
504 );
505
506 # center: swap stats
507 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
508 expand => 1,
509 value => $_,
510 options => [
511 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
512 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
513 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
514 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
515 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
516 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
517 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
518 ],
519 ), 1 .. 2;
520
521 $table->add_at (2, 0, new CFPlus::UI::Button
522 text => "Swap Stats",
523 on_activate => sub {
524 $conn->{stat_change_with} = $sw2->{value};
525 $conn->send ("reply $sw1->{value}");
526 destroy_query_dialog $conn;
527 0
528 },
529 );
530 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
531
532 # right: accept
533 $table->add_at (4, 0, new CFPlus::UI::Button
534 text => "Accept",
535 on_activate => sub {
536 $conn->send ("reply n");
537 $STATS_PAGE->hide;
538 destroy_query_dialog $conn;
539 0
540 },
541 );
542
543 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
544 for (
545 [Str => CS_STAT_STR],
546 [Dex => CS_STAT_DEX],
547 [Con => CS_STAT_CON],
548 [Int => CS_STAT_INT],
549 [Wis => CS_STAT_WIS],
550 [Pow => CS_STAT_POW],
551 [Cha => CS_STAT_CHA],
552 ) {
553 my ($name, $id) = @$_;
554 $hbox->add (new CFPlus::UI::Label
555 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
556 align => 0,
557 expand => 1,
558 can_events => 1,
559 can_hover => 1,
560 tooltip => "#stat_$name",
561 );
562 }
563
564 unshift @dialog, new CFPlus::UI::Label
565 max_w => $::WIDTH * 0.4,
566 ellipsise => 0,
567 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
568 ;
569 }
570
571 push @dialog, my $entry = new CFPlus::UI::Entry
572 on_changed => sub {
573 $conn->send ("reply $_[1]");
574 destroy_query_dialog $conn;
575 0
576 },
577 ;
578
579 $entry->grab_focus;
580
581 } else {
582 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
583
584 push @dialog, my $entry = new CFPlus::UI::Entry
585 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
586 on_activate => sub {
587 $conn->send ("reply $_[1]");
588 destroy_query_dialog $conn;
589 0
590 },
591 ;
592
593 $entry->grab_focus;
594 }
595
596 $vbox->add (@dialog);
597 $dialog->show;
116} 598}
117 599
118sub start_game { 600sub start_game {
119 status "logging in..."; 601 status "logging in...";
120 602
121 $LOGIN_BUTTON->set_text ("Logout"); 603 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 604 $SETUP_DIALOG->hide;
123 605
124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 606 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
125 607
126 my ($host, $port) = split /:/, $CFG->{host}; 608 my ($host, $port) = split /:/, $PROFILE->{host};
127 609
128 $MAP = new CFClient::Map $mapsize, $mapsize; 610 $MAP = new CFPlus::Map;
129 611
130 $CONN = eval { 612 $CONN = eval {
131 new CFClient::Protocol 613 new CFPlus::Protocol
132 host => $host, 614 host => $host,
133 port => $port || 13327, 615 port => $port || 13327,
134 user => $CFG->{user}, 616 user => $PROFILE->{user},
135 pass => $CFG->{password}, 617 pass => $PROFILE->{password},
136 mapw => $mapsize, 618 mapw => $mapsize,
137 maph => $mapsize, 619 maph => $mapsize,
138 620
621 client => "cfplus $CFPlus::VERSION $] $^O",
622
139 map_widget => $MAPWIDGET, 623 map_widget => $MAPWIDGET,
140 logview => $LOGVIEW,
141 statusbox => $STATUSBOX, 624 statusbox => $STATUSBOX,
142 map => $MAP, 625 map => $MAP,
143 mapmap => $MAPMAP, 626 mapmap => $MAPMAP,
627 query => \&server_query,
144 628
145 sound_play => sub { 629 setup_req => {
146 my ($x, $y, $soundnum, $type) = @_; 630 smoothing => $CFG->{map_smoothing}*1,
147
148 $SDL_MIXER
149 or return;
150
151 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
152 or return;
153
154 $chunk->play;
155 }, 631 },
156 }; 632 };
157 633
158 if ($CONN) { 634 if ($CONN) {
159 CFClient::lowdelay fileno $CONN->{fh}; 635 CFPlus::lowdelay fileno $CONN->{fh};
160 636
161 status "login successful"; 637 status "login successful";
162 } else { 638 } else {
163 status "unable to connect"; 639 status "unable to connect";
164 stop_game(); 640 stop_game();
165 } 641 }
166} 642}
167 643
168sub stop_game { 644sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 645 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 646 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
647 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 648 $PL_WINDOW->hide;
172 $LOGVIEW->hide; 649 $SPELL_LIST->clear_spells;
650 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
651
652 &audio_music_set_ambient ([]);
173 653
174 return unless $CONN; 654 return unless $CONN;
175 655
176 status "connection closed"; 656 status "connection closed";
177 657
658 destroy_query_dialog $CONN;
178 $CONN->destroy; 659 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 660 $CONN = 0; # false, does not autovivify
180}
181 661
182sub client_setup { 662 undef $MAP;
183 my $dialog = new CFClient::UI::FancyFrame 663}
184 req_x => 1, 664
185 req_y => $HEIGHT * (1/8), 665sub graphics_setup {
186 name => "client_setup", 666 my $vbox = new CFPlus::UI::VBox;
187 title => "Client Setup", 667
188 child => (my $vbox = new CFClient::UI::VBox);
189 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 668 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
190 669
670 my $row = 0;
671
672 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
673 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
674 can_events => 1,
675 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
676
677 my $vidmode_tooltip =
678 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
679 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
680
191 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 681 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
192 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 682 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
193 683
194 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 684 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
195 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 685 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
686 tooltip => $vidmode_tooltip);
687 $hbox->add (my $mode_label = new CFPlus::UI::Label
688 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
689 can_events => 1, tooltip => $vidmode_tooltip);
196 690
197 $mode_slider->connect (changed => sub { 691 $mode_slider->connect (changed => sub {
198 my ($self, $value) = @_; 692 my ($self, $value) = @_;
199 693
200 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 694 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
201 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 695 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
202 }); 696 });
203 $mode_slider->emit (changed => $mode_slider->{range}[0]); 697 $mode_slider->emit (changed => $mode_slider->{range}[0]);
204 698
205 my $row = 1;
206
207 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 699 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
208 $table->add (1, $row++, new CFClient::UI::CheckBox 700 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
209 state => $CFG->{fullscreen}, 701 state => $CFG->{fullscreen},
210 tooltip => "Bring the client into fullscreen mode.", 702 tooltip => "Bring the client into fullscreen mode.",
211 on_changed => sub { 703 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
212 my ($self, $value) = @_;
213 $CFG->{fullscreen} = $value;
214 }
215 ); 704 );
216 705
217 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 706 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
218 $table->add (1, $row++, new CFClient::UI::CheckBox 707 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
219 state => $CFG->{fast}, 708 state => $CFG->{fast},
220 tooltip => "Lower the visual quality considerably to speed up rendering.", 709 tooltip => "Lower the visual quality considerably to speed up rendering.",
710 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
711 );
712
713 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
714 $table->add_at (1, $row++, new CFPlus::UI::Slider
715 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
716 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
717 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
718 );
719
720 $table->add_at (1, $row++, new CFPlus::UI::Button
721 expand => 1, align => 0, text => "Apply",
722 tooltip => "Apply the video settings above.",
221 on_changed => sub { 723 on_activate => sub {
222 my ($self, $value) = @_; 724 video_shutdown ();
223 $CFG->{fast} = $value; 725 video_init ();
726 0
224 } 727 }
225 ); 728 );
226 729
227 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 730 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
228 $table->add (1, $row++, new CFClient::UI::Slider 731 $table->add_at (1, $row++, new CFPlus::UI::Slider
229 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 732 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
230 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 733 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
231 on_changed => sub { 734 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
232 my ($self, $value) = @_;
233 $CFG->{map_scale} = 2 ** $value;
234 }
235 ); 735 );
236 736
737 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
738 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
739 state => $CFG->{map_smoothing},
740 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
741 . "This increases load on the graphics subsystem and works only with 2.x servers. "
742 . "Changes take effect at next connection only.",
743 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
744 );
745
237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 746 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
238 $table->add (1, $row++, new CFClient::UI::CheckBox 747 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
239 state => $CFG->{fow_enable}, 748 state => $CFG->{fow_enable},
240 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 749 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
241 on_changed => sub { 750 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
242 my ($self, $value) = @_;
243 $CFG->{fow_enable} = $value;
244 }
245 ); 751 );
246 752
247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 753 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
248 $table->add (1, $row++, new CFClient::UI::Slider 754 $table->add_at (1, $row++, new CFPlus::UI::Slider
249 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 755 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
250 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 756 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
251 on_changed => sub { 757 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
252 my ($self, $value) = @_;
253 $CFG->{fow_intensity} = $value;
254 }
255 ); 758 );
256 759
257 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
258 $table->add (1, $row++, new CFClient::UI::CheckBox
259 state => $CFG->{fow_smooth},
260 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
261 on_changed => sub {
262 my ($self, $value) = @_;
263 $CFG->{fow_smooth} = $value;
264 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
265 }
266 );
267
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
269 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
271 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
272 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
273 );
274
275 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
276 $table->add (1, $row++, new CFClient::UI::Slider 761 $table->add_at (1, $row++, new CFPlus::UI::Slider
277 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 762 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
278 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 763 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
279 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 764 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
280 ); 765 );
281 766
282 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
283
284 $table->add (1, $row++, new CFClient::UI::Slider
285 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
286 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
287 on_changed => sub {
288 $CFG->{stat_fontsize} = $_[1];
289 &set_stats_window_fontsize;
290 }
291 );
292
293 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
294 $table->add (1, $row++, new CFClient::UI::Slider 768 $table->add_at (1, $row++, new CFPlus::UI::Slider
295 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 769 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
296 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 770 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
297 on_changed => sub { 771 on_changed => sub {
298 $CFG->{gauge_fontsize} = $_[1]; 772 $CFG->{gauge_fontsize} = $_[1];
299 &set_gauge_window_fontsize; 773 &set_gauge_window_fontsize;
774 0
300 } 775 }
301 ); 776 );
302 777
303 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 778 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
304 $table->add (1, $row++, new CFClient::UI::Slider 779 $table->add_at (1, $row++, new CFPlus::UI::Slider
305 range => [$CFG->{gauge_size}, 0.2, 0.8], 780 range => [$CFG->{gauge_size}, 0.2, 0.8],
306 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 781 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
307 on_changed => sub { 782 on_changed => sub {
308 $CFG->{gauge_size} = $_[1]; 783 $CFG->{gauge_size} = $_[1];
309 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 784 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
785 0
310 } 786 }
311 ); 787 );
312 788
313 $table->add (1, $row++, new CFClient::UI::Button 789 $vbox
314 expand => 1, align => 0, text => "Apply", 790}
315 tooltip => "Apply the video settings",
316 on_activate => sub {
317 video_shutdown ();
318 video_init ();
319 }
320 );
321 791
792sub audio_setup {
793 my $vbox = new CFPlus::UI::VBox;
794
795 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
796
797 my $row = 0;
798
322 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 799 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
323 $table->add (1, $row++, new CFClient::UI::CheckBox 800 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
324 state => $CFG->{audio_enable}, 801 state => $CFG->{audio_enable},
325 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.", 802 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.",
326 on_changed => sub { 803 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
327 $CFG->{audio_enable} = $_[1];
328 }
329 ); 804 );
330# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 805# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
331# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 806# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
332# $CFG->{effects_volume} = $_[1]; 807# $CFG->{effects_volume} = $_[1];
333# }); 808# });
334 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
335 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 810 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
336 $hbox->add (new CFClient::UI::CheckBox 811 $hbox->add (new CFPlus::UI::CheckBox
337 expand => 1, state => $CFG->{bgm_enable}, 812 expand => 1, state => $CFG->{bgm_enable},
338 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 813 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
339 on_changed => sub { 814 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
340 $CFG->{bgm_enable} = $_[1];
341 }
342 ); 815 );
343 $hbox->add (new CFClient::UI::Slider 816 $hbox->add (new CFPlus::UI::Slider
344 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 817 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
345 tooltip => "The volume of the background music. Changes are instant.", 818 tooltip => "The volume of the background music. Changes are instant.",
346 on_changed => sub { 819 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
347 $CFG->{bgm_volume} = $_[1];
348 CFClient::MixMusic::volume $_[1] * 128;
349 }
350 ); 820 );
351 821
352 $table->add (1, $row++, new CFClient::UI::Button 822 $table->add_at (1, $row++, new CFPlus::UI::Button
353 expand => 1, align => 0, text => "Apply", 823 expand => 1, align => 0, text => "Apply",
354 tooltip => "Apply the audio settings", 824 tooltip => "Apply the audio settings",
355 on_activate => sub { 825 on_activate => sub {
356 audio_shutdown (); 826 audio_shutdown ();
357 audio_init (); 827 audio_init ();
828 0
358 } 829 }
359 ); 830 );
360 831
361 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 832 $vbox
362 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363 text => $CFG->{say_command},
364 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. "
365 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367 on_changed => sub {
368 my ($self, $value) = @_;
369 $CFG->{say_command} = $value;
370 }
371 );
372
373 $dialog
374}
375
376sub set_stats_window_fontsize {
377 for (values %{$STATWIDS}) {
378 $_->set_fontsize ($::CFG->{stat_fontsize});
379 }
380} 833}
381 834
382sub set_gauge_window_fontsize { 835sub set_gauge_window_fontsize {
383 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 836 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
384 $_->set_fontsize ($::CFG->{gauge_fontsize}); 837 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
386} 839}
387 840
388sub make_gauge_window { 841sub make_gauge_window {
389 my $gh = int $HEIGHT * $CFG->{gauge_size}; 842 my $gh = int $HEIGHT * $CFG->{gauge_size};
390 843
391 my $win = new CFClient::UI::Frame ( 844 my $win = new CFPlus::UI::Frame (
392 req_x => 0, 845 force_x => 0,
393 req_y => -1, 846 force_y => "max",
394 def_w => $WIDTH, 847 force_w => $WIDTH,
395 def_h => $gh, 848 force_h => $gh,
396 ); 849 );
397 850
398 $win->add (my $hbox = new CFClient::UI::HBox 851 $win->add (my $hbox = new CFPlus::UI::HBox
399 children => [ 852 children => [
400 (new CFClient::UI::HBox expand => 1), 853 (new CFPlus::UI::HBox expand => 1),
401 (new CFClient::UI::VBox children => [ 854 (new CFPlus::UI::VBox children => [
402 (new CFClient::UI::Empty expand => 1), 855 (new CFPlus::UI::Empty expand => 1),
403 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 856 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
404 ]), 857 ]),
405 (my $vbox = new CFClient::UI::VBox), 858 (my $vbox = new CFPlus::UI::VBox),
406 ], 859 ],
407 ); 860 );
408 861
409 $vbox->add (new CFClient::UI::HBox 862 $vbox->add (new CFPlus::UI::HBox
410 expand => 1, 863 expand => 1,
411 children => [ 864 children => [
412 (new CFClient::UI::Empty expand => 1), 865 (new CFPlus::UI::Empty expand => 1),
413 (my $hb = new CFClient::UI::HBox), 866 (my $hb = new CFPlus::UI::HBox),
414 ], 867 ],
415 ); 868 );
416 869
417 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 870 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
418 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
419 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 871 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
420 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
421 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 872 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
422 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
423 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 873 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
424 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
425 874
426 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 875 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
427 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
428 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 876 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
429 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
430 877
431 $GAUGES = { 878 $GAUGES = {
432 exp => $exp, win => $win, range => $rng, 879 exp => $exp, win => $win, range => $rng,
433 food => $fg, mana => $mg, hp => $hg, grace => $gg 880 food => $fg, mana => $mg, hp => $hg, grace => $gg
434 }; 881 };
… …
436 &set_gauge_window_fontsize; 883 &set_gauge_window_fontsize;
437 884
438 $win 885 $win
439} 886}
440 887
888sub debug_setup {
889 my $table = new CFPlus::UI::Table;
890
891 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
892 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
893 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
894 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
895 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
896 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
897 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
898 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
899 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
900
901 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
902
903 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
904 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
905 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
906 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
907 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
908 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
909
910 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
911
912 $c->add_items ({
913 type => "line_loop",
914 color => [0, 1, 0],
915 width => 9,
916 coord_mode => "abs",
917 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
918 });
919
920 $c->add_items ({
921 type => "lines",
922 color => [1, 1, 0],
923 width => 2,
924 coord_mode => "rel",
925 coord => [[0,0], [1,1], [1,0], [0,1]],
926 });
927
928 $c->add_items ({
929 type => "polygon",
930 color => [0, 0.43, 0],
931 width => 2,
932 coord_mode => "rel",
933 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
934 });
935
936 $table
937}
938
441sub make_stats_window { 939sub stats_window {
442 my $tgw = new CFClient::UI::FancyFrame 940 my $r = new CFPlus::UI::ScrolledWindow (
443 req_y => $HEIGHT * (2/8),
444 req_x => -1, 941 expand => 1,
445 title => "Stats", 942 scroll_y => 1
446 name => "stats_window"; 943 );
944 $r->add (my $vb = new CFPlus::UI::VBox);
447 945
448 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 946 $vb->add (new CFPlus::UI::FancyFrame
947 label => "Player",
948 child => (my $pi = new CFPlus::UI::VBox),
949 );
950
449 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 951 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
450 can_hover => 1, can_events => 1, 952 can_hover => 1, can_events => 1,
451 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 953 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
452 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 954 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
453 can_hover => 1, can_events => 1, 955 can_hover => 1, can_events => 1,
454 tooltip => "The map you are currently on (if supported by the server)."); 956 tooltip => "The map you are currently on (if supported by the server).");
455 957
456 $vb->add (my $hb0 = new CFClient::UI::HBox); 958 $pi->add (my $hb0 = new CFPlus::UI::HBox);
457 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 959 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
458 can_hover => 1, can_events => 1, 960 can_hover => 1, can_events => 1,
459 tooltip => "The weight of the player including all inventory items."); 961 tooltip => "The weight of the player including all inventory items.");
460 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 962 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
461 can_hover => 1, can_events => 1, 963 can_hover => 1, can_events => 1,
462 tooltip => "The weight limit: you cannot carry more than this."); 964 tooltip => "The weight limit: you cannot carry more than this.");
463 965
464 966 $vb->add (new CFPlus::UI::FancyFrame
967 label => "Primary/Secondary Statistics",
465 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 968 child => (my $hb = new CFPlus::UI::HBox expand => 1),
969 );
466 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 970 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
467 971
468 my $color2 = [1, 1, 0]; 972 my $color2 = [1, 1, 0];
469 973
470 for ( 974 for (
471 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 975 [0, 0, st_str => "Str", 30],
472 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 976 [0, 1, st_dex => "Dex", 30],
473 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 977 [0, 2, st_con => "Con", 30],
474 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 978 [0, 3, st_int => "Int", 30],
475 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 979 [0, 4, st_wis => "Wis", 30],
476 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 980 [0, 5, st_pow => "Pow", 30],
477 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 981 [0, 6, st_cha => "Cha", 30],
478 982
479 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 983 [2, 0, st_wc => "Wc", -120],
480 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 984 [2, 1, st_ac => "Ac", -120],
481 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 985 [2, 2, st_dam => "Dam", 120],
482 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 986 [2, 3, st_arm => "Arm", 120],
483 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 987 [2, 4, st_spd => "Spd", 10.54],
484 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 988 [2, 5, st_wspd => "WSp", 10.54],
485 ) { 989 ) {
486 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 990 my ($col, $row, $id, $label, $template) = @$_;
487 991
488 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 992 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
489 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 993 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
994 align => +1, template => $template, tooltip => "#stat_$label");
490 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 995 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
491 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 996 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
997 align => -1, text => $label, tooltip => "#stat_$label");
492 } 998 }
493 999
1000 $vb->add (new CFPlus::UI::FancyFrame
1001 label => "Resistancies",
494 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1002 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1003 );
495 1004
496 my $row = 0; 1005 my $row = 0;
497 my $col = 0; 1006 my $col = 0;
498 1007
499 my %resist_names = ( 1008 my %resist_names = (
1009 slow => ["Slow",
500 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 1010 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
1011 holyw => ["Holy Word",
501 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 1012 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
1013 conf => ["Confusion",
502 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 1014 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
1015 fire => ["Fire",
503 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 1016 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
1017 depl => ["Depletion",
504 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 1018 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
1019 magic => ["Magic",
505 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 1020 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
1021 drain => ["Draining",
506 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 1022 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
1023 acid => ["Acid",
507 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 1024 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
1025 pois => ["Poison",
508 pois => "<b>Poison</b> (resistance to getting poisoned)", 1026 "<b>Poison</b> (resistance to getting poisoned)"],
1027 para => ["Paralysation",
509 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 1028 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1029 deat => ["Death",
510 deat => "<b>Death</b> (resistance against death spells)", 1030 "<b>Death</b> (resistance against death spells)"],
511 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 1031 phys => ["Physical",
1032 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
1033 blind => ["Blind",
512 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 1034 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1035 fear => ["Fear",
513 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 1036 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1037 tund => ["Turn undead",
514 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 1038 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
1039 elec => ["Electricity",
515 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 1040 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
1041 cold => ["Cold",
516 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 1042 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
1043 ghit => ["Ghost hit",
517 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 1044 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
518 ); 1045 );
1046
519 for (qw/slow holyw conf fire depl magic 1047 for (qw/slow holyw conf fire depl magic
520 drain acid pois para deat phys 1048 drain acid pois para deat phys
521 blind fear tund elec cold ghit/) 1049 blind fear tund elec cold ghit/)
522 { 1050 {
523 $tbl2->add ($col, $row, 1051 $tbl2->add_at ($col, $row,
524 $STATWIDS->{"res_$_"} = 1052 $STATWIDS->{"res_$_"} =
525 new CFClient::UI::Label 1053 new CFPlus::UI::Label
526 font => $FONT_FIXED, 1054 font => $FONT_FIXED,
527 template => "-100%", 1055 template => "-100%",
528 align => +1, 1056 align => +1,
529 valign => 0, 1057 valign => 0,
530 can_events => 1, 1058 can_events => 1,
531 can_hover => 1, 1059 can_hover => 1,
532 tooltip => $resist_names{$_}, 1060 tooltip => $resist_names{$_}->[1],
533 ); 1061 );
534 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1062 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
535 font => $FONT_FIXED, 1063 font => $FONT_FIXED,
536 can_hover => 1, 1064 can_hover => 1,
537 can_events => 1, 1065 can_events => 1,
538 image => "ui/resist/resist_$_.png", 1066 path => "ui/resist/resist_$_.png",
539 tooltip => $resist_names{$_}, 1067 tooltip => $resist_names{$_}->[1],
1068 );
1069 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
1070 text => $resist_names{$_}->[0],
1071 font => $FONT_FIXED,
1072 can_hover => 1,
1073 can_events => 1,
1074 tooltip => $resist_names{$_}->[1],
540 ); 1075 );
541 1076
542 $row++; 1077 $row++;
543 if ($row % 6 == 0) { 1078 if ($row % 6 == 0) {
544 $col += 2; 1079 $col += 3;
545 $row = 0; 1080 $row = 0;
546 } 1081 }
547 } 1082 }
548 1083
549 &set_stats_window_fontsize;
550 update_stats_window ({}); 1084 #update_stats_window ({});
551 1085
1086 $r
1087}
1088
1089sub skill_window {
1090 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1091 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
552 $tgw 1092 $sw
553} 1093}
554 1094
555sub formsep { 1095sub formsep($) {
556 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 1096 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
557}
558
559sub update_stats_window {
560 my ($stats) = @_;
561
562 # I love text protocols...
563
564 my $hp = $stats->{+CS_STAT_HP} * 1;
565 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
566 my $sp = $stats->{+CS_STAT_SP} * 1;
567 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
568 my $fo = $stats->{+CS_STAT_FOOD} * 1;
569 my $fo_m = 999;
570 my $gr = $stats->{+CS_STAT_GRACE} * 1;
571 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
572
573 $GAUGES->{hp} ->set_value ($hp, $hp_m);
574 $GAUGES->{mana} ->set_value ($sp, $sp_m);
575 $GAUGES->{food} ->set_value ($fo, $fo_m);
576 $GAUGES->{grace} ->set_value ($gr, $gr_m);
577 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
578 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
579 my $rng = $stats->{+CS_STAT_RANGE};
580 $rng =~ s/^Range: //; # thank you so much dear server
581 $GAUGES->{range} ->set_text ("Rng: " . $rng);
582 my $title = $stats->{+CS_STAT_TITLE};
583 $title =~ s/^Player: //;
584 $STATWIDS->{title} ->set_text ("Title: " . $title);
585
586 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
587 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
588 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
589 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
590 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
591 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
592 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
593 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
594 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
595 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
596 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
597 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
598 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
599
600 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
601
602 # TODO: replace by CS_STAT_RES_xxx constants
603 my %tbl = (
604 phys => 100,
605 magic => 101,
606 fire => 102,
607 elec => 103,
608 cold => 104,
609 conf => 105,
610 acid => 106,
611 drain => 107,
612 ghit => 108,
613 pois => 109,
614 slow => 110,
615 para => 111,
616 tund => 112,
617 fear => 113,
618 depl => 113,
619 deat => 115,
620 holyw => 116,
621 blind => 117,
622 );
623
624 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625 for keys %tbl;
626}
627
628sub metaserver_dialog {
629 my $dialog = new CFClient::UI::FancyFrame
630 title => "Server List",
631 child => (my $vbox = new CFClient::UI::VBox);
632
633 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635 $dialog
636} 1097}
637 1098
638my $METASERVER_ATIME; 1099my $METASERVER_ATIME;
639 1100
640sub update_metaserver { 1101sub update_metaserver {
641 my ($HOST) = @_; 1102 my ($metaserver_dialog) = @_;
1103
1104 $METASERVER = $metaserver_dialog
1105 if defined $metaserver_dialog;
642 1106
643 return if $METASERVER_ATIME > time; 1107 return if $METASERVER_ATIME > time;
644 $METASERVER_ATIME = time + 60; 1108 $METASERVER_ATIME = time + 60;
645 1109
646 my $table = $METASERVER->{table}; 1110 my $table = $METASERVER->{table};
647 $table->clear; 1111 $table->clear;
648 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1112 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
649 1113
650 my $buf; 1114 my $ok = 0;
651 1115
652 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1116 CFPlus::background {
1117 my $ua = CFPlus::lwp_useragent;
653 1118
654 unless ($fh) { 1119 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
655 $label->set_text ("unable to contact metaserver: $!"); 1120 } sub {
656 return; 1121 my ($msg) = @_;
657 } 1122 if ($msg) {
658
659 Event->io (fd => $fh, poll => 'r', cb => sub {
660 my $res = sysread $fh, $buf, 8192, length $buf;
661
662 if (!defined $res) {
663 $_[0]->w->cancel;
664 $label->set_text ("error while retrieving server list: $!");
665 } elsif ($res == 0) {
666 $_[0]->w->cancel;
667 status "server list retrieved";
668
669 utf8::decode $buf if utf8::valid $buf;
670
671 $table->clear; 1123 $table->clear;
672 1124
1125 my @tip = (
1126 "The current number of users logged in on the server.",
1127 "The hostname of the server.",
1128 "The time this server has been running without being restarted.",
1129 "The server software version - a '+' indicates a Crossfire+ server.",
1130 "Short information about this server provided by its admins.",
1131 );
673 my @col = qw(Use #Users Host Uptime Version Description); 1132 my @col = qw(#Users Host Uptime Version Description);
674 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 1133 $table->add_at ($_, 0, new CFPlus::UI::Label
1134 can_hover => 1, can_events => 1,
1135 align => 0, fg => [1, 1, 0],
1136 text => $col[$_], tooltip => $tip[$_])
675 for 0 .. $#col; 1137 for 0 .. $#col;
676 1138
677 my @align = qw(1 0 1 1 -1); 1139 my @align = qw(1 0 1 1 -1);
678 1140
679 my $y = 0; 1141 my $y = 0;
680 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1142 for my $m (@{ $msg->{servers} }) {
681 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1143 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1144 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
682 1145
683 for ($desc) { 1146 for ($desc) {
684 s/<br>/\n/gi; 1147 s/<br>/\n/gi;
685 s/<li>/\n· /gi; 1148 s/<li>/\n· /gi;
686 s/<.*?>//sgi; 1149 s/<.*?>//sgi;
687 s/&/&amp;/g; 1150 s/&amp;/&/g;
688 s/</&lt;/g; 1151 s/&lt;/</g;
689 s/>/&gt;/g; 1152 s/&gt;/>/g;
690 } 1153 }
691 1154
692 $uptime = sprintf "%dd %02d:%02d:%02d", 1155 $uptime = sprintf "%dd %02d:%02d:%02d",
693 (int $m->[8] / 86400), 1156 (int $uptime / 86400),
694 (int $m->[8] / 3600) % 24, 1157 (int $uptime / 3600) % 24,
695 (int $m->[8] / 60) % 60, 1158 (int $uptime / 60) % 60,
696 $m->[8] % 60; 1159 $uptime % 60;
697 1160
698 $m = [$users, $host, $uptime, $version, $desc]; 1161 $m = [$users, $host, $uptime, $version, $desc];
699 1162
700 $y++; 1163 $y++;
701 1164
702 $table->add (0, $y, new CFClient::UI::VBox children => [ 1165 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
703 (new CFClient::UI::Button text => "Use", on_activate => sub { 1166 (new CFPlus::UI::Button
1167 text => "Use",
1168 tooltip => "Put this server into the <b>Host:Port</b> field",
1169 on_activate => sub {
704 $HOST->set_text ($CFG->{host} = $host); 1170 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1171 $METASERVER->hide;
1172 0
1173 },
705 }), 1174 ),
706 (new CFClient::UI::Empty expand => 1), 1175 (new CFPlus::UI::Empty expand => 1),
707 ]); 1176 ]);
708 1177
709 $table->add ($_ + 1, $y, new CFClient::UI::Label 1178 $table->add_at ($_, $y, new CFPlus::UI::Label
710 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 1179 max_w => $::WIDTH * 0.4,
1180 ellipsise => 0,
1181 align => $align[$_],
1182 text => $m->[$_],
1183 tooltip => $tip[$_],
1184 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
1185 can_hover => 1,
1186 can_events => 1,
1187 fontsize => 0.8)
711 for 0 .. $#$m; 1188 for 0 .. $#$m;
712 } 1189 }
1190 } else {
1191 $ok or $label->set_text ("error while contacting metaserver");
713 } 1192 }
714 }); 1193 };
715}
716 1194
717sub server_setup { 1195}
718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1196
719 x => $WIDTH * (1/3), 1197sub metaserver_dialog {
720 y => $HEIGHT * (1/8), 1198 my $vbox = new CFPlus::UI::VBox;
721 name => "server_setup", 1199 my $table = new CFPlus::UI::Table;
722 title => "Server Setup", 1200 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
723 child => (my $vbox = new CFClient::UI::VBox), 1201
1202 my $dialog = new CFPlus::UI::Toplevel
1203 title => "Server List",
1204 name => 'metaserver_dialog',
1205 x => 'center',
1206 y => 'center',
1207 z => 3,
1208 force_w => $::WIDTH * 0.9,
1209 force_h => $::HEIGHT * 0.7,
1210 child => $vbox,
1211 has_close_button => 1,
1212 table => $table,
724 on_visibility_change => sub { 1213 on_visibility_change => sub {
725 my ($self, $visible) = @_; 1214 update_metaserver ($_[0]) if $_[1];
726 $self->center if $visible; 1215 0
727 }, 1216 },
728 ; 1217 ;
729 1218
1219 $dialog
1220}
1221
1222sub server_setup {
1223 my $vbox = new CFPlus::UI::VBox;
1224
1225 $vbox->add (new CFPlus::UI::FancyFrame
1226 label => "Connection Settings",
730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1227 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1228 );
731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1229 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
732 1230
733 { 1231 {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1232 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
735 1233
736 $vbox->add ( 1234 $vbox->add (
737 my $HOST = new CFClient::UI::Entry 1235 $HOST_ENTRY = new CFPlus::UI::Entry
738 expand => 1, 1236 expand => 1,
739 text => $CFG->{host}, 1237 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1238 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 1239 on_changed => sub {
742 my ($self, $value) = @_; 1240 my ($self, $value) = @_;
743 $CFG->{host} = $value; 1241 $CFG->{profile}{default}{host} = $value;
1242 1
744 } 1243 }
745 ); 1244 );
746 1245
747 $METASERVER = metaserver_dialog;
748
749 $vbox->add (new CFClient::UI::Flopper 1246 $vbox->add (new CFPlus::UI::Button
750 expand => 1, 1247 expand => 1,
751 text => "Server List", 1248 text => "Server List",
752 other => $METASERVER, 1249 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 1250 tooltip => "Show a list of available crossfire servers",
754 on_open => sub { 1251 on_activate => sub { $METASERVER->toggle_visibility; 0 },
755 update_metaserver $HOST; 1252 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
756 }
757 ); 1253 );
758 } 1254 }
759 1255
760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1256 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
761 $table->add (1, 4, new CFClient::UI::Entry 1257 $table->add_at (1, 4, new CFPlus::UI::Entry
762 text => $CFG->{user}, 1258 text => $CFG->{profile}{default}{user},
763 tooltip => "The name of your character on the server", 1259 tooltip => "The name of your character on the server",
764 on_changed => sub { 1260 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
765 my ($self, $value) = @_;
766 $CFG->{user} = $value;
767 }
768 ); 1261 );
769 1262
770 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1263 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
771 $table->add (1, 5, new CFClient::UI::Entry 1264 $table->add_at (1, 5, new CFPlus::UI::Entry
772 text => $CFG->{password}, 1265 text => $CFG->{profile}{default}{password},
773 hidden => 1, 1266 hidden => 1,
774 tooltip => "The password for your character", 1267 tooltip => "The password for your character",
775 on_changed => sub { 1268 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
776 my ($self, $value) = @_;
777 $CFG->{password} = $value;
778 }
779 ); 1269 );
780 1270
781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1271 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
782 $table->add (1, 7, new CFClient::UI::Slider 1272 $table->add_at (1, 7, new CFPlus::UI::Slider
783 req_w => 100, 1273 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1274 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 tooltip => "This is the size of the portion of the map update the server sends you. " 1275 tooltip => "This is the size of the portion of the map update the server sends you. "
786 . "If you set this to a high value you will be able to see further, " 1276 . "If you set this to a high value you will be able to see further, "
787 . "but you also increase bandwidth requirements and latency. " 1277 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1278 . "This option is only used once at log-in.",
789 on_changed => sub { 1279 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
790 my ($self, $value) = @_;
791
792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
793 },
794 ); 1280 );
795 1281
796 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1282 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
797 $table->add (1, 8, new CFClient::UI::CheckBox 1283 $table->add_at (1, 8, new CFPlus::UI::Entry
798 state => $CFG->{face_prefetch}, 1284 text => $CFG->{output_rate},
799 tooltip => "<b>Background Image Prefetch</b>\n\n" 1285 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
800 . "If enabled, the client automatically pre-fetches images from the server. " 1286 . "when sending data. When 0 or unset, the server "
801 . "This might increase or create lag, but increases the chances " 1287 . "default will be used, which is usually around 100kb/s. Most servers will "
802 . "of faces being ready for display when you encounter them. " 1288 . "dynamically find an optimal rate, so adjust this only when necessary.",
803 . "It also uses up server bandwidth on every connect, "
804 . "so only set it if you really need to prefetch images. "
805 . "This option can be set and unset any time.",
806 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1289 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
807 ); 1290 );
808 1291
809 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1292 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
810 $table->add (1, 9, new CFClient::UI::Entry 1293 $table->add_at (1, 9, new CFPlus::UI::Entry
811 text => $CFG->{output_count}, 1294 text => $CFG->{output_count},
812 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1295 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
813 on_changed => sub { $CFG->{output_count} = $_[1] }, 1296 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
814 ); 1297 );
815 1298
816 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1299 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
817 $table->add (1, 10, new CFClient::UI::Entry 1300 $table->add_at (1, 10, new CFPlus::UI::Entry
818 text => $CFG->{output_sync}, 1301 text => $CFG->{output_sync},
819 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1302 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
820 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1303 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
821 ); 1304 );
822 1305
823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1306 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
824 expand => 1, 1307 expand => 1,
825 align => 0, 1308 align => 0,
826 text => "Login", 1309 text => "Login",
827 on_activate => sub { 1310 on_activate => sub {
828 $CONN ? stop_game 1311 $CONN ? stop_game
829 : start_game; 1312 : start_game;
1313 1
830 }, 1314 },
831 ); 1315 );
832 1316
833 $dialog 1317 $vbox->add (new CFPlus::UI::FancyFrame
834} 1318 label => "Server Info",
1319 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1320 );
835 1321
836sub message_window { 1322 $vbox
837 my $window = new CFClient::UI::FancyFrame 1323}
838 name => "message_window",
839 title => "Messages",
840 border_bg => [1, 1, 1, 1],
841 bg => [0, 0, 0, 0.75],
842 req_x => -1,
843 req_y => 0,
844 def_w => int $::WIDTH / 3,
845 def_h => int $::HEIGHT / 5,
846 child => (my $vbox = new CFClient::UI::VBox);
847 1324
848 $vbox->add ($LOGVIEW); 1325sub client_setup {
1326 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
849 1327
850 $vbox->add (my $input = new CFClient::UI::Entry 1328 my $row = 0;
851 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1329
852 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1330 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
853 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1331 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
854 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1332 state => $CFG->{show_tips},
1333 tooltip => "Show the <b>Tip of the day</b> window at startup?",
855 on_focus_in => sub { 1334 on_changed => sub {
856 my ($input, $prev_focus) = @_; 1335 my ($self, $value) = @_;
857 1336 $CFG->{show_tips} = $value;
858 delete $input->{refocus_map};
859
860 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
861 $input->{refocus_map} = 1;
862 } 1337 0
863 delete $input->{auto_activated}; 1338 }
1339 );
1340
1341 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1342 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1343 text => $CFG->{logview_max_par},
1344 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1345 . "sends more messages than this number, older messages get removed to save memory and "
1346 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1347 on_changed => sub {
1348 my ($self, $value) = @_;
1349 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1350 0
864 }, 1351 },
1352 );
1353
1354 $table
1355}
1356
1357sub autopickup_setup {
1358 my $r = new CFPlus::UI::ScrolledWindow (
1359 expand => 1,
1360 scroll_y => 1
1361 );
1362 $r->add (my $table = new CFPlus::UI::Table
1363 row_expand => [0],
1364 col_expand => [0, 1, 0, 1],
1365 );
1366
1367 for (
1368 ["General", 0, 0,
1369 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1370 ["Inhibit autopickup" => PICKUP_INHIBIT],
1371 ["Stop before pickup" => PICKUP_STOP],
1372 ["Debug autopickup" => PICKUP_DEBUG],
1373 ],
1374 ["Weapons", 0, 6,
1375 ["All weapons" => PICKUP_ALLWEAPON],
1376 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1377 ["Bows" => PICKUP_BOW],
1378 ["Arrows" => PICKUP_ARROW],
1379 ],
1380 ["Armour", 0, 12,
1381 ["Helmets" => PICKUP_HELMET],
1382 ["Shields" => PICKUP_SHIELD],
1383 ["Body Armour" => PICKUP_ARMOUR],
1384 ["Boots" => PICKUP_BOOTS],
1385 ["Gloves" => PICKUP_GLOVES],
1386 ["Cloaks" => PICKUP_CLOAK],
1387 ],
1388
1389 ["Readables", 2, 0,
1390 ["Spellbooks" => PICKUP_SPELLBOOK],
1391 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1392 ["Normal Books/Scrolls" => PICKUP_READABLES],
1393 ],
1394 ["Misc", 2, 5,
1395 ["Food" => PICKUP_FOOD],
1396 ["Drinks" => PICKUP_DRINK],
1397 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1398 ["Keys" => PICKUP_KEY],
1399 ["Magical Items" => PICKUP_MAGICAL],
1400 ["Potions" => PICKUP_POTION],
1401 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1402 ["Ignore cursed" => PICKUP_NOT_CURSED],
1403 ["Jewelery" => PICKUP_JEWELS],
1404 ["Flesh" => PICKUP_FLESH],
1405 ],
1406 ["Weight/Value ratio", 2, 17]
1407 )
1408 {
1409 my ($title, $x, $y, @bits) = @$_;
1410 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1411
1412 for (@bits) {
1413 ++$y;
1414
1415 my $mask = $_->[1];
1416 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1417 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1418 state => $::CFG->{pickup} & $mask,
1419 on_changed => sub {
1420 my ($box, $value) = @_;
1421
1422 if ($value) {
1423 $::CFG->{pickup} |= $mask;
1424 } else {
1425 $::CFG->{pickup} &= ~$mask;
1426 }
1427
1428 $::CONN->send_command ("pickup $::CFG->{pickup}")
1429 if defined $::CONN;
1430
1431 0
1432 });
1433
1434 ${$_->[2]} = $checkbox if $_->[2];
1435 }
1436 }
1437
1438 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1439 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1440 template => ">= 99",
1441 to_value => sub { ">= " . 5 * $_[0] },
1442 on_changed => sub {
1443 my ($slider, $value) = @_;
1444
1445 $::CFG->{pickup} &= ~0xF;
1446 $::CFG->{pickup} |= int $value
1447 if $value;
1448 1;
1449 });
1450
1451 $table->add_at (3, 18, new CFPlus::UI::Button
1452 text => "set",
865 on_activate => sub { 1453 on_activate => sub {
866 my ($input, $text) = @_; 1454 $::CONN->send_command ("pickup $::CFG->{pickup}")
867 $input->set_text (''); 1455 if defined $::CONN;
868
869 if ($text =~ /^\/(.*)/) {
870 $::CONN->user_send ($1);
871 } else {
872 my $say_cmd = $::CFG->{say_command} || 'say';
873 $::CONN->user_send ("$say_cmd $text");
874 } 1456 0
875 if ($input->{refocus_map}) { 1457 });
876 delete $input->{refocus_map}; 1458
877 $MAPWIDGET->focus_in 1459 $r
1460}
1461
1462my %SORT_ORDER = (
1463 type => undef,
1464 mtime => sub {
1465 my $NOW = time;
1466 sort {
1467 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1468 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1469
1470 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1471 or $btime <=> $atime
1472 or $a->{type} <=> $b->{type}
1473 } @_
878 } 1474 },
1475 weight => sub { sort {
1476 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1477 or $a->{type} <=> $b->{type}
1478 } @_ },
1479);
1480
1481sub inventory_widget {
1482 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1483
1484 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1485 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1486
1487 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1488
1489 use sort 'stable';
1490
1491 $hb1->add (new CFPlus::UI::Selector
1492 value => $::CFG->{inv_sort},
1493 options => [
1494 [type => "Type/Name"],
1495 [mtime => "Recent/Normal/Locked"],
1496 [weight => "Weight/Type"],
1497 ],
1498 on_changed => sub {
1499 $::CFG->{inv_sort} = $_[1];
1500 $INV->set_sort_order ($SORT_ORDER{$_[1]});
879 }, 1501 },
880 on_escape => sub { 1502 );
881 $MAPWIDGET->focus_in 1503 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1504 #TODO# update to weigh/maxweight
1505 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1506
1507 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1508 $sw1->add ($INV = new CFPlus::UI::Inventory);
1509 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1510
1511 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1512
1513 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1514
1515 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1516 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1517
1518 # XXX: Call after $INVR = ... because set_opencont sets the items
1519 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1520
1521 $hb
1522}
1523
1524sub toggle_player_page {
1525 my ($widget) = @_;
1526
1527 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1528 $PL_WINDOW->hide;
1529 } else {
1530 $PL_NOTEBOOK->set_current_page ($widget);
1531 $PL_WINDOW->show;
1532 }
1533}
1534
1535sub player_window {
1536 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1537 x => "center",
1538 y => "center",
1539 force_w => $WIDTH * 9/10,
1540 force_h => $HEIGHT * 9/10,
1541 title => "Player",
1542 name => "playerbook",
1543 has_close_button => 1
1544 ;
1545
1546 my $ntb =
1547 $PL_NOTEBOOK =
1548 new CFPlus::UI::Notebook expand => 1;
1549
1550 $ntb->add_tab (
1551 "Statistics (F2)" => $STATS_PAGE = stats_window,
1552 "Shows statistics, where all your Stats and Resistances are shown."
1553 );
1554 $ntb->add_tab (
1555 "Skills (F3)" => $SKILL_PAGE = skill_window,
1556 "Shows all your Skills."
1557 );
1558
1559 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1560 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1561 $ntb->add_tab (
1562 "Spellbook (F4)" => $spellsw,
1563 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1564 );
1565 $ntb->add_tab (
1566 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1567 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1568 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1569 );
1570 $ntb->add_tab (Pickup => autopickup_setup,
1571 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1572
1573 $ntb->set_current_page ($INVENTORY_PAGE);
1574
1575 $plwin->add ($ntb);
1576 $plwin
1577}
1578
1579sub keyboard_setup {
1580 CFPlus::Macro::keyboard_setup
1581}
1582
1583sub help_window {
1584 my $win = new CFPlus::UI::Toplevel
1585 x => 'center',
1586 y => 'center',
1587 z => 4,
1588 name => 'doc_browser',
1589 force_w => int $WIDTH * 7/8,
1590 force_h => int $HEIGHT * 7/8,
1591 title => "Help Browser",
1592 has_close_button => 1;
1593
1594 $win->add (my $vbox = new CFPlus::UI::VBox);
1595
1596 $vbox->add (new CFPlus::UI::FancyFrame
1597 label => "Navigation",
1598 child => (my $buttons = new CFPlus::UI::HBox),
1599 );
1600 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1601 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1602
1603 my @history;
1604 my @future;
1605 my $curnode;
1606
1607 my $load_node; $load_node = sub {
1608 my ($node, $para) = @_;
1609
1610 $buttons->clear;
1611
1612 $buttons->add (new CFPlus::UI::Button
1613 text => "⇤",
1614 tooltip => "back to the starting page",
1615 on_activate => sub {
1616 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1617 unshift @future, @history;
1618 @history = ();
1619 $load_node->(@{shift @future});
1620 },
1621 );
1622
1623 if (@history) {
1624 $buttons->add (new CFPlus::UI::Button
1625 text => "⋘",
1626 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1627 on_activate => sub {
1628 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1629 $load_node->(@{pop @history});
1630 },
1631 );
882 }, 1632 }
883 );
884 1633
885 $CONSOLE = { 1634 if (@future) {
886 window => $window, 1635 $buttons->add (new CFPlus::UI::Button
887 input => $input 1636 text => "⋙",
1637 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1638 on_activate => sub {
1639 push @history, [$curnode, $viewer->current_paragraph];
1640 $load_node->(@{shift @future});
1641 },
1642 );
1643 }
1644
1645 $buttons->add (new CFPlus::UI::Label text => " ");
1646
1647 my @path = CFPlus::Pod::full_path_of $node;
1648 pop @path; # drop current node
1649
1650 for my $node (@path) {
1651 $buttons->add (new CFPlus::UI::Button
1652 text => $node->{kw}[0],
1653 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1654 on_activate => sub {
1655 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1656 $load_node->($node);
1657 },
1658 );
1659 $buttons->add (new CFPlus::UI::Label text => "/");
1660 }
1661
1662 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1663
1664 $curnode = $node;
1665
1666 $viewer->clear;
1667 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1668 $viewer->scroll_to ($para);
888 }; 1669 };
889 1670
1671 $load_node->(CFPlus::Pod::find pod => "mainpage");
1672
1673 $CFPlus::Pod::goto_document = sub {
1674 my (@path) = @_;
1675
1676 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1677
1678 $load_node->((CFPlus::Pod::find @path)[0]);
1679 $win->show;
1680 };
1681
890 $window 1682 $win
1683}
1684
1685sub open_string_query {
1686 my ($title, $cb, $txt, $tooltip) = @_;
1687 my $dialog = new CFPlus::UI::Toplevel
1688 x => "center",
1689 y => "center",
1690 z => 50,
1691 force_w => $WIDTH * 4/5,
1692 title => $title;
1693
1694 $dialog->add (
1695 my $e = new CFPlus::UI::Entry
1696 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1697 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1698 tooltip => $tooltip
1699 );
1700
1701 $e->grab_focus;
1702 $e->set_text ($txt) if $txt;
1703 $dialog->show;
891} 1704}
892 1705
893sub open_quit_dialog { 1706sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 1707 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1708 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1709 x => "center",
1710 y => "center",
1711 z => 50,
1712 title => "Really Quit?",
1713 on_key_down => sub {
1714 my ($dialog, $ev) = @_;
1715 $ev->{sym} == 27 and $dialog->hide;
1716 }
1717 ;
896 1718
897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1719 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
898 1720
899 $vb->add (new CFClient::UI::Label 1721 $vb->add (new CFPlus::UI::Label
900 text => "You should find a savebed and apply it first!", 1722 text => "You should find a savebed and apply it first!",
901 max_w => $WIDTH * 0.25, 1723 max_w => $WIDTH * 0.25,
902 ellipsize => 0, 1724 ellipsize => 0,
903 ); 1725 );
904 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1726 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
905 $hb->add (new CFClient::UI::Button 1727 $hb->add (new CFPlus::UI::Button
906 text => "Ok", 1728 text => "Ok",
907 expand => 1, 1729 expand => 1,
908 on_activate => sub { $QUIT_DIALOG->hide }, 1730 on_activate => sub { $QUIT_DIALOG->hide; 0 },
909 ); 1731 );
910 $hb->add (new CFClient::UI::Button 1732 $hb->add (new CFPlus::UI::Button
911 text => "Quit anyway", 1733 text => "Quit anyway",
912 expand => 1, 1734 expand => 1,
913 on_activate => sub { exit }, 1735 on_activate => sub { exit },
914 ); 1736 );
915 } 1737 }
916 1738
917 $QUIT_DIALOG->show; 1739 $QUIT_DIALOG->show;
918 $QUIT_DIALOG->center; 1740 $QUIT_DIALOG->grab_focus;
919} 1741}
920 1742
921sub make_inventory_window { 1743sub show_tip_of_the_day {
922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1744 # find all tips
923 def_w => $WIDTH * 7/8, 1745 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
924 def_h => $HEIGHT * 7/8, 1746
925 title => "Inventory", 1747 CFPlus::DB::get state => "tip_of_the_day", sub {
926 name => "inventory_window", 1748 my ($todindex) = @_;
927 on_visibility_change => sub { 1749 $todindex = 0 if $todindex >= @tod;
928 my ($self, $visible) = @_; 1750 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
929 $self->center if $visible; 1751
1752 # create dialog
1753 my $dialog;
1754
1755 my $close = sub {
1756 $dialog->destroy;
930 }, 1757 };
931 ;
932 1758
933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1759 $dialog = new CFPlus::UI::Toplevel
1760 x => "center",
1761 y => "center",
1762 z => 3,
1763 name => 'tip_of_the_day',
1764 force_w => int $WIDTH * 4/9,
1765 force_h => int $WIDTH * 2/9,
1766 title => "Tip of the day #" . (1 + $todindex),
1767 child => my $vbox = new CFPlus::UI::VBox,
1768 has_close_button => 1,
1769 on_delete => $close,
1770 ;
934 1771
935 $hb->add (my $vb1 = new CFClient::UI::VBox); 1772 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1773 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1774 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
938 1775
939 $hb->add (my $vb2 = new CFClient::UI::VBox); 1776 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
940 1777
941 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1778 $table->add_at (0, 0, new CFPlus::UI::Button
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
943 $hb2->add (new CFClient::UI::Button
944 text => "Close", 1779 text => "Close",
945 tooltip => "Close the currently open container (if one is open)", 1780 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
946 on_activate => sub { 1781 on_activate => $close,
947 $CONN->send ("apply $CONN->{open_container}")
948 if $CONN->{open_container} != 0;
949 },
950 ); 1782 );
951 1783
952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1784 $table->add_at (2, 0, new CFPlus::UI::Button
953 1785 text => "Next",
954 $invwin 1786 tooltip => "Show the next <b>Tip of the day</b>.",
955}
956
957sub make_help_window {
958 my $win = new CFClient::UI::FancyFrame
959 def_w => int $WIDTH * 7/8,
960 def_h => int $HEIGHT * 7/8,
961 title => "Documentation";
962
963 $win->add (my $vbox = new CFClient::UI::VBox);
964
965 $vbox->add (my $buttons = new CFClient::UI::HBox);
966 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
967
968 for (
969 [intro => "Introduction"],
970 [manual => "Manual"],
971 [command_help => "Commands"],
972 [skill_help => "Skills"],
973 ) {
974 my ($pod, $label) = @$_;
975
976 $buttons->add (new CFClient::UI::Button
977 text => $label,
978 on_activate => sub { 1787 on_activate => sub {
979 my $parser = new Pod::POM; 1788 $close->();
980 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1789 &show_tip_of_the_day;
981
982 $viewer->clear;
983
984 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
985 for @{ CFClient::pod_to_pango_list $pom };
986
987 $viewer->set_offset (0);
988 }, 1790 },
989 ); 1791 );
1792
1793 $dialog->show;
990 } 1794 };
991
992 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
993
994 $win
995} 1795}
996 1796
997sub sdl_init { 1797sub sdl_init {
998 CFClient::SDL_Init 1798 CFPlus::SDL_Init
999 and die "SDL::Init failed!\n"; 1799 and die "SDL::Init failed!\n";
1000} 1800}
1001 1801
1002sub video_init { 1802sub video_init {
1003 sdl_init;
1004
1005 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1803 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1006 1804
1007 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1805 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1008 1806
1009 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1807 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1010 $FULLSCREEN = $CFG->{fullscreen}; 1808 $FULLSCREEN = $CFG->{fullscreen};
1011 $FAST = $CFG->{fast}; 1809 $FAST = $CFG->{fast};
1012 1810
1013 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1811 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1014 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1812 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1015 1813
1016 $SDL_ACTIVE = 1; 1814 $SDL_ACTIVE = 1;
1017 $LAST_REFRESH = time - 0.01; 1815 $LAST_REFRESH = time - 0.01;
1018 1816
1019 CFClient::OpenGL::init; 1817 CFPlus::OpenGL::init;
1020 1818
1021 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1819 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1022 1820
1023 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1821 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1024 1822
1025 ############################################################################# 1823 #############################################################################
1026 1824
1027 if ($DEBUG_STATUS) { 1825 if ($DEBUG_STATUS) {
1028 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1826 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029 } else { 1827 } else {
1030 # create the widgets 1828 # create the widgets
1031 1829
1032 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1830 $DEBUG_STATUS = new CFPlus::UI::Label
1831 padding => 0,
1832 z => 100,
1833 force_x => "max",
1834 force_y => 0;
1033 $DEBUG_STATUS->show; 1835 $DEBUG_STATUS->show;
1034 1836
1035 $STATUSBOX = new CFClient::UI::Statusbox; 1837 $STATUSBOX = new CFPlus::UI::Statusbox;
1036 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1838 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1037 1839
1038 (new CFClient::UI::Frame 1840 (new CFPlus::UI::Frame
1039 bg => [0, 0, 0, 0.4], 1841 bg => [0, 0, 0, 0.4],
1040 req_y => -1, 1842 force_x => 0,
1843 force_y => "max",
1041 child => $STATUSBOX, 1844 child => $STATUSBOX,
1042 )->show; 1845 )->show;
1043 1846
1044 CFClient::UI::FancyFrame->new ( 1847 CFPlus::UI::Toplevel->new (
1848 title => "Map",
1849 name => "mapmap",
1850 x => 0,
1851 y => $FONTSIZE + 8,
1045 border_bg => [1, 1, 1, 192/255], 1852 border_bg => [1, 1, 1, 192/255],
1046 bg => [1, 1, 1, 0], 1853 bg => [1, 1, 1, 0],
1047 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1854 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1048 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1855 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049 ), 1856 ),
1050 )->show; 1857 )->show;
1051 1858
1052 $MAPWIDGET = new CFClient::MapWidget; 1859 $MAPWIDGET = new CFPlus::MapWidget;
1053 $MAPWIDGET->connect (activate_console => sub { 1860 $MAPWIDGET->connect (activate_console => sub {
1054 my ($mapwidget, $preset) = @_; 1861 my ($mapwidget, $preset) = @_;
1055 1862
1056 if ($CONSOLE) { 1863 $MESSAGE_WINDOW->activate_console ($preset)
1057 $CONSOLE->{input}->{auto_activated} = 1; 1864 if $MESSAGE_WINDOW;
1058 $CONSOLE->{input}->focus_in;
1059
1060 if ($preset && $CONSOLE->{input}->get_text eq '') {
1061 $CONSOLE->{input}->set_text ($preset);
1062 }
1063 }
1064 }); 1865 });
1065 $MAPWIDGET->show; 1866 $MAPWIDGET->show;
1066 $MAPWIDGET->focus_in; 1867 $MAPWIDGET->grab_focus;
1067 1868
1068 $LOGVIEW = new CFClient::UI::TextView 1869 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1870 title => "Setup",
1871 name => "setup_dialog",
1872 x => 'center',
1873 y => 'center',
1069 expand => 1, 1874 z => 2,
1070 font => $FONT_FIXED, 1875 force_w => $::WIDTH * 0.6,
1071 fontsize => $::CFG->{log_fontsize}, 1876 force_h => $::HEIGHT * 0.6,
1072 can_hover => 1, 1877 has_close_button => 1,
1073 can_events => 1,
1074 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075 ; 1878 ;
1076 1879
1077 $BUTTONBAR = new CFClient::UI::HBox; 1880 $METASERVER = metaserver_dialog;
1881 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1078 1882
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1883 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1080 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1884 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1885
1886 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1082 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1887 "Configure the server to play on, your username, password and other server-related options.");
1888 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1889 "Configure various client-specific settings.");
1890 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1891 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1892 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1893 "Configure the use of audio, sound effects and background music.");
1894 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1895 "Lets you define, edit and delete key bindings."
1896 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1897 . "with nothing set and the recording started. After doing the actions you "
1898 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1899 . "After pressing the combo the binding will be saved automatically and the "
1900 . "binding editor closes");
1901 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1902 "Some debuggin' options. Do not ask.");
1903
1904 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1905
1906 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1907 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1908
1083 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1909 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1084 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1910 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1085 1911
1086 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 1912 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
1087 1913
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1089 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1914 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1091 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1915 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1092 1916
1093 $BUTTONBAR->add (new CFClient::UI::Button 1917 $BUTTONBAR->add (new CFPlus::UI::Button
1094 text => "Save Config", 1918 text => "Save Config",
1095 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1919 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096 on_activate => sub { 1920 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout; 1921 $::CFG->{layout} = CFPlus::UI::get_layout;
1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1922 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099 status "Configuration Saved"; 1923 status "Configuration Saved";
1924 0
1100 }, 1925 },
1101 ); 1926 );
1102 1927
1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1928 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1104 tooltip => "View Documentation"); 1929 tooltip => "View Documentation");
1105 1930
1931
1106 $BUTTONBAR->add (new CFClient::UI::Button 1932 $BUTTONBAR->add (new CFPlus::UI::Button
1107 text => "Quit", 1933 text => "Quit",
1108 tooltip => "Terminates the program", 1934 tooltip => "Terminates the program",
1109 on_activate => sub { 1935 on_activate => sub {
1110 if ($CONN) { 1936 if ($CONN) {
1111 open_quit_dialog; 1937 open_quit_dialog;
1112 } else { 1938 } else {
1113 exit; 1939 exit;
1114 } 1940 }
1941 0
1115 }, 1942 },
1116 ); 1943 );
1117 1944
1118 $BUTTONBAR->show; 1945 $BUTTONBAR->show;
1119 1946 $SETUP_DIALOG->show;
1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122 $SERVER_SETUP->show;
1123 } 1947 }
1948
1949 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124} 1950}
1125 1951
1126sub video_shutdown { 1952sub video_shutdown {
1953 CFPlus::OpenGL::shutdown;
1954
1127 undef $SDL_ACTIVE; 1955 undef $SDL_ACTIVE;
1128}
1129
1130my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1131my $bgmusic;#TODO#hack#d#
1132
1133sub audio_channel_finished {
1134 my ($channel) = @_;
1135
1136 #warn "channel $channel finished\n";#d#
1137}
1138
1139sub audio_music_finished {
1140 return unless $CFG->{bgm_enable};
1141
1142 # TODO: hack, do play loop and mood music
1143 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1144 $bgmusic->play (0);
1145
1146 push @bgmusic, shift @bgmusic;
1147} 1956}
1148 1957
1149sub audio_init { 1958sub audio_init {
1150 if ($CFG->{audio_enable}) { 1959 if ($CFG->{audio_enable}) {
1151 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1960 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1152 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1961 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1153 1962
1154 unless ($SDL_MIXER) { 1963 unless ($SDL_MIXER) {
1155 status "Unable to open sound device: there will be no sound"; 1964 status "Unable to open sound device: there will be no sound";
1156 return; 1965 return;
1157 }
1158
1159 CFClient::Mix_AllocateChannels 8;
1160 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1161
1162 audio_music_finished;
1163
1164 while (<$fh>) {
1165 next if /^\s*#/;
1166 next if /^\s*$/;
1167
1168 my ($file, $volume, $event) = split /\s+/, $_, 3;
1169
1170 push @SOUNDS, "$volume,$file";
1171
1172 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1173 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1174 $chunk->volume ($volume * 128 / 100);
1175 $chunk
1176 };
1177 }
1178 } else {
1179 status "unable to open sound config: $!";
1180 } 1966 }
1967
1968 CFPlus::Mix_AllocateChannels 16;
1969
1970 audio_music_finished;
1971 } else {
1972 undef $SDL_MIXER;
1181 } 1973 }
1182} 1974}
1183 1975
1184sub audio_shutdown { 1976sub audio_shutdown {
1185 CFClient::Mix_CloseAudio if $SDL_MIXER; 1977 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1186 undef $SDL_MIXER; 1978 undef $SDL_MIXER;
1187 @SOUNDS = (); 1979 @SOUNDS = ();
1188 %AUDIO_CHUNKS = (); 1980 %AUDIO_CHUNK = ();
1189} 1981}
1190 1982
1191my %animate_object; 1983my %animate_object;
1192my $animate_timer; 1984my $animate_timer;
1193 1985
1194my $fps = 9; 1986my $fps = 9;
1195 1987
1196my %demo;#d#
1197
1198sub force_refresh { 1988sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1989 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1990 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1991
1202 $CFClient::UI::ROOT->draw; 1992 $CFPlus::UI::ROOT->draw;
1203 1993
1204 $WANT_REFRESH = 0; 1994 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1995 $CAN_REFRESH = 0;
1206 $LAST_REFRESH = $NOW; 1996 $LAST_REFRESH = $NOW;
1207 1997
12080 && do {
1209 # some weird model-drawing code, just a joke right now
1210 use CFClient::OpenGL;
1211
1212 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1213 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1214 $demo{r} ||= do {
1215 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1216 $mod->{v} = pack "f*", @{$mod->{v}};
1217 $_ = [scalar @$_, pack "S!*", @$_]
1218 for values %{$mod->{g}};
1219 $mod
1220 };
1221
1222 my $r = $demo{r} or die;
1223
1224 glDepthMask 1;
1225 glClear GL_DEPTH_BUFFER_BIT;
1226 glEnable GL_TEXTURE_2D;
1227 glEnable GL_DEPTH_TEST;
1228 glEnable GL_CULL_FACE;
1229 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1230
1231 glMatrixMode GL_PROJECTION;
1232 glLoadIdentity;
1233 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1234 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1235 glMatrixMode GL_MODELVIEW;
1236 glLoadIdentity;
1237
1238 glPushMatrix;
1239 glTranslate 0, 0, -800;
1240 glScale 1, -1, 1;
1241 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1242 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1243 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1244 glScale 50, 50, 50;
1245
1246 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1247 while (my ($k, $v) = each %{$r->{g}}) {
1248 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1249 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1250 }
1251
1252 glPopMatrix;
1253
1254 glShadeModel GL_FLAT;
1255 glDisable GL_DEPTH_TEST;
1256 glDisable GL_TEXTURE_2D;
1257 glDepthMask 0;
1258
1259 $WANT_REFRESH++;
1260};
1261
1262 CFClient::SDL_GL_SwapBuffers; 1998 CFPlus::SDL_GL_SwapBuffers;
1263} 1999}
1264 2000
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 2001my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 2002 $NOW = time;
1267 2003
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2004 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 2005 for CFPlus::poll_events;
1270 2006
1271 if (%animate_object) { 2007 if (%animate_object) {
1272 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2008 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1273 $WANT_REFRESH++; 2009 ++$WANT_REFRESH;
1274 } 2010 }
1275 2011
1276 if ($WANT_REFRESH) { 2012 if ($WANT_REFRESH) {
1277 force_refresh; 2013 force_refresh;
1278 } else { 2014 } else {
… …
1288sub animation_stop { 2024sub animation_stop {
1289 my ($widget) = @_; 2025 my ($widget) = @_;
1290 delete $animate_object{$widget}; 2026 delete $animate_object{$widget};
1291} 2027}
1292 2028
1293# check once/second for faces that need to be prefetched
1294# this should, of course, only run on demand, but
1295# SDL forces worse things on us....
1296
1297Event->timer (after => 1, interval => 0.25, cb => sub {
1298 $CONN->face_prefetch
1299 if $CONN;
1300});
1301
1302%SDL_CB = ( 2029%SDL_CB = (
1303 CFClient::SDL_QUIT => sub { 2030 CFPlus::SDL_QUIT => sub {
1304 Event::unloop -1; 2031 exit;
1305 }, 2032 },
1306 CFClient::SDL_VIDEORESIZE => sub { 2033 CFPlus::SDL_VIDEORESIZE => sub {
1307 }, 2034 },
1308 CFClient::SDL_VIDEOEXPOSE => sub { 2035 CFPlus::SDL_VIDEOEXPOSE => sub {
1309 CFClient::UI::full_refresh; 2036 CFPlus::UI::full_refresh;
1310 }, 2037 },
1311 CFClient::SDL_ACTIVEEVENT => sub { 2038 CFPlus::SDL_ACTIVEEVENT => sub {
1312# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2039# not useful, as APPACTIVE include sonly iconified state, not unmapped
2040# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2041# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2042# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2043# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2044# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1313 }, 2045 },
1314 CFClient::SDL_KEYDOWN => sub { 2046 CFPlus::SDL_KEYDOWN => sub {
1315 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2047 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1316 # alt-enter 2048 # alt-enter
2049 $FULLSCREEN_ENABLE->toggle;
1317 video_shutdown; 2050 video_shutdown;
1318 $CFG->{fullscreen} = !$CFG->{fullscreen};
1319 video_init; 2051 video_init;
1320 } else { 2052 } else {
1321 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2053 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1322 } 2054 }
1323 }, 2055 },
1324 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2056 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1325 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2057 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1326 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2058 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1327 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2059 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1328 CFClient::SDL_USEREVENT => sub { 2060 CFPlus::SDL_USEREVENT => sub {
1329 if ($_[0]{code} == 1) { 2061 if ($_[0]{code} == 1) {
1330 audio_channel_finished $_[0]{data1}; 2062 audio_channel_finished $_[0]{data1};
1331 } elsif ($_[0]{code} == 0) { 2063 } elsif ($_[0]{code} == 0) {
1332 audio_music_finished; 2064 audio_music_finished;
1333 } 2065 }
… …
1337############################################################################# 2069#############################################################################
1338 2070
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 2071$SIG{INT} = $SIG{TERM} = sub { exit };
1340 2072
1341{ 2073{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1343
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 2074 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2075 CFPlus::DB::Server::run;
2076
1345 CFClient::UI::set_layout ($::CFG->{layout}); 2077 CFPlus::UI::set_layout ($::CFG->{layout});
1346 2078
1347 my %DEF_CFG = ( 2079 my %DEF_CFG = (
1348 sdl_mode => 0, 2080 sdl_mode => 0,
1349 width => 640,
1350 height => 480,
1351 fullscreen => 0, 2081 fullscreen => 0,
1352 fast => 0, 2082 fast => 0,
1353 map_scale => 1, 2083 map_scale => 1,
1354 fow_enable => 1, 2084 fow_enable => 1,
1355 fow_intensity => 0.45, 2085 fow_intensity => 0,
1356 fow_smooth => 0, 2086 map_smoothing => 1,
1357 gui_fontsize => 1, 2087 gui_fontsize => 1,
1358 log_fontsize => 1, 2088 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 2089 gauge_fontsize => 1,
1360 gauge_size => 0.35, 2090 gauge_size => 0.35,
1361 stat_fontsize => 1, 2091 stat_fontsize => 0.7,
1362 mapsize => 100, 2092 mapsize => 100,
1363 host => "crossfire.schmorp.de",
1364 say_command => 'say',
1365 audio_enable => 1, 2093 audio_enable => 1,
1366 bgm_enable => 1, 2094 bgm_enable => 1,
1367 bgm_volume => 0.25, 2095 bgm_volume => 0.25,
1368 face_prefetch => 0,
1369 output_sync => 1, 2096 output_sync => 1,
1370 output_count => 1, 2097 output_count => 1,
2098 output_rate => "",
2099 pickup => 0,
2100 inv_sort => "mtime",
2101 default => "profile", # default profile
2102 show_tips => 1,
2103 logview_max_par => 1000,
2104 );
1371 ); 2105
1372
1373 while (my ($k, $v) = each %DEF_CFG) { 2106 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 2107 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 2108 }
1376 2109
2110 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2111 $PROFILE = $CFG->{profile}{default};
2112
2113 # convert old bindings (only default profile matters)
2114 if (my $bindings = delete $PROFILE->{bindings}) {
2115 while (my ($mod, $syms) = each %$bindings) {
2116 while (my ($sym, $cmds) = each %$syms) {
2117 push @{ $PROFILE->{macro} }, {
2118 accelkey => [$mod*1, $sym*1],
2119 action => $cmds,
2120 };
2121 }
2122 }
2123 }
2124
1377 sdl_init; 2125 sdl_init;
1378 2126
1379 @SDL_MODES = reverse 2127 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1380 grep $_->[0] >= 640 && $_->[1] >= 480, 2128 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1381 CFClient::SDL_ListModes;
1382
1383 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2129 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2130
2131 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1384 2132
1385 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2133 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1386 2134
1387 { 2135 {
1388 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2136 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1389 DejaVuSans.ttf 2137 DejaVuSans.ttf
1390 DejaVuSansMono.ttf 2138 DejaVuSansMono.ttf
1391 DejaVuSans-Bold.ttf 2139 DejaVuSans-Bold.ttf
1392 DejaVuSansMono-Bold.ttf 2140 DejaVuSansMono-Bold.ttf
1393 DejaVuSans-Oblique.ttf 2141 DejaVuSans-Oblique.ttf
1394 DejaVuSansMono-Oblique.ttf 2142 DejaVuSansMono-Oblique.ttf
1395 DejaVuSans-BoldOblique.ttf 2143 DejaVuSans-BoldOblique.ttf
1396 DejaVuSansMono-BoldOblique.ttf 2144 DejaVuSansMono-BoldOblique.ttf
1397 ); 2145 );
1398 2146
1399 CFClient::add_font $_ for @fonts; 2147 CFPlus::add_font $_ for @fonts;
1400 2148
1401 CFClient::pango_init; 2149 CFPlus::pango_init;
1402 2150
1403 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2151 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1404 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2152 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1405 2153
1406 $FONT_PROP->make_default; 2154 $FONT_PROP->make_default;
1407 } 2155 }
1408 2156
1409# compare mono (ft) vs. rgba (cairo) 2157# compare mono (ft) vs. rgba (cairo)
1410# ft - 1.8s, cairo 3s, even in alpha-only mode 2158# ft - 1.8s, cairo 3s, even in alpha-only mode
1411# for my $rgba (0..1) { 2159# for my $rgba (0..1) {
1412# my $t1 = Time::HiRes::time; 2160# my $t1 = Time::HiRes::time;
1413# for (1..1000) { 2161# for (1..1000) {
1414# my $layout = CFClient::Layout->new ($rgba); 2162# my $layout = CFPlus::Layout->new ($rgba);
1415# $layout->set_text ("hallo" x 100); 2163# $layout->set_text ("hallo" x 100);
1416# $layout->render; 2164# $layout->render;
1417# } 2165# }
1418# my $t2 = Time::HiRes::time; 2166# my $t2 = Time::HiRes::time;
1419# warn $t2-$t1; 2167# warn $t2-$t1;
1420# } 2168# }
1421 2169
2170 $startup_done->();
2171
1422 video_init; 2172 video_init;
1423 audio_init; 2173 audio_init;
1424} 2174}
1425 2175
2176show_tip_of_the_day if $CFG->{show_tips};
2177
1426Event::loop; 2178Event::loop;
2179#CFPlus::SDL_Quit;
2180#CFPlus::_exit 0;
1427 2181
1428END { CFClient::SDL_Quit } 2182END {
2183 CFPlus::SDL_Quit;
2184 CFPlus::DB::Server::stop;
2185}
1429 2186
1430=head1 NAME 2187=head1 NAME
1431 2188
1432pclient - A Crossfire+ and Crossfire game client 2189cfplus - A Crossfire+ and Crossfire game client
1433 2190
1434=head1 SYNOPSIS 2191=head1 SYNOPSIS
1435 2192
1436Just run it - no commandline arguments are supported. 2193Just run it - no commandline arguments are supported.
1437 2194
1438=head1 USAGE 2195=head1 USAGE
1439 2196
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2197cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 2198fullscreen and interactively.
1442 2199
2200=head1 DEBUGGING
2201
2202
2203CFPLUS_DEBUG - environment variable
2204
2205 1 draw borders around widgets
2206 2 add low-level widget info to tooltips
2207 4 show fps
2208 8 suppress tooltips
2209
1443=head1 AUTHOR 2210=head1 AUTHOR
1444 2211
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2212Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 2213
1447 2214

Diff Legend

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