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.167 by root, Fri Jul 13 05:31:32 2007 UTC vs.
Revision 1.172 by root, Tue Jul 17 16:02:14 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;
… …
527 $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");
528 $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,
529 can_events => 1, 531 can_events => 1,
530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
531 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
532 $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");
533 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
534 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
535 $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],
536 $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);
537 547
538 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
539 my ($self, $value) = @_; 549 my ($self, $value) = @_;
540 550
541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
542 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
543 }); 553 });
544 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
545 555
546 $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");
547 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
1278 1288
1279 $window 1289 $window
1280} 1290}
1281 1291
1282sub autopickup_setup { 1292sub autopickup_setup {
1293 my $r = new CFPlus::UI::ScrolledWindow (
1294 expand => 1,
1295 scroll_y => 1
1296 );
1283 my $table = new CFPlus::UI::Table; 1297 $r->add (my $table = new CFPlus::UI::Table
1298 row_expand => [0],
1299 col_expand => [0, 1, 0, 1],
1300 );
1284 1301
1285 for ( 1302 for (
1286 ["General", 0, 0, 1303 ["General", 0, 0,
1287 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1304 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1288 ["Inhibit autopickup" => PICKUP_INHIBIT], 1305 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1372 $::CONN->send_command ("pickup $::CFG->{pickup}") 1389 $::CONN->send_command ("pickup $::CFG->{pickup}")
1373 if defined $::CONN; 1390 if defined $::CONN;
1374 0 1391 0
1375 }); 1392 });
1376 1393
1377 $table 1394 $r
1378} 1395}
1379 1396
1380my %SORT_ORDER = ( 1397my %SORT_ORDER = (
1381 type => undef, 1398 type => undef,
1382 mtime => sub { 1399 mtime => sub {
… …
1716 CFPlus::SDL_Init 1733 CFPlus::SDL_Init
1717 and die "SDL::Init failed!\n"; 1734 and die "SDL::Init failed!\n";
1718} 1735}
1719 1736
1720sub video_init { 1737sub video_init {
1721 sdl_init;
1722
1723 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1738 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1724 1739
1725 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1740 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1726 1741
1727 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1742 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1728 $FULLSCREEN = $CFG->{fullscreen}; 1743 $FULLSCREEN = $CFG->{fullscreen};
1729 $FAST = $CFG->{fast}; 1744 $FAST = $CFG->{fast};
1730 1745
1731 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1746 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1732 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1747 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1733 1748
1734 $SDL_ACTIVE = 1; 1749 $SDL_ACTIVE = 1;
1735 $LAST_REFRESH = time - 0.01; 1750 $LAST_REFRESH = time - 0.01;
1736 1751
… …
2017} 2032}
2018 2033
2019sub audio_music_set { 2034sub audio_music_set {
2020 my ($songs) = @_; 2035 my ($songs) = @_;
2021 2036
2022 my $count = @$songs; 2037 my @want =
2023 my @meta; 2038 grep $_,
2039 map $CONN->{music_meta}{$_},
2040 @$songs;
2024 2041
2025 for my $name (@$songs) { 2042 if (@want) {
2026 CFPlus::DB::get "res-metadata" => $name, sub {
2027 my ($data) = @_;
2028
2029 if ($data) {
2030 $data = JSON::XS->new->utf8->decode ($data);
2031 $data->{path} = CFPlus::DB::path_of $name;
2032 push @meta, $data;
2033 }
2034
2035 unless (--$count) {
2036 if (@meta) {
2037 @MUSIC_WANT = @meta; 2043 @MUSIC_WANT = @want;
2038 &audio_music_changed (); 2044 &audio_music_changed ();
2039 } 2045 }
2040 } 2046}
2047
2048sub audio_music_start {
2049 my $path = $MUSIC_PLAYING->{path}
2050 or return;
2051
2052 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2053 # music might have changed...
2054 $path eq $MUSIC_PLAYING->{path}
2055 or return &audio_music_start ();
2056
2057 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2058
2059 my $NOW = time;
2060
2061 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2062 my $pos = $MUSIC_PLAYING->{stop_pos};
2063 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2064 $MUSIC_START = time - $pos;
2065 } else {
2066 $MUSIC_PLAYER->play (0);
2067 $MUSIC_START = time;
2041 }; 2068 }
2069
2070 delete $MUSIC_PLAYING->{stop_time};
2071 delete $MUSIC_PLAYING->{stop_pos};
2042 } 2072 }
2043} 2073}
2044 2074
2045sub audio_music_changed { 2075sub audio_music_changed {
2046 return unless $CFG->{bgm_enable}; 2076 return unless $CFG->{bgm_enable};
… …
2050 2080
2051 # if the currently playing song is acceptable, let it continue 2081 # if the currently playing song is acceptable, let it continue
2052 return if $MUSIC_PLAYING 2082 return if $MUSIC_PLAYING
2053 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 2083 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2054 2084
2085 my $NOW = time;
2086
2055 if ($MUSIC_PLAYING) { 2087 if ($MUSIC_PLAYING) {
2088 $MUSIC_PLAYING->{stop_time} = $NOW;
2089 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2056 CFPlus::MixMusic::fade_out 1000; 2090 CFPlus::MixMusic::fade_out 1000;
2057 } else { 2091 } else {
2058 my $music = $MUSIC_WANT [rand @MUSIC_WANT]; 2092 # sort by stop time, oldest first
2093 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2059 2094
2095 # if the most recently-played piece played very recently,
2096 # resume it, else choose the oldest piece for rotation.
2060 $MUSIC_PLAYING = $music; 2097 $MUSIC_PLAYING =
2098 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2099 ? $MUSIC_WANT[-1]
2100 : $MUSIC_WANT[0];
2061 2101
2062 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path}; 2102 audio_music_start;
2063 $MUSIC_PLAYER->play (0);
2064 } 2103 }
2065} 2104}
2066 2105
2067sub audio_music_finished { 2106sub audio_music_finished {
2068 $MUSIC_PLAYING = undef; 2107 $MUSIC_PLAYING = undef;
… …
2136 2175
2137my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2176my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2138 $NOW = time; 2177 $NOW = time;
2139 2178
2140 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2179 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2141 for CFPlus::SDL_PollEvent; 2180 for CFPlus::poll_events;
2142 2181
2143 if (%animate_object) { 2182 if (%animate_object) {
2144 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2183 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2145 $WANT_REFRESH++; 2184 $WANT_REFRESH++;
2146 } 2185 }
… …
2180 CFPlus::SDL_VIDEOEXPOSE => sub { 2219 CFPlus::SDL_VIDEOEXPOSE => sub {
2181 CFPlus::UI::full_refresh; 2220 CFPlus::UI::full_refresh;
2182 }, 2221 },
2183 CFPlus::SDL_ACTIVEEVENT => sub { 2222 CFPlus::SDL_ACTIVEEVENT => sub {
2184# not useful, as APPACTIVE include sonly iconified state, not unmapped 2223# not useful, as APPACTIVE include sonly iconified state, not unmapped
2185# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2224# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2225# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2186# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2226# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2187# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2227# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2188# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2228# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2189 }, 2229 },
2190 CFPlus::SDL_KEYDOWN => sub { 2230 CFPlus::SDL_KEYDOWN => sub {
… …
2271 } 2311 }
2272 } 2312 }
2273 2313
2274 sdl_init; 2314 sdl_init;
2275 2315
2276 @SDL_MODES = reverse 2316 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2277 grep $_->[0] >= 640 && $_->[1] >= 480, 2317 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2278 CFPlus::SDL_ListModes;
2279
2280 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2318 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2281 2319
2282 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2320 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2283 2321
2284 { 2322 {

Diff Legend

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