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.104 by root, Sun Jul 30 13:14:15 2006 UTC vs.
Revision 1.225 by root, Fri Aug 31 08:03:10 2007 UTC

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

Diff Legend

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