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.155 by root, Sat May 12 08:13:34 2007 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
43 44
44 if ($^O eq "MSWin32") { 45 if ($^O eq "MSWin32") {
45 # relocatable 46 # relocatable
46 } else { 47 } else {
47 # unix, need to patch pango rc file 48 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules" 49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!"; 50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
50 local $/; 51 local $/;
51 my $rc = <$fh>; 52 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
53 54
54 mkdir "$tmp/pango-modules"; 55 mkdir "$tmp/pango-modules";
… …
158 159
159our $SDL_ACTIVE; 160our $SDL_ACTIVE;
160our %SDL_CB; 161our %SDL_CB;
161 162
162our $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
163our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
164our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
165 172
166our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
167our $STATUSBOX; 174our $STATUSBOX;
… …
317 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
318 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
320 return; 327 return;
321 } 328 }
322
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325 329
326 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 332 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
495 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
500 507
501 return unless $CONN; 508 return unless $CONN;
502 509
503 status "connection closed"; 510 status "connection closed";
504 511
… …
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1, 528 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523 530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
526 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
527 $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]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
529 544
530 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
531 my ($self, $value) = @_; 546 my ($self, $value) = @_;
532 547
533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
535 }); 550 });
536 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
537 552
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 ); 589 );
575 590
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing}, 593 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. " 595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.", 596 . "Changes take effect at next connection only.",
… …
594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
595 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
596 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
597 ); 612 );
598 613
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
600 $table->add (1, $row++, new CFPlus::UI::CheckBox 615 $table->add (1, $row++, new CFPlus::UI::CheckBox
601 state => $CFG->{fow_smooth}, 616 state => $CFG->{fow_smooth},
602 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 617 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
603 on_changed => sub { 618 on_changed => sub {
604 my ($self, $value) = @_; 619 my ($self, $value) = @_;
605 $CFG->{fow_smooth} = $value; 620 $CFG->{fow_smooth} = $value;
606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
607 0 621 0
608 } 622 }
609 ); 623 );
610 624
611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 625 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
… …
745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 759 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 760 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 761 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 762 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 763 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 764 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751
752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
753
754 for my $x (0..2) {
755 for my $y (0 .. 2) {
756 $table->add ($x + 3, $y,
757 new CFPlus::UI::Entry
758 text => $default_smooth[$x * 3 + $y],
759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
760 );
761 }
762 }
763 765
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
765 767
766 $table 768 $table
767} 769}
… …
1270 1272
1271 $window 1273 $window
1272} 1274}
1273 1275
1274sub autopickup_setup { 1276sub autopickup_setup {
1277 my $r = new CFPlus::UI::ScrolledWindow (
1278 expand => 1,
1279 scroll_y => 1
1280 );
1275 my $table = new CFPlus::UI::Table; 1281 $r->add (my $table = new CFPlus::UI::Table
1282 row_expand => [0],
1283 col_expand => [0, 1, 0, 1],
1284 );
1276 1285
1277 for ( 1286 for (
1278 ["General", 0, 0, 1287 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1288 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1289 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1373 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1374 if defined $::CONN;
1366 0 1375 0
1367 }); 1376 });
1368 1377
1369 $table 1378 $r
1370} 1379}
1371 1380
1372my %SORT_ORDER = ( 1381my %SORT_ORDER = (
1373 type => undef, 1382 type => undef,
1374 mtime => sub { 1383 mtime => sub {
… …
1453 has_close_button => 1 1462 has_close_button => 1
1454 ; 1463 ;
1455 1464
1456 my $ntb = 1465 my $ntb =
1457 $PL_NOTEBOOK = 1466 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1467 new CFPlus::UI::Notebook expand => 1;
1459 1468
1460 $ntb->add ( 1469 $ntb->add (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1470 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1471 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1472 );
… …
1708 CFPlus::SDL_Init 1717 CFPlus::SDL_Init
1709 and die "SDL::Init failed!\n"; 1718 and die "SDL::Init failed!\n";
1710} 1719}
1711 1720
1712sub video_init { 1721sub video_init {
1713 sdl_init;
1714
1715 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1722 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1716 1723
1717 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1724 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1718 1725
1719 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1726 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1720 $FULLSCREEN = $CFG->{fullscreen}; 1727 $FULLSCREEN = $CFG->{fullscreen};
1721 $FAST = $CFG->{fast}; 1728 $FAST = $CFG->{fast};
1722 1729
1723 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1730 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1724 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1731 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1725 1732
1726 $SDL_ACTIVE = 1; 1733 $SDL_ACTIVE = 1;
1727 $LAST_REFRESH = time - 0.01; 1734 $LAST_REFRESH = time - 0.01;
1728 1735
… …
2000 CFPlus::OpenGL::shutdown; 2007 CFPlus::OpenGL::shutdown;
2001 2008
2002 undef $SDL_ACTIVE; 2009 undef $SDL_ACTIVE;
2003} 2010}
2004 2011
2005my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2006my $bgmusic;#TODO#hack#d#
2007
2008sub audio_channel_finished { 2012sub audio_channel_finished {
2009 my ($channel) = @_; 2013 my ($channel) = @_;
2010 2014
2011 #warn "channel $channel finished\n";#d# 2015 #warn "channel $channel finished\n";#d#
2012} 2016}
2013 2017
2018sub audio_music_set {
2019 my ($songs) = @_;
2020
2021 my @want =
2022 grep $_,
2023 map $CONN->{music_meta}{$_},
2024 @$songs;
2025
2026 if (@want) {
2027 @MUSIC_WANT = @want;
2028 &audio_music_changed ();
2029 }
2030}
2031
2032sub audio_music_start {
2033 my $path = $MUSIC_PLAYING->{path}
2034 or return;
2035
2036 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2037 # music might have changed...
2038 $path eq $MUSIC_PLAYING->{path}
2039 or return &audio_music_start ();
2040
2041 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2042
2043 my $NOW = time;
2044
2045 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2046 my $pos = $MUSIC_PLAYING->{stop_pos};
2047 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2048 $MUSIC_START = time - $pos;
2049 } else {
2050 $MUSIC_PLAYER->play (0);
2051 $MUSIC_START = time;
2052 }
2053
2054 delete $MUSIC_PLAYING->{stop_time};
2055 delete $MUSIC_PLAYING->{stop_pos};
2056 }
2057}
2058
2059sub audio_music_changed {
2060 return unless $CFG->{bgm_enable};
2061
2062 # default MUSIC_WANT == MUSIC_DEFAULT
2063 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2064
2065 # if the currently playing song is acceptable, let it continue
2066 return if $MUSIC_PLAYING
2067 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2068
2069 my $NOW = time;
2070
2071 if ($MUSIC_PLAYING) {
2072 $MUSIC_PLAYING->{stop_time} = $NOW;
2073 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2074 CFPlus::MixMusic::fade_out 1000;
2075 } else {
2076 # sort by stop time, oldest first
2077 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2078
2079 # if the most recently-played piece played very recently,
2080 # resume it, else choose the oldest piece for rotation.
2081 $MUSIC_PLAYING =
2082 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2083 ? $MUSIC_WANT[-1]
2084 : $MUSIC_WANT[0];
2085
2086 audio_music_start;
2087 }
2088}
2089
2014sub audio_music_finished { 2090sub audio_music_finished {
2015 return unless $CFG->{bgm_enable}; 2091 $MUSIC_PLAYING = undef;
2092 undef $MUSIC_PLAYER;
2016 2093
2017 # TODO: hack, do play loop and mood music 2094 audio_music_changed;
2018 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2019 $bgmusic->play (0);
2020
2021 push @bgmusic, shift @bgmusic;
2022} 2095}
2023 2096
2024sub audio_init { 2097sub audio_init {
2025 if ($CFG->{audio_enable}) { 2098 if ($CFG->{audio_enable}) {
2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2099 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2077 2150
2078 $CFPlus::UI::ROOT->draw; 2151 $CFPlus::UI::ROOT->draw;
2079 2152
2080 $WANT_REFRESH = 0; 2153 $WANT_REFRESH = 0;
2081 $CAN_REFRESH = 0; 2154 $CAN_REFRESH = 0;
2082 $LAST_REFRESH = $NOW; 2155 $LAST_REFRESH = $NOW;
2083 2156
2084 CFPlus::SDL_GL_SwapBuffers; 2157 CFPlus::SDL_GL_SwapBuffers;
2085} 2158}
2086 2159
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2160my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2088 $NOW = time; 2161 $NOW = time;
2089 2162
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2164 for CFPlus::poll_events;
2092 2165
2093 if (%animate_object) { 2166 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2168 ++$WANT_REFRESH;
2096 } 2169 }
2097 2170
2098 if ($WANT_REFRESH) { 2171 if ($WANT_REFRESH) {
2099 force_refresh; 2172 force_refresh;
2100 } else { 2173 } else {
… …
2130 CFPlus::SDL_VIDEOEXPOSE => sub { 2203 CFPlus::SDL_VIDEOEXPOSE => sub {
2131 CFPlus::UI::full_refresh; 2204 CFPlus::UI::full_refresh;
2132 }, 2205 },
2133 CFPlus::SDL_ACTIVEEVENT => sub { 2206 CFPlus::SDL_ACTIVEEVENT => sub {
2134# not useful, as APPACTIVE include sonly iconified state, not unmapped 2207# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2208# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2209# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2210# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2211# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2212# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2139 }, 2213 },
2140 CFPlus::SDL_KEYDOWN => sub { 2214 CFPlus::SDL_KEYDOWN => sub {
… …
2176 height => 480, 2250 height => 480,
2177 fullscreen => 0, 2251 fullscreen => 0,
2178 fast => 0, 2252 fast => 0,
2179 map_scale => 1, 2253 map_scale => 1,
2180 fow_enable => 1, 2254 fow_enable => 1,
2181 fow_intensity => 0.45, 2255 fow_intensity => 0,
2182 fow_smooth => 0, 2256 fow_smooth => 1,
2183 map_smoothing => 1, 2257 map_smoothing => 1,
2184 gui_fontsize => 1, 2258 gui_fontsize => 1,
2185 log_fontsize => 0.7, 2259 log_fontsize => 0.7,
2186 gauge_fontsize => 1, 2260 gauge_fontsize => 1,
2187 gauge_size => 0.35, 2261 gauge_size => 0.35,
… …
2221 } 2295 }
2222 } 2296 }
2223 2297
2224 sdl_init; 2298 sdl_init;
2225 2299
2226 @SDL_MODES = reverse 2300 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2227 grep $_->[0] >= 640 && $_->[1] >= 480, 2301 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2228 CFPlus::SDL_ListModes;
2229
2230 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2302 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2231 2303
2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2304 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2233 2305
2234 { 2306 {

Diff Legend

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