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.40 by root, Fri Jun 2 02:12:04 2006 UTC vs.
Revision 1.201 by root, Fri Aug 3 02:20:32 2007 UTC

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

Diff Legend

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