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.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
… …
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # 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 open my $fh, "<:perlio", "$root/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 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
… …
86use CFPlus::DB; 87use CFPlus::DB;
87use CFPlus::UI; 88use CFPlus::UI;
88use CFPlus::UI::Canvas; 89use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
91use CFPlus::UI::MessageWindow; 93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
92use CFPlus::Pod; 95use CFPlus::Pod;
93use CFPlus::MapWidget; 96use CFPlus::MapWidget;
94use CFPlus::Macro; 97use CFPlus::Macro;
95 98
96$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
113our $CONN; 116our $CONN;
114our $PROFILE; # current profile 117our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 119
117our $WANT_REFRESH; 120our $WANT_REFRESH;
118our $CAN_REFRESH;
119 121
120our @SDL_MODES; 122our @SDL_MODES;
121our $WIDTH; 123our $WIDTH;
122our $HEIGHT; 124our $HEIGHT;
123our $FULLSCREEN; 125our $FULLSCREEN;
… …
127our $FONT_FIXED; 129our $FONT_FIXED;
128 130
129our $MAP; 131our $MAP;
130our $MAPMAP; 132our $MAPMAP;
131our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
132our $BUTTONBAR; 135our $BUTTONBAR;
133our $METASERVER; 136our $METASERVER;
134our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 138our $QUIT_DIALOG;
136our $HOST_ENTRY; 139our $HOST_ENTRY;
… …
139our $SERVER_INFO; 142our $SERVER_INFO;
140 143
141our $SETUP_DIALOG; 144our $SETUP_DIALOG;
142our $SETUP_NOTEBOOK; 145our $SETUP_NOTEBOOK;
143our $SETUP_SERVER; 146our $SETUP_SERVER;
147our $SETUP_LOGIN;
144our $SETUP_KEYBOARD; 148our $SETUP_KEYBOARD;
145 149
146our $PL_NOTEBOOK; 150our $PL_NOTEBOOK;
147our $PL_WINDOW; 151our $PL_WINDOW;
148 152
153our $MUSIC_PLAYING_WIDGET;
154our $LICENSE_WIDGET;
155
156our $PICKUP_PAGE;
149our $INVENTORY_PAGE; 157our $INVENTORY_PAGE;
150our $STATS_PAGE; 158our $STATS_PAGE;
151our $SKILL_PAGE; 159our $SKILL_PAGE;
152our $SPELL_PAGE; 160our $SPELL_PAGE;
153our $SPELL_LIST; 161our $SPELL_LIST;
… …
159our $STATWIDS; 167our $STATWIDS;
160 168
161our $SDL_ACTIVE; 169our $SDL_ACTIVE;
162our %SDL_CB; 170our %SDL_CB;
163 171
172our $ALT_ENTER_MESSAGE;
173our $STATUSBOX;
174our $DEBUG_STATUS;
175
176our $INV;
177our $INVR;
178our $INVR_HB;
179
180#############################################################################
181
182sub status {
183 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
184}
185
186sub debug {
187 $DEBUG_STATUS->set_text ($_[0]);
188}
189
190sub message {
191 $MESSAGE_WINDOW->message (@_);
192}
193
194#############################################################################
195#TODO: maybe move into own audio module...
196
164our $SDL_MIXER; 197our $SDL_MIXER;
198
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 199our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT; 200our $MUSIC_WANT; # arryref of ambient music we want to play
201our @MUSIC_HAVE; # ambient music we have on disk
167our $MUSIC_START; 202our $MUSIC_START;
203our @MUSIC_JINGLE; # which jingles to play next
168our $MUSIC_PLAYING_DATA; 204our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 205our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 206our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 207our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172our @SOUNDS; # event => file mapping 208
173our %AUDIO_CHUNKS; # audio files 209our %AUDIO_CHUNK; # audio "files"
210our %AUDIO_PLAY; # which audio faces should be played
174 211
175our $ALT_ENTER_MESSAGE; 212sub audio_channel_finished {
176our $STATUSBOX; 213 my ($channel) = @_;
177our $DEBUG_STATUS;
178 214
179our $INV; 215# warn "channel $channel finished\n";#d#
180our $INVR;
181our $INV_RIGHT_HB;
182
183our $PICKUP_CFG;
184
185sub status {
186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187} 216}
188 217
189sub debug { 218sub audio_sound_push($) {
190 $DEBUG_STATUS->set_text ($_[0]);
191}
192
193sub message {
194 my ($para) = @_; 219 my ($face) = @_;
195 $MESSAGE_WINDOW->message ($para); 220
221 $CFG->{effects_enable}
222 or return;
223
224 $AUDIO_PLAY{$face}
225 or return;
226
227 if (my $chunk = $AUDIO_CHUNK{$face}) {
228 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
229 my (undef, $dx, $dy, $vol) = @$_;
230
231 my $channel = CFPlus::Channel::find;
232 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
233 $channel->set_position_r ($dx, $dy, 20);
234 $chunk->play ($channel);
235 }
236 } else {
237 # sound_meta not set means data is in flight either way
238 my $meta = $CONN->{face}[$face]
239 or return;
240
241 $meta->{data}
242 or return;
243
244 # if its a jingle, play it as ambient music
245 if ($meta->{data}{jingle}) {
246 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
247 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
248 &audio_music_push ($face);
249 }
250 } else {
251 # fetch from database
252 CFPlus::DB::get res_data => $meta->{name}, sub {
253 my $rwops = new CFPlus::RW $_[0];
254 my $chunk = new CFPlus::MixChunk $rwops
255 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
256 $chunk->volume (($meta->{data}{volume} || 1) * 128);
257 $AUDIO_CHUNK{$face} = $chunk;
258
259 audio_sound_push ($face);
260 };
261 }
262 }
196} 263}
264
265sub audio_sound_play {
266 my ($face, $dx, $dy, $vol) = @_;
267
268 $SDL_MIXER
269 or return;
270 $CFG->{effects_enable}
271 or return;
272
273 my $queue = $AUDIO_PLAY{$face} ||= [];
274 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
275 audio_sound_push $face
276 unless @$queue > 1;
277}
278
279sub audio_music_set_meta {
280 my ($meta) = @_;
281
282 $MUSIC_PLAYING_META = $meta;
283 $MUSIC_PLAYING_WIDGET->set_markup (
284 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
285 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
286 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
287 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
288 );
289}
290
291sub audio_music_update_volume {
292 return unless $MUSIC_PLAYING_META;
293 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
294 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
295 CFPlus::MixMusic::volume $base * $volume * 128;
296}
297
298sub audio_music_start {
299 my $meta = $MUSIC_PLAYING_META;
300
301 CFPlus::DB::get res_data => $meta->{name}, sub {
302 return unless $SDL_MIXER;
303
304 # music might have changed...
305 $meta eq $MUSIC_PLAYING_META
306 or return &audio_music_start ();
307
308 audio_music_update_volume;
309
310 $MUSIC_PLAYING_DATA = \$_[0];
311
312 my $rwops = $meta->{path}
313 ? new_from_file CFPlus::RW $meta->{path}
314 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
315
316 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
317 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
318
319 my $NOW = time;
320
321 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
322 my $pos = $MUSIC_PLAYING_META->{stop_pos};
323 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
324 $MUSIC_START = time - $pos;
325 } else {
326 $MUSIC_PLAYER->play (0);
327 $MUSIC_START = time;
328 }
329
330 delete $meta->{stop_time};
331 delete $meta->{stop_pos};
332 }
333}
334
335sub audio_music_push {
336 return unless $SDL_MIXER;
337
338 my $fade_out;
339
340 if (@MUSIC_JINGLE) {
341 @MUSIC_HAVE = $MUSIC_JINGLE[0];
342 $fade_out = 333;
343 } else {
344 return unless $CFG->{bgm_enable};
345
346 my @have =
347 grep $_ && $_->{data},
348 map $CONN->{face}[$_],
349 @$MUSIC_WANT;
350
351 # randomize music a bit so that the order is not always the same
352 $_->{stop_time} ||= rand for @have;
353
354 @MUSIC_HAVE = @have
355 if @have;
356
357 # default MUSIC_HAVE == MUSIC_DEFAULT
358 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
359 $fade_out = 700;
360 }
361
362 # if the currently playing song is acceptable, let it continue
363 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
364
365 my $NOW = time;
366
367 if ($MUSIC_PLAYING_META) {
368 $MUSIC_PLAYING_META->{stop_time} = $NOW;
369 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
370 CFPlus::MixMusic::fade_out $fade_out;
371 } else {
372 # sort by stop time, oldest first
373 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
374
375 # if the most recently-played piece played very recently,
376 # resume it, else choose the oldest piece for rotation.
377 audio_music_set_meta
378 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
379 ? $MUSIC_HAVE[-1]
380 : $MUSIC_HAVE[0];
381
382 audio_music_start;
383 }
384}
385
386sub audio_music_set_ambient {
387 my ($songs) = @_;
388
389 $MUSIC_WANT = $songs;
390 audio_music_push;
391}
392
393sub audio_music_finished {
394 if ($MUSIC_PLAYING_META) {
395 $MUSIC_PLAYING_META->{stop_time} = time;
396 }
397
398 # we compress multiple jingles of the same type
399 shift @MUSIC_JINGLE
400 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
401
402 $MUSIC_PLAYING_WIDGET->clear;
403
404 undef $MUSIC_PLAYER;
405 undef $MUSIC_PLAYING_META;
406 undef $MUSIC_PLAYING_DATA;
407
408 audio_music_push;
409}
410
411sub audio_init {
412 if ($CFG->{audio_enable}) {
413 $ENV{MIX_EFFECTSMAXSPEED} = 1;
414 $SDL_MIXER = !CFPlus::Mix_OpenAudio
415 $CFG->{audio_hw_frequency},
416 CFPlus::MIX_DEFAULT_FORMAT,
417 $CFG->{audio_hw_channels},
418 $CFG->{audio_hw_chunksize};
419
420 if ($SDL_MIXER) {
421 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
422
423 audio_music_finished;
424 } else {
425 status "Unable to open sound device: there will be no sound";
426 }
427 } else {
428 undef $SDL_MIXER;
429 }
430
431 sub audio_tab_update;
432 audio_tab_update;
433}
434
435sub audio_shutdown {
436 undef $MUSIC_PLAYER;
437 undef $MUSIC_PLAYING_META;
438 undef $MUSIC_PLAYING_DATA;
439
440 $MUSIC_WANT = [];
441 @MUSIC_JINGLE = ();
442 %AUDIO_PLAY = ();
443 %AUDIO_CHUNK = ();
444
445 CFPlus::Mix_CloseAudio if $SDL_MIXER;
446 undef $SDL_MIXER;
447}
448
449#############################################################################
197 450
198sub destroy_query_dialog { 451sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 452 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 453 if $_[0]{query_dialog};
201} 454}
… …
474 stop_game(); 727 stop_game();
475 } 728 }
476} 729}
477 730
478sub stop_game { 731sub stop_game {
479 $LOGIN_BUTTON->set_text ("Login"); 732 $LOGIN_BUTTON->set_text ("Login / Register");
480 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
481 $SETUP_DIALOG->show; 734 $SETUP_DIALOG->show;
482 $PL_WINDOW->hide; 735 $PL_WINDOW->hide;
483 $SPELL_LIST->clear_spells; 736 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485 738
486 &audio_music_set ([]); 739 &audio_music_set_ambient ([]);
487 740
488 return unless $CONN; 741 return unless $CONN;
489 742
490 status "connection closed"; 743 status "connection closed";
491 744
… …
533 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
534 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
535 state => $CFG->{fullscreen}, 788 state => $CFG->{fullscreen},
536 tooltip => "Bring the client into fullscreen mode.", 789 tooltip => "Bring the client into fullscreen mode.",
537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
791 );
792
793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
795 state => $CFG->{force_opengl11},
796 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
797 . "higher memory usage and slower performance. It will, however, help tremendously on "
798 . "cards that claim to support a feature but fall back to software rendering. "
799 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
800 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
801 . "experience extremely low framerates and your card should do better, try this option.</b>",
802 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803 );
804
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
807 state => $CFG->{texture_compression},
808 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
809 . "will save a lot of memory and increase performance. The compression algorithm "
810 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
811 . "forced OpenGL 1.1 mode.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
538 ); 813 );
539 814
540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
541 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
542 state => $CFG->{fast}, 817 state => $CFG->{fast},
… …
570 845
571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
572 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{map_smoothing}, 848 state => $CFG->{map_smoothing},
574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
575 . "This increases load on the graphics subsystem and works only with 2.x servers. " 850 . "This increases load on the graphics subsystem and works only with TRT servers. "
576 . "Changes take effect at next connection only.", 851 . "Changes take effect at next login only.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578 ); 853 );
579 854
580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
581 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 856 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
592 ); 867 );
593 868
594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
595 $table->add_at (1, $row++, new CFPlus::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
597 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 872 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
873 . "but you still need to press apply to correctly re-layout the widget.",
598 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 874 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
599 ); 875 );
600 876
601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
602 $table->add_at (1, $row++, new CFPlus::UI::Slider 878 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
621 ); 897 );
622 898
623 $vbox 899 $vbox
624} 900}
625 901
902our $AUDIO_HW_CHUNKSIZE;
903our $AUDIO_INFO;
904
905sub audio_tab_update {
906 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
907
908 $AUDIO_HW_CHUNKSIZE->set_options ([
909 [0, "default", "Use System Default"],
910 map {
911 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
912 [$_, $ms, "$ms ($_ samples)"],
913 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
914 ]);
915
916 my $text = !$freq
917 ? "audio is off"
918 : "audio is enabled\n"
919 . "frequency (Hz): $freq\n"
920 . "channels: $chans";
921
922 $AUDIO_INFO->set_text ($text);
923}
924
626sub audio_setup { 925sub audio_setup {
627 my $vbox = new CFPlus::UI::VBox; 926 my $vbox = new CFPlus::UI::VBox;
628 927
629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 928 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630 929
631 my $row = 0; 930 my $row = 0;
632 931
633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 932 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
635 state => $CFG->{audio_enable}, 934 state => $CFG->{audio_enable},
636 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.", 935 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.",
637 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 936 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
638 ); 937 );
938
639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 939 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
640# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 940 $table->add_at (1, $row, new CFPlus::UI::CheckBox
941 expand => 1, state => $CFG->{effects_enable},
942 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
943 on_changed => sub {
641# $CFG->{effects_volume} = $_[1]; 944 $CFG->{effects_enable} = $_[1];
642# }); 945 $CONN->update_fx_want if $CONN;
946 1
947 }
948 );
949 $table->add_at (2, $row++, new CFPlus::UI::Slider
950 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
951 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
952 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
953 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
954 );
955
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 956 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 957 $table->add_at (1, $row, new CFPlus::UI::CheckBox
645 $hbox->add (new CFPlus::UI::CheckBox
646 expand => 1, state => $CFG->{bgm_enable}, 958 expand => 1, state => $CFG->{bgm_enable},
647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 959 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
648 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 960 on_changed => sub {
961 $CFG->{bgm_enable} = $_[1];
962 $CONN->update_fx_want if $CONN;
963 audio_music_push;
964 1
965 }
649 ); 966 );
650 $hbox->add (new CFPlus::UI::Slider 967 $table->add_at (2, $row++, new CFPlus::UI::Slider
651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652 tooltip => "The volume of the background music. Changes are instant.", 969 tooltip => "The volume of the background music. Changes are instant.",
653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 970 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
971 );
972
973 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
974 $table->add_at (1, $row++, new CFPlus::UI::Selector
975 c_colspan => 2, expand => 1,
976 value => $CFG->{audio_hw_frequency},
977 options => [
978 [ 0, "default" , "Use System Default"],
979 [11025, "11 kHz" , "11kHz (low quality)"],
980 [22050, "22 kHz" , "22kHz (reduced quality)"],
981 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
982 [48000, "48 kHz" , "48kHz (studio quality)"],
983 ],
984 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
985 on_changed => sub {
986 $CFG->{audio_hw_frequency} = $_[1];
987 audio_tab_update;
988 1
989 }
990 );
991
992 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
993 $table->add_at (1, $row++, new CFPlus::UI::Selector
994 c_colspan => 2, expand => 1,
995 value => $CFG->{audio_hw_channels},
996 options => [
997 [0, "default" , "Use System Default"],
998 [1, "Mono" , "Mono (single channel, low quality)"],
999 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
1000 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
1001 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002 ],
1003 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1004 on_changed => sub {
1005 $CFG->{audio_hw_channels} = $_[1];
1006 audio_tab_update;
1007 1
1008 }
1009 );
1010
1011 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1012 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1013 c_colspan => 2, expand => 1,
1014 value => $CFG->{audio_hw_chunksize},
1015 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1016 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017 on_changed => sub {
1018 $CFG->{audio_hw_chunksize} = $_[1];
1019 audio_tab_update;
1020 1
1021 }
1022 );
1023
1024 # should really be a slider
1025 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1026 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1027 c_colspan => 2, expand => 1,
1028 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1029 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030 template => ">= 99",
1031 on_changed => sub {
1032 my ($slider, $value) = @_;
1033
1034 $CFG->{audio_mix_channels} = $value
1035 if $value;
1036 1;
1037 }
654 ); 1038 );
655 1039
656 $table->add_at (1, $row++, new CFPlus::UI::Button 1040 $table->add_at (1, $row++, new CFPlus::UI::Button
657 expand => 1, align => 0, text => "Apply", 1041 c_colspan => 2, expand => 1, align => 0, text => "Apply",
658 tooltip => "Apply the audio settings", 1042 tooltip => "Apply the audio settings",
659 on_activate => sub { 1043 on_activate => sub {
660 audio_shutdown (); 1044 audio_shutdown ();
661 audio_init (); 1045 audio_init ();
662 0 1046 0
663 } 1047 }
664 ); 1048 );
1049
1050 $vbox->add (new CFPlus::UI::FancyFrame
1051 expand => 1,
1052 label => "Audio Info",
1053 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1054 );
1055
1056 audio_tab_update;
665 1057
666 $vbox 1058 $vbox
667} 1059}
668 1060
669sub set_gauge_window_fontsize { 1061sub set_gauge_window_fontsize {
… …
704 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1096 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
705 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1097 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
706 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1098 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
707 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1099 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
708 1100
709 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1101 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1102 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1103 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
710 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1104 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
711 1105
712 $GAUGES = { 1106 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg,
713 exp => $exp, win => $win, range => $rng, 1108 win => $win, range => $rng,
714 food => $fg, mana => $mg, hp => $hg, grace => $gg 1109 hp => $hg, mana => $mg, grace => $gg, food => $fg,
715 }; 1110 };
716 1111
717 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
718 1113
719 $win 1114 $win
… …
733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1128 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734 1129
735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1130 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736 1131
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1132 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1133 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
739 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1134 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
740 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1135 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
741 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1136 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
742 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1137 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743 1138
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1139 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745 1140
746 $c->add_items ({ 1141 $c->add_items ({
… …
920 $r 1315 $r
921} 1316}
922 1317
923sub skill_window { 1318sub skill_window {
924 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1320
925 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1321 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322
926 $sw 1323 $sw
927} 1324}
928 1325
929sub formsep($) { 1326sub formsep($) {
930 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1327 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1051 ; 1448 ;
1052 1449
1053 $dialog 1450 $dialog
1054} 1451}
1055 1452
1056sub server_setup { 1453sub login_setup {
1057 my $vbox = new CFPlus::UI::VBox; 1454 my $vbox = new CFPlus::UI::VBox;
1058 1455
1059 $vbox->add (new CFPlus::UI::FancyFrame 1456 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Connection Settings", 1457 label => "Login Settings",
1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1458 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1062 ); 1459 );
1063 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1460 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1064 1461
1065 { 1462 {
… …
1071 text => $CFG->{profile}{default}{host}, 1468 text => $CFG->{profile}{default}{host},
1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1469 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1073 on_changed => sub { 1470 on_changed => sub {
1074 my ($self, $value) = @_; 1471 my ($self, $value) = @_;
1075 $CFG->{profile}{default}{host} = $value; 1472 $CFG->{profile}{default}{host} = $value;
1076 0 1473 1
1077 } 1474 }
1078 ); 1475 );
1079 1476
1080 $vbox->add (new CFPlus::UI::Button 1477 $vbox->add (new CFPlus::UI::Button
1081 expand => 1, 1478 expand => 1,
1082 text => "Server List", 1479 text => "Server List",
1083 other => $METASERVER, 1480 other => $METASERVER,
1084 tooltip => "Show a list of available crossfire servers", 1481 tooltip => "Show a list of available crossfire servers",
1085 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1482 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1483 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1087 ); 1484 );
1088 } 1485 }
1089 1486
1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1487 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1091 $table->add_at (1, 4, new CFPlus::UI::Entry 1488 $table->add_at (1, 4, new CFPlus::UI::Entry
1092 text => $CFG->{profile}{default}{user}, 1489 text => $CFG->{profile}{default}{user},
1093 tooltip => "The name of your character on the server", 1490 tooltip => "The name of your character on the server",
1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1491 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1095 ); 1492 );
1096 1493
1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1494 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1098 $table->add_at (1, 5, new CFPlus::UI::Entry 1495 $table->add_at (1, 5, new CFPlus::UI::Entry
1099 text => $CFG->{profile}{default}{password}, 1496 text => $CFG->{profile}{default}{password},
1100 hidden => 1, 1497 hidden => 1,
1101 tooltip => "The password for your character", 1498 tooltip => "The password for your character",
1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1499 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1103 ); 1500 );
1104 1501
1502 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1503 expand => 1,
1504 align => 0,
1505 text => "Login / Register",
1506 tooltip => "This button will either login to the account configured above or register a new account.",
1507 on_activate => sub {
1508 $CONN ? stop_game
1509 : start_game;
1510 1
1511 },
1512 );
1513
1514 $vbox
1515}
1516
1517sub server_setup {
1518 my $vbox = new CFPlus::UI::VBox;
1519
1520 $vbox->add (new CFPlus::UI::FancyFrame
1521 label => "Connection Settings",
1522 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1523 );
1524
1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1525 $table->add_at (0, 1, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1106 $table->add_at (1, 7, new CFPlus::UI::Slider 1526 $table->add_at (1, 1, new CFPlus::UI::Slider
1107 force_w => 100, 1527 force_w => 100,
1108 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1528 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109 tooltip => "This is the size of the portion of the map update the server sends you. " 1529 tooltip => "This is the size of the portion of the map update the server sends you. "
1110 . "If you set this to a high value you will be able to see further, " 1530 . "If you set this to a high value you will be able to see further, "
1111 . "but you also increase bandwidth requirements and latency. " 1531 . "but you also increase bandwidth requirements and latency. "
1112 . "This option is only used once at log-in.", 1532 . "This option is only used once at log-in.",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1533 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1114 ); 1534 );
1115 1535
1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1536 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117 $table->add_at (1, 8, new CFPlus::UI::Entry 1537 $table->add_at (1, 2, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate}, 1538 text => $CFG->{output_rate},
1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1539 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1540 . "when sending data. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s.", 1541 . "default will be used, which is usually around 100kb/s. Most servers will "
1542 . "dynamically find an optimal rate, so adjust this only when necessary.",
1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1543 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1123 ); 1544 );
1124 1545
1125 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1546 $table->add_at (0, 3, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1126 $table->add_at (1, 9, new CFPlus::UI::Entry 1547 $table->add_at (1, 3, new CFPlus::UI::Entry
1127 text => $CFG->{output_count}, 1548 text => $CFG->{output_count},
1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1549 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1550 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1130 ); 1551 );
1131 1552
1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1553 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1133 $table->add_at (1, 10, new CFPlus::UI::Entry 1554 $table->add_at (1, 4, new CFPlus::UI::Entry
1134 text => $CFG->{output_sync}, 1555 text => $CFG->{output_sync},
1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1556 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1557 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1137 );
1138
1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1140 expand => 1,
1141 align => 0,
1142 text => "Login",
1143 on_activate => sub {
1144 $CONN ? stop_game
1145 : start_game;
1146 0
1147 },
1148 ); 1558 );
1149 1559
1150 $vbox->add (new CFPlus::UI::FancyFrame 1560 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info", 1561 label => "Server Info",
1152 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1562 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
… …
1341 $sw1->add ($INV = new CFPlus::UI::Inventory); 1751 $sw1->add ($INV = new CFPlus::UI::Inventory);
1342 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1752 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1343 1753
1344 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1754 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1345 1755
1346 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1756 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1347 1757
1348 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1758 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1349 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1759 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1350 1760
1351 # XXX: Call after $INVR = ... because set_opencont sets the items 1761 # XXX: Call after $INVR = ... because set_opencont sets the items
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1762 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353 1763
1354 $hb 1764 $hb
1765}
1766
1767sub media_window {
1768 my $vb = new CFPlus::UI::VBox;
1769
1770 $vb->add (new CFPlus::UI::FancyFrame
1771 label => "Currently playing music",
1772 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1773 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1774 );
1775
1776 $vb->add (new CFPlus::UI::FancyFrame
1777 label => "Other media used in this session",
1778 expand => 1,
1779 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1780 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1781 );
1782
1783 $vb
1784}
1785
1786sub add_license {
1787 my ($meta) = @_;
1788
1789 $meta = $meta->{data}
1790 or return;
1791
1792 $meta->{license} || $meta->{author} || $meta->{source}
1793 or return;
1794
1795 $LICENSE_WIDGET->add_paragraph ({
1796 fg => [1, 1, 1, 1],
1797 markup => "<small>"
1798 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1799 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1800 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1801 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1802 . "</small>",
1803 });
1804 $LICENSE_WIDGET->scroll_to_bottom;
1355} 1805}
1356 1806
1357sub toggle_player_page { 1807sub toggle_player_page {
1358 my ($widget) = @_; 1808 my ($widget) = @_;
1359 1809
… …
1398 $ntb->add_tab ( 1848 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1849 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1850 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1851 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1852 );
1403 $ntb->add_tab (Pickup => autopickup_setup, 1853 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1404 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1854 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1855
1856 $ntb->add_tab (Media => media_window,
1857 "License, Author and Source info for media sent by the server.");
1405 1858
1406 $ntb->set_current_page ($INVENTORY_PAGE); 1859 $ntb->set_current_page ($INVENTORY_PAGE);
1407 1860
1408 $plwin->add ($ntb); 1861 $plwin->add ($ntb);
1409 $plwin 1862 $plwin
… …
1563 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2016 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1564 ); 2017 );
1565 $hb->add (new CFPlus::UI::Button 2018 $hb->add (new CFPlus::UI::Button
1566 text => "Quit anyway", 2019 text => "Quit anyway",
1567 expand => 1, 2020 expand => 1,
1568 on_activate => sub { exit }, 2021 on_activate => sub { Event::unloop_all },
1569 ); 2022 );
1570 } 2023 }
1571 2024
1572 $QUIT_DIALOG->show; 2025 $QUIT_DIALOG->show;
1573 $QUIT_DIALOG->grab_focus; 2026 $QUIT_DIALOG->grab_focus;
… …
1646 2099
1647 $SDL_ACTIVE = 1; 2100 $SDL_ACTIVE = 1;
1648 $LAST_REFRESH = time - 0.01; 2101 $LAST_REFRESH = time - 0.01;
1649 2102
1650 CFPlus::OpenGL::init; 2103 CFPlus::OpenGL::init;
2104 CFPlus::Macro::init;
1651 2105
1652 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2106 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1653 2107
1654 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2108 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1655 2109
1656 ############################################################################# 2110 #############################################################################
1657 2111
1658 if ($DEBUG_STATUS) { 2112 if ($DEBUG_STATUS) {
1659 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2113 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1660 } else { 2114 } else {
1661 # create the widgets 2115 # create/configure the widgets
2116
2117 $CFPlus::UI::ROOT->connect (key_down => sub {
2118 my (undef, $ev) = @_;
2119
2120 if (my @macros = CFPlus::Macro::find $ev) {
2121 CFPlus::Macro::execute $_ for @macros;
2122
2123 return 1;
2124 }
2125
2126 0
2127 });
1662 2128
1663 $DEBUG_STATUS = new CFPlus::UI::Label 2129 $DEBUG_STATUS = new CFPlus::UI::Label
1664 padding => 0, 2130 padding => 0,
1665 z => 100, 2131 z => 100,
1666 force_x => "max", 2132 force_x => "max",
… …
1697 if $MESSAGE_WINDOW; 2163 if $MESSAGE_WINDOW;
1698 }); 2164 });
1699 $MAPWIDGET->show; 2165 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 2166 $MAPWIDGET->grab_focus;
1701 2167
2168 $COMPLETER = new CFPlus::MapWidget::Command::
2169 command => { },
2170 tooltip => "#completer_help",
2171 ;
2172
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2173 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 2174 title => "Setup",
1704 name => "setup_dialog", 2175 name => "setup_dialog",
1705 x => 'center', 2176 x => 'center',
1706 y => 'center', 2177 y => 'center',
… …
1714 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 2185 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1715 2186
1716 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2187 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1717 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2188 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1718 2189
2190 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2191 "Configure the server to play on, your username and password.");
1719 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2192 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1720 "Configure the server to play on, your username, password and other server-related options."); 2193 "Configure other server related options.");
1721 $SETUP_NOTEBOOK->add_tab (Client => client_setup, 2194 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1722 "Configure various client-specific settings."); 2195 "Configure various client-specific settings.");
1723 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup, 2196 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1724 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2197 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1725 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup, 2198 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
… …
1767 tooltip => "Terminates the program", 2240 tooltip => "Terminates the program",
1768 on_activate => sub { 2241 on_activate => sub {
1769 if ($CONN) { 2242 if ($CONN) {
1770 open_quit_dialog; 2243 open_quit_dialog;
1771 } else { 2244 } else {
1772 exit; 2245 Event::unloop_all;
1773 } 2246 }
1774 0 2247 0
1775 }, 2248 },
1776 ); 2249 );
1777 2250
1778 $BUTTONBAR->show; 2251 $BUTTONBAR->show;
1779 $SETUP_DIALOG->show; 2252 $SETUP_DIALOG->show;
2253 $MESSAGE_WINDOW->show;
1780 } 2254 }
1781 2255
1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2256 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1783} 2257}
1784 2258
… …
1786 CFPlus::OpenGL::shutdown; 2260 CFPlus::OpenGL::shutdown;
1787 2261
1788 undef $SDL_ACTIVE; 2262 undef $SDL_ACTIVE;
1789} 2263}
1790 2264
1791sub audio_channel_finished {
1792 my ($channel) = @_;
1793
1794# warn "channel $channel finished\n";#d#
1795}
1796
1797our %AUDIO_PLAY;
1798our %AUDIO_CHUNK;
1799
1800sub audio_sound_push($) {
1801 my ($face) = @_;
1802
1803 if (my $chunk = $AUDIO_CHUNK{$face}) {
1804 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1805 my (undef, $dx, $dy, $vol) = @$_;
1806
1807 my $channel = $chunk->play
1808 or return;
1809
1810 $channel->volume (128 + $vol);
1811 $dx = $dx / 10 * 255;
1812 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816 }
1817 } else {
1818 # sound_meta not set means data is in flight either way
1819 my $meta = $CONN->{sound_meta}{$face}
1820 or return;
1821
1822 # fetch from database
1823 CFPlus::DB::get res_data => $meta->{name}, sub {
1824 my $vol = $meta->{meta}{volume} || 100;
1825 my $rwops = new CFPlus::RW $_[0];
1826 my $chunk = new CFPlus::MixChunk $rwops;
1827 $chunk->volume ($vol * 128 / 100);
1828 $AUDIO_CHUNK{$face} = $chunk;
1829
1830 audio_sound_push ($face);
1831 };
1832 }
1833}
1834
1835sub audio_sound_play {
1836 my ($face, $dx, $dy, $vol) = @_;
1837
1838 $SDL_MIXER
1839 or return;
1840
1841 my $queue = $AUDIO_PLAY{$face} ||= [];
1842 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843 audio_sound_push $face
1844 unless @$queue > 1;
1845}
1846
1847sub audio_music_set {
1848 my ($songs) = @_;
1849
1850 my @want =
1851 grep $_,
1852 map $CONN->{music_meta}{$_},
1853 @$songs;
1854
1855 if (@want) {
1856 @MUSIC_WANT = @want;
1857 &audio_music_changed ();
1858 }
1859}
1860
1861sub audio_music_start {
1862 my $meta = $MUSIC_PLAYING_META;
1863
1864 CFPlus::DB::get res_data => $meta->{name}, sub {
1865 return unless $SDL_MIXER;
1866
1867 # music might have changed...
1868 $meta eq $MUSIC_PLAYING_META
1869 or return &audio_music_start ();
1870
1871 $MUSIC_PLAYING_DATA = \$_[0];
1872
1873 my $rwops = $meta->{path}
1874 ? new_from_file CFPlus::RW $meta->{path}
1875 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880 my $NOW = time;
1881
1882 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885 $MUSIC_START = time - $pos;
1886 } else {
1887 $MUSIC_PLAYER->play (0);
1888 $MUSIC_START = time;
1889 }
1890
1891 delete $MUSIC_PLAYING_META->{stop_time};
1892 delete $MUSIC_PLAYING_META->{stop_pos};
1893 }
1894}
1895
1896sub audio_music_changed {
1897 return unless $CFG->{bgm_enable};
1898 return unless $SDL_MIXER;
1899
1900 # default MUSIC_WANT == MUSIC_DEFAULT
1901 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903 # if the currently playing song is acceptable, let it continue
1904 return if $MUSIC_PLAYING_META
1905 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907 my $NOW = time;
1908
1909 if ($MUSIC_PLAYING_META) {
1910 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1911 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912 CFPlus::MixMusic::fade_out 1000;
1913 } else {
1914 # sort by stop time, oldest first
1915 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917 # if the most recently-played piece played very recently,
1918 # resume it, else choose the oldest piece for rotation.
1919 $MUSIC_PLAYING_META =
1920 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921 ? $MUSIC_WANT[-1]
1922 : $MUSIC_WANT[0];
1923
1924 audio_music_start;
1925 }
1926}
1927
1928sub audio_music_finished {
1929 undef $MUSIC_PLAYER;
1930 undef $MUSIC_PLAYING_META;
1931 undef $MUSIC_PLAYING_DATA;
1932
1933 audio_music_changed;
1934}
1935
1936sub audio_init {
1937 if ($CFG->{audio_enable}) {
1938 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1939 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1940
1941 unless ($SDL_MIXER) {
1942 status "Unable to open sound device: there will be no sound";
1943 return;
1944 }
1945
1946 CFPlus::Mix_AllocateChannels 16;
1947 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949 audio_music_finished;
1950 } else {
1951 undef $SDL_MIXER;
1952 }
1953}
1954
1955sub audio_shutdown {
1956 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1957 undef $SDL_MIXER;
1958 @SOUNDS = ();
1959 %AUDIO_CHUNKS = ();
1960}
1961
1962my %animate_object; 2265my %animate_object;
1963my $animate_timer; 2266my $animate_timer;
1964 2267
1965my $fps = 9; 2268my $fps = 9;
1966 2269
1967my %demo;#d#
1968
1969sub force_refresh { 2270sub force_refresh {
2271 if ($ENV{CFPLUS_DEBUG} & 4) {
1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2272 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2273 debug sprintf "%3.2f", $fps;
2274 }
1972 2275
1973 $CFPlus::UI::ROOT->draw; 2276 $CFPlus::UI::ROOT->draw;
1974 2277 CFPlus::SDL_GL_SwapBuffers;
1975 $WANT_REFRESH = 0;
1976 $CAN_REFRESH = 0;
1977 $LAST_REFRESH = $NOW; 2278 $LAST_REFRESH = $NOW;
1978 2279 $WANT_REFRESH->stop;
1979 CFPlus::SDL_GL_SwapBuffers;
1980} 2280}
1981 2281
2282$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2283
1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2284my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1983 $NOW = time; 2285 $NOW = time;
1984 2286
1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2287 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1986 for CFPlus::poll_events; 2288 for CFPlus::poll_events;
1987 2289
1988 if (%animate_object) { 2290 if (%animate_object) {
1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2291 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1990 ++$WANT_REFRESH; 2292 $WANT_REFRESH->start;
1991 }
1992
1993 if ($WANT_REFRESH) {
1994 force_refresh;
1995 } else {
1996 $CAN_REFRESH = 1;
1997 } 2293 }
1998}); 2294});
1999 2295
2000sub animation_start { 2296sub animation_start {
2001 my ($widget) = @_; 2297 my ($widget) = @_;
… …
2007 delete $animate_object{$widget}; 2303 delete $animate_object{$widget};
2008} 2304}
2009 2305
2010%SDL_CB = ( 2306%SDL_CB = (
2011 CFPlus::SDL_QUIT => sub { 2307 CFPlus::SDL_QUIT => sub {
2012 exit; 2308 Event::unloop_all;
2013 }, 2309 },
2014 CFPlus::SDL_VIDEORESIZE => sub { 2310 CFPlus::SDL_VIDEORESIZE => sub {
2015 }, 2311 },
2016 CFPlus::SDL_VIDEOEXPOSE => sub { 2312 CFPlus::SDL_VIDEOEXPOSE => sub {
2017 CFPlus::UI::full_refresh; 2313 CFPlus::UI::full_refresh;
… …
2056 CFPlus::DB::Server::run; 2352 CFPlus::DB::Server::run;
2057 2353
2058 CFPlus::UI::set_layout ($::CFG->{layout}); 2354 CFPlus::UI::set_layout ($::CFG->{layout});
2059 2355
2060 my %DEF_CFG = ( 2356 my %DEF_CFG = (
2061 sdl_mode => 0, 2357 sdl_mode => 0,
2062 width => 640,
2063 height => 480,
2064 fullscreen => 0, 2358 fullscreen => 0,
2065 fast => 0, 2359 fast => 0,
2360 force_opengl11 => undef,
2361 texture_compression => 1,
2066 map_scale => 1, 2362 map_scale => 1,
2067 fow_enable => 1, 2363 fow_enable => 1,
2068 fow_intensity => 0, 2364 fow_intensity => 0,
2069 map_smoothing => 1, 2365 map_smoothing => 1,
2070 gui_fontsize => 1, 2366 gui_fontsize => 1,
2071 log_fontsize => 0.7, 2367 log_fontsize => 0.7,
2072 gauge_fontsize => 1, 2368 gauge_fontsize => 1,
2073 gauge_size => 0.35, 2369 gauge_size => 0.35,
2074 stat_fontsize => 0.7, 2370 stat_fontsize => 0.7,
2075 mapsize => 100, 2371 mapsize => 100,
2076 audio_enable => 1, 2372 audio_enable => 1,
2373 audio_hw_channels => 0,
2374 audio_hw_frequency => 0,
2375 audio_hw_chunksize => 0,
2376 audio_mix_channels => 8,
2377 effects_enable => 1,
2378 effects_volume => 1,
2077 bgm_enable => 1, 2379 bgm_enable => 1,
2078 bgm_volume => 0.25, 2380 bgm_volume => 0.5,
2079 output_sync => 1, 2381 output_sync => 1,
2080 output_count => 1, 2382 output_count => 1,
2081 output_rate => "", 2383 output_rate => "",
2082 pickup => 0, 2384 pickup => 0,
2083 inv_sort => "mtime", 2385 inv_sort => "mtime",
2084 default => "profile", # default profile 2386 default => "profile", # default profile
2085 show_tips => 1, 2387 show_tips => 1,
2086 logview_max_par => 1000, 2388 logview_max_par => 1000,
2087 ); 2389 );
2088 2390
2089 while (my ($k, $v) = each %DEF_CFG) { 2391 while (my ($k, $v) = each %DEF_CFG) {
2090 $CFG->{$k} = $v unless exists $CFG->{$k}; 2392 $CFG->{$k} = $v unless exists $CFG->{$k};
2091 } 2393 }
… …
2148# } 2450# }
2149# my $t2 = Time::HiRes::time; 2451# my $t2 = Time::HiRes::time;
2150# warn $t2-$t1; 2452# warn $t2-$t1;
2151# } 2453# }
2152 2454
2153 $startup_done->();
2154
2155 video_init; 2455 video_init;
2156 audio_init; 2456 audio_init;
2157} 2457}
2158 2458
2159show_tip_of_the_day if $CFG->{show_tips}; 2459show_tip_of_the_day if $CFG->{show_tips};
2160 2460
2461Event->idle (cb => sub {
2462 $_[0]->w->cancel;
2463 $startup_done->();
2464});
2465
2161Event::loop; 2466Event::loop;
2467
2468#video_shutdown;
2469#audio_shutdown;
2162#CFPlus::SDL_Quit; 2470CFPlus::SDL_Quit;
2163#CFPlus::_exit 0;
2164
2165END {
2166 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop; 2471CFPlus::DB::Server::stop;
2168}
2169 2472
2170=head1 NAME 2473=head1 NAME
2171 2474
2172cfplus - A Crossfire+ and Crossfire game client 2475cfplus - A Crossfire TRT and Crossfire game client
2173 2476
2174=head1 SYNOPSIS 2477=head1 SYNOPSIS
2175 2478
2176Just run it - no commandline arguments are supported. 2479Just run it - no commandline arguments are supported.
2177 2480
2178=head1 USAGE 2481=head1 USAGE
2179 2482
2180cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2483cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2181fullscreen and interactively. 2484be used in fullscreen mode and interactively.
2182 2485
2183=head1 DEBUGGING 2486=head1 DEBUGGING
2184 2487
2185 2488
2186CFPLUS_DEBUG - environment variable 2489CFPLUS_DEBUG - environment variable

Diff Legend

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