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.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;
… …
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->{face}[$face]
234 or return; 234 or return;
235 235
236 $meta->{data}
237 or return;
238
236 # if its a jingle, play it as ambient music 239 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) { 240 if ($meta->{data}{jingle}) {
238 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
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face); 243 &audio_music_push ($face);
244 }
241 } else { 245 } else {
242 # fetch from database 246 # fetch from database
243 CFPlus::DB::get res_data => $meta->{name}, sub { 247 CFPlus::DB::get res_data => $meta->{name}, sub {
244 my $rwops = new CFPlus::RW $_[0]; 248 my $rwops = new CFPlus::RW $_[0];
245 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;
246 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
247 $AUDIO_CHUNK{$face} = $chunk; 252 $AUDIO_CHUNK{$face} = $chunk;
248 253
249 audio_sound_push ($face); 254 audio_sound_push ($face);
250 }; 255 };
251 } 256 }
… …
255sub audio_sound_play { 260sub audio_sound_play {
256 my ($face, $dx, $dy, $vol) = @_; 261 my ($face, $dx, $dy, $vol) = @_;
257 262
258 $SDL_MIXER 263 $SDL_MIXER
259 or return; 264 or return;
265 $CFG->{effects_enable}
266 or return;
260 267
261 my $queue = $AUDIO_PLAY{$face} ||= []; 268 my $queue = $AUDIO_PLAY{$face} ||= [];
262 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
263 audio_sound_push $face 270 audio_sound_push $face
264 unless @$queue > 1; 271 unless @$queue > 1;
265} 272}
266 273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
267sub audio_music_update_volume { 286sub audio_music_update_volume {
268 return unless $MUSIC_PLAYING_META; 287 return unless $MUSIC_PLAYING_META;
269 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
270 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
271 CFPlus::MixMusic::volume $base * $volume * 128; 290 CFPlus::MixMusic::volume $base * $volume * 128;
272} 291}
273 292
274sub audio_music_start { 293sub audio_music_start {
275 my $meta = $MUSIC_PLAYING_META; 294 my $meta = $MUSIC_PLAYING_META;
… …
288 my $rwops = $meta->{path} 307 my $rwops = $meta->{path}
289 ? new_from_file CFPlus::RW $meta->{path} 308 ? new_from_file CFPlus::RW $meta->{path}
290 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
291 310
292 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
293 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
294 313
295 my $NOW = time; 314 my $NOW = time;
296 315
297 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
298 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
301 } else { 320 } else {
302 $MUSIC_PLAYER->play (0); 321 $MUSIC_PLAYER->play (0);
303 $MUSIC_START = time; 322 $MUSIC_START = time;
304 } 323 }
305 324
306 delete $MUSIC_PLAYING_META->{stop_time}; 325 delete $meta->{stop_time};
307 delete $MUSIC_PLAYING_META->{stop_pos}; 326 delete $meta->{stop_pos};
308 } 327 }
309} 328}
310 329
311sub audio_music_push { 330sub audio_music_push {
312 return unless $SDL_MIXER; 331 return unless $SDL_MIXER;
… …
318 $fade_out = 333; 337 $fade_out = 333;
319 } else { 338 } else {
320 return unless $CFG->{bgm_enable}; 339 return unless $CFG->{bgm_enable};
321 340
322 my @have = 341 my @have =
323 grep $_, 342 grep $_ && $_->{data},
324 map $CONN->{music_meta}{$_}, 343 map $CONN->{face}[$_],
325 @$MUSIC_WANT; 344 @$MUSIC_WANT;
326 345
327 @MUSIC_HAVE = @have 346 @MUSIC_HAVE = @have
328 if @have; 347 if @have;
329 348
… …
331 @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;
332 $fade_out = 1000; 351 $fade_out = 1000;
333 } 352 }
334 353
335 # if the currently playing song is acceptable, let it continue 354 # if the currently playing song is acceptable, let it continue
336 return if $MUSIC_PLAYING_META
337 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
338 356
339 my $NOW = time; 357 my $NOW = time;
340 358
341 if ($MUSIC_PLAYING_META) { 359 if ($MUSIC_PLAYING_META) {
342 $MUSIC_PLAYING_META->{stop_time} = $NOW; 360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
346 # sort by stop time, oldest first 364 # sort by stop time, oldest first
347 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
348 366
349 # if the most recently-played piece played very recently, 367 # if the most recently-played piece played very recently,
350 # resume it, else choose the oldest piece for rotation. 368 # resume it, else choose the oldest piece for rotation.
351 $MUSIC_PLAYING_META = 369 audio_music_set_meta
352 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
353 ? $MUSIC_HAVE[-1] 371 ? $MUSIC_HAVE[-1]
354 : $MUSIC_HAVE[0]; 372 : $MUSIC_HAVE[0];
355 373
356 audio_music_start; 374 audio_music_start;
… …
366 384
367sub audio_music_finished { 385sub audio_music_finished {
368 # we compress multiple jingles of the same type 386 # we compress multiple jingles of the same type
369 shift @MUSIC_JINGLE 387 shift @MUSIC_JINGLE
370 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
371 391
372 undef $MUSIC_PLAYER; 392 undef $MUSIC_PLAYER;
373 undef $MUSIC_PLAYING_META; 393 undef $MUSIC_PLAYING_META;
374 undef $MUSIC_PLAYING_DATA; 394 undef $MUSIC_PLAYING_DATA;
375 395
… …
750 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
751 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
752 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
753 ); 773 );
754 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
755 $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");
756 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
757 state => $CFG->{fast}, 799 state => $CFG->{fast},
758 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
759 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
785 827
786 $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");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
789 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. "
790 . "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. "
791 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
792 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
793 ); 835 );
794 836
795 $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");
796 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
807 ); 849 );
808 850
809 $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");
810 $table->add_at (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
811 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 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.", 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.",
813 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 },
814 ); 857 );
815 858
816 $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");
817 $table->add_at (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
839} 882}
840 883
841sub audio_setup { 884sub audio_setup {
842 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
843 886
844 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
845 888
846 my $row = 0; 889 my $row = 0;
847 890
848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $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 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
853 ); 896 );
854# $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");
855# $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 {
856# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
857# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
858 $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");
859 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
860 $hbox->add (new CFPlus::UI::CheckBox
861 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
862 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.",
863 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 }
864 ); 929 );
865 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
866 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
867 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
868 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 }
869 ); 934 );
870 935
871 $table->add_at (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
872 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
873 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
874 on_activate => sub { 939 on_activate => sub {
875 audio_shutdown (); 940 audio_shutdown ();
876 audio_init (); 941 audio_init ();
877 0 942 0
… …
948 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1013 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
949 1014
950 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1015 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
951 1016
952 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1017 $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); 1018 $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); 1019 $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); 1020 $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); 1021 $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"); 1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
958 1023
959 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
960 1025
961 $c->add_items ({ 1026 $c->add_items ({
… …
1557 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1558 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1559 1624
1560 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1561 1626
1562 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1563 1628
1564 $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);
1565 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1566 1631
1567 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1568 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1569 1634
1570 $hb 1635 $hb
1636}
1637
1638sub media_window {
1639 my $vb = new CFPlus::UI::VBox;
1640
1641 $vb->add (new CFPlus::UI::FancyFrame
1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1645 );
1646
1647 $vb->add (new CFPlus::UI::FancyFrame
1648 label => "Other media used in this session",
1649 expand => 1,
1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1652 );
1653
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;
1571} 1676}
1572 1677
1573sub toggle_player_page { 1678sub toggle_player_page {
1574 my ($widget) = @_; 1679 my ($widget) = @_;
1575 1680
… …
1614 $ntb->add_tab ( 1719 $ntb->add_tab (
1615 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1616 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1721 "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." 1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1618 ); 1723 );
1619 $ntb->add_tab (Pickup => autopickup_setup, 1724 $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."); 1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726
1727 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server.");
1621 1729
1622 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1623 1731
1624 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1625 $plwin 1733 $plwin
… …
1779 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1780 ); 1888 );
1781 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1782 text => "Quit anyway", 1890 text => "Quit anyway",
1783 expand => 1, 1891 expand => 1,
1784 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1785 ); 1893 );
1786 } 1894 }
1787 1895
1788 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1789 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1983 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1984 on_activate => sub { 2092 on_activate => sub {
1985 if ($CONN) { 2093 if ($CONN) {
1986 open_quit_dialog; 2094 open_quit_dialog;
1987 } else { 2095 } else {
1988 exit; 2096 Event::unloop_all;
1989 } 2097 }
1990 0 2098 0
1991 }, 2099 },
1992 ); 2100 );
1993 2101
1994 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1995 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1996 } 2105 }
1997 2106
1998 $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]);
1999} 2108}
2000 2109
… …
2008my $animate_timer; 2117my $animate_timer;
2009 2118
2010my $fps = 9; 2119my $fps = 9;
2011 2120
2012sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2013 $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;
2014 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2015 2126
2016 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2017 2128 CFPlus::SDL_GL_SwapBuffers;
2018 $WANT_REFRESH = 0;
2019 $CAN_REFRESH = 0;
2020 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2021 2130 $WANT_REFRESH->stop;
2022 CFPlus::SDL_GL_SwapBuffers;
2023} 2131}
2024 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2025my $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 {
2026 $NOW = time; 2136 $NOW = time;
2027 2137
2028 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2029 for CFPlus::poll_events; 2139 for CFPlus::poll_events;
2030 2140
2031 if (%animate_object) { 2141 if (%animate_object) {
2032 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2033 ++$WANT_REFRESH; 2143 $WANT_REFRESH->start;
2034 }
2035
2036 if ($WANT_REFRESH) {
2037 force_refresh;
2038 } else {
2039 $CAN_REFRESH = 1;
2040 } 2144 }
2041}); 2145});
2042 2146
2043sub animation_start { 2147sub animation_start {
2044 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2099 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2100 2204
2101 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2102 2206
2103 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2104 sdl_mode => 0, 2208 sdl_mode => 0,
2105 fullscreen => 0, 2209 fullscreen => 0,
2106 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2107 map_scale => 1, 2213 map_scale => 1,
2108 fow_enable => 1, 2214 fow_enable => 1,
2109 fow_intensity => 0, 2215 fow_intensity => 0,
2110 map_smoothing => 1, 2216 map_smoothing => 1,
2111 gui_fontsize => 1, 2217 gui_fontsize => 1,
2112 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2113 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2114 gauge_size => 0.35, 2220 gauge_size => 0.35,
2115 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2116 mapsize => 100, 2222 mapsize => 100,
2117 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2118 bgm_enable => 1, 2226 bgm_enable => 1,
2119 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2120 output_sync => 1, 2228 output_sync => 1,
2121 output_count => 1, 2229 output_count => 1,
2122 output_rate => "", 2230 output_rate => "",
2123 pickup => 0, 2231 pickup => 0,
2124 inv_sort => "mtime", 2232 inv_sort => "mtime",
2125 default => "profile", # default profile 2233 default => "profile", # default profile
2126 show_tips => 1, 2234 show_tips => 1,
2127 logview_max_par => 1000, 2235 logview_max_par => 1000,
2128 ); 2236 );
2129 2237
2130 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2131 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2132 } 2240 }
… …
2198} 2306}
2199 2307
2200show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2201 2309
2202Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2203#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2204#CFPlus::_exit 0;
2205
2206END {
2207 CFPlus::SDL_Quit;
2208 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2209}
2210 2316
2211=head1 NAME 2317=head1 NAME
2212 2318
2213cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2214 2320
2215=head1 SYNOPSIS 2321=head1 SYNOPSIS
2216 2322
2217Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2218 2324
2219=head1 USAGE 2325=head1 USAGE
2220 2326
2221cfplus 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
2222fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2223 2329
2224=head1 DEBUGGING 2330=head1 DEBUGGING
2225 2331
2226 2332
2227CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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