--- deliantra/server/ext/widget.ext	2007/12/27 19:41:26	1.21
+++ deliantra/server/ext/widget.ext	2008/01/13 12:42:55	1.25
@@ -19,12 +19,12 @@
    on_connect => sub {
       my ($ns) = @_;
 
-      Scalar::Util::weaken (my $weakns = $ns);
-
       $ns->{id} = "a";
       $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
-         $weakns->{widget}{$_[0]}
+         $ns->{widget}{$_[0]}
       });
+
+      cf::weaken $ns;
    },
 );
 
@@ -98,31 +98,6 @@
 EOF
 die if $@;
 
-sub demo_start {
-   my ($ns) = @_;
-
-   my $ws = $ns->{csc} = $ns->new_widgetset;
-
-   my ($tl, $entry) = $ws->template (inline => $cg_template,
-      [
-         toplevel => {},
-         entry    => {
-            text => "xyz",
-            on_changed => sub {
-               warn "changed<@_>\n";#d#
-            },
-         },
-      ],
-   );
-
-   $tl->show;
-
-   $ns->{xxxw} = [$tl, $entry];#d#
-   
-#   $ws->find ("setup_notebook")->add ($ws->{tab});
-#   $ws->find ("setup_dialog")->toggle_visibility;
-}
-
 sub csc_start {
    my ($ns) = @_;
 
@@ -171,19 +146,37 @@
 
    $ws->{tl} = $w;
    $w->show;
+
+#   my ($tl, $entry) = $ws->template (inline => $cg_template,
+#      [
+#         toplevel => {},
+#         entry    => {
+#            text => "xyz",
+#            on_changed => sub {
+#               warn "changed<@_>\n";#d#
+#            },
+#         },
+#      ],
+#   );
+#
+#   $tl->show;
+#
+#   $ns->{xxxw} = [$tl, $entry];#d#
+#   
+#   $ws->find ("setup_notebook")->add ($ws->{tab});
+#   $ws->find ("setup_dialog")->toggle_visibility;
 }
 
 cf::player->attach (
    on_login => sub {
       my ($pl) = @_;
 
-      return unless $cf::CFG{devel};
-
       my $ns = $pl->ns;
-
       return unless $ns->{can_widget};
+
+      return unless $cf::CFG{devel};
+
       #csc_start $ns;
-      demo_start $ns;
    },
 );
 
@@ -208,6 +201,8 @@
       _w => {},
    }, "ext::widget::set";
 
+   cf::weaken $ws->{ns};
+
    $ws->msg (ws_n => $id);
 
    $ws
@@ -243,6 +238,7 @@
    my ($self, @msg) = @_;
 
    if (my $ns = shift->{ns}) {
+      return unless $ns->{json_coder};#d# might be gone at destroy time(??)
       warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
       $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
    }
@@ -268,8 +264,9 @@
 
    my $proxy = $self->alloc;
 
-   Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
-   Scalar::Util::weaken ($proxy->{ws} = $self);
+   cf::weaken
+      +($self->{_w}{$proxy->{id}} = $proxy),
+      +($proxy->{ws} = $self);
 
    for my $ev (grep /^on_/, keys %args) {
       $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
@@ -289,15 +286,17 @@
    my ($self, $type, $template, $args, $done_cb) = @_;
 
    my %cfg;
-   my @res;
 
    while (@$args) {
       my ($name, $args) = splice @$args, 0, 2, ();
 
       my $proxy = $self->alloc;
 
-      Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
-      Scalar::Util::weaken ($proxy->{ws} = $self);
+      $self->{delete $args->{alias} or $name} = $proxy;
+
+      cf::weaken
+         +($self->{_w}{$proxy->{id}} = $proxy),
+         +($proxy->{ws} = $self);
 
       for my $ev (grep /^on_/, keys %$args) {
          $args->{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args->{$ev});
@@ -307,8 +306,6 @@
          %$args,
          id => $proxy->{id},
       };
-
-      push @res, $proxy;
    }
 
    if ($done_cb) {
@@ -321,14 +318,17 @@
       });
    }
 
+   if ($type eq "face") {
+      $self->{ns}->send_face ($template, 100);
+      $self->{ns}->flush_fx;
+   }
+
    $self->msg (ws_ct =>
       $self->{id},
       $type => $template,
       $done_cb,
       \%cfg,
    );
-
-   @res
 }
 
 sub find {
@@ -357,46 +357,6 @@
 
 package ext::widget::proxy;
 
-sub DESTROY {
-   my ($self) = @_;
-
-   delete $self->{ns}{widget}{$self->{id}};
-
-   if (my $ws = $self->{ws}) {
-      $self->msg (w_c => 0, "destroy");
-      delete $ws->{_w}{$self->{id}};
-   }
-}
-
-sub cb {
-   my ($self, $cb) = @_;
-
-   my $proxy = bless {
-      ns => $self->{ns},
-      id => $self->{ns}->alloc_wid,
-   }, "ext::widget::callback";
-
-   Scalar::Util::weaken $proxy->{ns};
-
-   $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
-
-   $proxy
-}
-
-sub oneshot_cb {
-   my ($self, $cb) = @_;
-
-   if ("CODE" eq ref $cb) {
-      my $ocb = $cb;
-      $cb = $self->cb (sub {
-         undef $cb;
-         &$ocb
-      });
-   }
-
-   $cb
-}
-
 sub msg {
    my ($self, $type, @arg) = @_;
 
@@ -443,6 +403,46 @@
    ()
 }
 
+sub DESTROY {
+   my ($self) = @_;
+
+   delete $self->{ns}{widget}{$self->{id}};
+
+   if (my $ws = $self->{ws}) {
+      $self->msg (w_c => 0, "destroy");
+      delete $ws->{_w}{$self->{id}};
+   }
+}
+
+sub cb {
+   my ($self, $cb) = @_;
+
+   my $proxy = bless {
+      ns => $self->{ns},
+      id => $self->{ns}->alloc_wid,
+   }, "ext::widget::callback";
+
+   cf::weaken $proxy->{ns};
+
+   $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
+
+   $proxy
+}
+
+sub oneshot_cb {
+   my ($self, $cb) = @_;
+
+   if ("CODE" eq ref $cb) {
+      my $ocb = $cb;
+      $cb = cb $self, sub {
+         undef $cb;
+         &$ocb
+      };
+   }
+
+   $cb
+}
+
 sub set {
    my ($self, @kv) = @_;