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.20 by root, Thu Dec 27 18:35:48 2007 UTC

1#! perl # mandatory depends=login 1#! perl # mandatory depends=login
2 2
3# sends the following ext message types 3# sends the following ext message types
4# ws_a id name... # associate well-known widget with given id
4# ws_n id # widgetset new 5# ws_n ws # widgetset new
5# ws_d id # widgetset destroy 6# ws_d ws # widgetset destroy
6# ws_c ws id class args # widgetset create 7# ws_c ws id class @args # widgetset create
8# ws_ct ws templateface \%cfg # widgetset create from template
7# w_c id [rid] name args # widget method call 9# w_c id rid name @args # widget method call
8# w_s id name value # widget member set 10# w_s id @attr # widget member set
9# w_g id rid name # widget member get 11# w_g id rid @attr # widget member get
10# 12#
11# and expects the following exti message types 13# and expects the following exti message types
12# w_r rid res # widget call return
13# w_e id name args # widget_event 14# w_e id @args # widget_call
15
16our $DEBUG = 1;
14 17
15cf::client->attach ( 18cf::client->attach (
16 on_connect => sub { 19 on_connect => sub {
17 my ($ns) = @_; 20 my ($ns) = @_;
18 21
22 Scalar::Util::weaken (my $weakns = $ns);
23
19 $ns->{id} = "a"; 24 $ns->{id} = "a";
25 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
26 $weakns->{widget}{$_[0]}
27 });
20 }, 28 },
21); 29);
22 30
23sub csc_update_stats { 31sub csc_update_stats {
24 my ($ns) = @_; 32 my ($ns) = @_;
25 33
26 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 34 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
27 $v->set_text ($ns->pl->ob->stats->$k); 35 $v->set_text ($ns->pl->ob->stats->$k);
28 } 36 }
37}
38
39sub demo_start {
40 my ($ns) = @_;
41
42 my $ws = $ns->{csc} = $ns->new_widgetset;
43
44 my ($tl, $entry) = $ws->template (undef,
45 toplevel => {},
46 entry => {
47 text => "xyz",
48 on_changed => sub {
49 warn "changed<@_>\n";#d#
50 },
51 },
52 );
53
54 $tl->show;
55
56 $ns->{xxxw} = [$tl, $entry];#d#
57
58# $ws->find ("setup_notebook")->add ($ws->{tab});
59# $ws->find ("setup_dialog")->toggle_visibility;
29} 60}
30 61
31sub csc_start { 62sub csc_start {
32 my ($ns) = @_; 63 my ($ns) = @_;
33 64
… …
45 }, 76 },
46 ); 77 );
47 78
48 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 79 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
49 80
50 $ntb->add (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character"); 81 $ntb->add_tab (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character");
51 82
52 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 83 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
53 84
54 for ( 85 for (
55 [0, "Str"], 86 [0, "Str"],
56 [1, "Dex"], 87 [1, "Dex"],
57 [2, "Con"], 88 [2, "Con"],
… …
60 [5, "Pow"], 91 [5, "Pow"],
61 [6, "Cha"], 92 [6, "Cha"],
62 ) { 93 ) {
63 my ($x, $label) = @$_; 94 my ($x, $label) = @$_;
64 95
65 $statstable->add ($x, 0, $ws->new (Label => 96 $statstable->add_at ($x, 0, $ws->new (Label =>
66 can_hover => 1, can_events => 1, 97 can_hover => 1, can_events => 1,
67 align => +1, text => $label, tooltip => "#stat_$label", 98 align => +1, text => $label, tooltip => "#stat_$label",
68 )); 99 ));
69 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 100 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
70 can_hover => 1, can_events => 1, 101 can_hover => 1, can_events => 1,
71 align => +1, template => "88", tooltip => "#stat_$label", 102 align => +1, template => "88", tooltip => "#stat_$label",
72 )); 103 ));
73 } 104 }
74 105
75 csc_update_stats $ns; 106 csc_update_stats $ns;
76 107
108 $ws->{tl} = $w;
77 $w->show; 109 $w->show;
78} 110}
79 111
80cf::player->attach ( 112cf::player->attach (
81 on_login => sub { 113 on_login => sub {
… …
84 return unless $cf::CFG{devel}; 116 return unless $cf::CFG{devel};
85 117
86 my $ns = $pl->ns; 118 my $ns = $pl->ns;
87 119
88 return unless $ns->{can_widget}; 120 return unless $ns->{can_widget};
89
90 csc_start $ns; 121 #csc_start $ns;
122 demo_start $ns;
91 }, 123 },
92); 124);
93 125
94cf::register_exticmd w_e => sub { 126cf::register_exticmd w_e => sub {
95 my ($ns, $pkt) = @_; 127 my ($ns, $id, @args) = @_;
96 128
97 if (my $w = $ns->{widget}{$pkt->{id}}) { 129 if (my $cb = $ns->{widget_cb}{$id}) {
98 if (my $cb = $w->{ev}{$pkt->{name}}) { 130 $cb->(@args);
99 $_->($w, @{ $pkt->{args} || [] })
100 for @$cb;
101 }
102 }
103
104 ()
105};
106
107cf::register_exticmd w_r => sub {
108 my ($ns, $pkt) = @_;
109
110 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) {
111 $cb->(@{$pkt->{res} || [] });
112 } 131 }
113 132
114 () 133 ()
115}; 134};
116 135
… …
120 my $id = ++$self->{id}; 139 my $id = ++$self->{id};
121 140
122 my $ws = bless { 141 my $ws = bless {
123 id => $id, 142 id => $id,
124 ns => $self, 143 ns => $self,
125 w => {}, 144 _w => {},
126 }, "ext::widget::set"; 145 }, "ext::widget::set";
127 146
128 $ws->msg (ws_n => id => $id); 147 $ws->msg (ws_n => $id);
129 148
130 $ws 149 $ws
150}
151
152sub cf::client::alloc_wid {
153 pop @{ $_[0]{ids} }
154 or ++$_[0]{id}
155}
156
157sub cf::client::free_wid {
158 push @{ $_[0]{ids} }, $_[1];
131} 159}
132 160
133############################################################################# 161#############################################################################
134 162
135package ext::widget::set; 163package ext::widget::set;
… …
139} 167}
140 168
141sub destroy { 169sub destroy {
142 my ($self) = @_; 170 my ($self) = @_;
143 171
144 $self->msg (ws_d => id => $self->{id}); 172 $self->msg (ws_d => $self->{id});
145 delete $self->{ns}; 173 delete $self->{ns};
146 $_->destroy 174 $_->destroy
147 for values %{ $self->{w} }; 175 for values %{ $self->{w} };
148} 176}
149 177
150sub msg { 178sub msg {
151 my ($self, $type, %msg) = @_; 179 my ($self, @msg) = @_;
152 180
153 if (my $ns = shift->{ns}) { 181 if (my $ns = shift->{ns}) {
154 $msg{msgtype} = $type; 182 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
155 $ns->send_packet ("ext " . cf::to_json \%msg); 183 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
156 } 184 }
185}
186
187sub alloc {
188 my ($self) = @_;
189
190 my $id = $self->{ns}->alloc_wid;
191
192 my $proxy = bless {
193 id => $id,
194 }, "ext::widget::proxy";
195
196 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
197 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
198
199 $proxy
157} 200}
158 201
159sub new { 202sub new {
160 my ($self, $class, %args) = @_; 203 my ($self, $class, %args) = @_;
161 204
162 my $id = ++$self->{ns}{id}; 205 my $proxy = $self->alloc;
163 206
164 my $proxy = $self->{w}{$id} = bless { 207 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
165 id => $id,
166 }, "ext::widget::proxy";
167
168 Scalar::Util::weaken ($proxy->{ws} = $self); 208 Scalar::Util::weaken ($proxy->{ws} = $self);
169 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
170 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
171 209
172 for my $ev (grep /^on_/, keys %args) { 210 for my $ev (grep /^on_/, keys %args) {
173 push @{$proxy->{ev}{$ev}}, $args{$ev}; 211 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
174 $args{$ev} = 0;
175 } 212 }
176 213
177 $self->msg (ws_c => 214 $self->msg (ws_c =>
178 ws => $self->{w}{id}, 215 $self->{id},
179 id => $id, 216 $proxy->{id},
180 class => $class, 217 $class,
181 args => \%args, 218 \%args,
182 ); 219 );
183 220
184 $proxy 221 $proxy
222}
223
224sub template {
225 my ($self, $template, @args) = @_;
226
227 my %cfg;
228 my @res;
229
230 while (@args) {
231 my ($name, $args) = splice @args, 0, 2, ();
232
233 my $proxy = $self->alloc;
234
235 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
236 Scalar::Util::weaken ($proxy->{ws} = $self);
237
238 for my $ev (grep /^on_/, keys %$args) {
239 $args->{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args->{$ev});
240 }
241
242 $cfg{$name} = {
243 %$args,
244 id => $proxy->{id},
245 };
246
247 push @res, $proxy;
248 }
249
250 $self->msg (ws_ct =>
251 $self->{id},
252 $template,
253 \%cfg,
254 );
255
256 @res
257}
258
259sub find {
260 my ($self, @names) = @_;
261
262 my @res;
263 my @alloc;
264
265 for my $name (@names) {
266 push @res, $self->{ns}{widget_wkw}{$name} ||= do {
267 my $proxy = $self->alloc;
268
269 push @alloc, $proxy->{id} => $name;
270
271 $proxy
272 };
273 }
274
275 $self->msg (ws_a => @alloc)
276 if @alloc;
277
278 wantarray ? @res : $res[0]
185} 279}
186 280
187############################################################################# 281#############################################################################
188 282
189package ext::widget::proxy; 283package ext::widget::proxy;
… …
192 my ($self) = @_; 286 my ($self) = @_;
193 287
194 delete $self->{ns}{widget}{$self->{id}}; 288 delete $self->{ns}{widget}{$self->{id}};
195 289
196 if (my $ws = $self->{ws}) { 290 if (my $ws = $self->{ws}) {
291 $self->msg (w_c => 0, "destroy");
197 delete $ws->{w}{$self->{id}}; 292 delete $ws->{_w}{$self->{id}};
198 $self->msg (w_c => name => "destroy");
199 } 293 }
294}
295
296sub cb {
297 my ($self, $cb) = @_;
298
299 my $proxy = bless {
300 ns => $self->{ns},
301 id => $self->{ns}->alloc_wid,
302 }, "ext::widget::callback";
303
304 Scalar::Util::weaken $proxy->{ns};
305
306 $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
307
308 $proxy
309}
310
311sub oneshot_cb {
312 my ($self, $cb) = @_;
313
314 if ("CODE" eq ref $cb) {
315 my $ocb = $cb;
316 $cb = $self->cb (sub {
317 undef $cb;
318 &$ocb
319 });
320 }
321
322 $cb
200} 323}
201 324
202sub msg { 325sub msg {
203 my ($self, $type, %msg) = @_; 326 my ($self, $type, @arg) = @_;
327
328 if (my $ns = $self->{ns}) {
329 my @msg = ($type, $self->{id}, @arg);
330 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
331 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
332 }
333}
334
335sub msg_cb {
336 my ($self, $cb, $type, @arg) = @_;
204 337
205 if (my $ws = $self->{ws}) { 338 if (my $ws = $self->{ws}) {
206 $ws->msg ($type,
207 %msg,
208 id => $self->{id},
209 );
210 }
211}
212
213sub msg_cb {
214 my ($self, $cb, $type, %msg) = @_;
215
216 if (my $ws = $self->{ws}) {
217
218 my $rid = ++$ws->{ns}{id}; 339 my $rid = $ws->{ns}->alloc_wid;
219
220 $self->msg ($type, %msg, rid => $rid);
221 340
222 if ($cb) { 341 if ($cb) {
223 $ws->{ns}{widget_return}{$rid} = $cb; 342 $ws->{ns}{widget_cb}{$rid} = sub {
343 delete $ws->{ns}{widget_cb}{$rid};
344 $ws->{ns}->free_wid ($rid);
345 &$cb
346 };
347
348 $self->msg ($type, $rid, @arg);
224 } else { 349 } else {
225 # synchronous case 350 # synchronous case
226 my $wait = new Coro::Signal; 351 my $wait = new Coro::Signal;
227 my @res; 352 my @res;
228 353
229 $ws->{ns}{widget_return}{$rid} = sub { 354 $ws->{ns}{widget_cb}{$rid} = sub {
355 delete $ws->{ns}{widget_cb}{$rid};
356 $ws->{ns}->free_wid ($rid);
357
230 @res = @_; 358 @res = @_;
231 $wait->send; 359 $wait->send;
232 }; 360 };
361 $self->msg ($type, $rid, @arg);
233 $wait->wait; 362 $wait->wait;
234 363
235 return @res; 364 return @res;
236 } 365 }
237 } 366 }
238 367
239 () 368 ()
240} 369}
241 370
242sub set { 371sub set {
243 my ($self, $member, $value) = @_; 372 my ($self, @kv) = @_;
244 373
245 $self->msg (w_s => name => $member, value => $value); 374 $self->msg (w_s => \@kv);
246} 375}
247 376
248sub get { 377sub get {
249 my ($self, $member, $cb) = @_; 378 my ($self, $member, $cb) = @_;
250 379
251 $self->msg_cb ($cb, w_g => name => $member); 380 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
252} 381}
253 382
254sub TO_JSON { 383sub TO_JSON {
255 { __widget_ref__ => $_[0]{id} } 384 { "\fw" => $_[0]{id} }
256} 385}
257 386
258our $AUTOLOAD; 387our $AUTOLOAD;
259 388
260sub AUTOLOAD { 389sub AUTOLOAD {
261 $AUTOLOAD =~ s/^.*:// 390 $AUTOLOAD =~ s/^.*://
262 or return; 391 or return;
263 392
264 my $self = shift; 393 my $self = shift;
265 394
395 #TODO: handle non-void context
266 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 396 $self->msg (w_c => 0, $AUTOLOAD, @_);
267 397
268 () 398 ()
269} 399}
270 400
401package ext::widget::callback;
402
403sub DESTROY {
404 my ($self) = @_;
405
406 if (my $ns = $self->{ns}) {
407 delete $ns->{widget_cb}{$self->{id}};
408 $ns->free_wid ($self->{id});
409 }
410}
411
412sub TO_JSON {
413 { "\fc" => $_[0]{id} }
414}
415

Diff Legend

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