… | |
… | |
529 | $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"); |
530 | $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, |
531 | can_events => 1, |
531 | can_events => 1, |
532 | tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); |
532 | tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); |
533 | |
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 | |
534 | $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"); |
535 | $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); |
539 | $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); |
536 | |
540 | |
|
|
541 | $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]); |
542 | 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"); |
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); |
539 | |
547 | |
540 | $mode_slider->connect (changed => sub { |
548 | $mode_slider->connect (changed => sub { |
541 | my ($self, $value) = @_; |
549 | my ($self, $value) = @_; |
542 | |
550 | |
543 | $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; |
551 | $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; |
544 | $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); |
552 | $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); |
545 | }); |
553 | }); |
546 | $mode_slider->emit (changed => $mode_slider->{range}[0]); |
554 | $mode_slider->emit (changed => $mode_slider->{range}[0]); |
547 | |
555 | |
548 | $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"); |
549 | $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox |
557 | $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox |
… | |
… | |
1280 | |
1288 | |
1281 | $window |
1289 | $window |
1282 | } |
1290 | } |
1283 | |
1291 | |
1284 | sub autopickup_setup { |
1292 | sub autopickup_setup { |
|
|
1293 | my $r = new CFPlus::UI::ScrolledWindow ( |
|
|
1294 | expand => 1, |
|
|
1295 | scroll_y => 1 |
|
|
1296 | ); |
1285 | 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 | ); |
1286 | |
1301 | |
1287 | for ( |
1302 | for ( |
1288 | ["General", 0, 0, |
1303 | ["General", 0, 0, |
1289 | ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], |
1304 | ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], |
1290 | ["Inhibit autopickup" => PICKUP_INHIBIT], |
1305 | ["Inhibit autopickup" => PICKUP_INHIBIT], |
… | |
… | |
1374 | $::CONN->send_command ("pickup $::CFG->{pickup}") |
1389 | $::CONN->send_command ("pickup $::CFG->{pickup}") |
1375 | if defined $::CONN; |
1390 | if defined $::CONN; |
1376 | 0 |
1391 | 0 |
1377 | }); |
1392 | }); |
1378 | |
1393 | |
1379 | $table |
1394 | $r |
1380 | } |
1395 | } |
1381 | |
1396 | |
1382 | my %SORT_ORDER = ( |
1397 | my %SORT_ORDER = ( |
1383 | type => undef, |
1398 | type => undef, |
1384 | mtime => sub { |
1399 | mtime => sub { |
… | |
… | |
1718 | CFPlus::SDL_Init |
1733 | CFPlus::SDL_Init |
1719 | and die "SDL::Init failed!\n"; |
1734 | and die "SDL::Init failed!\n"; |
1720 | } |
1735 | } |
1721 | |
1736 | |
1722 | sub video_init { |
1737 | sub video_init { |
1723 | sdl_init; |
|
|
1724 | |
|
|
1725 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1738 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; |
1726 | |
1739 | |
1727 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1740 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
1728 | |
1741 | |
1729 | ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1742 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
1730 | $FULLSCREEN = $CFG->{fullscreen}; |
1743 | $FULLSCREEN = $CFG->{fullscreen}; |
1731 | $FAST = $CFG->{fast}; |
1744 | $FAST = $CFG->{fast}; |
1732 | |
1745 | |
1733 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN |
1746 | CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
1734 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1747 | or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; |
1735 | |
1748 | |
1736 | $SDL_ACTIVE = 1; |
1749 | $SDL_ACTIVE = 1; |
1737 | $LAST_REFRESH = time - 0.01; |
1750 | $LAST_REFRESH = time - 0.01; |
1738 | |
1751 | |
… | |
… | |
2206 | CFPlus::SDL_VIDEOEXPOSE => sub { |
2219 | CFPlus::SDL_VIDEOEXPOSE => sub { |
2207 | CFPlus::UI::full_refresh; |
2220 | CFPlus::UI::full_refresh; |
2208 | }, |
2221 | }, |
2209 | CFPlus::SDL_ACTIVEEVENT => sub { |
2222 | CFPlus::SDL_ACTIVEEVENT => sub { |
2210 | # not useful, as APPACTIVE include sonly iconified state, not unmapped |
2223 | # not useful, as APPACTIVE include sonly iconified state, not unmapped |
2211 | # 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# |
2212 | # printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; |
2226 | # printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; |
2213 | # printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; |
2227 | # printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; |
2214 | # printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; |
2228 | # printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; |
2215 | }, |
2229 | }, |
2216 | CFPlus::SDL_KEYDOWN => sub { |
2230 | CFPlus::SDL_KEYDOWN => sub { |
… | |
… | |
2297 | } |
2311 | } |
2298 | } |
2312 | } |
2299 | |
2313 | |
2300 | sdl_init; |
2314 | sdl_init; |
2301 | |
2315 | |
2302 | @SDL_MODES = reverse |
2316 | @SDL_MODES = CFPlus::SDL_ListModes 8, 8; |
2303 | grep $_->[0] >= 640 && $_->[1] >= 480, |
2317 | @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)"; |
2318 | @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
2307 | |
2319 | |
2308 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2320 | $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; |
2309 | |
2321 | |
2310 | { |
2322 | { |