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

Diff Legend

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