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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines