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

Diff Legend

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