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.13 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.22 by root, Fri Dec 28 12:44:45 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 ttype ttext done_cb \%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 @attr # widget member set 10# w_s id @attr # widget member set
9# w_g id rid @attr # 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
14 15
15our $DEBUG = 1; 16our $DEBUG = 1;
16 17
17cf::client->attach ( 18cf::client->attach (
18 on_connect => sub { 19 on_connect => sub {
19 my ($ns) = @_; 20 my ($ns) = @_;
20 21
21 Scalar::Util::weaken (my $weakns = $ns); 22 Scalar::Util::weaken (my $weakns = $ns);
22 23
23 $ns->{id} = "a"; 24 $ns->{id} = "a";
24 $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub { 25 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
25 # cannot deserialise ATM 26 $weakns->{widget}{$_[0]}
26 undef
27 }); 27 });
28 }, 28 },
29); 29);
30 30
31sub csc_update_stats { 31sub csc_update_stats {
… …
33 33
34 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 34 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
35 $v->set_text ($ns->pl->ob->stats->$k); 35 $v->set_text ($ns->pl->ob->stats->$k);
36 } 36 }
37} 37}
38
39my $cg_template = eval <<EOF;
40[
41 Toplevel => {
42 s_id => "toplevel",
43 title => "Character Creation",
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 ]}],
96 },
97]
98EOF
99die if $@;
38 100
39sub csc_start { 101sub csc_start {
40 my ($ns) = @_; 102 my ($ns) = @_;
41 103
42 my $ws = $ns->{csc} = $ns->new_widgetset; 104 my $ws = $ns->{csc} = $ns->new_widgetset;
… …
53 }, 115 },
54 ); 116 );
55 117
56 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 118 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
57 119
58 $ntb->add (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character"); 120 $ntb->add_tab (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character");
59 121
60 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 122 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
61 123
62 for ( 124 for (
63 [0, "Str"], 125 [0, "Str"],
64 [1, "Dex"], 126 [1, "Dex"],
65 [2, "Con"], 127 [2, "Con"],
… …
80 )); 142 ));
81 } 143 }
82 144
83 csc_update_stats $ns; 145 csc_update_stats $ns;
84 146
147 $ws->{tl} = $w;
85 $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;
86} 168}
87 169
88cf::player->attach ( 170cf::player->attach (
89 on_login => sub { 171 on_login => sub {
90 my ($pl) = @_; 172 my ($pl) = @_;
91 173
174 my $ns = $pl->ns;
175 return unless $ns->{can_widget};
176
92 return unless $cf::CFG{devel}; 177 return unless $cf::CFG{devel};
93 178
94 my $ns = $pl->ns;
95
96 return unless $ns->{can_widget};
97 #csc_start $ns; 179 #csc_start $ns;
98 }, 180 },
99); 181);
100 182
101cf::register_exticmd w_e => sub { 183cf::register_exticmd w_e => sub {
102 my ($ns, $pkt) = @_; 184 my ($ns, $id, @args) = @_;
103 185
104 if (my $w = $ns->{widget}{$pkt->{id}}) { 186 if (my $cb = $ns->{widget_cb}{$id}) {
105 if (my $cb = $w->{ev}{$pkt->{name}}) { 187 $cb->(@args);
106 $_->($w, @{ $pkt->{args} || [] })
107 for @$cb;
108 }
109 }
110
111 ()
112};
113
114cf::register_exticmd w_r => sub {
115 my ($ns, $pkt) = @_;
116
117 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) {
118 $cb->(@{$pkt->{res} || [] });
119 } 188 }
120 189
121 () 190 ()
122}; 191};
123 192
… …
130 id => $id, 199 id => $id,
131 ns => $self, 200 ns => $self,
132 _w => {}, 201 _w => {},
133 }, "ext::widget::set"; 202 }, "ext::widget::set";
134 203
135 $ws->msg (ws_n => id => $id); 204 $ws->msg (ws_n => $id);
136 205
137 $ws 206 $ws
207}
208
209sub cf::client::alloc_wid {
210 pop @{ $_[0]{ids} }
211 or ++$_[0]{id}
212}
213
214sub cf::client::free_wid {
215 push @{ $_[0]{ids} }, $_[1];
138} 216}
139 217
140############################################################################# 218#############################################################################
141 219
142package ext::widget::set; 220package ext::widget::set;
… …
146} 224}
147 225
148sub destroy { 226sub destroy {
149 my ($self) = @_; 227 my ($self) = @_;
150 228
151 $self->msg (ws_d => id => $self->{id}); 229 $self->msg (ws_d => $self->{id});
152 delete $self->{ns}; 230 delete $self->{ns};
153 $_->destroy 231 $_->destroy
154 for values %{ $self->{w} }; 232 for values %{ $self->{w} };
155} 233}
156 234
157sub msg { 235sub msg {
158 my ($self, $type, %msg) = @_; 236 my ($self, @msg) = @_;
159 237
160 if (my $ns = shift->{ns}) { 238 if (my $ns = shift->{ns}) {
161 $msg{msgtype} = $type;
162 warn "msg " . $ns->{json_coder}->encode (\%msg) if $DEBUG;#d# 239 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
163 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 240 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
164 } 241 }
165} 242}
166 243
167sub new { 244sub alloc {
168 my ($self, $class, %args) = @_; 245 my ($self) = @_;
169 246
170 my $id = ++$self->{ns}{id}; 247 my $id = $self->{ns}->alloc_wid;
171 248
172 my $proxy = bless { 249 my $proxy = bless {
173 id => $id, 250 id => $id,
174 }, "ext::widget::proxy"; 251 }, "ext::widget::proxy";
175 252
176 Scalar::Util::weaken ($self->{_w}{$id} = $proxy);
177 Scalar::Util::weaken ($proxy->{ws} = $self);
178 Scalar::Util::weaken ($proxy->{ns} = $self->{ns}); 253 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
179 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy); 254 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
180 255
256 $proxy
257}
258
259sub new {
260 my ($self, $class, %args) = @_;
261
262 my $proxy = $self->alloc;
263
264 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
265 Scalar::Util::weaken ($proxy->{ws} = $self);
266
181 for my $ev (grep /^on_/, keys %args) { 267 for my $ev (grep /^on_/, keys %args) {
182 push @{$proxy->{ev}{$ev}}, $args{$ev}; 268 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
183 $args{$ev} = 0;
184 } 269 }
185 270
186 $self->msg (ws_c => 271 $self->msg (ws_c =>
272 $self->{id},
187 ws => $proxy->{id}, 273 $proxy->{id},
188 id => $id, 274 $class,
189 class => $class, 275 \%args,
190 args => \%args,
191 ); 276 );
192 277
193 $proxy 278 $proxy
279}
280
281sub template {
282 my ($self, $type, $template, $args, $done_cb) = @_;
283
284 my %cfg;
285
286 while (@$args) {
287 my ($name, $args) = splice @$args, 0, 2, ();
288
289 my $proxy = $self->alloc;
290
291 $self->{delete $args->{alias} or $name} = $proxy;
292
293 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
294 Scalar::Util::weaken ($proxy->{ws} = $self);
295
296 for my $ev (grep /^on_/, keys %$args) {
297 $args->{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args->{$ev});
298 }
299
300 $cfg{$name} = {
301 %$args,
302 id => $proxy->{id},
303 };
304 }
305
306 if ($done_cb) {
307 my $proxy = $self->alloc;
308 my $ocb = $done_cb;
309 $done_cb = $proxy->cb (sub {
310 undef $proxy;
311 undef $done_cb;
312 &$ocb
313 });
314 }
315
316 if ($type eq "face") {
317 $self->{ns}->send_face ($template, 100);
318 $self->{ns}->flush_fx;
319 }
320
321 $self->msg (ws_ct =>
322 $self->{id},
323 $type => $template,
324 $done_cb,
325 \%cfg,
326 );
327}
328
329sub find {
330 my ($self, @names) = @_;
331
332 my @res;
333 my @alloc;
334
335 for my $name (@names) {
336 push @res, $self->{ns}{widget_wkw}{$name} ||= do {
337 my $proxy = $self->alloc;
338
339 push @alloc, $proxy->{id} => $name;
340
341 $proxy
342 };
343 }
344
345 $self->msg (ws_a => @alloc)
346 if @alloc;
347
348 wantarray ? @res : $res[0]
194} 349}
195 350
196############################################################################# 351#############################################################################
197 352
198package ext::widget::proxy; 353package ext::widget::proxy;
… …
201 my ($self) = @_; 356 my ($self) = @_;
202 357
203 delete $self->{ns}{widget}{$self->{id}}; 358 delete $self->{ns}{widget}{$self->{id}};
204 359
205 if (my $ws = $self->{ws}) { 360 if (my $ws = $self->{ws}) {
206 $self->msg (w_c => name => "destroy"); 361 $self->msg (w_c => 0, "destroy");
207 delete $ws->{_w}{$self->{id}}; 362 delete $ws->{_w}{$self->{id}};
208 } 363 }
209} 364}
210 365
366sub cb {
367 my ($self, $cb) = @_;
368
369 my $proxy = bless {
370 ns => $self->{ns},
371 id => $self->{ns}->alloc_wid,
372 }, "ext::widget::callback";
373
374 Scalar::Util::weaken $proxy->{ns};
375
376 $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
377
378 $proxy
379}
380
381sub oneshot_cb {
382 my ($self, $cb) = @_;
383
384 if ("CODE" eq ref $cb) {
385 my $ocb = $cb;
386 $cb = $self->cb (sub {
387 undef $cb;
388 &$ocb
389 });
390 }
391
392 $cb
393}
394
211sub msg { 395sub msg {
212 my ($self, $type, %msg) = @_; 396 my ($self, $type, @arg) = @_;
397
398 if (my $ns = $self->{ns}) {
399 my @msg = ($type, $self->{id}, @arg);
400 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
401 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
402 }
403}
404
405sub msg_cb {
406 my ($self, $cb, $type, @arg) = @_;
213 407
214 if (my $ws = $self->{ws}) { 408 if (my $ws = $self->{ws}) {
215 $ws->msg ($type,
216 %msg,
217 id => $self->{id},
218 );
219 }
220}
221
222sub msg_cb {
223 my ($self, $cb, $type, %msg) = @_;
224
225 if (my $ws = $self->{ws}) {
226
227 my $rid = ++$ws->{ns}{id}; 409 my $rid = $ws->{ns}->alloc_wid;
228
229 $self->msg ($type, %msg, rid => $rid);
230 410
231 if ($cb) { 411 if ($cb) {
232 $ws->{ns}{widget_return}{$rid} = $cb; 412 $ws->{ns}{widget_cb}{$rid} = sub {
413 delete $ws->{ns}{widget_cb}{$rid};
414 $ws->{ns}->free_wid ($rid);
415 &$cb
416 };
417
418 $self->msg ($type, $rid, @arg);
233 } else { 419 } else {
234 # synchronous case 420 # synchronous case
235 my $wait = new Coro::Signal; 421 my $wait = new Coro::Signal;
236 my @res; 422 my @res;
237 423
238 $ws->{ns}{widget_return}{$rid} = sub { 424 $ws->{ns}{widget_cb}{$rid} = sub {
425 delete $ws->{ns}{widget_cb}{$rid};
426 $ws->{ns}->free_wid ($rid);
427
239 @res = @_; 428 @res = @_;
240 $wait->send; 429 $wait->send;
241 }; 430 };
431 $self->msg ($type, $rid, @arg);
242 $wait->wait; 432 $wait->wait;
243 433
244 return @res; 434 return @res;
245 } 435 }
246 } 436 }
… …
249} 439}
250 440
251sub set { 441sub set {
252 my ($self, @kv) = @_; 442 my ($self, @kv) = @_;
253 443
254 $self->msg (w_s => attr => \@kv); 444 $self->msg (w_s => \@kv);
255} 445}
256 446
257sub get { 447sub get {
258 my ($self, $member, $cb) = @_; 448 my ($self, $member, $cb) = @_;
259 449
260 $self->msg_cb ($cb, w_g => attr => [$member]); 450 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
261} 451}
262 452
263sub TO_JSON { 453sub TO_JSON {
264 { __widget_ref__ => $_[0]{id} } 454 { "\fw" => $_[0]{id} }
265} 455}
266 456
267our $AUTOLOAD; 457our $AUTOLOAD;
268 458
269sub AUTOLOAD { 459sub AUTOLOAD {
270 $AUTOLOAD =~ s/^.*:// 460 $AUTOLOAD =~ s/^.*://
271 or return; 461 or return;
272 462
273 my $self = shift; 463 my $self = shift;
274 464
465 #TODO: handle non-void context
275 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 466 $self->msg (w_c => 0, $AUTOLOAD, @_);
276 467
277 () 468 ()
278} 469}
279 470
471package ext::widget::callback;
472
473sub DESTROY {
474 my ($self) = @_;
475
476 if (my $ns = $self->{ns}) {
477 delete $ns->{widget_cb}{$self->{id}};
478 $ns->free_wid ($self->{id});
479 }
480}
481
482sub TO_JSON {
483 { "\fc" => $_[0]{id} }
484}
485

Diff Legend

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