--- deliantra/Deliantra-Client/bin/pclient	2006/04/07 16:04:03	1.10
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/11 21:24:10	1.75
@@ -1,18 +1,10 @@
 #!/opt/bin/perl
 
 use strict;
+use utf8;
 
-use Crossfire::Client;
-use Crossfire::Protocol;
-
-use Client::Util;
-
-package Crossfire::Client; # uh, yeah
-
-use strict;
-
-our $CFG;
-our $VERSION = '0.1';
+use Glib;
+use Gtk2 -init;
 
 use SDL;
 use SDL::App;
@@ -21,195 +13,458 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-my $conn;
-my $app;
+use Crossfire;
+use Crossfire::Protocol;
 
-my $WIDTH  = 640;
-my $HEIGHT = 480;
+use CFClient;
+use CFClient::UI;
 
-sub glinit {
-   # nuke all gl context data
-   
-   $app = new SDL::App
+our $VERSION = '0.1';
+
+my $MAX_FPS = 60;
+my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
+
+our $FACECACHE;
+
+our $CFG;
+our $CONN;
+
+our @SDL_MODES;
+our $WIDTH;
+our $HEIGHT;
+our $FULLSCREEN;
+
+our $NOW;
+
+our $MAPWIDGET;
+our $FONTSIZE;
+
+our $SDL_TIMER;
+our $SDL_APP;
+our $SDL_EV;
+our %SDL_CB;
+
+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 init_screen {
+   $SDL_APP = new SDL::App
       -flags         => SDL_ANYFORMAT | SDL_HWSURFACE,
       -title         => "Crossfire+ Client",
       -width         => $WIDTH,
       -height        => $HEIGHT,
       -opengl        => 1,
-      -red_size      => 8,
-      -green_size    => 8,
-      -blue_size     => 8,
+      -red_size      => 5,
+      -green_size    => 5,
+      -blue_size     => 5,
+      -alpha_size    => 0,
       -double_buffer => 1,
+      -fullscreen    => $FULLSCREEN,
       -resizeable    => 0;
 
+   $SDL_EV = new SDL::Event;
+   $SDL_EV->set_unicode (1);
+
+   $SDL_TIMER = add Glib::Timeout 1000/50, sub {
+      ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
+         while $SDL_EV->poll;
+
+      1
+   };
+
+   $last_refresh = SDL::GetTicks;
+
+   CFClient::gl_init;
+
+   $FONTSIZE = int $HEIGHT / 50;
+
+   #############################################################################
+
+   glClearColor 0.45, 0.45, 0.45, 1;
+
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   glEnable GL_COLOR_MATERIAL;
    glShadeModel GL_FLAT;
    glDisable GL_DEPTH_TEST;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_BLEND;
 
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;
+   #############################################################################
 
-   # re-bind all textures
+   $DEBUG_STATUS = new CFClient::UI::Label;
+   $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
+   
+   $STATUS_LINE = new CFClient::UI::Label
+                     y => $HEIGHT * 59 / 60 - $FONTSIZE;
+   $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
+
+   $ALT_ENTER_MESSAGE = new CFClient::UI::Label
+                           y => $HEIGHT * 59 / 60,
+                           height => $HEIGHT / 60,
+                           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;
 }
 
-sub refresh {
-   glClearColor 0, 0, 0, 0;
-   glClear GL_COLOR_BUFFER_BIT;
+sub destroy_screen {
+   remove Glib::Source $SDL_TIMER;
+   undef $SDL_APP;
+   undef $SDL_EV;
+   SDL::Quit;
+}
 
-   my $map = $conn->{map};
+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 => "Setup");
+   $vbox->add (my $table = new CFClient::UI::Table);
+
+   $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 req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
+   $hbox->add (my $mode_label = new CFClient::UI::Label);
+
+   $mode_slider->connect (changed => sub {
+      my (undef, $value) = @_;
+
+      $CFG->{sdl_mode} = $value = int $value + 0.5;
+      $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 => "Host");
+   $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
+   
+   $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
+   $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
 
-   for my $x (0 .. $conn->{mapw} - 1) {
-      for my $y (0 .. $conn->{maph} - 1) {
+   $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
+   $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
 
-         my $cell = $map->[$x][$y]
-            or next;
+   $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
+   $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
 
-         my $darkness = $cell->[3] * (1 / 255);
-         my $darkness = 0.8 + 0.2*rand;
-         glColor $darkness, $darkness, $darkness;
-
-         for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
-            my $tex = $conn->{face}[$num]{texture} || 0;
- 
-            glBindTexture GL_TEXTURE_2D, $tex;
-
-            glBegin GL_QUADS;
-            glTexCoord 0, 0; glVertex $x, $y;
-            glTexCoord 0, 1; glVertex $x,     $y + 1;
-            glTexCoord 1, 1; glVertex $x + 1, $y + 1;
-            glTexCoord 1, 0; glVertex $x + 1, $y;
-            glEnd;
-         }
-      }
-   }
+   $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
+   $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
 
-   SDL::GLSwapBuffers;
+   $CFClient::UI::TOPLEVEL->add ($dialog);
 }
 
-my $ev = new SDL::Event;
-my %ev_cb;
+sub start_game {
+   $WIDTH      = $CFG->{width};
+   $HEIGHT     = $CFG->{height};
+   $FULLSCREEN = 0;
+
+   init_screen;
+
+   config_dialog;
+
+   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,
+   ;
 
-sub event(&$) {
-   $ev_cb{$_[0]->()} = $_[1];
+   CFClient::lowdelay fileno $CONN->{fh};
 }
 
-sub does(&) { shift }
+sub stop_game {
+   remove Glib::Source $refresh_handler if $refresh_handler;
+   undef $refresh_handler;
 
-event {SDL_QUIT} does {
-   exit;
-};
+   undef $CONN;
+   destroy_screen;
+}
 
-event {SDL_VIDEORESIZE} does {
-   print "resize\n";
-};
+sub force_refresh {
+   glViewport 0, 0, $WIDTH, $HEIGHT;
 
-event {SDL_VIDEOEXPOSE} does {
-   refresh;
-};
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
 
-event {SDL_KEYDOWN} does {
-   print "keypress\n";
-};
+   glClear GL_COLOR_BUFFER_BIT;
 
-event {SDL_KEYUP} does {
-   print "keyup\n";#d#
-};
+   $CFClient::UI::TOPLEVEL->draw;
 
-event {SDL_MOUSEMOTION} does {
-   print "motion\n";
-};
+   SDL::GLSwapBuffers;
+}
 
-event {SDL_MOUSEBUTTONDOWN} does {
-   print "button\n";
-};
+sub debug {
+   $DEBUG_STATUS->set_text ($_[0]);
+   my ($w, $h) = $DEBUG_STATUS->size_request;
+   $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
+}
 
-event {SDL_MOUSEBUTTONUP} does {
-   print "buttup\n";
-};
+my $FPS;
 
-event {SDL_ACTIVEEVENT} does  {
-   print "active\n";
-};
+sub refresh {
+   $refresh_handler ||= add Glib::Idle sub {
+      if ($SDL_APP) {
+         $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.96 + (1 / $interval) * 0.04;
+            debug sprintf "%5.02f", $FPS;
+         }
 
-package Crossfire::Client;
+         force_refresh;
+         $_->animate ($interval) for grep $_, values %ANIMATE;
+
+         if (%ANIMATE) {
+            1
+         } else {
+            undef $refresh_handler;
+            0
+         }
+      } else {
+         undef $refresh_handler;
+         0
+      }
+   };
+}
+
+sub animation_start {
+   my ($widget) = @_;
+   $ANIMATE{$widget} = $widget;
+   Scalar::Util::weaken $ANIMATE{$widget};
+
+   refresh;
+}
+
+sub animation_stop {
+   my ($widget) = @_;
+   delete $ANIMATE{$widget};
+}
+
+%SDL_CB = (
+   SDL_QUIT() => sub {
+      main_quit Gtk2;
+   },
+   SDL_VIDEORESIZE() => sub {
+   },
+   SDL_VIDEOEXPOSE() => sub {
+      refresh;
+   },
+   SDL_KEYDOWN() => sub {
+      if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
+         # alt-enter
+         $FULLSCREEN = !$FULLSCREEN;
+         init_screen;
+      } else {
+         CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
+      }
+   },
+   SDL_KEYUP() => sub {
+      CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
+   },
+   SDL_MOUSEMOTION() => sub {
+      CFClient::UI::feed_sdl_motion_event ($SDL_EV);
+   },
+   SDL_MOUSEBUTTONDOWN() => sub {
+      CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
+   },
+   SDL_MOUSEBUTTONUP() => sub {
+      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#
+   },
+);
 
 @conn::ISA = Crossfire::Protocol::;
 
 sub conn::map_update {
    my ($self, $dirty) = @_;
 
-   refresh;
+   $MAPWIDGET->update;
 }
 
 sub conn::map_scroll {
    my ($self, $dx, $dy) = @_;
 
-   refresh;
+#   refresh;
 }
 
 sub conn::map_clear {
    my ($self) = @_;
 
-   refresh;
+#   refresh;
+}
+
+sub conn::face_find {
+   my ($self, $face) = @_;
+
+   $FACECACHE->{"$face->{chksum},$face->{name}"}
 }
 
 sub conn::face_update {
-   my ($self, $num, $face) = @_;
+   my ($self, $face) = @_;
 
-   warn "up face $self,$num,$face\n";#d#
-   use Gtk2;
+   $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
 
-   my $pb = new Gtk2::Gdk::PixbufLoader;
-   $pb->write ($face->{image});
-   $pb->close;
+   $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
+}
 
-   $pb = $pb->get_pixbuf;
-   $pb = $pb->add_alpha (0, 0, 0, 0);
+sub conn::query {
+   my ($self, $flags, $prompt) = @_;
 
-   glGetError();
-   my ($tex) = @{glGenTextures 1};
+   warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
+}
 
-   $face->{texture} = $tex;
-   
-   glBindTexture GL_TEXTURE_2D, $tex;
-   my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
-                
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
-   
-   glTexImage2D GL_TEXTURE_2D, 0,
-                GL_RGBA8,
-                $pb->get_width, $pb->get_height,
-                0,
-                GL_RGBA,
-                GL_UNSIGNED_BYTE,
-                $pb->get_pixels;
-   my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
+sub gtk_add_cfg_field {
+   my ($tbl, $cfg, $klbl, $key, $value) = @_;
+   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) = @_;
+         $cfg->{$key} = $ent->get_text;
+         # TODO: Mapsize should be a slider in the game gui
+         if ($key eq 'mapsize' and $cfg->{$key} > 100) {
+            $cfg->{$key} = 100;
+         } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
+            $cfg->{$key} = 50;
+         }
+      });
 }
 
+sub run_config_dialog {
+   my (%events) = @_;
+
+   my $w = Gtk2::Window->new;
+
+   my @cfg = (
+      [qw/Host     host/],
+      [qw/Port     port/],
+      [qw/Mapsize% mapsize/],
+      [qw/Username user/],
+      [qw/Password password/],
+   );
+
+   my $cfg = {};
+
+   $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]" } @SDL_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 ("save"), 1, 1, 5);
+            $cb->signal_connect (clicked => sub {
+               for (keys %$cfg) {
+                  $::CFG->{$_} = $cfg->{$_}
+                     if $_ ne '_i';
+               }
+               CFClient::write_cfg "$CFrossfire::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{logout} || 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 });
+}
+
+
 #############################################################################
 
-use Event;
+SDL::Init SDL_INIT_EVERYTHING;
+
+@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
+                @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
+
+CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
 
-Client::Util::read_cfg "$Crossfire::VARDIR/pclient";
+$CFG ||= {
+   width      => 640,
+   height     => 480,
+   mapsize    => 100,
+   fullscreen => 0,
+   host       => "crossfire.schmorp.de",
+   port       => 13327,
+};
+
+{
+   my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
 
-glinit;
+   CFClient::add_font $_ for @fonts;
+   CFClient::set_font $fonts[0];
+}
 
-$conn = new conn
-   host => "cf.schmorp.de",
-   port => 13327;
+$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
 
-Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
-   while ($ev->poll) {
-      ($ev_cb{$ev->type} || sub { warn "unhandled event ", $ev->type })->();
-   }
-});
+run_config_dialog
+   login  => sub { start_game  },
+   logout => sub { stop_game };
 
-Event::loop;
+main Gtk2;
 
+Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";