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.52 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

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