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

Diff Legend

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