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.7 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.20 by root, Thu Dec 27 18:35:48 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 templateface \%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 { 39sub demo_start {
38 my ($ns) = @_; 40 my ($ns) = @_;
39 41
40 my $ws = $ns->{csc} = $ns->new_widgetset; 42 my $ws = $ns->{csc} = $ns->new_widgetset;
41 43
42 my $w = $ws->new (Toplevel => 44 my ($tl, $entry) = $ws->template (undef,
43 w => 200, 45 toplevel => {},
44 h => 200, 46 entry => {
45 x => "center", 47 text => "xyz",
46 y => "center", 48 on_changed => sub {
47 title => "Worldmap", 49 warn "changed<@_>\n";#d#
48 has_close_button => 1, 50 },
49 on_delete => sub {
50 $ws->destroy;
51 }, 51 },
52 ); 52 );
53 53
54 my $face = cf::face::find "res/worldmap.jpg";
55 $ns->send_face ($face);
56
57 $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
58 $sw->add (my $fixed = $ws->new (Fixed => expand => 1));
59 $fixed->add ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face), abs => 0, 0, rel => 1, 1);
60 $fixed->add ($ws->new (Label => text => "lb1"), abs => 10, 10, rel => 1, 1);
61
62 $w->show; 54 $tl->show;
55
56 $ns->{xxxw} = [$tl, $entry];#d#
57
58# $ws->find ("setup_notebook")->add ($ws->{tab});
59# $ws->find ("setup_dialog")->toggle_visibility;
63} 60}
64 61
65sub csc_start { 62sub csc_start {
66 my ($ns) = @_; 63 my ($ns) = @_;
67 64
… …
79 }, 76 },
80 ); 77 );
81 78
82 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 79 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
83 80
84 $ntb->add (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character"); 81 $ntb->add_tab (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character");
85 82
86 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 83 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
87 84
88 for ( 85 for (
89 [0, "Str"], 86 [0, "Str"],
90 [1, "Dex"], 87 [1, "Dex"],
91 [2, "Con"], 88 [2, "Con"],
… …
94 [5, "Pow"], 91 [5, "Pow"],
95 [6, "Cha"], 92 [6, "Cha"],
96 ) { 93 ) {
97 my ($x, $label) = @$_; 94 my ($x, $label) = @$_;
98 95
99 $statstable->add ($x, 0, $ws->new (Label => 96 $statstable->add_at ($x, 0, $ws->new (Label =>
100 can_hover => 1, can_events => 1, 97 can_hover => 1, can_events => 1,
101 align => +1, text => $label, tooltip => "#stat_$label", 98 align => +1, text => $label, tooltip => "#stat_$label",
102 )); 99 ));
103 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 100 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
104 can_hover => 1, can_events => 1, 101 can_hover => 1, can_events => 1,
105 align => +1, template => "88", tooltip => "#stat_$label", 102 align => +1, template => "88", tooltip => "#stat_$label",
106 )); 103 ));
107 } 104 }
108 105
109 csc_update_stats $ns; 106 csc_update_stats $ns;
110 107
108 $ws->{tl} = $w;
111 $w->show; 109 $w->show;
112} 110}
113 111
114cf::player->attach ( 112cf::player->attach (
115 on_login => sub { 113 on_login => sub {
116 my ($pl) = @_; 114 my ($pl) = @_;
117 115
118 #return unless $cf::CFG{devel}; 116 return unless $cf::CFG{devel};
119 117
120 my $ns = $pl->ns; 118 my $ns = $pl->ns;
121 119
122 return unless $ns->{can_widget}; 120 return unless $ns->{can_widget};
123
124 demo_map $ns;
125 #csc_start $ns; 121 #csc_start $ns;
122 demo_start $ns;
126 }, 123 },
127); 124);
128 125
129cf::register_exticmd w_e => sub { 126cf::register_exticmd w_e => sub {
130 my ($ns, $pkt) = @_; 127 my ($ns, $id, @args) = @_;
131 128
132 if (my $w = $ns->{widget}{$pkt->{id}}) { 129 if (my $cb = $ns->{widget_cb}{$id}) {
133 if (my $cb = $w->{ev}{$pkt->{name}}) { 130 $cb->(@args);
134 $_->($w, @{ $pkt->{args} || [] })
135 for @$cb;
136 }
137 }
138
139 ()
140};
141
142cf::register_exticmd w_r => sub {
143 my ($ns, $pkt) = @_;
144
145 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) {
146 $cb->(@{$pkt->{res} || [] });
147 } 131 }
148 132
149 () 133 ()
150}; 134};
151 135
… …
155 my $id = ++$self->{id}; 139 my $id = ++$self->{id};
156 140
157 my $ws = bless { 141 my $ws = bless {
158 id => $id, 142 id => $id,
159 ns => $self, 143 ns => $self,
160 w => {}, 144 _w => {},
161 }, "ext::widget::set"; 145 }, "ext::widget::set";
162 146
163 $ws->msg (ws_n => id => $id); 147 $ws->msg (ws_n => $id);
164 148
165 $ws 149 $ws
150}
151
152sub cf::client::alloc_wid {
153 pop @{ $_[0]{ids} }
154 or ++$_[0]{id}
155}
156
157sub cf::client::free_wid {
158 push @{ $_[0]{ids} }, $_[1];
166} 159}
167 160
168############################################################################# 161#############################################################################
169 162
170package ext::widget::set; 163package ext::widget::set;
… …
174} 167}
175 168
176sub destroy { 169sub destroy {
177 my ($self) = @_; 170 my ($self) = @_;
178 171
179 $self->msg (ws_d => id => $self->{id}); 172 $self->msg (ws_d => $self->{id});
180 delete $self->{ns}; 173 delete $self->{ns};
181 $_->destroy 174 $_->destroy
182 for values %{ $self->{w} }; 175 for values %{ $self->{w} };
183} 176}
184 177
185sub msg { 178sub msg {
186 my ($self, $type, %msg) = @_; 179 my ($self, @msg) = @_;
187 180
188 if (my $ns = shift->{ns}) { 181 if (my $ns = shift->{ns}) {
189 $msg{msgtype} = $type; 182 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
190 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 183 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
191 } 184 }
185}
186
187sub alloc {
188 my ($self) = @_;
189
190 my $id = $self->{ns}->alloc_wid;
191
192 my $proxy = bless {
193 id => $id,
194 }, "ext::widget::proxy";
195
196 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
197 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
198
199 $proxy
192} 200}
193 201
194sub new { 202sub new {
195 my ($self, $class, %args) = @_; 203 my ($self, $class, %args) = @_;
196 204
197 my $id = ++$self->{ns}{id}; 205 my $proxy = $self->alloc;
198 206
199 my $proxy = $self->{w}{$id} = bless { 207 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
200 id => $id,
201 }, "ext::widget::proxy";
202
203 Scalar::Util::weaken ($proxy->{ws} = $self); 208 Scalar::Util::weaken ($proxy->{ws} = $self);
204 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
205 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
206 209
207 for my $ev (grep /^on_/, keys %args) { 210 for my $ev (grep /^on_/, keys %args) {
208 push @{$proxy->{ev}{$ev}}, $args{$ev}; 211 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
209 $args{$ev} = 0;
210 } 212 }
211 213
212 $self->msg (ws_c => 214 $self->msg (ws_c =>
213 ws => $self->{w}{id}, 215 $self->{id},
214 id => $id, 216 $proxy->{id},
215 class => $class, 217 $class,
216 args => \%args, 218 \%args,
217 ); 219 );
218 220
219 $proxy 221 $proxy
222}
223
224sub template {
225 my ($self, $template, @args) = @_;
226
227 my %cfg;
228 my @res;
229
230 while (@args) {
231 my ($name, $args) = splice @args, 0, 2, ();
232
233 my $proxy = $self->alloc;
234
235 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
236 Scalar::Util::weaken ($proxy->{ws} = $self);
237
238 for my $ev (grep /^on_/, keys %$args) {
239 $args->{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args->{$ev});
240 }
241
242 $cfg{$name} = {
243 %$args,
244 id => $proxy->{id},
245 };
246
247 push @res, $proxy;
248 }
249
250 $self->msg (ws_ct =>
251 $self->{id},
252 $template,
253 \%cfg,
254 );
255
256 @res
257}
258
259sub find {
260 my ($self, @names) = @_;
261
262 my @res;
263 my @alloc;
264
265 for my $name (@names) {
266 push @res, $self->{ns}{widget_wkw}{$name} ||= do {
267 my $proxy = $self->alloc;
268
269 push @alloc, $proxy->{id} => $name;
270
271 $proxy
272 };
273 }
274
275 $self->msg (ws_a => @alloc)
276 if @alloc;
277
278 wantarray ? @res : $res[0]
220} 279}
221 280
222############################################################################# 281#############################################################################
223 282
224package ext::widget::proxy; 283package ext::widget::proxy;
… …
227 my ($self) = @_; 286 my ($self) = @_;
228 287
229 delete $self->{ns}{widget}{$self->{id}}; 288 delete $self->{ns}{widget}{$self->{id}};
230 289
231 if (my $ws = $self->{ws}) { 290 if (my $ws = $self->{ws}) {
291 $self->msg (w_c => 0, "destroy");
232 delete $ws->{w}{$self->{id}}; 292 delete $ws->{_w}{$self->{id}};
233 $self->msg (w_c => name => "destroy");
234 } 293 }
294}
295
296sub cb {
297 my ($self, $cb) = @_;
298
299 my $proxy = bless {
300 ns => $self->{ns},
301 id => $self->{ns}->alloc_wid,
302 }, "ext::widget::callback";
303
304 Scalar::Util::weaken $proxy->{ns};
305
306 $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
307
308 $proxy
309}
310
311sub oneshot_cb {
312 my ($self, $cb) = @_;
313
314 if ("CODE" eq ref $cb) {
315 my $ocb = $cb;
316 $cb = $self->cb (sub {
317 undef $cb;
318 &$ocb
319 });
320 }
321
322 $cb
235} 323}
236 324
237sub msg { 325sub msg {
238 my ($self, $type, %msg) = @_; 326 my ($self, $type, @arg) = @_;
327
328 if (my $ns = $self->{ns}) {
329 my @msg = ($type, $self->{id}, @arg);
330 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
331 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
332 }
333}
334
335sub msg_cb {
336 my ($self, $cb, $type, @arg) = @_;
239 337
240 if (my $ws = $self->{ws}) { 338 if (my $ws = $self->{ws}) {
241 $ws->msg ($type,
242 %msg,
243 id => $self->{id},
244 );
245 }
246}
247
248sub msg_cb {
249 my ($self, $cb, $type, %msg) = @_;
250
251 if (my $ws = $self->{ws}) {
252
253 my $rid = ++$ws->{ns}{id}; 339 my $rid = $ws->{ns}->alloc_wid;
254
255 $self->msg ($type, %msg, rid => $rid);
256 340
257 if ($cb) { 341 if ($cb) {
258 $ws->{ns}{widget_return}{$rid} = $cb; 342 $ws->{ns}{widget_cb}{$rid} = sub {
343 delete $ws->{ns}{widget_cb}{$rid};
344 $ws->{ns}->free_wid ($rid);
345 &$cb
346 };
347
348 $self->msg ($type, $rid, @arg);
259 } else { 349 } else {
260 # synchronous case 350 # synchronous case
261 my $wait = new Coro::Signal; 351 my $wait = new Coro::Signal;
262 my @res; 352 my @res;
263 353
264 $ws->{ns}{widget_return}{$rid} = sub { 354 $ws->{ns}{widget_cb}{$rid} = sub {
355 delete $ws->{ns}{widget_cb}{$rid};
356 $ws->{ns}->free_wid ($rid);
357
265 @res = @_; 358 @res = @_;
266 $wait->send; 359 $wait->send;
267 }; 360 };
361 $self->msg ($type, $rid, @arg);
268 $wait->wait; 362 $wait->wait;
269 363
270 return @res; 364 return @res;
271 } 365 }
272 } 366 }
273 367
274 () 368 ()
275} 369}
276 370
277sub set { 371sub set {
278 my ($self, $member, $value) = @_; 372 my ($self, @kv) = @_;
279 373
280 $self->msg (w_s => name => $member, value => $value); 374 $self->msg (w_s => \@kv);
281} 375}
282 376
283sub get { 377sub get {
284 my ($self, $member, $cb) = @_; 378 my ($self, $member, $cb) = @_;
285 379
286 $self->msg_cb ($cb, w_g => name => $member); 380 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
287} 381}
288 382
289sub TO_JSON { 383sub TO_JSON {
290 { __widget_ref__ => $_[0]{id} } 384 { "\fw" => $_[0]{id} }
291} 385}
292 386
293our $AUTOLOAD; 387our $AUTOLOAD;
294 388
295sub AUTOLOAD { 389sub AUTOLOAD {
296 $AUTOLOAD =~ s/^.*:// 390 $AUTOLOAD =~ s/^.*://
297 or return; 391 or return;
298 392
299 my $self = shift; 393 my $self = shift;
300 394
395 #TODO: handle non-void context
301 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 396 $self->msg (w_c => 0, $AUTOLOAD, @_);
302 397
303 () 398 ()
304} 399}
305 400
401package ext::widget::callback;
402
403sub DESTROY {
404 my ($self) = @_;
405
406 if (my $ns = $self->{ns}) {
407 delete $ns->{widget_cb}{$self->{id}};
408 $ns->free_wid ($self->{id});
409 }
410}
411
412sub TO_JSON {
413 { "\fc" => $_[0]{id} }
414}
415

Diff Legend

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