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.225 by root, Fri Aug 31 08:03:10 2007 UTC

… …
113our $CONN; 113our $CONN;
114our $PROFILE; # current profile 114our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 116
117our $WANT_REFRESH; 117our $WANT_REFRESH;
118our $CAN_REFRESH;
119 118
120our @SDL_MODES; 119our @SDL_MODES;
121our $WIDTH; 120our $WIDTH;
122our $HEIGHT; 121our $HEIGHT;
123our $FULLSCREEN; 122our $FULLSCREEN;
… …
127our $FONT_FIXED; 126our $FONT_FIXED;
128 127
129our $MAP; 128our $MAP;
130our $MAPMAP; 129our $MAPMAP;
131our $MAPWIDGET; 130our $MAPWIDGET;
131our $COMPLETER;
132our $BUTTONBAR; 132our $BUTTONBAR;
133our $METASERVER; 133our $METASERVER;
134our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 135our $QUIT_DIALOG;
136our $HOST_ENTRY; 136our $HOST_ENTRY;
… …
144our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
145 145
146our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
147our $PL_WINDOW; 147our $PL_WINDOW;
148 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
152our $PICKUP_PAGE;
149our $INVENTORY_PAGE; 153our $INVENTORY_PAGE;
150our $STATS_PAGE; 154our $STATS_PAGE;
151our $SKILL_PAGE; 155our $SKILL_PAGE;
152our $SPELL_PAGE; 156our $SPELL_PAGE;
153our $SPELL_LIST; 157our $SPELL_LIST;
… …
159our $STATWIDS; 163our $STATWIDS;
160 164
161our $SDL_ACTIVE; 165our $SDL_ACTIVE;
162our %SDL_CB; 166our %SDL_CB;
163 167
168our $ALT_ENTER_MESSAGE;
169our $STATUSBOX;
170our $DEBUG_STATUS;
171
172our $INV;
173our $INVR;
174our $INVR_HB;
175
176#############################################################################
177
178sub status {
179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
180}
181
182sub debug {
183 $DEBUG_STATUS->set_text ($_[0]);
184}
185
186sub message {
187 $MESSAGE_WINDOW->message (@_);
188}
189
190#############################################################################
191#TODO: maybe move into own audio module...
192
164our $SDL_MIXER; 193our $SDL_MIXER;
194
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 195our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT; 196our $MUSIC_WANT; # arryref of ambient music we want to play
197our @MUSIC_HAVE; # ambient music we have on disk
167our $MUSIC_START; 198our $MUSIC_START;
199our @MUSIC_JINGLE; # which jingles to play next
168our $MUSIC_PLAYING_DATA; 200our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 201our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 202our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 203our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172our @SOUNDS; # event => file mapping 204
173our %AUDIO_CHUNKS; # audio files 205our %AUDIO_CHUNK; # audio "files"
206our %AUDIO_PLAY; # which audio faces should be played
174 207
175our $ALT_ENTER_MESSAGE; 208sub audio_channel_finished {
176our $STATUSBOX; 209 my ($channel) = @_;
177our $DEBUG_STATUS;
178 210
179our $INV; 211# 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} 212}
188 213
189sub debug { 214sub audio_sound_push($) {
190 $DEBUG_STATUS->set_text ($_[0]);
191}
192
193sub message {
194 my ($para) = @_; 215 my ($face) = @_;
195 $MESSAGE_WINDOW->message ($para); 216
217 $CFG->{effects_enable}
218 or return;
219
220 $AUDIO_PLAY{$face}
221 or return;
222
223 if (my $chunk = $AUDIO_CHUNK{$face}) {
224 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
225 my (undef, $dx, $dy, $vol) = @$_;
226
227 my $channel = CFPlus::Channel::find;
228 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
229 $channel->set_position_r ($dx, $dy, 20);
230 $chunk->play ($channel);
231 }
232 } else {
233 # sound_meta not set means data is in flight either way
234 my $meta = $CONN->{face}[$face]
235 or return;
236
237 $meta->{data}
238 or return;
239
240 # if its a jingle, play it as ambient music
241 if ($meta->{data}{jingle}) {
242 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
243 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
244 &audio_music_push ($face);
245 }
246 } else {
247 # fetch from database
248 CFPlus::DB::get res_data => $meta->{name}, sub {
249 my $rwops = new CFPlus::RW $_[0];
250 my $chunk = new CFPlus::MixChunk $rwops
251 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
252 $chunk->volume (($meta->{data}{volume} || 1) * 128);
253 $AUDIO_CHUNK{$face} = $chunk;
254
255 audio_sound_push ($face);
256 };
257 }
258 }
196} 259}
260
261sub audio_sound_play {
262 my ($face, $dx, $dy, $vol) = @_;
263
264 $SDL_MIXER
265 or return;
266 $CFG->{effects_enable}
267 or return;
268
269 my $queue = $AUDIO_PLAY{$face} ||= [];
270 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
271 audio_sound_push $face
272 unless @$queue > 1;
273}
274
275sub audio_music_set_meta {
276 my ($meta) = @_;
277
278 $MUSIC_PLAYING_META = $meta;
279 $MUSIC_PLAYING_WIDGET->set_markup (
280 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
281 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
282 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
283 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
284 );
285}
286
287sub audio_music_update_volume {
288 return unless $MUSIC_PLAYING_META;
289 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
290 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
291 CFPlus::MixMusic::volume $base * $volume * 128;
292}
293
294sub audio_music_start {
295 my $meta = $MUSIC_PLAYING_META;
296
297 CFPlus::DB::get res_data => $meta->{name}, sub {
298 return unless $SDL_MIXER;
299
300 # music might have changed...
301 $meta eq $MUSIC_PLAYING_META
302 or return &audio_music_start ();
303
304 audio_music_update_volume;
305
306 $MUSIC_PLAYING_DATA = \$_[0];
307
308 my $rwops = $meta->{path}
309 ? new_from_file CFPlus::RW $meta->{path}
310 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
311
312 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
313 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
314
315 my $NOW = time;
316
317 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
318 my $pos = $MUSIC_PLAYING_META->{stop_pos};
319 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
320 $MUSIC_START = time - $pos;
321 } else {
322 $MUSIC_PLAYER->play (0);
323 $MUSIC_START = time;
324 }
325
326 delete $meta->{stop_time};
327 delete $meta->{stop_pos};
328 }
329}
330
331sub audio_music_push {
332 return unless $SDL_MIXER;
333
334 my $fade_out;
335
336 if (@MUSIC_JINGLE) {
337 @MUSIC_HAVE = $MUSIC_JINGLE[0];
338 $fade_out = 333;
339 } else {
340 return unless $CFG->{bgm_enable};
341
342 my @have =
343 grep $_ && $_->{data},
344 map $CONN->{face}[$_],
345 @$MUSIC_WANT;
346
347 # randomize music a bit so that the order is not always the same
348 $_->{stop_time} ||= rand for @have;
349
350 @MUSIC_HAVE = @have
351 if @have;
352
353 # default MUSIC_HAVE == MUSIC_DEFAULT
354 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
355 $fade_out = 700;
356 }
357
358 # if the currently playing song is acceptable, let it continue
359 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
360
361 my $NOW = time;
362
363 if ($MUSIC_PLAYING_META) {
364 $MUSIC_PLAYING_META->{stop_time} = $NOW;
365 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
366 CFPlus::MixMusic::fade_out $fade_out;
367 } else {
368 # sort by stop time, oldest first
369 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
370
371 # if the most recently-played piece played very recently,
372 # resume it, else choose the oldest piece for rotation.
373 audio_music_set_meta
374 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
375 ? $MUSIC_HAVE[-1]
376 : $MUSIC_HAVE[0];
377
378 audio_music_start;
379 }
380}
381
382sub audio_music_set_ambient {
383 my ($songs) = @_;
384
385 $MUSIC_WANT = $songs;
386 audio_music_push;
387}
388
389sub audio_music_finished {
390 if ($MUSIC_PLAYING_META) {
391 $MUSIC_PLAYING_META->{stop_time} = time;
392 }
393
394 # we compress multiple jingles of the same type
395 shift @MUSIC_JINGLE
396 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
397
398 $MUSIC_PLAYING_WIDGET->clear;
399
400 undef $MUSIC_PLAYER;
401 undef $MUSIC_PLAYING_META;
402 undef $MUSIC_PLAYING_DATA;
403
404 audio_music_push;
405}
406
407sub audio_init {
408 if ($CFG->{audio_enable}) {
409 $ENV{MIX_EFFECTSMAXSPEED} = 1;
410 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
411
412 unless ($SDL_MIXER) {
413 status "Unable to open sound device: there will be no sound";
414 return;
415 }
416
417 CFPlus::Mix_AllocateChannels 16;
418
419 audio_music_finished;
420 } else {
421 undef $SDL_MIXER;
422 }
423}
424
425sub audio_shutdown {
426 undef $MUSIC_PLAYER;
427 undef $MUSIC_PLAYING_META;
428 undef $MUSIC_PLAYING_DATA;
429
430 $MUSIC_WANT = [];
431 @MUSIC_JINGLE = ();
432 %AUDIO_PLAY = ();
433 %AUDIO_CHUNK = ();
434
435 CFPlus::Mix_CloseAudio if $SDL_MIXER;
436 undef $SDL_MIXER;
437}
438
439#############################################################################
197 440
198sub destroy_query_dialog { 441sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 442 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 443 if $_[0]{query_dialog};
201} 444}
… …
481 $SETUP_DIALOG->show; 724 $SETUP_DIALOG->show;
482 $PL_WINDOW->hide; 725 $PL_WINDOW->hide;
483 $SPELL_LIST->clear_spells; 726 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 727 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485 728
486 &audio_music_set ([]); 729 &audio_music_set_ambient ([]);
487 730
488 return unless $CONN; 731 return unless $CONN;
489 732
490 status "connection closed"; 733 status "connection closed";
491 734
… …
533 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 776 $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 777 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
535 state => $CFG->{fullscreen}, 778 state => $CFG->{fullscreen},
536 tooltip => "Bring the client into fullscreen mode.", 779 tooltip => "Bring the client into fullscreen mode.",
537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 780 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
781 );
782
783 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
784 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
785 state => $CFG->{force_opengl11},
786 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
787 . "higher memory usage and slower performance. It will, however, help tremendously on "
788 . "cards that claim to support a feature but fall back to software rendering. "
789 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
790 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
791 . "experience extremely low framerates and your card should do better, try this option.</b>",
792 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
793 );
794
795 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
796 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
797 state => $CFG->{texture_compression},
798 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
799 . "will save a lot of memory and increase performance. The compression algorithm "
800 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
801 . "forced OpenGL 1.1 mode.",
802 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
538 ); 803 );
539 804
540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 805 $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 806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
542 state => $CFG->{fast}, 807 state => $CFG->{fast},
… …
570 835
571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 836 $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 837 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{map_smoothing}, 838 state => $CFG->{map_smoothing},
574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 839 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. " 840 . "This increases load on the graphics subsystem and works only with TRT servers. "
576 . "Changes take effect at next connection only.", 841 . "Changes take effect at next login only.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 842 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578 ); 843 );
579 844
580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 845 $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 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
592 ); 857 );
593 858
594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 859 $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 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 861 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.", 862 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
863 . "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 }, 864 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
599 ); 865 );
600 866
601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 867 $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 868 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
624} 890}
625 891
626sub audio_setup { 892sub audio_setup {
627 my $vbox = new CFPlus::UI::VBox; 893 my $vbox = new CFPlus::UI::VBox;
628 894
629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 895 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630 896
631 my $row = 0; 897 my $row = 0;
632 898
633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 899 $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 900 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
638 ); 904 );
639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 905# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
640# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 906# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
641# $CFG->{effects_volume} = $_[1]; 907# $CFG->{effects_volume} = $_[1];
642# }); 908# });
909
910 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
911 $table->add_at (1, $row, new CFPlus::UI::CheckBox
912 expand => 1, state => $CFG->{effects_enable},
913 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
914 on_changed => sub {
915 $CFG->{effects_enable} = $_[1];
916 $CONN->update_fx_want if $CONN;
917 0
918 }
919 );
920 $table->add_at (2, $row++, new CFPlus::UI::Slider
921 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
922 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
923 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
924 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
925 );
926
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 927 $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); 928 $table->add_at (1, $row, new CFPlus::UI::CheckBox
645 $hbox->add (new CFPlus::UI::CheckBox
646 expand => 1, state => $CFG->{bgm_enable}, 929 expand => 1, state => $CFG->{bgm_enable},
647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 930 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 } 931 on_changed => sub {
932 $CFG->{bgm_enable} = $_[1];
933 $CONN->update_fx_want if $CONN;
934 audio_music_push;
935 0
936 }
649 ); 937 );
650 $hbox->add (new CFPlus::UI::Slider 938 $table->add_at (2, $row++, new CFPlus::UI::Slider
651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 939 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652 tooltip => "The volume of the background music. Changes are instant.", 940 tooltip => "The volume of the background music. Changes are instant.",
653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 941 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
654 ); 942 );
655 943
656 $table->add_at (1, $row++, new CFPlus::UI::Button 944 $table->add_at (1, $row++, new CFPlus::UI::Button
657 expand => 1, align => 0, text => "Apply", 945 c_colspan => 2, expand => 1, align => 0, text => "Apply",
658 tooltip => "Apply the audio settings", 946 tooltip => "Apply the audio settings",
659 on_activate => sub { 947 on_activate => sub {
660 audio_shutdown (); 948 audio_shutdown ();
661 audio_init (); 949 audio_init ();
662 0 950 0
… …
704 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 992 $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"); 993 $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"); 994 $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"); 995 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
708 996
709 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 997 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
998 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
999 $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"); 1000 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
711 1001
712 $GAUGES = { 1002 $GAUGES = {
1003 exp => $exp, prg => $prg, sklprg => $sklprg,
713 exp => $exp, win => $win, range => $rng, 1004 win => $win, range => $rng,
714 food => $fg, mana => $mg, hp => $hg, grace => $gg 1005 hp => $hg, mana => $mg, grace => $gg, food => $fg,
715 }; 1006 };
716 1007
717 &set_gauge_window_fontsize; 1008 &set_gauge_window_fontsize;
718 1009
719 $win 1010 $win
… …
733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1024 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734 1025
735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1026 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736 1027
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1028 $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); 1029 $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); 1030 $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); 1031 $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); 1032 $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"); 1033 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743 1034
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1035 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745 1036
746 $c->add_items ({ 1037 $c->add_items ({
… …
920 $r 1211 $r
921} 1212}
922 1213
923sub skill_window { 1214sub skill_window {
924 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1215 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1216
925 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1217 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1218
926 $sw 1219 $sw
927} 1220}
928 1221
929sub formsep($) { 1222sub formsep($) {
930 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1223 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1071 text => $CFG->{profile}{default}{host}, 1364 text => $CFG->{profile}{default}{host},
1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1365 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1073 on_changed => sub { 1366 on_changed => sub {
1074 my ($self, $value) = @_; 1367 my ($self, $value) = @_;
1075 $CFG->{profile}{default}{host} = $value; 1368 $CFG->{profile}{default}{host} = $value;
1076 0 1369 1
1077 } 1370 }
1078 ); 1371 );
1079 1372
1080 $vbox->add (new CFPlus::UI::Button 1373 $vbox->add (new CFPlus::UI::Button
1081 expand => 1, 1374 expand => 1,
1082 text => "Server List", 1375 text => "Server List",
1083 other => $METASERVER, 1376 other => $METASERVER,
1084 tooltip => "Show a list of available crossfire servers", 1377 tooltip => "Show a list of available crossfire servers",
1085 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1378 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1379 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1087 ); 1380 );
1088 } 1381 }
1089 1382
1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1383 $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 1384 $table->add_at (1, 4, new CFPlus::UI::Entry
1092 text => $CFG->{profile}{default}{user}, 1385 text => $CFG->{profile}{default}{user},
1093 tooltip => "The name of your character on the server", 1386 tooltip => "The name of your character on the server",
1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1387 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1095 ); 1388 );
1096 1389
1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1390 $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 1391 $table->add_at (1, 5, new CFPlus::UI::Entry
1099 text => $CFG->{profile}{default}{password}, 1392 text => $CFG->{profile}{default}{password},
1100 hidden => 1, 1393 hidden => 1,
1101 tooltip => "The password for your character", 1394 tooltip => "The password for your character",
1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1395 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1103 ); 1396 );
1104 1397
1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1398 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1106 $table->add_at (1, 7, new CFPlus::UI::Slider 1399 $table->add_at (1, 7, new CFPlus::UI::Slider
1107 force_w => 100, 1400 force_w => 100,
1108 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1401 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109 tooltip => "This is the size of the portion of the map update the server sends you. " 1402 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, " 1403 . "If you set this to a high value you will be able to see further, "
1111 . "but you also increase bandwidth requirements and latency. " 1404 . "but you also increase bandwidth requirements and latency. "
1112 . "This option is only used once at log-in.", 1405 . "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 }, 1406 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1114 ); 1407 );
1115 1408
1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1409 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117 $table->add_at (1, 8, new CFPlus::UI::Entry 1410 $table->add_at (1, 8, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate}, 1411 text => $CFG->{output_rate},
1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1412 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 " 1413 . "when sending data. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s.", 1414 . "default will be used, which is usually around 100kb/s. Most servers will "
1415 . "dynamically find an optimal rate, so adjust this only when necessary.",
1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1416 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1123 ); 1417 );
1124 1418
1125 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1419 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1126 $table->add_at (1, 9, new CFPlus::UI::Entry 1420 $table->add_at (1, 9, new CFPlus::UI::Entry
1127 text => $CFG->{output_count}, 1421 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.", 1422 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 }, 1423 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1130 ); 1424 );
1131 1425
1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1426 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1133 $table->add_at (1, 10, new CFPlus::UI::Entry 1427 $table->add_at (1, 10, new CFPlus::UI::Entry
1134 text => $CFG->{output_sync}, 1428 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.", 1429 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 }, 1430 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1137 ); 1431 );
1138 1432
1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1433 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1140 expand => 1, 1434 expand => 1,
1141 align => 0, 1435 align => 0,
1142 text => "Login", 1436 text => "Login",
1143 on_activate => sub { 1437 on_activate => sub {
1144 $CONN ? stop_game 1438 $CONN ? stop_game
1145 : start_game; 1439 : start_game;
1146 0 1440 1
1147 }, 1441 },
1148 ); 1442 );
1149 1443
1150 $vbox->add (new CFPlus::UI::FancyFrame 1444 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info", 1445 label => "Server Info",
… …
1341 $sw1->add ($INV = new CFPlus::UI::Inventory); 1635 $sw1->add ($INV = new CFPlus::UI::Inventory);
1342 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1636 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1343 1637
1344 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1638 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1345 1639
1346 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1640 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1347 1641
1348 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1642 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1349 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1643 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1350 1644
1351 # XXX: Call after $INVR = ... because set_opencont sets the items 1645 # XXX: Call after $INVR = ... because set_opencont sets the items
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1646 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353 1647
1354 $hb 1648 $hb
1649}
1650
1651sub media_window {
1652 my $vb = new CFPlus::UI::VBox;
1653
1654 $vb->add (new CFPlus::UI::FancyFrame
1655 label => "Currently playing music",
1656 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1657 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1658 );
1659
1660 $vb->add (new CFPlus::UI::FancyFrame
1661 label => "Other media used in this session",
1662 expand => 1,
1663 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1664 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1665 );
1666
1667 $vb
1668}
1669
1670sub add_license {
1671 my ($meta) = @_;
1672
1673 $meta = $meta->{data}
1674 or return;
1675
1676 $meta->{license} || $meta->{author} || $meta->{source}
1677 or return;
1678
1679 $LICENSE_WIDGET->add_paragraph ({
1680 fg => [1, 1, 1, 1],
1681 markup => "<small>"
1682 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1683 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1684 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1685 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1686 . "</small>",
1687 });
1688 $LICENSE_WIDGET->scroll_to_bottom;
1355} 1689}
1356 1690
1357sub toggle_player_page { 1691sub toggle_player_page {
1358 my ($widget) = @_; 1692 my ($widget) = @_;
1359 1693
… …
1398 $ntb->add_tab ( 1732 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1733 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1734 "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." 1735 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1736 );
1403 $ntb->add_tab (Pickup => autopickup_setup, 1737 $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."); 1738 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1739
1740 $ntb->add_tab (Media => media_window,
1741 "License, Author and Source info for media sent by the server.");
1405 1742
1406 $ntb->set_current_page ($INVENTORY_PAGE); 1743 $ntb->set_current_page ($INVENTORY_PAGE);
1407 1744
1408 $plwin->add ($ntb); 1745 $plwin->add ($ntb);
1409 $plwin 1746 $plwin
… …
1563 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1900 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1564 ); 1901 );
1565 $hb->add (new CFPlus::UI::Button 1902 $hb->add (new CFPlus::UI::Button
1566 text => "Quit anyway", 1903 text => "Quit anyway",
1567 expand => 1, 1904 expand => 1,
1568 on_activate => sub { exit }, 1905 on_activate => sub { Event::unloop_all },
1569 ); 1906 );
1570 } 1907 }
1571 1908
1572 $QUIT_DIALOG->show; 1909 $QUIT_DIALOG->show;
1573 $QUIT_DIALOG->grab_focus; 1910 $QUIT_DIALOG->grab_focus;
… …
1646 1983
1647 $SDL_ACTIVE = 1; 1984 $SDL_ACTIVE = 1;
1648 $LAST_REFRESH = time - 0.01; 1985 $LAST_REFRESH = time - 0.01;
1649 1986
1650 CFPlus::OpenGL::init; 1987 CFPlus::OpenGL::init;
1988 CFPlus::Macro::init;
1651 1989
1652 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1990 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1653 1991
1654 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1992 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1655 1993
1656 ############################################################################# 1994 #############################################################################
1657 1995
1658 if ($DEBUG_STATUS) { 1996 if ($DEBUG_STATUS) {
1659 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1997 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1660 } else { 1998 } else {
1661 # create the widgets 1999 # create/configure the widgets
2000
2001 $CFPlus::UI::ROOT->connect (key_down => sub {
2002 my (undef, $ev) = @_;
2003
2004 if (my @macros = CFPlus::Macro::find $ev) {
2005 CFPlus::Macro::execute $_ for @macros;
2006
2007 return 1;
2008 }
2009
2010 0
2011 });
1662 2012
1663 $DEBUG_STATUS = new CFPlus::UI::Label 2013 $DEBUG_STATUS = new CFPlus::UI::Label
1664 padding => 0, 2014 padding => 0,
1665 z => 100, 2015 z => 100,
1666 force_x => "max", 2016 force_x => "max",
… …
1696 $MESSAGE_WINDOW->activate_console ($preset) 2046 $MESSAGE_WINDOW->activate_console ($preset)
1697 if $MESSAGE_WINDOW; 2047 if $MESSAGE_WINDOW;
1698 }); 2048 });
1699 $MAPWIDGET->show; 2049 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 2050 $MAPWIDGET->grab_focus;
2051
2052 $COMPLETER = new CFPlus::MapWidget::Command::
2053 command => { },
2054 tooltip => "#completer_help",
2055 ;
1701 2056
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2057 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 2058 title => "Setup",
1704 name => "setup_dialog", 2059 name => "setup_dialog",
1705 x => 'center', 2060 x => 'center',
… …
1767 tooltip => "Terminates the program", 2122 tooltip => "Terminates the program",
1768 on_activate => sub { 2123 on_activate => sub {
1769 if ($CONN) { 2124 if ($CONN) {
1770 open_quit_dialog; 2125 open_quit_dialog;
1771 } else { 2126 } else {
1772 exit; 2127 Event::unloop_all;
1773 } 2128 }
1774 0 2129 0
1775 }, 2130 },
1776 ); 2131 );
1777 2132
1778 $BUTTONBAR->show; 2133 $BUTTONBAR->show;
1779 $SETUP_DIALOG->show; 2134 $SETUP_DIALOG->show;
2135 $MESSAGE_WINDOW->show;
1780 } 2136 }
1781 2137
1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2138 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1783} 2139}
1784 2140
… …
1786 CFPlus::OpenGL::shutdown; 2142 CFPlus::OpenGL::shutdown;
1787 2143
1788 undef $SDL_ACTIVE; 2144 undef $SDL_ACTIVE;
1789} 2145}
1790 2146
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; 2147my %animate_object;
1963my $animate_timer; 2148my $animate_timer;
1964 2149
1965my $fps = 9; 2150my $fps = 9;
1966 2151
1967my %demo;#d#
1968
1969sub force_refresh { 2152sub force_refresh {
2153 if ($ENV{CFPLUS_DEBUG} & 4) {
1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2154 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2155 debug sprintf "%3.2f", $fps;
2156 }
1972 2157
1973 $CFPlus::UI::ROOT->draw; 2158 $CFPlus::UI::ROOT->draw;
1974 2159 CFPlus::SDL_GL_SwapBuffers;
1975 $WANT_REFRESH = 0;
1976 $CAN_REFRESH = 0;
1977 $LAST_REFRESH = $NOW; 2160 $LAST_REFRESH = $NOW;
1978 2161 $WANT_REFRESH->stop;
1979 CFPlus::SDL_GL_SwapBuffers;
1980} 2162}
1981 2163
2164$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2165
1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2166my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1983 $NOW = time; 2167 $NOW = time;
1984 2168
1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2169 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1986 for CFPlus::poll_events; 2170 for CFPlus::poll_events;
1987 2171
1988 if (%animate_object) { 2172 if (%animate_object) {
1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2173 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1990 ++$WANT_REFRESH; 2174 $WANT_REFRESH->start;
1991 }
1992
1993 if ($WANT_REFRESH) {
1994 force_refresh;
1995 } else {
1996 $CAN_REFRESH = 1;
1997 } 2175 }
1998}); 2176});
1999 2177
2000sub animation_start { 2178sub animation_start {
2001 my ($widget) = @_; 2179 my ($widget) = @_;
… …
2007 delete $animate_object{$widget}; 2185 delete $animate_object{$widget};
2008} 2186}
2009 2187
2010%SDL_CB = ( 2188%SDL_CB = (
2011 CFPlus::SDL_QUIT => sub { 2189 CFPlus::SDL_QUIT => sub {
2012 exit; 2190 Event::unloop_all;
2013 }, 2191 },
2014 CFPlus::SDL_VIDEORESIZE => sub { 2192 CFPlus::SDL_VIDEORESIZE => sub {
2015 }, 2193 },
2016 CFPlus::SDL_VIDEOEXPOSE => sub { 2194 CFPlus::SDL_VIDEOEXPOSE => sub {
2017 CFPlus::UI::full_refresh; 2195 CFPlus::UI::full_refresh;
… …
2056 CFPlus::DB::Server::run; 2234 CFPlus::DB::Server::run;
2057 2235
2058 CFPlus::UI::set_layout ($::CFG->{layout}); 2236 CFPlus::UI::set_layout ($::CFG->{layout});
2059 2237
2060 my %DEF_CFG = ( 2238 my %DEF_CFG = (
2061 sdl_mode => 0, 2239 sdl_mode => 0,
2062 width => 640,
2063 height => 480,
2064 fullscreen => 0, 2240 fullscreen => 0,
2065 fast => 0, 2241 fast => 0,
2242 force_opengl11 => undef,
2243 texture_compression => 1,
2066 map_scale => 1, 2244 map_scale => 1,
2067 fow_enable => 1, 2245 fow_enable => 1,
2068 fow_intensity => 0, 2246 fow_intensity => 0,
2069 map_smoothing => 1, 2247 map_smoothing => 1,
2070 gui_fontsize => 1, 2248 gui_fontsize => 1,
2071 log_fontsize => 0.7, 2249 log_fontsize => 0.7,
2072 gauge_fontsize => 1, 2250 gauge_fontsize => 1,
2073 gauge_size => 0.35, 2251 gauge_size => 0.35,
2074 stat_fontsize => 0.7, 2252 stat_fontsize => 0.7,
2075 mapsize => 100, 2253 mapsize => 100,
2076 audio_enable => 1, 2254 audio_enable => 1,
2255 effects_enable => 1,
2256 effects_volume => 1,
2077 bgm_enable => 1, 2257 bgm_enable => 1,
2078 bgm_volume => 0.25, 2258 bgm_volume => 0.5,
2079 output_sync => 1, 2259 output_sync => 1,
2080 output_count => 1, 2260 output_count => 1,
2081 output_rate => "", 2261 output_rate => "",
2082 pickup => 0, 2262 pickup => 0,
2083 inv_sort => "mtime", 2263 inv_sort => "mtime",
2084 default => "profile", # default profile 2264 default => "profile", # default profile
2085 show_tips => 1, 2265 show_tips => 1,
2086 logview_max_par => 1000, 2266 logview_max_par => 1000,
2087 ); 2267 );
2088 2268
2089 while (my ($k, $v) = each %DEF_CFG) { 2269 while (my ($k, $v) = each %DEF_CFG) {
2090 $CFG->{$k} = $v unless exists $CFG->{$k}; 2270 $CFG->{$k} = $v unless exists $CFG->{$k};
2091 } 2271 }
… …
2148# } 2328# }
2149# my $t2 = Time::HiRes::time; 2329# my $t2 = Time::HiRes::time;
2150# warn $t2-$t1; 2330# warn $t2-$t1;
2151# } 2331# }
2152 2332
2153 $startup_done->();
2154
2155 video_init; 2333 video_init;
2156 audio_init; 2334 audio_init;
2157} 2335}
2158 2336
2159show_tip_of_the_day if $CFG->{show_tips}; 2337show_tip_of_the_day if $CFG->{show_tips};
2160 2338
2339Event->idle (cb => sub {
2340 $_[0]->w->cancel;
2341 $startup_done->();
2342});
2343
2161Event::loop; 2344Event::loop;
2345
2346#video_shutdown;
2347#audio_shutdown;
2162#CFPlus::SDL_Quit; 2348CFPlus::SDL_Quit;
2163#CFPlus::_exit 0;
2164
2165END {
2166 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop; 2349CFPlus::DB::Server::stop;
2168}
2169 2350
2170=head1 NAME 2351=head1 NAME
2171 2352
2172cfplus - A Crossfire+ and Crossfire game client 2353cfplus - A Crossfire TRT and Crossfire game client
2173 2354
2174=head1 SYNOPSIS 2355=head1 SYNOPSIS
2175 2356
2176Just run it - no commandline arguments are supported. 2357Just run it - no commandline arguments are supported.
2177 2358
2178=head1 USAGE 2359=head1 USAGE
2179 2360
2180cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2361cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2181fullscreen and interactively. 2362be used in fullscreen mode and interactively.
2182 2363
2183=head1 DEBUGGING 2364=head1 DEBUGGING
2184 2365
2185 2366
2186CFPLUS_DEBUG - environment variable 2367CFPLUS_DEBUG - environment variable

Diff Legend

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