--- deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 16:29:19	1.2
+++ deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 19:58:55	1.9
@@ -1,13 +1,38 @@
-package Client::Util;
+package Crossfire::Client::Util;
+use strict;
+use base 'Exporter';
+use Data::Dumper;
+our @EXPORT = qw(find_rcfile read_cfg write_cfg);
+use SDL;
+use SDL::App;
+use SDL::Event;
+use SDL::Surface;
+
 use Gtk2;
 
+sub find_rcfile($) {
+   my $path;
+
+   for (@INC) {
+      $path = "$_/Crossfire/resources/$_[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;
 
-   $::CFG = eval join '', <CFG>;
+   my $CFG;
+
+   local $/;
+   $CFG = eval <CFG>;
+
+   $::CFG = $CFG;
 
    close CFG;
 }
@@ -33,6 +58,10 @@
    my $i = $cfg->{_i}++;
    $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
    $tbl->attach_defaults (my $ent = Gtk2::Entry->new,         1, 2, $i, $i + 1);
+      if ($key eq 'password') {
+         $ent->set_invisible_char ("*");
+         $ent->set (visibility => 0)
+      }
       $ent->set_text ($value);
       $ent->signal_connect (changed => sub {
          my ($ent) = @_;
@@ -41,39 +70,78 @@
 }
 
 sub run_config_dialog {
-   Gtk2->init;
+   my (%events) = @_;
 
    my $w = Gtk2::Window->new;
 
    my @cfg = (
-      [qw/Width width/],
-      [qw/Height height/],
+      [qw/Host     host/],
+      [qw/Port     port/],
+      [qw/Username user/],
+      [qw/Password password/],
    );
 
    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]});
          }
 
       $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
-         $hb->pack_start (my $cb = Gtk2::Button->new ("close"), 1, 1, 5);
-            $cb->signal_connect (clicked => sub { $w->destroy });
          $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
             $cb->signal_connect (clicked => sub {
                for (keys %$cfg) {
                   $::CFG->{$_} = $cfg->{$_}
                      if $_ ne '_i';
                }
-               $w->destroy
+               write_cfg "$Crossfire::VARDIR/pclientrc";
             });
+         $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
+            $cb->signal_connect (clicked => sub {
+               for (keys %$cfg) {
+                  $::CFG->{$_} = $cfg->{$_}
+                     if $_ ne '_i';
+               }
+               my $cb = $events{login} || sub {};
+               $cb->($::CFG->{user}, $::CFG->{password});
+            });
+         $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
+            $cb->signal_connect (clicked => sub {
+               my $cb = $events{login} || sub {};
+               $cb->();
+            });
+         $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
+            $cb->signal_connect (clicked => sub { $w->destroy });
 
    $w->show_all;
 
    $w->signal_connect (destroy => sub { Gtk2->main_quit });
-   Gtk2->main;
 }
 
 1;