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.6 by root, Mon Jul 16 09:07:12 2007 UTC vs.
Revision 1.24 by root, Sun Jan 13 12:40:42 2008 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 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
19 Scalar::Util::weaken (my $weakns = $ns);
20
21 $ns->{id} = "a"; 22 $ns->{id} = "a";
22 $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub { 23 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
23 # cannot deserialise ATM 24 $ns->{widget}{$_[0]}
24 undef
25 }); 25 });
26
27 cf::weaken $ns;
26 }, 28 },
27); 29);
28 30
29sub csc_update_stats { 31sub csc_update_stats {
30 my ($ns) = @_; 32 my ($ns) = @_;
32 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 34 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
33 $v->set_text ($ns->pl->ob->stats->$k); 35 $v->set_text ($ns->pl->ob->stats->$k);
34 } 36 }
35} 37}
36 38
37sub demo_map { 39my $cg_template = eval <<EOF;
38 my ($ns) = @_; 40[
39 41 Toplevel => {
40 my $ws = $ns->{csc} = $ns->new_widgetset; 42 s_id => "toplevel",
41 43 title => "Character Creation",
42 my $w = $ws->new (Toplevel =>
43 w => 200,
44 h => 200,
45 x => "center", 44 x => "center",
46 y => "center", 45 y => "center",
47 title => "Worldmap", 46 z => 5,
48 has_close_button => 1, 47 force_w => 760,
49 on_delete => sub { 48 force_h => 440,
50 $ws->destroy; 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 },
51 }, 95 ]}],
52 ); 96 },
53 97]
54 my $face = cf::face::find "res/worldmap.jpg"; 98EOF
55 $ns->send_face ($face); 99die if $@;
56
57 $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
58 $sw->add (my $vb = $ws->new (VBox => expand => 1));
59 #$vb->add ($ws->new (Label => text => "lb1"));
60 $vb->add ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face));
61 $sw->show;
62 $vb->show;
63
64 $w->show;
65}
66 100
67sub csc_start { 101sub csc_start {
68 my ($ns) = @_; 102 my ($ns) = @_;
69 103
70 my $ws = $ns->{csc} = $ns->new_widgetset; 104 my $ws = $ns->{csc} = $ns->new_widgetset;
81 }, 115 },
82 ); 116 );
83 117
84 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 118 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
85 119
86 $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");
87 121
88 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 122 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
89 123
90 for ( 124 for (
91 [0, "Str"], 125 [0, "Str"],
92 [1, "Dex"], 126 [1, "Dex"],
93 [2, "Con"], 127 [2, "Con"],
96 [5, "Pow"], 130 [5, "Pow"],
97 [6, "Cha"], 131 [6, "Cha"],
98 ) { 132 ) {
99 my ($x, $label) = @$_; 133 my ($x, $label) = @$_;
100 134
101 $statstable->add ($x, 0, $ws->new (Label => 135 $statstable->add_at ($x, 0, $ws->new (Label =>
102 can_hover => 1, can_events => 1, 136 can_hover => 1, can_events => 1,
103 align => +1, text => $label, tooltip => "#stat_$label", 137 align => +1, text => $label, tooltip => "#stat_$label",
104 )); 138 ));
105 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 139 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
106 can_hover => 1, can_events => 1, 140 can_hover => 1, can_events => 1,
107 align => +1, template => "88", tooltip => "#stat_$label", 141 align => +1, template => "88", tooltip => "#stat_$label",
108 )); 142 ));
109 } 143 }
110 144
111 csc_update_stats $ns; 145 csc_update_stats $ns;
112 146
147 $ws->{tl} = $w;
113 $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;
114} 168}
115 169
116cf::player->attach ( 170cf::player->attach (
117 on_login => sub { 171 on_login => sub {
118 my ($pl) = @_; 172 my ($pl) = @_;
119 173
120 #return unless $cf::CFG{devel};
121
122 my $ns = $pl->ns; 174 my $ns = $pl->ns;
123
124 return unless $ns->{can_widget}; 175 return unless $ns->{can_widget};
125 176
126 demo_map $ns; 177 return unless $cf::CFG{devel};
178
127 #csc_start $ns; 179 #csc_start $ns;
128 }, 180 },
129); 181);
130 182
131cf::register_exticmd w_e => sub { 183cf::register_exticmd w_e => sub {
132 my ($ns, $pkt) = @_; 184 my ($ns, $id, @args) = @_;
133 185
134 if (my $w = $ns->{widget}{$pkt->{id}}) { 186 if (my $cb = $ns->{widget_cb}{$id}) {
135 if (my $cb = $w->{ev}{$pkt->{name}}) { 187 $cb->(@args);
136 $_->($w, @{ $pkt->{args} || [] })
137 for @$cb;
138 }
139 }
140
141 ()
142};
143
144cf::register_exticmd w_r => sub {
145 my ($ns, $pkt) = @_;
146
147 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) {
148 $cb->(@{$pkt->{res} || [] });
149 } 188 }
150 189
151 () 190 ()
152}; 191};
153 192
157 my $id = ++$self->{id}; 196 my $id = ++$self->{id};
158 197
159 my $ws = bless { 198 my $ws = bless {
160 id => $id, 199 id => $id,
161 ns => $self, 200 ns => $self,
162 w => {}, 201 _w => {},
163 }, "ext::widget::set"; 202 }, "ext::widget::set";
164 203
204 cf::weaken $ws->{ns};
205
165 $ws->msg (ws_n => id => $id); 206 $ws->msg (ws_n => $id);
166 207
167 $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];
168} 218}
169 219
170############################################################################# 220#############################################################################
171 221
172package ext::widget::set; 222package ext::widget::set;
176} 226}
177 227
178sub destroy { 228sub destroy {
179 my ($self) = @_; 229 my ($self) = @_;
180 230
181 $self->msg (ws_d => id => $self->{id}); 231 $self->msg (ws_d => $self->{id});
182 delete $self->{ns}; 232 delete $self->{ns};
183 $_->destroy 233 $_->destroy
184 for values %{ $self->{w} }; 234 for values %{ $self->{w} };
185} 235}
186 236
187sub msg { 237sub msg {
188 my ($self, $type, %msg) = @_; 238 my ($self, @msg) = @_;
189 239
190 if (my $ns = shift->{ns}) { 240 if (my $ns = shift->{ns}) {
191 $msg{msgtype} = $type; 241 return unless $ns->{json_coder};#d#
242 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
192 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 243 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
193 } 244 }
245}
246
247sub alloc {
248 my ($self) = @_;
249
250 my $id = $self->{ns}->alloc_wid;
251
252 my $proxy = bless {
253 id => $id,
254 }, "ext::widget::proxy";
255
256 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
257 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
258
259 $proxy
194} 260}
195 261
196sub new { 262sub new {
197 my ($self, $class, %args) = @_; 263 my ($self, $class, %args) = @_;
198 264
199 my $id = ++$self->{ns}{id}; 265 my $proxy = $self->alloc;
200 266
201 my $proxy = $self->{w}{$id} = bless { 267 cf::weaken
202 id => $id, 268 +($self->{_w}{$proxy->{id}} = $proxy),
203 }, "ext::widget::proxy"; 269 +($proxy->{ws} = $self);
204
205 Scalar::Util::weaken ($proxy->{ws} = $self);
206 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
207 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
208 270
209 for my $ev (grep /^on_/, keys %args) { 271 for my $ev (grep /^on_/, keys %args) {
210 push @{$proxy->{ev}{$ev}}, $args{$ev}; 272 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
211 $args{$ev} = 0;
212 } 273 }
213 274
214 $self->msg (ws_c => 275 $self->msg (ws_c =>
215 ws => $self->{w}{id}, 276 $self->{id},
216 id => $id, 277 $proxy->{id},
217 class => $class, 278 $class,
218 args => \%args, 279 \%args,
219 ); 280 );
220 281
221 $proxy 282 $proxy
222} 283}
223 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
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
224############################################################################# 356#############################################################################
225 357
226package ext::widget::proxy; 358package ext::widget::proxy;
227 359
228sub DESTROY { 360sub msg {
229 my ($self) = @_; 361 my ($self, $type, @arg) = @_;
230 362
231 delete $self->{ns}{widget}{$self->{id}}; 363 if (my $ns = $self->{ns}) {
364 my @msg = ($type, $self->{id}, @arg);
365 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
366 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
367 }
368}
369
370sub msg_cb {
371 my ($self, $cb, $type, @arg) = @_;
232 372
233 if (my $ws = $self->{ws}) { 373 if (my $ws = $self->{ws}) {
234 delete $ws->{w}{$self->{id}};
235 $self->msg (w_c => name => "destroy");
236 }
237}
238
239sub msg {
240 my ($self, $type, %msg) = @_;
241
242 if (my $ws = $self->{ws}) {
243 $ws->msg ($type,
244 %msg,
245 id => $self->{id},
246 );
247 }
248}
249
250sub msg_cb {
251 my ($self, $cb, $type, %msg) = @_;
252
253 if (my $ws = $self->{ws}) {
254
255 my $rid = ++$ws->{ns}{id}; 374 my $rid = $ws->{ns}->alloc_wid;
256
257 $self->msg ($type, %msg, rid => $rid);
258 375
259 if ($cb) { 376 if ($cb) {
260 $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);
261 } else { 384 } else {
262 # synchronous case 385 # synchronous case
263 my $wait = new Coro::Signal; 386 my $wait = new Coro::Signal;
264 my @res; 387 my @res;
265 388
266 $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
267 @res = @_; 393 @res = @_;
268 $wait->send; 394 $wait->send;
269 }; 395 };
396 $self->msg ($type, $rid, @arg);
270 $wait->wait; 397 $wait->wait;
271 398
272 return @res; 399 return @res;
273 } 400 }
274 } 401 }
275 402
276 () 403 ()
277} 404}
278 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
279sub set { 446sub set {
280 my ($self, $member, $value) = @_; 447 my ($self, @kv) = @_;
281 448
282 $self->msg (w_s => name => $member, value => $value); 449 $self->msg (w_s => \@kv);
283} 450}
284 451
285sub get { 452sub get {
286 my ($self, $member, $cb) = @_; 453 my ($self, $member, $cb) = @_;
287 454
288 $self->msg_cb ($cb, w_g => name => $member); 455 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
289} 456}
290 457
291sub TO_JSON { 458sub TO_JSON {
292 { __widget_ref__ => $_[0]{id} } 459 { "\fw" => $_[0]{id} }
293} 460}
294 461
295our $AUTOLOAD; 462our $AUTOLOAD;
296 463
297sub AUTOLOAD { 464sub AUTOLOAD {
298 $AUTOLOAD =~ s/^.*:// 465 $AUTOLOAD =~ s/^.*://
299 or return; 466 or return;
300 467
301 my $self = shift; 468 my $self = shift;
302 469
470 #TODO: handle non-void context
303 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 471 $self->msg (w_c => 0, $AUTOLOAD, @_);
304 472
305 () 473 ()
306} 474}
307 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