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.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.200 by root, Thu Aug 2 14:35:21 2007 UTC

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

Diff Legend

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