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.5 by root, Sun Jul 15 22:39:48 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 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); 22 Scalar::Util::weaken (my $weakns = $ns);
20 23
21 $ns->{id} = "a"; 24 $ns->{id} = "a";
22 $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub { 25 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
23 # cannot deserialise ATM 26 $weakns->{widget}{$_[0]}
24 undef
25 }); 27 });
26 }, 28 },
27); 29);
28 30
29sub csc_update_stats { 31sub csc_update_stats {
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
174 my $ns = $pl->ns;
175 return unless $ns->{can_widget};
176
120 return unless $cf::CFG{devel}; 177 return unless $cf::CFG{devel};
121 178
122 my $ns = $pl->ns;
123
124 return unless $ns->{can_widget};
125
126 demo_map $ns;
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
165 $ws->msg (ws_n => id => $id); 204 $ws->msg (ws_n => $id);
166 205
167 $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];
168} 216}
169 217
170############################################################################# 218#############################################################################
171 219
172package ext::widget::set; 220package ext::widget::set;
176} 224}
177 225
178sub destroy { 226sub destroy {
179 my ($self) = @_; 227 my ($self) = @_;
180 228
181 $self->msg (ws_d => id => $self->{id}); 229 $self->msg (ws_d => $self->{id});
182 delete $self->{ns}; 230 delete $self->{ns};
183 $_->destroy 231 $_->destroy
184 for values %{ $self->{w} }; 232 for values %{ $self->{w} };
185} 233}
186 234
187sub msg { 235sub msg {
188 my ($self, $type, %msg) = @_; 236 my ($self, @msg) = @_;
189 237
190 if (my $ns = shift->{ns}) { 238 if (my $ns = shift->{ns}) {
191 $msg{msgtype} = $type; 239 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
192 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 240 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
193 } 241 }
242}
243
244sub alloc {
245 my ($self) = @_;
246
247 my $id = $self->{ns}->alloc_wid;
248
249 my $proxy = bless {
250 id => $id,
251 }, "ext::widget::proxy";
252
253 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
254 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
255
256 $proxy
194} 257}
195 258
196sub new { 259sub new {
197 my ($self, $class, %args) = @_; 260 my ($self, $class, %args) = @_;
198 261
199 my $id = ++$self->{ns}{id}; 262 my $proxy = $self->alloc;
200 263
201 my $proxy = $self->{w}{$id} = bless { 264 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
202 id => $id,
203 }, "ext::widget::proxy";
204
205 Scalar::Util::weaken ($proxy->{ws} = $self); 265 Scalar::Util::weaken ($proxy->{ws} = $self);
206 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
207 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
208 266
209 for my $ev (grep /^on_/, keys %args) { 267 for my $ev (grep /^on_/, keys %args) {
210 push @{$proxy->{ev}{$ev}}, $args{$ev}; 268 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
211 $args{$ev} = 0;
212 } 269 }
213 270
214 $self->msg (ws_c => 271 $self->msg (ws_c =>
215 ws => $self->{w}{id}, 272 $self->{id},
216 id => $id, 273 $proxy->{id},
217 class => $class, 274 $class,
218 args => \%args, 275 \%args,
219 ); 276 );
220 277
221 $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]
222} 349}
223 350
224############################################################################# 351#############################################################################
225 352
226package ext::widget::proxy; 353package ext::widget::proxy;
229 my ($self) = @_; 356 my ($self) = @_;
230 357
231 delete $self->{ns}{widget}{$self->{id}}; 358 delete $self->{ns}{widget}{$self->{id}};
232 359
233 if (my $ws = $self->{ws}) { 360 if (my $ws = $self->{ws}) {
361 $self->msg (w_c => 0, "destroy");
234 delete $ws->{w}{$self->{id}}; 362 delete $ws->{_w}{$self->{id}};
235 $self->msg (w_c => name => "destroy");
236 } 363 }
364}
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
237} 393}
238 394
239sub msg { 395sub msg {
240 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) = @_;
241 407
242 if (my $ws = $self->{ws}) { 408 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}; 409 my $rid = $ws->{ns}->alloc_wid;
256
257 $self->msg ($type, %msg, rid => $rid);
258 410
259 if ($cb) { 411 if ($cb) {
260 $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);
261 } else { 419 } else {
262 # synchronous case 420 # synchronous case
263 my $wait = new Coro::Signal; 421 my $wait = new Coro::Signal;
264 my @res; 422 my @res;
265 423
266 $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
267 @res = @_; 428 @res = @_;
268 $wait->send; 429 $wait->send;
269 }; 430 };
431 $self->msg ($type, $rid, @arg);
270 $wait->wait; 432 $wait->wait;
271 433
272 return @res; 434 return @res;
273 } 435 }
274 } 436 }
275 437
276 () 438 ()
277} 439}
278 440
279sub set { 441sub set {
280 my ($self, $member, $value) = @_; 442 my ($self, @kv) = @_;
281 443
282 $self->msg (w_s => name => $member, value => $value); 444 $self->msg (w_s => \@kv);
283} 445}
284 446
285sub get { 447sub get {
286 my ($self, $member, $cb) = @_; 448 my ($self, $member, $cb) = @_;
287 449
288 $self->msg_cb ($cb, w_g => name => $member); 450 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
289} 451}
290 452
291sub TO_JSON { 453sub TO_JSON {
292 { __widget_ref__ => $_[0]{id} } 454 { "\fw" => $_[0]{id} }
293} 455}
294 456
295our $AUTOLOAD; 457our $AUTOLOAD;
296 458
297sub AUTOLOAD { 459sub AUTOLOAD {
298 $AUTOLOAD =~ s/^.*:// 460 $AUTOLOAD =~ s/^.*://
299 or return; 461 or return;
300 462
301 my $self = shift; 463 my $self = shift;
302 464
465 #TODO: handle non-void context
303 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 466 $self->msg (w_c => 0, $AUTOLOAD, @_);
304 467
305 () 468 ()
306} 469}
307 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