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

Diff Legend

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