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.18 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.25 by root, Sun Jan 13 12:42:55 2008 UTC

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_a id name... # associate well-known widget with given id
5# ws_n ws # widgetset new 5# ws_n ws # widgetset new
6# ws_d ws # widgetset destroy 6# ws_d ws # widgetset destroy
7# ws_c ws id class @args # widgetset create 7# ws_c ws id class @args # widgetset create
8# ws_ct ws ttype ttext done_cb \%cfg # widgetset create from template
8# w_c id rid name @args # widget method call 9# w_c id rid name @args # widget method call
9# w_s id @attr # widget member set 10# w_s id @attr # widget member set
10# w_g id rid @attr # widget member get 11# w_g id rid @attr # widget member get
11# 12#
12# and expects the following exti message types 13# and expects the following exti message types
13# w_r rid res # widget call return
14# w_e id rid @args # widget_event 14# w_e id @args # widget_call
15 15
16our $DEBUG = 1; 16our $DEBUG = 1;
17 17
18cf::client->attach ( 18cf::client->attach (
19 on_connect => sub { 19 on_connect => sub {
20 my ($ns) = @_; 20 my ($ns) = @_;
21 21
22 Scalar::Util::weaken (my $weakns = $ns);
23
24 $ns->{id} = "a"; 22 $ns->{id} = "a";
25 $ns->{json_coder}->filter_json_single_key_object (__w_ => sub { 23 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
26 # cannot deserialise ATM 24 $ns->{widget}{$_[0]}
27 undef
28 }); 25 });
26
27 cf::weaken $ns;
29 }, 28 },
30); 29);
31 30
32sub csc_update_stats { 31sub csc_update_stats {
33 my ($ns) = @_; 32 my ($ns) = @_;
35 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 34 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
36 $v->set_text ($ns->pl->ob->stats->$k); 35 $v->set_text ($ns->pl->ob->stats->$k);
37 } 36 }
38} 37}
39 38
40sub demo_start { 39my $cg_template = eval <<EOF;
41 my ($ns) = @_; 40[
42 41 Toplevel => {
43 my $ws = $ns->{csc} = $ns->new_widgetset; 42 s_id => "toplevel",
44 43 title => "Character Creation",
45 $ws->{tab} = $ws->new (Label => text => "dumb tst", c_tab => ["hull"]); 44 x => "center",
45 y => "center",
46 z => 5,
47 force_w => 760,
48 force_h => 440,
49 s_cl => [VBox => { s_cl => [
50 Label => {
51 text => "Character Creation",
52 fontsize => 1,
53 align => 0,
54 },
55 Label => {
56 markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
57 fontsize => 0.8,
58 align => 0,
59 },
60 HBox => { s_cl => [
61 Face => {
62 s_id => "face",
63 face => 0,
64 bg => [.2, .2, .2, 1],
65 min_w => 64,
66 min_h => 64,
67 },
68 Label => {
69 s_id => "desc",
70 fontsize => 0.8,
71 ellipsize => 0,
72 },
73 ]},
74 Notebook => {
75 expand => 1,
76 s_cl => [
77 Table => {
78 c_tab => ["Basics", "Title, background and other information of your character."],
79 },
80 Table => {
81 c_tab => ["Stats", "Your character's primary stats such as strength, dexterity and so on."],
82 },
83 Table => {
84 c_tab => ["Race", "Your character's race."],
85 },
86 Table => {
87 c_tab => ["Class", "Your character's initial class."],
88 },
89 ],
90 },
91 Button => {
92 s_id => "finish",
93 text => "Finish",
94 },
95 ]}],
46 96 },
47 $ws->find ("setup_notebook")->add ($ws->{tab}); 97]
48 $ws->find ("setup_dialog")->toggle_visibility; 98EOF
49} 99die if $@;
50 100
51sub csc_start { 101sub csc_start {
52 my ($ns) = @_; 102 my ($ns) = @_;
53 103
54 my $ws = $ns->{csc} = $ns->new_widgetset; 104 my $ws = $ns->{csc} = $ns->new_widgetset;
94 144
95 csc_update_stats $ns; 145 csc_update_stats $ns;
96 146
97 $ws->{tl} = $w; 147 $ws->{tl} = $w;
98 $w->show; 148 $w->show;
149
150# my ($tl, $entry) = $ws->template (inline => $cg_template,
151# [
152# toplevel => {},
153# entry => {
154# text => "xyz",
155# on_changed => sub {
156# warn "changed<@_>\n";#d#
157# },
158# },
159# ],
160# );
161#
162# $tl->show;
163#
164# $ns->{xxxw} = [$tl, $entry];#d#
165#
166# $ws->find ("setup_notebook")->add ($ws->{tab});
167# $ws->find ("setup_dialog")->toggle_visibility;
99} 168}
100 169
101cf::player->attach ( 170cf::player->attach (
102 on_login => sub { 171 on_login => sub {
103 my ($pl) = @_; 172 my ($pl) = @_;
104 173
174 my $ns = $pl->ns;
175 return unless $ns->{can_widget};
176
105 return unless $cf::CFG{devel}; 177 return unless $cf::CFG{devel};
106 178
107 my $ns = $pl->ns;
108
109 return unless $ns->{can_widget};
110 #csc_start $ns; 179 #csc_start $ns;
111 #demo_start $ns;
112 }, 180 },
113); 181);
114 182
115cf::register_exticmd w_e => sub { 183cf::register_exticmd w_e => sub {
116 my ($ns, $id, $rid, @args) = @_; 184 my ($ns, $id, @args) = @_;
117 185
118 if (my $w = $ns->{widget}{$id}) { 186 if (my $cb = $ns->{widget_cb}{$id}) {
119 if (my $cb = $w->{ev}{$rid}) {
120 $cb->($w, @args);
121 }
122 }
123
124 ()
125};
126
127cf::register_exticmd w_r => sub {
128 my ($ns, $rid, $res) = @_;
129
130 if (my $cb = delete $ns->{widget_return}{$rid}) {
131 $cb->(@$res); 187 $cb->(@args);
132 } 188 }
133 189
134 () 190 ()
135}; 191};
136 192
143 id => $id, 199 id => $id,
144 ns => $self, 200 ns => $self,
145 _w => {}, 201 _w => {},
146 }, "ext::widget::set"; 202 }, "ext::widget::set";
147 203
204 cf::weaken $ws->{ns};
205
148 $ws->msg (ws_n => $id); 206 $ws->msg (ws_n => $id);
149 207
150 $ws 208 $ws
209}
210
211sub cf::client::alloc_wid {
212 pop @{ $_[0]{ids} }
213 or ++$_[0]{id}
214}
215
216sub cf::client::free_wid {
217 push @{ $_[0]{ids} }, $_[1];
151} 218}
152 219
153############################################################################# 220#############################################################################
154 221
155package ext::widget::set; 222package ext::widget::set;
169 236
170sub msg { 237sub msg {
171 my ($self, @msg) = @_; 238 my ($self, @msg) = @_;
172 239
173 if (my $ns = shift->{ns}) { 240 if (my $ns = shift->{ns}) {
241 return unless $ns->{json_coder};#d# might be gone at destroy time(??)
174 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d# 242 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
175 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg)); 243 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
176 } 244 }
177} 245}
178 246
179sub alloc { 247sub alloc {
180 my ($self) = @_; 248 my ($self) = @_;
181 249
182 my $id = ++$self->{ns}{id}; 250 my $id = $self->{ns}->alloc_wid;
183 251
184 my $proxy = bless { 252 my $proxy = bless {
185 id => $id, 253 id => $id,
186 }, "ext::widget::proxy"; 254 }, "ext::widget::proxy";
187 255
194sub new { 262sub new {
195 my ($self, $class, %args) = @_; 263 my ($self, $class, %args) = @_;
196 264
197 my $proxy = $self->alloc; 265 my $proxy = $self->alloc;
198 266
199 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy); 267 cf::weaken
200 Scalar::Util::weaken ($proxy->{ws} = $self); 268 +($self->{_w}{$proxy->{id}} = $proxy),
269 +($proxy->{ws} = $self);
201 270
202 for my $ev (grep /^on_/, keys %args) { 271 for my $ev (grep /^on_/, keys %args) {
203 my $rid = ++$self->{ns}{id}; 272 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
204 $proxy->{ev}{$rid} = $args{$ev};
205 $args{$ev} = $rid;
206 } 273 }
207 274
208 $self->msg (ws_c => 275 $self->msg (ws_c =>
209 $self->{id}, 276 $self->{id},
210 $proxy->{id}, 277 $proxy->{id},
213 ); 280 );
214 281
215 $proxy 282 $proxy
216} 283}
217 284
285sub template {
286 my ($self, $type, $template, $args, $done_cb) = @_;
287
288 my %cfg;
289
290 while (@$args) {
291 my ($name, $args) = splice @$args, 0, 2, ();
292
293 my $proxy = $self->alloc;
294
295 $self->{delete $args->{alias} or $name} = $proxy;
296
297 cf::weaken
298 +($self->{_w}{$proxy->{id}} = $proxy),
299 +($proxy->{ws} = $self);
300
301 for my $ev (grep /^on_/, keys %$args) {
302 $args->{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args->{$ev});
303 }
304
305 $cfg{$name} = {
306 %$args,
307 id => $proxy->{id},
308 };
309 }
310
311 if ($done_cb) {
312 my $proxy = $self->alloc;
313 my $ocb = $done_cb;
314 $done_cb = $proxy->cb (sub {
315 undef $proxy;
316 undef $done_cb;
317 &$ocb
318 });
319 }
320
321 if ($type eq "face") {
322 $self->{ns}->send_face ($template, 100);
323 $self->{ns}->flush_fx;
324 }
325
326 $self->msg (ws_ct =>
327 $self->{id},
328 $type => $template,
329 $done_cb,
330 \%cfg,
331 );
332}
333
218sub find { 334sub find {
219 my ($self, @names) = @_; 335 my ($self, @names) = @_;
220 336
221 my @res; 337 my @res;
222 my @alloc; 338 my @alloc;
238} 354}
239 355
240############################################################################# 356#############################################################################
241 357
242package ext::widget::proxy; 358package ext::widget::proxy;
243
244sub DESTROY {
245 my ($self) = @_;
246
247 delete $self->{ns}{widget}{$self->{id}};
248
249 if (my $ws = $self->{ws}) {
250 $self->msg (w_c => 0, "destroy");
251 delete $ws->{_w}{$self->{id}};
252 }
253}
254 359
255sub msg { 360sub msg {
256 my ($self, $type, @arg) = @_; 361 my ($self, $type, @arg) = @_;
257 362
258 if (my $ns = $self->{ns}) { 363 if (my $ns = $self->{ns}) {
264 369
265sub msg_cb { 370sub msg_cb {
266 my ($self, $cb, $type, @arg) = @_; 371 my ($self, $cb, $type, @arg) = @_;
267 372
268 if (my $ws = $self->{ws}) { 373 if (my $ws = $self->{ws}) {
269 my $rid = ++$ws->{ns}{id}; 374 my $rid = $ws->{ns}->alloc_wid;
270
271 $self->msg ($type, $rid, @arg);
272 375
273 if ($cb) { 376 if ($cb) {
274 $ws->{ns}{widget_return}{$rid} = $cb; 377 $ws->{ns}{widget_cb}{$rid} = sub {
378 delete $ws->{ns}{widget_cb}{$rid};
379 $ws->{ns}->free_wid ($rid);
380 &$cb
381 };
382
383 $self->msg ($type, $rid, @arg);
275 } else { 384 } else {
276 # synchronous case 385 # synchronous case
277 my $wait = new Coro::Signal; 386 my $wait = new Coro::Signal;
278 my @res; 387 my @res;
279 388
280 $ws->{ns}{widget_return}{$rid} = sub { 389 $ws->{ns}{widget_cb}{$rid} = sub {
390 delete $ws->{ns}{widget_cb}{$rid};
391 $ws->{ns}->free_wid ($rid);
392
281 @res = @_; 393 @res = @_;
282 $wait->send; 394 $wait->send;
283 }; 395 };
396 $self->msg ($type, $rid, @arg);
284 $wait->wait; 397 $wait->wait;
285 398
286 return @res; 399 return @res;
287 } 400 }
288 } 401 }
289 402
290 () 403 ()
291} 404}
292 405
406sub DESTROY {
407 my ($self) = @_;
408
409 delete $self->{ns}{widget}{$self->{id}};
410
411 if (my $ws = $self->{ws}) {
412 $self->msg (w_c => 0, "destroy");
413 delete $ws->{_w}{$self->{id}};
414 }
415}
416
417sub cb {
418 my ($self, $cb) = @_;
419
420 my $proxy = bless {
421 ns => $self->{ns},
422 id => $self->{ns}->alloc_wid,
423 }, "ext::widget::callback";
424
425 cf::weaken $proxy->{ns};
426
427 $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
428
429 $proxy
430}
431
432sub oneshot_cb {
433 my ($self, $cb) = @_;
434
435 if ("CODE" eq ref $cb) {
436 my $ocb = $cb;
437 $cb = cb $self, sub {
438 undef $cb;
439 &$ocb
440 };
441 }
442
443 $cb
444}
445
293sub set { 446sub set {
294 my ($self, @kv) = @_; 447 my ($self, @kv) = @_;
295 448
296 $self->msg (w_s => \@kv); 449 $self->msg (w_s => \@kv);
297} 450}
298 451
299sub get { 452sub get {
300 my ($self, $member, $cb) = @_; 453 my ($self, $member, $cb) = @_;
301 454
302 $self->msg_cb ($cb, w_g => [$member]); 455 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
303} 456}
304 457
305sub TO_JSON { 458sub TO_JSON {
306 { __w_ => $_[0]{id} } 459 { "\fw" => $_[0]{id} }
307} 460}
308 461
309our $AUTOLOAD; 462our $AUTOLOAD;
310 463
311sub AUTOLOAD { 464sub AUTOLOAD {
318 $self->msg (w_c => 0, $AUTOLOAD, @_); 471 $self->msg (w_c => 0, $AUTOLOAD, @_);
319 472
320 () 473 ()
321} 474}
322 475
476package ext::widget::callback;
477
478sub DESTROY {
479 my ($self) = @_;
480
481 if (my $ns = $self->{ns}) {
482 delete $ns->{widget_cb}{$self->{id}};
483 $ns->free_wid ($self->{id});
484 }
485}
486
487sub TO_JSON {
488 { "\fc" => $_[0]{id} }
489}
490

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines