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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.15 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.218 by root, Sun Aug 19 14:17:05 2007 UTC

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

Diff Legend

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