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.41 by root, Fri Jun 2 02:21:48 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 $HOST_ENTRY; 136our $HOST_ENTRY;
87our $SERVER_SETUP; 137our $FULLSCREEN_ENABLE;
138our $PICKUP_ENABLE;
139our $SERVER_INFO;
88 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;
89our $FLOORBOX; 157our $FLOORBOX;
90our $GAUGES; 158our $GAUGES;
91our $STATWIDS; 159our $STATWIDS;
92 160
93our $SDL_ACTIVE; 161our $SDL_ACTIVE;
94our %SDL_CB; 162our %SDL_CB;
95 163
96our $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
97our @SOUNDS; # event => file mapping 174our @SOUNDS; # event => file mapping
98our %AUDIO_CHUNKS; # audio files 175our %AUDIO_CHUNK; # audio files
99 176
100our $ALT_ENTER_MESSAGE; 177our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 178our $STATUSBOX;
102our $DEBUG_STATUS; 179our $DEBUG_STATUS;
103 180
104our $INV_WINDOW;
105our $INV; 181our $INV;
106our $INVR; 182our $INVR;
107our $INV_RIGHT_HB; 183our $INV_RIGHT_HB;
108 184
109our $BIND_WINDOW; 185our $PICKUP_CFG;
110our $BIND_EDITOR;
111 186
112our $SPELL_LIST; 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#############################################################################
113 365
114sub status { 366sub status {
115 $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]);
116} 368}
117 369
118sub debug { 370sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 371 $DEBUG_STATUS->set_text ($_[0]);
120} 372}
121 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;
613}
614
122sub start_game { 615sub start_game {
123 status "logging in..."; 616 status "logging in...";
124 617
125 $LOGIN_BUTTON->set_text ("Logout"); 618 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 619 $SETUP_DIALOG->hide;
127 620
128 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;
129 622
130 my ($host, $port) = split /:/, $CFG->{host}; 623 my ($host, $port) = split /:/, $PROFILE->{host};
131 624
132 $MAP = new CFClient::Map $mapsize, $mapsize; 625 $MAP = new CFPlus::Map;
133 626
134 $CONN = eval { 627 $CONN = eval {
135 new CFClient::Protocol 628 new CFPlus::Protocol
136 host => $host, 629 host => $host,
137 port => $port || 13327, 630 port => $port || 13327,
138 user => $CFG->{user}, 631 user => $PROFILE->{user},
139 pass => $CFG->{password}, 632 pass => $PROFILE->{password},
140 mapw => $mapsize, 633 mapw => $mapsize,
141 maph => $mapsize, 634 maph => $mapsize,
142 635
636 client => "cfplus $CFPlus::VERSION $] $^O",
637
143 map_widget => $MAPWIDGET, 638 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 639 statusbox => $STATUSBOX,
146 map => $MAP, 640 map => $MAP,
147 mapmap => $MAPMAP, 641 mapmap => $MAPMAP,
642 query => \&server_query,
148 643
149 sound_play => sub { 644 setup_req => {
150 my ($x, $y, $soundnum, $type) = @_; 645 smoothing => $CFG->{map_smoothing}*1,
151
152 $SDL_MIXER
153 or return;
154
155 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
156 or return;
157
158 $chunk->play;
159 }, 646 },
160 }; 647 };
161 648
162 if ($CONN) { 649 if ($CONN) {
163 CFClient::lowdelay fileno $CONN->{fh}; 650 CFPlus::lowdelay fileno $CONN->{fh};
164 651
165 status "login successful"; 652 status "login successful";
166 } else { 653 } else {
167 status "unable to connect"; 654 status "unable to connect";
168 stop_game(); 655 stop_game();
169 } 656 }
170} 657}
171 658
172sub stop_game { 659sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 660 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 661 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
662 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 663 $PL_WINDOW->hide;
176 $LOGVIEW->hide; 664 $SPELL_LIST->clear_spells;
665 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
666
667 &audio_music_set_ambient ([]);
177 668
178 return unless $CONN; 669 return unless $CONN;
179 670
180 status "connection closed"; 671 status "connection closed";
181 672
673 destroy_query_dialog $CONN;
182 $CONN->destroy; 674 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 675 $CONN = 0; # false, does not autovivify
184}
185 676
186sub client_setup { 677 undef $MAP;
187 my $dialog = new CFClient::UI::FancyFrame 678}
188 x => 1,
189 y => $HEIGHT * (1/8),
190 name => "client_setup",
191 title => "Client Setup",
192 child => (my $vbox = new CFClient::UI::VBox);
193 679
680sub graphics_setup {
681 my $vbox = new CFPlus::UI::VBox;
682
194 $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]);
195 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
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 697 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
198 698
699 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
199 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 700 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
200 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 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);
201 705
202 $mode_slider->connect (changed => sub { 706 $mode_slider->connect (changed => sub {
203 my ($self, $value) = @_; 707 my ($self, $value) = @_;
204 708
205 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 709 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
206 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 710 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
207 }); 711 });
208 $mode_slider->emit (changed => $mode_slider->{range}[0]); 712 $mode_slider->emit (changed => $mode_slider->{range}[0]);
209 713
210 my $row = 1;
211
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 715 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
214 state => $CFG->{fullscreen}, 716 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 717 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 718 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 719 );
221 720
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 722 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
224 state => $CFG->{fast}, 723 state => $CFG->{fast},
225 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.",
226 on_changed => sub { 738 on_activate => sub {
227 my ($self, $value) = @_; 739 video_shutdown ();
228 $CFG->{fast} = $value; 740 video_init ();
741 0
229 } 742 }
230 ); 743 );
231 744
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 746 $table->add_at (1, $row++, new CFPlus::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 747 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 748 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 749 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 750 );
241 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
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 762 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
244 state => $CFG->{fow_enable}, 763 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 765 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 766 );
251 767
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 769 $table->add_at (1, $row++, new CFPlus::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 770 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 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.",
256 on_changed => sub { 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 773 );
261 774
262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth},
265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266 on_changed => sub {
267 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value;
269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
270 }
271 );
272
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
278 );
279
280 $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");
281 $table->add (1, $row++, new CFClient::UI::Slider 776 $table->add_at (1, $row++, new CFPlus::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 777 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 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.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 779 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 ); 780 );
286 781
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 );
297
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 783 $table->add_at (1, $row++, new CFPlus::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 784 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 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.",
302 on_changed => sub { 786 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 787 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 788 &set_gauge_window_fontsize;
789 0
305 } 790 }
306 ); 791 );
307 792
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 794 $table->add_at (1, $row++, new CFPlus::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 795 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 797 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 798 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 799 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
800 0
315 } 801 }
316 ); 802 );
317 803
318 $table->add (1, $row++, new CFClient::UI::Button 804 $vbox
319 expand => 1, align => 0, text => "Apply", 805}
320 tooltip => "Apply the video settings",
321 on_activate => sub {
322 video_shutdown ();
323 video_init ();
324 }
325 );
326 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
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
329 state => $CFG->{audio_enable}, 816 state => $CFG->{audio_enable},
330 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.",
331 on_changed => sub { 818 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
332 $CFG->{audio_enable} = $_[1];
333 }
334 ); 819 );
335# $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");
336# $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 {
337# $CFG->{effects_volume} = $_[1]; 822# $CFG->{effects_volume} = $_[1];
338# }); 823# });
339 $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");
340 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
341 $hbox->add (new CFClient::UI::CheckBox 826 $hbox->add (new CFPlus::UI::CheckBox
342 expand => 1, state => $CFG->{bgm_enable}, 827 expand => 1, state => $CFG->{bgm_enable},
343 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.",
344 on_changed => sub { 829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
345 $CFG->{bgm_enable} = $_[1];
346 }
347 ); 830 );
348 $hbox->add (new CFClient::UI::Slider 831 $hbox->add (new CFPlus::UI::Slider
349 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
350 tooltip => "The volume of the background music. Changes are instant.", 833 tooltip => "The volume of the background music. Changes are instant.",
351 on_changed => sub { 834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
352 $CFG->{bgm_volume} = $_[1];
353 CFClient::MixMusic::volume $_[1] * 128;
354 }
355 ); 835 );
356 836
357 $table->add (1, $row++, new CFClient::UI::Button 837 $table->add_at (1, $row++, new CFPlus::UI::Button
358 expand => 1, align => 0, text => "Apply", 838 expand => 1, align => 0, text => "Apply",
359 tooltip => "Apply the audio settings", 839 tooltip => "Apply the audio settings",
360 on_activate => sub { 840 on_activate => sub {
361 audio_shutdown (); 841 audio_shutdown ();
362 audio_init (); 842 audio_init ();
843 0
363 } 844 }
364 ); 845 );
365 846
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 847 $vbox
367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368 text => $CFG->{say_command},
369 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. "
370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372 on_changed => sub {
373 my ($self, $value) = @_;
374 $CFG->{say_command} = $value;
375 }
376 );
377
378 $dialog
379}
380
381sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize});
384 }
385} 848}
386 849
387sub set_gauge_window_fontsize { 850sub set_gauge_window_fontsize {
388 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 851 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
389 $_->set_fontsize ($::CFG->{gauge_fontsize}); 852 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
391} 854}
392 855
393sub make_gauge_window { 856sub make_gauge_window {
394 my $gh = int $HEIGHT * $CFG->{gauge_size}; 857 my $gh = int $HEIGHT * $CFG->{gauge_size};
395 858
396 my $win = new CFClient::UI::Frame ( 859 my $win = new CFPlus::UI::Frame (
397 force_x => 0, 860 force_x => 0,
398 force_y => "max", 861 force_y => "max",
399 force_w => $WIDTH, 862 force_w => $WIDTH,
400 force_h => $gh, 863 force_h => $gh,
401 ); 864 );
402 865
403 $win->add (my $hbox = new CFClient::UI::HBox 866 $win->add (my $hbox = new CFPlus::UI::HBox
404 children => [ 867 children => [
405 (new CFClient::UI::HBox expand => 1), 868 (new CFPlus::UI::HBox expand => 1),
406 (new CFClient::UI::VBox children => [ 869 (new CFPlus::UI::VBox children => [
407 (new CFClient::UI::Empty expand => 1), 870 (new CFPlus::UI::Empty expand => 1),
408 (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)),
409 ]), 872 ]),
410 (my $vbox = new CFClient::UI::VBox), 873 (my $vbox = new CFPlus::UI::VBox),
411 ], 874 ],
412 ); 875 );
413 876
414 $vbox->add (new CFClient::UI::HBox 877 $vbox->add (new CFPlus::UI::HBox
415 expand => 1, 878 expand => 1,
416 children => [ 879 children => [
417 (new CFClient::UI::Empty expand => 1), 880 (new CFPlus::UI::Empty expand => 1),
418 (my $hb = new CFClient::UI::HBox), 881 (my $hb = new CFPlus::UI::HBox),
419 ], 882 ],
420 ); 883 );
421 884
422 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 885 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
423 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.");
424 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 886 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
425 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.");
426 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 887 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
427 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.");
428 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 888 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
429 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.");
430 889
431 $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");
432 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.");
433 $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");
434 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
435 892
436 $GAUGES = { 893 $GAUGES = {
437 exp => $exp, win => $win, range => $rng, 894 exp => $exp, win => $win, range => $rng,
438 food => $fg, mana => $mg, hp => $hg, grace => $gg 895 food => $fg, mana => $mg, hp => $hg, grace => $gg
439 }; 896 };
… …
441 &set_gauge_window_fontsize; 898 &set_gauge_window_fontsize;
442 899
443 $win 900 $win
444} 901}
445 902
903sub debug_setup {
904 my $table = new CFPlus::UI::Table;
446 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
447sub make_stats_window { 954sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 955 my $r = new CFPlus::UI::ScrolledWindow (
449 y => $HEIGHT * (2/8), 956 expand => 1,
450 x => "max", 957 scroll_y => 1
451 title => "Stats", 958 );
452 name => "stats_window"; 959 $r->add (my $vb = new CFPlus::UI::VBox);
453 960
454 $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
455 $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,
456 can_hover => 1, can_events => 1, 967 can_hover => 1, can_events => 1,
457 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.");
458 $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,
459 can_hover => 1, can_events => 1, 970 can_hover => 1, can_events => 1,
460 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).");
461 972
462 $vb->add (my $hb0 = new CFClient::UI::HBox); 973 $pi->add (my $hb0 = new CFPlus::UI::HBox);
463 $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,
464 can_hover => 1, can_events => 1, 975 can_hover => 1, can_events => 1,
465 tooltip => "The weight of the player including all inventory items."); 976 tooltip => "The weight of the player including all inventory items.");
466 $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,
467 can_hover => 1, can_events => 1, 978 can_hover => 1, can_events => 1,
468 tooltip => "The weight limit: you cannot carry more than this."); 979 tooltip => "The weight limit: you cannot carry more than this.");
469 980
470 981 $vb->add (new CFPlus::UI::FancyFrame
982 label => "Primary/Secondary Statistics",
471 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 983 child => (my $hb = new CFPlus::UI::HBox expand => 1),
984 );
472 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 985 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
473 986
474 my $color2 = [1, 1, 0]; 987 my $color2 = [1, 1, 0];
475 988
476 for ( 989 for (
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 [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],
483 [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],
484 997
485 [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],
486 [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],
487 [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],
488 [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],
489 [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],
490 [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],
491 ) { 1004 ) {
492 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 1005 my ($col, $row, $id, $label, $template) = @$_;
493 1006
494 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 1007 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
495 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");
496 $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
497 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");
498 } 1013 }
499 1014
1015 $vb->add (new CFPlus::UI::FancyFrame
1016 label => "Resistancies",
500 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1017 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1018 );
501 1019
502 my $row = 0; 1020 my $row = 0;
503 my $col = 0; 1021 my $col = 0;
504 1022
505 my %resist_names = ( 1023 my %resist_names = (
1024 slow => ["Slow",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 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",
513 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",
514 pois => "<b>Poison</b> (resistance to getting poisoned)", 1041 "<b>Poison</b> (resistance to getting poisoned)"],
1042 para => ["Paralysation",
515 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",
516 deat => "<b>Death</b> (resistance against death spells)", 1045 "<b>Death</b> (resistance against death spells)"],
517 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",
518 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",
519 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",
520 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",
521 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",
522 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",
523 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)"],
524 ); 1060 );
1061
525 for (qw/slow holyw conf fire depl magic 1062 for (qw/slow holyw conf fire depl magic
526 drain acid pois para deat phys 1063 drain acid pois para deat phys
527 blind fear tund elec cold ghit/) 1064 blind fear tund elec cold ghit/)
528 { 1065 {
529 $tbl2->add ($col, $row, 1066 $tbl2->add_at ($col, $row,
530 $STATWIDS->{"res_$_"} = 1067 $STATWIDS->{"res_$_"} =
531 new CFClient::UI::Label 1068 new CFPlus::UI::Label
532 font => $FONT_FIXED, 1069 font => $FONT_FIXED,
533 template => "-100%", 1070 template => "-100%",
534 align => +1, 1071 align => +1,
535 valign => 0, 1072 valign => 0,
536 can_events => 1, 1073 can_events => 1,
537 can_hover => 1, 1074 can_hover => 1,
538 tooltip => $resist_names{$_}, 1075 tooltip => $resist_names{$_}->[1],
539 ); 1076 );
540 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1077 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
541 font => $FONT_FIXED, 1078 font => $FONT_FIXED,
542 can_hover => 1, 1079 can_hover => 1,
543 can_events => 1, 1080 can_events => 1,
544 image => "ui/resist/resist_$_.png", 1081 path => "ui/resist/resist_$_.png",
545 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],
546 ); 1090 );
547 1091
548 $row++; 1092 $row++;
549 if ($row % 6 == 0) { 1093 if ($row % 6 == 0) {
550 $col += 2; 1094 $col += 3;
551 $row = 0; 1095 $row = 0;
552 } 1096 }
553 } 1097 }
554 1098
555 &set_stats_window_fontsize;
556 update_stats_window ({}); 1099 #update_stats_window ({});
557 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]);
558 $tgw 1107 $sw
559} 1108}
560 1109
561sub formsep { 1110sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 1111 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563}
564
565sub update_stats_window {
566 my ($stats) = @_;
567
568 # I love text protocols...
569
570 my $hp = $stats->{+CS_STAT_HP} * 1;
571 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
572 my $sp = $stats->{+CS_STAT_SP} * 1;
573 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
574 my $fo = $stats->{+CS_STAT_FOOD} * 1;
575 my $fo_m = 999;
576 my $gr = $stats->{+CS_STAT_GRACE} * 1;
577 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
578
579 $GAUGES->{hp} ->set_value ($hp, $hp_m);
580 $GAUGES->{mana} ->set_value ($sp, $sp_m);
581 $GAUGES->{food} ->set_value ($fo, $fo_m);
582 $GAUGES->{grace} ->set_value ($gr, $gr_m);
583 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
584 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
585 my $rng = $stats->{+CS_STAT_RANGE};
586 $rng =~ s/^Range: //; # thank you so much dear server
587 $GAUGES->{range} ->set_text ("Rng: " . $rng);
588 my $title = $stats->{+CS_STAT_TITLE};
589 $title =~ s/^Player: //;
590 $STATWIDS->{title} ->set_text ("Title: " . $title);
591
592 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
593 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
594 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
595 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
596 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
597 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
598 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
599 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
600 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
601 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
602 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
603 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
604 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
605
606 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
607
608 # TODO: replace by CS_STAT_RES_xxx constants
609 my %tbl = (
610 phys => 100,
611 magic => 101,
612 fire => 102,
613 elec => 103,
614 cold => 104,
615 conf => 105,
616 acid => 106,
617 drain => 107,
618 ghit => 108,
619 pois => 109,
620 slow => 110,
621 para => 111,
622 tund => 112,
623 fear => 113,
624 depl => 113,
625 deat => 115,
626 holyw => 116,
627 blind => 117,
628 );
629
630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
631 for keys %tbl;
632} 1112}
633 1113
634my $METASERVER_ATIME; 1114my $METASERVER_ATIME;
635 1115
636sub update_metaserver { 1116sub update_metaserver {
1117 my ($metaserver_dialog) = @_;
1118
1119 $METASERVER = $metaserver_dialog
1120 if defined $metaserver_dialog;
1121
637 return if $METASERVER_ATIME > time; 1122 return if $METASERVER_ATIME > time;
638 $METASERVER_ATIME = time + 60; 1123 $METASERVER_ATIME = time + 60;
639 1124
640 my $table = $METASERVER->{table}; 1125 my $table = $METASERVER->{table};
641 $table->clear; 1126 $table->clear;
642 $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...");
643 1128
644 my $buf; 1129 my $ok = 0;
645 1130
646 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1131 CFPlus::background {
1132 my $ua = CFPlus::lwp_useragent;
647 1133
648 unless ($fh) { 1134 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
649 $label->set_text ("unable to contact metaserver: $!"); 1135 } sub {
650 return; 1136 my ($msg) = @_;
651 } 1137 if ($msg) {
652
653 Event->io (fd => $fh, poll => 'r', cb => sub {
654 my $res = sysread $fh, $buf, 8192, length $buf;
655
656 if (!defined $res) {
657 $_[0]->w->cancel;
658 $label->set_text ("error while retrieving server list: $!");
659 } elsif ($res == 0) {
660 $_[0]->w->cancel;
661 status "server list retrieved";
662
663 utf8::decode $buf if utf8::valid $buf;
664
665 $table->clear; 1138 $table->clear;
666 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 );
667 my @col = qw(Use #Users Host Uptime Version Description); 1147 my @col = qw(#Users Host Uptime Version Description);
668 $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[$_])
669 for 0 .. $#col; 1152 for 0 .. $#col;
670 1153
671 my @align = qw(1 0 1 1 -1); 1154 my @align = qw(1 0 1 1 -1);
672 1155
673 my $y = 0; 1156 my $y = 0;
674 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1157 for my $m (@{ $msg->{servers} }) {
675 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)};
676 1160
677 for ($desc) { 1161 for ($desc) {
678 s/<br>/\n/gi; 1162 s/<br>/\n/gi;
679 s/<li>/\n· /gi; 1163 s/<li>/\n· /gi;
680 s/<.*?>//sgi; 1164 s/<.*?>//sgi;
681 s/&/&amp;/g; 1165 s/&amp;/&/g;
682 s/</&lt;/g; 1166 s/&lt;/</g;
683 s/>/&gt;/g; 1167 s/&gt;/>/g;
684 } 1168 }
685 1169
686 $uptime = sprintf "%dd %02d:%02d:%02d", 1170 $uptime = sprintf "%dd %02d:%02d:%02d",
687 (int $m->[8] / 86400), 1171 (int $uptime / 86400),
688 (int $m->[8] / 3600) % 24, 1172 (int $uptime / 3600) % 24,
689 (int $m->[8] / 60) % 60, 1173 (int $uptime / 60) % 60,
690 $m->[8] % 60; 1174 $uptime % 60;
691 1175
692 $m = [$users, $host, $uptime, $version, $desc]; 1176 $m = [$users, $host, $uptime, $version, $desc];
693 1177
694 $y++; 1178 $y++;
695 1179
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 1180 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
697 (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 {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 1185 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
699 $METASERVER->toggle_visibility; 1186 $METASERVER->hide;
1187 0
1188 },
700 }), 1189 ),
701 (new CFClient::UI::Empty expand => 1), 1190 (new CFPlus::UI::Empty expand => 1),
702 ]); 1191 ]);
703 1192
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 1193 $table->add_at ($_, $y, new CFPlus::UI::Label
705 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)
706 for 0 .. $#$m; 1203 for 0 .. $#$m;
707 } 1204 }
1205 } else {
1206 $ok or $label->set_text ("error while contacting metaserver");
708 } 1207 }
709 }); 1208 };
1209
710} 1210}
711 1211
712sub metaserver_dialog { 1212sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame 1213 my $vbox = new CFPlus::UI::VBox;
1214 my $table = new CFPlus::UI::Table;
1215 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1216
1217 my $dialog = new CFPlus::UI::Toplevel
714 title => "Server List", 1218 title => "Server List",
715 name => 'metaserver_dialog', 1219 name => 'metaserver_dialog',
716 x => 'center', 1220 x => 'center',
717 y => 'center', 1221 y => 'center',
718 child => (my $vbox = new CFClient::UI::VBox), 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,
719 on_visibility_change => sub { 1228 on_visibility_change => sub {
720 update_metaserver if $_[1]; 1229 update_metaserver ($_[0]) if $_[1];
1230 0
721 }, 1231 },
722 ; 1232 ;
723 1233
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog 1234 $dialog
727} 1235}
728 1236
729sub server_setup { 1237sub server_setup {
730 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1238 my $vbox = new CFPlus::UI::VBox;
731 x => "center", 1239
732 y => "center", 1240 $vbox->add (new CFPlus::UI::FancyFrame
733 name => "server_setup", 1241 label => "Connection Settings",
734 title => "Server Setup", 1242 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
735 child => (my $vbox = new CFClient::UI::VBox),
736 ; 1243 );
737
738 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
739 $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");
740 1245
741 { 1246 {
742 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1247 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
743 1248
744 $vbox->add ( 1249 $vbox->add (
745 $HOST_ENTRY = new CFClient::UI::Entry 1250 $HOST_ENTRY = new CFPlus::UI::Entry
746 expand => 1, 1251 expand => 1,
747 text => $CFG->{host}, 1252 text => $CFG->{profile}{default}{host},
748 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",
749 on_changed => sub { 1254 on_changed => sub {
750 my ($self, $value) = @_; 1255 my ($self, $value) = @_;
751 $CFG->{host} = $value; 1256 $CFG->{profile}{default}{host} = $value;
1257 1
752 } 1258 }
753 ); 1259 );
754 1260
755 $METASERVER = metaserver_dialog;
756
757 $vbox->add (new CFClient::UI::Button 1261 $vbox->add (new CFPlus::UI::Button
758 expand => 1, 1262 expand => 1,
759 text => "Server List", 1263 text => "Server List",
760 other => $METASERVER, 1264 other => $METASERVER,
761 tooltip => "Show a list of available crossfire servers", 1265 tooltip => "Show a list of available crossfire servers",
762 on_activate => sub { $METASERVER->toggle_visibility }, 1266 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1267 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
763 ); 1268 );
764 } 1269 }
765 1270
766 $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");
767 $table->add (1, 4, new CFClient::UI::Entry 1272 $table->add_at (1, 4, new CFPlus::UI::Entry
768 text => $CFG->{user}, 1273 text => $CFG->{profile}{default}{user},
769 tooltip => "The name of your character on the server", 1274 tooltip => "The name of your character on the server",
770 on_changed => sub { 1275 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
771 my ($self, $value) = @_;
772 $CFG->{user} = $value;
773 }
774 ); 1276 );
775 1277
776 $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");
777 $table->add (1, 5, new CFClient::UI::Entry 1279 $table->add_at (1, 5, new CFPlus::UI::Entry
778 text => $CFG->{password}, 1280 text => $CFG->{profile}{default}{password},
779 hidden => 1, 1281 hidden => 1,
780 tooltip => "The password for your character", 1282 tooltip => "The password for your character",
781 on_changed => sub { 1283 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
782 my ($self, $value) = @_;
783 $CFG->{password} = $value;
784 }
785 ); 1284 );
786 1285
787 $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");
788 $table->add (1, 7, new CFClient::UI::Slider 1287 $table->add_at (1, 7, new CFPlus::UI::Slider
789 force_w => 100, 1288 force_w => 100,
790 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1289 range => [$CFG->{mapsize}, 10, 100, 0, 1],
791 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. "
792 . "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, "
793 . "but you also increase bandwidth requirements and latency. " 1292 . "but you also increase bandwidth requirements and latency. "
794 . "This option is only used once at log-in.", 1293 . "This option is only used once at log-in.",
795 on_changed => sub { 1294 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
796 my ($self, $value) = @_;
797
798 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
799 },
800 ); 1295 );
801 1296
802 $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");
803 $table->add (1, 8, new CFClient::UI::CheckBox 1298 $table->add_at (1, 8, new CFPlus::UI::Entry
804 state => $CFG->{face_prefetch}, 1299 text => $CFG->{output_rate},
805 tooltip => "<b>Background Image Prefetch</b>\n\n" 1300 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
806 . "If enabled, the client automatically pre-fetches images from the server. " 1301 . "when sending data. When 0 or unset, the server "
807 . "This might increase or create lag, but increases the chances " 1302 . "default will be used, which is usually around 100kb/s. Most servers will "
808 . "of faces being ready for display when you encounter them. " 1303 . "dynamically find an optimal rate, so adjust this only when necessary.",
809 . "It also uses up server bandwidth on every connect, "
810 . "so only set it if you really need to prefetch images. "
811 . "This option can be set and unset any time.",
812 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1304 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
813 ); 1305 );
814 1306
815 $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");
816 $table->add (1, 9, new CFClient::UI::Entry 1308 $table->add_at (1, 9, new CFPlus::UI::Entry
817 text => $CFG->{output_count}, 1309 text => $CFG->{output_count},
818 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.",
819 on_changed => sub { $CFG->{output_count} = $_[1] }, 1311 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
820 ); 1312 );
821 1313
822 $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");
823 $table->add (1, 10, new CFClient::UI::Entry 1315 $table->add_at (1, 10, new CFPlus::UI::Entry
824 text => $CFG->{output_sync}, 1316 text => $CFG->{output_sync},
825 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.",
826 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1318 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
827 ); 1319 );
828 1320
829 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1321 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
830 expand => 1, 1322 expand => 1,
831 align => 0, 1323 align => 0,
832 text => "Login", 1324 text => "Login",
833 on_activate => sub { 1325 on_activate => sub {
834 $CONN ? stop_game 1326 $CONN ? stop_game
835 : start_game; 1327 : start_game;
1328 1
836 }, 1329 },
837 ); 1330 );
838 1331
839 $dialog 1332 $vbox->add (new CFPlus::UI::FancyFrame
840} 1333 label => "Server Info",
1334 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1335 );
841 1336
842sub message_window { 1337 $vbox
843 my $window = new CFClient::UI::FancyFrame 1338}
844 name => "message_window",
845 title => "Messages",
846 border_bg => [1, 1, 1, 1],
847 bg => [0, 0, 0, 0.75],
848 x => "max",
849 y => 0,
850 force_w => $::WIDTH / 3,
851 force_h => $::HEIGHT / 5,
852 child => (my $vbox = new CFClient::UI::VBox);
853 1339
854 $vbox->add ($LOGVIEW); 1340sub client_setup {
1341 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
855 1342
856 $vbox->add (my $input = new CFClient::UI::Entry 1343 my $row = 0;
857 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1344
858 . "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");
859 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1346 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
860 . "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?",
861 on_focus_in => sub { 1349 on_changed => sub {
862 my ($input, $prev_focus) = @_; 1350 my ($self, $value) = @_;
863 1351 $CFG->{show_tips} = $value;
864 delete $input->{refocus_map};
865
866 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
867 $input->{refocus_map} = 1;
868 } 1352 0
869 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
870 }, 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",
871 on_activate => sub { 1468 on_activate => sub {
872 my ($input, $text) = @_; 1469 $::CONN->send_command ("pickup $::CFG->{pickup}")
873 $input->set_text (''); 1470 if defined $::CONN;
874
875 if ($text =~ /^\/bind\s+(.*)$/) {
876 CFClient::Binder::open_binding_dialog (sub {
877 my ($mod, $sym) = @_;
878 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
879 });
880 } elsif ($text =~ /^\/(.*)/) {
881 $::CONN->user_send ($1);
882 } else {
883 my $say_cmd = $::CFG->{say_command} || 'say';
884 $::CONN->user_send ("$say_cmd $text");
885 } 1471 0
886 if ($input->{refocus_map}) { 1472 });
887 delete $input->{refocus_map}; 1473
888 $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 } @_
889 } 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]});
890 }, 1516 },
891 on_escape => sub { 1517 );
892 $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 );
893 }, 1647 }
894 );
895 1648
896 $CONSOLE = { 1649 if (@future) {
897 window => $window, 1650 $buttons->add (new CFPlus::UI::Button
898 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);
899 }; 1684 };
900 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
901 $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;
902} 1719}
903 1720
904sub open_quit_dialog { 1721sub open_quit_dialog {
905 unless ($QUIT_DIALOG) { 1722 unless ($QUIT_DIALOG) {
906 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1723 $QUIT_DIALOG = new CFPlus::UI::Toplevel
907 x => "center", 1724 x => "center",
908 y => "center", 1725 y => "center",
1726 z => 50,
909 title => "Really Quit?", 1727 title => "Really Quit?",
1728 on_key_down => sub {
1729 my ($dialog, $ev) = @_;
1730 $ev->{sym} == 27 and $dialog->hide;
1731 }
910 ; 1732 ;
911 1733
912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1734 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
913 1735
914 $vb->add (new CFClient::UI::Label 1736 $vb->add (new CFPlus::UI::Label
915 text => "You should find a savebed and apply it first!", 1737 text => "You should find a savebed and apply it first!",
916 max_w => $WIDTH * 0.25, 1738 max_w => $WIDTH * 0.25,
917 ellipsize => 0, 1739 ellipsize => 0,
918 ); 1740 );
919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1741 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
920 $hb->add (new CFClient::UI::Button 1742 $hb->add (new CFPlus::UI::Button
921 text => "Ok", 1743 text => "Ok",
922 expand => 1, 1744 expand => 1,
923 on_activate => sub { $QUIT_DIALOG->hide }, 1745 on_activate => sub { $QUIT_DIALOG->hide; 0 },
924 ); 1746 );
925 $hb->add (new CFClient::UI::Button 1747 $hb->add (new CFPlus::UI::Button
926 text => "Quit anyway", 1748 text => "Quit anyway",
927 expand => 1, 1749 expand => 1,
928 on_activate => sub { exit }, 1750 on_activate => sub { exit },
929 ); 1751 );
930 } 1752 }
931 1753
932 $QUIT_DIALOG->show; 1754 $QUIT_DIALOG->show;
1755 $QUIT_DIALOG->grab_focus;
933} 1756}
934 1757
935sub make_inventory_window { 1758sub show_tip_of_the_day {
936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1759 # find all tips
937 x => "center", 1760 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
938 y => "center",
939 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10,
941 title => "Inventory",
942 ;
943 1761
944 $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 { };
945 1766
946 $hb->add (my $vb1 = new CFClient::UI::VBox); 1767 # create dialog
947 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1768 my $dialog;
948 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
949 1769
950 $hb->add (my $vb2 = new CFClient::UI::VBox); 1770 my $close = sub {
951 1771 $dialog->destroy;
952 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
953
954 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
955
956 # XXX: Call after $INVR = ... because set_opencont sets the items
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958
959 $invwin
960}
961
962sub make_spell_list {
963 $SPELL_LIST = new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967}
968
969sub make_binding_window {
970 my $binding_list = new CFClient::UI::VBox;
971
972 my $refresh;
973 $refresh = sub {
974 $binding_list->clear ();
975
976 for my $mod (keys %{$::CFG->{bindings}}) {
977 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
978 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
979 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
980
981 my $lbl = join "; ", @$cmds;
982 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
983 $binding_list->add (my $hb = new CFClient::UI::HBox);
984 $hb->add (new CFClient::UI::Button
985 text => "delete",
986 tooltip => "Deletes the binding",
987 on_activate => sub {
988 $binding_list->remove ($hb);
989 delete $::CFG->{bindings}->{$mod}->{$sym};
990 });
991
992 $hb->add (new CFClient::UI::Button
993 text => "edit",
994 tooltip => "Edits the binding",
995 on_activate => sub {
996 $::BIND_EDITOR->set_binding (
997 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
998 sub {
999 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->();
1003 $::BIND_WINDOW->show;
1004 },
1005 sub {
1006 $::BIND_WINDOW->show;
1007 });
1008 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide;
1010 });
1011
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 }
1015 }
1016 };
1017
1018 $BIND_WINDOW = new CFClient::UI::FancyFrame
1019 title => "Bindings",
1020 x => "center",
1021 y => "center",
1022 def_w => int $WIDTH * 9/10,
1023 def_h => int $HEIGHT * 9/10,
1024 on_visibility_change => sub {
1025 my ($self, $visible) = @_;
1026 $refresh->() if $visible;
1027 }; 1772 };
1028 1773
1029 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1774 $dialog = new CFPlus::UI::Toplevel
1030 $vb->add ($binding_list); 1775 x => "center",
1031 $vb->add (my $hb = new CFClient::UI::HBox); 1776 y => "center",
1032 $hb->add (new CFClient::UI::Button 1777 z => 3,
1033 text => "record new", 1778 name => 'tip_of_the_day',
1034 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub {
1039 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->();
1042 $::BIND_WINDOW->show;
1043 },
1044 sub {
1045 $::BIND_WINDOW->show;
1046 });
1047 $::BIND_WINDOW->hide;
1048 $::BIND_EDITOR->show;
1049 },
1050 );
1051 $hb->add (new CFClient::UI::Button
1052 text => "close",
1053 tooltip => "Closes the binding window",
1054 expand => 1,
1055 on_activate => sub {
1056 $::BIND_WINDOW->hide;
1057 }
1058 );
1059
1060 $refresh->();
1061 $BIND_WINDOW
1062}
1063
1064sub make_help_window {
1065 my $win = new CFClient::UI::FancyFrame
1066 x => 'center',
1067 y => 'center',
1068 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8, 1779 force_w => int $WIDTH * 4/9,
1070 force_h => int $HEIGHT * 7/8, 1780 force_h => int $WIDTH * 2/9,
1071 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 ;
1072 1786
1073 $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]);
1074 1790
1075 $vbox->add (my $buttons = new CFClient::UI::HBox); 1791 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1077 1792
1078 for ( 1793 $table->add_at (0, 0, new CFPlus::UI::Button
1079 [intro => "Introduction"],
1080 [manual => "Manual"],
1081 [command_help => "Commands"],
1082 [skill_help => "Skills"],
1083 ) {
1084 my ($pod, $label) = @$_;
1085
1086 $buttons->add (new CFClient::UI::Button
1087 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>.",
1088 on_activate => sub { 1802 on_activate => sub {
1089 my $parser = new Pod::POM; 1803 $close->();
1090 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1804 &show_tip_of_the_day;
1091
1092 $viewer->clear;
1093
1094 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095 for @{ CFClient::pod_to_pango_list $pom };
1096
1097 $viewer->set_offset (0);
1098 }, 1805 },
1099 ); 1806 );
1807
1808 $dialog->show;
1100 } 1809 };
1101
1102 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1103
1104 $win
1105} 1810}
1106 1811
1107sub sdl_init { 1812sub sdl_init {
1108 CFClient::SDL_Init 1813 CFPlus::SDL_Init
1109 and die "SDL::Init failed!\n"; 1814 and die "SDL::Init failed!\n";
1110} 1815}
1111 1816
1112sub video_init { 1817sub video_init {
1113 sdl_init;
1114
1115 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1818 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1116 1819
1117 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1820 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1118 1821
1119 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1822 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1120 $FULLSCREEN = $CFG->{fullscreen}; 1823 $FULLSCREEN = $CFG->{fullscreen};
1121 $FAST = $CFG->{fast}; 1824 $FAST = $CFG->{fast};
1122 1825
1123 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1826 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1124 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1827 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1125 1828
1126 $SDL_ACTIVE = 1; 1829 $SDL_ACTIVE = 1;
1127 $LAST_REFRESH = time - 0.01; 1830 $LAST_REFRESH = time - 0.01;
1128 1831
1129 CFClient::OpenGL::init; 1832 CFPlus::OpenGL::init;
1130 1833
1131 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1834 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1132 1835
1133 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1836 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1134 1837
1135 ############################################################################# 1838 #############################################################################
1136 1839
1137 if ($DEBUG_STATUS) { 1840 if ($DEBUG_STATUS) {
1138 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1841 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1139 } else { 1842 } else {
1140 # create the widgets 1843 # create the widgets
1141 1844
1142 $DEBUG_STATUS = new CFClient::UI::Label 1845 $DEBUG_STATUS = new CFPlus::UI::Label
1143 padding => 0, 1846 padding => 0,
1144 z => 100, 1847 z => 100,
1145 force_x => "max", 1848 force_x => "max",
1146 force_y => 0; 1849 force_y => 0;
1147 $DEBUG_STATUS->show; 1850 $DEBUG_STATUS->show;
1148 1851
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150
1151 $STATUSBOX = new CFClient::UI::Statusbox; 1852 $STATUSBOX = new CFPlus::UI::Statusbox;
1152 $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]);
1153 1854
1154 (new CFClient::UI::Frame 1855 (new CFPlus::UI::Frame
1155 bg => [0, 0, 0, 0.4], 1856 bg => [0, 0, 0, 0.4],
1156 force_x => 0, 1857 force_x => 0,
1157 force_y => "max", 1858 force_y => "max",
1158 child => $STATUSBOX, 1859 child => $STATUSBOX,
1159 )->show; 1860 )->show;
1160 1861
1161 CFClient::UI::FancyFrame->new ( 1862 CFPlus::UI::Toplevel->new (
1863 title => "Map",
1864 name => "mapmap",
1162 x => 0, 1865 x => 0,
1163 y => $FONTSIZE + 8, 1866 y => $FONTSIZE + 8,
1164 border_bg => [1, 1, 1, 192/255], 1867 border_bg => [1, 1, 1, 192/255],
1165 bg => [1, 1, 1, 0], 1868 bg => [1, 1, 1, 0],
1166 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1869 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1167 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.",
1168 ), 1871 ),
1169 )->show; 1872 )->show;
1170 1873
1171 $MAPWIDGET = new CFClient::MapWidget; 1874 $MAPWIDGET = new CFPlus::MapWidget;
1172 $MAPWIDGET->connect (activate_console => sub { 1875 $MAPWIDGET->connect (activate_console => sub {
1173 my ($mapwidget, $preset) = @_; 1876 my ($mapwidget, $preset) = @_;
1174 1877
1175 if ($CONSOLE) { 1878 $MESSAGE_WINDOW->activate_console ($preset)
1176 $CONSOLE->{input}->{auto_activated} = 1; 1879 if $MESSAGE_WINDOW;
1177 $CONSOLE->{input}->focus_in;
1178
1179 if ($preset && $CONSOLE->{input}->get_text eq '') {
1180 $CONSOLE->{input}->set_text ($preset);
1181 }
1182 }
1183 }); 1880 });
1184 $MAPWIDGET->show; 1881 $MAPWIDGET->show;
1185 $MAPWIDGET->focus_in; 1882 $MAPWIDGET->grab_focus;
1186 1883
1187 $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',
1188 expand => 1, 1889 z => 2,
1189 font => $FONT_FIXED, 1890 force_w => $::WIDTH * 0.6,
1190 fontsize => $::CFG->{log_fontsize}, 1891 force_h => $::HEIGHT * 0.6,
1191 can_hover => 1, 1892 has_close_button => 1,
1192 can_events => 1,
1193 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1194 ; 1893 ;
1195 1894
1196 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1895 $METASERVER = metaserver_dialog;
1896 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1197 1897
1198 $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,
1199 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);
1200 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1900
1901 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1201 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
1202 $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,
1203 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.");
1204 1926
1205 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
1206 1928
1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1208 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1209 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1929 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1210 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.");
1211 ."You can also hit the Tab-key to show/hide the Inventory.");
1212 1931
1213 $BUTTONBAR->add (new CFClient::UI::Button 1932 $BUTTONBAR->add (new CFPlus::UI::Button
1214 text => "Save Config", 1933 text => "Save Config",
1215 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.",
1216 on_activate => sub { 1935 on_activate => sub {
1217 $::CFG->{layout} = CFClient::UI::get_layout; 1936 $::CFG->{layout} = CFPlus::UI::get_layout;
1218 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1937 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1219 status "Configuration Saved"; 1938 status "Configuration Saved";
1939 0
1220 }, 1940 },
1221 ); 1941 );
1222 1942
1223 $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,
1224 tooltip => "View Documentation"); 1944 tooltip => "View Documentation");
1225 1945
1226 $BUTTONBAR->add (new CFClient::UI::Flopper
1227 text => "Bindings",
1228 other => make_binding_window,
1229 tooltip =>
1230 "Lets you define, edit and delete bindings."
1231 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1232 ."with nothing set and the recording started. After doing the actions you "
1233 ."want to record press Insert and you will be asked to press a key-combo."
1234 ."After pressing the combo the binding will be saved automatically and the "
1235 ."binding editor closes");
1236 1946
1237 $BUTTONBAR->add (new CFClient::UI::Flopper
1238 text => "Spells",
1239 other => make_spell_list,
1240 tooltip => "The spell list");
1241
1242 $BUTTONBAR->add (new CFClient::UI::Button 1947 $BUTTONBAR->add (new CFPlus::UI::Button
1243 text => "Quit", 1948 text => "Quit",
1244 tooltip => "Terminates the program", 1949 tooltip => "Terminates the program",
1245 on_activate => sub { 1950 on_activate => sub {
1246 if ($CONN) { 1951 if ($CONN) {
1247 open_quit_dialog; 1952 open_quit_dialog;
1248 } else { 1953 } else {
1249 exit; 1954 exit;
1250 } 1955 }
1956 0
1251 }, 1957 },
1252 ); 1958 );
1253 1959
1254 $BUTTONBAR->show; 1960 $BUTTONBAR->show;
1255 $SERVER_SETUP->show; 1961 $SETUP_DIALOG->show;
1256
1257 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1258 } 1962 }
1963
1964 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1259} 1965}
1260 1966
1261sub video_shutdown { 1967sub video_shutdown {
1968 CFPlus::OpenGL::shutdown;
1969
1262 undef $SDL_ACTIVE; 1970 undef $SDL_ACTIVE;
1263}
1264
1265my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1266my $bgmusic;#TODO#hack#d#
1267
1268sub audio_channel_finished {
1269 my ($channel) = @_;
1270
1271 #warn "channel $channel finished\n";#d#
1272}
1273
1274sub audio_music_finished {
1275 return unless $CFG->{bgm_enable};
1276
1277 # TODO: hack, do play loop and mood music
1278 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1279 $bgmusic->play (0);
1280
1281 push @bgmusic, shift @bgmusic;
1282} 1971}
1283 1972
1284sub audio_init { 1973sub audio_init {
1285 if ($CFG->{audio_enable}) { 1974 if ($CFG->{audio_enable}) {
1286 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1287 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1288 1977
1289 unless ($SDL_MIXER) { 1978 unless ($SDL_MIXER) {
1290 status "Unable to open sound device: there will be no sound"; 1979 status "Unable to open sound device: there will be no sound";
1291 return; 1980 return;
1292 }
1293
1294 CFClient::Mix_AllocateChannels 8;
1295 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1296
1297 audio_music_finished;
1298
1299 while (<$fh>) {
1300 next if /^\s*#/;
1301 next if /^\s*$/;
1302
1303 my ($file, $volume, $event) = split /\s+/, $_, 3;
1304
1305 push @SOUNDS, "$volume,$file";
1306
1307 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1308 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1309 $chunk->volume ($volume * 128 / 100);
1310 $chunk
1311 };
1312 }
1313 } else {
1314 status "unable to open sound config: $!";
1315 } 1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
1316 } 1988 }
1317} 1989}
1318 1990
1319sub audio_shutdown { 1991sub audio_shutdown {
1320 CFClient::Mix_CloseAudio if $SDL_MIXER; 1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1321 undef $SDL_MIXER; 1993 undef $SDL_MIXER;
1322 @SOUNDS = (); 1994 @SOUNDS = ();
1323 %AUDIO_CHUNKS = (); 1995 %AUDIO_CHUNK = ();
1324} 1996}
1325 1997
1326my %animate_object; 1998my %animate_object;
1327my $animate_timer; 1999my $animate_timer;
1328 2000
1329my $fps = 9; 2001my $fps = 9;
1330
1331my %demo;#d#
1332 2002
1333sub force_refresh { 2003sub force_refresh {
1334 $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;
1335 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1336 2006
1337 $CFClient::UI::ROOT->draw; 2007 $CFPlus::UI::ROOT->draw;
1338 2008
1339 $WANT_REFRESH = 0; 2009 $WANT_REFRESH = 0;
1340 $CAN_REFRESH = 0; 2010 $CAN_REFRESH = 0;
1341 $LAST_REFRESH = $NOW; 2011 $LAST_REFRESH = $NOW;
1342 2012
13430 && do {
1344 # some weird model-drawing code, just a joke right now
1345 use CFClient::OpenGL;
1346
1347 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1348 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1349 $demo{r} ||= do {
1350 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1351 $mod->{v} = pack "f*", @{$mod->{v}};
1352 $_ = [scalar @$_, pack "S!*", @$_]
1353 for values %{$mod->{g}};
1354 $mod
1355 };
1356
1357 my $r = $demo{r} or die;
1358
1359 glDepthMask 1;
1360 glClear GL_DEPTH_BUFFER_BIT;
1361 glEnable GL_TEXTURE_2D;
1362 glEnable GL_DEPTH_TEST;
1363 glEnable GL_CULL_FACE;
1364 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1365
1366 glMatrixMode GL_PROJECTION;
1367 glLoadIdentity;
1368 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1369 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1370 glMatrixMode GL_MODELVIEW;
1371 glLoadIdentity;
1372
1373 glPushMatrix;
1374 glTranslate 0, 0, -800;
1375 glScale 1, -1, 1;
1376 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1377 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1378 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1379 glScale 50, 50, 50;
1380
1381 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1382 while (my ($k, $v) = each %{$r->{g}}) {
1383 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1384 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1385 }
1386
1387 glPopMatrix;
1388
1389 glShadeModel GL_FLAT;
1390 glDisable GL_DEPTH_TEST;
1391 glDisable GL_TEXTURE_2D;
1392 glDepthMask 0;
1393
1394 $WANT_REFRESH++;
1395};
1396
1397 CFClient::SDL_GL_SwapBuffers; 2013 CFPlus::SDL_GL_SwapBuffers;
1398} 2014}
1399 2015
1400my $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 {
1401 $NOW = time; 2017 $NOW = time;
1402 2018
1403 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1404 for CFClient::SDL_PollEvent; 2020 for CFPlus::poll_events;
1405 2021
1406 if (%animate_object) { 2022 if (%animate_object) {
1407 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1408 $WANT_REFRESH++; 2024 ++$WANT_REFRESH;
1409 } 2025 }
1410 2026
1411 if ($WANT_REFRESH) { 2027 if ($WANT_REFRESH) {
1412 force_refresh; 2028 force_refresh;
1413 } else { 2029 } else {
… …
1423sub animation_stop { 2039sub animation_stop {
1424 my ($widget) = @_; 2040 my ($widget) = @_;
1425 delete $animate_object{$widget}; 2041 delete $animate_object{$widget};
1426} 2042}
1427 2043
1428# check once/second for faces that need to be prefetched
1429# this should, of course, only run on demand, but
1430# SDL forces worse things on us....
1431
1432Event->timer (after => 1, interval => 0.25, cb => sub {
1433 $CONN->face_prefetch
1434 if $CONN;
1435});
1436
1437%SDL_CB = ( 2044%SDL_CB = (
1438 CFClient::SDL_QUIT => sub { 2045 CFPlus::SDL_QUIT => sub {
1439 Event::unloop -1; 2046 exit;
1440 }, 2047 },
1441 CFClient::SDL_VIDEORESIZE => sub { 2048 CFPlus::SDL_VIDEORESIZE => sub {
1442 }, 2049 },
1443 CFClient::SDL_VIDEOEXPOSE => sub { 2050 CFPlus::SDL_VIDEOEXPOSE => sub {
1444 CFClient::UI::full_refresh; 2051 CFPlus::UI::full_refresh;
1445 }, 2052 },
1446 CFClient::SDL_ACTIVEEVENT => sub { 2053 CFPlus::SDL_ACTIVEEVENT => sub {
1447# 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;
1448 }, 2060 },
1449 CFClient::SDL_KEYDOWN => sub { 2061 CFPlus::SDL_KEYDOWN => sub {
1450 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2062 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1451 # alt-enter 2063 # alt-enter
2064 $FULLSCREEN_ENABLE->toggle;
1452 video_shutdown; 2065 video_shutdown;
1453 $CFG->{fullscreen} = !$CFG->{fullscreen};
1454 video_init; 2066 video_init;
1455 } else { 2067 } else {
1456 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2068 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1457 } 2069 }
1458 }, 2070 },
1459 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2071 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1460 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2072 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1461 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2073 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1462 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2074 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1463 CFClient::SDL_USEREVENT => sub { 2075 CFPlus::SDL_USEREVENT => sub {
1464 if ($_[0]{code} == 1) { 2076 if ($_[0]{code} == 1) {
1465 audio_channel_finished $_[0]{data1}; 2077 audio_channel_finished $_[0]{data1};
1466 } elsif ($_[0]{code} == 0) { 2078 } elsif ($_[0]{code} == 0) {
1467 audio_music_finished; 2079 audio_music_finished;
1468 } 2080 }
… …
1472############################################################################# 2084#############################################################################
1473 2085
1474$SIG{INT} = $SIG{TERM} = sub { exit }; 2086$SIG{INT} = $SIG{TERM} = sub { exit };
1475 2087
1476{ 2088{
1477 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1478
1479 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2089 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2090 CFPlus::DB::Server::run;
2091
1480 CFClient::UI::set_layout ($::CFG->{layout}); 2092 CFPlus::UI::set_layout ($::CFG->{layout});
1481 2093
1482 my %DEF_CFG = ( 2094 my %DEF_CFG = (
1483 sdl_mode => 0, 2095 sdl_mode => 0,
1484 width => 640,
1485 height => 480,
1486 fullscreen => 0, 2096 fullscreen => 0,
1487 fast => 0, 2097 fast => 0,
1488 map_scale => 1, 2098 map_scale => 1,
1489 fow_enable => 1, 2099 fow_enable => 1,
1490 fow_intensity => 0.45, 2100 fow_intensity => 0,
1491 fow_smooth => 0, 2101 map_smoothing => 1,
1492 gui_fontsize => 1, 2102 gui_fontsize => 1,
1493 log_fontsize => 1, 2103 log_fontsize => 0.7,
1494 gauge_fontsize=> 1, 2104 gauge_fontsize => 1,
1495 gauge_size => 0.35, 2105 gauge_size => 0.35,
1496 stat_fontsize => 1, 2106 stat_fontsize => 0.7,
1497 mapsize => 100, 2107 mapsize => 100,
1498 host => "crossfire.schmorp.de",
1499 say_command => 'say',
1500 audio_enable => 1, 2108 audio_enable => 1,
1501 bgm_enable => 1, 2109 bgm_enable => 1,
1502 bgm_volume => 0.25, 2110 bgm_volume => 0.25,
1503 face_prefetch => 0,
1504 output_sync => 1, 2111 output_sync => 1,
1505 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 );
1506 ); 2120
1507
1508 while (my ($k, $v) = each %DEF_CFG) { 2121 while (my ($k, $v) = each %DEF_CFG) {
1509 $CFG->{$k} = $v unless exists $CFG->{$k}; 2122 $CFG->{$k} = $v unless exists $CFG->{$k};
1510 } 2123 }
1511 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
1512 sdl_init; 2140 sdl_init;
1513 2141
1514 @SDL_MODES = reverse 2142 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1515 grep $_->[0] >= 640 && $_->[1] >= 480, 2143 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1516 CFClient::SDL_ListModes;
1517
1518 @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;
1519 2147
1520 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2148 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1521 2149
1522 { 2150 {
1523 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2151 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1524 DejaVuSans.ttf 2152 DejaVuSans.ttf
1525 DejaVuSansMono.ttf 2153 DejaVuSansMono.ttf
1526 DejaVuSans-Bold.ttf 2154 DejaVuSans-Bold.ttf
1527 DejaVuSansMono-Bold.ttf 2155 DejaVuSansMono-Bold.ttf
1528 DejaVuSans-Oblique.ttf 2156 DejaVuSans-Oblique.ttf
1529 DejaVuSansMono-Oblique.ttf 2157 DejaVuSansMono-Oblique.ttf
1530 DejaVuSans-BoldOblique.ttf 2158 DejaVuSans-BoldOblique.ttf
1531 DejaVuSansMono-BoldOblique.ttf 2159 DejaVuSansMono-BoldOblique.ttf
1532 ); 2160 );
1533 2161
1534 CFClient::add_font $_ for @fonts; 2162 CFPlus::add_font $_ for @fonts;
1535 2163
1536 CFClient::pango_init; 2164 CFPlus::pango_init;
1537 2165
1538 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2166 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1539 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2167 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1540 2168
1541 $FONT_PROP->make_default; 2169 $FONT_PROP->make_default;
1542 } 2170 }
1543 2171
1544# compare mono (ft) vs. rgba (cairo) 2172# compare mono (ft) vs. rgba (cairo)
1545# ft - 1.8s, cairo 3s, even in alpha-only mode 2173# ft - 1.8s, cairo 3s, even in alpha-only mode
1546# for my $rgba (0..1) { 2174# for my $rgba (0..1) {
1547# my $t1 = Time::HiRes::time; 2175# my $t1 = Time::HiRes::time;
1548# for (1..1000) { 2176# for (1..1000) {
1549# my $layout = CFClient::Layout->new ($rgba); 2177# my $layout = CFPlus::Layout->new ($rgba);
1550# $layout->set_text ("hallo" x 100); 2178# $layout->set_text ("hallo" x 100);
1551# $layout->render; 2179# $layout->render;
1552# } 2180# }
1553# my $t2 = Time::HiRes::time; 2181# my $t2 = Time::HiRes::time;
1554# warn $t2-$t1; 2182# warn $t2-$t1;
1555# } 2183# }
1556 2184
2185 $startup_done->();
2186
1557 video_init; 2187 video_init;
1558 audio_init; 2188 audio_init;
1559} 2189}
1560 2190
2191show_tip_of_the_day if $CFG->{show_tips};
2192
1561Event::loop; 2193Event::loop;
2194#CFPlus::SDL_Quit;
2195#CFPlus::_exit 0;
1562 2196
1563END { CFClient::SDL_Quit } 2197END {
2198 CFPlus::SDL_Quit;
2199 CFPlus::DB::Server::stop;
2200}
1564 2201
1565=head1 NAME 2202=head1 NAME
1566 2203
1567cfplus - A Crossfire+ and Crossfire game client 2204cfplus - A Crossfire+ and Crossfire game client
1568 2205

Diff Legend

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