--- deliantra/server/ext/widget.ext	2007/06/26 04:50:05	1.3
+++ deliantra/server/ext/widget.ext	2007/07/21 15:04:36	1.10
@@ -5,8 +5,8 @@
 # ws_d       id                                # widgetset destroy
 # ws_c       ws id class args                  # widgetset create
 # w_c        id [rid] name args                # widget method call
-# w_s        id name value                     # widget member set
-# w_g        id rid name                       # widget member get
+# w_s        id @attr                          # widget member set
+# w_g        id rid @attr                      # widget member get
 #
 # and expects the following exti message types
 # w_r        rid res                           # widget call return
@@ -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,34 @@
    }
 }
 
+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 $fixed = $ws->new (Fixed => expand => 1));
+   $fixed->add ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face), abs => 0, 0, rel => 1, 1);
+   $fixed->add ($ws->new (Label => text => "lb1"), abs => 10, 10, rel => 1, 1);
+
+   $w->show;
+}
+
 sub csc_start {
    my ($ns) = @_;
 
@@ -62,11 +96,11 @@
    ) {
       my ($x, $label) = @$_;
 
-      $statstable->add ($x, 0, $ws->new (Label =>
+      $statstable->add_at ($x, 0, $ws->new (Label =>
          can_hover => 1, can_events => 1,
          align => +1, text => $label, tooltip => "#stat_$label",
       ));
-      $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
+      $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
          can_hover => 1, can_events => 1,
          align => +1, template => "88", tooltip => "#stat_$label",
       ));
@@ -87,7 +121,8 @@
 
       return unless $ns->{can_widget};
 
-      csc_start $ns;
+      demo_map $ns;
+      #csc_start $ns;
    },
 );
 
@@ -152,7 +187,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));
    }
 }
 
@@ -242,13 +277,13 @@
 sub set {
    my ($self, $member, $value) = @_;
 
-   $self->msg (w_s => name => $member, value => $value);
+   $self->msg (w_s => attr => [ [$member, $value] ]);
 }
 
 sub get {
    my ($self, $member, $cb) = @_;
 
-   $self->msg_cb ($cb, w_g => name => $member);
+   $self->msg_cb ($cb, w_g => attr => [$member]);
 }
 
 sub TO_JSON {