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.190 by root, Sun Jul 29 18:56:03 2007 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
… …
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 73 if %PAR::LibCache;
73 74
74use Time::HiRes 'time'; 75use Time::HiRes 'time';
75use Event; 76use Event;
77use List::Util qw(max min);
76 78
77use Crossfire; 79use Crossfire;
78use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
79 81
80use Compress::LZF; 82use Compress::LZF;
… …
85use CFPlus::DB; 87use CFPlus::DB;
86use CFPlus::UI; 88use CFPlus::UI;
87use CFPlus::UI::Canvas; 89use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
90use CFPlus::UI::MessageWindow; 93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
91use CFPlus::Pod; 95use CFPlus::Pod;
92use CFPlus::MapWidget; 96use CFPlus::MapWidget;
93use CFPlus::Macro; 97use CFPlus::Macro;
94 98
95$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
112our $CONN; 116our $CONN;
113our $PROFILE; # current profile 117our $PROFILE; # current profile
114our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
115 119
116our $WANT_REFRESH; 120our $WANT_REFRESH;
117our $CAN_REFRESH;
118 121
119our @SDL_MODES; 122our @SDL_MODES;
120our $WIDTH; 123our $WIDTH;
121our $HEIGHT; 124our $HEIGHT;
122our $FULLSCREEN; 125our $FULLSCREEN;
… …
126our $FONT_FIXED; 129our $FONT_FIXED;
127 130
128our $MAP; 131our $MAP;
129our $MAPMAP; 132our $MAPMAP;
130our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
131our $BUTTONBAR; 135our $BUTTONBAR;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
… …
143our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
144 148
145our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
146our $PL_WINDOW; 150our $PL_WINDOW;
147 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
148our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
149our $STATS_PAGE; 157our $STATS_PAGE;
150our $SKILL_PAGE; 158our $SKILL_PAGE;
151our $SPELL_PAGE; 159our $SPELL_PAGE;
152our $SPELL_LIST; 160our $SPELL_LIST;
… …
158our $STATWIDS; 166our $STATWIDS;
159 167
160our $SDL_ACTIVE; 168our $SDL_ACTIVE;
161our %SDL_CB; 169our %SDL_CB;
162 170
171our $ALT_ENTER_MESSAGE;
172our $STATUSBOX;
173our $DEBUG_STATUS;
174
175our $INV;
176our $INVR;
177our $INVR_HB;
178
179#############################################################################
180
181sub status {
182 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
183}
184
185sub debug {
186 $DEBUG_STATUS->set_text ($_[0]);
187}
188
189sub message {
190 $MESSAGE_WINDOW->message (@_);
191}
192
193#############################################################################
194#TODO: maybe move into own audio module...
195
163our $SDL_MIXER; 196our $SDL_MIXER;
197
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 198our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 199our $MUSIC_WANT; # arryref of ambient music we want to play
200our @MUSIC_HAVE; # ambient music we have on disk
166our $MUSIC_START; 201our $MUSIC_START;
202our @MUSIC_JINGLE; # which jingles to play next
167our $MUSIC_PLAYING_DATA; 203our $MUSIC_PLAYING_DATA;
168our $MUSIC_PLAYING_META; 204our $MUSIC_PLAYING_META;
169our $MUSIC_PLAYER; 205our $MUSIC_PLAYER;
170our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 206our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
171our @SOUNDS; # event => file mapping 207
172our %AUDIO_CHUNKS; # audio files 208our %AUDIO_CHUNK; # audio "files"
209our %AUDIO_PLAY; # which audio faces should be played
173 210
174our $ALT_ENTER_MESSAGE; 211sub audio_channel_finished {
175our $STATUSBOX; 212 my ($channel) = @_;
176our $DEBUG_STATUS;
177 213
178our $INV; 214# warn "channel $channel finished\n";#d#
179our $INVR;
180our $INV_RIGHT_HB;
181
182our $PICKUP_CFG;
183
184sub status {
185 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
186} 215}
187 216
188sub debug { 217sub audio_sound_push($) {
189 $DEBUG_STATUS->set_text ($_[0]);
190}
191
192sub message {
193 my ($para) = @_; 218 my ($face) = @_;
194 $MESSAGE_WINDOW->message ($para); 219
220 $CFG->{effects_enable}
221 or return;
222
223 $AUDIO_PLAY{$face}
224 or return;
225
226 if (my $chunk = $AUDIO_CHUNK{$face}) {
227 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
228 my (undef, $dx, $dy, $vol) = @$_;
229
230 my $channel = CFPlus::Channel::find;
231 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
232 $channel->set_position_r ($dx, $dy, 20);
233 $chunk->play ($channel);
234 }
235 } else {
236 # sound_meta not set means data is in flight either way
237 my $meta = $CONN->{face}[$face]
238 or return;
239
240 $meta->{data}
241 or return;
242
243 # if its a jingle, play it as ambient music
244 if ($meta->{data}{jingle}) {
245 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
247 &audio_music_push ($face);
248 }
249 } else {
250 # fetch from database
251 CFPlus::DB::get res_data => $meta->{name}, sub {
252 my $rwops = new CFPlus::RW $_[0];
253 my $chunk = new CFPlus::MixChunk $rwops
254 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
256 $AUDIO_CHUNK{$face} = $chunk;
257
258 audio_sound_push ($face);
259 };
260 }
261 }
195} 262}
263
264sub audio_sound_play {
265 my ($face, $dx, $dy, $vol) = @_;
266
267 $SDL_MIXER
268 or return;
269 $CFG->{effects_enable}
270 or return;
271
272 my $queue = $AUDIO_PLAY{$face} ||= [];
273 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
274 audio_sound_push $face
275 unless @$queue > 1;
276}
277
278sub audio_music_set_meta {
279 my ($meta) = @_;
280
281 $MUSIC_PLAYING_META = $meta;
282 $MUSIC_PLAYING_WIDGET->set_markup (
283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
287 );
288}
289
290sub audio_music_update_volume {
291 return unless $MUSIC_PLAYING_META;
292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
294 CFPlus::MixMusic::volume $base * $volume * 128;
295}
296
297sub audio_music_start {
298 my $meta = $MUSIC_PLAYING_META;
299
300 CFPlus::DB::get res_data => $meta->{name}, sub {
301 return unless $SDL_MIXER;
302
303 # music might have changed...
304 $meta eq $MUSIC_PLAYING_META
305 or return &audio_music_start ();
306
307 audio_music_update_volume;
308
309 $MUSIC_PLAYING_DATA = \$_[0];
310
311 my $rwops = $meta->{path}
312 ? new_from_file CFPlus::RW $meta->{path}
313 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
314
315 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
316 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
317
318 my $NOW = time;
319
320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
323 $MUSIC_START = time - $pos;
324 } else {
325 $MUSIC_PLAYER->play (0);
326 $MUSIC_START = time;
327 }
328
329 delete $meta->{stop_time};
330 delete $meta->{stop_pos};
331 }
332}
333
334sub audio_music_push {
335 return unless $SDL_MIXER;
336
337 my $fade_out;
338
339 if (@MUSIC_JINGLE) {
340 @MUSIC_HAVE = $MUSIC_JINGLE[0];
341 $fade_out = 333;
342 } else {
343 return unless $CFG->{bgm_enable};
344
345 my @have =
346 grep $_ && $_->{data},
347 map $CONN->{face}[$_],
348 @$MUSIC_WANT;
349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
352
353 @MUSIC_HAVE = @have
354 if @have;
355
356 # default MUSIC_HAVE == MUSIC_DEFAULT
357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
358 $fade_out = 700;
359 }
360
361 # if the currently playing song is acceptable, let it continue
362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
363
364 my $NOW = time;
365
366 if ($MUSIC_PLAYING_META) {
367 $MUSIC_PLAYING_META->{stop_time} = $NOW;
368 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
369 CFPlus::MixMusic::fade_out $fade_out;
370 } else {
371 # sort by stop time, oldest first
372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
373
374 # if the most recently-played piece played very recently,
375 # resume it, else choose the oldest piece for rotation.
376 audio_music_set_meta
377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
378 ? $MUSIC_HAVE[-1]
379 : $MUSIC_HAVE[0];
380
381 audio_music_start;
382 }
383}
384
385sub audio_music_set_ambient {
386 my ($songs) = @_;
387
388 $MUSIC_WANT = $songs;
389 audio_music_push;
390}
391
392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
397 # we compress multiple jingles of the same type
398 shift @MUSIC_JINGLE
399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
400
401 $MUSIC_PLAYING_WIDGET->clear;
402
403 undef $MUSIC_PLAYER;
404 undef $MUSIC_PLAYING_META;
405 undef $MUSIC_PLAYING_DATA;
406
407 audio_music_push;
408}
409
410sub audio_init {
411 if ($CFG->{audio_enable}) {
412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
413 $SDL_MIXER = !CFPlus::Mix_OpenAudio
414 $CFG->{audio_hw_frequency},
415 CFPlus::MIX_DEFAULT_FORMAT,
416 $CFG->{audio_hw_channels},
417 $CFG->{audio_hw_chunksize};
418
419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
424 status "Unable to open sound device: there will be no sound";
425 }
426 } else {
427 undef $SDL_MIXER;
428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
432}
433
434sub audio_shutdown {
435 undef $MUSIC_PLAYER;
436 undef $MUSIC_PLAYING_META;
437 undef $MUSIC_PLAYING_DATA;
438
439 $MUSIC_WANT = [];
440 @MUSIC_JINGLE = ();
441 %AUDIO_PLAY = ();
442 %AUDIO_CHUNK = ();
443
444 CFPlus::Mix_CloseAudio if $SDL_MIXER;
445 undef $SDL_MIXER;
446}
447
448#############################################################################
196 449
197sub destroy_query_dialog { 450sub destroy_query_dialog {
198 (delete $_[0]{query_dialog})->destroy 451 (delete $_[0]{query_dialog})->destroy
199 if $_[0]{query_dialog}; 452 if $_[0]{query_dialog};
200} 453}
… …
460 query => \&server_query, 713 query => \&server_query,
461 714
462 setup_req => { 715 setup_req => {
463 smoothing => $CFG->{map_smoothing}*1, 716 smoothing => $CFG->{map_smoothing}*1,
464 }, 717 },
465
466 sound_play => sub {
467 my ($x, $y, $soundnum, $type) = @_;
468
469 $SDL_MIXER
470 or return;
471
472 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
473 or return;
474
475 $chunk->play;
476 },
477 }; 718 };
478 719
479 if ($CONN) { 720 if ($CONN) {
480 CFPlus::lowdelay fileno $CONN->{fh}; 721 CFPlus::lowdelay fileno $CONN->{fh};
481 722
… …
492 $SETUP_DIALOG->show; 733 $SETUP_DIALOG->show;
493 $PL_WINDOW->hide; 734 $PL_WINDOW->hide;
494 $SPELL_LIST->clear_spells; 735 $SPELL_LIST->clear_spells;
495 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 736 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
496 737
497 &audio_music_set ([]); 738 &audio_music_set_ambient ([]);
498 739
499 return unless $CONN; 740 return unless $CONN;
500 741
501 status "connection closed"; 742 status "connection closed";
502 743
… …
544 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
545 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 786 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
546 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
547 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
790 );
791
792 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
793 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
794 state => $CFG->{force_opengl11},
795 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
796 . "higher memory usage and slower performance. It will, however, help tremendously on "
797 . "cards that claim to support a feature but fall back to software rendering. "
798 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
799 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
800 . "experience extremely low framerates and your card should do better, try this option.</b>",
801 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
802 );
803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
805 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
806 state => $CFG->{texture_compression},
807 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
808 . "will save a lot of memory and increase performance. The compression algorithm "
809 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
810 . "forced OpenGL 1.1 mode.",
811 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
549 ); 812 );
550 813
551 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
552 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
553 state => $CFG->{fast}, 816 state => $CFG->{fast},
… …
581 844
582 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 845 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
583 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 848 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. " 849 . "This increases load on the graphics subsystem and works only with TRT servers. "
587 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
589 ); 852 );
590 853
591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 854 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
603 ); 866 );
604 867
605 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
606 $table->add_at (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
607 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
608 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 871 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
872 . "but you still need to press apply to correctly re-layout the widget.",
609 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
610 ); 874 );
611 875
612 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 876 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
613 $table->add_at (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
632 ); 896 );
633 897
634 $vbox 898 $vbox
635} 899}
636 900
901our $AUDIO_HW_CHUNKSIZE;
902our $AUDIO_INFO;
903
904sub audio_tab_update {
905 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
906
907 $AUDIO_HW_CHUNKSIZE->set_options ([
908 map {
909 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
910 [$_, $ms, "$ms ($_ samples)"],
911 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
912 ]);
913
914 my $text = !$freq
915 ? "audio is off"
916 : "Frequency (Hz): $freq\n"
917 . "Channels: $chans";
918
919 $AUDIO_INFO->set_text ($text);
920}
921
637sub audio_setup { 922sub audio_setup {
638 my $vbox = new CFPlus::UI::VBox; 923 my $vbox = new CFPlus::UI::VBox;
639 924
640 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 925 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
641 926
642 my $row = 0; 927 my $row = 0;
643 928
644 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
645 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 930 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
646 state => $CFG->{audio_enable}, 931 state => $CFG->{audio_enable},
647 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 932 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
648 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 933 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
649 ); 934 );
935
650# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 936 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
651# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 937 $table->add_at (1, $row, new CFPlus::UI::CheckBox
938 expand => 1, state => $CFG->{effects_enable},
939 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
940 on_changed => sub {
652# $CFG->{effects_volume} = $_[1]; 941 $CFG->{effects_enable} = $_[1];
653# }); 942 $CONN->update_fx_want if $CONN;
943 1
944 }
945 );
946 $table->add_at (2, $row++, new CFPlus::UI::Slider
947 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
948 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
949 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
950 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
951 );
952
654 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 953 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
655 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 954 $table->add_at (1, $row, new CFPlus::UI::CheckBox
656 $hbox->add (new CFPlus::UI::CheckBox
657 expand => 1, state => $CFG->{bgm_enable}, 955 expand => 1, state => $CFG->{bgm_enable},
658 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 956 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
659 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 957 on_changed => sub {
958 $CFG->{bgm_enable} = $_[1];
959 $CONN->update_fx_want if $CONN;
960 audio_music_push;
961 1
962 }
660 ); 963 );
661 $hbox->add (new CFPlus::UI::Slider 964 $table->add_at (2, $row++, new CFPlus::UI::Slider
662 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 965 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
663 tooltip => "The volume of the background music. Changes are instant.", 966 tooltip => "The volume of the background music. Changes are instant.",
664 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 967 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
968 );
969
970 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
971 $table->add_at (1, $row++, new CFPlus::UI::Selector
972 c_colspan => 2, expand => 1,
973 value => $CFG->{audio_hw_frequency},
974 options => [
975 [11025, "11 kHz" , "11kHz (low quality)"],
976 [22050, "22 kHz" , "22kHz (reduced quality)"],
977 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
978 [48000, "48 kHz" , "48kHz (studio quality)"],
979 ],
980 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
981 on_changed => sub {
982 $CFG->{audio_hw_frequency} = $_[1];
983 audio_tab_update;
984 1
985 }
986 );
987
988 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
989 $table->add_at (1, $row++, new CFPlus::UI::Selector
990 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_channels},
992 options => [
993 [1, "Mono" , "Mono (single channel, low quality)"],
994 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
995 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
996 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
997 ],
998 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
999 on_changed => sub {
1000 $CFG->{audio_hw_channels} = $_[1];
1001 audio_tab_update;
1002 1
1003 }
1004 );
1005
1006 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1007 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1008 c_colspan => 2, expand => 1,
1009 value => $CFG->{audio_hw_chunksize},
1010 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1011 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1012 on_changed => sub {
1013 $CFG->{audio_hw_chunksize} = $_[1]
1014 if $_[1];
1015 audio_tab_update;
1016 1
1017 }
1018 );
1019
1020 # should really be a slider
1021 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1022 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1023 c_colspan => 2, expand => 1,
1024 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1025 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026 template => ">= 99",
1027 on_changed => sub {
1028 my ($slider, $value) = @_;
1029
1030 $CFG->{audio_mix_channels} = $value
1031 if $value;
1032 1;
1033 }
665 ); 1034 );
666 1035
667 $table->add_at (1, $row++, new CFPlus::UI::Button 1036 $table->add_at (1, $row++, new CFPlus::UI::Button
668 expand => 1, align => 0, text => "Apply", 1037 c_colspan => 2, expand => 1, align => 0, text => "Apply",
669 tooltip => "Apply the audio settings", 1038 tooltip => "Apply the audio settings",
670 on_activate => sub { 1039 on_activate => sub {
671 audio_shutdown (); 1040 audio_shutdown ();
672 audio_init (); 1041 audio_init ();
673 0 1042 0
674 } 1043 }
675 ); 1044 );
1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 expand => 1,
1048 label => "Audio Info",
1049 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1050 );
1051
1052 audio_tab_update;
676 1053
677 $vbox 1054 $vbox
678} 1055}
679 1056
680sub set_gauge_window_fontsize { 1057sub set_gauge_window_fontsize {
… …
715 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1092 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
716 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1093 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
717 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1094 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
718 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1095 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
719 1096
720 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1097 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1098 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1099 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
721 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1100 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
722 1101
723 $GAUGES = { 1102 $GAUGES = {
1103 exp => $exp, prg => $prg, sklprg => $sklprg,
724 exp => $exp, win => $win, range => $rng, 1104 win => $win, range => $rng,
725 food => $fg, mana => $mg, hp => $hg, grace => $gg 1105 hp => $hg, mana => $mg, grace => $gg, food => $fg,
726 }; 1106 };
727 1107
728 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
729 1109
730 $win 1110 $win
… …
744 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1124 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
745 1125
746 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1126 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
747 1127
748 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1128 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
749 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1129 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
750 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1130 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
751 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1131 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
752 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1132 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
753 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1133 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
754 1134
755 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1135 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
756 1136
757 $c->add_items ({ 1137 $c->add_items ({
… …
931 $r 1311 $r
932} 1312}
933 1313
934sub skill_window { 1314sub skill_window {
935 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1315 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1316
936 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1317 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318
937 $sw 1319 $sw
938} 1320}
939 1321
940sub formsep($) { 1322sub formsep($) {
941 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1323 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1082 text => $CFG->{profile}{default}{host}, 1464 text => $CFG->{profile}{default}{host},
1083 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1465 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1084 on_changed => sub { 1466 on_changed => sub {
1085 my ($self, $value) = @_; 1467 my ($self, $value) = @_;
1086 $CFG->{profile}{default}{host} = $value; 1468 $CFG->{profile}{default}{host} = $value;
1087 0 1469 1
1088 } 1470 }
1089 ); 1471 );
1090 1472
1091 $vbox->add (new CFPlus::UI::Button 1473 $vbox->add (new CFPlus::UI::Button
1092 expand => 1, 1474 expand => 1,
1093 text => "Server List", 1475 text => "Server List",
1094 other => $METASERVER, 1476 other => $METASERVER,
1095 tooltip => "Show a list of available crossfire servers", 1477 tooltip => "Show a list of available crossfire servers",
1096 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1478 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1097 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1479 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1098 ); 1480 );
1099 } 1481 }
1100 1482
1101 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1483 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1102 $table->add_at (1, 4, new CFPlus::UI::Entry 1484 $table->add_at (1, 4, new CFPlus::UI::Entry
1103 text => $CFG->{profile}{default}{user}, 1485 text => $CFG->{profile}{default}{user},
1104 tooltip => "The name of your character on the server", 1486 tooltip => "The name of your character on the server",
1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1106 ); 1488 );
1107 1489
1108 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1490 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1109 $table->add_at (1, 5, new CFPlus::UI::Entry 1491 $table->add_at (1, 5, new CFPlus::UI::Entry
1110 text => $CFG->{profile}{default}{password}, 1492 text => $CFG->{profile}{default}{password},
1111 hidden => 1, 1493 hidden => 1,
1112 tooltip => "The password for your character", 1494 tooltip => "The password for your character",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1495 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1114 ); 1496 );
1115 1497
1116 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1498 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1117 $table->add_at (1, 7, new CFPlus::UI::Slider 1499 $table->add_at (1, 7, new CFPlus::UI::Slider
1118 force_w => 100, 1500 force_w => 100,
1119 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1501 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1120 tooltip => "This is the size of the portion of the map update the server sends you. " 1502 tooltip => "This is the size of the portion of the map update the server sends you. "
1121 . "If you set this to a high value you will be able to see further, " 1503 . "If you set this to a high value you will be able to see further, "
1122 . "but you also increase bandwidth requirements and latency. " 1504 . "but you also increase bandwidth requirements and latency. "
1123 . "This option is only used once at log-in.", 1505 . "This option is only used once at log-in.",
1124 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1506 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1125 ); 1507 );
1126 1508
1127 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1509 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1128 $table->add_at (1, 8, new CFPlus::UI::Entry 1510 $table->add_at (1, 8, new CFPlus::UI::Entry
1129 text => $CFG->{output_rate}, 1511 text => $CFG->{output_rate},
1130 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1512 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1131 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1513 . "when sending data. When 0 or unset, the server "
1132 . "default will be used, which is usually around 100kb/s.", 1514 . "default will be used, which is usually around 100kb/s. Most servers will "
1515 . "dynamically find an optimal rate, so adjust this only when necessary.",
1133 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1516 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1134 ); 1517 );
1135 1518
1136 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1519 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1137 $table->add_at (1, 9, new CFPlus::UI::Entry 1520 $table->add_at (1, 9, new CFPlus::UI::Entry
1138 text => $CFG->{output_count}, 1521 text => $CFG->{output_count},
1139 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1522 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1140 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1523 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1141 ); 1524 );
1142 1525
1143 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1526 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1144 $table->add_at (1, 10, new CFPlus::UI::Entry 1527 $table->add_at (1, 10, new CFPlus::UI::Entry
1145 text => $CFG->{output_sync}, 1528 text => $CFG->{output_sync},
1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1529 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1147 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1530 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1148 ); 1531 );
1149 1532
1150 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1533 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1151 expand => 1, 1534 expand => 1,
1152 align => 0, 1535 align => 0,
1153 text => "Login", 1536 text => "Login",
1154 on_activate => sub { 1537 on_activate => sub {
1155 $CONN ? stop_game 1538 $CONN ? stop_game
1156 : start_game; 1539 : start_game;
1157 0 1540 1
1158 }, 1541 },
1159 ); 1542 );
1160 1543
1161 $vbox->add (new CFPlus::UI::FancyFrame 1544 $vbox->add (new CFPlus::UI::FancyFrame
1162 label => "Server Info", 1545 label => "Server Info",
… …
1352 $sw1->add ($INV = new CFPlus::UI::Inventory); 1735 $sw1->add ($INV = new CFPlus::UI::Inventory);
1353 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1736 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1354 1737
1355 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1738 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1356 1739
1357 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1740 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1358 1741
1359 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1742 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1360 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1743 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1361 1744
1362 # XXX: Call after $INVR = ... because set_opencont sets the items 1745 # XXX: Call after $INVR = ... because set_opencont sets the items
1363 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1746 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1364 1747
1365 $hb 1748 $hb
1749}
1750
1751sub media_window {
1752 my $vb = new CFPlus::UI::VBox;
1753
1754 $vb->add (new CFPlus::UI::FancyFrame
1755 label => "Currently playing music",
1756 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1757 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1758 );
1759
1760 $vb->add (new CFPlus::UI::FancyFrame
1761 label => "Other media used in this session",
1762 expand => 1,
1763 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1764 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1765 );
1766
1767 $vb
1768}
1769
1770sub add_license {
1771 my ($meta) = @_;
1772
1773 $meta = $meta->{data}
1774 or return;
1775
1776 $meta->{license} || $meta->{author} || $meta->{source}
1777 or return;
1778
1779 $LICENSE_WIDGET->add_paragraph ({
1780 fg => [1, 1, 1, 1],
1781 markup => "<small>"
1782 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1783 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1784 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1785 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1786 . "</small>",
1787 });
1788 $LICENSE_WIDGET->scroll_to_bottom;
1366} 1789}
1367 1790
1368sub toggle_player_page { 1791sub toggle_player_page {
1369 my ($widget) = @_; 1792 my ($widget) = @_;
1370 1793
… …
1409 $ntb->add_tab ( 1832 $ntb->add_tab (
1410 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1833 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1411 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1834 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1412 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1835 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1413 ); 1836 );
1414 $ntb->add_tab (Pickup => autopickup_setup, 1837 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1415 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1838 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1839
1840 $ntb->add_tab (Media => media_window,
1841 "License, Author and Source info for media sent by the server.");
1416 1842
1417 $ntb->set_current_page ($INVENTORY_PAGE); 1843 $ntb->set_current_page ($INVENTORY_PAGE);
1418 1844
1419 $plwin->add ($ntb); 1845 $plwin->add ($ntb);
1420 $plwin 1846 $plwin
… …
1574 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2000 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1575 ); 2001 );
1576 $hb->add (new CFPlus::UI::Button 2002 $hb->add (new CFPlus::UI::Button
1577 text => "Quit anyway", 2003 text => "Quit anyway",
1578 expand => 1, 2004 expand => 1,
1579 on_activate => sub { exit }, 2005 on_activate => sub { Event::unloop_all },
1580 ); 2006 );
1581 } 2007 }
1582 2008
1583 $QUIT_DIALOG->show; 2009 $QUIT_DIALOG->show;
1584 $QUIT_DIALOG->grab_focus; 2010 $QUIT_DIALOG->grab_focus;
… …
1657 2083
1658 $SDL_ACTIVE = 1; 2084 $SDL_ACTIVE = 1;
1659 $LAST_REFRESH = time - 0.01; 2085 $LAST_REFRESH = time - 0.01;
1660 2086
1661 CFPlus::OpenGL::init; 2087 CFPlus::OpenGL::init;
2088 CFPlus::Macro::init;
1662 2089
1663 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2090 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1664 2091
1665 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2092 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1666 2093
1667 ############################################################################# 2094 #############################################################################
1668 2095
1669 if ($DEBUG_STATUS) { 2096 if ($DEBUG_STATUS) {
1670 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2097 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1671 } else { 2098 } else {
1672 # create the widgets 2099 # create/configure the widgets
2100
2101 $CFPlus::UI::ROOT->connect (key_down => sub {
2102 my (undef, $ev) = @_;
2103
2104 if (my @macros = CFPlus::Macro::find $ev) {
2105 CFPlus::Macro::execute $_ for @macros;
2106
2107 return 1;
2108 }
2109
2110 0
2111 });
1673 2112
1674 $DEBUG_STATUS = new CFPlus::UI::Label 2113 $DEBUG_STATUS = new CFPlus::UI::Label
1675 padding => 0, 2114 padding => 0,
1676 z => 100, 2115 z => 100,
1677 force_x => "max", 2116 force_x => "max",
… …
1707 $MESSAGE_WINDOW->activate_console ($preset) 2146 $MESSAGE_WINDOW->activate_console ($preset)
1708 if $MESSAGE_WINDOW; 2147 if $MESSAGE_WINDOW;
1709 }); 2148 });
1710 $MAPWIDGET->show; 2149 $MAPWIDGET->show;
1711 $MAPWIDGET->grab_focus; 2150 $MAPWIDGET->grab_focus;
2151
2152 $COMPLETER = new CFPlus::MapWidget::Command::
2153 command => { },
2154 tooltip => "#completer_help",
2155 ;
1712 2156
1713 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2157 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1714 title => "Setup", 2158 title => "Setup",
1715 name => "setup_dialog", 2159 name => "setup_dialog",
1716 x => 'center', 2160 x => 'center',
… …
1778 tooltip => "Terminates the program", 2222 tooltip => "Terminates the program",
1779 on_activate => sub { 2223 on_activate => sub {
1780 if ($CONN) { 2224 if ($CONN) {
1781 open_quit_dialog; 2225 open_quit_dialog;
1782 } else { 2226 } else {
1783 exit; 2227 Event::unloop_all;
1784 } 2228 }
1785 0 2229 0
1786 }, 2230 },
1787 ); 2231 );
1788 2232
1789 $BUTTONBAR->show; 2233 $BUTTONBAR->show;
1790 $SETUP_DIALOG->show; 2234 $SETUP_DIALOG->show;
2235 $MESSAGE_WINDOW->show;
1791 } 2236 }
1792 2237
1793 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2238 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1794} 2239}
1795 2240
… …
1797 CFPlus::OpenGL::shutdown; 2242 CFPlus::OpenGL::shutdown;
1798 2243
1799 undef $SDL_ACTIVE; 2244 undef $SDL_ACTIVE;
1800} 2245}
1801 2246
1802sub audio_channel_finished {
1803 my ($channel) = @_;
1804
1805 #warn "channel $channel finished\n";#d#
1806}
1807
1808sub audio_music_set {
1809 my ($songs) = @_;
1810
1811 my @want =
1812 grep $_,
1813 map $CONN->{music_meta}{$_},
1814 @$songs;
1815
1816 if (@want) {
1817 @MUSIC_WANT = @want;
1818 &audio_music_changed ();
1819 }
1820}
1821
1822sub audio_music_start {
1823 my $meta = $MUSIC_PLAYING_META;
1824
1825 CFPlus::DB::get res_data => $meta->{name}, sub {
1826 return unless $SDL_MIXER;
1827
1828 # music might have changed...
1829 $meta eq $MUSIC_PLAYING_META
1830 or return &audio_music_start ();
1831
1832 $MUSIC_PLAYING_DATA = \$_[0];
1833
1834 my $rwops = $meta->{path}
1835 ? new_from_file CFPlus::RW $meta->{path}
1836 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1837
1838 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1839 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1840
1841 my $NOW = time;
1842
1843 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1844 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1845 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1846 $MUSIC_START = time - $pos;
1847 } else {
1848 $MUSIC_PLAYER->play (0);
1849 $MUSIC_START = time;
1850 }
1851
1852 delete $MUSIC_PLAYING_META->{stop_time};
1853 delete $MUSIC_PLAYING_META->{stop_pos};
1854 }
1855}
1856
1857sub audio_music_changed {
1858 return unless $CFG->{bgm_enable};
1859 return unless $SDL_MIXER;
1860
1861 # default MUSIC_WANT == MUSIC_DEFAULT
1862 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1863
1864 # if the currently playing song is acceptable, let it continue
1865 return if $MUSIC_PLAYING_META
1866 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1867
1868 my $NOW = time;
1869
1870 if ($MUSIC_PLAYING_META) {
1871 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1872 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1873 CFPlus::MixMusic::fade_out 1000;
1874 } else {
1875 # sort by stop time, oldest first
1876 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1877
1878 # if the most recently-played piece played very recently,
1879 # resume it, else choose the oldest piece for rotation.
1880 $MUSIC_PLAYING_META =
1881 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1882 ? $MUSIC_WANT[-1]
1883 : $MUSIC_WANT[0];
1884
1885 audio_music_start;
1886 }
1887}
1888
1889sub audio_music_finished {
1890 undef $MUSIC_PLAYER;
1891 undef $MUSIC_PLAYING_META;
1892 undef $MUSIC_PLAYING_DATA;
1893
1894 audio_music_changed;
1895}
1896
1897sub audio_init {
1898 if ($CFG->{audio_enable}) {
1899 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1900 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1901 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1902
1903 unless ($SDL_MIXER) {
1904 status "Unable to open sound device: there will be no sound";
1905 return;
1906 }
1907
1908 CFPlus::Mix_AllocateChannels 8;
1909 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1910
1911 audio_music_finished;
1912
1913 local $_;
1914 while (<$fh>) {
1915 next if /^\s*#/;
1916 next if /^\s*$/;
1917
1918 my ($file, $volume, $event) = split /\s+/, $_, 3;
1919
1920 push @SOUNDS, "$volume,$file";
1921
1922 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1923 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1924 my $chunk = new CFPlus::MixChunk $rwops;
1925 $chunk->volume ($volume * 128 / 100);
1926 $chunk
1927 };
1928 }
1929 } else {
1930 status "unable to open sound config: $!";
1931 }
1932 } else {
1933 undef $SDL_MIXER;
1934 }
1935}
1936
1937sub audio_shutdown {
1938 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1939 undef $SDL_MIXER;
1940 @SOUNDS = ();
1941 %AUDIO_CHUNKS = ();
1942}
1943
1944my %animate_object; 2247my %animate_object;
1945my $animate_timer; 2248my $animate_timer;
1946 2249
1947my $fps = 9; 2250my $fps = 9;
1948 2251
1949my %demo;#d#
1950
1951sub force_refresh { 2252sub force_refresh {
2253 if ($ENV{CFPLUS_DEBUG} & 4) {
1952 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2254 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2255 debug sprintf "%3.2f", $fps;
2256 }
1954 2257
1955 $CFPlus::UI::ROOT->draw; 2258 $CFPlus::UI::ROOT->draw;
1956 2259 CFPlus::SDL_GL_SwapBuffers;
1957 $WANT_REFRESH = 0;
1958 $CAN_REFRESH = 0;
1959 $LAST_REFRESH = $NOW; 2260 $LAST_REFRESH = $NOW;
1960 2261 $WANT_REFRESH->stop;
1961 CFPlus::SDL_GL_SwapBuffers;
1962} 2262}
1963 2263
2264$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2265
1964my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2266my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1965 $NOW = time; 2267 $NOW = time;
1966 2268
1967 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2269 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1968 for CFPlus::poll_events; 2270 for CFPlus::poll_events;
1969 2271
1970 if (%animate_object) { 2272 if (%animate_object) {
1971 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2273 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1972 ++$WANT_REFRESH; 2274 $WANT_REFRESH->start;
1973 }
1974
1975 if ($WANT_REFRESH) {
1976 force_refresh;
1977 } else {
1978 $CAN_REFRESH = 1;
1979 } 2275 }
1980}); 2276});
1981 2277
1982sub animation_start { 2278sub animation_start {
1983 my ($widget) = @_; 2279 my ($widget) = @_;
… …
1989 delete $animate_object{$widget}; 2285 delete $animate_object{$widget};
1990} 2286}
1991 2287
1992%SDL_CB = ( 2288%SDL_CB = (
1993 CFPlus::SDL_QUIT => sub { 2289 CFPlus::SDL_QUIT => sub {
1994 exit; 2290 Event::unloop_all;
1995 }, 2291 },
1996 CFPlus::SDL_VIDEORESIZE => sub { 2292 CFPlus::SDL_VIDEORESIZE => sub {
1997 }, 2293 },
1998 CFPlus::SDL_VIDEOEXPOSE => sub { 2294 CFPlus::SDL_VIDEOEXPOSE => sub {
1999 CFPlus::UI::full_refresh; 2295 CFPlus::UI::full_refresh;
… …
2038 CFPlus::DB::Server::run; 2334 CFPlus::DB::Server::run;
2039 2335
2040 CFPlus::UI::set_layout ($::CFG->{layout}); 2336 CFPlus::UI::set_layout ($::CFG->{layout});
2041 2337
2042 my %DEF_CFG = ( 2338 my %DEF_CFG = (
2043 sdl_mode => 0, 2339 sdl_mode => 0,
2044 width => 640,
2045 height => 480,
2046 fullscreen => 0, 2340 fullscreen => 0,
2047 fast => 0, 2341 fast => 0,
2342 force_opengl11 => undef,
2343 texture_compression => 1,
2048 map_scale => 1, 2344 map_scale => 1,
2049 fow_enable => 1, 2345 fow_enable => 1,
2050 fow_intensity => 0, 2346 fow_intensity => 0,
2051 map_smoothing => 1, 2347 map_smoothing => 1,
2052 gui_fontsize => 1, 2348 gui_fontsize => 1,
2053 log_fontsize => 0.7, 2349 log_fontsize => 0.7,
2054 gauge_fontsize => 1, 2350 gauge_fontsize => 1,
2055 gauge_size => 0.35, 2351 gauge_size => 0.35,
2056 stat_fontsize => 0.7, 2352 stat_fontsize => 0.7,
2057 mapsize => 100, 2353 mapsize => 100,
2058 audio_enable => 1, 2354 audio_enable => 1,
2355 audio_hw_channels => 2,
2356 audio_hw_frequency => 22050,
2357 audio_hw_chunksize => 2048,
2358 audio_mix_channels => 8,
2359 effects_enable => 1,
2360 effects_volume => 1,
2059 bgm_enable => 1, 2361 bgm_enable => 1,
2060 bgm_volume => 0.25, 2362 bgm_volume => 0.5,
2061 output_sync => 1, 2363 output_sync => 1,
2062 output_count => 1, 2364 output_count => 1,
2063 output_rate => "", 2365 output_rate => "",
2064 pickup => 0, 2366 pickup => 0,
2065 inv_sort => "mtime", 2367 inv_sort => "mtime",
2066 default => "profile", # default profile 2368 default => "profile", # default profile
2067 show_tips => 1, 2369 show_tips => 1,
2068 logview_max_par => 1000, 2370 logview_max_par => 1000,
2069 ); 2371 );
2070 2372
2071 while (my ($k, $v) = each %DEF_CFG) { 2373 while (my ($k, $v) = each %DEF_CFG) {
2072 $CFG->{$k} = $v unless exists $CFG->{$k}; 2374 $CFG->{$k} = $v unless exists $CFG->{$k};
2073 } 2375 }
… …
2130# } 2432# }
2131# my $t2 = Time::HiRes::time; 2433# my $t2 = Time::HiRes::time;
2132# warn $t2-$t1; 2434# warn $t2-$t1;
2133# } 2435# }
2134 2436
2135 $startup_done->();
2136
2137 video_init; 2437 video_init;
2138 audio_init; 2438 audio_init;
2139} 2439}
2140 2440
2141show_tip_of_the_day if $CFG->{show_tips}; 2441show_tip_of_the_day if $CFG->{show_tips};
2142 2442
2443Event->idle (cb => sub {
2444 $_[0]->w->cancel;
2445 $startup_done->();
2446});
2447
2143Event::loop; 2448Event::loop;
2449
2450#video_shutdown;
2451#audio_shutdown;
2144#CFPlus::SDL_Quit; 2452CFPlus::SDL_Quit;
2145#CFPlus::_exit 0;
2146
2147END {
2148 CFPlus::SDL_Quit;
2149 CFPlus::DB::Server::stop; 2453CFPlus::DB::Server::stop;
2150}
2151 2454
2152=head1 NAME 2455=head1 NAME
2153 2456
2154cfplus - A Crossfire+ and Crossfire game client 2457cfplus - A Crossfire TRT and Crossfire game client
2155 2458
2156=head1 SYNOPSIS 2459=head1 SYNOPSIS
2157 2460
2158Just run it - no commandline arguments are supported. 2461Just run it - no commandline arguments are supported.
2159 2462
2160=head1 USAGE 2463=head1 USAGE
2161 2464
2162cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2465cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2163fullscreen and interactively. 2466be used in fullscreen mode and interactively.
2164 2467
2165=head1 DEBUGGING 2468=head1 DEBUGGING
2166 2469
2167 2470
2168CFPLUS_DEBUG - environment variable 2471CFPLUS_DEBUG - environment variable

Diff Legend

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