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

Diff Legend

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