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.198 by root, Tue Jul 31 02:45:39 2007 UTC vs.
Revision 1.213 by root, Mon Aug 13 16:46:08 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;
… …
211} 213}
212 214
213sub audio_sound_push($) { 215sub audio_sound_push($) {
214 my ($face) = @_; 216 my ($face) = @_;
215 217
218 $CFG->{effects_enable}
219 or return;
220
221 $AUDIO_PLAY{$face}
222 or return;
223
216 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
217 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
218 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
219 227
220 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
221 $channel->volume ($vol * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
222 $dx = $dx / 10 * 255;
223 $channel->set_panning (255 - $dx, 255 + $dx);
224
225# my $angle = $dx ? : $dx < 0 ?
226# my $distance = -$vol;
227# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
228
229 $chunk->play ($channel); 231 $chunk->play ($channel);
230 } 232 }
231 } else { 233 } else {
232 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{sound_meta}{$face}
234 or return; 236 or return;
235 237
236 # if its a jingle, play it as ambient music 238 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) { 239 if ($meta->{meta}{jingle}) {
238 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue 240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face); 242 &audio_music_push ($face);
243 }
241 } else { 244 } else {
242 # fetch from database 245 # fetch from database
243 CFPlus::DB::get res_data => $meta->{name}, sub { 246 CFPlus::DB::get res_data => $meta->{name}, sub {
244 my $rwops = new CFPlus::RW $_[0]; 247 my $rwops = new CFPlus::RW $_[0];
245 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;
246 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
247 $AUDIO_CHUNK{$face} = $chunk; 251 $AUDIO_CHUNK{$face} = $chunk;
248 252
249 audio_sound_push ($face); 253 audio_sound_push ($face);
250 }; 254 };
… …
255sub audio_sound_play { 259sub audio_sound_play {
256 my ($face, $dx, $dy, $vol) = @_; 260 my ($face, $dx, $dy, $vol) = @_;
257 261
258 $SDL_MIXER 262 $SDL_MIXER
259 or return; 263 or return;
264 $CFG->{effects_enable}
265 or return;
260 266
261 my $queue = $AUDIO_PLAY{$face} ||= []; 267 my $queue = $AUDIO_PLAY{$face} ||= [];
262 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 268 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
263 audio_sound_push $face 269 audio_sound_push $face
264 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 );
265} 283}
266 284
267sub audio_music_update_volume { 285sub audio_music_update_volume {
268 return unless $MUSIC_PLAYING_META; 286 return unless $MUSIC_PLAYING_META;
269 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
… …
288 my $rwops = $meta->{path} 306 my $rwops = $meta->{path}
289 ? new_from_file CFPlus::RW $meta->{path} 307 ? new_from_file CFPlus::RW $meta->{path}
290 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
291 309
292 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
293 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
294 312
295 my $NOW = time; 313 my $NOW = time;
296 314
297 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
298 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
301 } else { 319 } else {
302 $MUSIC_PLAYER->play (0); 320 $MUSIC_PLAYER->play (0);
303 $MUSIC_START = time; 321 $MUSIC_START = time;
304 } 322 }
305 323
306 delete $MUSIC_PLAYING_META->{stop_time}; 324 delete $meta->{stop_time};
307 delete $MUSIC_PLAYING_META->{stop_pos}; 325 delete $meta->{stop_pos};
308 } 326 }
309} 327}
310 328
311sub audio_music_push { 329sub audio_music_push {
312 return unless $SDL_MIXER; 330 return unless $SDL_MIXER;
… …
331 @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;
332 $fade_out = 1000; 350 $fade_out = 1000;
333 } 351 }
334 352
335 # if the currently playing song is acceptable, let it continue 353 # if the currently playing song is acceptable, let it continue
336 return if $MUSIC_PLAYING_META
337 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
338 355
339 my $NOW = time; 356 my $NOW = time;
340 357
341 if ($MUSIC_PLAYING_META) { 358 if ($MUSIC_PLAYING_META) {
342 $MUSIC_PLAYING_META->{stop_time} = $NOW; 359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
346 # sort by stop time, oldest first 363 # sort by stop time, oldest first
347 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
348 365
349 # if the most recently-played piece played very recently, 366 # if the most recently-played piece played very recently,
350 # resume it, else choose the oldest piece for rotation. 367 # resume it, else choose the oldest piece for rotation.
351 $MUSIC_PLAYING_META = 368 audio_music_set_meta
352 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
353 ? $MUSIC_HAVE[-1] 370 ? $MUSIC_HAVE[-1]
354 : $MUSIC_HAVE[0]; 371 : $MUSIC_HAVE[0];
355 372
356 audio_music_start; 373 audio_music_start;
… …
366 383
367sub audio_music_finished { 384sub audio_music_finished {
368 # we compress multiple jingles of the same type 385 # we compress multiple jingles of the same type
369 shift @MUSIC_JINGLE 386 shift @MUSIC_JINGLE
370 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
371 390
372 undef $MUSIC_PLAYER; 391 undef $MUSIC_PLAYER;
373 undef $MUSIC_PLAYING_META; 392 undef $MUSIC_PLAYING_META;
374 undef $MUSIC_PLAYING_DATA; 393 undef $MUSIC_PLAYING_DATA;
375 394
… …
750 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
751 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
752 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
753 ); 772 );
754 773
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
776 state => $CFG->{opengl11},
777 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
778 . "higher memory usage and slower performance. It will, however, help tremendously on "
779 . "cards that claim to support a feature but fall back to software rendering. "
780 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
781 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
782 . "experience extremely low framerates and your card should do better, try this option.</b>",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
784 );
785
755 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
756 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
757 state => $CFG->{fast}, 788 state => $CFG->{fast},
758 tooltip => "Lower the visual quality considerably to speed up rendering.", 789 tooltip => "Lower the visual quality considerably to speed up rendering.",
759 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
785 816
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 817 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 818 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{map_smoothing}, 819 state => $CFG->{map_smoothing},
789 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 820 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
790 . "This increases load on the graphics subsystem and works only with 2.x servers. " 821 . "This increases load on the graphics subsystem and works only with TRT servers. "
791 . "Changes take effect at next connection only.", 822 . "Changes take effect at next login only.",
792 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 823 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
793 ); 824 );
794 825
795 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 826 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
796 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 827 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
807 ); 838 );
808 839
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
810 $table->add_at (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
811 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 842 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
812 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 843 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
844 . "but you still need to press apply to correctly re-layout the widget.",
813 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 845 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
814 ); 846 );
815 847
816 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
817 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
839} 871}
840 872
841sub audio_setup { 873sub audio_setup {
842 my $vbox = new CFPlus::UI::VBox; 874 my $vbox = new CFPlus::UI::VBox;
843 875
844 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 876 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
845 877
846 my $row = 0; 878 my $row = 0;
847 879
848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 880 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 881 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
853 ); 885 );
854# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 886# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
855# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 887# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
856# $CFG->{effects_volume} = $_[1]; 888# $CFG->{effects_volume} = $_[1];
857# }); 889# });
890
891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
892 $table->add_at (1, $row, new CFPlus::UI::CheckBox
893 expand => 1, state => $CFG->{effects_enable},
894 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
895 on_changed => sub {
896 $CFG->{effects_enable} = $_[1];
897 $CONN->update_fx_want if $CONN;
898 0
899 }
900 );
901 $table->add_at (2, $row++, new CFPlus::UI::Slider
902 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
903 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
904 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
905 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
906 );
907
858 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 908 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
859 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 909 $table->add_at (1, $row, new CFPlus::UI::CheckBox
860 $hbox->add (new CFPlus::UI::CheckBox
861 expand => 1, state => $CFG->{bgm_enable}, 910 expand => 1, state => $CFG->{bgm_enable},
862 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 911 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
863 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 912 on_changed => sub {
913 $CFG->{bgm_enable} = $_[1];
914 $CONN->update_fx_want if $CONN;
915 0
916 }
864 ); 917 );
865 $hbox->add (new CFPlus::UI::Slider 918 $table->add_at (2, $row++, new CFPlus::UI::Slider
866 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
867 tooltip => "The volume of the background music. Changes are instant.", 920 tooltip => "The volume of the background music. Changes are instant.",
868 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 921 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
869 ); 922 );
870 923
871 $table->add_at (1, $row++, new CFPlus::UI::Button 924 $table->add_at (1, $row++, new CFPlus::UI::Button
872 expand => 1, align => 0, text => "Apply", 925 c_colspan => 2, expand => 1, align => 0, text => "Apply",
873 tooltip => "Apply the audio settings", 926 tooltip => "Apply the audio settings",
874 on_activate => sub { 927 on_activate => sub {
875 audio_shutdown (); 928 audio_shutdown ();
876 audio_init (); 929 audio_init ();
877 0 930 0
… …
948 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1001 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
949 1002
950 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1003 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
951 1004
952 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1005 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
953 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1006 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
954 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1007 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
955 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1008 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
956 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1009 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
957 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1010 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
958 1011
959 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1012 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
960 1013
961 $c->add_items ({ 1014 $c->add_items ({
… …
1568 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1621 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1569 1622
1570 $hb 1623 $hb
1571} 1624}
1572 1625
1626sub media_window {
1627 my $vb = new CFPlus::UI::VBox;
1628
1629 $vb->add (new CFPlus::UI::FancyFrame
1630 label => "Currently playing music",
1631 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1632 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1633 );
1634
1635 $vb->add (new CFPlus::UI::FancyFrame
1636 label => "Other media used in this session",
1637 expand => 1,
1638 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1640 );
1641
1642 $vb
1643}
1644
1645sub add_license {
1646 my ($meta) = @_;
1647
1648 $meta = $meta->{meta}
1649 or return;
1650
1651 $meta->{license} || $meta->{author} || $meta->{source}
1652 or return;
1653
1654 $LICENSE_WIDGET->add_paragraph ({
1655 fg => [1, 1, 1, 1],
1656 markup => "<small>"
1657 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1658 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1659 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1660 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1661 . "</small>",
1662 });
1663 $LICENSE_WIDGET->scroll_to_bottom;
1664}
1665
1573sub toggle_player_page { 1666sub toggle_player_page {
1574 my ($widget) = @_; 1667 my ($widget) = @_;
1575 1668
1576 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1669 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1577 $PL_WINDOW->hide; 1670 $PL_WINDOW->hide;
… …
1614 $ntb->add_tab ( 1707 $ntb->add_tab (
1615 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1708 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1616 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1709 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1617 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1710 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1618 ); 1711 );
1619 $ntb->add_tab (Pickup => autopickup_setup, 1712 $ntb->add_tab (Pickup => autopickup_setup,
1620 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1713 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1714
1715 $ntb->add_tab (Media => media_window,
1716 "License, Author and Source info for media sent by the server.");
1621 1717
1622 $ntb->set_current_page ($INVENTORY_PAGE); 1718 $ntb->set_current_page ($INVENTORY_PAGE);
1623 1719
1624 $plwin->add ($ntb); 1720 $plwin->add ($ntb);
1625 $plwin 1721 $plwin
… …
1779 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1875 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1780 ); 1876 );
1781 $hb->add (new CFPlus::UI::Button 1877 $hb->add (new CFPlus::UI::Button
1782 text => "Quit anyway", 1878 text => "Quit anyway",
1783 expand => 1, 1879 expand => 1,
1784 on_activate => sub { exit }, 1880 on_activate => sub { Event::unloop_all },
1785 ); 1881 );
1786 } 1882 }
1787 1883
1788 $QUIT_DIALOG->show; 1884 $QUIT_DIALOG->show;
1789 $QUIT_DIALOG->grab_focus; 1885 $QUIT_DIALOG->grab_focus;
… …
1983 tooltip => "Terminates the program", 2079 tooltip => "Terminates the program",
1984 on_activate => sub { 2080 on_activate => sub {
1985 if ($CONN) { 2081 if ($CONN) {
1986 open_quit_dialog; 2082 open_quit_dialog;
1987 } else { 2083 } else {
1988 exit; 2084 Event::unloop_all;
1989 } 2085 }
1990 0 2086 0
1991 }, 2087 },
1992 ); 2088 );
1993 2089
… …
2008my $animate_timer; 2104my $animate_timer;
2009 2105
2010my $fps = 9; 2106my $fps = 9;
2011 2107
2012sub force_refresh { 2108sub force_refresh {
2109 if ($ENV{CFPLUS_DEBUG} & 4) {
2013 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2110 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2014 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2111 debug sprintf "%3.2f", $fps;
2112 }
2015 2113
2016 $CFPlus::UI::ROOT->draw; 2114 $CFPlus::UI::ROOT->draw;
2017 2115 CFPlus::SDL_GL_SwapBuffers;
2018 $WANT_REFRESH = 0;
2019 $CAN_REFRESH = 0;
2020 $LAST_REFRESH = $NOW; 2116 $LAST_REFRESH = $NOW;
2021 2117 $WANT_REFRESH->stop;
2022 CFPlus::SDL_GL_SwapBuffers;
2023} 2118}
2024 2119
2120$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2121
2025my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2122my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2026 $NOW = time; 2123 $NOW = time;
2027 2124
2028 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2125 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2029 for CFPlus::poll_events; 2126 for CFPlus::poll_events;
2030 2127
2031 if (%animate_object) { 2128 if (%animate_object) {
2032 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2129 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2033 ++$WANT_REFRESH; 2130 $WANT_REFRESH->start;
2034 }
2035
2036 if ($WANT_REFRESH) {
2037 force_refresh;
2038 } else {
2039 $CAN_REFRESH = 1;
2040 } 2131 }
2041}); 2132});
2042 2133
2043sub animation_start { 2134sub animation_start {
2044 my ($widget) = @_; 2135 my ($widget) = @_;
… …
2102 2193
2103 my %DEF_CFG = ( 2194 my %DEF_CFG = (
2104 sdl_mode => 0, 2195 sdl_mode => 0,
2105 fullscreen => 0, 2196 fullscreen => 0,
2106 fast => 0, 2197 fast => 0,
2198 opengl11 => 0,
2107 map_scale => 1, 2199 map_scale => 1,
2108 fow_enable => 1, 2200 fow_enable => 1,
2109 fow_intensity => 0, 2201 fow_intensity => 0,
2110 map_smoothing => 1, 2202 map_smoothing => 1,
2111 gui_fontsize => 1, 2203 gui_fontsize => 1,
… …
2113 gauge_fontsize => 1, 2205 gauge_fontsize => 1,
2114 gauge_size => 0.35, 2206 gauge_size => 0.35,
2115 stat_fontsize => 0.7, 2207 stat_fontsize => 0.7,
2116 mapsize => 100, 2208 mapsize => 100,
2117 audio_enable => 1, 2209 audio_enable => 1,
2210 effects_enable => 1,
2211 effects_volume => 1,
2118 bgm_enable => 1, 2212 bgm_enable => 1,
2119 bgm_volume => 0.25, 2213 bgm_volume => 0.5,
2120 output_sync => 1, 2214 output_sync => 1,
2121 output_count => 1, 2215 output_count => 1,
2122 output_rate => "", 2216 output_rate => "",
2123 pickup => 0, 2217 pickup => 0,
2124 inv_sort => "mtime", 2218 inv_sort => "mtime",
… …
2198} 2292}
2199 2293
2200show_tip_of_the_day if $CFG->{show_tips}; 2294show_tip_of_the_day if $CFG->{show_tips};
2201 2295
2202Event::loop; 2296Event::loop;
2297
2298#video_shutdown;
2299#audio_shutdown;
2203#CFPlus::SDL_Quit; 2300CFPlus::SDL_Quit;
2204#CFPlus::_exit 0;
2205
2206END {
2207 CFPlus::SDL_Quit;
2208 CFPlus::DB::Server::stop; 2301CFPlus::DB::Server::stop;
2209}
2210 2302
2211=head1 NAME 2303=head1 NAME
2212 2304
2213cfplus - A Crossfire+ and Crossfire game client 2305cfplus - A Crossfire TRT and Crossfire game client
2214 2306
2215=head1 SYNOPSIS 2307=head1 SYNOPSIS
2216 2308
2217Just run it - no commandline arguments are supported. 2309Just run it - no commandline arguments are supported.
2218 2310
2219=head1 USAGE 2311=head1 USAGE
2220 2312
2221cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2313cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2222fullscreen and interactively. 2314be used in fullscreen mode and interactively.
2223 2315
2224=head1 DEBUGGING 2316=head1 DEBUGGING
2225 2317
2226 2318
2227CFPLUS_DEBUG - environment variable 2319CFPLUS_DEBUG - environment variable

Diff Legend

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