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

Diff Legend

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