--- deliantra/Deliantra-Client/bin/pclient	2006/04/10 11:55:16	1.59
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/12 17:11:02	1.85
@@ -16,22 +16,29 @@
 use Crossfire;
 use Crossfire::Protocol;
 
-use Crossfire::Client;
-use Crossfire::Client::Widget;
-
-our $FACECACHE;
+use CFClient;
+use CFClient::UI;
 
 our $VERSION = '0.1';
 
-our %GL_EXT;
+my $MAX_FPS = 60;
+my $MIN_FPS =  5; # unused
+my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
+
+our $FACECACHE;
 
 our $CFG;
 our $CONN;
+our $FAST; # fast, low-quality mode, possibly useful for software-rendering
 
+our @SDL_MODES;
 our $WIDTH;
 our $HEIGHT;
 our $FULLSCREEN;
 
+our $NOW;
+
+our $MAPWIDGET;
 our $FONTSIZE;
 
 our $SDL_TIMER;
@@ -39,18 +46,122 @@
 our $SDL_EV;
 our %SDL_CB;
 
-our @GL_INIT; # hooks called on every gl init
-
 our $ALT_ENTER_MESSAGE;
 our $STATUS_LINE;
+our $DEBUG_STATUS;
 
 my $last_refresh;
 my %ANIMATE;
 my $refresh_handler;
 
-our ($tw, $te); # Test widget #d#
+sub status {
+   $STATUS_LINE->set_text ($_[0]);
+   my ($w, $h) = $STATUS_LINE->size_request;
+   $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
+}
+
+sub debug {
+   $DEBUG_STATUS->set_text ($_[0]);
+   my ($w, $h) = $DEBUG_STATUS->size_request;
+   $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
+}
+
+sub start_game {
+   status "logging in...";
+
+   my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+
+   $CONN = new conn
+      host => $CFG->{host},
+      port => $CFG->{port},
+      user => $CFG->{user},
+      pass => $CFG->{password},
+      mapw => $mapsize,
+      maph => $mapsize,
+   ;
+
+   status "login successful";
+
+   CFClient::lowdelay fileno $CONN->{fh};
+}
+
+sub stop_game {
+   undef $CONN;
+}
+
+sub config_dialog {
+   my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
+      child => (my $vbox = new CFClient::UI::VBox);
+   $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
+   $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+
+   $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
+   $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
+
+   $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
+   $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
+
+   $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_slider->emit (changed => $mode_slider->{range}[0]);
+
+   $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
+   $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
+      my ($self, $value) = @_;
+      $CFG->{fullscreen} = $value;
+   });
+
+   $table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+      destroy_screen ();
+      init_screen ();
+   });
+   
+   $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
+   $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+   $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
+   $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
+   
+   $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
+   $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
+
+   $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
+   $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
+
+   $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
+   $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
+
+   $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
+   $table->add (1, 6, new CFClient::UI::Slider
+      req_w => 100,
+      range => [$CFG->{mapsize}, 10, 100 + 1, 1],
+      connect_changed => sub {
+         my ($self, $value) = @_;
+
+         $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
+      },
+   );
+
+   $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
+      start_game;
+   });
+
+   $vbox->add (my $hbox = new CFClient::UI::HBox);
+
+   $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
+      CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+      status "Configuration Saved";
+   });
+   $CFClient::UI::TOPLEVEL->add ($dialog);
+}
 
 sub init_screen {
+   ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
+   $FULLSCREEN = $CFG->{fullscreen};
+
    $SDL_APP = new SDL::App
       -flags         => SDL_ANYFORMAT | SDL_HWSURFACE,
       -title         => "Crossfire+ Client",
@@ -68,107 +179,50 @@
    $SDL_EV = new SDL::Event;
    $SDL_EV->set_unicode (1);
 
-   $last_refresh = SDL::GetTicks;
-
-   %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
-
-   $GL_EXT{GL_ARB_texture_non_power_of_two}
-      or warn "WARNING: non-power-of-two opengl extension required";
-
-   $FONTSIZE = int $HEIGHT / 50;
-
-   #############################################################################
-
-   glClearColor 1, 1, 1, 1;
-
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_COLOR_MATERIAL;
-   glShadeModel GL_FLAT;
-   glDisable GL_DEPTH_TEST;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-
-   $_->() for @GL_INIT;
-
-   #############################################################################
-   
-   $STATUS_LINE = new Crossfire::Client::Widget::Label
-                      0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
-                      "";
-   $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
-
-   $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
-                            0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
-                            "Use <b>Alt-Enter</b> to toggle fullscreen mode";
-   $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
-
-   # Test code #d#
-   unless ($tw) { # haha...
-      $te = new Crossfire::Client::Widget::FancyFrame;
-      $te->add (new Crossfire::Client::Widget::Entry);
-      $te->move (300, 0, 2);
-      $Crossfire::Client::Widget::TOPLEVEL->add ($te);
-      
-      $tw = new Crossfire::Client::Widget::Animator;
-      my $lbl1 = new Crossfire::Client::Widget::Label
-         0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
-      my $lbl2 = new Crossfire::Client::Widget::Label
-         0, 0, 10, $FONTSIZE, "LBL2";
-
-      my $vb = new Crossfire::Client::Widget::VBox;
-      my $f  = new Crossfire::Client::Widget::FancyFrame;
-      my $f2 = new Crossfire::Client::Widget::FancyFrame;
-      $f->add ($lbl1);
-      $f2->add ($lbl2);
-      $vb->add ($f);
-      $vb->add ($f2, 1);
-
-      $tw->add ($vb);
-      $tw->w (400);
-      $tw->h (300);
-      $tw->move ($WIDTH - 200, 0);
-      $tw->moveto (0, 0);
-      $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
-
-#     $f->move ($WIDTH - 200, 0);
-#     $Crossfire::Client::Widget::TOPLEVEL->add ($f);
-   }
-}
-
-sub start_game {
-   $SDL_TIMER = add Glib::Timeout 1000/50, sub {
+   $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
       ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
          while $SDL_EV->poll;
 
       1
    };
 
-   $WIDTH      = $CFG->{width};
-   $HEIGHT     = $CFG->{height};
-   $FULLSCREEN = 0;
+   $last_refresh = SDL::GetTicks;
 
-   init_screen;
+   CFClient::gl_init;
 
-   my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+   $FONTSIZE = int $HEIGHT / 40;
 
-   $CONN = new conn
-      host => $CFG->{host},
-      port => $CFG->{port},
-      user => $CFG->{user},
-      pass => $CFG->{password},
-      mapw => $mapsize,
-      maph => $mapsize,
-   ;
+   #############################################################################
 
-   Crossfire::Client::lowdelay fileno $CONN->{fh};
+   $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
+   $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
+   
+   $STATUS_LINE = new CFClient::UI::Label
+                     padding => 0,
+                     y => $HEIGHT * 49 / 50 - $FONTSIZE;
+   $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
+
+   $ALT_ENTER_MESSAGE = new CFClient::UI::Label
+                           padding => 0,
+                           y => $HEIGHT * 49 / 50,
+                           height => $HEIGHT / 50,
+                           text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
+   $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
+
+   $MAPWIDGET = new CFClient::UI::MapWidget;
+   $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
+   $MAPWIDGET->focus_in;
+
+   config_dialog;
 }
 
-sub stop_game {
+sub destroy_screen {
+   $CFClient::UI::TOPLEVEL->{children} = [];
    remove Glib::Source $SDL_TIMER;
    remove Glib::Source $refresh_handler if $refresh_handler;
    undef $refresh_handler;
-
    undef $SDL_APP;
-   undef $CONN;
+   undef $SDL_EV;
    SDL::Quit;
 }
 
@@ -179,20 +233,35 @@
    glLoadIdentity;
    glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
    glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
 
    glClear GL_COLOR_BUFFER_BIT;
 
-   $Crossfire::Client::Widget::TOPLEVEL->draw;
+   $CFClient::UI::TOPLEVEL->draw;
 
    SDL::GLSwapBuffers;
 }
 
+my $FPS;
+
 sub refresh {
    $refresh_handler ||= add Glib::Idle sub {
       if ($SDL_APP) {
-         my $next_refresh = SDL::GetTicks;
-         my $interval = ($next_refresh - $last_refresh) * 0.001;
-         $last_refresh = $next_refresh;
+         $NOW = SDL::GetTicks;
+
+         if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
+            SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
+            $NOW = SDL::GetTicks;
+         }
+         
+         my $interval = ($NOW - $last_refresh) * 0.001;
+         $last_refresh = $NOW;
+
+         if ($interval) {
+            $FPS ||= 1 / $interval;
+            $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
+            debug sprintf "%5.02f", $FPS;
+         }
 
          force_refresh;
          $_->animate ($interval) for grep $_, values %ANIMATE;
@@ -236,25 +305,26 @@
       if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
          # alt-enter
          $FULLSCREEN = !$FULLSCREEN;
+         destroy_screen;
          init_screen;
       } else {
-         Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
+         CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
       }
    },
    SDL_KEYUP() => sub {
-      Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
+      CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
    },
    SDL_MOUSEMOTION() => sub {
-      Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);
+      CFClient::UI::feed_sdl_motion_event ($SDL_EV);
    },
    SDL_MOUSEBUTTONDOWN() => sub {
-      Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
+      CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
    },
    SDL_MOUSEBUTTONUP() => sub {
-      Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
+      CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
    },
    SDL_ACTIVEEVENT() => sub {
-      printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
+#      printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
    },
 );
 
@@ -263,7 +333,7 @@
 sub conn::map_update {
    my ($self, $dirty) = @_;
 
-   refresh;
+   $MAPWIDGET->update;
 }
 
 sub conn::map_scroll {
@@ -289,7 +359,7 @@
 
    $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
 
-   $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
+   $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
 }
 
 sub conn::query {
@@ -335,9 +405,6 @@
 
    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};
@@ -345,7 +412,7 @@
          $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) {
+            for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
                if ($_ eq $selmode) { $act = $i }
                $cb->append_text ($_);
                $i++;
@@ -372,7 +439,7 @@
                   $::CFG->{$_} = $cfg->{$_}
                      if $_ ne '_i';
                }
-               Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
+               CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
             });
          $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
             $cb->signal_connect (clicked => sub {
@@ -401,30 +468,33 @@
 
 SDL::Init SDL_INIT_EVERYTHING;
 
-my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
-
-$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
-$mapwidget->focus_in;
+@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
+                @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
 
-Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
+CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
 
 $CFG ||= {
    width      => 640,
    height     => 480,
-   mapsize    => 100,
    fullscreen => 0,
+   sdl_mode   => 0,
+   mapsize    => 100,
    host       => "crossfire.schmorp.de",
    port       => 13327,
 };
 
-Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";
+{
+   my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
+
+   CFClient::add_font $_ for @fonts;
+   CFClient::set_font $fonts[0];
+}
 
 $FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
 
-run_config_dialog
-   login  => sub { start_game  },
-   logout => sub { stop_game };
+init_screen;
 
 main Gtk2;
 
 Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
+