ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines