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.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.220 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

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