--- deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 16:29:19	1.2
+++ deliantra/Deliantra-Client/DC/Util.pm	2006/04/07 17:18:22	1.5
@@ -7,7 +7,8 @@
    open CFG, $file
       or return;
 
-   $::CFG = eval join '', <CFG>;
+   local $/;
+   $::CFG = eval <CFG>;
 
    close CFG;
 }
@@ -33,6 +34,7 @@
    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_text ($value);
       $ent->signal_connect (changed => sub {
          my ($ent) = @_;
@@ -41,13 +43,17 @@
 }
 
 sub run_config_dialog {
-   Gtk2->init;
+   my (%events) = @_;
 
    my $w = Gtk2::Window->new;
 
    my @cfg = (
-      [qw/Width width/],
-      [qw/Height height/],
+      [qw/Width    width/],
+      [qw/Height   height/],
+      [qw/Host     host/],
+      [qw/Port     port/],
+      [qw/Username user/],
+      [qw/Password password/],
    );
 
    my $cfg = {};
@@ -59,21 +65,33 @@
          }
 
       $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
             });
+         $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;