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.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.209 by root, Sat Aug 11 14:41:38 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines