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

Diff Legend

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