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

Diff Legend

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