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.14 by elmex, Sat May 27 08:45:24 2006 UTC vs.
Revision 1.217 by root, Sun Aug 19 14:09:28 2007 UTC

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

Diff Legend

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