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.206 by root, Thu Aug 9 03:40:44 2007 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 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;
… …
139our $SERVER_INFO; 142our $SERVER_INFO;
140 143
141our $SETUP_DIALOG; 144our $SETUP_DIALOG;
142our $SETUP_NOTEBOOK; 145our $SETUP_NOTEBOOK;
143our $SETUP_SERVER; 146our $SETUP_SERVER;
147our $SETUP_LOGIN;
144our $SETUP_KEYBOARD; 148our $SETUP_KEYBOARD;
145 149
146our $PL_NOTEBOOK; 150our $PL_NOTEBOOK;
147our $PL_WINDOW; 151our $PL_WINDOW;
148 152
149our $MUSIC_PLAYING_WIDGET; 153our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET; 154our $LICENSE_WIDGET;
151 155
156our $PICKUP_PAGE;
152our $INVENTORY_PAGE; 157our $INVENTORY_PAGE;
153our $STATS_PAGE; 158our $STATS_PAGE;
154our $SKILL_PAGE; 159our $SKILL_PAGE;
155our $SPELL_PAGE; 160our $SPELL_PAGE;
156our $SPELL_LIST; 161our $SPELL_LIST;
… …
168our $STATUSBOX; 173our $STATUSBOX;
169our $DEBUG_STATUS; 174our $DEBUG_STATUS;
170 175
171our $INV; 176our $INV;
172our $INVR; 177our $INVR;
173our $INV_RIGHT_HB; 178our $INVR_HB;
174
175our $PICKUP_CFG;
176 179
177############################################################################# 180#############################################################################
178 181
179sub status { 182sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 183 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
183sub debug { 186sub debug {
184 $DEBUG_STATUS->set_text ($_[0]); 187 $DEBUG_STATUS->set_text ($_[0]);
185} 188}
186 189
187sub message { 190sub message {
188 my ($para) = @_;
189 $MESSAGE_WINDOW->message ($para); 191 $MESSAGE_WINDOW->message (@_);
190} 192}
191 193
192############################################################################# 194#############################################################################
193#TODO: maybe move into own audio module... 195#TODO: maybe move into own audio module...
194 196
… …
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 228 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_; 229 my (undef, $dx, $dy, $vol) = @$_;
228 230
229 my $channel = CFPlus::Channel::find; 231 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 232 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance); 233 $channel->set_position_r ($dx, $dy, 20);
237
238 $chunk->play ($channel); 234 $chunk->play ($channel);
239 } 235 }
240 } else { 236 } else {
241 # sound_meta not set means data is in flight either way 237 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face} 238 my $meta = $CONN->{face}[$face]
243 or return; 239 or return;
244 240
241 $meta->{data}
242 or return;
243
245 # if its a jingle, play it as ambient music 244 # if its a jingle, play it as ambient music
246 if ($meta->{meta}{jingle}) { 245 if ($meta->{data}{jingle}) {
247 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 246 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
248 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 247 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
249 &audio_music_push ($face); 248 &audio_music_push ($face);
250 } 249 }
251 } else { 250 } else {
252 # fetch from database 251 # fetch from database
253 CFPlus::DB::get res_data => $meta->{name}, sub { 252 CFPlus::DB::get res_data => $meta->{name}, sub {
254 my $rwops = new CFPlus::RW $_[0]; 253 my $rwops = new CFPlus::RW $_[0];
255 my $chunk = new CFPlus::MixChunk $rwops 254 my $chunk = new CFPlus::MixChunk $rwops
256 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 255 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
257 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 256 $chunk->volume (($meta->{data}{volume} || 1) * 128);
258 $AUDIO_CHUNK{$face} = $chunk; 257 $AUDIO_CHUNK{$face} = $chunk;
259 258
260 audio_sound_push ($face); 259 audio_sound_push ($face);
261 }; 260 };
262 } 261 }
… …
270 or return; 269 or return;
271 $CFG->{effects_enable} 270 $CFG->{effects_enable}
272 or return; 271 or return;
273 272
274 my $queue = $AUDIO_PLAY{$face} ||= []; 273 my $queue = $AUDIO_PLAY{$face} ||= [];
275 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 274 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
276 audio_sound_push $face 275 audio_sound_push $face
277 unless @$queue > 1; 276 unless @$queue > 1;
278} 277}
279 278
280sub audio_music_set_meta { 279sub audio_music_set_meta {
281 my ($meta) = @_; 280 my ($meta) = @_;
282 281
283 $MUSIC_PLAYING_META = $meta; 282 $MUSIC_PLAYING_META = $meta;
284 $MUSIC_PLAYING_WIDGET->set_markup ( 283 $MUSIC_PLAYING_WIDGET->set_markup (
285 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 284 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
286 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 285 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
287 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 286 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
288 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 287 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
289 ); 288 );
290} 289}
291 290
292sub audio_music_update_volume { 291sub audio_music_update_volume {
293 return unless $MUSIC_PLAYING_META; 292 return unless $MUSIC_PLAYING_META;
294 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 293 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
295 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 294 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
296 CFPlus::MixMusic::volume $base * $volume * 128; 295 CFPlus::MixMusic::volume $base * $volume * 128;
297} 296}
298 297
299sub audio_music_start { 298sub audio_music_start {
300 my $meta = $MUSIC_PLAYING_META; 299 my $meta = $MUSIC_PLAYING_META;
… …
319 318
320 my $NOW = time; 319 my $NOW = time;
321 320
322 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 321 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
323 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 322 my $pos = $MUSIC_PLAYING_META->{stop_pos};
324 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 323 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
325 $MUSIC_START = time - $pos; 324 $MUSIC_START = time - $pos;
326 } else { 325 } else {
327 $MUSIC_PLAYER->play (0); 326 $MUSIC_PLAYER->play (0);
328 $MUSIC_START = time; 327 $MUSIC_START = time;
329 } 328 }
… …
343 $fade_out = 333; 342 $fade_out = 333;
344 } else { 343 } else {
345 return unless $CFG->{bgm_enable}; 344 return unless $CFG->{bgm_enable};
346 345
347 my @have = 346 my @have =
348 grep $_, 347 grep $_ && $_->{data},
349 map $CONN->{music_meta}{$_}, 348 map $CONN->{face}[$_],
350 @$MUSIC_WANT; 349 @$MUSIC_WANT;
350
351 # randomize music a bit so that the order is not always the same
352 $_->{stop_time} ||= rand for @have;
351 353
352 @MUSIC_HAVE = @have 354 @MUSIC_HAVE = @have
353 if @have; 355 if @have;
354 356
355 # default MUSIC_HAVE == MUSIC_DEFAULT 357 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 358 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 1000; 359 $fade_out = 700;
358 } 360 }
359 361
360 # if the currently playing song is acceptable, let it continue 362 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 363 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362 364
… …
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 373 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372 374
373 # if the most recently-played piece played very recently, 375 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation. 376 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta 377 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 378 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1] 379 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0]; 380 : $MUSIC_HAVE[0];
379 381
380 audio_music_start; 382 audio_music_start;
381 } 383 }
… …
387 $MUSIC_WANT = $songs; 389 $MUSIC_WANT = $songs;
388 audio_music_push; 390 audio_music_push;
389} 391}
390 392
391sub audio_music_finished { 393sub audio_music_finished {
394 if ($MUSIC_PLAYING_META) {
395 $MUSIC_PLAYING_META->{stop_time} = time;
396 }
397
392 # we compress multiple jingles of the same type 398 # we compress multiple jingles of the same type
393 shift @MUSIC_JINGLE 399 shift @MUSIC_JINGLE
394 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 400 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
395 401
396 $MUSIC_PLAYING_WIDGET->clear; 402 $MUSIC_PLAYING_WIDGET->clear;
… …
403} 409}
404 410
405sub audio_init { 411sub audio_init {
406 if ($CFG->{audio_enable}) { 412 if ($CFG->{audio_enable}) {
407 $ENV{MIX_EFFECTSMAXSPEED} = 1; 413 $ENV{MIX_EFFECTSMAXSPEED} = 1;
408 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 414 $SDL_MIXER = !CFPlus::Mix_OpenAudio
415 $CFG->{audio_hw_frequency},
416 CFPlus::MIX_DEFAULT_FORMAT,
417 $CFG->{audio_hw_channels},
418 $CFG->{audio_hw_chunksize};
409 419
410 unless ($SDL_MIXER) { 420 if ($SDL_MIXER) {
421 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
422
423 audio_music_finished;
424 } else {
411 status "Unable to open sound device: there will be no sound"; 425 status "Unable to open sound device: there will be no sound";
412 return;
413 } 426 }
414
415 CFPlus::Mix_AllocateChannels 16;
416
417 audio_music_finished;
418 } else { 427 } else {
419 undef $SDL_MIXER; 428 undef $SDL_MIXER;
420 } 429 }
430
431 sub audio_tab_update;
432 audio_tab_update;
421} 433}
422 434
423sub audio_shutdown { 435sub audio_shutdown {
424 undef $MUSIC_PLAYER; 436 undef $MUSIC_PLAYER;
425 undef $MUSIC_PLAYING_META; 437 undef $MUSIC_PLAYING_META;
… …
715 stop_game(); 727 stop_game();
716 } 728 }
717} 729}
718 730
719sub stop_game { 731sub stop_game {
720 $LOGIN_BUTTON->set_text ("Login"); 732 $LOGIN_BUTTON->set_text ("Login / Register");
721 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
722 $SETUP_DIALOG->show; 734 $SETUP_DIALOG->show;
723 $PL_WINDOW->hide; 735 $PL_WINDOW->hide;
724 $SPELL_LIST->clear_spells; 736 $SPELL_LIST->clear_spells;
725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
726 738
… …
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
776 state => $CFG->{fullscreen}, 788 state => $CFG->{fullscreen},
777 tooltip => "Bring the client into fullscreen mode.", 789 tooltip => "Bring the client into fullscreen mode.",
778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
791 );
792
793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
795 state => $CFG->{force_opengl11},
796 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
797 . "higher memory usage and slower performance. It will, however, help tremendously on "
798 . "cards that claim to support a feature but fall back to software rendering. "
799 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
800 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
801 . "experience extremely low framerates and your card should do better, try this option.</b>",
802 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803 );
804
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
807 state => $CFG->{texture_compression},
808 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
809 . "will save a lot of memory and increase performance. The compression algorithm "
810 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
811 . "forced OpenGL 1.1 mode.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
779 ); 813 );
780 814
781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
783 state => $CFG->{fast}, 817 state => $CFG->{fast},
… …
811 845
812 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
814 state => $CFG->{map_smoothing}, 848 state => $CFG->{map_smoothing},
815 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
816 . "This increases load on the graphics subsystem and works only with 2.x servers. " 850 . "This increases load on the graphics subsystem and works only with TRT servers. "
817 . "Changes take effect at next connection only.", 851 . "Changes take effect at next login only.",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
819 ); 853 );
820 854
821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 856 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
833 ); 867 );
834 868
835 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
836 $table->add_at (1, $row++, new CFPlus::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
838 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 872 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
873 . "but you still need to press apply to correctly re-layout the widget.",
839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 874 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
840 ); 875 );
841 876
842 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
843 $table->add_at (1, $row++, new CFPlus::UI::Slider 878 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
862 ); 897 );
863 898
864 $vbox 899 $vbox
865} 900}
866 901
902our $AUDIO_HW_CHUNKSIZE;
903our $AUDIO_INFO;
904
905sub audio_tab_update {
906 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
907
908 $AUDIO_HW_CHUNKSIZE->set_options ([
909 [0, "default", "Use System Default"],
910 map {
911 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
912 [$_, $ms, "$ms ($_ samples)"],
913 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
914 ]);
915
916 my $text = !$freq
917 ? "audio is off"
918 : "audio is enabled\n"
919 . "frequency (Hz): $freq\n"
920 . "channels: $chans";
921
922 $AUDIO_INFO->set_text ($text);
923}
924
867sub audio_setup { 925sub audio_setup {
868 my $vbox = new CFPlus::UI::VBox; 926 my $vbox = new CFPlus::UI::VBox;
869 927
870 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 928 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
871 929
… …
873 931
874 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 932 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
876 state => $CFG->{audio_enable}, 934 state => $CFG->{audio_enable},
877 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.", 935 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.",
878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 936 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
879 ); 937 );
880# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
881# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
882# $CFG->{effects_volume} = $_[1];
883# });
884 938
885 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 939 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
886 $table->add_at (1, $row, new CFPlus::UI::CheckBox 940 $table->add_at (1, $row, new CFPlus::UI::CheckBox
887 expand => 1, state => $CFG->{effects_enable}, 941 expand => 1, state => $CFG->{effects_enable},
888 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 942 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
889 on_changed => sub { 943 on_changed => sub {
890 $CFG->{effects_enable} = $_[1]; 944 $CFG->{effects_enable} = $_[1];
891 $CONN->update_fx_want if $CONN; 945 $CONN->update_fx_want if $CONN;
892 0 946 1
893 } 947 }
894 ); 948 );
895 $table->add_at (2, $row++, new CFPlus::UI::Slider 949 $table->add_at (2, $row++, new CFPlus::UI::Slider
896 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 950 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
897 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 951 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
898 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 952 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
899 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 953 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
900 ); 954 );
901 955
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 956 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox 957 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{bgm_enable}, 958 expand => 1, state => $CFG->{bgm_enable},
905 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 959 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
906 on_changed => sub { 960 on_changed => sub {
907 $CFG->{bgm_enable} = $_[1]; 961 $CFG->{bgm_enable} = $_[1];
908 $CONN->update_fx_want if $CONN; 962 $CONN->update_fx_want if $CONN;
963 audio_music_push;
909 0 964 1
910 } 965 }
911 ); 966 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider 967 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
914 tooltip => "The volume of the background music. Changes are instant.", 969 tooltip => "The volume of the background music. Changes are instant.",
915 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 970 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
971 );
972
973 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
974 $table->add_at (1, $row++, new CFPlus::UI::Selector
975 c_colspan => 2, expand => 1,
976 value => $CFG->{audio_hw_frequency},
977 options => [
978 [ 0, "default" , "Use System Default"],
979 [11025, "11 kHz" , "11kHz (low quality)"],
980 [22050, "22 kHz" , "22kHz (reduced quality)"],
981 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
982 [48000, "48 kHz" , "48kHz (studio quality)"],
983 ],
984 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
985 on_changed => sub {
986 $CFG->{audio_hw_frequency} = $_[1];
987 audio_tab_update;
988 1
989 }
990 );
991
992 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
993 $table->add_at (1, $row++, new CFPlus::UI::Selector
994 c_colspan => 2, expand => 1,
995 value => $CFG->{audio_hw_channels},
996 options => [
997 [0, "default" , "Use System Default"],
998 [1, "Mono" , "Mono (single channel, low quality)"],
999 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
1000 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
1001 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002 ],
1003 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1004 on_changed => sub {
1005 $CFG->{audio_hw_channels} = $_[1];
1006 audio_tab_update;
1007 1
1008 }
1009 );
1010
1011 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1012 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1013 c_colspan => 2, expand => 1,
1014 value => $CFG->{audio_hw_chunksize},
1015 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1016 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017 on_changed => sub {
1018 $CFG->{audio_hw_chunksize} = $_[1];
1019 audio_tab_update;
1020 1
1021 }
1022 );
1023
1024 # should really be a slider
1025 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1026 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1027 c_colspan => 2, expand => 1,
1028 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1029 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030 template => ">= 99",
1031 on_changed => sub {
1032 my ($slider, $value) = @_;
1033
1034 $CFG->{audio_mix_channels} = $value
1035 if $value;
1036 1;
1037 }
916 ); 1038 );
917 1039
918 $table->add_at (1, $row++, new CFPlus::UI::Button 1040 $table->add_at (1, $row++, new CFPlus::UI::Button
919 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1041 c_colspan => 2, expand => 1, align => 0, text => "Apply",
920 tooltip => "Apply the audio settings", 1042 tooltip => "Apply the audio settings",
… …
922 audio_shutdown (); 1044 audio_shutdown ();
923 audio_init (); 1045 audio_init ();
924 0 1046 0
925 } 1047 }
926 ); 1048 );
1049
1050 $vbox->add (new CFPlus::UI::FancyFrame
1051 expand => 1,
1052 label => "Audio Info",
1053 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1054 );
1055
1056 audio_tab_update;
927 1057
928 $vbox 1058 $vbox
929} 1059}
930 1060
931sub set_gauge_window_fontsize { 1061sub set_gauge_window_fontsize {
… …
966 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1096 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
967 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1097 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
968 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1098 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
969 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1099 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
970 1100
971 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1101 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1102 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1103 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
972 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1104 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
973 1105
974 $GAUGES = { 1106 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg,
975 exp => $exp, win => $win, range => $rng, 1108 win => $win, range => $rng,
976 food => $fg, mana => $mg, hp => $hg, grace => $gg 1109 hp => $hg, mana => $mg, grace => $gg, food => $fg,
977 }; 1110 };
978 1111
979 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
980 1113
981 $win 1114 $win
… …
1182 $r 1315 $r
1183} 1316}
1184 1317
1185sub skill_window { 1318sub skill_window {
1186 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1320
1187 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1321 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322
1188 $sw 1323 $sw
1189} 1324}
1190 1325
1191sub formsep($) { 1326sub formsep($) {
1192 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1327 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1313 ; 1448 ;
1314 1449
1315 $dialog 1450 $dialog
1316} 1451}
1317 1452
1318sub server_setup { 1453sub login_setup {
1319 my $vbox = new CFPlus::UI::VBox; 1454 my $vbox = new CFPlus::UI::VBox;
1320 1455
1321 $vbox->add (new CFPlus::UI::FancyFrame 1456 $vbox->add (new CFPlus::UI::FancyFrame
1322 label => "Connection Settings", 1457 label => "Login Settings",
1323 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1458 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1324 ); 1459 );
1325 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1460 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1326 1461
1327 { 1462 {
… …
1362 hidden => 1, 1497 hidden => 1,
1363 tooltip => "The password for your character", 1498 tooltip => "The password for your character",
1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1499 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1365 ); 1500 );
1366 1501
1502 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1503 expand => 1,
1504 align => 0,
1505 text => "Login / Register",
1506 tooltip => "This button will either login to the account configured above or register a new account.",
1507 on_activate => sub {
1508 $CONN ? stop_game
1509 : start_game;
1510 1
1511 },
1512 );
1513
1514 $vbox
1515}
1516
1517sub server_setup {
1518 my $vbox = new CFPlus::UI::VBox;
1519
1520 $vbox->add (new CFPlus::UI::FancyFrame
1521 label => "Connection Settings",
1522 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1523 );
1524
1367 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1525 $table->add_at (0, 1, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1368 $table->add_at (1, 7, new CFPlus::UI::Slider 1526 $table->add_at (1, 1, new CFPlus::UI::Slider
1369 force_w => 100, 1527 force_w => 100,
1370 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1528 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1371 tooltip => "This is the size of the portion of the map update the server sends you. " 1529 tooltip => "This is the size of the portion of the map update the server sends you. "
1372 . "If you set this to a high value you will be able to see further, " 1530 . "If you set this to a high value you will be able to see further, "
1373 . "but you also increase bandwidth requirements and latency. " 1531 . "but you also increase bandwidth requirements and latency. "
1374 . "This option is only used once at log-in.", 1532 . "This option is only used once at log-in.",
1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1533 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1376 ); 1534 );
1377 1535
1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1536 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1379 $table->add_at (1, 8, new CFPlus::UI::Entry 1537 $table->add_at (1, 2, new CFPlus::UI::Entry
1380 text => $CFG->{output_rate}, 1538 text => $CFG->{output_rate},
1381 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1539 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1382 . "when sending data. When 0 or unset, the server " 1540 . "when sending data. When 0 or unset, the server "
1383 . "default will be used, which is usually around 100kb/s. Most servers will " 1541 . "default will be used, which is usually around 100kb/s. Most servers will "
1384 . "dynamically find an optimal rate, so adjust this only when necessary.", 1542 . "dynamically find an optimal rate, so adjust this only when necessary.",
1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1543 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1386 ); 1544 );
1387 1545
1388 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1546 $table->add_at (0, 3, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1389 $table->add_at (1, 9, new CFPlus::UI::Entry 1547 $table->add_at (1, 3, new CFPlus::UI::Entry
1390 text => $CFG->{output_count}, 1548 text => $CFG->{output_count},
1391 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1549 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 }, 1550 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1393 ); 1551 );
1394 1552
1395 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1553 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1396 $table->add_at (1, 10, new CFPlus::UI::Entry 1554 $table->add_at (1, 4, new CFPlus::UI::Entry
1397 text => $CFG->{output_sync}, 1555 text => $CFG->{output_sync},
1398 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1556 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 }, 1557 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1400 );
1401
1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1403 expand => 1,
1404 align => 0,
1405 text => "Login",
1406 on_activate => sub {
1407 $CONN ? stop_game
1408 : start_game;
1409 1
1410 },
1411 ); 1558 );
1412 1559
1413 $vbox->add (new CFPlus::UI::FancyFrame 1560 $vbox->add (new CFPlus::UI::FancyFrame
1414 label => "Server Info", 1561 label => "Server Info",
1415 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1562 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
… …
1604 $sw1->add ($INV = new CFPlus::UI::Inventory); 1751 $sw1->add ($INV = new CFPlus::UI::Inventory);
1605 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1752 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1606 1753
1607 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1754 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1608 1755
1609 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1756 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1610 1757
1611 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1758 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1612 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1759 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1613 1760
1614 # XXX: Call after $INVR = ... because set_opencont sets the items 1761 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1637} 1784}
1638 1785
1639sub add_license { 1786sub add_license {
1640 my ($meta) = @_; 1787 my ($meta) = @_;
1641 1788
1642 $meta = $meta->{meta} 1789 $meta = $meta->{data}
1643 or return; 1790 or return;
1644 1791
1645 $meta->{license} || $meta->{author} || $meta->{source} 1792 $meta->{license} || $meta->{author} || $meta->{source}
1646 or return; 1793 or return;
1647 1794
… …
1701 $ntb->add_tab ( 1848 $ntb->add_tab (
1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1849 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1703 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1850 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1704 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1851 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1705 ); 1852 );
1706 $ntb->add_tab (Pickup => autopickup_setup, 1853 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1707 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1854 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1708 1855
1709 $ntb->add_tab (Media => media_window, 1856 $ntb->add_tab (Media => media_window,
1710 "License, Author and Source info for media sent by the server."); 1857 "License, Author and Source info for media sent by the server.");
1711 1858
… …
1869 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2016 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1870 ); 2017 );
1871 $hb->add (new CFPlus::UI::Button 2018 $hb->add (new CFPlus::UI::Button
1872 text => "Quit anyway", 2019 text => "Quit anyway",
1873 expand => 1, 2020 expand => 1,
1874 on_activate => sub { exit }, 2021 on_activate => sub { Event::unloop_all },
1875 ); 2022 );
1876 } 2023 }
1877 2024
1878 $QUIT_DIALOG->show; 2025 $QUIT_DIALOG->show;
1879 $QUIT_DIALOG->grab_focus; 2026 $QUIT_DIALOG->grab_focus;
… …
1952 2099
1953 $SDL_ACTIVE = 1; 2100 $SDL_ACTIVE = 1;
1954 $LAST_REFRESH = time - 0.01; 2101 $LAST_REFRESH = time - 0.01;
1955 2102
1956 CFPlus::OpenGL::init; 2103 CFPlus::OpenGL::init;
2104 CFPlus::Macro::init;
1957 2105
1958 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2106 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1959 2107
1960 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2108 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1961 2109
1962 ############################################################################# 2110 #############################################################################
1963 2111
1964 if ($DEBUG_STATUS) { 2112 if ($DEBUG_STATUS) {
1965 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2113 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1966 } else { 2114 } else {
1967 # create the widgets 2115 # create/configure the widgets
2116
2117 $CFPlus::UI::ROOT->connect (key_down => sub {
2118 my (undef, $ev) = @_;
2119
2120 if (my @macros = CFPlus::Macro::find $ev) {
2121 CFPlus::Macro::execute $_ for @macros;
2122
2123 return 1;
2124 }
2125
2126 0
2127 });
1968 2128
1969 $DEBUG_STATUS = new CFPlus::UI::Label 2129 $DEBUG_STATUS = new CFPlus::UI::Label
1970 padding => 0, 2130 padding => 0,
1971 z => 100, 2131 z => 100,
1972 force_x => "max", 2132 force_x => "max",
… …
2003 if $MESSAGE_WINDOW; 2163 if $MESSAGE_WINDOW;
2004 }); 2164 });
2005 $MAPWIDGET->show; 2165 $MAPWIDGET->show;
2006 $MAPWIDGET->grab_focus; 2166 $MAPWIDGET->grab_focus;
2007 2167
2168 $COMPLETER = new CFPlus::MapWidget::Command::
2169 command => { },
2170 tooltip => "#completer_help",
2171 ;
2172
2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2173 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2009 title => "Setup", 2174 title => "Setup",
2010 name => "setup_dialog", 2175 name => "setup_dialog",
2011 x => 'center', 2176 x => 'center',
2012 y => 'center', 2177 y => 'center',
… …
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 2185 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
2021 2186
2022 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2187 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2188 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
2024 2189
2190 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2191 "Configure the server to play on, your username and password.");
2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2192 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2026 "Configure the server to play on, your username, password and other server-related options."); 2193 "Configure other server related options.");
2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup, 2194 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
2028 "Configure various client-specific settings."); 2195 "Configure various client-specific settings.");
2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup, 2196 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
2030 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2197 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup, 2198 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
… …
2073 tooltip => "Terminates the program", 2240 tooltip => "Terminates the program",
2074 on_activate => sub { 2241 on_activate => sub {
2075 if ($CONN) { 2242 if ($CONN) {
2076 open_quit_dialog; 2243 open_quit_dialog;
2077 } else { 2244 } else {
2078 exit; 2245 Event::unloop_all;
2079 } 2246 }
2080 0 2247 0
2081 }, 2248 },
2082 ); 2249 );
2083 2250
2084 $BUTTONBAR->show; 2251 $BUTTONBAR->show;
2085 $SETUP_DIALOG->show; 2252 $SETUP_DIALOG->show;
2253 $MESSAGE_WINDOW->show;
2086 } 2254 }
2087 2255
2088 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2256 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2089} 2257}
2090 2258
… …
2098my $animate_timer; 2266my $animate_timer;
2099 2267
2100my $fps = 9; 2268my $fps = 9;
2101 2269
2102sub force_refresh { 2270sub force_refresh {
2271 if ($ENV{CFPLUS_DEBUG} & 4) {
2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2272 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2273 debug sprintf "%3.2f", $fps;
2274 }
2105 2275
2106 $CFPlus::UI::ROOT->draw; 2276 $CFPlus::UI::ROOT->draw;
2107 2277 CFPlus::SDL_GL_SwapBuffers;
2108 $WANT_REFRESH = 0;
2109 $CAN_REFRESH = 0;
2110 $LAST_REFRESH = $NOW; 2278 $LAST_REFRESH = $NOW;
2111 2279 $WANT_REFRESH->stop;
2112 CFPlus::SDL_GL_SwapBuffers;
2113} 2280}
2114 2281
2282$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2283
2115my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2284my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2116 $NOW = time; 2285 $NOW = time;
2117 2286
2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2287 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2119 for CFPlus::poll_events; 2288 for CFPlus::poll_events;
2120 2289
2121 if (%animate_object) { 2290 if (%animate_object) {
2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2291 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2123 ++$WANT_REFRESH; 2292 $WANT_REFRESH->start;
2124 }
2125
2126 if ($WANT_REFRESH) {
2127 force_refresh;
2128 } else {
2129 $CAN_REFRESH = 1;
2130 } 2293 }
2131}); 2294});
2132 2295
2133sub animation_start { 2296sub animation_start {
2134 my ($widget) = @_; 2297 my ($widget) = @_;
… …
2140 delete $animate_object{$widget}; 2303 delete $animate_object{$widget};
2141} 2304}
2142 2305
2143%SDL_CB = ( 2306%SDL_CB = (
2144 CFPlus::SDL_QUIT => sub { 2307 CFPlus::SDL_QUIT => sub {
2145 exit; 2308 Event::unloop_all;
2146 }, 2309 },
2147 CFPlus::SDL_VIDEORESIZE => sub { 2310 CFPlus::SDL_VIDEORESIZE => sub {
2148 }, 2311 },
2149 CFPlus::SDL_VIDEOEXPOSE => sub { 2312 CFPlus::SDL_VIDEOEXPOSE => sub {
2150 CFPlus::UI::full_refresh; 2313 CFPlus::UI::full_refresh;
… …
2189 CFPlus::DB::Server::run; 2352 CFPlus::DB::Server::run;
2190 2353
2191 CFPlus::UI::set_layout ($::CFG->{layout}); 2354 CFPlus::UI::set_layout ($::CFG->{layout});
2192 2355
2193 my %DEF_CFG = ( 2356 my %DEF_CFG = (
2194 sdl_mode => 0, 2357 sdl_mode => 0,
2195 fullscreen => 0, 2358 fullscreen => 0,
2196 fast => 0, 2359 fast => 0,
2360 force_opengl11 => undef,
2361 texture_compression => 1,
2197 map_scale => 1, 2362 map_scale => 1,
2198 fow_enable => 1, 2363 fow_enable => 1,
2199 fow_intensity => 0, 2364 fow_intensity => 0,
2200 map_smoothing => 1, 2365 map_smoothing => 1,
2201 gui_fontsize => 1, 2366 gui_fontsize => 1,
2202 log_fontsize => 0.7, 2367 log_fontsize => 0.7,
2203 gauge_fontsize => 1, 2368 gauge_fontsize => 1,
2204 gauge_size => 0.35, 2369 gauge_size => 0.35,
2205 stat_fontsize => 0.7, 2370 stat_fontsize => 0.7,
2206 mapsize => 100, 2371 mapsize => 100,
2207 audio_enable => 1, 2372 audio_enable => 1,
2373 audio_hw_channels => 0,
2374 audio_hw_frequency => 0,
2375 audio_hw_chunksize => 0,
2376 audio_mix_channels => 8,
2208 effects_enable => 1, 2377 effects_enable => 1,
2209 effects_volume => 1, 2378 effects_volume => 1,
2210 bgm_enable => 1, 2379 bgm_enable => 1,
2211 bgm_volume => 0.5, 2380 bgm_volume => 0.5,
2212 output_sync => 1, 2381 output_sync => 1,
2213 output_count => 1, 2382 output_count => 1,
2214 output_rate => "", 2383 output_rate => "",
2215 pickup => 0, 2384 pickup => 0,
2216 inv_sort => "mtime", 2385 inv_sort => "mtime",
2217 default => "profile", # default profile 2386 default => "profile", # default profile
2218 show_tips => 1, 2387 show_tips => 1,
2219 logview_max_par => 1000, 2388 logview_max_par => 1000,
2220 ); 2389 );
2221 2390
2222 while (my ($k, $v) = each %DEF_CFG) { 2391 while (my ($k, $v) = each %DEF_CFG) {
2223 $CFG->{$k} = $v unless exists $CFG->{$k}; 2392 $CFG->{$k} = $v unless exists $CFG->{$k};
2224 } 2393 }
… …
2281# } 2450# }
2282# my $t2 = Time::HiRes::time; 2451# my $t2 = Time::HiRes::time;
2283# warn $t2-$t1; 2452# warn $t2-$t1;
2284# } 2453# }
2285 2454
2286 $startup_done->();
2287
2288 video_init; 2455 video_init;
2289 audio_init; 2456 audio_init;
2290} 2457}
2291 2458
2292show_tip_of_the_day if $CFG->{show_tips}; 2459show_tip_of_the_day if $CFG->{show_tips};
2293 2460
2461Event->idle (cb => sub {
2462 $_[0]->w->cancel;
2463 $startup_done->();
2464});
2465
2294Event::loop; 2466Event::loop;
2467
2468#video_shutdown;
2469#audio_shutdown;
2295#CFPlus::SDL_Quit; 2470CFPlus::SDL_Quit;
2296#CFPlus::_exit 0;
2297
2298END {
2299 video_shutdown;
2300 audio_shutdown;
2301 CFPlus::SDL_Quit;
2302 CFPlus::DB::Server::stop; 2471CFPlus::DB::Server::stop;
2303}
2304 2472
2305=head1 NAME 2473=head1 NAME
2306 2474
2307cfplus - A Crossfire TRT and Crossfire game client 2475cfplus - A Crossfire TRT and Crossfire game client
2308 2476

Diff Legend

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