ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/widget.ext
(Generate patch)

Comparing deliantra/server/ext/widget.ext (file contents):
Revision 1.3 by root, Tue Jun 26 04:50:05 2007 UTC vs.
Revision 1.12 by root, Sun Jul 22 20:08:38 2007 UTC

… …
3# sends the following ext message types 3# sends the following ext message types
4# ws_n id # widgetset new 4# ws_n id # widgetset new
5# ws_d id # widgetset destroy 5# ws_d id # widgetset destroy
6# ws_c ws id class args # widgetset create 6# ws_c ws id class args # widgetset create
7# w_c id [rid] name args # widget method call 7# w_c id [rid] name args # widget method call
8# w_s id name value # widget member set 8# w_s id @attr # widget member set
9# w_g id rid name # widget member get 9# w_g id rid @attr # widget member get
10# 10#
11# and expects the following exti message types 11# and expects the following exti message types
12# w_r rid res # widget call return 12# w_r rid res # widget call return
13# w_e id name args # widget_event 13# w_e id name args # widget_event
14 14
15cf::client->attach ( 15cf::client->attach (
16 on_connect => sub { 16 on_connect => sub {
17 my ($ns) = @_; 17 my ($ns) = @_;
18 18
19 Scalar::Util::weaken (my $weakns = $ns);
20
19 $ns->{id} = "a"; 21 $ns->{id} = "a";
22 $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub {
23 # cannot deserialise ATM
24 undef
25 });
20 }, 26 },
21); 27);
22 28
23sub csc_update_stats { 29sub csc_update_stats {
24 my ($ns) = @_; 30 my ($ns) = @_;
… …
60 [5, "Pow"], 66 [5, "Pow"],
61 [6, "Cha"], 67 [6, "Cha"],
62 ) { 68 ) {
63 my ($x, $label) = @$_; 69 my ($x, $label) = @$_;
64 70
65 $statstable->add ($x, 0, $ws->new (Label => 71 $statstable->add_at ($x, 0, $ws->new (Label =>
66 can_hover => 1, can_events => 1, 72 can_hover => 1, can_events => 1,
67 align => +1, text => $label, tooltip => "#stat_$label", 73 align => +1, text => $label, tooltip => "#stat_$label",
68 )); 74 ));
69 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 75 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
70 can_hover => 1, can_events => 1, 76 can_hover => 1, can_events => 1,
71 align => +1, template => "88", tooltip => "#stat_$label", 77 align => +1, template => "88", tooltip => "#stat_$label",
72 )); 78 ));
73 } 79 }
74 80
… …
84 return unless $cf::CFG{devel}; 90 return unless $cf::CFG{devel};
85 91
86 my $ns = $pl->ns; 92 my $ns = $pl->ns;
87 93
88 return unless $ns->{can_widget}; 94 return unless $ns->{can_widget};
89
90 csc_start $ns; 95 #csc_start $ns;
91 }, 96 },
92); 97);
93 98
94cf::register_exticmd w_e => sub { 99cf::register_exticmd w_e => sub {
95 my ($ns, $pkt) = @_; 100 my ($ns, $pkt) = @_;
… …
120 my $id = ++$self->{id}; 125 my $id = ++$self->{id};
121 126
122 my $ws = bless { 127 my $ws = bless {
123 id => $id, 128 id => $id,
124 ns => $self, 129 ns => $self,
125 w => {}, 130 _w => {},
126 }, "ext::widget::set"; 131 }, "ext::widget::set";
127 132
128 $ws->msg (ws_n => id => $id); 133 $ws->msg (ws_n => id => $id);
129 134
130 $ws 135 $ws
… …
150sub msg { 155sub msg {
151 my ($self, $type, %msg) = @_; 156 my ($self, $type, %msg) = @_;
152 157
153 if (my $ns = shift->{ns}) { 158 if (my $ns = shift->{ns}) {
154 $msg{msgtype} = $type; 159 $msg{msgtype} = $type;
155 $ns->send_packet ("ext " . cf::to_json \%msg); 160 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg));
156 } 161 }
157} 162}
158 163
159sub new { 164sub new {
160 my ($self, $class, %args) = @_; 165 my ($self, $class, %args) = @_;
161 166
162 my $id = ++$self->{ns}{id}; 167 my $id = ++$self->{ns}{id};
163 168
164 my $proxy = $self->{w}{$id} = bless { 169 my $proxy = $self->{_w}{$id} = bless {
165 id => $id, 170 id => $id,
166 }, "ext::widget::proxy"; 171 }, "ext::widget::proxy";
167 172
168 Scalar::Util::weaken ($proxy->{ws} = $self); 173 Scalar::Util::weaken ($proxy->{ws} = $self);
169 Scalar::Util::weaken ($proxy->{ns} = $self->{ns}); 174 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
… …
173 push @{$proxy->{ev}{$ev}}, $args{$ev}; 178 push @{$proxy->{ev}{$ev}}, $args{$ev};
174 $args{$ev} = 0; 179 $args{$ev} = 0;
175 } 180 }
176 181
177 $self->msg (ws_c => 182 $self->msg (ws_c =>
178 ws => $self->{w}{id}, 183 ws => $proxy->{id},
179 id => $id, 184 id => $id,
180 class => $class, 185 class => $class,
181 args => \%args, 186 args => \%args,
182 ); 187 );
183 188
… …
191sub DESTROY { 196sub DESTROY {
192 my ($self) = @_; 197 my ($self) = @_;
193 198
194 delete $self->{ns}{widget}{$self->{id}}; 199 delete $self->{ns}{widget}{$self->{id}};
195 200
201 #warn "DES<$self> $self->{ws}\n";#d#
196 if (my $ws = $self->{ws}) { 202 if (my $ws = $self->{ws}) {
197 delete $ws->{w}{$self->{id}};
198 $self->msg (w_c => name => "destroy"); 203 $self->msg (w_c => name => "destroy");
204 delete $ws->{_w}{$self->{id}};
199 } 205 }
200} 206}
201 207
202sub msg { 208sub msg {
203 my ($self, $type, %msg) = @_; 209 my ($self, $type, %msg) = @_;
… …
238 244
239 () 245 ()
240} 246}
241 247
242sub set { 248sub set {
243 my ($self, $member, $value) = @_; 249 my ($self, @kv) = @_;
244 250
245 $self->msg (w_s => name => $member, value => $value); 251 $self->msg (w_s => attr => \@kv);
246} 252}
247 253
248sub get { 254sub get {
249 my ($self, $member, $cb) = @_; 255 my ($self, $member, $cb) = @_;
250 256
251 $self->msg_cb ($cb, w_g => name => $member); 257 $self->msg_cb ($cb, w_g => attr => [$member]);
252} 258}
253 259
254sub TO_JSON { 260sub TO_JSON {
255 { __widget_ref__ => $_[0]{id} } 261 { __widget_ref__ => $_[0]{id} }
256} 262}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines