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.205 by root, Thu Aug 9 03:40:02 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" };
… …
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;
… …
147our $PL_WINDOW; 150our $PL_WINDOW;
148 151
149our $MUSIC_PLAYING_WIDGET; 152our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET; 153our $LICENSE_WIDGET;
151 154
155our $PICKUP_PAGE;
152our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
153our $STATS_PAGE; 157our $STATS_PAGE;
154our $SKILL_PAGE; 158our $SKILL_PAGE;
155our $SPELL_PAGE; 159our $SPELL_PAGE;
156our $SPELL_LIST; 160our $SPELL_LIST;
… …
168our $STATUSBOX; 172our $STATUSBOX;
169our $DEBUG_STATUS; 173our $DEBUG_STATUS;
170 174
171our $INV; 175our $INV;
172our $INVR; 176our $INVR;
173our $INV_RIGHT_HB; 177our $INVR_HB;
174
175our $PICKUP_CFG;
176 178
177############################################################################# 179#############################################################################
178 180
179sub status { 181sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 182 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
183sub debug { 185sub debug {
184 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
185} 187}
186 188
187sub message { 189sub message {
188 my ($para) = @_;
189 $MESSAGE_WINDOW->message ($para); 190 $MESSAGE_WINDOW->message (@_);
190} 191}
191 192
192############################################################################# 193#############################################################################
193#TODO: maybe move into own audio module... 194#TODO: maybe move into own audio module...
194 195
… …
217 my ($face) = @_; 218 my ($face) = @_;
218 219
219 $CFG->{effects_enable} 220 $CFG->{effects_enable}
220 or return; 221 or return;
221 222
223 $AUDIO_PLAY{$face}
224 or return;
225
222 if (my $chunk = $AUDIO_CHUNK{$face}) { 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 227 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_; 228 my (undef, $dx, $dy, $vol) = @$_;
225 229
226 my $channel = CFPlus::Channel::find; 230 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 231 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance); 232 $channel->set_position_r ($dx, $dy, 20);
234
235 $chunk->play ($channel); 233 $chunk->play ($channel);
236 } 234 }
237 } else { 235 } else {
238 # sound_meta not set means data is in flight either way 236 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face} 237 my $meta = $CONN->{face}[$face]
240 or return; 238 or return;
241 239
240 $meta->{data}
241 or return;
242
242 # if its a jingle, play it as ambient music 243 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) { 244 if ($meta->{data}{jingle}) {
244 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
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face); 247 &audio_music_push ($face);
247 } 248 }
248 } else { 249 } else {
249 # fetch from database 250 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub { 251 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0]; 252 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops 253 my $chunk = new CFPlus::MixChunk $rwops
253 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;
254 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk; 256 $AUDIO_CHUNK{$face} = $chunk;
256 257
257 audio_sound_push ($face); 258 audio_sound_push ($face);
258 }; 259 };
259 } 260 }
… …
267 or return; 268 or return;
268 $CFG->{effects_enable} 269 $CFG->{effects_enable}
269 or return; 270 or return;
270 271
271 my $queue = $AUDIO_PLAY{$face} ||= []; 272 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 273 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
273 audio_sound_push $face 274 audio_sound_push $face
274 unless @$queue > 1; 275 unless @$queue > 1;
275} 276}
276 277
277sub audio_music_set_meta { 278sub audio_music_set_meta {
278 my ($meta) = @_; 279 my ($meta) = @_;
279 280
280 $MUSIC_PLAYING_META = $meta; 281 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup ( 282 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
286 ); 287 );
287} 288}
288 289
289sub audio_music_update_volume { 290sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META; 291 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128; 294 CFPlus::MixMusic::volume $base * $volume * 128;
294} 295}
295 296
296sub audio_music_start { 297sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META; 298 my $meta = $MUSIC_PLAYING_META;
… …
316 317
317 my $NOW = time; 318 my $NOW = time;
318 319
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
322 $MUSIC_START = time - $pos; 323 $MUSIC_START = time - $pos;
323 } else { 324 } else {
324 $MUSIC_PLAYER->play (0); 325 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time; 326 $MUSIC_START = time;
326 } 327 }
… …
340 $fade_out = 333; 341 $fade_out = 333;
341 } else { 342 } else {
342 return unless $CFG->{bgm_enable}; 343 return unless $CFG->{bgm_enable};
343 344
344 my @have = 345 my @have =
345 grep $_, 346 grep $_ && $_->{data},
346 map $CONN->{music_meta}{$_}, 347 map $CONN->{face}[$_],
347 @$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;
348 352
349 @MUSIC_HAVE = @have 353 @MUSIC_HAVE = @have
350 if @have; 354 if @have;
351 355
352 # default MUSIC_HAVE == MUSIC_DEFAULT 356 # default MUSIC_HAVE == MUSIC_DEFAULT
353 @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;
354 $fade_out = 1000; 358 $fade_out = 700;
355 } 359 }
356 360
357 # if the currently playing song is acceptable, let it continue 361 # if the currently playing song is acceptable, let it continue
358 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
359 363
… …
368 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
369 373
370 # if the most recently-played piece played very recently, 374 # if the most recently-played piece played very recently,
371 # resume it, else choose the oldest piece for rotation. 375 # resume it, else choose the oldest piece for rotation.
372 audio_music_set_meta 376 audio_music_set_meta
373 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
374 ? $MUSIC_HAVE[-1] 378 ? $MUSIC_HAVE[-1]
375 : $MUSIC_HAVE[0]; 379 : $MUSIC_HAVE[0];
376 380
377 audio_music_start; 381 audio_music_start;
378 } 382 }
… …
384 $MUSIC_WANT = $songs; 388 $MUSIC_WANT = $songs;
385 audio_music_push; 389 audio_music_push;
386} 390}
387 391
388sub audio_music_finished { 392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
389 # we compress multiple jingles of the same type 397 # we compress multiple jingles of the same type
390 shift @MUSIC_JINGLE 398 shift @MUSIC_JINGLE
391 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
392 400
393 $MUSIC_PLAYING_WIDGET->clear; 401 $MUSIC_PLAYING_WIDGET->clear;
… …
400} 408}
401 409
402sub audio_init { 410sub audio_init {
403 if ($CFG->{audio_enable}) { 411 if ($CFG->{audio_enable}) {
404 $ENV{MIX_EFFECTSMAXSPEED} = 1; 412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
405 $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};
406 418
407 unless ($SDL_MIXER) { 419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
408 status "Unable to open sound device: there will be no sound"; 424 status "Unable to open sound device: there will be no sound";
409 return;
410 } 425 }
411
412 CFPlus::Mix_AllocateChannels 16;
413
414 audio_music_finished;
415 } else { 426 } else {
416 undef $SDL_MIXER; 427 undef $SDL_MIXER;
417 } 428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
418} 432}
419 433
420sub audio_shutdown { 434sub audio_shutdown {
421 undef $MUSIC_PLAYER; 435 undef $MUSIC_PLAYER;
422 undef $MUSIC_PLAYING_META; 436 undef $MUSIC_PLAYING_META;
… …
773 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
774 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
775 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
776 ); 790 );
777 791
792 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
793 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
794 state => $CFG->{force_opengl11},
795 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
796 . "higher memory usage and slower performance. It will, however, help tremendously on "
797 . "cards that claim to support a feature but fall back to software rendering. "
798 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
799 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
800 . "experience extremely low framerates and your card should do better, try this option.</b>",
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 }
812 );
813
778 $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");
779 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
780 state => $CFG->{fast}, 816 state => $CFG->{fast},
781 tooltip => "Lower the visual quality considerably to speed up rendering.", 817 tooltip => "Lower the visual quality considerably to speed up rendering.",
782 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
808 844
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 845 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
810 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
811 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
812 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 848 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
813 . "This increases load on the graphics subsystem and works only with 2.x servers. " 849 . "This increases load on the graphics subsystem and works only with TRT servers. "
814 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
815 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
816 ); 852 );
817 853
818 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 854 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
819 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
830 ); 866 );
831 867
832 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
833 $table->add_at (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
834 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
835 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 871 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
872 . "but you still need to press apply to correctly re-layout the widget.",
836 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
837 ); 874 );
838 875
839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 876 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
840 $table->add_at (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
859 ); 896 );
860 897
861 $vbox 898 $vbox
862} 899}
863 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
864sub audio_setup { 923sub audio_setup {
865 my $vbox = new CFPlus::UI::VBox; 924 my $vbox = new CFPlus::UI::VBox;
866 925
867 $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]);
868 927
… …
870 929
871 $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");
872 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 931 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
873 state => $CFG->{audio_enable}, 932 state => $CFG->{audio_enable},
874 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.",
875 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 934 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
876 ); 935 );
877# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
878# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
879# $CFG->{effects_volume} = $_[1];
880# });
881 936
882 $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");
883 $table->add_at (1, $row, new CFPlus::UI::CheckBox 938 $table->add_at (1, $row, new CFPlus::UI::CheckBox
884 expand => 1, state => $CFG->{effects_enable}, 939 expand => 1, state => $CFG->{effects_enable},
885 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.",
886 on_changed => sub { 941 on_changed => sub {
887 $CFG->{effects_enable} = $_[1]; 942 $CFG->{effects_enable} = $_[1];
888 $CONN->update_fx_want if $CONN; 943 $CONN->update_fx_want if $CONN;
889 0 944 1
890 } 945 }
891 ); 946 );
892 $table->add_at (2, $row++, new CFPlus::UI::Slider 947 $table->add_at (2, $row++, new CFPlus::UI::Slider
893 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 948 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
894 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 "
895 . "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.",
896 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 951 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
897 ); 952 );
898 953
899 $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");
900 $table->add_at (1, $row, new CFPlus::UI::CheckBox 955 $table->add_at (1, $row, new CFPlus::UI::CheckBox
901 expand => 1, state => $CFG->{bgm_enable}, 956 expand => 1, state => $CFG->{bgm_enable},
902 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.",
903 on_changed => sub { 958 on_changed => sub {
904 $CFG->{bgm_enable} = $_[1]; 959 $CFG->{bgm_enable} = $_[1];
905 $CONN->update_fx_want if $CONN; 960 $CONN->update_fx_want if $CONN;
961 audio_music_push;
906 0 962 1
907 } 963 }
908 ); 964 );
909 $table->add_at (2, $row++, new CFPlus::UI::Slider 965 $table->add_at (2, $row++, new CFPlus::UI::Slider
910 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 966 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
911 tooltip => "The volume of the background music. Changes are instant.", 967 tooltip => "The volume of the background music. Changes are instant.",
912 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 }
913 ); 1035 );
914 1036
915 $table->add_at (1, $row++, new CFPlus::UI::Button 1037 $table->add_at (1, $row++, new CFPlus::UI::Button
916 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1038 c_colspan => 2, expand => 1, align => 0, text => "Apply",
917 tooltip => "Apply the audio settings", 1039 tooltip => "Apply the audio settings",
… …
919 audio_shutdown (); 1041 audio_shutdown ();
920 audio_init (); 1042 audio_init ();
921 0 1043 0
922 } 1044 }
923 ); 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;
924 1054
925 $vbox 1055 $vbox
926} 1056}
927 1057
928sub set_gauge_window_fontsize { 1058sub set_gauge_window_fontsize {
… …
963 $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");
964 $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");
965 $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");
966 $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");
967 1097
968 $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);
969 $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");
970 1102
971 $GAUGES = { 1103 $GAUGES = {
1104 exp => $exp, prg => $prg, sklprg => $sklprg,
972 exp => $exp, win => $win, range => $rng, 1105 win => $win, range => $rng,
973 food => $fg, mana => $mg, hp => $hg, grace => $gg 1106 hp => $hg, mana => $mg, grace => $gg, food => $fg,
974 }; 1107 };
975 1108
976 &set_gauge_window_fontsize; 1109 &set_gauge_window_fontsize;
977 1110
978 $win 1111 $win
… …
1179 $r 1312 $r
1180} 1313}
1181 1314
1182sub skill_window { 1315sub skill_window {
1183 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1316 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1317
1184 $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
1185 $sw 1320 $sw
1186} 1321}
1187 1322
1188sub formsep($) { 1323sub formsep($) {
1189 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1324 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1601 $sw1->add ($INV = new CFPlus::UI::Inventory); 1736 $sw1->add ($INV = new CFPlus::UI::Inventory);
1602 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1737 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1603 1738
1604 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1739 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1605 1740
1606 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1741 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1607 1742
1608 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1743 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1609 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1744 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1610 1745
1611 # XXX: Call after $INVR = ... because set_opencont sets the items 1746 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1634} 1769}
1635 1770
1636sub add_license { 1771sub add_license {
1637 my ($meta) = @_; 1772 my ($meta) = @_;
1638 1773
1639 $meta = $meta->{meta} 1774 $meta = $meta->{data}
1640 or return; 1775 or return;
1641 1776
1642 $meta->{license} || $meta->{author} || $meta->{source} 1777 $meta->{license} || $meta->{author} || $meta->{source}
1643 or return; 1778 or return;
1644 1779
… …
1698 $ntb->add_tab ( 1833 $ntb->add_tab (
1699 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1834 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1700 "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 :). "
1701 . "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."
1702 ); 1837 );
1703 $ntb->add_tab (Pickup => autopickup_setup, 1838 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1704 "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.");
1705 1840
1706 $ntb->add_tab (Media => media_window, 1841 $ntb->add_tab (Media => media_window,
1707 "License, Author and Source info for media sent by the server."); 1842 "License, Author and Source info for media sent by the server.");
1708 1843
… …
1866 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2001 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1867 ); 2002 );
1868 $hb->add (new CFPlus::UI::Button 2003 $hb->add (new CFPlus::UI::Button
1869 text => "Quit anyway", 2004 text => "Quit anyway",
1870 expand => 1, 2005 expand => 1,
1871 on_activate => sub { exit }, 2006 on_activate => sub { Event::unloop_all },
1872 ); 2007 );
1873 } 2008 }
1874 2009
1875 $QUIT_DIALOG->show; 2010 $QUIT_DIALOG->show;
1876 $QUIT_DIALOG->grab_focus; 2011 $QUIT_DIALOG->grab_focus;
… …
1949 2084
1950 $SDL_ACTIVE = 1; 2085 $SDL_ACTIVE = 1;
1951 $LAST_REFRESH = time - 0.01; 2086 $LAST_REFRESH = time - 0.01;
1952 2087
1953 CFPlus::OpenGL::init; 2088 CFPlus::OpenGL::init;
2089 CFPlus::Macro::init;
1954 2090
1955 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2091 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1956 2092
1957 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2093 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1958 2094
1959 ############################################################################# 2095 #############################################################################
1960 2096
1961 if ($DEBUG_STATUS) { 2097 if ($DEBUG_STATUS) {
1962 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2098 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1963 } else { 2099 } else {
1964 # 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 });
1965 2113
1966 $DEBUG_STATUS = new CFPlus::UI::Label 2114 $DEBUG_STATUS = new CFPlus::UI::Label
1967 padding => 0, 2115 padding => 0,
1968 z => 100, 2116 z => 100,
1969 force_x => "max", 2117 force_x => "max",
… …
1999 $MESSAGE_WINDOW->activate_console ($preset) 2147 $MESSAGE_WINDOW->activate_console ($preset)
2000 if $MESSAGE_WINDOW; 2148 if $MESSAGE_WINDOW;
2001 }); 2149 });
2002 $MAPWIDGET->show; 2150 $MAPWIDGET->show;
2003 $MAPWIDGET->grab_focus; 2151 $MAPWIDGET->grab_focus;
2152
2153 $COMPLETER = new CFPlus::MapWidget::Command::
2154 command => { },
2155 tooltip => "#completer_help",
2156 ;
2004 2157
2005 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2158 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2006 title => "Setup", 2159 title => "Setup",
2007 name => "setup_dialog", 2160 name => "setup_dialog",
2008 x => 'center', 2161 x => 'center',
… …
2070 tooltip => "Terminates the program", 2223 tooltip => "Terminates the program",
2071 on_activate => sub { 2224 on_activate => sub {
2072 if ($CONN) { 2225 if ($CONN) {
2073 open_quit_dialog; 2226 open_quit_dialog;
2074 } else { 2227 } else {
2075 exit; 2228 Event::unloop_all;
2076 } 2229 }
2077 0 2230 0
2078 }, 2231 },
2079 ); 2232 );
2080 2233
2081 $BUTTONBAR->show; 2234 $BUTTONBAR->show;
2082 $SETUP_DIALOG->show; 2235 $SETUP_DIALOG->show;
2236 $MESSAGE_WINDOW->show;
2083 } 2237 }
2084 2238
2085 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2239 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2086} 2240}
2087 2241
… …
2095my $animate_timer; 2249my $animate_timer;
2096 2250
2097my $fps = 9; 2251my $fps = 9;
2098 2252
2099sub force_refresh { 2253sub force_refresh {
2254 if ($ENV{CFPLUS_DEBUG} & 4) {
2100 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2255 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2101 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2256 debug sprintf "%3.2f", $fps;
2257 }
2102 2258
2103 $CFPlus::UI::ROOT->draw; 2259 $CFPlus::UI::ROOT->draw;
2104 2260 CFPlus::SDL_GL_SwapBuffers;
2105 $WANT_REFRESH = 0;
2106 $CAN_REFRESH = 0;
2107 $LAST_REFRESH = $NOW; 2261 $LAST_REFRESH = $NOW;
2108 2262 $WANT_REFRESH->stop;
2109 CFPlus::SDL_GL_SwapBuffers;
2110} 2263}
2111 2264
2265$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2266
2112my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2267my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2113 $NOW = time; 2268 $NOW = time;
2114 2269
2115 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2270 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2116 for CFPlus::poll_events; 2271 for CFPlus::poll_events;
2117 2272
2118 if (%animate_object) { 2273 if (%animate_object) {
2119 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2274 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2120 ++$WANT_REFRESH; 2275 $WANT_REFRESH->start;
2121 }
2122
2123 if ($WANT_REFRESH) {
2124 force_refresh;
2125 } else {
2126 $CAN_REFRESH = 1;
2127 } 2276 }
2128}); 2277});
2129 2278
2130sub animation_start { 2279sub animation_start {
2131 my ($widget) = @_; 2280 my ($widget) = @_;
… …
2137 delete $animate_object{$widget}; 2286 delete $animate_object{$widget};
2138} 2287}
2139 2288
2140%SDL_CB = ( 2289%SDL_CB = (
2141 CFPlus::SDL_QUIT => sub { 2290 CFPlus::SDL_QUIT => sub {
2142 exit; 2291 Event::unloop_all;
2143 }, 2292 },
2144 CFPlus::SDL_VIDEORESIZE => sub { 2293 CFPlus::SDL_VIDEORESIZE => sub {
2145 }, 2294 },
2146 CFPlus::SDL_VIDEOEXPOSE => sub { 2295 CFPlus::SDL_VIDEOEXPOSE => sub {
2147 CFPlus::UI::full_refresh; 2296 CFPlus::UI::full_refresh;
… …
2186 CFPlus::DB::Server::run; 2335 CFPlus::DB::Server::run;
2187 2336
2188 CFPlus::UI::set_layout ($::CFG->{layout}); 2337 CFPlus::UI::set_layout ($::CFG->{layout});
2189 2338
2190 my %DEF_CFG = ( 2339 my %DEF_CFG = (
2191 sdl_mode => 0, 2340 sdl_mode => 0,
2192 fullscreen => 0, 2341 fullscreen => 0,
2193 fast => 0, 2342 fast => 0,
2343 force_opengl11 => undef,
2344 texture_compression => 1,
2194 map_scale => 1, 2345 map_scale => 1,
2195 fow_enable => 1, 2346 fow_enable => 1,
2196 fow_intensity => 0, 2347 fow_intensity => 0,
2197 map_smoothing => 1, 2348 map_smoothing => 1,
2198 gui_fontsize => 1, 2349 gui_fontsize => 1,
2199 log_fontsize => 0.7, 2350 log_fontsize => 0.7,
2200 gauge_fontsize => 1, 2351 gauge_fontsize => 1,
2201 gauge_size => 0.35, 2352 gauge_size => 0.35,
2202 stat_fontsize => 0.7, 2353 stat_fontsize => 0.7,
2203 mapsize => 100, 2354 mapsize => 100,
2204 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,
2205 effects_enable => 1, 2360 effects_enable => 1,
2206 effects_volume => 1, 2361 effects_volume => 1,
2207 bgm_enable => 1, 2362 bgm_enable => 1,
2208 bgm_volume => 0.5, 2363 bgm_volume => 0.5,
2209 output_sync => 1, 2364 output_sync => 1,
2210 output_count => 1, 2365 output_count => 1,
2211 output_rate => "", 2366 output_rate => "",
2212 pickup => 0, 2367 pickup => 0,
2213 inv_sort => "mtime", 2368 inv_sort => "mtime",
2214 default => "profile", # default profile 2369 default => "profile", # default profile
2215 show_tips => 1, 2370 show_tips => 1,
2216 logview_max_par => 1000, 2371 logview_max_par => 1000,
2217 ); 2372 );
2218 2373
2219 while (my ($k, $v) = each %DEF_CFG) { 2374 while (my ($k, $v) = each %DEF_CFG) {
2220 $CFG->{$k} = $v unless exists $CFG->{$k}; 2375 $CFG->{$k} = $v unless exists $CFG->{$k};
2221 } 2376 }
… …
2278# } 2433# }
2279# my $t2 = Time::HiRes::time; 2434# my $t2 = Time::HiRes::time;
2280# warn $t2-$t1; 2435# warn $t2-$t1;
2281# } 2436# }
2282 2437
2283 $startup_done->();
2284
2285 video_init; 2438 video_init;
2286 audio_init; 2439 audio_init;
2287} 2440}
2288 2441
2289show_tip_of_the_day if $CFG->{show_tips}; 2442show_tip_of_the_day if $CFG->{show_tips};
2290 2443
2444Event->idle (cb => sub {
2445 $_[0]->w->cancel;
2446 $startup_done->();
2447});
2448
2291Event::loop; 2449Event::loop;
2450
2451#video_shutdown;
2452#audio_shutdown;
2292#CFPlus::SDL_Quit; 2453CFPlus::SDL_Quit;
2293#CFPlus::_exit 0;
2294
2295END {
2296 video_shutdown;
2297 audio_shutdown;
2298 CFPlus::SDL_Quit;
2299 CFPlus::DB::Server::stop; 2454CFPlus::DB::Server::stop;
2300}
2301 2455
2302=head1 NAME 2456=head1 NAME
2303 2457
2304cfplus - A Crossfire TRT and Crossfire game client 2458cfplus - A Crossfire TRT and Crossfire game client
2305 2459

Diff Legend

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