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.194 by root, Tue Jul 31 00:50:04 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 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;
… …
144our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
145 144
146our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
147our $PL_WINDOW; 146our $PL_WINDOW;
148 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
149our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
150our $STATS_PAGE; 152our $STATS_PAGE;
151our $SKILL_PAGE; 153our $SKILL_PAGE;
152our $SPELL_PAGE; 154our $SPELL_PAGE;
153our $SPELL_LIST; 155our $SPELL_LIST;
… …
159our $STATWIDS; 161our $STATWIDS;
160 162
161our $SDL_ACTIVE; 163our $SDL_ACTIVE;
162our %SDL_CB; 164our %SDL_CB;
163 165
166our $ALT_ENTER_MESSAGE;
167our $STATUSBOX;
168our $DEBUG_STATUS;
169
170our $INV;
171our $INVR;
172our $INVR_HB;
173
174#############################################################################
175
176sub status {
177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
178}
179
180sub debug {
181 $DEBUG_STATUS->set_text ($_[0]);
182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
164our $SDL_MIXER; 192our $SDL_MIXER;
193
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT; 195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
167our $MUSIC_START; 197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
168our $MUSIC_PLAYING_DATA; 199our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 200our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 201our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172our @SOUNDS; # event => file mapping 203
173our %AUDIO_CHUNK; # audio files 204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
174 206
175our $ALT_ENTER_MESSAGE; 207sub audio_channel_finished {
176our $STATUSBOX; 208 my ($channel) = @_;
177our $DEBUG_STATUS;
178 209
179our $INV; 210# 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} 211}
188 212
189sub debug { 213sub audio_sound_push($) {
190 $DEBUG_STATUS->set_text ($_[0]);
191}
192
193sub message {
194 my ($para) = @_; 214 my ($face) = @_;
195 $MESSAGE_WINDOW->message ($para); 215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{face}[$face]
234 or return;
235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{data}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
196} 258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_ && $_->{data},
343 map $CONN->{face}[$_],
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
197 432
198sub destroy_query_dialog { 433sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
201} 436}
… …
535 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
536 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
538 ); 773 );
539 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $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 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
542 state => $CFG->{fast}, 799 state => $CFG->{fast},
543 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
544 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
570 827
571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 828 $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 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 831 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. " 832 . "This increases load on the graphics subsystem and works only with TRT servers. "
576 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578 ); 835 );
579 836
580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $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 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
592 ); 849 );
593 850
594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 851 $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 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 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.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "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 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
599 ); 857 );
600 858
601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $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 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
624} 882}
625 883
626sub audio_setup { 884sub audio_setup {
627 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
628 886
629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630 888
631 my $row = 0; 889 my $row = 0;
632 890
633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $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 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
638 ); 896 );
639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 897# $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 { 898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
641# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
642# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 919 $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); 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
645 $hbox->add (new CFPlus::UI::CheckBox
646 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 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 } 923 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
927 0
928 }
649 ); 929 );
650 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
654 ); 934 );
655 935
656 $table->add_at (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
657 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
658 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
659 on_activate => sub { 939 on_activate => sub {
660 audio_shutdown (); 940 audio_shutdown ();
661 audio_init (); 941 audio_init ();
662 0 942 0
… …
733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1013 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734 1014
735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1015 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736 1016
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1017 $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); 1018 $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); 1019 $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); 1020 $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); 1021 $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"); 1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743 1023
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745 1025
746 $c->add_items ({ 1026 $c->add_items ({
… …
1342 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1343 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1344 1624
1345 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1346 1626
1347 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1348 1628
1349 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1629 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1350 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1351 1631
1352 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1353 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1354 1634
1355 $hb 1635 $hb
1636}
1637
1638sub media_window {
1639 my $vb = new CFPlus::UI::VBox;
1640
1641 $vb->add (new CFPlus::UI::FancyFrame
1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1645 );
1646
1647 $vb->add (new CFPlus::UI::FancyFrame
1648 label => "Other media used in this session",
1649 expand => 1,
1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1652 );
1653
1654 $vb
1655}
1656
1657sub add_license {
1658 my ($meta) = @_;
1659
1660 $meta = $meta->{data}
1661 or return;
1662
1663 $meta->{license} || $meta->{author} || $meta->{source}
1664 or return;
1665
1666 $LICENSE_WIDGET->add_paragraph ({
1667 fg => [1, 1, 1, 1],
1668 markup => "<small>"
1669 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1670 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1671 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1672 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1673 . "</small>",
1674 });
1675 $LICENSE_WIDGET->scroll_to_bottom;
1356} 1676}
1357 1677
1358sub toggle_player_page { 1678sub toggle_player_page {
1359 my ($widget) = @_; 1679 my ($widget) = @_;
1360 1680
… …
1399 $ntb->add_tab ( 1719 $ntb->add_tab (
1400 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1721 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1402 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403 ); 1723 );
1404 $ntb->add_tab (Pickup => autopickup_setup, 1724 $ntb->add_tab (Pickup => autopickup_setup,
1405 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726
1727 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server.");
1406 1729
1407 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1408 1731
1409 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1410 $plwin 1733 $plwin
… …
1564 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1565 ); 1888 );
1566 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1567 text => "Quit anyway", 1890 text => "Quit anyway",
1568 expand => 1, 1891 expand => 1,
1569 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1570 ); 1893 );
1571 } 1894 }
1572 1895
1573 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1574 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1768 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1769 on_activate => sub { 2092 on_activate => sub {
1770 if ($CONN) { 2093 if ($CONN) {
1771 open_quit_dialog; 2094 open_quit_dialog;
1772 } else { 2095 } else {
1773 exit; 2096 Event::unloop_all;
1774 } 2097 }
1775 0 2098 0
1776 }, 2099 },
1777 ); 2100 );
1778 2101
1779 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1780 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1781 } 2105 }
1782 2106
1783 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2107 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1784} 2108}
1785 2109
… …
1787 CFPlus::OpenGL::shutdown; 2111 CFPlus::OpenGL::shutdown;
1788 2112
1789 undef $SDL_ACTIVE; 2113 undef $SDL_ACTIVE;
1790} 2114}
1791 2115
1792sub audio_channel_finished {
1793 my ($channel) = @_;
1794
1795# warn "channel $channel finished\n";#d#
1796}
1797
1798our %AUDIO_PLAY;
1799our %AUDIO_CHUNK;
1800
1801sub audio_sound_push($) {
1802 my ($face) = @_;
1803
1804 if (my $chunk = $AUDIO_CHUNK{$face}) {
1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1806 my (undef, $dx, $dy, $vol) = @$_;
1807
1808 my $channel = CFPlus::Channel::find;
1809 $channel->volume (128 + $vol);
1810 $dx = $dx / 10 * 255;
1811 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1812
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816
1817 $chunk->play ($channel);
1818 }
1819 } else {
1820 # sound_meta not set means data is in flight either way
1821 my $meta = $CONN->{sound_meta}{$face}
1822 or return;
1823
1824 # fetch from database
1825 CFPlus::DB::get res_data => $meta->{name}, sub {
1826 my $vol = $meta->{meta}{volume} || 1;
1827 my $rwops = new CFPlus::RW $_[0];
1828 my $chunk = new CFPlus::MixChunk $rwops;
1829 $chunk->volume ($vol * 128);
1830 $AUDIO_CHUNK{$face} = $chunk;
1831
1832 audio_sound_push ($face);
1833 };
1834 }
1835}
1836
1837sub audio_sound_play {
1838 my ($face, $dx, $dy, $vol) = @_;
1839
1840 $SDL_MIXER
1841 or return;
1842
1843 my $queue = $AUDIO_PLAY{$face} ||= [];
1844 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1845 audio_sound_push $face
1846 unless @$queue > 1;
1847}
1848
1849sub audio_music_set_ambient {
1850 my ($songs) = @_;
1851
1852 my @want =
1853 grep $_,
1854 map $CONN->{music_meta}{$_},
1855 @$songs;
1856
1857 if (@want) {
1858 @MUSIC_WANT = @want;
1859 &audio_music_changed ();
1860 }
1861}
1862
1863sub audio_music_start {
1864 my $meta = $MUSIC_PLAYING_META;
1865
1866 CFPlus::DB::get res_data => $meta->{name}, sub {
1867 return unless $SDL_MIXER;
1868
1869 # music might have changed...
1870 $meta eq $MUSIC_PLAYING_META
1871 or return &audio_music_start ();
1872
1873 $MUSIC_PLAYING_DATA = \$_[0];
1874
1875 my $rwops = $meta->{path}
1876 ? new_from_file CFPlus::RW $meta->{path}
1877 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1878
1879 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1880 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1881
1882 my $NOW = time;
1883
1884 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1885 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1886 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1887 $MUSIC_START = time - $pos;
1888 } else {
1889 $MUSIC_PLAYER->play (0);
1890 $MUSIC_START = time;
1891 }
1892
1893 delete $MUSIC_PLAYING_META->{stop_time};
1894 delete $MUSIC_PLAYING_META->{stop_pos};
1895 }
1896}
1897
1898sub audio_music_changed {
1899 return unless $CFG->{bgm_enable};
1900 return unless $SDL_MIXER;
1901
1902 # default MUSIC_WANT == MUSIC_DEFAULT
1903 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1904
1905 # if the currently playing song is acceptable, let it continue
1906 return if $MUSIC_PLAYING_META
1907 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1908
1909 my $NOW = time;
1910
1911 if ($MUSIC_PLAYING_META) {
1912 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1913 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1914 CFPlus::MixMusic::fade_out 1000;
1915 } else {
1916 # sort by stop time, oldest first
1917 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1918
1919 # if the most recently-played piece played very recently,
1920 # resume it, else choose the oldest piece for rotation.
1921 $MUSIC_PLAYING_META =
1922 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1923 ? $MUSIC_WANT[-1]
1924 : $MUSIC_WANT[0];
1925
1926 audio_music_start;
1927 }
1928}
1929
1930sub audio_music_finished {
1931 undef $MUSIC_PLAYER;
1932 undef $MUSIC_PLAYING_META;
1933 undef $MUSIC_PLAYING_DATA;
1934
1935 audio_music_changed;
1936}
1937
1938sub audio_init {
1939 if ($CFG->{audio_enable}) {
1940 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1941 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1942
1943 unless ($SDL_MIXER) {
1944 status "Unable to open sound device: there will be no sound";
1945 return;
1946 }
1947
1948 CFPlus::Mix_AllocateChannels 16;
1949 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1950
1951 audio_music_finished;
1952 } else {
1953 undef $SDL_MIXER;
1954 }
1955}
1956
1957sub audio_shutdown {
1958 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1959 undef $SDL_MIXER;
1960 @SOUNDS = ();
1961 %AUDIO_CHUNK = ();
1962}
1963
1964my %animate_object; 2116my %animate_object;
1965my $animate_timer; 2117my $animate_timer;
1966 2118
1967my $fps = 9; 2119my $fps = 9;
1968 2120
1969sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2123 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
1972 2126
1973 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
1974 2128 CFPlus::SDL_GL_SwapBuffers;
1975 $WANT_REFRESH = 0;
1976 $CAN_REFRESH = 0;
1977 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
1978 2130 $WANT_REFRESH->stop;
1979 CFPlus::SDL_GL_SwapBuffers;
1980} 2131}
1981 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2135my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1983 $NOW = time; 2136 $NOW = time;
1984 2137
1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1986 for CFPlus::poll_events; 2139 for CFPlus::poll_events;
1987 2140
1988 if (%animate_object) { 2141 if (%animate_object) {
1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1990 ++$WANT_REFRESH; 2143 $WANT_REFRESH->start;
1991 }
1992
1993 if ($WANT_REFRESH) {
1994 force_refresh;
1995 } else {
1996 $CAN_REFRESH = 1;
1997 } 2144 }
1998}); 2145});
1999 2146
2000sub animation_start { 2147sub animation_start {
2001 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2056 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2057 2204
2058 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2059 2206
2060 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2061 sdl_mode => 0, 2208 sdl_mode => 0,
2062 fullscreen => 0, 2209 fullscreen => 0,
2063 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2064 map_scale => 1, 2213 map_scale => 1,
2065 fow_enable => 1, 2214 fow_enable => 1,
2066 fow_intensity => 0, 2215 fow_intensity => 0,
2067 map_smoothing => 1, 2216 map_smoothing => 1,
2068 gui_fontsize => 1, 2217 gui_fontsize => 1,
2069 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2070 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2071 gauge_size => 0.35, 2220 gauge_size => 0.35,
2072 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2073 mapsize => 100, 2222 mapsize => 100,
2074 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2075 bgm_enable => 1, 2226 bgm_enable => 1,
2076 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2077 output_sync => 1, 2228 output_sync => 1,
2078 output_count => 1, 2229 output_count => 1,
2079 output_rate => "", 2230 output_rate => "",
2080 pickup => 0, 2231 pickup => 0,
2081 inv_sort => "mtime", 2232 inv_sort => "mtime",
2082 default => "profile", # default profile 2233 default => "profile", # default profile
2083 show_tips => 1, 2234 show_tips => 1,
2084 logview_max_par => 1000, 2235 logview_max_par => 1000,
2085 ); 2236 );
2086 2237
2087 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2088 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2089 } 2240 }
… …
2155} 2306}
2156 2307
2157show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2158 2309
2159Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2160#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2161#CFPlus::_exit 0;
2162
2163END {
2164 CFPlus::SDL_Quit;
2165 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2166}
2167 2316
2168=head1 NAME 2317=head1 NAME
2169 2318
2170cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2171 2320
2172=head1 SYNOPSIS 2321=head1 SYNOPSIS
2173 2322
2174Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2175 2324
2176=head1 USAGE 2325=head1 USAGE
2177 2326
2178cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2327cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2179fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2180 2329
2181=head1 DEBUGGING 2330=head1 DEBUGGING
2182 2331
2183 2332
2184CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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