--- deliantra/server/ext/widget.ext	2007/06/26 04:50:05	1.3
+++ deliantra/server/ext/widget.ext	2007/07/15 22:39:48	1.5
@@ -16,7 +16,13 @@
    on_connect => sub {
       my ($ns) = @_;
 
+      Scalar::Util::weaken (my $weakns = $ns);
+
       $ns->{id} = "a";
+      $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub {
+        # cannot deserialise ATM
+        undef
+      });
    },
 );
 
@@ -28,6 +34,36 @@
    }
 }
 
+sub demo_map {
+   my ($ns) = @_;
+
+   my $ws = $ns->{csc} = $ns->new_widgetset;
+
+   my $w = $ws->new (Toplevel =>
+      w     => 200,
+      h     => 200,
+      x     => "center",
+      y     => "center",
+      title => "Worldmap",
+      has_close_button => 1,
+      on_delete => sub {
+         $ws->destroy;
+      },
+   );
+
+   my $face = cf::face::find "res/worldmap.jpg";
+   $ns->send_face ($face);
+
+   $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
+   $sw->add (my $vb = $ws->new (VBox => expand => 1));
+   #$vb->add ($ws->new (Label => text => "lb1"));
+   $vb->add ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face));
+   $sw->show;
+   $vb->show;
+
+   $w->show;
+}
+
 sub csc_start {
    my ($ns) = @_;
 
@@ -87,7 +123,8 @@
 
       return unless $ns->{can_widget};
 
-      csc_start $ns;
+      demo_map $ns;
+      #csc_start $ns;
    },
 );
 
@@ -152,7 +189,7 @@
 
    if (my $ns = shift->{ns}) {
       $msg{msgtype} = $type;
-      $ns->send_packet ("ext " . cf::to_json \%msg);
+      $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg));
    }
 }