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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

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