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.215 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.229 by root, Mon Oct 8 17:01:03 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" };
… …
126our $FONT_FIXED; 129our $FONT_FIXED;
127 130
128our $MAP; 131our $MAP;
129our $MAPMAP; 132our $MAPMAP;
130our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
131our $BUTTONBAR; 135our $BUTTONBAR;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
… …
146our $PL_WINDOW; 150our $PL_WINDOW;
147 151
148our $MUSIC_PLAYING_WIDGET; 152our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET; 153our $LICENSE_WIDGET;
150 154
155our $PICKUP_PAGE;
151our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
152our $STATS_PAGE; 157our $STATS_PAGE;
153our $SKILL_PAGE; 158our $SKILL_PAGE;
154our $SPELL_PAGE; 159our $SPELL_PAGE;
155our $SPELL_LIST; 160our $SPELL_LIST;
… …
180sub debug { 185sub debug {
181 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
182} 187}
183 188
184sub message { 189sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para); 190 $MESSAGE_WINDOW->message (@_);
187} 191}
188 192
189############################################################################# 193#############################################################################
190#TODO: maybe move into own audio module... 194#TODO: maybe move into own audio module...
191 195
… …
228 $channel->set_position_r ($dx, $dy, 20); 232 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel); 233 $chunk->play ($channel);
230 } 234 }
231 } else { 235 } else {
232 # sound_meta not set means data is in flight either way 236 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face} 237 my $meta = $CONN->{face}[$face]
234 or return; 238 or return;
235 239
240 $meta->{data}
241 or return;
242
236 # if its a jingle, play it as ambient music 243 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) { 244 if ($meta->{data}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 245 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face); 247 &audio_music_push ($face);
241 } 248 }
242 } else { 249 } else {
243 # fetch from database 250 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub { 251 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0]; 252 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops 253 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 254 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk; 256 $AUDIO_CHUNK{$face} = $chunk;
250 257
251 audio_sound_push ($face); 258 audio_sound_push ($face);
252 }; 259 };
253 } 260 }
… …
271sub audio_music_set_meta { 278sub audio_music_set_meta {
272 my ($meta) = @_; 279 my ($meta) = @_;
273 280
274 $MUSIC_PLAYING_META = $meta; 281 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup ( 282 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
280 ); 287 );
281} 288}
282 289
283sub audio_music_update_volume { 290sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META; 291 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128; 294 CFPlus::MixMusic::volume $base * $volume * 128;
288} 295}
289 296
290sub audio_music_start { 297sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META; 298 my $meta = $MUSIC_PLAYING_META;
… …
310 317
311 my $NOW = time; 318 my $NOW = time;
312 319
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
316 $MUSIC_START = time - $pos; 323 $MUSIC_START = time - $pos;
317 } else { 324 } else {
318 $MUSIC_PLAYER->play (0); 325 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time; 326 $MUSIC_START = time;
320 } 327 }
… …
334 $fade_out = 333; 341 $fade_out = 333;
335 } else { 342 } else {
336 return unless $CFG->{bgm_enable}; 343 return unless $CFG->{bgm_enable};
337 344
338 my @have = 345 my @have =
339 grep $_, 346 grep $_ && $_->{data},
340 map $CONN->{music_meta}{$_}, 347 map $CONN->{face}[$_],
341 @$MUSIC_WANT; 348 @$MUSIC_WANT;
349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
342 352
343 @MUSIC_HAVE = @have 353 @MUSIC_HAVE = @have
344 if @have; 354 if @have;
345 355
346 # default MUSIC_HAVE == MUSIC_DEFAULT 356 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000; 358 $fade_out = 700;
349 } 359 }
350 360
351 # if the currently playing song is acceptable, let it continue 361 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353 363
… …
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363 373
364 # if the most recently-played piece played very recently, 374 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation. 375 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta 376 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1] 378 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0]; 379 : $MUSIC_HAVE[0];
370 380
371 audio_music_start; 381 audio_music_start;
372 } 382 }
… …
378 $MUSIC_WANT = $songs; 388 $MUSIC_WANT = $songs;
379 audio_music_push; 389 audio_music_push;
380} 390}
381 391
382sub audio_music_finished { 392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
383 # we compress multiple jingles of the same type 397 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE 398 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386 400
387 $MUSIC_PLAYING_WIDGET->clear; 401 $MUSIC_PLAYING_WIDGET->clear;
… …
394} 408}
395 409
396sub audio_init { 410sub audio_init {
397 if ($CFG->{audio_enable}) { 411 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1; 412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 413 $SDL_MIXER = !CFPlus::Mix_OpenAudio
414 $CFG->{audio_hw_frequency},
415 CFPlus::MIX_DEFAULT_FORMAT,
416 $CFG->{audio_hw_channels},
417 $CFG->{audio_hw_chunksize};
400 418
401 unless ($SDL_MIXER) { 419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
402 status "Unable to open sound device: there will be no sound"; 424 status "Unable to open sound device: there will be no sound";
403 return;
404 } 425 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else { 426 } else {
410 undef $SDL_MIXER; 427 undef $SDL_MIXER;
411 } 428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
412} 432}
413 433
414sub audio_shutdown { 434sub audio_shutdown {
415 undef $MUSIC_PLAYER; 435 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META; 436 undef $MUSIC_PLAYING_META;
… …
769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
770 ); 790 );
771 791
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 792 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 793 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{opengl11}, 794 state => $CFG->{force_opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 795 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on " 796 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. " 797 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 798 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 799 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>", 800 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
802 );
803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
805 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
806 state => $CFG->{texture_compression},
807 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
808 . "will save a lot of memory and increase performance. The compression algorithm "
809 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
810 . "forced OpenGL 1.1 mode.",
811 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
782 ); 812 );
783 813
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{fast}, 816 state => $CFG->{fast},
… …
866 ); 896 );
867 897
868 $vbox 898 $vbox
869} 899}
870 900
901our $AUDIO_HW_CHUNKSIZE;
902our $AUDIO_INFO;
903
904sub audio_tab_update {
905 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
906
907 $AUDIO_HW_CHUNKSIZE->set_options ([
908 [0, "default", "system default"],
909 map {
910 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
911 [$_, $ms, "$ms ($_ samples)"],
912 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
913 ]);
914
915 my $text = !$freq
916 ? "audio is off"
917 : "Frequency (Hz): $freq\n"
918 . "Channels: $chans";
919
920 $AUDIO_INFO->set_text ($text);
921}
922
871sub audio_setup { 923sub audio_setup {
872 my $vbox = new CFPlus::UI::VBox; 924 my $vbox = new CFPlus::UI::VBox;
873 925
874 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 926 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
875 927
… …
877 929
878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 930 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
879 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 931 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
880 state => $CFG->{audio_enable}, 932 state => $CFG->{audio_enable},
881 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.", 933 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.",
882 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 934 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
883 ); 935 );
884# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
885# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
886# $CFG->{effects_volume} = $_[1];
887# });
888 936
889 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 937 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
890 $table->add_at (1, $row, new CFPlus::UI::CheckBox 938 $table->add_at (1, $row, new CFPlus::UI::CheckBox
891 expand => 1, state => $CFG->{effects_enable}, 939 expand => 1, state => $CFG->{effects_enable},
892 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 940 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
893 on_changed => sub { 941 on_changed => sub {
894 $CFG->{effects_enable} = $_[1]; 942 $CFG->{effects_enable} = $_[1];
895 $CONN->update_fx_want if $CONN; 943 $CONN->update_fx_want if $CONN;
896 0 944 1
897 } 945 }
898 ); 946 );
899 $table->add_at (2, $row++, new CFPlus::UI::Slider 947 $table->add_at (2, $row++, new CFPlus::UI::Slider
900 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 948 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
901 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 949 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
902 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 950 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
903 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 951 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
904 ); 952 );
905 953
906 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 954 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
907 $table->add_at (1, $row, new CFPlus::UI::CheckBox 955 $table->add_at (1, $row, new CFPlus::UI::CheckBox
908 expand => 1, state => $CFG->{bgm_enable}, 956 expand => 1, state => $CFG->{bgm_enable},
909 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 957 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
910 on_changed => sub { 958 on_changed => sub {
911 $CFG->{bgm_enable} = $_[1]; 959 $CFG->{bgm_enable} = $_[1];
912 $CONN->update_fx_want if $CONN; 960 $CONN->update_fx_want if $CONN;
961 audio_music_push;
913 0 962 1
914 } 963 }
915 ); 964 );
916 $table->add_at (2, $row++, new CFPlus::UI::Slider 965 $table->add_at (2, $row++, new CFPlus::UI::Slider
917 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 966 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
918 tooltip => "The volume of the background music. Changes are instant.", 967 tooltip => "The volume of the background music. Changes are instant.",
919 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 968 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
969 );
970
971 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
972 $table->add_at (1, $row++, new CFPlus::UI::Selector
973 c_colspan => 2, expand => 1,
974 value => $CFG->{audio_hw_frequency},
975 options => [
976 [11025, "11 kHz" , "11kHz (low quality)"],
977 [22050, "22 kHz" , "22kHz (reduced quality)"],
978 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
979 [48000, "48 kHz" , "48kHz (studio quality)"],
980 ],
981 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
982 on_changed => sub {
983 $CFG->{audio_hw_frequency} = $_[1];
984 audio_tab_update;
985 1
986 }
987 );
988
989 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
990 $table->add_at (1, $row++, new CFPlus::UI::Selector
991 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_channels},
993 options => [
994 [1, "Mono" , "Mono (single channel, low quality)"],
995 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
996 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
997 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
998 ],
999 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1000 on_changed => sub {
1001 $CFG->{audio_hw_channels} = $_[1];
1002 audio_tab_update;
1003 1
1004 }
1005 );
1006
1007 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1008 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1009 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_chunksize},
1011 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1012 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1013 on_changed => sub {
1014 $CFG->{audio_hw_chunksize} = $_[1]
1015 if $_[1];
1016 audio_tab_update;
1017 1
1018 }
1019 );
1020
1021 # should really be a slider
1022 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1023 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1024 c_colspan => 2, expand => 1,
1025 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1026 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1027 template => ">= 99",
1028 on_changed => sub {
1029 my ($slider, $value) = @_;
1030
1031 $CFG->{audio_mix_channels} = $value
1032 if $value;
1033 1;
1034 }
920 ); 1035 );
921 1036
922 $table->add_at (1, $row++, new CFPlus::UI::Button 1037 $table->add_at (1, $row++, new CFPlus::UI::Button
923 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1038 c_colspan => 2, expand => 1, align => 0, text => "Apply",
924 tooltip => "Apply the audio settings", 1039 tooltip => "Apply the audio settings",
… …
926 audio_shutdown (); 1041 audio_shutdown ();
927 audio_init (); 1042 audio_init ();
928 0 1043 0
929 } 1044 }
930 ); 1045 );
1046
1047 $vbox->add (new CFPlus::UI::FancyFrame
1048 expand => 1,
1049 label => "Audio Info",
1050 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1051 );
1052
1053 audio_tab_update;
931 1054
932 $vbox 1055 $vbox
933} 1056}
934 1057
935sub set_gauge_window_fontsize { 1058sub set_gauge_window_fontsize {
… …
970 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1093 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
971 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1094 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
972 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1095 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
973 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1096 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
974 1097
975 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1098 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1099 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1100 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
976 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1101 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
977 1102
978 $GAUGES = { 1103 $GAUGES = {
1104 exp => $exp, prg => $prg, sklprg => $sklprg,
979 exp => $exp, win => $win, range => $rng, 1105 win => $win, range => $rng,
980 food => $fg, mana => $mg, hp => $hg, grace => $gg 1106 hp => $hg, mana => $mg, grace => $gg, food => $fg,
981 }; 1107 };
982 1108
983 &set_gauge_window_fontsize; 1109 &set_gauge_window_fontsize;
984 1110
985 $win 1111 $win
… …
1186 $r 1312 $r
1187} 1313}
1188 1314
1189sub skill_window { 1315sub skill_window {
1190 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1316 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1317
1191 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1318 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1319
1192 $sw 1320 $sw
1193} 1321}
1194 1322
1195sub formsep($) { 1323sub formsep($) {
1196 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1324 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1641} 1769}
1642 1770
1643sub add_license { 1771sub add_license {
1644 my ($meta) = @_; 1772 my ($meta) = @_;
1645 1773
1646 $meta = $meta->{meta} 1774 $meta = $meta->{data}
1647 or return; 1775 or return;
1648 1776
1649 $meta->{license} || $meta->{author} || $meta->{source} 1777 $meta->{license} || $meta->{author} || $meta->{source}
1650 or return; 1778 or return;
1651 1779
… …
1705 $ntb->add_tab ( 1833 $ntb->add_tab (
1706 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1834 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1707 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1835 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1708 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1836 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1709 ); 1837 );
1710 $ntb->add_tab (Pickup => autopickup_setup, 1838 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1711 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1839 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1712 1840
1713 $ntb->add_tab (Media => media_window, 1841 $ntb->add_tab (Media => media_window,
1714 "License, Author and Source info for media sent by the server."); 1842 "License, Author and Source info for media sent by the server.");
1715 1843
… …
1956 2084
1957 $SDL_ACTIVE = 1; 2085 $SDL_ACTIVE = 1;
1958 $LAST_REFRESH = time - 0.01; 2086 $LAST_REFRESH = time - 0.01;
1959 2087
1960 CFPlus::OpenGL::init; 2088 CFPlus::OpenGL::init;
2089 CFPlus::Macro::init;
1961 2090
1962 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2091 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1963 2092
1964 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2093 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1965 2094
1966 ############################################################################# 2095 #############################################################################
1967 2096
1968 if ($DEBUG_STATUS) { 2097 if ($DEBUG_STATUS) {
1969 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2098 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1970 } else { 2099 } else {
1971 # create the widgets 2100 # create/configure the widgets
2101
2102 $CFPlus::UI::ROOT->connect (key_down => sub {
2103 my (undef, $ev) = @_;
2104
2105 if (my @macros = CFPlus::Macro::find $ev) {
2106 CFPlus::Macro::execute $_ for @macros;
2107
2108 return 1;
2109 }
2110
2111 0
2112 });
1972 2113
1973 $DEBUG_STATUS = new CFPlus::UI::Label 2114 $DEBUG_STATUS = new CFPlus::UI::Label
1974 padding => 0, 2115 padding => 0,
1975 z => 100, 2116 z => 100,
1976 force_x => "max", 2117 force_x => "max",
… …
2006 $MESSAGE_WINDOW->activate_console ($preset) 2147 $MESSAGE_WINDOW->activate_console ($preset)
2007 if $MESSAGE_WINDOW; 2148 if $MESSAGE_WINDOW;
2008 }); 2149 });
2009 $MAPWIDGET->show; 2150 $MAPWIDGET->show;
2010 $MAPWIDGET->grab_focus; 2151 $MAPWIDGET->grab_focus;
2152
2153 $COMPLETER = new CFPlus::MapWidget::Command::
2154 command => { },
2155 tooltip => "#completer_help",
2156 ;
2011 2157
2012 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2158 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2013 title => "Setup", 2159 title => "Setup",
2014 name => "setup_dialog", 2160 name => "setup_dialog",
2015 x => 'center', 2161 x => 'center',
… …
2140 delete $animate_object{$widget}; 2286 delete $animate_object{$widget};
2141} 2287}
2142 2288
2143%SDL_CB = ( 2289%SDL_CB = (
2144 CFPlus::SDL_QUIT => sub { 2290 CFPlus::SDL_QUIT => sub {
2145 exit; 2291 Event::unloop_all;
2146 }, 2292 },
2147 CFPlus::SDL_VIDEORESIZE => sub { 2293 CFPlus::SDL_VIDEORESIZE => sub {
2148 }, 2294 },
2149 CFPlus::SDL_VIDEOEXPOSE => sub { 2295 CFPlus::SDL_VIDEOEXPOSE => sub {
2150 CFPlus::UI::full_refresh; 2296 CFPlus::UI::full_refresh;
… …
2189 CFPlus::DB::Server::run; 2335 CFPlus::DB::Server::run;
2190 2336
2191 CFPlus::UI::set_layout ($::CFG->{layout}); 2337 CFPlus::UI::set_layout ($::CFG->{layout});
2192 2338
2193 my %DEF_CFG = ( 2339 my %DEF_CFG = (
2194 sdl_mode => 0, 2340 sdl_mode => 0,
2195 fullscreen => 0, 2341 fullscreen => 0,
2196 fast => 0, 2342 fast => 0,
2197 opengl11 => 0, 2343 force_opengl11 => undef,
2344 texture_compression => 1,
2198 map_scale => 1, 2345 map_scale => 1,
2199 fow_enable => 1, 2346 fow_enable => 1,
2200 fow_intensity => 0, 2347 fow_intensity => 0,
2201 map_smoothing => 1, 2348 map_smoothing => 1,
2202 gui_fontsize => 1, 2349 gui_fontsize => 1,
2203 log_fontsize => 0.7, 2350 log_fontsize => 0.7,
2204 gauge_fontsize => 1, 2351 gauge_fontsize => 1,
2205 gauge_size => 0.35, 2352 gauge_size => 0.35,
2206 stat_fontsize => 0.7, 2353 stat_fontsize => 0.7,
2207 mapsize => 100, 2354 mapsize => 100,
2208 audio_enable => 1, 2355 audio_enable => 1,
2356 audio_hw_channels => 2,
2357 audio_hw_frequency => 22050,
2358 audio_hw_chunksize => 0,
2359 audio_mix_channels => 8,
2209 effects_enable => 1, 2360 effects_enable => 1,
2210 effects_volume => 1, 2361 effects_volume => 1,
2211 bgm_enable => 1, 2362 bgm_enable => 1,
2212 bgm_volume => 0.5, 2363 bgm_volume => 0.5,
2213 output_sync => 1, 2364 output_sync => 1,
2214 output_count => 1, 2365 output_count => 1,
2215 output_rate => "", 2366 output_rate => "",
2216 pickup => 0, 2367 pickup => 0,
2217 inv_sort => "mtime", 2368 inv_sort => "mtime",
2218 default => "profile", # default profile 2369 default => "profile", # default profile
2219 show_tips => 1, 2370 show_tips => 1,
2220 logview_max_par => 1000, 2371 logview_max_par => 1000,
2221 ); 2372 );
2222 2373
2223 while (my ($k, $v) = each %DEF_CFG) { 2374 while (my ($k, $v) = each %DEF_CFG) {
2224 $CFG->{$k} = $v unless exists $CFG->{$k}; 2375 $CFG->{$k} = $v unless exists $CFG->{$k};
2225 } 2376 }
… …
2282# } 2433# }
2283# my $t2 = Time::HiRes::time; 2434# my $t2 = Time::HiRes::time;
2284# warn $t2-$t1; 2435# warn $t2-$t1;
2285# } 2436# }
2286 2437
2287 $startup_done->();
2288
2289 video_init; 2438 video_init;
2290 audio_init; 2439 audio_init;
2291} 2440}
2292 2441
2293show_tip_of_the_day if $CFG->{show_tips}; 2442show_tip_of_the_day if $CFG->{show_tips};
2443
2444Event->idle (cb => sub {
2445 $_[0]->w->cancel;
2446 $startup_done->();
2447});
2294 2448
2295Event::loop; 2449Event::loop;
2296 2450
2297#video_shutdown; 2451#video_shutdown;
2298#audio_shutdown; 2452#audio_shutdown;

Diff Legend

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