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

Diff Legend

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