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

Diff Legend

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