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.169 by root, Sun Jul 15 21:08:40 2007 UTC vs.
Revision 1.173 by root, Tue Jul 17 17:39:08 2007 UTC

… …
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
… …
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 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 }
584 ); 592 );
585 593
586 $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");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 595 $table->add (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 596 state => $CFG->{map_smoothing},
589 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. "
590 . "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. "
591 . "Changes take effect at next connection only.", 599 . "Changes take effect at next connection only.",
… …
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 612 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.", 613 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 } 614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 615 );
608 616
609 $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");
610 $table->add (1, $row++, new CFPlus::UI::CheckBox 618 $table->add (1, $row++, new CFPlus::UI::CheckBox
611 state => $CFG->{fow_smooth}, 619 state => $CFG->{fow_smooth},
612 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.",
613 on_changed => sub { 621 on_changed => sub {
614 my ($self, $value) = @_; 622 my ($self, $value) = @_;
615 $CFG->{fow_smooth} = $value; 623 $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 624 0
618 } 625 }
619 ); 626 );
620 627
621 $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");
… …
756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 763 $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 }); 764 $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"); 765 $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 }); 766 $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() } ); 767 $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 768
774 $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#
775 770
776 $table 771 $table
777} 772}
… …
1280 1275
1281 $window 1276 $window
1282} 1277}
1283 1278
1284sub autopickup_setup { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1285 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 );
1286 1288
1287 for ( 1289 for (
1288 ["General", 0, 0, 1290 ["General", 0, 0,
1289 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1290 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1374 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1375 if defined $::CONN; 1377 if defined $::CONN;
1376 0 1378 0
1377 }); 1379 });
1378 1380
1379 $table 1381 $r
1380} 1382}
1381 1383
1382my %SORT_ORDER = ( 1384my %SORT_ORDER = (
1383 type => undef, 1385 type => undef,
1384 mtime => sub { 1386 mtime => sub {
… …
1718 CFPlus::SDL_Init 1720 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1720} 1722}
1721 1723
1722sub video_init { 1724sub video_init {
1723 sdl_init;
1724
1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726 1726
1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728 1728
1729 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1731 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1732 1732
1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1735 1735
1736 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1737 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1738 1738
… …
2206 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
2207 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
2208 }, 2208 },
2209 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
2210# not useful, as APPACTIVE include sonly iconified state, not unmapped 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# 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#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2215 }, 2216 },
2216 CFPlus::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
… …
2252 height => 480, 2253 height => 480,
2253 fullscreen => 0, 2254 fullscreen => 0,
2254 fast => 0, 2255 fast => 0,
2255 map_scale => 1, 2256 map_scale => 1,
2256 fow_enable => 1, 2257 fow_enable => 1,
2257 fow_intensity => 0.45, 2258 fow_intensity => 0,
2258 fow_smooth => 0, 2259 fow_smooth => 1,
2259 map_smoothing => 1, 2260 map_smoothing => 1,
2260 gui_fontsize => 1, 2261 gui_fontsize => 1,
2261 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
2262 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
2263 gauge_size => 0.35, 2264 gauge_size => 0.35,
… …
2297 } 2298 }
2298 } 2299 }
2299 2300
2300 sdl_init; 2301 sdl_init;
2301 2302
2302 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2303 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @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)"; 2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2307 2306
2308 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2309 2308
2310 { 2309 {

Diff Legend

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