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.197 by root, Tue Jul 31 02:25:52 2007 UTC vs.
Revision 1.208 by root, Fri Aug 10 04:02:14 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 $INV_RIGHT_HB;
173
174our $PICKUP_CFG;
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 my ($para) = @_;
188 $MESSAGE_WINDOW->message ($para);
189}
190
191#############################################################################
192#TODO: maybe move into own audio module...
193
164our $SDL_MIXER; 194our $SDL_MIXER;
195
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 196our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music 197our $MUSIC_WANT; # arryref of ambient music we want to play
167our @MUSIC_HAVE; # ambient music we want now 198our @MUSIC_HAVE; # ambient music we have on disk
168our $MUSIC_START; 199our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play 200our @MUSIC_JINGLE; # which jingles to play next
170our $MUSIC_PLAYING_DATA; 201our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META; 202our $MUSIC_PLAYING_META;
172our $MUSIC_PLAYER; 203our $MUSIC_PLAYER;
173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 204our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
174our @SOUNDS; # event => file mapping 205
175our %AUDIO_CHUNK; # audio files 206our %AUDIO_CHUNK; # audio "files"
176 207our %AUDIO_PLAY; # which audio faces should be played
177our $ALT_ENTER_MESSAGE;
178our $STATUSBOX;
179our $DEBUG_STATUS;
180
181our $INV;
182our $INVR;
183our $INV_RIGHT_HB;
184
185our $PICKUP_CFG;
186
187#############################################################################
188#TODO: maybe move into own audio module...
189 208
190sub audio_channel_finished { 209sub audio_channel_finished {
191 my ($channel) = @_; 210 my ($channel) = @_;
192 211
193# warn "channel $channel finished\n";#d# 212# warn "channel $channel finished\n";#d#
194} 213}
195 214
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) { 215sub audio_sound_push($) {
200 my ($face) = @_; 216 my ($face) = @_;
217
218 $CFG->{effects_enable}
219 or return;
220
221 $AUDIO_PLAY{$face}
222 or return;
201 223
202 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
205 227
206 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
214
215 $chunk->play ($channel); 231 $chunk->play ($channel);
216 } 232 }
217 } else { 233 } else {
218 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{sound_meta}{$face}
220 or return; 236 or return;
221 237
222 # if its a jingle, play it as ambient music 238 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) { 239 if ($meta->{meta}{jingle}) {
224 push @MUSIC_JINGLE, $meta; 240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
225 delete $AUDIO_PLAY{$face}; 241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
226 &audio_music_push ($face); 242 &audio_music_push ($face);
243 }
227 } else { 244 } else {
228 # fetch from database 245 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub { 246 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0]; 247 my $rwops = new CFPlus::RW $_[0];
231 my $chunk = new CFPlus::MixChunk $rwops; 248 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk; 251 $AUDIO_CHUNK{$face} = $chunk;
234 252
235 audio_sound_push ($face); 253 audio_sound_push ($face);
236 }; 254 };
… …
240 258
241sub audio_sound_play { 259sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_; 260 my ($face, $dx, $dy, $vol) = @_;
243 261
244 $SDL_MIXER 262 $SDL_MIXER
263 or return;
264 $CFG->{effects_enable}
245 or return; 265 or return;
246 266
247 my $queue = $AUDIO_PLAY{$face} ||= []; 267 my $queue = $AUDIO_PLAY{$face} ||= [];
248 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
249 audio_sound_push $face 269 audio_sound_push $face
250 unless @$queue > 1; 270 unless @$queue > 1;
271}
272
273sub audio_music_set_meta {
274 my ($meta) = @_;
275
276 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
282 );
251} 283}
252 284
253sub audio_music_update_volume { 285sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META; 286 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
… …
274 my $rwops = $meta->{path} 306 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path} 307 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277 309
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
280 312
281 my $NOW = time; 313 my $NOW = time;
282 314
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
287 } else { 319 } else {
288 $MUSIC_PLAYER->play (0); 320 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time; 321 $MUSIC_START = time;
290 } 322 }
291 323
292 delete $MUSIC_PLAYING_META->{stop_time}; 324 delete $meta->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos}; 325 delete $meta->{stop_pos};
294 } 326 }
295} 327}
296 328
297sub audio_music_push { 329sub audio_music_push {
298 return unless $SDL_MIXER; 330 return unless $SDL_MIXER;
… …
317 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
318 $fade_out = 1000; 350 $fade_out = 1000;
319 } 351 }
320 352
321 # if the currently playing song is acceptable, let it continue 353 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324 355
325 my $NOW = time; 356 my $NOW = time;
326 357
327 if ($MUSIC_PLAYING_META) { 358 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW; 359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
332 # sort by stop time, oldest first 363 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334 365
335 # if the most recently-played piece played very recently, 366 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation. 367 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META = 368 audio_music_set_meta
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1] 370 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0]; 371 : $MUSIC_HAVE[0];
341 372
342 audio_music_start; 373 audio_music_start;
… …
349 $MUSIC_WANT = $songs; 380 $MUSIC_WANT = $songs;
350 audio_music_push; 381 audio_music_push;
351} 382}
352 383
353sub audio_music_finished { 384sub audio_music_finished {
385 # we compress multiple jingles of the same type
354 shift @MUSIC_JINGLE 386 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
356 390
357 undef $MUSIC_PLAYER; 391 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META; 392 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA; 393 undef $MUSIC_PLAYING_DATA;
360 394
361 audio_music_push; 395 audio_music_push;
362} 396}
363 397
398sub audio_init {
399 if ($CFG->{audio_enable}) {
400 $ENV{MIX_EFFECTSMAXSPEED} = 1;
401 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
402
403 unless ($SDL_MIXER) {
404 status "Unable to open sound device: there will be no sound";
405 return;
406 }
407
408 CFPlus::Mix_AllocateChannels 16;
409
410 audio_music_finished;
411 } else {
412 undef $SDL_MIXER;
413 }
414}
415
416sub audio_shutdown {
417 undef $MUSIC_PLAYER;
418 undef $MUSIC_PLAYING_META;
419 undef $MUSIC_PLAYING_DATA;
420
421 $MUSIC_WANT = [];
422 @MUSIC_JINGLE = ();
423 %AUDIO_PLAY = ();
424 %AUDIO_CHUNK = ();
425
426 CFPlus::Mix_CloseAudio if $SDL_MIXER;
427 undef $SDL_MIXER;
428}
429
364############################################################################# 430#############################################################################
365
366sub status {
367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
368}
369
370sub debug {
371 $DEBUG_STATUS->set_text ($_[0]);
372}
373
374sub message {
375 my ($para) = @_;
376 $MESSAGE_WINDOW->message ($para);
377}
378 431
379sub destroy_query_dialog { 432sub destroy_query_dialog {
380 (delete $_[0]{query_dialog})->destroy 433 (delete $_[0]{query_dialog})->destroy
381 if $_[0]{query_dialog}; 434 if $_[0]{query_dialog};
382} 435}
… …
805} 858}
806 859
807sub audio_setup { 860sub audio_setup {
808 my $vbox = new CFPlus::UI::VBox; 861 my $vbox = new CFPlus::UI::VBox;
809 862
810 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
811 864
812 my $row = 0; 865 my $row = 0;
813 866
814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 867 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 868 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
819 ); 872 );
820# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 873# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
821# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 874# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
822# $CFG->{effects_volume} = $_[1]; 875# $CFG->{effects_volume} = $_[1];
823# }); 876# });
877
878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
879 $table->add_at (1, $row, new CFPlus::UI::CheckBox
880 expand => 1, state => $CFG->{effects_enable},
881 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
882 on_changed => sub {
883 $CFG->{effects_enable} = $_[1];
884 $CONN->update_fx_want if $CONN;
885 0
886 }
887 );
888 $table->add_at (2, $row++, new CFPlus::UI::Slider
889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
891 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
893 );
894
824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
826 $hbox->add (new CFPlus::UI::CheckBox
827 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
828 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 899 on_changed => sub {
900 $CFG->{bgm_enable} = $_[1];
901 $CONN->update_fx_want if $CONN;
902 0
903 }
830 ); 904 );
831 $hbox->add (new CFPlus::UI::Slider 905 $table->add_at (2, $row++, new CFPlus::UI::Slider
832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 906 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
833 tooltip => "The volume of the background music. Changes are instant.", 907 tooltip => "The volume of the background music. Changes are instant.",
834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 908 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
835 ); 909 );
836 910
837 $table->add_at (1, $row++, new CFPlus::UI::Button 911 $table->add_at (1, $row++, new CFPlus::UI::Button
838 expand => 1, align => 0, text => "Apply", 912 c_colspan => 2, expand => 1, align => 0, text => "Apply",
839 tooltip => "Apply the audio settings", 913 tooltip => "Apply the audio settings",
840 on_activate => sub { 914 on_activate => sub {
841 audio_shutdown (); 915 audio_shutdown ();
842 audio_init (); 916 audio_init ();
843 0 917 0
… …
914 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 988 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
915 989
916 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 990 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
917 991
918 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 992 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
919 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 993 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
920 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 994 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
921 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 995 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
922 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 996 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
923 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 997 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
924 998
925 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 999 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
926 1000
927 $c->add_items ({ 1001 $c->add_items ({
… …
1534 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1608 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1535 1609
1536 $hb 1610 $hb
1537} 1611}
1538 1612
1613sub media_window {
1614 my $vb = new CFPlus::UI::VBox;
1615
1616 $vb->add (new CFPlus::UI::FancyFrame
1617 label => "Currently playing music",
1618 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1619 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1620 );
1621
1622 $vb->add (new CFPlus::UI::FancyFrame
1623 label => "Other media used in this session",
1624 expand => 1,
1625 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1626 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1627 );
1628
1629 $vb
1630}
1631
1632sub add_license {
1633 my ($meta) = @_;
1634
1635 $meta = $meta->{meta}
1636 or return;
1637
1638 $meta->{license} || $meta->{author} || $meta->{source}
1639 or return;
1640
1641 $LICENSE_WIDGET->add_paragraph ({
1642 fg => [1, 1, 1, 1],
1643 markup => "<small>"
1644 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1645 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1646 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1647 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1648 . "</small>",
1649 });
1650 $LICENSE_WIDGET->scroll_to_bottom;
1651}
1652
1539sub toggle_player_page { 1653sub toggle_player_page {
1540 my ($widget) = @_; 1654 my ($widget) = @_;
1541 1655
1542 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1656 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1543 $PL_WINDOW->hide; 1657 $PL_WINDOW->hide;
… …
1580 $ntb->add_tab ( 1694 $ntb->add_tab (
1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1695 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1582 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1696 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1583 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1697 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1584 ); 1698 );
1585 $ntb->add_tab (Pickup => autopickup_setup, 1699 $ntb->add_tab (Pickup => autopickup_setup,
1586 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1700 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1701
1702 $ntb->add_tab (Media => media_window,
1703 "License, Author and Source info for media sent by the server.");
1587 1704
1588 $ntb->set_current_page ($INVENTORY_PAGE); 1705 $ntb->set_current_page ($INVENTORY_PAGE);
1589 1706
1590 $plwin->add ($ntb); 1707 $plwin->add ($ntb);
1591 $plwin 1708 $plwin
… …
1968 CFPlus::OpenGL::shutdown; 2085 CFPlus::OpenGL::shutdown;
1969 2086
1970 undef $SDL_ACTIVE; 2087 undef $SDL_ACTIVE;
1971} 2088}
1972 2089
1973sub audio_init {
1974 if ($CFG->{audio_enable}) {
1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1977
1978 unless ($SDL_MIXER) {
1979 status "Unable to open sound device: there will be no sound";
1980 return;
1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
1988 }
1989}
1990
1991sub audio_shutdown {
1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1993 undef $SDL_MIXER;
1994 @SOUNDS = ();
1995 %AUDIO_CHUNK = ();
1996}
1997
1998my %animate_object; 2090my %animate_object;
1999my $animate_timer; 2091my $animate_timer;
2000 2092
2001my $fps = 9; 2093my $fps = 9;
2002 2094
2003sub force_refresh { 2095sub force_refresh {
2096 if ($ENV{CFPLUS_DEBUG} & 4) {
2004 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps;
2099 }
2006 2100
2007 $CFPlus::UI::ROOT->draw; 2101 $CFPlus::UI::ROOT->draw;
2008 2102 CFPlus::SDL_GL_SwapBuffers;
2009 $WANT_REFRESH = 0;
2010 $CAN_REFRESH = 0;
2011 $LAST_REFRESH = $NOW; 2103 $LAST_REFRESH = $NOW;
2012 2104 $WANT_REFRESH->stop;
2013 CFPlus::SDL_GL_SwapBuffers;
2014} 2105}
2015 2106
2107$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2108
2016my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2017 $NOW = time; 2110 $NOW = time;
2018 2111
2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2020 for CFPlus::poll_events; 2113 for CFPlus::poll_events;
2021 2114
2022 if (%animate_object) { 2115 if (%animate_object) {
2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2024 ++$WANT_REFRESH; 2117 $WANT_REFRESH->start;
2025 }
2026
2027 if ($WANT_REFRESH) {
2028 force_refresh;
2029 } else {
2030 $CAN_REFRESH = 1;
2031 } 2118 }
2032}); 2119});
2033 2120
2034sub animation_start { 2121sub animation_start {
2035 my ($widget) = @_; 2122 my ($widget) = @_;
… …
2104 gauge_fontsize => 1, 2191 gauge_fontsize => 1,
2105 gauge_size => 0.35, 2192 gauge_size => 0.35,
2106 stat_fontsize => 0.7, 2193 stat_fontsize => 0.7,
2107 mapsize => 100, 2194 mapsize => 100,
2108 audio_enable => 1, 2195 audio_enable => 1,
2196 effects_enable => 1,
2197 effects_volume => 1,
2109 bgm_enable => 1, 2198 bgm_enable => 1,
2110 bgm_volume => 0.25, 2199 bgm_volume => 0.5,
2111 output_sync => 1, 2200 output_sync => 1,
2112 output_count => 1, 2201 output_count => 1,
2113 output_rate => "", 2202 output_rate => "",
2114 pickup => 0, 2203 pickup => 0,
2115 inv_sort => "mtime", 2204 inv_sort => "mtime",
… …
2193Event::loop; 2282Event::loop;
2194#CFPlus::SDL_Quit; 2283#CFPlus::SDL_Quit;
2195#CFPlus::_exit 0; 2284#CFPlus::_exit 0;
2196 2285
2197END { 2286END {
2287 video_shutdown;
2288 audio_shutdown;
2198 CFPlus::SDL_Quit; 2289 CFPlus::SDL_Quit;
2199 CFPlus::DB::Server::stop; 2290 CFPlus::DB::Server::stop;
2200} 2291}
2201 2292
2202=head1 NAME 2293=head1 NAME
2203 2294
2204cfplus - A Crossfire+ and Crossfire game client 2295cfplus - A Crossfire TRT and Crossfire game client
2205 2296
2206=head1 SYNOPSIS 2297=head1 SYNOPSIS
2207 2298
2208Just run it - no commandline arguments are supported. 2299Just run it - no commandline arguments are supported.
2209 2300
2210=head1 USAGE 2301=head1 USAGE
2211 2302
2212cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2213fullscreen and interactively. 2304be used in fullscreen mode and interactively.
2214 2305
2215=head1 DEBUGGING 2306=head1 DEBUGGING
2216 2307
2217 2308
2218CFPLUS_DEBUG - environment variable 2309CFPLUS_DEBUG - environment variable

Diff Legend

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