--- deliantra/server/ext/widget.ext	2007/07/23 21:02:50	1.13
+++ deliantra/server/ext/widget.ext	2007/07/23 23:38:17	1.14
@@ -1,10 +1,10 @@
 #! perl # mandatory depends=login
 
 # sends the following ext message types
-# ws_n       id                                # widgetset new
-# ws_d       id                                # widgetset destroy
+# ws_n       ws                                # widgetset new
+# ws_d       ws                                # widgetset destroy
 # ws_c       ws id class args                  # widgetset create
-# w_c        id [rid] name args                # widget method call
+# w_c        id rid name args                  # widget method call
 # w_s        id @attr                          # widget member set
 # w_g        id rid @attr                      # widget member get
 #
@@ -99,11 +99,11 @@
 );
 
 cf::register_exticmd w_e => sub {
-   my ($ns, $pkt) = @_;
+   my ($ns, $id, $name, $args) = @_;
 
-   if (my $w = $ns->{widget}{$pkt->{id}}) {
-      if (my $cb = $w->{ev}{$pkt->{name}}) {
-         $_->($w, @{ $pkt->{args} || [] })
+   if (my $w = $ns->{widget}{$id}) {
+      if (my $cb = $w->{ev}{$name}) {
+         $_->($w, @$args)
             for @$cb;
       }
    }
@@ -112,10 +112,10 @@
 };
 
 cf::register_exticmd w_r => sub {
-   my ($ns, $pkt) = @_;
+   my ($ns, $rid, $res) = @_;
 
-   if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) {
-      $cb->(@{$pkt->{res} || [] });
+   if (my $cb = delete $ns->{widget_return}{$rid}) {
+      $cb->(@$res);
    }
 
    ()
@@ -132,7 +132,7 @@
       _w => {},
    }, "ext::widget::set";
 
-   $ws->msg (ws_n => id => $id);
+   $ws->msg (ws_n => $id);
 
    $ws
 }
@@ -148,19 +148,18 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->msg (ws_d => id => $self->{id});
+   $self->msg (ws_d => $self->{id});
    delete $self->{ns};
    $_->destroy
       for values %{ $self->{w} };
 }
 
 sub msg {
-   my ($self, $type, %msg) = @_;
+   my ($self, @msg) = @_;
 
    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));
+      warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
+      $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
    }
 }
 
@@ -184,10 +183,10 @@
    }
 
    $self->msg (ws_c =>
-      ws    => $proxy->{id},
-      id    => $id,
-      class => $class,
-      args  => \%args,
+      $proxy->{id},
+      $id,
+      $class,
+      \%args,
    );
 
    $proxy
@@ -203,30 +202,26 @@
    delete $self->{ns}{widget}{$self->{id}};
 
    if (my $ws = $self->{ws}) {
-      $self->msg (w_c => name => "destroy");
+      $self->msg (w_c => 0, "destroy");
       delete $ws->{_w}{$self->{id}};
    }
 }
 
 sub msg {
-   my ($self, $type, %msg) = @_;
+   my ($self, $type, @arg) = @_;
 
    if (my $ws = $self->{ws}) {
-      $ws->msg ($type,
-         %msg,
-         id => $self->{id},
-      );
+      $ws->msg ($type, $self->{id}, @arg);
    }
 }
 
 sub msg_cb {
-   my ($self, $cb, $type, %msg) = @_;
+   my ($self, $cb, $type, @arg) = @_;
 
    if (my $ws = $self->{ws}) {
-
       my $rid = ++$ws->{ns}{id};
 
-      $self->msg ($type, %msg, rid => $rid);
+      $self->msg ($type, $rid, @arg);
 
       if ($cb) {
          $ws->{ns}{widget_return}{$rid} = $cb;
@@ -251,13 +246,13 @@
 sub set {
    my ($self, @kv) = @_;
 
-   $self->msg (w_s => attr => \@kv);
+   $self->msg (w_s => \@kv);
 }
 
 sub get {
    my ($self, $member, $cb) = @_;
 
-   $self->msg_cb ($cb, w_g => attr => [$member]);
+   $self->msg_cb ($cb, w_g => [$member]);
 }
 
 sub TO_JSON {
@@ -272,7 +267,7 @@
 
    my $self = shift;
 
-   $self->msg (w_c => name => $AUTOLOAD, args => \@_);
+   $self->msg (w_c => 0, $AUTOLOAD, \@_);
 
    ()
 }