… | |
… | |
324 | if (my $stat = delete $conn->{stat_change_with}) { |
324 | if (my $stat = delete $conn->{stat_change_with}) { |
325 | $conn->send ("reply $stat"); |
325 | $conn->send ("reply $stat"); |
326 | destroy_query_dialog $conn; |
326 | destroy_query_dialog $conn; |
327 | return; |
327 | return; |
328 | } |
328 | } |
329 | |
|
|
330 | $STATS_PAGE->show; |
|
|
331 | $MESSAGE_WINDOW->hide; |
|
|
332 | |
329 | |
333 | unshift @dialog, new CFPlus::UI::Label |
330 | unshift @dialog, new CFPlus::UI::Label |
334 | max_w => $::WIDTH * 0.4, |
331 | max_w => $::WIDTH * 0.4, |
335 | ellipsise => 0, |
332 | ellipsise => 0, |
336 | markup => "\nOr use your keyboard and the text entry below:\n"; |
333 | markup => "\nOr use your keyboard and the text entry below:\n"; |
… | |
… | |
529 | $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"); |
530 | $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, |
531 | can_events => 1, |
528 | can_events => 1, |
532 | tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); |
529 | tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); |
533 | |
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 | |
534 | $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"); |
535 | $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); |
536 | $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); |
536 | |
537 | |
|
|
538 | $hbox->add (my $mode_slider = new CFPlus::UI::Slider |
537 | $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], |
538 | $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); |
539 | |
544 | |
540 | $mode_slider->connect (changed => sub { |
545 | $mode_slider->connect (changed => sub { |
541 | my ($self, $value) = @_; |
546 | my ($self, $value) = @_; |
542 | |
547 | |
543 | $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; |
548 | $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; |
544 | $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); |
549 | $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); |
545 | }); |
550 | }); |
546 | $mode_slider->emit (changed => $mode_slider->{range}[0]); |
551 | $mode_slider->emit (changed => $mode_slider->{range}[0]); |
547 | |
552 | |
548 | $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"); |
549 | $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox |
554 | $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox |
… | |
… | |
581 | range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], |
586 | range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], |
582 | tooltip => "Enlarge or shrink the displayed map. Changes are instant.", |
587 | tooltip => "Enlarge or shrink the displayed map. Changes are instant.", |
583 | 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 } |
584 | ); |
589 | ); |
585 | |
590 | |
586 | $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"); |
587 | $table->add (1, $row++, new CFPlus::UI::CheckBox |
592 | $table->add (1, $row++, new CFPlus::UI::CheckBox |
588 | state => $CFG->{map_smoothing}, |
593 | state => $CFG->{map_smoothing}, |
589 | 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. " |
590 | . "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. " |
591 | . "Changes take effect at next connection only.", |
596 | . "Changes take effect at next connection only.", |
… | |
… | |
602 | $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); |
607 | $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); |
603 | $table->add (1, $row++, new CFPlus::UI::Slider |
608 | $table->add (1, $row++, new CFPlus::UI::Slider |
604 | range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], |
609 | range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], |
605 | 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.", |
606 | on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } |
611 | on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } |
607 | ); |
|
|
608 | |
|
|
609 | $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); |
|
|
610 | $table->add (1, $row++, new CFPlus::UI::CheckBox |
|
|
611 | state => $CFG->{fow_smooth}, |
|
|
612 | tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", |
|
|
613 | on_changed => sub { |
|
|
614 | my ($self, $value) = @_; |
|
|
615 | $CFG->{fow_smooth} = $value; |
|
|
616 | status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; |
|
|
617 | 0 |
|
|
618 | } |
|
|
619 | ); |
612 | ); |
620 | |
613 | |
621 | $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); |
614 | $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); |
622 | $table->add (1, $row++, new CFPlus::UI::Slider |
615 | $table->add (1, $row++, new CFPlus::UI::Slider |
623 | range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], |
616 | range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], |
… | |
… | |
756 | $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); |
749 | $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); |
757 | $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); |
750 | $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); |
758 | $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); |
751 | $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); |
759 | $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); |
752 | $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); |
760 | $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); |
753 | $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); |
761 | |
|
|
762 | my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); |
|
|
763 | |
|
|
764 | for my $x (0..2) { |
|
|
765 | for my $y (0 .. 2) { |
|
|
766 | $table->add ($x + 3, $y, |
|
|
767 | new CFPlus::UI::Entry |
|
|
768 | text => $default_smooth[$x * 3 + $y], |
|
|
769 | on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, |
|
|
770 | ); |
|
|
771 | } |
|
|
772 | } |
|
|
773 | |
754 | |
774 | $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# |
755 | $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# |
775 | |
756 | |
776 | $table |
757 | $table |
777 | } |
758 | } |
… | |
… | |
1280 | |
1261 | |
1281 | $window |
1262 | $window |
1282 | } |
1263 | } |
1283 | |
1264 | |
1284 | sub autopickup_setup { |
1265 | sub autopickup_setup { |
|
|
1266 | my $r = new CFPlus::UI::ScrolledWindow ( |
|
|
1267 | expand => 1, |
|
|
1268 | scroll_y => 1 |
|
|
1269 | ); |
1285 | my $table = new CFPlus::UI::Table; |
1270 | $r->add (my $table = new CFPlus::UI::Table |
|
|
1271 | row_expand => [0], |
|
|
1272 | col_expand => [0, 1, 0, 1], |
|
|
1273 | ); |
1286 | |
1274 | |
1287 | for ( |
1275 | for ( |
1288 | ["General", 0, 0, |
1276 | ["General", 0, 0, |
1289 | ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], |
1277 | ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], |
1290 | ["Inhibit autopickup" => PICKUP_INHIBIT], |
1278 | ["Inhibit autopickup" => PICKUP_INHIBIT], |
… | |
… | |
1374 | $::CONN->send_command ("pickup $::CFG->{pickup}") |
1362 | $::CONN->send_command ("pickup $::CFG->{pickup}") |
1375 | if defined $::CONN; |
1363 | if defined $::CONN; |
1376 | 0 |
1364 | 0 |
1377 | }); |
1365 | }); |
1378 | |
1366 | |
1379 | $table |
1367 | $r |
1380 | } |
1368 | } |
1381 | |
1369 | |
1382 | my %SORT_ORDER = ( |
1370 | my %SORT_ORDER = ( |
1383 | type => undef, |
1371 | type => undef, |
1384 | mtime => sub { |
1372 | mtime => sub { |
… | |
… | |
1718 | CFPlus::SDL_Init |
1706 | CFPlus::SDL_Init |
1719 | and die "SDL::Init failed!\n"; |
1707 | and die "SDL::Init failed!\n"; |
1720 | } |
1708 | } |
1721 | |
1709 | |
1722 | sub video_init { |
1710 | sub video_init { |
1723 | sdl_init; |
|
|
1724 | |
|
|
1725 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1711 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1726 | |
1712 | |
1727 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1713 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1728 | |
1714 | |
1729 | ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1715 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1730 | $FULLSCREEN = $CFG->{fullscreen}; |
1716 | $FULLSCREEN = $CFG->{fullscreen}; |
1731 | $FAST = $CFG->{fast}; |
1717 | $FAST = $CFG->{fast}; |
1732 | |
1718 | |
1733 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN |
1719 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
1734 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1720 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1735 | |
1721 | |
1736 | $SDL_ACTIVE = 1; |
1722 | $SDL_ACTIVE = 1; |
1737 | $LAST_REFRESH = time - 0.01; |
1723 | $LAST_REFRESH = time - 0.01; |
1738 | |
1724 | |
… | |
… | |
2152 | debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; |
2138 | debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; |
2153 | |
2139 | |
2154 | $CFPlus::UI::ROOT->draw; |
2140 | $CFPlus::UI::ROOT->draw; |
2155 | |
2141 | |
2156 | $WANT_REFRESH = 0; |
2142 | $WANT_REFRESH = 0; |
2157 | $CAN_REFRESH = 0; |
2143 | $CAN_REFRESH = 0; |
2158 | $LAST_REFRESH = $NOW; |
2144 | $LAST_REFRESH = $NOW; |
2159 | |
2145 | |
2160 | CFPlus::SDL_GL_SwapBuffers; |
2146 | CFPlus::SDL_GL_SwapBuffers; |
2161 | } |
2147 | } |
2162 | |
2148 | |
… | |
… | |
2166 | ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) |
2152 | ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) |
2167 | for CFPlus::poll_events; |
2153 | for CFPlus::poll_events; |
2168 | |
2154 | |
2169 | if (%animate_object) { |
2155 | if (%animate_object) { |
2170 | $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; |
2156 | $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; |
2171 | $WANT_REFRESH++; |
2157 | ++$WANT_REFRESH; |
2172 | } |
2158 | } |
2173 | |
2159 | |
2174 | if ($WANT_REFRESH) { |
2160 | if ($WANT_REFRESH) { |
2175 | force_refresh; |
2161 | force_refresh; |
2176 | } else { |
2162 | } else { |
… | |
… | |
2206 | CFPlus::SDL_VIDEOEXPOSE => sub { |
2192 | CFPlus::SDL_VIDEOEXPOSE => sub { |
2207 | CFPlus::UI::full_refresh; |
2193 | CFPlus::UI::full_refresh; |
2208 | }, |
2194 | }, |
2209 | CFPlus::SDL_ACTIVEEVENT => sub { |
2195 | CFPlus::SDL_ACTIVEEVENT => sub { |
2210 | # not useful, as APPACTIVE include sonly iconified state, not unmapped |
2196 | # not useful, as APPACTIVE include sonly iconified state, not unmapped |
2211 | # printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# |
2197 | # printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d# |
|
|
2198 | # printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d# |
2212 | # printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; |
2199 | # printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; |
2213 | # printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; |
2200 | # printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; |
2214 | # printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; |
2201 | # printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; |
2215 | }, |
2202 | }, |
2216 | CFPlus::SDL_KEYDOWN => sub { |
2203 | CFPlus::SDL_KEYDOWN => sub { |
… | |
… | |
2252 | height => 480, |
2239 | height => 480, |
2253 | fullscreen => 0, |
2240 | fullscreen => 0, |
2254 | fast => 0, |
2241 | fast => 0, |
2255 | map_scale => 1, |
2242 | map_scale => 1, |
2256 | fow_enable => 1, |
2243 | fow_enable => 1, |
2257 | fow_intensity => 0.45, |
2244 | fow_intensity => 0, |
2258 | fow_smooth => 0, |
|
|
2259 | map_smoothing => 1, |
2245 | map_smoothing => 1, |
2260 | gui_fontsize => 1, |
2246 | gui_fontsize => 1, |
2261 | log_fontsize => 0.7, |
2247 | log_fontsize => 0.7, |
2262 | gauge_fontsize => 1, |
2248 | gauge_fontsize => 1, |
2263 | gauge_size => 0.35, |
2249 | gauge_size => 0.35, |
… | |
… | |
2297 | } |
2283 | } |
2298 | } |
2284 | } |
2299 | |
2285 | |
2300 | sdl_init; |
2286 | sdl_init; |
2301 | |
2287 | |
2302 | @SDL_MODES = reverse |
2288 | @SDL_MODES = CFPlus::SDL_ListModes 8, 8; |
2303 | grep $_->[0] >= 640 && $_->[1] >= 480, |
2289 | @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; |
2304 | CFPlus::SDL_ListModes; |
|
|
2305 | |
|
|
2306 | @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
2290 | @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
|
|
2291 | |
|
|
2292 | @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; |
2307 | |
2293 | |
2308 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2294 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2309 | |
2295 | |
2310 | { |
2296 | { |
2311 | my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( |
2297 | my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( |