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.107 by root, Sun Aug 13 03:20:56 2006 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

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