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.25 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

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