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

Diff Legend

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