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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines