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.106 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines