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.199 by root, Wed Aug 1 14:27:21 2007 UTC vs.
Revision 1.215 by root, Fri Aug 17 21:18:01 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;
… …
165our $STATUSBOX; 167our $STATUSBOX;
166our $DEBUG_STATUS; 168our $DEBUG_STATUS;
167 169
168our $INV; 170our $INV;
169our $INVR; 171our $INVR;
170our $INV_RIGHT_HB; 172our $INVR_HB;
171
172our $PICKUP_CFG;
173 173
174############################################################################# 174#############################################################################
175 175
176sub status { 176sub status {
177 $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]);
… …
214 my ($face) = @_; 214 my ($face) = @_;
215 215
216 $CFG->{effects_enable} 216 $CFG->{effects_enable}
217 or return; 217 or return;
218 218
219 $AUDIO_PLAY{$face}
220 or return;
221
219 if (my $chunk = $AUDIO_CHUNK{$face}) { 222 if (my $chunk = $AUDIO_CHUNK{$face}) {
220 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
221 my (undef, $dx, $dy, $vol) = @$_; 224 my (undef, $dx, $dy, $vol) = @$_;
222 225
223 my $channel = CFPlus::Channel::find; 226 my $channel = CFPlus::Channel::find;
224 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
225 $dx = $dx / 10 * 255;
226 $channel->set_panning (255 - $dx, 255 + $dx);
227
228# my $angle = $dx ? : $dx < 0 ?
229# my $distance = -$vol;
230# $channel->set_position ($angle, $distance); 228 $channel->set_position_r ($dx, $dy, 20);
231
232 $chunk->play ($channel); 229 $chunk->play ($channel);
233 } 230 }
234 } else { 231 } else {
235 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{sound_meta}{$face}
237 or return; 234 or return;
238 235
239 # if its a jingle, play it as ambient music 236 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) { 237 if ($meta->{meta}{jingle}) {
241 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue 238 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 239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face); 240 &audio_music_push ($face);
241 }
244 } else { 242 } else {
245 # fetch from database 243 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub { 244 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0]; 245 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops; 246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
249 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
250 $AUDIO_CHUNK{$face} = $chunk; 249 $AUDIO_CHUNK{$face} = $chunk;
251 250
252 audio_sound_push ($face); 251 audio_sound_push ($face);
253 }; 252 };
… …
262 or return; 261 or return;
263 $CFG->{effects_enable} 262 $CFG->{effects_enable}
264 or return; 263 or return;
265 264
266 my $queue = $AUDIO_PLAY{$face} ||= []; 265 my $queue = $AUDIO_PLAY{$face} ||= [];
267 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
268 audio_sound_push $face 267 audio_sound_push $face
269 unless @$queue > 1; 268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
270} 281}
271 282
272sub audio_music_update_volume { 283sub audio_music_update_volume {
273 return unless $MUSIC_PLAYING_META; 284 return unless $MUSIC_PLAYING_META;
274 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
… …
293 my $rwops = $meta->{path} 304 my $rwops = $meta->{path}
294 ? new_from_file CFPlus::RW $meta->{path} 305 ? new_from_file CFPlus::RW $meta->{path}
295 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
296 307
297 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
298 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
299 310
300 my $NOW = time; 311 my $NOW = time;
301 312
302 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
303 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
306 } else { 317 } else {
307 $MUSIC_PLAYER->play (0); 318 $MUSIC_PLAYER->play (0);
308 $MUSIC_START = time; 319 $MUSIC_START = time;
309 } 320 }
310 321
311 delete $MUSIC_PLAYING_META->{stop_time}; 322 delete $meta->{stop_time};
312 delete $MUSIC_PLAYING_META->{stop_pos}; 323 delete $meta->{stop_pos};
313 } 324 }
314} 325}
315 326
316sub audio_music_push { 327sub audio_music_push {
317 return unless $SDL_MIXER; 328 return unless $SDL_MIXER;
… …
336 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
337 $fade_out = 1000; 348 $fade_out = 1000;
338 } 349 }
339 350
340 # if the currently playing song is acceptable, let it continue 351 # if the currently playing song is acceptable, let it continue
341 return if $MUSIC_PLAYING_META
342 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
343 353
344 my $NOW = time; 354 my $NOW = time;
345 355
346 if ($MUSIC_PLAYING_META) { 356 if ($MUSIC_PLAYING_META) {
347 $MUSIC_PLAYING_META->{stop_time} = $NOW; 357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
351 # sort by stop time, oldest first 361 # sort by stop time, oldest first
352 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
353 363
354 # if the most recently-played piece played very recently, 364 # if the most recently-played piece played very recently,
355 # resume it, else choose the oldest piece for rotation. 365 # resume it, else choose the oldest piece for rotation.
356 $MUSIC_PLAYING_META = 366 audio_music_set_meta
357 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
358 ? $MUSIC_HAVE[-1] 368 ? $MUSIC_HAVE[-1]
359 : $MUSIC_HAVE[0]; 369 : $MUSIC_HAVE[0];
360 370
361 audio_music_start; 371 audio_music_start;
… …
371 381
372sub audio_music_finished { 382sub audio_music_finished {
373 # we compress multiple jingles of the same type 383 # we compress multiple jingles of the same type
374 shift @MUSIC_JINGLE 384 shift @MUSIC_JINGLE
375 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
376 388
377 undef $MUSIC_PLAYER; 389 undef $MUSIC_PLAYER;
378 undef $MUSIC_PLAYING_META; 390 undef $MUSIC_PLAYING_META;
379 undef $MUSIC_PLAYING_DATA; 391 undef $MUSIC_PLAYING_DATA;
380 392
… …
755 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
756 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
757 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
758 ); 770 );
759 771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
782 );
783
760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
761 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
762 state => $CFG->{fast}, 786 state => $CFG->{fast},
763 tooltip => "Lower the visual quality considerably to speed up rendering.", 787 tooltip => "Lower the visual quality considerably to speed up rendering.",
764 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 788 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
790 814
791 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
792 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
793 state => $CFG->{map_smoothing}, 817 state => $CFG->{map_smoothing},
794 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 818 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
795 . "This increases load on the graphics subsystem and works only with 2.x servers. " 819 . "This increases load on the graphics subsystem and works only with TRT servers. "
796 . "Changes take effect at next connection only.", 820 . "Changes take effect at next login only.",
797 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 821 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
798 ); 822 );
799 823
800 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
801 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
812 ); 836 );
813 837
814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
815 $table->add_at (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
816 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 840 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
817 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 841 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
842 . "but you still need to press apply to correctly re-layout the widget.",
818 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 843 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
819 ); 844 );
820 845
821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
822 $table->add_at (1, $row++, new CFPlus::UI::Slider 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
859# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 884# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
860# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 885# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
861# $CFG->{effects_volume} = $_[1]; 886# $CFG->{effects_volume} = $_[1];
862# }); 887# });
863 888
864 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 889 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
865 $table->add_at (1, $row, new CFPlus::UI::CheckBox 890 $table->add_at (1, $row, new CFPlus::UI::CheckBox
866 expand => 1, state => $CFG->{effects_enable}, 891 expand => 1, state => $CFG->{effects_enable},
867 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 892 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
893 on_changed => sub {
868 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 } 894 $CFG->{effects_enable} = $_[1];
895 $CONN->update_fx_want if $CONN;
896 0
897 }
869 ); 898 );
870 $table->add_at (2, $row++, new CFPlus::UI::Slider 899 $table->add_at (2, $row++, new CFPlus::UI::Slider
871 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 900 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
872 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 901 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
873 . "is set highest and you use your operating system volume setting. Changes are instant.", 902 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
874 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 903 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
875 ); 904 );
876 905
877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 906 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
878 $table->add_at (1, $row, new CFPlus::UI::CheckBox 907 $table->add_at (1, $row, new CFPlus::UI::CheckBox
879 expand => 1, state => $CFG->{bgm_enable}, 908 expand => 1, state => $CFG->{bgm_enable},
880 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 909 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
881 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 910 on_changed => sub {
911 $CFG->{bgm_enable} = $_[1];
912 $CONN->update_fx_want if $CONN;
913 0
914 }
882 ); 915 );
883 $table->add_at (2, $row++, new CFPlus::UI::Slider 916 $table->add_at (2, $row++, new CFPlus::UI::Slider
884 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 917 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
885 tooltip => "The volume of the background music. Changes are instant.", 918 tooltip => "The volume of the background music. Changes are instant.",
886 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 919 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
… …
1575 $sw1->add ($INV = new CFPlus::UI::Inventory); 1608 $sw1->add ($INV = new CFPlus::UI::Inventory);
1576 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1609 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1577 1610
1578 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1611 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1579 1612
1580 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1613 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1581 1614
1582 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1615 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1583 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1616 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1584 1617
1585 # XXX: Call after $INVR = ... because set_opencont sets the items 1618 # XXX: Call after $INVR = ... because set_opencont sets the items
1586 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1619 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1587 1620
1588 $hb 1621 $hb
1622}
1623
1624sub media_window {
1625 my $vb = new CFPlus::UI::VBox;
1626
1627 $vb->add (new CFPlus::UI::FancyFrame
1628 label => "Currently playing music",
1629 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1630 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1631 );
1632
1633 $vb->add (new CFPlus::UI::FancyFrame
1634 label => "Other media used in this session",
1635 expand => 1,
1636 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1637 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1638 );
1639
1640 $vb
1641}
1642
1643sub add_license {
1644 my ($meta) = @_;
1645
1646 $meta = $meta->{meta}
1647 or return;
1648
1649 $meta->{license} || $meta->{author} || $meta->{source}
1650 or return;
1651
1652 $LICENSE_WIDGET->add_paragraph ({
1653 fg => [1, 1, 1, 1],
1654 markup => "<small>"
1655 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1656 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1657 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1658 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1659 . "</small>",
1660 });
1661 $LICENSE_WIDGET->scroll_to_bottom;
1589} 1662}
1590 1663
1591sub toggle_player_page { 1664sub toggle_player_page {
1592 my ($widget) = @_; 1665 my ($widget) = @_;
1593 1666
… …
1632 $ntb->add_tab ( 1705 $ntb->add_tab (
1633 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1706 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1634 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1707 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1635 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1708 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1636 ); 1709 );
1637 $ntb->add_tab (Pickup => autopickup_setup, 1710 $ntb->add_tab (Pickup => autopickup_setup,
1638 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1711 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1712
1713 $ntb->add_tab (Media => media_window,
1714 "License, Author and Source info for media sent by the server.");
1639 1715
1640 $ntb->set_current_page ($INVENTORY_PAGE); 1716 $ntb->set_current_page ($INVENTORY_PAGE);
1641 1717
1642 $plwin->add ($ntb); 1718 $plwin->add ($ntb);
1643 $plwin 1719 $plwin
… …
1797 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1873 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1798 ); 1874 );
1799 $hb->add (new CFPlus::UI::Button 1875 $hb->add (new CFPlus::UI::Button
1800 text => "Quit anyway", 1876 text => "Quit anyway",
1801 expand => 1, 1877 expand => 1,
1802 on_activate => sub { exit }, 1878 on_activate => sub { Event::unloop_all },
1803 ); 1879 );
1804 } 1880 }
1805 1881
1806 $QUIT_DIALOG->show; 1882 $QUIT_DIALOG->show;
1807 $QUIT_DIALOG->grab_focus; 1883 $QUIT_DIALOG->grab_focus;
… …
2001 tooltip => "Terminates the program", 2077 tooltip => "Terminates the program",
2002 on_activate => sub { 2078 on_activate => sub {
2003 if ($CONN) { 2079 if ($CONN) {
2004 open_quit_dialog; 2080 open_quit_dialog;
2005 } else { 2081 } else {
2006 exit; 2082 Event::unloop_all;
2007 } 2083 }
2008 0 2084 0
2009 }, 2085 },
2010 ); 2086 );
2011 2087
2012 $BUTTONBAR->show; 2088 $BUTTONBAR->show;
2013 $SETUP_DIALOG->show; 2089 $SETUP_DIALOG->show;
2090 $MESSAGE_WINDOW->show;
2014 } 2091 }
2015 2092
2016 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2093 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2017} 2094}
2018 2095
… …
2026my $animate_timer; 2103my $animate_timer;
2027 2104
2028my $fps = 9; 2105my $fps = 9;
2029 2106
2030sub force_refresh { 2107sub force_refresh {
2108 if ($ENV{CFPLUS_DEBUG} & 4) {
2031 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2109 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2032 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2110 debug sprintf "%3.2f", $fps;
2111 }
2033 2112
2034 $CFPlus::UI::ROOT->draw; 2113 $CFPlus::UI::ROOT->draw;
2035 2114 CFPlus::SDL_GL_SwapBuffers;
2036 $WANT_REFRESH = 0;
2037 $CAN_REFRESH = 0;
2038 $LAST_REFRESH = $NOW; 2115 $LAST_REFRESH = $NOW;
2039 2116 $WANT_REFRESH->stop;
2040 CFPlus::SDL_GL_SwapBuffers;
2041} 2117}
2042 2118
2119$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2120
2043my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2121my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2044 $NOW = time; 2122 $NOW = time;
2045 2123
2046 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2124 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2047 for CFPlus::poll_events; 2125 for CFPlus::poll_events;
2048 2126
2049 if (%animate_object) { 2127 if (%animate_object) {
2050 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2128 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2051 ++$WANT_REFRESH; 2129 $WANT_REFRESH->start;
2052 }
2053
2054 if ($WANT_REFRESH) {
2055 force_refresh;
2056 } else {
2057 $CAN_REFRESH = 1;
2058 } 2130 }
2059}); 2131});
2060 2132
2061sub animation_start { 2133sub animation_start {
2062 my ($widget) = @_; 2134 my ($widget) = @_;
… …
2120 2192
2121 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2122 sdl_mode => 0, 2194 sdl_mode => 0,
2123 fullscreen => 0, 2195 fullscreen => 0,
2124 fast => 0, 2196 fast => 0,
2197 opengl11 => 0,
2125 map_scale => 1, 2198 map_scale => 1,
2126 fow_enable => 1, 2199 fow_enable => 1,
2127 fow_intensity => 0, 2200 fow_intensity => 0,
2128 map_smoothing => 1, 2201 map_smoothing => 1,
2129 gui_fontsize => 1, 2202 gui_fontsize => 1,
… …
2218} 2291}
2219 2292
2220show_tip_of_the_day if $CFG->{show_tips}; 2293show_tip_of_the_day if $CFG->{show_tips};
2221 2294
2222Event::loop; 2295Event::loop;
2296
2297#video_shutdown;
2298#audio_shutdown;
2223#CFPlus::SDL_Quit; 2299CFPlus::SDL_Quit;
2224#CFPlus::_exit 0;
2225
2226END {
2227 CFPlus::SDL_Quit;
2228 CFPlus::DB::Server::stop; 2300CFPlus::DB::Server::stop;
2229}
2230 2301
2231=head1 NAME 2302=head1 NAME
2232 2303
2233cfplus - A Crossfire+ and Crossfire game client 2304cfplus - A Crossfire TRT and Crossfire game client
2234 2305
2235=head1 SYNOPSIS 2306=head1 SYNOPSIS
2236 2307
2237Just run it - no commandline arguments are supported. 2308Just run it - no commandline arguments are supported.
2238 2309
2239=head1 USAGE 2310=head1 USAGE
2240 2311
2241cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2312cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2242fullscreen and interactively. 2313be used in fullscreen mode and interactively.
2243 2314
2244=head1 DEBUGGING 2315=head1 DEBUGGING
2245 2316
2246 2317
2247CFPLUS_DEBUG - environment variable 2318CFPLUS_DEBUG - environment variable

Diff Legend

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