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.9 by root, Fri Jul 20 22:34:56 2007 UTC vs.
Revision 1.19 by root, Sat Sep 1 07:22:20 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
7# w_c id [rid] name args # widget method call 8# w_c id rid name @args # widget method call
8# w_s id name value # widget member set 9# w_s id @attr # widget member set
9# w_g id rid name # widget member get 10# w_g id rid @attr # widget member get
10# 11#
11# and expects the following exti message types 12# and expects the following exti message types
12# w_r rid res # widget call return
13# w_e id name args # widget_event 13# w_e id @args # widget_call
14
15our $DEBUG = 1;
14 16
15cf::client->attach ( 17cf::client->attach (
16 on_connect => sub { 18 on_connect => sub {
17 my ($ns) = @_; 19 my ($ns) = @_;
18 20
19 Scalar::Util::weaken (my $weakns = $ns); 21 Scalar::Util::weaken (my $weakns = $ns);
20 22
21 $ns->{id} = "a"; 23 $ns->{id} = "a";
22 $ns->{json_coder}->filter_json_single_key_object (__widget_ref__ => sub { 24 $ns->{json_coder}->filter_json_single_key_object ("\fw" => sub {
23 # cannot deserialise ATM 25 $weakns->{widget}{$_[0]}
24 undef
25 }); 26 });
26 }, 27 },
27); 28);
28 29
29sub csc_update_stats { 30sub csc_update_stats {
32 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 33 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
33 $v->set_text ($ns->pl->ob->stats->$k); 34 $v->set_text ($ns->pl->ob->stats->$k);
34 } 35 }
35} 36}
36 37
37sub demo_map { 38sub demo_start {
38 my ($ns) = @_; 39 my ($ns) = @_;
39 40
40 my $ws = $ns->{csc} = $ns->new_widgetset; 41 my $ws = $ns->{csc} = $ns->new_widgetset;
41 42
42 my $w = $ws->new (Toplevel => 43 $ws->{tab} = $ws->new (Label => text => "dumb tst", c_tab => ["hull"]);
43 w => 200,
44 h => 200,
45 x => "center",
46 y => "center",
47 title => "Worldmap",
48 has_close_button => 1,
49 on_delete => sub {
50 $ws->destroy;
51 },
52 ); 44
53 45 $ws->find ("setup_notebook")->add ($ws->{tab});
54 my $face = cf::face::find "res/worldmap.jpg"; 46 $ws->find ("setup_dialog")->toggle_visibility;
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;
63} 47}
64 48
65sub csc_start { 49sub csc_start {
66 my ($ns) = @_; 50 my ($ns) = @_;
67 51
79 }, 63 },
80 ); 64 );
81 65
82 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 66 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
83 67
84 $ntb->add (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character"); 68 $ntb->add_tab (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character");
85 69
86 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 70 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
87 71
88 for ( 72 for (
89 [0, "Str"], 73 [0, "Str"],
90 [1, "Dex"], 74 [1, "Dex"],
91 [2, "Con"], 75 [2, "Con"],
106 )); 90 ));
107 } 91 }
108 92
109 csc_update_stats $ns; 93 csc_update_stats $ns;
110 94
95 $ws->{tl} = $w;
111 $w->show; 96 $w->show;
112} 97}
113 98
114cf::player->attach ( 99cf::player->attach (
115 on_login => sub { 100 on_login => sub {
118 return unless $cf::CFG{devel}; 103 return unless $cf::CFG{devel};
119 104
120 my $ns = $pl->ns; 105 my $ns = $pl->ns;
121 106
122 return unless $ns->{can_widget}; 107 return unless $ns->{can_widget};
123
124 demo_map $ns;
125 #csc_start $ns; 108 #csc_start $ns;
109 #demo_start $ns;
126 }, 110 },
127); 111);
128 112
129cf::register_exticmd w_e => sub { 113cf::register_exticmd w_e => sub {
130 my ($ns, $pkt) = @_; 114 my ($ns, $id, @args) = @_;
131 115
132 if (my $w = $ns->{widget}{$pkt->{id}}) { 116 if (my $cb = $ns->{widget_cb}{$id}) {
133 if (my $cb = $w->{ev}{$pkt->{name}}) { 117 $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 } 118 }
148 119
149 () 120 ()
150}; 121};
151 122
155 my $id = ++$self->{id}; 126 my $id = ++$self->{id};
156 127
157 my $ws = bless { 128 my $ws = bless {
158 id => $id, 129 id => $id,
159 ns => $self, 130 ns => $self,
160 w => {}, 131 _w => {},
161 }, "ext::widget::set"; 132 }, "ext::widget::set";
162 133
163 $ws->msg (ws_n => id => $id); 134 $ws->msg (ws_n => $id);
164 135
165 $ws 136 $ws
137}
138
139sub cf::client::alloc_wid {
140 pop @{ $_[0]{ids} }
141 or ++$_[0]{id}
142}
143
144sub cf::client::free_wid {
145 push @{ $_[0]{ids} }, $_[1];
166} 146}
167 147
168############################################################################# 148#############################################################################
169 149
170package ext::widget::set; 150package ext::widget::set;
174} 154}
175 155
176sub destroy { 156sub destroy {
177 my ($self) = @_; 157 my ($self) = @_;
178 158
179 $self->msg (ws_d => id => $self->{id}); 159 $self->msg (ws_d => $self->{id});
180 delete $self->{ns}; 160 delete $self->{ns};
181 $_->destroy 161 $_->destroy
182 for values %{ $self->{w} }; 162 for values %{ $self->{w} };
183} 163}
184 164
185sub msg { 165sub msg {
186 my ($self, $type, %msg) = @_; 166 my ($self, @msg) = @_;
187 167
188 if (my $ns = shift->{ns}) { 168 if (my $ns = shift->{ns}) {
189 $msg{msgtype} = $type; 169 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
190 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 170 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
191 } 171 }
172}
173
174sub alloc {
175 my ($self) = @_;
176
177 my $id = $self->{ns}->alloc_wid;
178
179 my $proxy = bless {
180 id => $id,
181 }, "ext::widget::proxy";
182
183 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
184 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
185
186 $proxy
192} 187}
193 188
194sub new { 189sub new {
195 my ($self, $class, %args) = @_; 190 my ($self, $class, %args) = @_;
196 191
197 my $id = ++$self->{ns}{id}; 192 my $proxy = $self->alloc;
198 193
199 my $proxy = $self->{w}{$id} = bless { 194 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
200 id => $id,
201 }, "ext::widget::proxy";
202
203 Scalar::Util::weaken ($proxy->{ws} = $self); 195 Scalar::Util::weaken ($proxy->{ws} = $self);
204 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
205 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
206 196
207 for my $ev (grep /^on_/, keys %args) { 197 for my $ev (grep /^on_/, keys %args) {
208 push @{$proxy->{ev}{$ev}}, $args{$ev}; 198 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
209 $args{$ev} = 0;
210 } 199 }
211 200
212 $self->msg (ws_c => 201 $self->msg (ws_c =>
213 ws => $self->{w}{id}, 202 $self->{id},
214 id => $id, 203 $proxy->{id},
215 class => $class, 204 $class,
216 args => \%args, 205 \%args,
217 ); 206 );
218 207
219 $proxy 208 $proxy
220} 209}
221 210
211sub find {
212 my ($self, @names) = @_;
213
214 my @res;
215 my @alloc;
216
217 for my $name (@names) {
218 push @res, $self->{ns}{widget_wkw}{$name} ||= do {
219 my $proxy = $self->alloc;
220
221 push @alloc, $proxy->{id} => $name;
222
223 $proxy
224 };
225 }
226
227 $self->msg (ws_a => @alloc)
228 if @alloc;
229
230 wantarray ? @res : $res[0]
231}
232
222############################################################################# 233#############################################################################
223 234
224package ext::widget::proxy; 235package ext::widget::proxy;
225 236
226sub DESTROY { 237sub DESTROY {
227 my ($self) = @_; 238 my ($self) = @_;
228 239
229 delete $self->{ns}{widget}{$self->{id}}; 240 delete $self->{ns}{widget}{$self->{id}};
230 241
231 if (my $ws = $self->{ws}) { 242 if (my $ws = $self->{ws}) {
243 $self->msg (w_c => 0, "destroy");
232 delete $ws->{w}{$self->{id}}; 244 delete $ws->{_w}{$self->{id}};
233 $self->msg (w_c => name => "destroy");
234 } 245 }
246}
247
248sub cb {
249 my ($self, $cb) = @_;
250
251 my $proxy = bless {
252 ns => $self->{ns},
253 id => $self->{ns}->alloc_wid,
254 }, "ext::widget::callback";
255
256 Scalar::Util::weaken $proxy->{ns};
257
258 $self->{ns}{widget_cb}{$proxy->{id}} = $cb;
259
260 $proxy
261}
262
263sub oneshot_cb {
264 my ($self, $cb) = @_;
265
266 if ("CODE" eq ref $cb) {
267 my $ocb = $cb;
268 $cb = $self->cb (sub {
269 undef $cb;
270 &$ocb
271 });
272 }
273
274 $cb
235} 275}
236 276
237sub msg { 277sub msg {
238 my ($self, $type, %msg) = @_; 278 my ($self, $type, @arg) = @_;
279
280 if (my $ns = $self->{ns}) {
281 my @msg = ($type, $self->{id}, @arg);
282 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
283 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
284 }
285}
286
287sub msg_cb {
288 my ($self, $cb, $type, @arg) = @_;
239 289
240 if (my $ws = $self->{ws}) { 290 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}; 291 my $rid = $ws->{ns}->alloc_wid;
254
255 $self->msg ($type, %msg, rid => $rid);
256 292
257 if ($cb) { 293 if ($cb) {
258 $ws->{ns}{widget_return}{$rid} = $cb; 294 $ws->{ns}{widget_cb}{$rid} = sub {
295 delete $ws->{ns}{widget_cb}{$rid};
296 $ws->{ns}->free_wid ($rid);
297 &$cb
298 };
299
300 $self->msg ($type, $rid, @arg);
259 } else { 301 } else {
260 # synchronous case 302 # synchronous case
261 my $wait = new Coro::Signal; 303 my $wait = new Coro::Signal;
262 my @res; 304 my @res;
263 305
264 $ws->{ns}{widget_return}{$rid} = sub { 306 $ws->{ns}{widget_cb}{$rid} = sub {
307 delete $ws->{ns}{widget_cb}{$rid};
308 $ws->{ns}->free_wid ($rid);
309
265 @res = @_; 310 @res = @_;
266 $wait->send; 311 $wait->send;
267 }; 312 };
313 $self->msg ($type, $rid, @arg);
268 $wait->wait; 314 $wait->wait;
269 315
270 return @res; 316 return @res;
271 } 317 }
272 } 318 }
273 319
274 () 320 ()
275} 321}
276 322
277sub set { 323sub set {
278 my ($self, $member, $value) = @_; 324 my ($self, @kv) = @_;
279 325
280 $self->msg (w_s => name => $member, value => $value); 326 $self->msg (w_s => \@kv);
281} 327}
282 328
283sub get { 329sub get {
284 my ($self, $member, $cb) = @_; 330 my ($self, $member, $cb) = @_;
285 331
286 $self->msg_cb ($cb, w_g => name => $member); 332 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
287} 333}
288 334
289sub TO_JSON { 335sub TO_JSON {
290 { __widget_ref__ => $_[0]{id} } 336 { "\fw" => $_[0]{id} }
291} 337}
292 338
293our $AUTOLOAD; 339our $AUTOLOAD;
294 340
295sub AUTOLOAD { 341sub AUTOLOAD {
296 $AUTOLOAD =~ s/^.*:// 342 $AUTOLOAD =~ s/^.*://
297 or return; 343 or return;
298 344
299 my $self = shift; 345 my $self = shift;
300 346
347 #TODO: handle non-void context
301 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 348 $self->msg (w_c => 0, $AUTOLOAD, @_);
302 349
303 () 350 ()
304} 351}
305 352
353package ext::widget::callback;
354
355sub DESTROY {
356 my ($self) = @_;
357
358 if (my $ns = $self->{ns}) {
359 delete $ns->{widget_cb}{$self->{id}};
360 $ns->free_wid ($self->{id});
361 }
362}
363
364sub TO_JSON {
365 { "\fc" => $_[0]{id} }
366}
367

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines