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

Diff Legend

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