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

Diff Legend

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