ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC

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

Diff Legend

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