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.216 by root, Sun Aug 19 12:56:24 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]);
… …
211} 211}
212 212
213sub audio_sound_push($) { 213sub audio_sound_push($) {
214 my ($face) = @_; 214 my ($face) = @_;
215 215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
216 if (my $chunk = $AUDIO_CHUNK{$face}) { 222 if (my $chunk = $AUDIO_CHUNK{$face}) {
217 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
218 my (undef, $dx, $dy, $vol) = @$_; 224 my (undef, $dx, $dy, $vol) = @$_;
219 225
220 my $channel = CFPlus::Channel::find; 226 my $channel = CFPlus::Channel::find;
221 $channel->volume ($vol * 128 / 255); 227 $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); 228 $channel->set_position_r ($dx, $dy, 20);
228
229 $chunk->play ($channel); 229 $chunk->play ($channel);
230 } 230 }
231 } else { 231 } else {
232 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{sound_meta}{$face}
234 or return; 234 or return;
235 235
236 # if its a jingle, play it as ambient music 236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) { 237 if ($meta->{meta}{jingle}) {
238 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
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face); 240 &audio_music_push ($face);
241 }
241 } else { 242 } else {
242 # fetch from database 243 # fetch from database
243 CFPlus::DB::get res_data => $meta->{name}, sub { 244 CFPlus::DB::get res_data => $meta->{name}, sub {
244 my $rwops = new CFPlus::RW $_[0]; 245 my $rwops = new CFPlus::RW $_[0];
245 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;
246 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
247 $AUDIO_CHUNK{$face} = $chunk; 249 $AUDIO_CHUNK{$face} = $chunk;
248 250
249 audio_sound_push ($face); 251 audio_sound_push ($face);
250 }; 252 };
… …
255sub audio_sound_play { 257sub audio_sound_play {
256 my ($face, $dx, $dy, $vol) = @_; 258 my ($face, $dx, $dy, $vol) = @_;
257 259
258 $SDL_MIXER 260 $SDL_MIXER
259 or return; 261 or return;
262 $CFG->{effects_enable}
263 or return;
260 264
261 my $queue = $AUDIO_PLAY{$face} ||= []; 265 my $queue = $AUDIO_PLAY{$face} ||= [];
262 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
263 audio_sound_push $face 267 audio_sound_push $face
264 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 );
265} 281}
266 282
267sub audio_music_update_volume { 283sub audio_music_update_volume {
268 return unless $MUSIC_PLAYING_META; 284 return unless $MUSIC_PLAYING_META;
269 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
… …
288 my $rwops = $meta->{path} 304 my $rwops = $meta->{path}
289 ? new_from_file CFPlus::RW $meta->{path} 305 ? new_from_file CFPlus::RW $meta->{path}
290 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
291 307
292 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
293 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
294 310
295 my $NOW = time; 311 my $NOW = time;
296 312
297 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
298 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
301 } else { 317 } else {
302 $MUSIC_PLAYER->play (0); 318 $MUSIC_PLAYER->play (0);
303 $MUSIC_START = time; 319 $MUSIC_START = time;
304 } 320 }
305 321
306 delete $MUSIC_PLAYING_META->{stop_time}; 322 delete $meta->{stop_time};
307 delete $MUSIC_PLAYING_META->{stop_pos}; 323 delete $meta->{stop_pos};
308 } 324 }
309} 325}
310 326
311sub audio_music_push { 327sub audio_music_push {
312 return unless $SDL_MIXER; 328 return unless $SDL_MIXER;
… …
331 @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;
332 $fade_out = 1000; 348 $fade_out = 1000;
333 } 349 }
334 350
335 # if the currently playing song is acceptable, let it continue 351 # if the currently playing song is acceptable, let it continue
336 return if $MUSIC_PLAYING_META
337 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
338 353
339 my $NOW = time; 354 my $NOW = time;
340 355
341 if ($MUSIC_PLAYING_META) { 356 if ($MUSIC_PLAYING_META) {
342 $MUSIC_PLAYING_META->{stop_time} = $NOW; 357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
346 # sort by stop time, oldest first 361 # sort by stop time, oldest first
347 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
348 363
349 # if the most recently-played piece played very recently, 364 # if the most recently-played piece played very recently,
350 # resume it, else choose the oldest piece for rotation. 365 # resume it, else choose the oldest piece for rotation.
351 $MUSIC_PLAYING_META = 366 audio_music_set_meta
352 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
353 ? $MUSIC_HAVE[-1] 368 ? $MUSIC_HAVE[-1]
354 : $MUSIC_HAVE[0]; 369 : $MUSIC_HAVE[0];
355 370
356 audio_music_start; 371 audio_music_start;
… …
366 381
367sub audio_music_finished { 382sub audio_music_finished {
368 # we compress multiple jingles of the same type 383 # we compress multiple jingles of the same type
369 shift @MUSIC_JINGLE 384 shift @MUSIC_JINGLE
370 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;
371 388
372 undef $MUSIC_PLAYER; 389 undef $MUSIC_PLAYER;
373 undef $MUSIC_PLAYING_META; 390 undef $MUSIC_PLAYING_META;
374 undef $MUSIC_PLAYING_DATA; 391 undef $MUSIC_PLAYING_DATA;
375 392
… …
750 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
751 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
752 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
753 ); 770 );
754 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->{force_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->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
791 );
792
755 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 793 $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 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
757 state => $CFG->{fast}, 795 state => $CFG->{fast},
758 tooltip => "Lower the visual quality considerably to speed up rendering.", 796 tooltip => "Lower the visual quality considerably to speed up rendering.",
759 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 797 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
785 823
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 824 $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 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{map_smoothing}, 826 state => $CFG->{map_smoothing},
789 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 827 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. " 828 . "This increases load on the graphics subsystem and works only with TRT servers. "
791 . "Changes take effect at next connection only.", 829 . "Changes take effect at next login only.",
792 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
793 ); 831 );
794 832
795 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 833 $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 834 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
807 ); 845 );
808 846
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 847 $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 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
811 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 849 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.", 850 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
851 . "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 }, 852 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
814 ); 853 );
815 854
816 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 855 $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 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
839} 878}
840 879
841sub audio_setup { 880sub audio_setup {
842 my $vbox = new CFPlus::UI::VBox; 881 my $vbox = new CFPlus::UI::VBox;
843 882
844 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 883 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
845 884
846 my $row = 0; 885 my $row = 0;
847 886
848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 887 $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 888 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
853 ); 892 );
854# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 893# $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 { 894# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
856# $CFG->{effects_volume} = $_[1]; 895# $CFG->{effects_volume} = $_[1];
857# }); 896# });
897
898 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
899 $table->add_at (1, $row, new CFPlus::UI::CheckBox
900 expand => 1, state => $CFG->{effects_enable},
901 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
902 on_changed => sub {
903 $CFG->{effects_enable} = $_[1];
904 $CONN->update_fx_want if $CONN;
905 0
906 }
907 );
908 $table->add_at (2, $row++, new CFPlus::UI::Slider
909 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
910 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
911 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
912 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
913 );
914
858 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 915 $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); 916 $table->add_at (1, $row, new CFPlus::UI::CheckBox
860 $hbox->add (new CFPlus::UI::CheckBox
861 expand => 1, state => $CFG->{bgm_enable}, 917 expand => 1, state => $CFG->{bgm_enable},
862 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 918 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 } 919 on_changed => sub {
920 $CFG->{bgm_enable} = $_[1];
921 $CONN->update_fx_want if $CONN;
922 0
923 }
864 ); 924 );
865 $hbox->add (new CFPlus::UI::Slider 925 $table->add_at (2, $row++, new CFPlus::UI::Slider
866 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 926 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
867 tooltip => "The volume of the background music. Changes are instant.", 927 tooltip => "The volume of the background music. Changes are instant.",
868 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 928 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
869 ); 929 );
870 930
871 $table->add_at (1, $row++, new CFPlus::UI::Button 931 $table->add_at (1, $row++, new CFPlus::UI::Button
872 expand => 1, align => 0, text => "Apply", 932 c_colspan => 2, expand => 1, align => 0, text => "Apply",
873 tooltip => "Apply the audio settings", 933 tooltip => "Apply the audio settings",
874 on_activate => sub { 934 on_activate => sub {
875 audio_shutdown (); 935 audio_shutdown ();
876 audio_init (); 936 audio_init ();
877 0 937 0
… …
948 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1008 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
949 1009
950 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1010 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
951 1011
952 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1012 $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); 1013 $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); 1014 $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); 1015 $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); 1016 $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"); 1017 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
958 1018
959 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1019 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
960 1020
961 $c->add_items ({ 1021 $c->add_items ({
… …
1557 $sw1->add ($INV = new CFPlus::UI::Inventory); 1617 $sw1->add ($INV = new CFPlus::UI::Inventory);
1558 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1618 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1559 1619
1560 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1620 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1561 1621
1562 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1622 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1563 1623
1564 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1624 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1565 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1625 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1566 1626
1567 # XXX: Call after $INVR = ... because set_opencont sets the items 1627 # XXX: Call after $INVR = ... because set_opencont sets the items
1568 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1628 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1569 1629
1570 $hb 1630 $hb
1631}
1632
1633sub media_window {
1634 my $vb = new CFPlus::UI::VBox;
1635
1636 $vb->add (new CFPlus::UI::FancyFrame
1637 label => "Currently playing music",
1638 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1639 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1640 );
1641
1642 $vb->add (new CFPlus::UI::FancyFrame
1643 label => "Other media used in this session",
1644 expand => 1,
1645 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1647 );
1648
1649 $vb
1650}
1651
1652sub add_license {
1653 my ($meta) = @_;
1654
1655 $meta = $meta->{meta}
1656 or return;
1657
1658 $meta->{license} || $meta->{author} || $meta->{source}
1659 or return;
1660
1661 $LICENSE_WIDGET->add_paragraph ({
1662 fg => [1, 1, 1, 1],
1663 markup => "<small>"
1664 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1665 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1666 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1667 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1668 . "</small>",
1669 });
1670 $LICENSE_WIDGET->scroll_to_bottom;
1571} 1671}
1572 1672
1573sub toggle_player_page { 1673sub toggle_player_page {
1574 my ($widget) = @_; 1674 my ($widget) = @_;
1575 1675
… …
1614 $ntb->add_tab ( 1714 $ntb->add_tab (
1615 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1715 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1616 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 "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." 1717 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1618 ); 1718 );
1619 $ntb->add_tab (Pickup => autopickup_setup, 1719 $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."); 1720 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1721
1722 $ntb->add_tab (Media => media_window,
1723 "License, Author and Source info for media sent by the server.");
1621 1724
1622 $ntb->set_current_page ($INVENTORY_PAGE); 1725 $ntb->set_current_page ($INVENTORY_PAGE);
1623 1726
1624 $plwin->add ($ntb); 1727 $plwin->add ($ntb);
1625 $plwin 1728 $plwin
… …
1779 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1882 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1780 ); 1883 );
1781 $hb->add (new CFPlus::UI::Button 1884 $hb->add (new CFPlus::UI::Button
1782 text => "Quit anyway", 1885 text => "Quit anyway",
1783 expand => 1, 1886 expand => 1,
1784 on_activate => sub { exit }, 1887 on_activate => sub { Event::unloop_all },
1785 ); 1888 );
1786 } 1889 }
1787 1890
1788 $QUIT_DIALOG->show; 1891 $QUIT_DIALOG->show;
1789 $QUIT_DIALOG->grab_focus; 1892 $QUIT_DIALOG->grab_focus;
… …
1983 tooltip => "Terminates the program", 2086 tooltip => "Terminates the program",
1984 on_activate => sub { 2087 on_activate => sub {
1985 if ($CONN) { 2088 if ($CONN) {
1986 open_quit_dialog; 2089 open_quit_dialog;
1987 } else { 2090 } else {
1988 exit; 2091 Event::unloop_all;
1989 } 2092 }
1990 0 2093 0
1991 }, 2094 },
1992 ); 2095 );
1993 2096
1994 $BUTTONBAR->show; 2097 $BUTTONBAR->show;
1995 $SETUP_DIALOG->show; 2098 $SETUP_DIALOG->show;
2099 $MESSAGE_WINDOW->show;
1996 } 2100 }
1997 2101
1998 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2102 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1999} 2103}
2000 2104
… …
2008my $animate_timer; 2112my $animate_timer;
2009 2113
2010my $fps = 9; 2114my $fps = 9;
2011 2115
2012sub force_refresh { 2116sub force_refresh {
2117 if ($ENV{CFPLUS_DEBUG} & 4) {
2013 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2118 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2014 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2119 debug sprintf "%3.2f", $fps;
2120 }
2015 2121
2016 $CFPlus::UI::ROOT->draw; 2122 $CFPlus::UI::ROOT->draw;
2017 2123 CFPlus::SDL_GL_SwapBuffers;
2018 $WANT_REFRESH = 0;
2019 $CAN_REFRESH = 0;
2020 $LAST_REFRESH = $NOW; 2124 $LAST_REFRESH = $NOW;
2021 2125 $WANT_REFRESH->stop;
2022 CFPlus::SDL_GL_SwapBuffers;
2023} 2126}
2024 2127
2128$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2129
2025my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2130my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2026 $NOW = time; 2131 $NOW = time;
2027 2132
2028 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2133 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2029 for CFPlus::poll_events; 2134 for CFPlus::poll_events;
2030 2135
2031 if (%animate_object) { 2136 if (%animate_object) {
2032 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2137 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2033 ++$WANT_REFRESH; 2138 $WANT_REFRESH->start;
2034 }
2035
2036 if ($WANT_REFRESH) {
2037 force_refresh;
2038 } else {
2039 $CAN_REFRESH = 1;
2040 } 2139 }
2041}); 2140});
2042 2141
2043sub animation_start { 2142sub animation_start {
2044 my ($widget) = @_; 2143 my ($widget) = @_;
… …
2099 CFPlus::DB::Server::run; 2198 CFPlus::DB::Server::run;
2100 2199
2101 CFPlus::UI::set_layout ($::CFG->{layout}); 2200 CFPlus::UI::set_layout ($::CFG->{layout});
2102 2201
2103 my %DEF_CFG = ( 2202 my %DEF_CFG = (
2104 sdl_mode => 0, 2203 sdl_mode => 0,
2105 fullscreen => 0, 2204 fullscreen => 0,
2106 fast => 0, 2205 fast => 0,
2206 force_opengl11 => 0,
2207 texture_compression => 1,
2107 map_scale => 1, 2208 map_scale => 1,
2108 fow_enable => 1, 2209 fow_enable => 1,
2109 fow_intensity => 0, 2210 fow_intensity => 0,
2110 map_smoothing => 1, 2211 map_smoothing => 1,
2111 gui_fontsize => 1, 2212 gui_fontsize => 1,
2112 log_fontsize => 0.7, 2213 log_fontsize => 0.7,
2113 gauge_fontsize => 1, 2214 gauge_fontsize => 1,
2114 gauge_size => 0.35, 2215 gauge_size => 0.35,
2115 stat_fontsize => 0.7, 2216 stat_fontsize => 0.7,
2116 mapsize => 100, 2217 mapsize => 100,
2117 audio_enable => 1, 2218 audio_enable => 1,
2219 effects_enable => 1,
2220 effects_volume => 1,
2118 bgm_enable => 1, 2221 bgm_enable => 1,
2119 bgm_volume => 0.25, 2222 bgm_volume => 0.5,
2120 output_sync => 1, 2223 output_sync => 1,
2121 output_count => 1, 2224 output_count => 1,
2122 output_rate => "", 2225 output_rate => "",
2123 pickup => 0, 2226 pickup => 0,
2124 inv_sort => "mtime", 2227 inv_sort => "mtime",
2125 default => "profile", # default profile 2228 default => "profile", # default profile
2126 show_tips => 1, 2229 show_tips => 1,
2127 logview_max_par => 1000, 2230 logview_max_par => 1000,
2128 ); 2231 );
2129 2232
2130 while (my ($k, $v) = each %DEF_CFG) { 2233 while (my ($k, $v) = each %DEF_CFG) {
2131 $CFG->{$k} = $v unless exists $CFG->{$k}; 2234 $CFG->{$k} = $v unless exists $CFG->{$k};
2132 } 2235 }
… …
2198} 2301}
2199 2302
2200show_tip_of_the_day if $CFG->{show_tips}; 2303show_tip_of_the_day if $CFG->{show_tips};
2201 2304
2202Event::loop; 2305Event::loop;
2306
2307#video_shutdown;
2308#audio_shutdown;
2203#CFPlus::SDL_Quit; 2309CFPlus::SDL_Quit;
2204#CFPlus::_exit 0;
2205
2206END {
2207 CFPlus::SDL_Quit;
2208 CFPlus::DB::Server::stop; 2310CFPlus::DB::Server::stop;
2209}
2210 2311
2211=head1 NAME 2312=head1 NAME
2212 2313
2213cfplus - A Crossfire+ and Crossfire game client 2314cfplus - A Crossfire TRT and Crossfire game client
2214 2315
2215=head1 SYNOPSIS 2316=head1 SYNOPSIS
2216 2317
2217Just run it - no commandline arguments are supported. 2318Just run it - no commandline arguments are supported.
2218 2319
2219=head1 USAGE 2320=head1 USAGE
2220 2321
2221cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2322cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2222fullscreen and interactively. 2323be used in fullscreen mode and interactively.
2223 2324
2224=head1 DEBUGGING 2325=head1 DEBUGGING
2225 2326
2226 2327
2227CFPLUS_DEBUG - environment variable 2328CFPLUS_DEBUG - environment variable

Diff Legend

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