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.11 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.18 by root, Sun Aug 19 09:27:08 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 @attr # widget member set 9# w_s id @attr # widget member set
9# w_g id rid @attr # 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_r rid res # widget call return
13# w_e id name args # widget_event 14# w_e id rid @args # widget_event
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 (__w_ => sub {
23 # cannot deserialise ATM 26 # cannot deserialise ATM
24 undef 27 undef
25 }); 28 });
26 }, 29 },
27); 30);
… …
30 my ($ns) = @_; 33 my ($ns) = @_;
31 34
32 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) { 35 while (my ($k, $v) = each %{ $ns->{csc}{stat} }) {
33 $v->set_text ($ns->pl->ob->stats->$k); 36 $v->set_text ($ns->pl->ob->stats->$k);
34 } 37 }
38}
39
40sub demo_start {
41 my ($ns) = @_;
42
43 my $ws = $ns->{csc} = $ns->new_widgetset;
44
45 $ws->{tab} = $ws->new (Label => text => "dumb tst", c_tab => ["hull"]);
46
47 $ws->find ("setup_notebook")->add ($ws->{tab});
48 $ws->find ("setup_dialog")->toggle_visibility;
35} 49}
36 50
37sub csc_start { 51sub csc_start {
38 my ($ns) = @_; 52 my ($ns) = @_;
39 53
… …
51 }, 65 },
52 ); 66 );
53 67
54 $w->add (my $ntb = $ws->new (Notebook => expand => 1)); 68 $w->add (my $ntb = $ws->new (Notebook => expand => 1));
55 69
56 $ntb->add (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character"); 70 $ntb->add_tab (Statistics => (my $stats = $ws->new (Table => expand => 1)), "Basic statistics of your new character");
57 71
58 $stats->add (0, 0, (my $statstable = $ws->new ("Table"))); 72 $stats->add_at (0, 0, (my $statstable = $ws->new ("Table")));
59 73
60 for ( 74 for (
61 [0, "Str"], 75 [0, "Str"],
62 [1, "Dex"], 76 [1, "Dex"],
63 [2, "Con"], 77 [2, "Con"],
… …
78 )); 92 ));
79 } 93 }
80 94
81 csc_update_stats $ns; 95 csc_update_stats $ns;
82 96
97 $ws->{tl} = $w;
83 $w->show; 98 $w->show;
84} 99}
85 100
86cf::player->attach ( 101cf::player->attach (
87 on_login => sub { 102 on_login => sub {
… …
91 106
92 my $ns = $pl->ns; 107 my $ns = $pl->ns;
93 108
94 return unless $ns->{can_widget}; 109 return unless $ns->{can_widget};
95 #csc_start $ns; 110 #csc_start $ns;
111 #demo_start $ns;
96 }, 112 },
97); 113);
98 114
99cf::register_exticmd w_e => sub { 115cf::register_exticmd w_e => sub {
100 my ($ns, $pkt) = @_; 116 my ($ns, $id, $rid, @args) = @_;
101 117
102 if (my $w = $ns->{widget}{$pkt->{id}}) { 118 if (my $w = $ns->{widget}{$id}) {
103 if (my $cb = $w->{ev}{$pkt->{name}}) { 119 if (my $cb = $w->{ev}{$rid}) {
104 $_->($w, @{ $pkt->{args} || [] }) 120 $cb->($w, @args);
105 for @$cb;
106 } 121 }
107 } 122 }
108 123
109 () 124 ()
110}; 125};
111 126
112cf::register_exticmd w_r => sub { 127cf::register_exticmd w_r => sub {
113 my ($ns, $pkt) = @_; 128 my ($ns, $rid, $res) = @_;
114 129
115 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) { 130 if (my $cb = delete $ns->{widget_return}{$rid}) {
116 $cb->(@{$pkt->{res} || [] }); 131 $cb->(@$res);
117 } 132 }
118 133
119 () 134 ()
120}; 135};
121 136
… …
125 my $id = ++$self->{id}; 140 my $id = ++$self->{id};
126 141
127 my $ws = bless { 142 my $ws = bless {
128 id => $id, 143 id => $id,
129 ns => $self, 144 ns => $self,
130 w => {}, 145 _w => {},
131 }, "ext::widget::set"; 146 }, "ext::widget::set";
132 147
133 $ws->msg (ws_n => id => $id); 148 $ws->msg (ws_n => $id);
134 149
135 $ws 150 $ws
136} 151}
137 152
138############################################################################# 153#############################################################################
… …
144} 159}
145 160
146sub destroy { 161sub destroy {
147 my ($self) = @_; 162 my ($self) = @_;
148 163
149 $self->msg (ws_d => id => $self->{id}); 164 $self->msg (ws_d => $self->{id});
150 delete $self->{ns}; 165 delete $self->{ns};
151 $_->destroy 166 $_->destroy
152 for values %{ $self->{w} }; 167 for values %{ $self->{w} };
153} 168}
154 169
155sub msg { 170sub msg {
156 my ($self, $type, %msg) = @_; 171 my ($self, @msg) = @_;
157 172
158 if (my $ns = shift->{ns}) { 173 if (my $ns = shift->{ns}) {
159 $msg{msgtype} = $type; 174 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
160 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 175 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
161 } 176 }
177}
178
179sub alloc {
180 my ($self) = @_;
181
182 my $id = ++$self->{ns}{id};
183
184 my $proxy = bless {
185 id => $id,
186 }, "ext::widget::proxy";
187
188 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
189 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
190
191 $proxy
162} 192}
163 193
164sub new { 194sub new {
165 my ($self, $class, %args) = @_; 195 my ($self, $class, %args) = @_;
166 196
167 my $id = ++$self->{ns}{id}; 197 my $proxy = $self->alloc;
168 198
169 my $proxy = $self->{w}{$id} = bless { 199 Scalar::Util::weaken ($self->{_w}{$proxy->{id}} = $proxy);
170 id => $id,
171 }, "ext::widget::proxy";
172
173 Scalar::Util::weaken ($proxy->{ws} = $self); 200 Scalar::Util::weaken ($proxy->{ws} = $self);
174 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
175 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
176 201
177 for my $ev (grep /^on_/, keys %args) { 202 for my $ev (grep /^on_/, keys %args) {
203 my $rid = ++$self->{ns}{id};
178 push @{$proxy->{ev}{$ev}}, $args{$ev}; 204 $proxy->{ev}{$rid} = $args{$ev};
179 $args{$ev} = 0; 205 $args{$ev} = $rid;
180 } 206 }
181 207
182 $self->msg (ws_c => 208 $self->msg (ws_c =>
183 ws => $self->{w}{id}, 209 $self->{id},
184 id => $id, 210 $proxy->{id},
185 class => $class, 211 $class,
186 args => \%args, 212 \%args,
187 ); 213 );
188 214
189 $proxy 215 $proxy
216}
217
218sub find {
219 my ($self, @names) = @_;
220
221 my @res;
222 my @alloc;
223
224 for my $name (@names) {
225 push @res, $self->{ns}{widget_wkw}{$name} ||= do {
226 my $proxy = $self->alloc;
227
228 push @alloc, $proxy->{id} => $name;
229
230 $proxy
231 };
232 }
233
234 $self->msg (ws_a => @alloc)
235 if @alloc;
236
237 wantarray ? @res : $res[0]
190} 238}
191 239
192############################################################################# 240#############################################################################
193 241
194package ext::widget::proxy; 242package ext::widget::proxy;
… …
197 my ($self) = @_; 245 my ($self) = @_;
198 246
199 delete $self->{ns}{widget}{$self->{id}}; 247 delete $self->{ns}{widget}{$self->{id}};
200 248
201 if (my $ws = $self->{ws}) { 249 if (my $ws = $self->{ws}) {
250 $self->msg (w_c => 0, "destroy");
202 delete $ws->{w}{$self->{id}}; 251 delete $ws->{_w}{$self->{id}};
203 $self->msg (w_c => name => "destroy");
204 } 252 }
205} 253}
206 254
207sub msg { 255sub msg {
208 my ($self, $type, %msg) = @_; 256 my ($self, $type, @arg) = @_;
257
258 if (my $ns = $self->{ns}) {
259 my @msg = ($type, $self->{id}, @arg);
260 warn "MSG " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
261 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
262 }
263}
264
265sub msg_cb {
266 my ($self, $cb, $type, @arg) = @_;
209 267
210 if (my $ws = $self->{ws}) { 268 if (my $ws = $self->{ws}) {
211 $ws->msg ($type,
212 %msg,
213 id => $self->{id},
214 );
215 }
216}
217
218sub msg_cb {
219 my ($self, $cb, $type, %msg) = @_;
220
221 if (my $ws = $self->{ws}) {
222
223 my $rid = ++$ws->{ns}{id}; 269 my $rid = ++$ws->{ns}{id};
224 270
225 $self->msg ($type, %msg, rid => $rid); 271 $self->msg ($type, $rid, @arg);
226 272
227 if ($cb) { 273 if ($cb) {
228 $ws->{ns}{widget_return}{$rid} = $cb; 274 $ws->{ns}{widget_return}{$rid} = $cb;
229 } else { 275 } else {
230 # synchronous case 276 # synchronous case
… …
243 289
244 () 290 ()
245} 291}
246 292
247sub set { 293sub set {
248 my ($self, $member, $value) = @_; 294 my ($self, @kv) = @_;
249 295
250 $self->msg (w_s => attr => [ [$member, $value] ]); 296 $self->msg (w_s => \@kv);
251} 297}
252 298
253sub get { 299sub get {
254 my ($self, $member, $cb) = @_; 300 my ($self, $member, $cb) = @_;
255 301
256 $self->msg_cb ($cb, w_g => attr => [$member]); 302 $self->msg_cb ($cb, w_g => [$member]);
257} 303}
258 304
259sub TO_JSON { 305sub TO_JSON {
260 { __widget_ref__ => $_[0]{id} } 306 { __w_ => $_[0]{id} }
261} 307}
262 308
263our $AUTOLOAD; 309our $AUTOLOAD;
264 310
265sub AUTOLOAD { 311sub AUTOLOAD {
266 $AUTOLOAD =~ s/^.*:// 312 $AUTOLOAD =~ s/^.*://
267 or return; 313 or return;
268 314
269 my $self = shift; 315 my $self = shift;
270 316
317 #TODO: handle non-void context
271 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 318 $self->msg (w_c => 0, $AUTOLOAD, @_);
272 319
273 () 320 ()
274} 321}
275 322

Diff Legend

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