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.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 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}
86use CFPlus::DB; 87use CFPlus::DB;
87use CFPlus::UI; 88use CFPlus::UI;
88use CFPlus::UI::Canvas; 89use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
91use CFPlus::UI::MessageWindow; 93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
92use CFPlus::Pod; 95use CFPlus::Pod;
93use CFPlus::MapWidget; 96use CFPlus::MapWidget;
94use CFPlus::Macro; 97use CFPlus::Macro;
95 98
96$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
113our $CONN; 116our $CONN;
114our $PROFILE; # current profile 117our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 119
117our $WANT_REFRESH; 120our $WANT_REFRESH;
118our $CAN_REFRESH;
119 121
120our @SDL_MODES; 122our @SDL_MODES;
121our $WIDTH; 123our $WIDTH;
122our $HEIGHT; 124our $HEIGHT;
123our $FULLSCREEN; 125our $FULLSCREEN;
127our $FONT_FIXED; 129our $FONT_FIXED;
128 130
129our $MAP; 131our $MAP;
130our $MAPMAP; 132our $MAPMAP;
131our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
132our $BUTTONBAR; 135our $BUTTONBAR;
133our $METASERVER; 136our $METASERVER;
134our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 138our $QUIT_DIALOG;
136our $HOST_ENTRY; 139our $HOST_ENTRY;
144our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
145 148
146our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
147our $PL_WINDOW; 150our $PL_WINDOW;
148 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
149our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
150our $STATS_PAGE; 157our $STATS_PAGE;
151our $SKILL_PAGE; 158our $SKILL_PAGE;
152our $SPELL_PAGE; 159our $SPELL_PAGE;
153our $SPELL_LIST; 160our $SPELL_LIST;
159our $STATWIDS; 166our $STATWIDS;
160 167
161our $SDL_ACTIVE; 168our $SDL_ACTIVE;
162our %SDL_CB; 169our %SDL_CB;
163 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
164our $SDL_MIXER; 196our $SDL_MIXER;
197
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 198our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT; 199our $MUSIC_WANT; # arryref of ambient music we want to play
200our @MUSIC_HAVE; # ambient music we have on disk
167our $MUSIC_START; 201our $MUSIC_START;
202our @MUSIC_JINGLE; # which jingles to play next
168our $MUSIC_PLAYING_DATA; 203our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 204our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 205our $MUSIC_PLAYER;
171our $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
172our @SOUNDS; # event => file mapping 207
173our %AUDIO_CHUNKS; # audio files 208our %AUDIO_CHUNK; # audio "files"
209our %AUDIO_PLAY; # which audio faces should be played
174 210
175our $ALT_ENTER_MESSAGE; 211sub audio_channel_finished {
176our $STATUSBOX; 212 my ($channel) = @_;
177our $DEBUG_STATUS;
178 213
179our $INV; 214# warn "channel $channel finished\n";#d#
180our $INVR;
181our $INV_RIGHT_HB;
182
183our $PICKUP_CFG;
184
185sub status {
186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187} 215}
188 216
189sub debug { 217sub audio_sound_push($) {
190 $DEBUG_STATUS->set_text ($_[0]);
191}
192
193sub message {
194 my ($para) = @_; 218 my ($face) = @_;
195 $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 }
196} 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
415 unless ($SDL_MIXER) {
416 status "Unable to open sound device: there will be no sound";
417 return;
418 }
419
420 CFPlus::Mix_AllocateChannels 16;
421
422 audio_music_finished;
423 } else {
424 undef $SDL_MIXER;
425 }
426}
427
428sub audio_shutdown {
429 undef $MUSIC_PLAYER;
430 undef $MUSIC_PLAYING_META;
431 undef $MUSIC_PLAYING_DATA;
432
433 $MUSIC_WANT = [];
434 @MUSIC_JINGLE = ();
435 %AUDIO_PLAY = ();
436 %AUDIO_CHUNK = ();
437
438 CFPlus::Mix_CloseAudio if $SDL_MIXER;
439 undef $SDL_MIXER;
440}
441
442#############################################################################
197 443
198sub destroy_query_dialog { 444sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 445 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 446 if $_[0]{query_dialog};
201} 447}
481 $SETUP_DIALOG->show; 727 $SETUP_DIALOG->show;
482 $PL_WINDOW->hide; 728 $PL_WINDOW->hide;
483 $SPELL_LIST->clear_spells; 729 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 730 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485 731
486 &audio_music_set ([]); 732 &audio_music_set_ambient ([]);
487 733
488 return unless $CONN; 734 return unless $CONN;
489 735
490 status "connection closed"; 736 status "connection closed";
491 737
533 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 779 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
534 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 780 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
535 state => $CFG->{fullscreen}, 781 state => $CFG->{fullscreen},
536 tooltip => "Bring the client into fullscreen mode.", 782 tooltip => "Bring the client into fullscreen mode.",
537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
784 );
785
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{force_opengl11},
789 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
790 . "higher memory usage and slower performance. It will, however, help tremendously on "
791 . "cards that claim to support a feature but fall back to software rendering. "
792 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
793 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
794 . "experience extremely low framerates and your card should do better, try this option.</b>",
795 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
796 );
797
798 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
799 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
800 state => $CFG->{texture_compression},
801 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
802 . "will save a lot of memory and increase performance. The compression algorithm "
803 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
804 . "forced OpenGL 1.1 mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
538 ); 806 );
539 807
540 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 808 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
541 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
542 state => $CFG->{fast}, 810 state => $CFG->{fast},
570 838
571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
572 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{map_smoothing}, 841 state => $CFG->{map_smoothing},
574 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 842 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
575 . "This increases load on the graphics subsystem and works only with 2.x servers. " 843 . "This increases load on the graphics subsystem and works only with TRT servers. "
576 . "Changes take effect at next connection only.", 844 . "Changes take effect at next login only.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 845 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578 ); 846 );
579 847
580 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
581 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
592 ); 860 );
593 861
594 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 862 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
595 $table->add_at (1, $row++, new CFPlus::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 864 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
597 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 865 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
866 . "but you still need to press apply to correctly re-layout the widget.",
598 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 867 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
599 ); 868 );
600 869
601 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 870 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
602 $table->add_at (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
624} 893}
625 894
626sub audio_setup { 895sub audio_setup {
627 my $vbox = new CFPlus::UI::VBox; 896 my $vbox = new CFPlus::UI::VBox;
628 897
629 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 898 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630 899
631 my $row = 0; 900 my $row = 0;
632 901
633 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 903 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
638 ); 907 );
639# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 908# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
640# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 909# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
641# $CFG->{effects_volume} = $_[1]; 910# $CFG->{effects_volume} = $_[1];
642# }); 911# });
912
913 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
914 $table->add_at (1, $row, new CFPlus::UI::CheckBox
915 expand => 1, state => $CFG->{effects_enable},
916 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
917 on_changed => sub {
918 $CFG->{effects_enable} = $_[1];
919 $CONN->update_fx_want if $CONN;
920 0
921 }
922 );
923 $table->add_at (2, $row++, new CFPlus::UI::Slider
924 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
925 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
926 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
927 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
928 );
929
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 930 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 931 $table->add_at (1, $row, new CFPlus::UI::CheckBox
645 $hbox->add (new CFPlus::UI::CheckBox
646 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
647 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 933 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
648 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 934 on_changed => sub {
935 $CFG->{bgm_enable} = $_[1];
936 $CONN->update_fx_want if $CONN;
937 audio_music_push;
938 0
939 }
649 ); 940 );
650 $hbox->add (new CFPlus::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652 tooltip => "The volume of the background music. Changes are instant.", 943 tooltip => "The volume of the background music. Changes are instant.",
653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 944 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
654 ); 945 );
655 946
656 $table->add_at (1, $row++, new CFPlus::UI::Button 947 $table->add_at (1, $row++, new CFPlus::UI::Button
657 expand => 1, align => 0, text => "Apply", 948 c_colspan => 2, expand => 1, align => 0, text => "Apply",
658 tooltip => "Apply the audio settings", 949 tooltip => "Apply the audio settings",
659 on_activate => sub { 950 on_activate => sub {
660 audio_shutdown (); 951 audio_shutdown ();
661 audio_init (); 952 audio_init ();
662 0 953 0
704 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 995 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
705 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 996 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
706 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 997 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
707 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 998 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
708 999
709 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1000 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1001 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1002 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
710 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1003 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
711 1004
712 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
713 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
714 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
715 }; 1009 };
716 1010
717 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
718 1012
719 $win 1013 $win
733 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1027 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734 1028
735 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1029 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736 1030
737 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1031 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1032 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
739 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1033 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
740 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1034 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
741 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1035 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
742 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1036 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743 1037
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1038 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745 1039
746 $c->add_items ({ 1040 $c->add_items ({
920 $r 1214 $r
921} 1215}
922 1216
923sub skill_window { 1217sub skill_window {
924 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
925 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1220 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1221
926 $sw 1222 $sw
927} 1223}
928 1224
929sub formsep($) { 1225sub formsep($) {
930 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
1071 text => $CFG->{profile}{default}{host}, 1367 text => $CFG->{profile}{default}{host},
1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1368 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1073 on_changed => sub { 1369 on_changed => sub {
1074 my ($self, $value) = @_; 1370 my ($self, $value) = @_;
1075 $CFG->{profile}{default}{host} = $value; 1371 $CFG->{profile}{default}{host} = $value;
1076 0 1372 1
1077 } 1373 }
1078 ); 1374 );
1079 1375
1080 $vbox->add (new CFPlus::UI::Button 1376 $vbox->add (new CFPlus::UI::Button
1081 expand => 1, 1377 expand => 1,
1082 text => "Server List", 1378 text => "Server List",
1083 other => $METASERVER, 1379 other => $METASERVER,
1084 tooltip => "Show a list of available crossfire servers", 1380 tooltip => "Show a list of available crossfire servers",
1085 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1381 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1382 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1087 ); 1383 );
1088 } 1384 }
1089 1385
1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1386 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1091 $table->add_at (1, 4, new CFPlus::UI::Entry 1387 $table->add_at (1, 4, new CFPlus::UI::Entry
1092 text => $CFG->{profile}{default}{user}, 1388 text => $CFG->{profile}{default}{user},
1093 tooltip => "The name of your character on the server", 1389 tooltip => "The name of your character on the server",
1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1390 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1095 ); 1391 );
1096 1392
1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1393 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1098 $table->add_at (1, 5, new CFPlus::UI::Entry 1394 $table->add_at (1, 5, new CFPlus::UI::Entry
1099 text => $CFG->{profile}{default}{password}, 1395 text => $CFG->{profile}{default}{password},
1100 hidden => 1, 1396 hidden => 1,
1101 tooltip => "The password for your character", 1397 tooltip => "The password for your character",
1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1103 ); 1399 );
1104 1400
1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1401 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1106 $table->add_at (1, 7, new CFPlus::UI::Slider 1402 $table->add_at (1, 7, new CFPlus::UI::Slider
1107 force_w => 100, 1403 force_w => 100,
1108 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1404 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109 tooltip => "This is the size of the portion of the map update the server sends you. " 1405 tooltip => "This is the size of the portion of the map update the server sends you. "
1110 . "If you set this to a high value you will be able to see further, " 1406 . "If you set this to a high value you will be able to see further, "
1111 . "but you also increase bandwidth requirements and latency. " 1407 . "but you also increase bandwidth requirements and latency. "
1112 . "This option is only used once at log-in.", 1408 . "This option is only used once at log-in.",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1409 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1114 ); 1410 );
1115 1411
1116 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1412 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117 $table->add_at (1, 8, new CFPlus::UI::Entry 1413 $table->add_at (1, 8, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate}, 1414 text => $CFG->{output_rate},
1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1415 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1416 . "when sending data. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s.", 1417 . "default will be used, which is usually around 100kb/s. Most servers will "
1418 . "dynamically find an optimal rate, so adjust this only when necessary.",
1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1419 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1123 ); 1420 );
1124 1421
1125 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1422 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1126 $table->add_at (1, 9, new CFPlus::UI::Entry 1423 $table->add_at (1, 9, new CFPlus::UI::Entry
1127 text => $CFG->{output_count}, 1424 text => $CFG->{output_count},
1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1425 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1426 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1130 ); 1427 );
1131 1428
1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1429 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1133 $table->add_at (1, 10, new CFPlus::UI::Entry 1430 $table->add_at (1, 10, new CFPlus::UI::Entry
1134 text => $CFG->{output_sync}, 1431 text => $CFG->{output_sync},
1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1432 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1433 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1137 ); 1434 );
1138 1435
1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1436 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1140 expand => 1, 1437 expand => 1,
1141 align => 0, 1438 align => 0,
1142 text => "Login", 1439 text => "Login",
1143 on_activate => sub { 1440 on_activate => sub {
1144 $CONN ? stop_game 1441 $CONN ? stop_game
1145 : start_game; 1442 : start_game;
1146 0 1443 1
1147 }, 1444 },
1148 ); 1445 );
1149 1446
1150 $vbox->add (new CFPlus::UI::FancyFrame 1447 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info", 1448 label => "Server Info",
1341 $sw1->add ($INV = new CFPlus::UI::Inventory); 1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1342 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1343 1640
1344 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1345 1642
1346 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1347 1644
1348 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1645 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1349 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1350 1647
1351 # XXX: Call after $INVR = ... because set_opencont sets the items 1648 # XXX: Call after $INVR = ... because set_opencont sets the items
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1649 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353 1650
1354 $hb 1651 $hb
1652}
1653
1654sub media_window {
1655 my $vb = new CFPlus::UI::VBox;
1656
1657 $vb->add (new CFPlus::UI::FancyFrame
1658 label => "Currently playing music",
1659 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1660 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1661 );
1662
1663 $vb->add (new CFPlus::UI::FancyFrame
1664 label => "Other media used in this session",
1665 expand => 1,
1666 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1667 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1668 );
1669
1670 $vb
1671}
1672
1673sub add_license {
1674 my ($meta) = @_;
1675
1676 $meta = $meta->{data}
1677 or return;
1678
1679 $meta->{license} || $meta->{author} || $meta->{source}
1680 or return;
1681
1682 $LICENSE_WIDGET->add_paragraph ({
1683 fg => [1, 1, 1, 1],
1684 markup => "<small>"
1685 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1686 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1687 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1688 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1689 . "</small>",
1690 });
1691 $LICENSE_WIDGET->scroll_to_bottom;
1355} 1692}
1356 1693
1357sub toggle_player_page { 1694sub toggle_player_page {
1358 my ($widget) = @_; 1695 my ($widget) = @_;
1359 1696
1398 $ntb->add_tab ( 1735 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1737 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1738 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1739 );
1403 $ntb->add_tab (Pickup => autopickup_setup, 1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1404 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1741 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1742
1743 $ntb->add_tab (Media => media_window,
1744 "License, Author and Source info for media sent by the server.");
1405 1745
1406 $ntb->set_current_page ($INVENTORY_PAGE); 1746 $ntb->set_current_page ($INVENTORY_PAGE);
1407 1747
1408 $plwin->add ($ntb); 1748 $plwin->add ($ntb);
1409 $plwin 1749 $plwin
1563 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1903 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1564 ); 1904 );
1565 $hb->add (new CFPlus::UI::Button 1905 $hb->add (new CFPlus::UI::Button
1566 text => "Quit anyway", 1906 text => "Quit anyway",
1567 expand => 1, 1907 expand => 1,
1568 on_activate => sub { exit }, 1908 on_activate => sub { Event::unloop_all },
1569 ); 1909 );
1570 } 1910 }
1571 1911
1572 $QUIT_DIALOG->show; 1912 $QUIT_DIALOG->show;
1573 $QUIT_DIALOG->grab_focus; 1913 $QUIT_DIALOG->grab_focus;
1646 1986
1647 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1648 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1649 1989
1650 CFPlus::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1651 1992
1652 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1653 1994
1654 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1655 1996
1656 ############################################################################# 1997 #############################################################################
1657 1998
1658 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1659 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1660 } else { 2001 } else {
1661 # create the widgets 2002 # create/configure the widgets
2003
2004 $CFPlus::UI::ROOT->connect (key_down => sub {
2005 my (undef, $ev) = @_;
2006
2007 if (my @macros = CFPlus::Macro::find $ev) {
2008 CFPlus::Macro::execute $_ for @macros;
2009
2010 return 1;
2011 }
2012
2013 0
2014 });
1662 2015
1663 $DEBUG_STATUS = new CFPlus::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1664 padding => 0, 2017 padding => 0,
1665 z => 100, 2018 z => 100,
1666 force_x => "max", 2019 force_x => "max",
1696 $MESSAGE_WINDOW->activate_console ($preset) 2049 $MESSAGE_WINDOW->activate_console ($preset)
1697 if $MESSAGE_WINDOW; 2050 if $MESSAGE_WINDOW;
1698 }); 2051 });
1699 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
2054
2055 $COMPLETER = new CFPlus::MapWidget::Command::
2056 command => { },
2057 tooltip => "#completer_help",
2058 ;
1701 2059
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 2061 title => "Setup",
1704 name => "setup_dialog", 2062 name => "setup_dialog",
1705 x => 'center', 2063 x => 'center',
1767 tooltip => "Terminates the program", 2125 tooltip => "Terminates the program",
1768 on_activate => sub { 2126 on_activate => sub {
1769 if ($CONN) { 2127 if ($CONN) {
1770 open_quit_dialog; 2128 open_quit_dialog;
1771 } else { 2129 } else {
1772 exit; 2130 Event::unloop_all;
1773 } 2131 }
1774 0 2132 0
1775 }, 2133 },
1776 ); 2134 );
1777 2135
1778 $BUTTONBAR->show; 2136 $BUTTONBAR->show;
1779 $SETUP_DIALOG->show; 2137 $SETUP_DIALOG->show;
2138 $MESSAGE_WINDOW->show;
1780 } 2139 }
1781 2140
1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2141 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1783} 2142}
1784 2143
1786 CFPlus::OpenGL::shutdown; 2145 CFPlus::OpenGL::shutdown;
1787 2146
1788 undef $SDL_ACTIVE; 2147 undef $SDL_ACTIVE;
1789} 2148}
1790 2149
1791sub audio_channel_finished {
1792 my ($channel) = @_;
1793
1794# warn "channel $channel finished\n";#d#
1795}
1796
1797our %AUDIO_PLAY;
1798our %AUDIO_CHUNK;
1799
1800sub audio_sound_push($) {
1801 my ($face) = @_;
1802
1803 if (my $chunk = $AUDIO_CHUNK{$face}) {
1804 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1805 my (undef, $dx, $dy, $vol) = @$_;
1806
1807 my $channel = $chunk->play
1808 or return;
1809
1810 $channel->volume (128 + $vol);
1811 $dx = $dx / 10 * 255;
1812 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816 }
1817 } else {
1818 # sound_meta not set means data is in flight either way
1819 my $meta = $CONN->{sound_meta}{$face}
1820 or return;
1821
1822 # fetch from database
1823 CFPlus::DB::get res_data => $meta->{name}, sub {
1824 my $vol = $meta->{meta}{volume} || 100;
1825 my $rwops = new CFPlus::RW $_[0];
1826 my $chunk = new CFPlus::MixChunk $rwops;
1827 $chunk->volume ($vol * 128 / 100);
1828 $AUDIO_CHUNK{$face} = $chunk;
1829
1830 audio_sound_push ($face);
1831 };
1832 }
1833}
1834
1835sub audio_sound_play {
1836 my ($face, $dx, $dy, $vol) = @_;
1837
1838 $SDL_MIXER
1839 or return;
1840
1841 my $queue = $AUDIO_PLAY{$face} ||= [];
1842 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843 audio_sound_push $face
1844 unless @$queue > 1;
1845}
1846
1847sub audio_music_set {
1848 my ($songs) = @_;
1849
1850 my @want =
1851 grep $_,
1852 map $CONN->{music_meta}{$_},
1853 @$songs;
1854
1855 if (@want) {
1856 @MUSIC_WANT = @want;
1857 &audio_music_changed ();
1858 }
1859}
1860
1861sub audio_music_start {
1862 my $meta = $MUSIC_PLAYING_META;
1863
1864 CFPlus::DB::get res_data => $meta->{name}, sub {
1865 return unless $SDL_MIXER;
1866
1867 # music might have changed...
1868 $meta eq $MUSIC_PLAYING_META
1869 or return &audio_music_start ();
1870
1871 $MUSIC_PLAYING_DATA = \$_[0];
1872
1873 my $rwops = $meta->{path}
1874 ? new_from_file CFPlus::RW $meta->{path}
1875 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880 my $NOW = time;
1881
1882 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885 $MUSIC_START = time - $pos;
1886 } else {
1887 $MUSIC_PLAYER->play (0);
1888 $MUSIC_START = time;
1889 }
1890
1891 delete $MUSIC_PLAYING_META->{stop_time};
1892 delete $MUSIC_PLAYING_META->{stop_pos};
1893 }
1894}
1895
1896sub audio_music_changed {
1897 return unless $CFG->{bgm_enable};
1898 return unless $SDL_MIXER;
1899
1900 # default MUSIC_WANT == MUSIC_DEFAULT
1901 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903 # if the currently playing song is acceptable, let it continue
1904 return if $MUSIC_PLAYING_META
1905 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907 my $NOW = time;
1908
1909 if ($MUSIC_PLAYING_META) {
1910 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1911 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912 CFPlus::MixMusic::fade_out 1000;
1913 } else {
1914 # sort by stop time, oldest first
1915 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917 # if the most recently-played piece played very recently,
1918 # resume it, else choose the oldest piece for rotation.
1919 $MUSIC_PLAYING_META =
1920 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921 ? $MUSIC_WANT[-1]
1922 : $MUSIC_WANT[0];
1923
1924 audio_music_start;
1925 }
1926}
1927
1928sub audio_music_finished {
1929 undef $MUSIC_PLAYER;
1930 undef $MUSIC_PLAYING_META;
1931 undef $MUSIC_PLAYING_DATA;
1932
1933 audio_music_changed;
1934}
1935
1936sub audio_init {
1937 if ($CFG->{audio_enable}) {
1938 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1939 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1940
1941 unless ($SDL_MIXER) {
1942 status "Unable to open sound device: there will be no sound";
1943 return;
1944 }
1945
1946 CFPlus::Mix_AllocateChannels 16;
1947 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949 audio_music_finished;
1950 } else {
1951 undef $SDL_MIXER;
1952 }
1953}
1954
1955sub audio_shutdown {
1956 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1957 undef $SDL_MIXER;
1958 @SOUNDS = ();
1959 %AUDIO_CHUNKS = ();
1960}
1961
1962my %animate_object; 2150my %animate_object;
1963my $animate_timer; 2151my $animate_timer;
1964 2152
1965my $fps = 9; 2153my $fps = 9;
1966 2154
1967my %demo;#d#
1968
1969sub force_refresh { 2155sub force_refresh {
2156 if ($ENV{CFPLUS_DEBUG} & 4) {
1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2157 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2158 debug sprintf "%3.2f", $fps;
2159 }
1972 2160
1973 $CFPlus::UI::ROOT->draw; 2161 $CFPlus::UI::ROOT->draw;
1974 2162 CFPlus::SDL_GL_SwapBuffers;
1975 $WANT_REFRESH = 0;
1976 $CAN_REFRESH = 0;
1977 $LAST_REFRESH = $NOW; 2163 $LAST_REFRESH = $NOW;
1978 2164 $WANT_REFRESH->stop;
1979 CFPlus::SDL_GL_SwapBuffers;
1980} 2165}
1981 2166
2167$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2168
1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2169my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1983 $NOW = time; 2170 $NOW = time;
1984 2171
1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2172 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1986 for CFPlus::poll_events; 2173 for CFPlus::poll_events;
1987 2174
1988 if (%animate_object) { 2175 if (%animate_object) {
1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2176 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1990 ++$WANT_REFRESH; 2177 $WANT_REFRESH->start;
1991 }
1992
1993 if ($WANT_REFRESH) {
1994 force_refresh;
1995 } else {
1996 $CAN_REFRESH = 1;
1997 } 2178 }
1998}); 2179});
1999 2180
2000sub animation_start { 2181sub animation_start {
2001 my ($widget) = @_; 2182 my ($widget) = @_;
2007 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
2008} 2189}
2009 2190
2010%SDL_CB = ( 2191%SDL_CB = (
2011 CFPlus::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
2012 exit; 2193 Event::unloop_all;
2013 }, 2194 },
2014 CFPlus::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
2015 }, 2196 },
2016 CFPlus::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
2017 CFPlus::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
2056 CFPlus::DB::Server::run; 2237 CFPlus::DB::Server::run;
2057 2238
2058 CFPlus::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
2059 2240
2060 my %DEF_CFG = ( 2241 my %DEF_CFG = (
2061 sdl_mode => 0, 2242 sdl_mode => 0,
2062 width => 640,
2063 height => 480,
2064 fullscreen => 0, 2243 fullscreen => 0,
2065 fast => 0, 2244 fast => 0,
2245 force_opengl11 => undef,
2246 texture_compression => 1,
2066 map_scale => 1, 2247 map_scale => 1,
2067 fow_enable => 1, 2248 fow_enable => 1,
2068 fow_intensity => 0, 2249 fow_intensity => 0,
2069 map_smoothing => 1, 2250 map_smoothing => 1,
2070 gui_fontsize => 1, 2251 gui_fontsize => 1,
2071 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
2072 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
2073 gauge_size => 0.35, 2254 gauge_size => 0.35,
2074 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
2075 mapsize => 100, 2256 mapsize => 100,
2076 audio_enable => 1, 2257 audio_enable => 1,
2258 effects_enable => 1,
2259 effects_volume => 1,
2077 bgm_enable => 1, 2260 bgm_enable => 1,
2078 bgm_volume => 0.25, 2261 bgm_volume => 0.5,
2079 output_sync => 1, 2262 output_sync => 1,
2080 output_count => 1, 2263 output_count => 1,
2081 output_rate => "", 2264 output_rate => "",
2082 pickup => 0, 2265 pickup => 0,
2083 inv_sort => "mtime", 2266 inv_sort => "mtime",
2084 default => "profile", # default profile 2267 default => "profile", # default profile
2085 show_tips => 1, 2268 show_tips => 1,
2086 logview_max_par => 1000, 2269 logview_max_par => 1000,
2087 ); 2270 );
2088 2271
2089 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
2090 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
2091 } 2274 }
2148# } 2331# }
2149# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2150# warn $t2-$t1; 2333# warn $t2-$t1;
2151# } 2334# }
2152 2335
2153 $startup_done->();
2154
2155 video_init; 2336 video_init;
2156 audio_init; 2337 audio_init;
2157} 2338}
2158 2339
2159show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2160 2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
2161Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
2162#CFPlus::SDL_Quit; 2351CFPlus::SDL_Quit;
2163#CFPlus::_exit 0;
2164
2165END {
2166 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop; 2352CFPlus::DB::Server::stop;
2168}
2169 2353
2170=head1 NAME 2354=head1 NAME
2171 2355
2172cfplus - A Crossfire+ and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
2173 2357
2174=head1 SYNOPSIS 2358=head1 SYNOPSIS
2175 2359
2176Just run it - no commandline arguments are supported. 2360Just run it - no commandline arguments are supported.
2177 2361
2178=head1 USAGE 2362=head1 USAGE
2179 2363
2180cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2364cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2181fullscreen and interactively. 2365be used in fullscreen mode and interactively.
2182 2366
2183=head1 DEBUGGING 2367=head1 DEBUGGING
2184 2368
2185 2369
2186CFPLUS_DEBUG - environment variable 2370CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines