--- deliantra/Deliantra-Client/DC.pm	2006/06/01 05:04:34	1.85
+++ deliantra/Deliantra-Client/DC.pm	2008/09/24 02:39:47	1.194
@@ -1,10 +1,10 @@
 =head1 NAME
 
-CFClient - undocumented utility garbage for our crossfire client
+DC - undocumented utility garbage for our deliantra client
 
 =head1 SYNOPSIS
 
- use CFClient;
+ use DC;
 
 =head1 DESCRIPTION
 
@@ -12,462 +12,269 @@
 
 =cut
 
-package CFClient;
+package DC;
+
+use Carp ();
+
+our $VERSION;
 
 BEGIN {
-   $VERSION = '0.1';
+   $VERSION = '0.9976';
 
    use XSLoader;
-   XSLoader::load "CFClient", $VERSION;
+   XSLoader::load "Deliantra::Client", $VERSION;
 }
 
 use utf8;
+use strict qw(vars subs);
 
-use Carp ();
 use AnyEvent ();
-use BerkeleyDB;
-
-sub find_rcfile($) {
-   my $path;
-
-   for (grep !ref, @INC) {
-      $path = "$_/CFClient/resources/$_[0]";
-      return $path if -r $path;
-   }
+use Pod::POM ();
+use File::Path ();
+use Storable (); # finally
+use Fcntl ();
+use JSON::XS qw(encode_json decode_json);
 
-   die "FATAL: can't find required file $_[0]\n";
-}
-
-sub read_cfg {
-   my ($file) = @_;
-
-   open CFG, $file
-      or return;
-
-   my $CFG;
+=item guard { BLOCK }
 
-   local $/;
-   $CFG = eval <CFG>;
+Returns an object that executes the given block as soon as it is destroyed.
 
-   $::CFG = $CFG;
+=cut
 
-   close CFG;
+sub guard(&) {
+   bless \(my $cb = $_[0]), "DC::Guard"
 }
 
-sub write_cfg {
-   my ($file) = @_;
+sub DC::Guard::DESTROY {
+   ${$_[0]}->()
+}
 
-   open CFG, ">$file"
-      or return;
+=item shorten $string[, $maxlength]
 
-   {
-      require Data::Dumper;
-      local $Data::Dumper::Purity = 1;
-      $::CFG->{VERSION} = $::VERSION;
-      print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
-   }
+=cut
 
-   close CFG;
+sub shorten($;$) {
+   my ($str, $len) = @_;
+   substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
+   $str
 }
 
-mkdir "$Crossfire::VARDIR/cfplus", 0777;
+sub asxml($) {
+   local $_ = $_[0];
 
-our $DB_ENV;
+   s/&/&amp;/g;
+   s/>/&gt;/g;
+   s/</&lt;/g;
 
-{
-   use strict;
+   $_
+}
 
-   my $recover = $BerkeleyDB::db_version >= 4.4 
-                 ? eval "DB_REGISTER | DB_RECOVER"
-                 : 0;
+sub socketpipe() {
+   socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
+      or die "cannot establish bidirectional pipe: $!\n";
 
-   $DB_ENV = new BerkeleyDB::Env
-                    -Home => "$Crossfire::VARDIR/cfplus",
-                    -Cachesize => 1_000_000,
-                    -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
-#                 -ErrPrefix => "DATABASE",
-                    -Verbose => 1,
-                    -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
-                    -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
-                       or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
+   ($fh1, $fh2)
 }
 
-sub db_table($) {
-   my ($table) = @_;
+sub background(&;&) {
+   my ($bg, $cb) = @_;
 
-   $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+   my ($fh_r, $fh_w) = DC::socketpipe;
 
-   new CFClient::Database
-      -Env      => $DB_ENV,
-      -Filename => $table,
-#      -Filename => "database",
-#      -Subname  => $table,
-      -Property => DB_CHKSUM,
-      -Flags    => DB_CREATE | DB_UPGRADE,
-         or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
-}
+   my $pid = fork;
 
-sub pod_to_pango($) {
-   my ($pom) = @_;
+   if (defined $pid && !$pid) {
+      local $SIG{__DIE__};
 
-   $pom->present ("CFClient::PodToPango")
-}
+      open STDOUT, ">&", $fh_w;
+      open STDERR, ">&", $fh_w;
+      close $fh_r;
+      close $fh_w;
 
-sub pod_to_pango_list($) {
-   my ($pom) = @_;
+      $| = 1;
 
-   [
-      map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
-         split /\n/, $pom->present ("CFClient::PodToPango")
-   ]
-}
+      eval { $bg->() };
 
-package CFClient::PodToPango;
+      if ($@) {
+         my $msg = $@;
+         $msg =~ s/\n+/\n/;
+         warn "FATAL: $msg";
+         DC::_exit 1;
+      }
 
-use base Pod::POM::View::Text;
+      # win32 is fucked up, of course. exit will clean stuff up,
+      # which destroys our database etc. _exit will exit ALL
+      # forked processes, because of the dreaded fork emulation.
+      DC::_exit 0;
+   }
 
-our $indent = 0;
+   close $fh_w;
 
-*view_seq_code   =
-*view_seq_bold   = sub { "<b>$_[1]</b>" };
-*view_seq_italic = sub { "<i>$_[1]</i>" };
-*view_seq_space  =
-*view_seq_link   =
-*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
+   my $buffer;
 
-sub view_seq_text {
-   my $text = $_[1];
-   $text =~ s/\s+/ /g;
-   CFClient::UI::Label::escape ($text)
-}
+   my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
+      unless (sysread $fh_r, $buffer, 4096, length $buffer) {
+         undef $w;
+         $cb->();
+         return;
+      }
 
-sub view_item {
-   ("\t" x ($indent / 4))
-   . $_[1]->title->present ($_[0])
-   . "\n"
-   . $_[1]->content->present ($_[0])
+      while ($buffer =~ s/^(.*)\n//) {
+         my $line = $1;
+         $line =~ s/\s+$//;
+         utf8::decode $line;
+         if ($line =~ /^\x{e877}json_msg (.*)$/s) {
+            $cb->(JSON::XS->new->allow_nonref->decode ($1));
+         } else {
+            ::message ({
+               markup => "background($pid): " . DC::asxml $line,
+            });
+         }
+      }
+   });
 }
 
-sub view_verbatim {
-   (join "",
-       map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
-          split /\n/, CFClient::UI::Label::escape ($_[1]))
-   . "\n"
-}
+sub background_msg {
+   my ($msg) = @_;
 
-sub view_textblock {
-   ("\t" x ($indent / 2)) . "$_[1]\n\n"
+   $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
+   $msg =~ s/\n//g;
+   utf8::encode $msg;
+   print $msg, "\n";
 }
 
-sub view_head1 {
-   "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_head2 {
-   "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
+package DC;
 
-sub view_head3 {
-   "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
+our $RC_THEME;
+our %THEME;
+our @RC_PATH;
+our $RC_BASE;
 
-sub view_over {
-   local $indent = $indent + $_[1]->indent;
-   $_[1]->content->present ($_[0])
+for (grep !ref, @INC) {
+   $RC_BASE = "$_/Deliantra/Client/private/resources";
+   last if -d $RC_BASE;
 }
 
-package CFClient::Database;
-
-our @ISA = BerkeleyDB::Btree::;
+sub find_rcfile($) {
+   my $path;
 
-sub get($$) {
-   my $data;
+   for (@RC_PATH, "") {
+      $path = "$RC_BASE/$_/$_[0]";
+      return $path if -r $path;
+   }
 
-   $_[0]->db_get ($_[1], $data) == 0
-      ? $data
-      : ()
+   die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
 }
 
-my %DB_SYNC;
-
-sub put($$$) {
-   my ($db, $key, $data) = @_;
+sub load_json($) {
+   my ($file) = @_;
 
-   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+   open my $fh, $file
+      or return;
 
-   $db->db_put ($key => $data)
+   local $/;
+   JSON::XS->new->utf8->relaxed->decode (<$fh>)
 }
 
-package CFClient::Item;
+sub set_theme($) {
+   return if $RC_THEME eq $_[0];
+   $RC_THEME = $_[0];
 
-use strict;
-use Crossfire::Protocol::Constants;
+   # kind of hacky, find the main theme file, then load all theme files and merge them
 
-my $last_enter_count = 1;
+   %THEME = ();
+   @RC_PATH = "theme-$RC_THEME";
 
-sub desc_string {
-   my ($self) = @_;
+   my $theme = load_json find_rcfile "theme.json"
+      or die "FATAL: theme resource file not found";
 
-   my $desc =
-      $self->{nrof} < 2
-         ? $self->{name}
-         : "$self->{nrof} × $self->{name_pl}";
+   @RC_PATH = @{ $theme->{path} } if $theme->{path};
 
-   $self->{flags} & F_OPEN
-      and $desc .= " (open)";
-   $self->{flags} & F_APPLIED
-      and $desc .= " (applied)";
-   $self->{flags} & F_UNPAID
-      and $desc .= " (unpaid)";
-   $self->{flags} & F_MAGIC
-      and $desc .= " (magic)";
-   $self->{flags} & F_CURSED
-      and $desc .= " (cursed)";
-   $self->{flags} & F_DAMNED
-      and $desc .= " (damned)";
-   $self->{flags} & F_LOCKED
-      and $desc .= " *";
+   for (@RC_PATH, "") {
+      my $theme = load_json "$RC_BASE/$_/theme.json"
+         or next;
 
-   $desc
+      %THEME = ( %$theme, %THEME );
+   }
 }
 
-sub weight_string {
-   my ($self) = @_;
-
-   my $weight = ($self->{nrof} || 1) * $self->{weight};
+sub read_cfg {
+   my ($file) = @_;
 
-   $weight < 0 ? "?" : $weight * 0.001
+   $::CFG = load_json $file;
 }
 
-sub do_n_dialog {
-   my ($cb) = @_;
+sub write_cfg {
+   my $file = "$Deliantra::VARDIR/client.cf";
 
-   my $w = new CFClient::UI::FancyFrame;
-   $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
-   $vb->add (new CFClient::UI::Label text => "Enter item count:");
-   $vb->add (my $entry = new CFClient::UI::Entry
-      text => $last_enter_count,
-      on_activate => sub {
-         my ($entry) = @_;
-         $last_enter_count = $entry->get_text;
-         $cb->($last_enter_count);
-         $w->hide;
-         $w = undef;
-      }
-   );
-   $entry->focus_in;
-   $w->show;
+   $::CFG->{VERSION} = $::VERSION;
 
+   open my $fh, ">:utf8", $file
+      or return;
+   print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
 }
 
-sub update_widgets {
-   my ($self) = @_;
-
-   my $button_cb = sub {
-      my (undef, $ev, $x, $y) = @_;
-
-      my $targ = $::CONN->{player}{tag};
+sub http_proxy {
+   my @proxy = win32_proxy_info;
 
-      if ($self->{container} == $::CONN->{player}{tag}) {
-         $targ = $::CONN->{open_container};
-      }
-
-      if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
-         $::CONN->send ("move $targ $self->{tag} 0")
-            if $targ || !($self->{flags} & F_LOCKED);
-      } elsif ($ev->{button} == 1) {
-         $::CONN->send ("examine $self->{tag}");
-      } elsif ($ev->{button} == 2) {
-         $::CONN->send ("apply $self->{tag}");
-      } elsif ($ev->{button} == 3) {
-         my @menu_items = (
-            ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
-            ["mark",    sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
-            ["apply",   sub { $::CONN->send ("apply $self->{tag}") }],
-            (
-               $self->{flags} & F_LOCKED
-               ? (
-                  ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
-                 )
-               : (
-                  ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
-                  ["drop",   sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
-                  ["move n", 
-                     sub {
-                        do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
-                     }
-                  ]
-               )
-            ),
-         );
-
-         CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
-      }
+   if (@proxy) {
+      "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
+   } elsif (exists $ENV{http_proxy}) {
+      $ENV{http_proxy}
+   } else {
+     ()
+   }
+}
 
-      1
-   };
+sub set_proxy {
+   my $proxy = http_proxy
+      or return;
 
-   my $tooltip_std = "<small>"
-                   . "Left click - examine item\n"
-                   . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
-                   . "Middle click - apply\n"
-                   . "Right click - further options"
-                   . "</small>\n";
-
-   $self->{face_widget} ||= new CFClient::UI::Face 
-      can_events => 1,
-      can_hover  => 1,
-      anim       => $self->{anim},
-      animspeed  => $self->{animspeed}, # TODO# must be set at creation time
-      on_button_down => $button_cb,
-   ;
-   $self->{face_widget}{face}      = $self->{face};
-   $self->{face_widget}{anim}      = $self->{anim};
-   $self->{face_widget}{animspeed} = $self->{animspeed};
-   $self->{face_widget}->set_tooltip (
-      "<b>Face/Animation.</b>\n"
-    . "Item uses face #$self->{face}. "
-    . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
-    . "\n\n$tooltip_std"
-   );
-   
-   $self->{desc_widget} ||= new CFClient::UI::Label
-      can_events => 1,
-      can_hover  => 1,
-      ellipsise  => 2,
-      align      => -1,
-      on_button_down => $button_cb,
-   ;
-   my $desc = CFClient::Item::desc_string $self;
-   $self->{desc_widget}->set_text ($desc);
-   $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
-
-   $self->{weight_widget} ||= new CFClient::UI::Label
-      can_events => 1,
-      can_hover  => 1,
-      ellipsise  => 0,
-      align      => 0,
-      on_button_down => $button_cb,
-   ;
-   $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
-
-   $self->{weight_widget}->set_tooltip (
-      "<b>Weight</b>.\n"
-    . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
-    . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
-    . "\n\n$tooltip_std"
-   );
+   $ENV{http_proxy} = $proxy;
 }
 
-package CFClient::Binder;
+sub lwp_useragent {
+   require LWP::UserAgent;
+   
+   DC::set_proxy;
 
-my @ALLOWED_MODIFIER_KEYS = (
-   CFClient::SDLK_LSHIFT,
-   CFClient::SDLK_LCTRL ,
-   CFClient::SDLK_LALT  ,
-   CFClient::SDLK_LMETA ,
-
-   CFClient::SDLK_RSHIFT,
-   CFClient::SDLK_RCTRL ,
-   CFClient::SDLK_RALT  ,
-   CFClient::SDLK_RMETA ,
-);
-
-my %ALLOWED_MODIFIERS = (
-   CFClient::KMOD_LSHIFT => "LSHIFT",
-   CFClient::KMOD_LCTRL  => "LCTRL",
-   CFClient::KMOD_LALT   => "LALT",
-   CFClient::KMOD_LMETA  => "LMETA",
-
-   CFClient::KMOD_RSHIFT => "RSHIFT",
-   CFClient::KMOD_RCTRL  => "RCTRL",
-   CFClient::KMOD_RALT   => "RALT",
-   CFClient::KMOD_RMETA  => "RMETA",
-);
-
-my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
-my @DIRECT_BIND_KEYS = (
-   CFClient::SDLK_F1,
-   CFClient::SDLK_F2,
-   CFClient::SDLK_F3,
-   CFClient::SDLK_F4,
-   CFClient::SDLK_F5,
-   CFClient::SDLK_F6,
-   CFClient::SDLK_F7,
-   CFClient::SDLK_F8,
-   CFClient::SDLK_F9,
-   CFClient::SDLK_F10,
-   CFClient::SDLK_F11,
-   CFClient::SDLK_F12,
-   CFClient::SDLK_F13,
-   CFClient::SDLK_F14,
-   CFClient::SDLK_F15,
-);
-
-# this binding dialog asks for a key-combo to be pressed
-# and if successful it calls the $cb with $mod and $sym as args.
-sub open_binding_dialog {
-   my ($cb) = @_;
-
-   my $w = new CFClient::UI::FancyFrame
-      title => "Bind Action",
-      x => "center",
-      y => "center";
-
-   $w->add (my $vb = new CFClient::UI::VBox);
-   $vb->add (new CFClient::UI::Label
-      text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
-             ."You can only bind 0-9 and F1-F15 without modifiers."
+   my $ua = LWP::UserAgent->new (
+      agent      => "deliantra $VERSION",
+      keep_alive => 1,
+      env_proxy  => 1,
+      timeout    => 30,
    );
-   $vb->add (my $entry = new CFClient::UI::Entry
-      text => "",
-      on_key_down => sub {
-         my ($entry, $ev) = @_;
-
-         my $mod = $ev->{mod};
-         my $sym = $ev->{sym};
-
-         # XXX: This seems a little bit hackisch to me, but i have to ignore them
-         if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
-            return;
-         }
+}
 
-         if ($mod == CFClient::KMOD_NONE
-             and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
-             and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
-         {
-            $::STATUSBOX->add (
-               "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
-               ." directly without modifier! It would damage the completer handling."
-            );
-            return;
-         }
+sub lwp_check($) {
+   my ($res) = @_;
 
-         $entry->focus_out;
+   $res->is_error
+      and die $res->status_line;
 
-         $cb->($mod, $sym);
+   $res
+}
 
-         $w->destroy
-      });
+sub fh_nonblocking($$) {
+   my ($fh, $nb) = @_;
 
-   $entry->focus_in;
-   $w->show;
+   if ($^O eq "MSWin32") {
+      $nb = (! ! $nb) + 0;
+      ioctl $fh, 0x8004667e, \$nb; # FIONBIO
+   } else {
+      fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
+   }
 }
 
-sub keycombo_to_name {
-   my ($mod, $sym) = @_;
+package DC::Layout;
 
-   my $mods = join '+',
-                 map { $ALLOWED_MODIFIERS{$_} }
-                    grep { ($_ + 0) & ($mod + 0) }
-                       keys %ALLOWED_MODIFIERS;
-   $mods .= "+" if $mods ne '';
+$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
+   glyph_cache_restore;
+};
 
-   return $mods . CFClient::SDL_GetKeyName ($sym);
-}
+$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
+   glyph_cache_backup;
+};
 
 1;