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