--- deliantra/Deliantra-Client/bin/cfplus	2007/07/15 21:42:02	1.171
+++ deliantra/Deliantra-Client/bin/cfplus	2007/07/17 16:02:14	1.172
@@ -531,17 +531,25 @@
                                                  can_events => 1,
                                                  tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
 
+   my $vidmode_tooltip =
+      "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
+    . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
+
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
    $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
 
-   $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]);
-   $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
+   $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],
+      tooltip => $vidmode_tooltip);
+   $hbox->add (my $mode_label = new CFPlus::UI::Label
+      align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
+      can_events => 1, tooltip => $vidmode_tooltip);
 
    $mode_slider->connect (changed => sub {
       my ($self, $value) = @_;
 
       $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
-      $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
+      $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
    });
    $mode_slider->emit (changed => $mode_slider->{range}[0]);
 
@@ -1727,17 +1735,15 @@
 }
 
 sub video_init {
-   sdl_init;
-
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
 
    my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
 
-   ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
+   ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
    $FULLSCREEN = $CFG->{fullscreen};
    $FAST       = $CFG->{fast};
 
-   CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
+   CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
       or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
 
    $SDL_ACTIVE = 1;
@@ -2307,10 +2313,8 @@
 
    sdl_init;
 
-   @SDL_MODES = reverse
-                   grep $_->[0] >= 640 && $_->[1] >= 480,
-                      CFPlus::SDL_ListModes;
-
+   @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
+   @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
    @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
 
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;