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.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 $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} 47}
66 48
67sub csc_start { 49sub csc_start {
68 my ($ns) = @_; 50 my ($ns) = @_;
69 51
… …
81 }, 63 },
82 ); 64 );
83 65
84 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 66 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
85 67
86 $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");
87 69
88 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 70 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
89 71
90 for ( 72 for (
91 [0, "Str"], 73 [0, "Str"],
92 [1, "Dex"], 74 [1, "Dex"],
93 [2, "Con"], 75 [2, "Con"],
… …
96 [5, "Pow"], 78 [5, "Pow"],
97 [6, "Cha"], 79 [6, "Cha"],
98 ) { 80 ) {
99 my ($x, $label) = @$_; 81 my ($x, $label) = @$_;
100 82
101 $statstable->add ($x, 0, $ws->new (Label => 83 $statstable->add_at ($x, 0, $ws->new (Label =>
102 can_hover => 1, can_events => 1, 84 can_hover => 1, can_events => 1,
103 align => +1, text => $label, tooltip => "#stat_$label", 85 align => +1, text => $label, tooltip => "#stat_$label",
104 )); 86 ));
105 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 87 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
106 can_hover => 1, can_events => 1, 88 can_hover => 1, can_events => 1,
107 align => +1, template => "88", tooltip => "#stat_$label", 89 align => +1, template => "88", tooltip => "#stat_$label",
108 )); 90 ));
109 } 91 }
110 92
111 csc_update_stats $ns; 93 csc_update_stats $ns;
112 94
95 $ws->{tl} = $w;
113 $w->show; 96 $w->show;
114} 97}
115 98
116cf::player->attach ( 99cf::player->attach (
117 on_login => sub { 100 on_login => sub {
118 my ($pl) = @_; 101 my ($pl) = @_;
119 102
120 #return unless $cf::CFG{devel}; 103 return unless $cf::CFG{devel};
121 104
122 my $ns = $pl->ns; 105 my $ns = $pl->ns;
123 106
124 return unless $ns->{can_widget}; 107 return unless $ns->{can_widget};
125
126 demo_map $ns;
127 #csc_start $ns; 108 #csc_start $ns;
109 #demo_start $ns;
128 }, 110 },
129); 111);
130 112
131cf::register_exticmd w_e => sub { 113cf::register_exticmd w_e => sub {
132 my ($ns, $pkt) = @_; 114 my ($ns, $id, @args) = @_;
133 115
134 if (my $w = $ns->{widget}{$pkt->{id}}) { 116 if (my $cb = $ns->{widget_cb}{$id}) {
135 if (my $cb = $w->{ev}{$pkt->{name}}) { 117 $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 } 118 }
150 119
151 () 120 ()
152}; 121};
153 122
… …
157 my $id = ++$self->{id}; 126 my $id = ++$self->{id};
158 127
159 my $ws = bless { 128 my $ws = bless {
160 id => $id, 129 id => $id,
161 ns => $self, 130 ns => $self,
162 w => {}, 131 _w => {},
163 }, "ext::widget::set"; 132 }, "ext::widget::set";
164 133
165 $ws->msg (ws_n => id => $id); 134 $ws->msg (ws_n => $id);
166 135
167 $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];
168} 146}
169 147
170############################################################################# 148#############################################################################
171 149
172package ext::widget::set; 150package ext::widget::set;
… …
176} 154}
177 155
178sub destroy { 156sub destroy {
179 my ($self) = @_; 157 my ($self) = @_;
180 158
181 $self->msg (ws_d => id => $self->{id}); 159 $self->msg (ws_d => $self->{id});
182 delete $self->{ns}; 160 delete $self->{ns};
183 $_->destroy 161 $_->destroy
184 for values %{ $self->{w} }; 162 for values %{ $self->{w} };
185} 163}
186 164
187sub msg { 165sub msg {
188 my ($self, $type, %msg) = @_; 166 my ($self, @msg) = @_;
189 167
190 if (my $ns = shift->{ns}) { 168 if (my $ns = shift->{ns}) {
191 $msg{msgtype} = $type; 169 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
192 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 170 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
193 } 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
194} 187}
195 188
196sub new { 189sub new {
197 my ($self, $class, %args) = @_; 190 my ($self, $class, %args) = @_;
198 191
199 my $id = ++$self->{ns}{id}; 192 my $proxy = $self->alloc;
200 193
201 my $proxy = $self->{w}{$id} = bless { 194 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
202 id => $id,
203 }, "ext::widget::proxy";
204
205 Scalar::Util::weaken ($proxy->{ws} = $self); 195 Scalar::Util::weaken ($proxy->{ws} = $self);
206 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
207 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
208 196
209 for my $ev (grep /^on_/, keys %args) { 197 for my $ev (grep /^on_/, keys %args) {
210 push @{$proxy->{ev}{$ev}}, $args{$ev}; 198 $args{$ev} = $proxy->{"_$ev"} = $proxy->cb ($args{$ev});
211 $args{$ev} = 0;
212 } 199 }
213 200
214 $self->msg (ws_c => 201 $self->msg (ws_c =>
215 ws => $self->{w}{id}, 202 $self->{id},
216 id => $id, 203 $proxy->{id},
217 class => $class, 204 $class,
218 args => \%args, 205 \%args,
219 ); 206 );
220 207
221 $proxy 208 $proxy
222} 209}
223 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
224############################################################################# 233#############################################################################
225 234
226package ext::widget::proxy; 235package ext::widget::proxy;
227 236
228sub DESTROY { 237sub DESTROY {
229 my ($self) = @_; 238 my ($self) = @_;
230 239
231 delete $self->{ns}{widget}{$self->{id}}; 240 delete $self->{ns}{widget}{$self->{id}};
232 241
233 if (my $ws = $self->{ws}) { 242 if (my $ws = $self->{ws}) {
243 $self->msg (w_c => 0, "destroy");
234 delete $ws->{w}{$self->{id}}; 244 delete $ws->{_w}{$self->{id}};
235 $self->msg (w_c => name => "destroy");
236 } 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
237} 275}
238 276
239sub msg { 277sub msg {
240 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) = @_;
241 289
242 if (my $ws = $self->{ws}) { 290 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}; 291 my $rid = $ws->{ns}->alloc_wid;
256
257 $self->msg ($type, %msg, rid => $rid);
258 292
259 if ($cb) { 293 if ($cb) {
260 $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);
261 } else { 301 } else {
262 # synchronous case 302 # synchronous case
263 my $wait = new Coro::Signal; 303 my $wait = new Coro::Signal;
264 my @res; 304 my @res;
265 305
266 $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
267 @res = @_; 310 @res = @_;
268 $wait->send; 311 $wait->send;
269 }; 312 };
313 $self->msg ($type, $rid, @arg);
270 $wait->wait; 314 $wait->wait;
271 315
272 return @res; 316 return @res;
273 } 317 }
274 } 318 }
275 319
276 () 320 ()
277} 321}
278 322
279sub set { 323sub set {
280 my ($self, $member, $value) = @_; 324 my ($self, @kv) = @_;
281 325
282 $self->msg (w_s => name => $member, value => $value); 326 $self->msg (w_s => \@kv);
283} 327}
284 328
285sub get { 329sub get {
286 my ($self, $member, $cb) = @_; 330 my ($self, $member, $cb) = @_;
287 331
288 $self->msg_cb ($cb, w_g => name => $member); 332 $self->msg_cb ($cb, w_g => ref $member ? @$member : $member);
289} 333}
290 334
291sub TO_JSON { 335sub TO_JSON {
292 { __widget_ref__ => $_[0]{id} } 336 { "\fw" => $_[0]{id} }
293} 337}
294 338
295our $AUTOLOAD; 339our $AUTOLOAD;
296 340
297sub AUTOLOAD { 341sub AUTOLOAD {
298 $AUTOLOAD =~ s/^.*:// 342 $AUTOLOAD =~ s/^.*://
299 or return; 343 or return;
300 344
301 my $self = shift; 345 my $self = shift;
302 346
347 #TODO: handle non-void context
303 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 348 $self->msg (w_c => 0, $AUTOLOAD, @_);
304 349
305 () 350 ()
306} 351}
307 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