--- deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 18:27:54	1.8
+++ deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 20:13:13	1.10
@@ -1,54 +1,12 @@
-package Client::Util;
+package Crossfire::Client::Util;
+
 use strict;
-use base 'Exporter';
+
 use Data::Dumper;
-our @EXPORT = qw(find_rcfile);
 
+use SDL;
 use Gtk2;
 
-sub find_rcfile($) {
-   my $path;
-
-   for (@INC) {
-      $path = "$_/Crossfire/Client/$_[0]";
-      return $path if -r $path;
-   }
-
-   die "FATAL: can't find required file $_[0]\n";
-}
-
-sub read_cfg {
-   my ($file) = @_;
-
-   open CFG, $file
-      or return;
-
-   my $CFG;
-
-   local $/;
-   $CFG = eval <CFG>;
-
-   $::CFG = $CFG;
-
-   close CFG;
-}
-
-sub write_cfg {
-   my ($file) = @_;
-
-   open CFG, ">$file"
-      or return;
-
-   {
-      local $Data::Dumper::Purity = 1;
-      $::CFG->{VERSION} = $::VERSION;
-      print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
-   }
-
-   close CFG;
-}
-
-
 sub gtk_add_cfg_field {
    my ($tbl, $cfg, $klbl, $key, $value) = @_;
    my $i = $cfg->{_i}++;
@@ -71,8 +29,6 @@
    my $w = Gtk2::Window->new;
 
    my @cfg = (
-      [qw/Width    width/],
-      [qw/Height   height/],
       [qw/Host     host/],
       [qw/Port     port/],
       [qw/Username user/],
@@ -81,8 +37,32 @@
 
    my $cfg = {};
 
+   my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
+   my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
+
    $w->add (my $vb = Gtk2::VBox->new);
       $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
+         my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
+         $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
+         $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
+            my $i = 0;
+            my $act = 0;
+            for (map { "$_->[0]x$_->[1]" } reverse @modes) {
+               if ($_ eq $selmode) { $act = $i }
+               $cb->append_text ($_);
+               $i++;
+            }
+            $cb->set_active ($act);
+            $cb->signal_connect (changed => sub {
+               my ($cb) = @_;
+               my $txt = $cb->get_active_text;
+               if ($txt =~ m/(\d+)x(\d+)/) {
+                  $::CFG->{width} = $1;
+                  $::CFG->{height} = $2;
+               }
+            });
+
+         $cfg->{_i} = 1;
          for (@cfg) {
             gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
          }
@@ -94,7 +74,7 @@
                   $::CFG->{$_} = $cfg->{$_}
                      if $_ ne '_i';
                }
-               write_cfg "$Crossfire::VARDIR/pclientrc";
+               Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
             });
          $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
             $cb->signal_connect (clicked => sub {