… | |
… | |
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.", |
… | |
… | |
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 | ); |
612 | ); |
608 | |
613 | |
609 | $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"); |
610 | $table->add (1, $row++, new CFPlus::UI::CheckBox |
615 | $table->add (1, $row++, new CFPlus::UI::CheckBox |
611 | state => $CFG->{fow_smooth}, |
616 | state => $CFG->{fow_smooth}, |
612 | 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.", |
613 | on_changed => sub { |
618 | on_changed => sub { |
614 | my ($self, $value) = @_; |
619 | my ($self, $value) = @_; |
615 | $CFG->{fow_smooth} = $value; |
620 | $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 |
621 | 0 |
618 | } |
622 | } |
619 | ); |
623 | ); |
620 | |
624 | |
621 | $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"); |
… | |
… | |
756 | $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); |
760 | $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 }); |
761 | $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"); |
762 | $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 }); |
763 | $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() } ); |
764 | $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 | |
765 | |
774 | $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# |
775 | |
767 | |
776 | $table |
768 | $table |
777 | } |
769 | } |
… | |
… | |
1725 | CFPlus::SDL_Init |
1717 | CFPlus::SDL_Init |
1726 | and die "SDL::Init failed!\n"; |
1718 | and die "SDL::Init failed!\n"; |
1727 | } |
1719 | } |
1728 | |
1720 | |
1729 | sub video_init { |
1721 | sub video_init { |
1730 | sdl_init; |
|
|
1731 | |
|
|
1732 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1722 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1733 | |
1723 | |
1734 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1724 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1735 | |
1725 | |
1736 | ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1726 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1737 | $FULLSCREEN = $CFG->{fullscreen}; |
1727 | $FULLSCREEN = $CFG->{fullscreen}; |
1738 | $FAST = $CFG->{fast}; |
1728 | $FAST = $CFG->{fast}; |
1739 | |
1729 | |
1740 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN |
1730 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
1741 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1731 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1742 | |
1732 | |
1743 | $SDL_ACTIVE = 1; |
1733 | $SDL_ACTIVE = 1; |
1744 | $LAST_REFRESH = time - 0.01; |
1734 | $LAST_REFRESH = time - 0.01; |
1745 | |
1735 | |
… | |
… | |
2159 | debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; |
2149 | debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; |
2160 | |
2150 | |
2161 | $CFPlus::UI::ROOT->draw; |
2151 | $CFPlus::UI::ROOT->draw; |
2162 | |
2152 | |
2163 | $WANT_REFRESH = 0; |
2153 | $WANT_REFRESH = 0; |
2164 | $CAN_REFRESH = 0; |
2154 | $CAN_REFRESH = 0; |
2165 | $LAST_REFRESH = $NOW; |
2155 | $LAST_REFRESH = $NOW; |
2166 | |
2156 | |
2167 | CFPlus::SDL_GL_SwapBuffers; |
2157 | CFPlus::SDL_GL_SwapBuffers; |
2168 | } |
2158 | } |
2169 | |
2159 | |
… | |
… | |
2173 | ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) |
2163 | ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) |
2174 | for CFPlus::poll_events; |
2164 | for CFPlus::poll_events; |
2175 | |
2165 | |
2176 | if (%animate_object) { |
2166 | if (%animate_object) { |
2177 | $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; |
2167 | $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; |
2178 | $WANT_REFRESH++; |
2168 | ++$WANT_REFRESH; |
2179 | } |
2169 | } |
2180 | |
2170 | |
2181 | if ($WANT_REFRESH) { |
2171 | if ($WANT_REFRESH) { |
2182 | force_refresh; |
2172 | force_refresh; |
2183 | } else { |
2173 | } else { |
… | |
… | |
2260 | height => 480, |
2250 | height => 480, |
2261 | fullscreen => 0, |
2251 | fullscreen => 0, |
2262 | fast => 0, |
2252 | fast => 0, |
2263 | map_scale => 1, |
2253 | map_scale => 1, |
2264 | fow_enable => 1, |
2254 | fow_enable => 1, |
2265 | fow_intensity => 0.45, |
2255 | fow_intensity => 0, |
2266 | fow_smooth => 0, |
2256 | fow_smooth => 1, |
2267 | map_smoothing => 1, |
2257 | map_smoothing => 1, |
2268 | gui_fontsize => 1, |
2258 | gui_fontsize => 1, |
2269 | log_fontsize => 0.7, |
2259 | log_fontsize => 0.7, |
2270 | gauge_fontsize => 1, |
2260 | gauge_fontsize => 1, |
2271 | gauge_size => 0.35, |
2261 | gauge_size => 0.35, |
… | |
… | |
2305 | } |
2295 | } |
2306 | } |
2296 | } |
2307 | |
2297 | |
2308 | sdl_init; |
2298 | sdl_init; |
2309 | |
2299 | |
2310 | @SDL_MODES = reverse |
2300 | @SDL_MODES = CFPlus::SDL_ListModes 8, 8; |
2311 | grep $_->[0] >= 640 && $_->[1] >= 480, |
2301 | @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; |
2312 | CFPlus::SDL_ListModes; |
|
|
2313 | |
|
|
2314 | @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)"; |
2315 | |
2303 | |
2316 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2304 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2317 | |
2305 | |
2318 | { |
2306 | { |