--- deliantra/server/ext/widget.ext	2007/07/16 14:09:40	1.7
+++ deliantra/server/ext/widget.ext	2007/07/23 21:02:50	1.13
@@ -5,13 +5,15 @@
 # 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
 # w_e        id name args                      # widget_event
 
+our $DEBUG = 1;
+
 cf::client->attach (
    on_connect => sub {
       my ($ns) = @_;
@@ -34,34 +36,6 @@
    }
 }
 
-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) = @_;
 
@@ -96,11 +70,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",
       ));
@@ -115,13 +89,11 @@
    on_login => sub {
       my ($pl) = @_;
 
-      #return unless $cf::CFG{devel};
+      return unless $cf::CFG{devel};
 
       my $ns = $pl->ns;
 
       return unless $ns->{can_widget};
-
-      demo_map $ns;
       #csc_start $ns;
    },
 );
@@ -157,7 +129,7 @@
    my $ws = bless {
       id => $id,
       ns => $self,
-      w  => {},
+      _w => {},
    }, "ext::widget::set";
 
    $ws->msg (ws_n => id => $id);
@@ -187,6 +159,7 @@
 
    if (my $ns = shift->{ns}) {
       $msg{msgtype} = $type;
+      warn "msg " . $ns->{json_coder}->encode (\%msg) if $DEBUG;#d#
       $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg));
    }
 }
@@ -196,10 +169,11 @@
 
    my $id = ++$self->{ns}{id};
 
-   my $proxy = $self->{w}{$id} = bless {
+   my $proxy = bless {
       id => $id,
    }, "ext::widget::proxy";
 
+   Scalar::Util::weaken ($self->{_w}{$id} = $proxy);
    Scalar::Util::weaken ($proxy->{ws} = $self);
    Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
    Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
@@ -210,7 +184,7 @@
    }
 
    $self->msg (ws_c =>
-      ws    => $self->{w}{id},
+      ws    => $proxy->{id},
       id    => $id,
       class => $class,
       args  => \%args,
@@ -229,8 +203,8 @@
    delete $self->{ns}{widget}{$self->{id}};
 
    if (my $ws = $self->{ws}) {
-      delete $ws->{w}{$self->{id}};
       $self->msg (w_c => name => "destroy");
+      delete $ws->{_w}{$self->{id}};
    }
 }
 
@@ -275,15 +249,15 @@
 }
 
 sub set {
-   my ($self, $member, $value) = @_;
+   my ($self, @kv) = @_;
 
-   $self->msg (w_s => name => $member, value => $value);
+   $self->msg (w_s => attr => \@kv);
 }
 
 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 {