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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.214 by elmex, Tue Aug 14 14:12:46 2007 UTC

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

Diff Legend

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