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.226 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

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