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

Diff Legend

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