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.164 by root, Thu Jul 12 18:28:34 2007 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 2007 UTC

… …
161our %SDL_CB; 161our %SDL_CB;
162 162
163our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 165our @MUSIC_WANT;
166our $MUSIC_START;
166our $MUSIC_PLAYING; 167our $MUSIC_PLAYING;
167our $MUSIC_PLAYER; 168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
168our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
170 172
171our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 174our $STATUSBOX;
… …
502 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 508
509 &audio_music_set ([]);
510
507 return unless $CONN; 511 return unless $CONN;
508 512
509 status "connection closed"; 513 status "connection closed";
510 514
511 destroy_query_dialog $CONN; 515 destroy_query_dialog $CONN;
… …
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
526 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
527 can_events => 1, 531 can_events => 1,
528 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
529 533
534 my $vidmode_tooltip =
535 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
536 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
537
530 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
532 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
533 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 542 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
534 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 543 tooltip => $vidmode_tooltip);
544 $hbox->add (my $mode_label = new CFPlus::UI::Label
545 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
546 can_events => 1, tooltip => $vidmode_tooltip);
535 547
536 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
537 my ($self, $value) = @_; 549 my ($self, $value) = @_;
538 550
539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
541 }); 553 });
542 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
543 555
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
579 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
580 ); 592 );
581 593
582 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
583 $table->add (1, $row++, new CFPlus::UI::CheckBox 595 $table->add (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 596 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 597 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. " 598 . "This increases load on the graphics subsystem and works only with 2.x servers. "
587 . "Changes take effect at next connection only.", 599 . "Changes take effect at next connection only.",
… …
600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 612 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
601 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 613 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
603 ); 615 );
604 616
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
606 $table->add (1, $row++, new CFPlus::UI::CheckBox 618 $table->add (1, $row++, new CFPlus::UI::CheckBox
607 state => $CFG->{fow_smooth}, 619 state => $CFG->{fow_smooth},
608 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 620 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
609 on_changed => sub { 621 on_changed => sub {
610 my ($self, $value) = @_; 622 my ($self, $value) = @_;
611 $CFG->{fow_smooth} = $value; 623 $CFG->{fow_smooth} = $value;
612 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
613 0 624 0
614 } 625 }
615 ); 626 );
616 627
617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
… …
752 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 763 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
753 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 764 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
754 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 765 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
755 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 766 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
756 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 767 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
757
758 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
759
760 for my $x (0..2) {
761 for my $y (0 .. 2) {
762 $table->add ($x + 3, $y,
763 new CFPlus::UI::Entry
764 text => $default_smooth[$x * 3 + $y],
765 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
766 );
767 }
768 }
769 768
770 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 769 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
771 770
772 $table 771 $table
773} 772}
… …
1276 1275
1277 $window 1276 $window
1278} 1277}
1279 1278
1280sub autopickup_setup { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1281 my $table = new CFPlus::UI::Table; 1284 $r->add (my $table = new CFPlus::UI::Table
1285 row_expand => [0],
1286 col_expand => [0, 1, 0, 1],
1287 );
1282 1288
1283 for ( 1289 for (
1284 ["General", 0, 0, 1290 ["General", 0, 0,
1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1286 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1370 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1371 if defined $::CONN; 1377 if defined $::CONN;
1372 0 1378 0
1373 }); 1379 });
1374 1380
1375 $table 1381 $r
1376} 1382}
1377 1383
1378my %SORT_ORDER = ( 1384my %SORT_ORDER = (
1379 type => undef, 1385 type => undef,
1380 mtime => sub { 1386 mtime => sub {
… …
1714 CFPlus::SDL_Init 1720 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1716} 1722}
1717 1723
1718sub video_init { 1724sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 1726
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 1728
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1728 1732
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 1735
1732 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1734 1738
… …
2015} 2019}
2016 2020
2017sub audio_music_set { 2021sub audio_music_set {
2018 my ($songs) = @_; 2022 my ($songs) = @_;
2019 2023
2020 my $count = @$songs; 2024 my @want =
2021 my @meta; 2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2022 2028
2023 for my $name (@$songs) { 2029 if (@want) {
2024 CFPlus::DB::get resmap => $name, sub {
2025 my ($data) = @_;
2026
2027 if ($data) {
2028 $data = JSON::XS->new->utf8->decode ($data);
2029 $data->{path} = CFPlus::DB::path_of $name;
2030 push @meta, $data;
2031 }
2032
2033 unless (--$count) {
2034 if (@meta) {
2035 @MUSIC_WANT = @meta; 2030 @MUSIC_WANT = @want;
2036 &audio_music_changed (); 2031 &audio_music_changed ();
2037 } 2032 }
2038 } 2033}
2034
2035sub audio_music_start {
2036 my $path = $MUSIC_PLAYING->{path}
2037 or return;
2038
2039 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2040 # music might have changed...
2041 $path eq $MUSIC_PLAYING->{path}
2042 or return &audio_music_start ();
2043
2044 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2045
2046 my $NOW = time;
2047
2048 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2049 my $pos = $MUSIC_PLAYING->{stop_pos};
2050 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2051 $MUSIC_START = time - $pos;
2052 } else {
2053 $MUSIC_PLAYER->play (0);
2054 $MUSIC_START = time;
2039 }; 2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2040 } 2059 }
2041} 2060}
2042 2061
2043sub audio_music_changed { 2062sub audio_music_changed {
2044 return unless $CFG->{bgm_enable}; 2063 return unless $CFG->{bgm_enable};
2045 2064
2046 # default MUSIC_WANT, undef/0 == MUSIC_DEFAULT 2065 # default MUSIC_WANT == MUSIC_DEFAULT
2047 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT; 2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2048 2067
2049 # if the currently playing song is acceptable, let it continue 2068 # if the currently playing song is acceptable, let it continue
2050 return if $MUSIC_PLAYING 2069 return if $MUSIC_PLAYING
2051 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2052 2071
2072 my $NOW = time;
2073
2053 if ($MUSIC_PLAYING) { 2074 if ($MUSIC_PLAYING) {
2054 warn "fade out"; 2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2055 CFPlus::MixMusic::fade_out 1500; 2077 CFPlus::MixMusic::fade_out 1000;
2056 } else { 2078 } else {
2057 warn "new music\n"; 2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2058 2081
2059 my $music = $MUSIC_WANT [rand @MUSIC_WANT]; 2082 # if the most recently-played piece played very recently,
2060 2083 # resume it, else choose the oldest piece for rotation.
2061 $MUSIC_PLAYING = $music; 2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2062 2088
2063 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path}; 2089 audio_music_start;
2064 $MUSIC_PLAYER->play (0);
2065 } 2090 }
2066} 2091}
2067 2092
2068sub audio_music_finished { 2093sub audio_music_finished {
2069 $MUSIC_PLAYING = undef; 2094 $MUSIC_PLAYING = undef;
… …
2127 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2128 2153
2129 $CFPlus::UI::ROOT->draw; 2154 $CFPlus::UI::ROOT->draw;
2130 2155
2131 $WANT_REFRESH = 0; 2156 $WANT_REFRESH = 0;
2132 $CAN_REFRESH = 0; 2157 $CAN_REFRESH = 0;
2133 $LAST_REFRESH = $NOW; 2158 $LAST_REFRESH = $NOW;
2134 2159
2135 CFPlus::SDL_GL_SwapBuffers; 2160 CFPlus::SDL_GL_SwapBuffers;
2136} 2161}
2137 2162
2138my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2163my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2139 $NOW = time; 2164 $NOW = time;
2140 2165
2141 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2142 for CFPlus::SDL_PollEvent; 2167 for CFPlus::poll_events;
2143 2168
2144 if (%animate_object) { 2169 if (%animate_object) {
2145 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2146 $WANT_REFRESH++; 2171 ++$WANT_REFRESH;
2147 } 2172 }
2148 2173
2149 if ($WANT_REFRESH) { 2174 if ($WANT_REFRESH) {
2150 force_refresh; 2175 force_refresh;
2151 } else { 2176 } else {
… …
2181 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
2182 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
2183 }, 2208 },
2184 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
2185# not useful, as APPACTIVE include sonly iconified state, not unmapped 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2186# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2211# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2212# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2187# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2188# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2189# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2190 }, 2216 },
2191 CFPlus::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
… …
2227 height => 480, 2253 height => 480,
2228 fullscreen => 0, 2254 fullscreen => 0,
2229 fast => 0, 2255 fast => 0,
2230 map_scale => 1, 2256 map_scale => 1,
2231 fow_enable => 1, 2257 fow_enable => 1,
2232 fow_intensity => 0.45, 2258 fow_intensity => 0,
2233 fow_smooth => 0, 2259 fow_smooth => 1,
2234 map_smoothing => 1, 2260 map_smoothing => 1,
2235 gui_fontsize => 1, 2261 gui_fontsize => 1,
2236 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
2237 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
2238 gauge_size => 0.35, 2264 gauge_size => 0.35,
… …
2272 } 2298 }
2273 } 2299 }
2274 2300
2275 sdl_init; 2301 sdl_init;
2276 2302
2277 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2278 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2279 CFPlus::SDL_ListModes;
2280
2281 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2282 2306
2283 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2284 2308
2285 { 2309 {

Diff Legend

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