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.200 by root, Thu Aug 2 14:35:21 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;
… …
168our $STATUSBOX; 167our $STATUSBOX;
169our $DEBUG_STATUS; 168our $DEBUG_STATUS;
170 169
171our $INV; 170our $INV;
172our $INVR; 171our $INVR;
173our $INV_RIGHT_HB; 172our $INVR_HB;
174
175our $PICKUP_CFG;
176 173
177############################################################################# 174#############################################################################
178 175
179sub status { 176sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
217 my ($face) = @_; 214 my ($face) = @_;
218 215
219 $CFG->{effects_enable} 216 $CFG->{effects_enable}
220 or return; 217 or return;
221 218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) { 222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_; 224 my (undef, $dx, $dy, $vol) = @$_;
225 225
226 my $channel = CFPlus::Channel::find; 226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance); 228 $channel->set_position_r ($dx, $dy, 20);
234
235 $chunk->play ($channel); 229 $chunk->play ($channel);
236 } 230 }
237 } else { 231 } else {
238 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{face}[$face]
240 or return; 234 or return;
241 235
236 $meta->{data}
237 or return;
238
242 # if its a jingle, play it as ambient music 239 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) { 240 if ($meta->{data}{jingle}) {
244 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue 241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face); 243 &audio_music_push ($face);
244 }
247 } else { 245 } else {
248 # fetch from database 246 # fetch from database
249 CFPlus::DB::get res_data => $meta->{name}, sub { 247 CFPlus::DB::get res_data => $meta->{name}, sub {
250 my $rwops = new CFPlus::RW $_[0]; 248 my $rwops = new CFPlus::RW $_[0];
251 my $chunk = new CFPlus::MixChunk $rwops; 249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
252 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
253 $AUDIO_CHUNK{$face} = $chunk; 252 $AUDIO_CHUNK{$face} = $chunk;
254 253
255 audio_sound_push ($face); 254 audio_sound_push ($face);
256 }; 255 };
257 } 256 }
… …
265 or return; 264 or return;
266 $CFG->{effects_enable} 265 $CFG->{effects_enable}
267 or return; 266 or return;
268 267
269 my $queue = $AUDIO_PLAY{$face} ||= []; 268 my $queue = $AUDIO_PLAY{$face} ||= [];
270 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
271 audio_sound_push $face 270 audio_sound_push $face
272 unless @$queue > 1; 271 unless @$queue > 1;
273} 272}
274 273
275sub audio_music_set_meta { 274sub audio_music_set_meta {
276 my ($meta) = @_; 275 my ($meta) = @_;
277 276
278 $MUSIC_PLAYING_META = $meta; 277 $MUSIC_PLAYING_META = $meta;
279 $MUSIC_PLAYING_WIDGET->set_markup ( 278 $MUSIC_PLAYING_WIDGET->set_markup (
280 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
281 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
282 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
283 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
284 ); 283 );
285} 284}
286 285
287sub audio_music_update_volume { 286sub audio_music_update_volume {
288 return unless $MUSIC_PLAYING_META; 287 return unless $MUSIC_PLAYING_META;
289 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
290 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
291 CFPlus::MixMusic::volume $base * $volume * 128; 290 CFPlus::MixMusic::volume $base * $volume * 128;
292} 291}
293 292
294sub audio_music_start { 293sub audio_music_start {
295 my $meta = $MUSIC_PLAYING_META; 294 my $meta = $MUSIC_PLAYING_META;
… …
308 my $rwops = $meta->{path} 307 my $rwops = $meta->{path}
309 ? new_from_file CFPlus::RW $meta->{path} 308 ? new_from_file CFPlus::RW $meta->{path}
310 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
311 310
312 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
313 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
314 313
315 my $NOW = time; 314 my $NOW = time;
316 315
317 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
318 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
338 $fade_out = 333; 337 $fade_out = 333;
339 } else { 338 } else {
340 return unless $CFG->{bgm_enable}; 339 return unless $CFG->{bgm_enable};
341 340
342 my @have = 341 my @have =
343 grep $_, 342 grep $_ && $_->{data},
344 map $CONN->{music_meta}{$_}, 343 map $CONN->{face}[$_],
345 @$MUSIC_WANT; 344 @$MUSIC_WANT;
346 345
347 @MUSIC_HAVE = @have 346 @MUSIC_HAVE = @have
348 if @have; 347 if @have;
349 348
… …
351 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
352 $fade_out = 1000; 351 $fade_out = 1000;
353 } 352 }
354 353
355 # if the currently playing song is acceptable, let it continue 354 # if the currently playing song is acceptable, let it continue
356 return if $MUSIC_PLAYING_META
357 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
358 356
359 my $NOW = time; 357 my $NOW = time;
360 358
361 if ($MUSIC_PLAYING_META) { 359 if ($MUSIC_PLAYING_META) {
362 $MUSIC_PLAYING_META->{stop_time} = $NOW; 360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
418 416
419sub audio_shutdown { 417sub audio_shutdown {
420 undef $MUSIC_PLAYER; 418 undef $MUSIC_PLAYER;
421 undef $MUSIC_PLAYING_META; 419 undef $MUSIC_PLAYING_META;
422 undef $MUSIC_PLAYING_DATA; 420 undef $MUSIC_PLAYING_DATA;
423
424 audio_music_set_meta { };
425 421
426 $MUSIC_WANT = []; 422 $MUSIC_WANT = [];
427 @MUSIC_JINGLE = (); 423 @MUSIC_JINGLE = ();
428 %AUDIO_PLAY = (); 424 %AUDIO_PLAY = ();
429 %AUDIO_CHUNK = (); 425 %AUDIO_CHUNK = ();
… …
774 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
775 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
776 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
777 ); 773 );
778 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
779 $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");
780 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
781 state => $CFG->{fast}, 799 state => $CFG->{fast},
782 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
809 827
810 $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");
811 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
812 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
813 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. "
814 . "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. "
815 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
816 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
817 ); 835 );
818 836
819 $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");
820 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
831 ); 849 );
832 850
833 $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");
834 $table->add_at (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
835 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
836 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.",
837 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 },
838 ); 857 );
839 858
840 $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");
841 $table->add_at (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
878# $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");
879# $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 {
880# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
881# }); 900# });
882 901
883 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
884 $table->add_at (1, $row, new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
885 expand => 1, state => $CFG->{effects_enable}, 904 expand => 1, state => $CFG->{effects_enable},
886 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
887 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 } 907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
888 ); 911 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
891 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
892 . "is set highest and you use your operating system volume setting. Changes are instant.", 915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 ); 917 );
895 918
896 $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");
897 $table->add_at (1, $row, new CFPlus::UI::CheckBox 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
898 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
899 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.",
900 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 }
901 ); 929 );
902 $table->add_at (2, $row++, new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
903 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
904 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
905 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
… …
1594 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1595 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1596 1624
1597 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1598 1626
1599 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1600 1628
1601 $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);
1602 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1603 1631
1604 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1610sub media_window { 1638sub media_window {
1611 my $vb = new CFPlus::UI::VBox; 1639 my $vb = new CFPlus::UI::VBox;
1612 1640
1613 $vb->add (new CFPlus::UI::FancyFrame 1641 $vb->add (new CFPlus::UI::FancyFrame
1614 label => "Currently playing music", 1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1615 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0), 1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1616 ); 1645 );
1617 1646
1618 $vb->add (new CFPlus::UI::FancyFrame 1647 $vb->add (new CFPlus::UI::FancyFrame
1619 label => "Other media used in this session", 1648 label => "Other media used in this session",
1649 expand => 1,
1620 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller 1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1621 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1622 ); 1652 );
1623 1653
1624 $vb 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;
1625} 1676}
1626 1677
1627sub toggle_player_page { 1678sub toggle_player_page {
1628 my ($widget) = @_; 1679 my ($widget) = @_;
1629 1680
… …
1836 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1837 ); 1888 );
1838 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1839 text => "Quit anyway", 1890 text => "Quit anyway",
1840 expand => 1, 1891 expand => 1,
1841 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1842 ); 1893 );
1843 } 1894 }
1844 1895
1845 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1846 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
2040 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
2041 on_activate => sub { 2092 on_activate => sub {
2042 if ($CONN) { 2093 if ($CONN) {
2043 open_quit_dialog; 2094 open_quit_dialog;
2044 } else { 2095 } else {
2045 exit; 2096 Event::unloop_all;
2046 } 2097 }
2047 0 2098 0
2048 }, 2099 },
2049 ); 2100 );
2050 2101
2051 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
2052 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
2053 } 2105 }
2054 2106
2055 $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]);
2056} 2108}
2057 2109
… …
2065my $animate_timer; 2117my $animate_timer;
2066 2118
2067my $fps = 9; 2119my $fps = 9;
2068 2120
2069sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2070 $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;
2071 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2072 2126
2073 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2074 2128 CFPlus::SDL_GL_SwapBuffers;
2075 $WANT_REFRESH = 0;
2076 $CAN_REFRESH = 0;
2077 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2078 2130 $WANT_REFRESH->stop;
2079 CFPlus::SDL_GL_SwapBuffers;
2080} 2131}
2081 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2082my $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 {
2083 $NOW = time; 2136 $NOW = time;
2084 2137
2085 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2086 for CFPlus::poll_events; 2139 for CFPlus::poll_events;
2087 2140
2088 if (%animate_object) { 2141 if (%animate_object) {
2089 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2090 ++$WANT_REFRESH; 2143 $WANT_REFRESH->start;
2091 }
2092
2093 if ($WANT_REFRESH) {
2094 force_refresh;
2095 } else {
2096 $CAN_REFRESH = 1;
2097 } 2144 }
2098}); 2145});
2099 2146
2100sub animation_start { 2147sub animation_start {
2101 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2156 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2157 2204
2158 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2159 2206
2160 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2161 sdl_mode => 0, 2208 sdl_mode => 0,
2162 fullscreen => 0, 2209 fullscreen => 0,
2163 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2164 map_scale => 1, 2213 map_scale => 1,
2165 fow_enable => 1, 2214 fow_enable => 1,
2166 fow_intensity => 0, 2215 fow_intensity => 0,
2167 map_smoothing => 1, 2216 map_smoothing => 1,
2168 gui_fontsize => 1, 2217 gui_fontsize => 1,
2169 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2170 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2171 gauge_size => 0.35, 2220 gauge_size => 0.35,
2172 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2173 mapsize => 100, 2222 mapsize => 100,
2174 audio_enable => 1, 2223 audio_enable => 1,
2175 effects_enable => 1, 2224 effects_enable => 1,
2176 effects_volume => 1, 2225 effects_volume => 1,
2177 bgm_enable => 1, 2226 bgm_enable => 1,
2178 bgm_volume => 0.5, 2227 bgm_volume => 0.5,
2179 output_sync => 1, 2228 output_sync => 1,
2180 output_count => 1, 2229 output_count => 1,
2181 output_rate => "", 2230 output_rate => "",
2182 pickup => 0, 2231 pickup => 0,
2183 inv_sort => "mtime", 2232 inv_sort => "mtime",
2184 default => "profile", # default profile 2233 default => "profile", # default profile
2185 show_tips => 1, 2234 show_tips => 1,
2186 logview_max_par => 1000, 2235 logview_max_par => 1000,
2187 ); 2236 );
2188 2237
2189 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2190 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2191 } 2240 }
… …
2257} 2306}
2258 2307
2259show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2260 2309
2261Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2262#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2263#CFPlus::_exit 0;
2264
2265END {
2266 CFPlus::SDL_Quit;
2267 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2268}
2269 2316
2270=head1 NAME 2317=head1 NAME
2271 2318
2272cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2273 2320
2274=head1 SYNOPSIS 2321=head1 SYNOPSIS
2275 2322
2276Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2277 2324
2278=head1 USAGE 2325=head1 USAGE
2279 2326
2280cfplus 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
2281fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2282 2329
2283=head1 DEBUGGING 2330=head1 DEBUGGING
2284 2331
2285 2332
2286CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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