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.188 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.225 by root, Fri Aug 31 08:03:10 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
112our $CONN; 113our $CONN;
113our $PROFILE; # current profile 114our $PROFILE; # current profile
114our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
115 116
116our $WANT_REFRESH; 117our $WANT_REFRESH;
117our $CAN_REFRESH;
118 118
119our @SDL_MODES; 119our @SDL_MODES;
120our $WIDTH; 120our $WIDTH;
121our $HEIGHT; 121our $HEIGHT;
122our $FULLSCREEN; 122our $FULLSCREEN;
… …
126our $FONT_FIXED; 126our $FONT_FIXED;
127 127
128our $MAP; 128our $MAP;
129our $MAPMAP; 129our $MAPMAP;
130our $MAPWIDGET; 130our $MAPWIDGET;
131our $COMPLETER;
131our $BUTTONBAR; 132our $BUTTONBAR;
132our $METASERVER; 133our $METASERVER;
133our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 135our $QUIT_DIALOG;
135our $HOST_ENTRY; 136our $HOST_ENTRY;
… …
143our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
144 145
145our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
146our $PL_WINDOW; 147our $PL_WINDOW;
147 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
152our $PICKUP_PAGE;
148our $INVENTORY_PAGE; 153our $INVENTORY_PAGE;
149our $STATS_PAGE; 154our $STATS_PAGE;
150our $SKILL_PAGE; 155our $SKILL_PAGE;
151our $SPELL_PAGE; 156our $SPELL_PAGE;
152our $SPELL_LIST; 157our $SPELL_LIST;
… …
158our $STATWIDS; 163our $STATWIDS;
159 164
160our $SDL_ACTIVE; 165our $SDL_ACTIVE;
161our %SDL_CB; 166our %SDL_CB;
162 167
163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files
172
173our $ALT_ENTER_MESSAGE; 168our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 169our $STATUSBOX;
175our $DEBUG_STATUS; 170our $DEBUG_STATUS;
176 171
177our $INV; 172our $INV;
178our $INVR; 173our $INVR;
179our $INV_RIGHT_HB; 174our $INVR_HB;
180 175
181our $PICKUP_CFG; 176#############################################################################
182 177
183sub status { 178sub status {
184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
185} 180}
186 181
187sub debug { 182sub debug {
188 $DEBUG_STATUS->set_text ($_[0]); 183 $DEBUG_STATUS->set_text ($_[0]);
189} 184}
190 185
191sub message { 186sub message {
192 my ($para) = @_;
193 $MESSAGE_WINDOW->message ($para); 187 $MESSAGE_WINDOW->message (@_);
194} 188}
189
190#############################################################################
191#TODO: maybe move into own audio module...
192
193our $SDL_MIXER;
194
195our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
196our $MUSIC_WANT; # arryref of ambient music we want to play
197our @MUSIC_HAVE; # ambient music we have on disk
198our $MUSIC_START;
199our @MUSIC_JINGLE; # which jingles to play next
200our $MUSIC_PLAYING_DATA;
201our $MUSIC_PLAYING_META;
202our $MUSIC_PLAYER;
203our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
204
205our %AUDIO_CHUNK; # audio "files"
206our %AUDIO_PLAY; # which audio faces should be played
207
208sub audio_channel_finished {
209 my ($channel) = @_;
210
211# warn "channel $channel finished\n";#d#
212}
213
214sub audio_sound_push($) {
215 my ($face) = @_;
216
217 $CFG->{effects_enable}
218 or return;
219
220 $AUDIO_PLAY{$face}
221 or return;
222
223 if (my $chunk = $AUDIO_CHUNK{$face}) {
224 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
225 my (undef, $dx, $dy, $vol) = @$_;
226
227 my $channel = CFPlus::Channel::find;
228 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
229 $channel->set_position_r ($dx, $dy, 20);
230 $chunk->play ($channel);
231 }
232 } else {
233 # sound_meta not set means data is in flight either way
234 my $meta = $CONN->{face}[$face]
235 or return;
236
237 $meta->{data}
238 or return;
239
240 # if its a jingle, play it as ambient music
241 if ($meta->{data}{jingle}) {
242 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
243 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
244 &audio_music_push ($face);
245 }
246 } else {
247 # fetch from database
248 CFPlus::DB::get res_data => $meta->{name}, sub {
249 my $rwops = new CFPlus::RW $_[0];
250 my $chunk = new CFPlus::MixChunk $rwops
251 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
252 $chunk->volume (($meta->{data}{volume} || 1) * 128);
253 $AUDIO_CHUNK{$face} = $chunk;
254
255 audio_sound_push ($face);
256 };
257 }
258 }
259}
260
261sub audio_sound_play {
262 my ($face, $dx, $dy, $vol) = @_;
263
264 $SDL_MIXER
265 or return;
266 $CFG->{effects_enable}
267 or return;
268
269 my $queue = $AUDIO_PLAY{$face} ||= [];
270 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
271 audio_sound_push $face
272 unless @$queue > 1;
273}
274
275sub audio_music_set_meta {
276 my ($meta) = @_;
277
278 $MUSIC_PLAYING_META = $meta;
279 $MUSIC_PLAYING_WIDGET->set_markup (
280 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
281 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
282 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
283 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
284 );
285}
286
287sub audio_music_update_volume {
288 return unless $MUSIC_PLAYING_META;
289 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
290 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
291 CFPlus::MixMusic::volume $base * $volume * 128;
292}
293
294sub audio_music_start {
295 my $meta = $MUSIC_PLAYING_META;
296
297 CFPlus::DB::get res_data => $meta->{name}, sub {
298 return unless $SDL_MIXER;
299
300 # music might have changed...
301 $meta eq $MUSIC_PLAYING_META
302 or return &audio_music_start ();
303
304 audio_music_update_volume;
305
306 $MUSIC_PLAYING_DATA = \$_[0];
307
308 my $rwops = $meta->{path}
309 ? new_from_file CFPlus::RW $meta->{path}
310 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
311
312 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
313 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
314
315 my $NOW = time;
316
317 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
318 my $pos = $MUSIC_PLAYING_META->{stop_pos};
319 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
320 $MUSIC_START = time - $pos;
321 } else {
322 $MUSIC_PLAYER->play (0);
323 $MUSIC_START = time;
324 }
325
326 delete $meta->{stop_time};
327 delete $meta->{stop_pos};
328 }
329}
330
331sub audio_music_push {
332 return unless $SDL_MIXER;
333
334 my $fade_out;
335
336 if (@MUSIC_JINGLE) {
337 @MUSIC_HAVE = $MUSIC_JINGLE[0];
338 $fade_out = 333;
339 } else {
340 return unless $CFG->{bgm_enable};
341
342 my @have =
343 grep $_ && $_->{data},
344 map $CONN->{face}[$_],
345 @$MUSIC_WANT;
346
347 # randomize music a bit so that the order is not always the same
348 $_->{stop_time} ||= rand for @have;
349
350 @MUSIC_HAVE = @have
351 if @have;
352
353 # default MUSIC_HAVE == MUSIC_DEFAULT
354 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
355 $fade_out = 700;
356 }
357
358 # if the currently playing song is acceptable, let it continue
359 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
360
361 my $NOW = time;
362
363 if ($MUSIC_PLAYING_META) {
364 $MUSIC_PLAYING_META->{stop_time} = $NOW;
365 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
366 CFPlus::MixMusic::fade_out $fade_out;
367 } else {
368 # sort by stop time, oldest first
369 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
370
371 # if the most recently-played piece played very recently,
372 # resume it, else choose the oldest piece for rotation.
373 audio_music_set_meta
374 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
375 ? $MUSIC_HAVE[-1]
376 : $MUSIC_HAVE[0];
377
378 audio_music_start;
379 }
380}
381
382sub audio_music_set_ambient {
383 my ($songs) = @_;
384
385 $MUSIC_WANT = $songs;
386 audio_music_push;
387}
388
389sub audio_music_finished {
390 if ($MUSIC_PLAYING_META) {
391 $MUSIC_PLAYING_META->{stop_time} = time;
392 }
393
394 # we compress multiple jingles of the same type
395 shift @MUSIC_JINGLE
396 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
397
398 $MUSIC_PLAYING_WIDGET->clear;
399
400 undef $MUSIC_PLAYER;
401 undef $MUSIC_PLAYING_META;
402 undef $MUSIC_PLAYING_DATA;
403
404 audio_music_push;
405}
406
407sub audio_init {
408 if ($CFG->{audio_enable}) {
409 $ENV{MIX_EFFECTSMAXSPEED} = 1;
410 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
411
412 unless ($SDL_MIXER) {
413 status "Unable to open sound device: there will be no sound";
414 return;
415 }
416
417 CFPlus::Mix_AllocateChannels 16;
418
419 audio_music_finished;
420 } else {
421 undef $SDL_MIXER;
422 }
423}
424
425sub audio_shutdown {
426 undef $MUSIC_PLAYER;
427 undef $MUSIC_PLAYING_META;
428 undef $MUSIC_PLAYING_DATA;
429
430 $MUSIC_WANT = [];
431 @MUSIC_JINGLE = ();
432 %AUDIO_PLAY = ();
433 %AUDIO_CHUNK = ();
434
435 CFPlus::Mix_CloseAudio if $SDL_MIXER;
436 undef $SDL_MIXER;
437}
438
439#############################################################################
195 440
196sub destroy_query_dialog { 441sub destroy_query_dialog {
197 (delete $_[0]{query_dialog})->destroy 442 (delete $_[0]{query_dialog})->destroy
198 if $_[0]{query_dialog}; 443 if $_[0]{query_dialog};
199} 444}
… …
459 query => \&server_query, 704 query => \&server_query,
460 705
461 setup_req => { 706 setup_req => {
462 smoothing => $CFG->{map_smoothing}*1, 707 smoothing => $CFG->{map_smoothing}*1,
463 }, 708 },
464
465 sound_play => sub {
466 my ($x, $y, $soundnum, $type) = @_;
467
468 $SDL_MIXER
469 or return;
470
471 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
472 or return;
473
474 $chunk->play;
475 },
476 }; 709 };
477 710
478 if ($CONN) { 711 if ($CONN) {
479 CFPlus::lowdelay fileno $CONN->{fh}; 712 CFPlus::lowdelay fileno $CONN->{fh};
480 713
… …
491 $SETUP_DIALOG->show; 724 $SETUP_DIALOG->show;
492 $PL_WINDOW->hide; 725 $PL_WINDOW->hide;
493 $SPELL_LIST->clear_spells; 726 $SPELL_LIST->clear_spells;
494 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 727 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
495 728
496 &audio_music_set ([]); 729 &audio_music_set_ambient ([]);
497 730
498 return unless $CONN; 731 return unless $CONN;
499 732
500 status "connection closed"; 733 status "connection closed";
501 734
… …
543 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 776 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
544 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 777 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
545 state => $CFG->{fullscreen}, 778 state => $CFG->{fullscreen},
546 tooltip => "Bring the client into fullscreen mode.", 779 tooltip => "Bring the client into fullscreen mode.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 780 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
781 );
782
783 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
784 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
785 state => $CFG->{force_opengl11},
786 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
787 . "higher memory usage and slower performance. It will, however, help tremendously on "
788 . "cards that claim to support a feature but fall back to software rendering. "
789 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
790 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
791 . "experience extremely low framerates and your card should do better, try this option.</b>",
792 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
793 );
794
795 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
796 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
797 state => $CFG->{texture_compression},
798 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
799 . "will save a lot of memory and increase performance. The compression algorithm "
800 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
801 . "forced OpenGL 1.1 mode.",
802 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
548 ); 803 );
549 804
550 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
552 state => $CFG->{fast}, 807 state => $CFG->{fast},
… …
580 835
581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 836 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 837 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
583 state => $CFG->{map_smoothing}, 838 state => $CFG->{map_smoothing},
584 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 839 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
585 . "This increases load on the graphics subsystem and works only with 2.x servers. " 840 . "This increases load on the graphics subsystem and works only with TRT servers. "
586 . "Changes take effect at next connection only.", 841 . "Changes take effect at next login only.",
587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 842 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
588 ); 843 );
589 844
590 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 845 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
602 ); 857 );
603 858
604 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 859 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
605 $table->add_at (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 861 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
607 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 862 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
863 . "but you still need to press apply to correctly re-layout the widget.",
608 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 864 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
609 ); 865 );
610 866
611 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 867 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
612 $table->add_at (1, $row++, new CFPlus::UI::Slider 868 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
634} 890}
635 891
636sub audio_setup { 892sub audio_setup {
637 my $vbox = new CFPlus::UI::VBox; 893 my $vbox = new CFPlus::UI::VBox;
638 894
639 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 895 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
640 896
641 my $row = 0; 897 my $row = 0;
642 898
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 899 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 900 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
648 ); 904 );
649# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 905# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
650# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 906# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
651# $CFG->{effects_volume} = $_[1]; 907# $CFG->{effects_volume} = $_[1];
652# }); 908# });
909
910 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
911 $table->add_at (1, $row, new CFPlus::UI::CheckBox
912 expand => 1, state => $CFG->{effects_enable},
913 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
914 on_changed => sub {
915 $CFG->{effects_enable} = $_[1];
916 $CONN->update_fx_want if $CONN;
917 0
918 }
919 );
920 $table->add_at (2, $row++, new CFPlus::UI::Slider
921 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
922 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
923 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
924 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
925 );
926
653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 927 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 928 $table->add_at (1, $row, new CFPlus::UI::CheckBox
655 $hbox->add (new CFPlus::UI::CheckBox
656 expand => 1, state => $CFG->{bgm_enable}, 929 expand => 1, state => $CFG->{bgm_enable},
657 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 930 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
658 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 931 on_changed => sub {
932 $CFG->{bgm_enable} = $_[1];
933 $CONN->update_fx_want if $CONN;
934 audio_music_push;
935 0
936 }
659 ); 937 );
660 $hbox->add (new CFPlus::UI::Slider 938 $table->add_at (2, $row++, new CFPlus::UI::Slider
661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 939 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
662 tooltip => "The volume of the background music. Changes are instant.", 940 tooltip => "The volume of the background music. Changes are instant.",
663 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 941 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
664 ); 942 );
665 943
666 $table->add_at (1, $row++, new CFPlus::UI::Button 944 $table->add_at (1, $row++, new CFPlus::UI::Button
667 expand => 1, align => 0, text => "Apply", 945 c_colspan => 2, expand => 1, align => 0, text => "Apply",
668 tooltip => "Apply the audio settings", 946 tooltip => "Apply the audio settings",
669 on_activate => sub { 947 on_activate => sub {
670 audio_shutdown (); 948 audio_shutdown ();
671 audio_init (); 949 audio_init ();
672 0 950 0
… …
714 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 992 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
715 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 993 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
716 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 994 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
717 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 995 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
718 996
719 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 997 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
998 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
999 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
720 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1000 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
721 1001
722 $GAUGES = { 1002 $GAUGES = {
1003 exp => $exp, prg => $prg, sklprg => $sklprg,
723 exp => $exp, win => $win, range => $rng, 1004 win => $win, range => $rng,
724 food => $fg, mana => $mg, hp => $hg, grace => $gg 1005 hp => $hg, mana => $mg, grace => $gg, food => $fg,
725 }; 1006 };
726 1007
727 &set_gauge_window_fontsize; 1008 &set_gauge_window_fontsize;
728 1009
729 $win 1010 $win
… …
743 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1024 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
744 1025
745 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1026 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
746 1027
747 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1028 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
748 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1029 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
749 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1030 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
750 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1031 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
751 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1032 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
752 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1033 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
753 1034
754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1035 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755 1036
756 $c->add_items ({ 1037 $c->add_items ({
… …
930 $r 1211 $r
931} 1212}
932 1213
933sub skill_window { 1214sub skill_window {
934 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1215 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1216
935 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1217 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1218
936 $sw 1219 $sw
937} 1220}
938 1221
939sub formsep($) { 1222sub formsep($) {
940 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1223 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1081 text => $CFG->{profile}{default}{host}, 1364 text => $CFG->{profile}{default}{host},
1082 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1365 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1083 on_changed => sub { 1366 on_changed => sub {
1084 my ($self, $value) = @_; 1367 my ($self, $value) = @_;
1085 $CFG->{profile}{default}{host} = $value; 1368 $CFG->{profile}{default}{host} = $value;
1086 0 1369 1
1087 } 1370 }
1088 ); 1371 );
1089 1372
1090 $vbox->add (new CFPlus::UI::Button 1373 $vbox->add (new CFPlus::UI::Button
1091 expand => 1, 1374 expand => 1,
1092 text => "Server List", 1375 text => "Server List",
1093 other => $METASERVER, 1376 other => $METASERVER,
1094 tooltip => "Show a list of available crossfire servers", 1377 tooltip => "Show a list of available crossfire servers",
1095 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1378 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1379 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1097 ); 1380 );
1098 } 1381 }
1099 1382
1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1383 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1101 $table->add_at (1, 4, new CFPlus::UI::Entry 1384 $table->add_at (1, 4, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{user}, 1385 text => $CFG->{profile}{default}{user},
1103 tooltip => "The name of your character on the server", 1386 tooltip => "The name of your character on the server",
1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1387 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1105 ); 1388 );
1106 1389
1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1390 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1108 $table->add_at (1, 5, new CFPlus::UI::Entry 1391 $table->add_at (1, 5, new CFPlus::UI::Entry
1109 text => $CFG->{profile}{default}{password}, 1392 text => $CFG->{profile}{default}{password},
1110 hidden => 1, 1393 hidden => 1,
1111 tooltip => "The password for your character", 1394 tooltip => "The password for your character",
1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1395 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1113 ); 1396 );
1114 1397
1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1398 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1116 $table->add_at (1, 7, new CFPlus::UI::Slider 1399 $table->add_at (1, 7, new CFPlus::UI::Slider
1117 force_w => 100, 1400 force_w => 100,
1118 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1401 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1119 tooltip => "This is the size of the portion of the map update the server sends you. " 1402 tooltip => "This is the size of the portion of the map update the server sends you. "
1120 . "If you set this to a high value you will be able to see further, " 1403 . "If you set this to a high value you will be able to see further, "
1121 . "but you also increase bandwidth requirements and latency. " 1404 . "but you also increase bandwidth requirements and latency. "
1122 . "This option is only used once at log-in.", 1405 . "This option is only used once at log-in.",
1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1406 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1124 ); 1407 );
1125 1408
1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1128 state => $CFG->{face_prefetch},
1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
1130 . "If enabled, the client automatically pre-fetches images from the server. "
1131 . "This might increase or create lag, but increases the chances "
1132 . "of faces being ready for display when you encounter them. "
1133 . "It also uses up server bandwidth on every connect, "
1134 . "so only set it if you really need to prefetch images. "
1135 . "This option can be set and unset any time.",
1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1137 );
1138
1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1409 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1410 $table->add_at (1, 8, new CFPlus::UI::Entry
1411 text => $CFG->{output_rate},
1412 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1413 . "when sending data. When 0 or unset, the server "
1414 . "default will be used, which is usually around 100kb/s. Most servers will "
1415 . "dynamically find an optimal rate, so adjust this only when necessary.",
1416 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1417 );
1418
1419 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add_at (1, 9, new CFPlus::UI::Entry 1420 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_rate},
1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1144 . "default will be used, which is usually around 100kb/s.",
1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1146 );
1147
1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1149 $table->add_at (1, 10, new CFPlus::UI::Entry
1150 text => $CFG->{output_count}, 1421 text => $CFG->{output_count},
1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1422 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1423 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1153 ); 1424 );
1154 1425
1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1426 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1156 $table->add_at (1, 11, new CFPlus::UI::Entry 1427 $table->add_at (1, 10, new CFPlus::UI::Entry
1157 text => $CFG->{output_sync}, 1428 text => $CFG->{output_sync},
1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1429 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1430 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1160 ); 1431 );
1161 1432
1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1433 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1163 expand => 1, 1434 expand => 1,
1164 align => 0, 1435 align => 0,
1165 text => "Login", 1436 text => "Login",
1166 on_activate => sub { 1437 on_activate => sub {
1167 $CONN ? stop_game 1438 $CONN ? stop_game
1168 : start_game; 1439 : start_game;
1169 0 1440 1
1170 }, 1441 },
1171 ); 1442 );
1172 1443
1173 $vbox->add (new CFPlus::UI::FancyFrame 1444 $vbox->add (new CFPlus::UI::FancyFrame
1174 label => "Server Info", 1445 label => "Server Info",
… …
1364 $sw1->add ($INV = new CFPlus::UI::Inventory); 1635 $sw1->add ($INV = new CFPlus::UI::Inventory);
1365 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1636 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1366 1637
1367 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1638 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1368 1639
1369 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1640 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1370 1641
1371 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1642 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1372 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1643 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1373 1644
1374 # XXX: Call after $INVR = ... because set_opencont sets the items 1645 # XXX: Call after $INVR = ... because set_opencont sets the items
1375 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1646 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1376 1647
1377 $hb 1648 $hb
1649}
1650
1651sub media_window {
1652 my $vb = new CFPlus::UI::VBox;
1653
1654 $vb->add (new CFPlus::UI::FancyFrame
1655 label => "Currently playing music",
1656 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1657 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1658 );
1659
1660 $vb->add (new CFPlus::UI::FancyFrame
1661 label => "Other media used in this session",
1662 expand => 1,
1663 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1664 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1665 );
1666
1667 $vb
1668}
1669
1670sub add_license {
1671 my ($meta) = @_;
1672
1673 $meta = $meta->{data}
1674 or return;
1675
1676 $meta->{license} || $meta->{author} || $meta->{source}
1677 or return;
1678
1679 $LICENSE_WIDGET->add_paragraph ({
1680 fg => [1, 1, 1, 1],
1681 markup => "<small>"
1682 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1683 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1684 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1685 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1686 . "</small>",
1687 });
1688 $LICENSE_WIDGET->scroll_to_bottom;
1378} 1689}
1379 1690
1380sub toggle_player_page { 1691sub toggle_player_page {
1381 my ($widget) = @_; 1692 my ($widget) = @_;
1382 1693
… …
1421 $ntb->add_tab ( 1732 $ntb->add_tab (
1422 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1733 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1423 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1734 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1424 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1735 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1425 ); 1736 );
1426 $ntb->add_tab (Pickup => autopickup_setup, 1737 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1427 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1738 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1739
1740 $ntb->add_tab (Media => media_window,
1741 "License, Author and Source info for media sent by the server.");
1428 1742
1429 $ntb->set_current_page ($INVENTORY_PAGE); 1743 $ntb->set_current_page ($INVENTORY_PAGE);
1430 1744
1431 $plwin->add ($ntb); 1745 $plwin->add ($ntb);
1432 $plwin 1746 $plwin
… …
1586 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1900 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1587 ); 1901 );
1588 $hb->add (new CFPlus::UI::Button 1902 $hb->add (new CFPlus::UI::Button
1589 text => "Quit anyway", 1903 text => "Quit anyway",
1590 expand => 1, 1904 expand => 1,
1591 on_activate => sub { exit }, 1905 on_activate => sub { Event::unloop_all },
1592 ); 1906 );
1593 } 1907 }
1594 1908
1595 $QUIT_DIALOG->show; 1909 $QUIT_DIALOG->show;
1596 $QUIT_DIALOG->grab_focus; 1910 $QUIT_DIALOG->grab_focus;
… …
1669 1983
1670 $SDL_ACTIVE = 1; 1984 $SDL_ACTIVE = 1;
1671 $LAST_REFRESH = time - 0.01; 1985 $LAST_REFRESH = time - 0.01;
1672 1986
1673 CFPlus::OpenGL::init; 1987 CFPlus::OpenGL::init;
1988 CFPlus::Macro::init;
1674 1989
1675 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1990 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1676 1991
1677 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1992 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1678 1993
1679 ############################################################################# 1994 #############################################################################
1680 1995
1681 if ($DEBUG_STATUS) { 1996 if ($DEBUG_STATUS) {
1682 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1997 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1683 } else { 1998 } else {
1684 # create the widgets 1999 # create/configure the widgets
2000
2001 $CFPlus::UI::ROOT->connect (key_down => sub {
2002 my (undef, $ev) = @_;
2003
2004 if (my @macros = CFPlus::Macro::find $ev) {
2005 CFPlus::Macro::execute $_ for @macros;
2006
2007 return 1;
2008 }
2009
2010 0
2011 });
1685 2012
1686 $DEBUG_STATUS = new CFPlus::UI::Label 2013 $DEBUG_STATUS = new CFPlus::UI::Label
1687 padding => 0, 2014 padding => 0,
1688 z => 100, 2015 z => 100,
1689 force_x => "max", 2016 force_x => "max",
… …
1719 $MESSAGE_WINDOW->activate_console ($preset) 2046 $MESSAGE_WINDOW->activate_console ($preset)
1720 if $MESSAGE_WINDOW; 2047 if $MESSAGE_WINDOW;
1721 }); 2048 });
1722 $MAPWIDGET->show; 2049 $MAPWIDGET->show;
1723 $MAPWIDGET->grab_focus; 2050 $MAPWIDGET->grab_focus;
2051
2052 $COMPLETER = new CFPlus::MapWidget::Command::
2053 command => { },
2054 tooltip => "#completer_help",
2055 ;
1724 2056
1725 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2057 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1726 title => "Setup", 2058 title => "Setup",
1727 name => "setup_dialog", 2059 name => "setup_dialog",
1728 x => 'center', 2060 x => 'center',
… …
1790 tooltip => "Terminates the program", 2122 tooltip => "Terminates the program",
1791 on_activate => sub { 2123 on_activate => sub {
1792 if ($CONN) { 2124 if ($CONN) {
1793 open_quit_dialog; 2125 open_quit_dialog;
1794 } else { 2126 } else {
1795 exit; 2127 Event::unloop_all;
1796 } 2128 }
1797 0 2129 0
1798 }, 2130 },
1799 ); 2131 );
1800 2132
1801 $BUTTONBAR->show; 2133 $BUTTONBAR->show;
1802 $SETUP_DIALOG->show; 2134 $SETUP_DIALOG->show;
2135 $MESSAGE_WINDOW->show;
1803 } 2136 }
1804 2137
1805 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2138 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1806} 2139}
1807 2140
… …
1809 CFPlus::OpenGL::shutdown; 2142 CFPlus::OpenGL::shutdown;
1810 2143
1811 undef $SDL_ACTIVE; 2144 undef $SDL_ACTIVE;
1812} 2145}
1813 2146
1814sub audio_channel_finished {
1815 my ($channel) = @_;
1816
1817 #warn "channel $channel finished\n";#d#
1818}
1819
1820sub audio_music_set {
1821 my ($songs) = @_;
1822
1823 my @want =
1824 grep $_,
1825 map $CONN->{music_meta}{$_},
1826 @$songs;
1827
1828 if (@want) {
1829 @MUSIC_WANT = @want;
1830 &audio_music_changed ();
1831 }
1832}
1833
1834sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path}
1836 or return;
1837
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1839 return unless $SDL_MIXER;
1840
1841 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path}
1843 or return &audio_music_start ();
1844
1845 my $rwops = new_from_file CFPlus::RW $path;
1846 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops;
1847
1848 my $NOW = time;
1849
1850 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1851 my $pos = $MUSIC_PLAYING->{stop_pos};
1852 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1853 $MUSIC_START = time - $pos;
1854 } else {
1855 $MUSIC_PLAYER->play (0);
1856 $MUSIC_START = time;
1857 }
1858
1859 delete $MUSIC_PLAYING->{stop_time};
1860 delete $MUSIC_PLAYING->{stop_pos};
1861 }
1862}
1863
1864sub audio_music_changed {
1865 return unless $CFG->{bgm_enable};
1866 return unless $SDL_MIXER;
1867
1868 # default MUSIC_WANT == MUSIC_DEFAULT
1869 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1870
1871 # if the currently playing song is acceptable, let it continue
1872 return if $MUSIC_PLAYING
1873 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1874
1875 my $NOW = time;
1876
1877 if ($MUSIC_PLAYING) {
1878 $MUSIC_PLAYING->{stop_time} = $NOW;
1879 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1880 CFPlus::MixMusic::fade_out 1000;
1881 } else {
1882 # sort by stop time, oldest first
1883 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1884
1885 # if the most recently-played piece played very recently,
1886 # resume it, else choose the oldest piece for rotation.
1887 $MUSIC_PLAYING =
1888 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1889 ? $MUSIC_WANT[-1]
1890 : $MUSIC_WANT[0];
1891
1892 audio_music_start;
1893 }
1894}
1895
1896sub audio_music_finished {
1897 $MUSIC_PLAYING = undef;
1898 undef $MUSIC_PLAYER;
1899
1900 audio_music_changed;
1901}
1902
1903sub audio_init {
1904 if ($CFG->{audio_enable}) {
1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1907 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1908
1909 unless ($SDL_MIXER) {
1910 status "Unable to open sound device: there will be no sound";
1911 return;
1912 }
1913
1914 CFPlus::Mix_AllocateChannels 8;
1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1916
1917 audio_music_finished;
1918
1919 local $_;
1920 while (<$fh>) {
1921 next if /^\s*#/;
1922 next if /^\s*$/;
1923
1924 my ($file, $volume, $event) = split /\s+/, $_, 3;
1925
1926 push @SOUNDS, "$volume,$file";
1927
1928 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1929 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1930 my $chunk = new CFPlus::MixChunk $rwops;
1931 $chunk->volume ($volume * 128 / 100);
1932 $chunk
1933 };
1934 }
1935 } else {
1936 status "unable to open sound config: $!";
1937 }
1938 } else {
1939 undef $SDL_MIXER;
1940 }
1941}
1942
1943sub audio_shutdown {
1944 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1945 undef $SDL_MIXER;
1946 @SOUNDS = ();
1947 %AUDIO_CHUNKS = ();
1948}
1949
1950my %animate_object; 2147my %animate_object;
1951my $animate_timer; 2148my $animate_timer;
1952 2149
1953my $fps = 9; 2150my $fps = 9;
1954 2151
1955my %demo;#d#
1956
1957sub force_refresh { 2152sub force_refresh {
2153 if ($ENV{CFPLUS_DEBUG} & 4) {
1958 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2154 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1959 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2155 debug sprintf "%3.2f", $fps;
2156 }
1960 2157
1961 $CFPlus::UI::ROOT->draw; 2158 $CFPlus::UI::ROOT->draw;
1962 2159 CFPlus::SDL_GL_SwapBuffers;
1963 $WANT_REFRESH = 0;
1964 $CAN_REFRESH = 0;
1965 $LAST_REFRESH = $NOW; 2160 $LAST_REFRESH = $NOW;
1966 2161 $WANT_REFRESH->stop;
1967 CFPlus::SDL_GL_SwapBuffers;
1968} 2162}
1969 2163
2164$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2165
1970my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2166my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1971 $NOW = time; 2167 $NOW = time;
1972 2168
1973 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2169 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1974 for CFPlus::poll_events; 2170 for CFPlus::poll_events;
1975 2171
1976 if (%animate_object) { 2172 if (%animate_object) {
1977 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2173 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1978 ++$WANT_REFRESH; 2174 $WANT_REFRESH->start;
1979 }
1980
1981 if ($WANT_REFRESH) {
1982 force_refresh;
1983 } else {
1984 $CAN_REFRESH = 1;
1985 } 2175 }
1986}); 2176});
1987 2177
1988sub animation_start { 2178sub animation_start {
1989 my ($widget) = @_; 2179 my ($widget) = @_;
… …
1993sub animation_stop { 2183sub animation_stop {
1994 my ($widget) = @_; 2184 my ($widget) = @_;
1995 delete $animate_object{$widget}; 2185 delete $animate_object{$widget};
1996} 2186}
1997 2187
1998# check once/second for faces that need to be prefetched
1999# this should, of course, only run on demand, but
2000# SDL forces worse things on us....
2001
2002Event->timer (after => 1, interval => 0.25, cb => sub {
2003 $CONN->face_prefetch
2004 if $CONN;
2005});
2006
2007%SDL_CB = ( 2188%SDL_CB = (
2008 CFPlus::SDL_QUIT => sub { 2189 CFPlus::SDL_QUIT => sub {
2009 exit; 2190 Event::unloop_all;
2010 }, 2191 },
2011 CFPlus::SDL_VIDEORESIZE => sub { 2192 CFPlus::SDL_VIDEORESIZE => sub {
2012 }, 2193 },
2013 CFPlus::SDL_VIDEOEXPOSE => sub { 2194 CFPlus::SDL_VIDEOEXPOSE => sub {
2014 CFPlus::UI::full_refresh; 2195 CFPlus::UI::full_refresh;
… …
2053 CFPlus::DB::Server::run; 2234 CFPlus::DB::Server::run;
2054 2235
2055 CFPlus::UI::set_layout ($::CFG->{layout}); 2236 CFPlus::UI::set_layout ($::CFG->{layout});
2056 2237
2057 my %DEF_CFG = ( 2238 my %DEF_CFG = (
2058 sdl_mode => 0, 2239 sdl_mode => 0,
2059 width => 640,
2060 height => 480,
2061 fullscreen => 0, 2240 fullscreen => 0,
2062 fast => 0, 2241 fast => 0,
2242 force_opengl11 => undef,
2243 texture_compression => 1,
2063 map_scale => 1, 2244 map_scale => 1,
2064 fow_enable => 1, 2245 fow_enable => 1,
2065 fow_intensity => 0, 2246 fow_intensity => 0,
2066 map_smoothing => 1, 2247 map_smoothing => 1,
2067 gui_fontsize => 1, 2248 gui_fontsize => 1,
2068 log_fontsize => 0.7, 2249 log_fontsize => 0.7,
2069 gauge_fontsize => 1, 2250 gauge_fontsize => 1,
2070 gauge_size => 0.35, 2251 gauge_size => 0.35,
2071 stat_fontsize => 0.7, 2252 stat_fontsize => 0.7,
2072 mapsize => 100, 2253 mapsize => 100,
2073 audio_enable => 1, 2254 audio_enable => 1,
2255 effects_enable => 1,
2256 effects_volume => 1,
2074 bgm_enable => 1, 2257 bgm_enable => 1,
2075 bgm_volume => 0.25, 2258 bgm_volume => 0.5,
2076 face_prefetch => 0,
2077 output_sync => 1, 2259 output_sync => 1,
2078 output_count => 1, 2260 output_count => 1,
2079 output_rate => "", 2261 output_rate => "",
2080 pickup => 0, 2262 pickup => 0,
2081 inv_sort => "mtime", 2263 inv_sort => "mtime",
2082 default => "profile", # default profile 2264 default => "profile", # default profile
2083 show_tips => 1, 2265 show_tips => 1,
2084 logview_max_par => 1000, 2266 logview_max_par => 1000,
2085 ); 2267 );
2086 2268
2087 while (my ($k, $v) = each %DEF_CFG) { 2269 while (my ($k, $v) = each %DEF_CFG) {
2088 $CFG->{$k} = $v unless exists $CFG->{$k}; 2270 $CFG->{$k} = $v unless exists $CFG->{$k};
2089 } 2271 }
… …
2146# } 2328# }
2147# my $t2 = Time::HiRes::time; 2329# my $t2 = Time::HiRes::time;
2148# warn $t2-$t1; 2330# warn $t2-$t1;
2149# } 2331# }
2150 2332
2151 $startup_done->();
2152
2153 video_init; 2333 video_init;
2154 audio_init; 2334 audio_init;
2155} 2335}
2156 2336
2157show_tip_of_the_day if $CFG->{show_tips}; 2337show_tip_of_the_day if $CFG->{show_tips};
2158 2338
2339Event->idle (cb => sub {
2340 $_[0]->w->cancel;
2341 $startup_done->();
2342});
2343
2159Event::loop; 2344Event::loop;
2345
2346#video_shutdown;
2347#audio_shutdown;
2160#CFPlus::SDL_Quit; 2348CFPlus::SDL_Quit;
2161#CFPlus::_exit 0;
2162
2163END {
2164 CFPlus::SDL_Quit;
2165 CFPlus::DB::Server::stop; 2349CFPlus::DB::Server::stop;
2166}
2167 2350
2168=head1 NAME 2351=head1 NAME
2169 2352
2170cfplus - A Crossfire+ and Crossfire game client 2353cfplus - A Crossfire TRT and Crossfire game client
2171 2354
2172=head1 SYNOPSIS 2355=head1 SYNOPSIS
2173 2356
2174Just run it - no commandline arguments are supported. 2357Just run it - no commandline arguments are supported.
2175 2358
2176=head1 USAGE 2359=head1 USAGE
2177 2360
2178cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2361cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2179fullscreen and interactively. 2362be used in fullscreen mode and interactively.
2180 2363
2181=head1 DEBUGGING 2364=head1 DEBUGGING
2182 2365
2183 2366
2184CFPLUS_DEBUG - environment variable 2367CFPLUS_DEBUG - environment variable

Diff Legend

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