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.197 by root, Tue Jul 31 02:25:52 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;
… …
159our $STATWIDS; 161our $STATWIDS;
160 162
161our $SDL_ACTIVE; 163our $SDL_ACTIVE;
162our %SDL_CB; 164our %SDL_CB;
163 165
166our $ALT_ENTER_MESSAGE;
167our $STATUSBOX;
168our $DEBUG_STATUS;
169
170our $INV;
171our $INVR;
172our $INVR_HB;
173
174#############################################################################
175
176sub status {
177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
178}
179
180sub debug {
181 $DEBUG_STATUS->set_text ($_[0]);
182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
164our $SDL_MIXER; 192our $SDL_MIXER;
193
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music 195our $MUSIC_WANT; # arryref of ambient music we want to play
167our @MUSIC_HAVE; # ambient music we want now 196our @MUSIC_HAVE; # ambient music we have on disk
168our $MUSIC_START; 197our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play 198our @MUSIC_JINGLE; # which jingles to play next
170our $MUSIC_PLAYING_DATA; 199our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META; 200our $MUSIC_PLAYING_META;
172our $MUSIC_PLAYER; 201our $MUSIC_PLAYER;
173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
174our @SOUNDS; # event => file mapping 203
175our %AUDIO_CHUNK; # audio files 204our %AUDIO_CHUNK; # audio "files"
176 205our %AUDIO_PLAY; # which audio faces should be played
177our $ALT_ENTER_MESSAGE;
178our $STATUSBOX;
179our $DEBUG_STATUS;
180
181our $INV;
182our $INVR;
183our $INV_RIGHT_HB;
184
185our $PICKUP_CFG;
186
187#############################################################################
188#TODO: maybe move into own audio module...
189 206
190sub audio_channel_finished { 207sub audio_channel_finished {
191 my ($channel) = @_; 208 my ($channel) = @_;
192 209
193# warn "channel $channel finished\n";#d# 210# warn "channel $channel finished\n";#d#
194} 211}
195 212
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) { 213sub audio_sound_push($) {
200 my ($face) = @_; 214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
201 221
202 if (my $chunk = $AUDIO_CHUNK{$face}) { 222 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_; 224 my (undef, $dx, $dy, $vol) = @$_;
205 225
206 my $channel = CFPlus::Channel::find; 226 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255); 227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance); 228 $channel->set_position_r ($dx, $dy, 20);
214
215 $chunk->play ($channel); 229 $chunk->play ($channel);
216 } 230 }
217 } else { 231 } else {
218 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{face}[$face]
220 or return; 234 or return;
221 235
236 $meta->{data}
237 or return;
238
222 # if its a jingle, play it as ambient music 239 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) { 240 if ($meta->{data}{jingle}) {
224 push @MUSIC_JINGLE, $meta; 241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
225 delete $AUDIO_PLAY{$face}; 242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
226 &audio_music_push ($face); 243 &audio_music_push ($face);
244 }
227 } else { 245 } else {
228 # fetch from database 246 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub { 247 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0]; 248 my $rwops = new CFPlus::RW $_[0];
231 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;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk; 252 $AUDIO_CHUNK{$face} = $chunk;
234 253
235 audio_sound_push ($face); 254 audio_sound_push ($face);
236 }; 255 };
237 } 256 }
… …
241sub audio_sound_play { 260sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_; 261 my ($face, $dx, $dy, $vol) = @_;
243 262
244 $SDL_MIXER 263 $SDL_MIXER
245 or return; 264 or return;
265 $CFG->{effects_enable}
266 or return;
246 267
247 my $queue = $AUDIO_PLAY{$face} ||= []; 268 my $queue = $AUDIO_PLAY{$face} ||= [];
248 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
249 audio_sound_push $face 270 audio_sound_push $face
250 unless @$queue > 1; 271 unless @$queue > 1;
251} 272}
252 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
253sub audio_music_update_volume { 286sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META; 287 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
256 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
257 CFPlus::MixMusic::volume $base * $volume * 128; 290 CFPlus::MixMusic::volume $base * $volume * 128;
258} 291}
259 292
260sub audio_music_start { 293sub audio_music_start {
261 my $meta = $MUSIC_PLAYING_META; 294 my $meta = $MUSIC_PLAYING_META;
… …
274 my $rwops = $meta->{path} 307 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path} 308 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277 310
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
280 313
281 my $NOW = time; 314 my $NOW = time;
282 315
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
287 } else { 320 } else {
288 $MUSIC_PLAYER->play (0); 321 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time; 322 $MUSIC_START = time;
290 } 323 }
291 324
292 delete $MUSIC_PLAYING_META->{stop_time}; 325 delete $meta->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos}; 326 delete $meta->{stop_pos};
294 } 327 }
295} 328}
296 329
297sub audio_music_push { 330sub audio_music_push {
298 return unless $SDL_MIXER; 331 return unless $SDL_MIXER;
… …
304 $fade_out = 333; 337 $fade_out = 333;
305 } else { 338 } else {
306 return unless $CFG->{bgm_enable}; 339 return unless $CFG->{bgm_enable};
307 340
308 my @have = 341 my @have =
309 grep $_, 342 grep $_ && $_->{data},
310 map $CONN->{music_meta}{$_}, 343 map $CONN->{face}[$_],
311 @$MUSIC_WANT; 344 @$MUSIC_WANT;
312 345
313 @MUSIC_HAVE = @have 346 @MUSIC_HAVE = @have
314 if @have; 347 if @have;
315 348
… …
317 @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;
318 $fade_out = 1000; 351 $fade_out = 1000;
319 } 352 }
320 353
321 # if the currently playing song is acceptable, let it continue 354 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324 356
325 my $NOW = time; 357 my $NOW = time;
326 358
327 if ($MUSIC_PLAYING_META) { 359 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW; 360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
332 # sort by stop time, oldest first 364 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334 366
335 # if the most recently-played piece played very recently, 367 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation. 368 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META = 369 audio_music_set_meta
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1] 371 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0]; 372 : $MUSIC_HAVE[0];
341 373
342 audio_music_start; 374 audio_music_start;
… …
349 $MUSIC_WANT = $songs; 381 $MUSIC_WANT = $songs;
350 audio_music_push; 382 audio_music_push;
351} 383}
352 384
353sub audio_music_finished { 385sub audio_music_finished {
386 # we compress multiple jingles of the same type
354 shift @MUSIC_JINGLE 387 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
356 391
357 undef $MUSIC_PLAYER; 392 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META; 393 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA; 394 undef $MUSIC_PLAYING_DATA;
360 395
361 audio_music_push; 396 audio_music_push;
362} 397}
363 398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
364############################################################################# 431#############################################################################
365
366sub status {
367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
368}
369
370sub debug {
371 $DEBUG_STATUS->set_text ($_[0]);
372}
373
374sub message {
375 my ($para) = @_;
376 $MESSAGE_WINDOW->message ($para);
377}
378 432
379sub destroy_query_dialog { 433sub destroy_query_dialog {
380 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
381 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
382} 436}
… …
716 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
717 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
718 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
719 ); 773 );
720 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
721 $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");
722 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
723 state => $CFG->{fast}, 799 state => $CFG->{fast},
724 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
725 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
751 827
752 $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");
753 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
754 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
755 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. "
756 . "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. "
757 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
758 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
759 ); 835 );
760 836
761 $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");
762 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
773 ); 849 );
774 850
775 $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");
776 $table->add_at (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
777 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
778 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.",
779 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 },
780 ); 857 );
781 858
782 $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");
783 $table->add_at (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
805} 882}
806 883
807sub audio_setup { 884sub audio_setup {
808 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
809 886
810 $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]);
811 888
812 my $row = 0; 889 my $row = 0;
813 890
814 $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");
815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
819 ); 896 );
820# $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");
821# $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 {
822# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
823# }); 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
824 $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");
825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
826 $hbox->add (new CFPlus::UI::CheckBox
827 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
828 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.",
829 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 }
830 ); 929 );
831 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
833 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
834 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 }
835 ); 934 );
836 935
837 $table->add_at (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
838 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
839 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
840 on_activate => sub { 939 on_activate => sub {
841 audio_shutdown (); 940 audio_shutdown ();
842 audio_init (); 941 audio_init ();
843 0 942 0
… …
914 $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() } );
915 1014
916 $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#
917 1016
918 $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);
919 $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);
920 $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);
921 $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);
922 $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);
923 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
924 1023
925 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
926 1025
927 $c->add_items ({ 1026 $c->add_items ({
… …
1523 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1524 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1525 1624
1526 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1527 1626
1528 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1529 1628
1530 $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);
1531 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1532 1631
1533 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1534 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1535 1634
1536 $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;
1537} 1676}
1538 1677
1539sub toggle_player_page { 1678sub toggle_player_page {
1540 my ($widget) = @_; 1679 my ($widget) = @_;
1541 1680
… …
1580 $ntb->add_tab ( 1719 $ntb->add_tab (
1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1582 "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 :). "
1583 . "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."
1584 ); 1723 );
1585 $ntb->add_tab (Pickup => autopickup_setup, 1724 $ntb->add_tab (Pickup => autopickup_setup,
1586 "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.");
1587 1729
1588 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1589 1731
1590 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1591 $plwin 1733 $plwin
… …
1745 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1746 ); 1888 );
1747 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1748 text => "Quit anyway", 1890 text => "Quit anyway",
1749 expand => 1, 1891 expand => 1,
1750 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1751 ); 1893 );
1752 } 1894 }
1753 1895
1754 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1755 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1949 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1950 on_activate => sub { 2092 on_activate => sub {
1951 if ($CONN) { 2093 if ($CONN) {
1952 open_quit_dialog; 2094 open_quit_dialog;
1953 } else { 2095 } else {
1954 exit; 2096 Event::unloop_all;
1955 } 2097 }
1956 0 2098 0
1957 }, 2099 },
1958 ); 2100 );
1959 2101
1960 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1961 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1962 } 2105 }
1963 2106
1964 $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]);
1965} 2108}
1966 2109
… …
1968 CFPlus::OpenGL::shutdown; 2111 CFPlus::OpenGL::shutdown;
1969 2112
1970 undef $SDL_ACTIVE; 2113 undef $SDL_ACTIVE;
1971} 2114}
1972 2115
1973sub audio_init {
1974 if ($CFG->{audio_enable}) {
1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1977
1978 unless ($SDL_MIXER) {
1979 status "Unable to open sound device: there will be no sound";
1980 return;
1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
1988 }
1989}
1990
1991sub audio_shutdown {
1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1993 undef $SDL_MIXER;
1994 @SOUNDS = ();
1995 %AUDIO_CHUNK = ();
1996}
1997
1998my %animate_object; 2116my %animate_object;
1999my $animate_timer; 2117my $animate_timer;
2000 2118
2001my $fps = 9; 2119my $fps = 9;
2002 2120
2003sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2004 $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;
2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2006 2126
2007 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2008 2128 CFPlus::SDL_GL_SwapBuffers;
2009 $WANT_REFRESH = 0;
2010 $CAN_REFRESH = 0;
2011 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2012 2130 $WANT_REFRESH->stop;
2013 CFPlus::SDL_GL_SwapBuffers;
2014} 2131}
2015 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2016my $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 {
2017 $NOW = time; 2136 $NOW = time;
2018 2137
2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2020 for CFPlus::poll_events; 2139 for CFPlus::poll_events;
2021 2140
2022 if (%animate_object) { 2141 if (%animate_object) {
2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2024 ++$WANT_REFRESH; 2143 $WANT_REFRESH->start;
2025 }
2026
2027 if ($WANT_REFRESH) {
2028 force_refresh;
2029 } else {
2030 $CAN_REFRESH = 1;
2031 } 2144 }
2032}); 2145});
2033 2146
2034sub animation_start { 2147sub animation_start {
2035 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2090 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2091 2204
2092 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2093 2206
2094 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2095 sdl_mode => 0, 2208 sdl_mode => 0,
2096 fullscreen => 0, 2209 fullscreen => 0,
2097 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2098 map_scale => 1, 2213 map_scale => 1,
2099 fow_enable => 1, 2214 fow_enable => 1,
2100 fow_intensity => 0, 2215 fow_intensity => 0,
2101 map_smoothing => 1, 2216 map_smoothing => 1,
2102 gui_fontsize => 1, 2217 gui_fontsize => 1,
2103 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2104 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2105 gauge_size => 0.35, 2220 gauge_size => 0.35,
2106 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2107 mapsize => 100, 2222 mapsize => 100,
2108 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2109 bgm_enable => 1, 2226 bgm_enable => 1,
2110 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2111 output_sync => 1, 2228 output_sync => 1,
2112 output_count => 1, 2229 output_count => 1,
2113 output_rate => "", 2230 output_rate => "",
2114 pickup => 0, 2231 pickup => 0,
2115 inv_sort => "mtime", 2232 inv_sort => "mtime",
2116 default => "profile", # default profile 2233 default => "profile", # default profile
2117 show_tips => 1, 2234 show_tips => 1,
2118 logview_max_par => 1000, 2235 logview_max_par => 1000,
2119 ); 2236 );
2120 2237
2121 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2122 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2123 } 2240 }
… …
2189} 2306}
2190 2307
2191show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2192 2309
2193Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2194#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2195#CFPlus::_exit 0;
2196
2197END {
2198 CFPlus::SDL_Quit;
2199 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2200}
2201 2316
2202=head1 NAME 2317=head1 NAME
2203 2318
2204cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2205 2320
2206=head1 SYNOPSIS 2321=head1 SYNOPSIS
2207 2322
2208Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2209 2324
2210=head1 USAGE 2325=head1 USAGE
2211 2326
2212cfplus 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
2213fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2214 2329
2215=head1 DEBUGGING 2330=head1 DEBUGGING
2216 2331
2217 2332
2218CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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