ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

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