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.29 by root, Mon May 29 21:54:16 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

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