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.206 by root, Thu Aug 9 03:40:44 2007 UTC

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

Diff Legend

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