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.160 by root, Thu Jul 5 06:51:04 2007 UTC vs.
Revision 1.173 by root, Tue Jul 17 17:39:08 2007 UTC

… …
159 159
160our $SDL_ACTIVE; 160our $SDL_ACTIVE;
161our %SDL_CB; 161our %SDL_CB;
162 162
163our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
164our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
165our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
166 172
167our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
168our $STATUSBOX; 174our $STATUSBOX;
… …
445 451
446 my ($host, $port) = split /:/, $PROFILE->{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
447 453
448 $MAP = new CFPlus::Map; 454 $MAP = new CFPlus::Map;
449 455
450 warn "connecting...\n";#d#
451 $CONN = eval { 456 $CONN = eval {
452 new CFPlus::Protocol 457 new CFPlus::Protocol
453 host => $host, 458 host => $host,
454 port => $port || 13327, 459 port => $port || 13327,
455 user => $PROFILE->{user}, 460 user => $PROFILE->{user},
… …
480 or return; 485 or return;
481 486
482 $chunk->play; 487 $chunk->play;
483 }, 488 },
484 }; 489 };
485 warn "connected<$CONN>\n";#d#
486 490
487 if ($CONN) { 491 if ($CONN) {
488 CFPlus::lowdelay fileno $CONN->{fh}; 492 CFPlus::lowdelay fileno $CONN->{fh};
489 493
490 status "login successful"; 494 status "login successful";
… …
500 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
501 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
502 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
504 508
509 &audio_music_set ([]);
510
505 return unless $CONN; 511 return unless $CONN;
506 512
507 status "connection closed"; 513 status "connection closed";
508 514
509 destroy_query_dialog $CONN; 515 destroy_query_dialog $CONN;
… …
523 $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");
524 $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,
525 can_events => 1, 531 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527 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
528 $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");
529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
530 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
531 $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],
532 $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);
533 547
534 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
535 my ($self, $value) = @_; 549 my ($self, $value) = @_;
536 550
537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
539 }); 553 });
540 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
541 555
542 $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");
543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
577 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 }
578 ); 592 );
579 593
580 $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");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox 595 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing}, 596 state => $CFG->{map_smoothing},
583 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. "
584 . "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. "
585 . "Changes take effect at next connection only.", 599 . "Changes take effect at next connection only.",
… …
598 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 612 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
599 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.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
601 ); 615 );
602 616
603 $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");
604 $table->add (1, $row++, new CFPlus::UI::CheckBox 618 $table->add (1, $row++, new CFPlus::UI::CheckBox
605 state => $CFG->{fow_smooth}, 619 state => $CFG->{fow_smooth},
606 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.",
607 on_changed => sub { 621 on_changed => sub {
608 my ($self, $value) = @_; 622 my ($self, $value) = @_;
609 $CFG->{fow_smooth} = $value; 623 $CFG->{fow_smooth} = $value;
610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
611 0 624 0
612 } 625 }
613 ); 626 );
614 627
615 $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");
… …
750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 763 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
751 $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 });
752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 765 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
753 $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 });
754 $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() } );
755
756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
757
758 for my $x (0..2) {
759 for my $y (0 .. 2) {
760 $table->add ($x + 3, $y,
761 new CFPlus::UI::Entry
762 text => $default_smooth[$x * 3 + $y],
763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
764 );
765 }
766 }
767 768
768 $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#
769 770
770 $table 771 $table
771} 772}
… …
1274 1275
1275 $window 1276 $window
1276} 1277}
1277 1278
1278sub autopickup_setup { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1279 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 );
1280 1288
1281 for ( 1289 for (
1282 ["General", 0, 0, 1290 ["General", 0, 0,
1283 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1284 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1368 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1369 if defined $::CONN; 1377 if defined $::CONN;
1370 0 1378 0
1371 }); 1379 });
1372 1380
1373 $table 1381 $r
1374} 1382}
1375 1383
1376my %SORT_ORDER = ( 1384my %SORT_ORDER = (
1377 type => undef, 1385 type => undef,
1378 mtime => sub { 1386 mtime => sub {
… …
1712 CFPlus::SDL_Init 1720 CFPlus::SDL_Init
1713 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1714} 1722}
1715 1723
1716sub video_init { 1724sub video_init {
1717 sdl_init;
1718
1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1720 1726
1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1722 1728
1723 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1724 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1725 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1726 1732
1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1729 1735
1730 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1731 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1732 1738
… …
2004 CFPlus::OpenGL::shutdown; 2010 CFPlus::OpenGL::shutdown;
2005 2011
2006 undef $SDL_ACTIVE; 2012 undef $SDL_ACTIVE;
2007} 2013}
2008 2014
2009my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2010my $bgmusic;#TODO#hack#d#
2011
2012sub audio_channel_finished { 2015sub audio_channel_finished {
2013 my ($channel) = @_; 2016 my ($channel) = @_;
2014 2017
2015 #warn "channel $channel finished\n";#d# 2018 #warn "channel $channel finished\n";#d#
2016} 2019}
2017 2020
2021sub audio_music_set {
2022 my ($songs) = @_;
2023
2024 my @want =
2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2028
2029 if (@want) {
2030 @MUSIC_WANT = @want;
2031 &audio_music_changed ();
2032 }
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;
2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2059 }
2060}
2061
2062sub audio_music_changed {
2063 return unless $CFG->{bgm_enable};
2064
2065 # default MUSIC_WANT == MUSIC_DEFAULT
2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2067
2068 # if the currently playing song is acceptable, let it continue
2069 return if $MUSIC_PLAYING
2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2071
2072 my $NOW = time;
2073
2074 if ($MUSIC_PLAYING) {
2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2077 CFPlus::MixMusic::fade_out 1000;
2078 } else {
2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2081
2082 # if the most recently-played piece played very recently,
2083 # resume it, else choose the oldest piece for rotation.
2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2088
2089 audio_music_start;
2090 }
2091}
2092
2018sub audio_music_finished { 2093sub audio_music_finished {
2019 return unless $CFG->{bgm_enable}; 2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
2020 2096
2021 # TODO: hack, do play loop and mood music 2097 audio_music_changed;
2022 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2023 $bgmusic->play (0);
2024
2025 push @bgmusic, shift @bgmusic;
2026} 2098}
2027 2099
2028sub audio_init { 2100sub audio_init {
2029 if ($CFG->{audio_enable}) { 2101 if ($CFG->{audio_enable}) {
2030 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2090 2162
2091my $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 {
2092 $NOW = time; 2164 $NOW = time;
2093 2165
2094 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2095 for CFPlus::SDL_PollEvent; 2167 for CFPlus::poll_events;
2096 2168
2097 if (%animate_object) { 2169 if (%animate_object) {
2098 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2099 $WANT_REFRESH++; 2171 $WANT_REFRESH++;
2100 } 2172 }
… …
2134 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
2135 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
2136 }, 2208 },
2137 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
2138# not useful, as APPACTIVE include sonly iconified state, not unmapped 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# 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#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2143 }, 2216 },
2144 CFPlus::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
… …
2180 height => 480, 2253 height => 480,
2181 fullscreen => 0, 2254 fullscreen => 0,
2182 fast => 0, 2255 fast => 0,
2183 map_scale => 1, 2256 map_scale => 1,
2184 fow_enable => 1, 2257 fow_enable => 1,
2185 fow_intensity => 0.45, 2258 fow_intensity => 0,
2186 fow_smooth => 0, 2259 fow_smooth => 1,
2187 map_smoothing => 1, 2260 map_smoothing => 1,
2188 gui_fontsize => 1, 2261 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2264 gauge_size => 0.35,
… …
2225 } 2298 }
2226 } 2299 }
2227 2300
2228 sdl_init; 2301 sdl_init;
2229 2302
2230 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2231 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2232 CFPlus::SDL_ListModes;
2233
2234 @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)";
2235 2306
2236 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2237 2308
2238 { 2309 {

Diff Legend

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