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.14 by root, Mon Jul 23 23:38:17 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_n id # widgetset new 4# ws_n ws # widgetset new
5# ws_d id # widgetset destroy 5# ws_d ws # widgetset destroy
6# ws_c ws id class args # widgetset create 6# ws_c ws id class args # widgetset create
7# w_c id [rid] name args # widget method call 7# w_c id rid name args # widget method call
8# w_s id name value # widget member set 8# w_s id @attr # widget member set
9# w_g id rid name # widget member get 9# w_g id rid @attr # widget member get
10# 10#
11# and expects the following exti message types 11# and expects the following exti message types
12# w_r rid res # widget call return 12# w_r rid res # widget call return
13# w_e id name args # widget_event 13# w_e id name args # widget_event
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
… …
30 my ($ns) = @_; 32 my ($ns) = @_;
31 33
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}
36
37sub demo_map {
38 my ($ns) = @_;
39
40 my $ws = $ns->{csc} = $ns->new_widgetset;
41
42 my $w = $ws->new (Toplevel =>
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 );
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 $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} 37}
66 38
67sub csc_start { 39sub csc_start {
68 my ($ns) = @_; 40 my ($ns) = @_;
69 41
… …
96 [5, "Pow"], 68 [5, "Pow"],
97 [6, "Cha"], 69 [6, "Cha"],
98 ) { 70 ) {
99 my ($x, $label) = @$_; 71 my ($x, $label) = @$_;
100 72
101 $statstable->add ($x, 0, $ws->new (Label => 73 $statstable->add_at ($x, 0, $ws->new (Label =>
102 can_hover => 1, can_events => 1, 74 can_hover => 1, can_events => 1,
103 align => +1, text => $label, tooltip => "#stat_$label", 75 align => +1, text => $label, tooltip => "#stat_$label",
104 )); 76 ));
105 $statstable->add ($x, 1, $ws->{stat}{$label} = $ws->new (Label => 77 $statstable->add_at ($x, 1, $ws->{stat}{$label} = $ws->new (Label =>
106 can_hover => 1, can_events => 1, 78 can_hover => 1, can_events => 1,
107 align => +1, template => "88", tooltip => "#stat_$label", 79 align => +1, template => "88", tooltip => "#stat_$label",
108 )); 80 ));
109 } 81 }
110 82
… …
115 87
116cf::player->attach ( 88cf::player->attach (
117 on_login => sub { 89 on_login => sub {
118 my ($pl) = @_; 90 my ($pl) = @_;
119 91
120 #return unless $cf::CFG{devel}; 92 return unless $cf::CFG{devel};
121 93
122 my $ns = $pl->ns; 94 my $ns = $pl->ns;
123 95
124 return unless $ns->{can_widget}; 96 return unless $ns->{can_widget};
125
126 demo_map $ns;
127 #csc_start $ns; 97 #csc_start $ns;
128 }, 98 },
129); 99);
130 100
131cf::register_exticmd w_e => sub { 101cf::register_exticmd w_e => sub {
132 my ($ns, $pkt) = @_; 102 my ($ns, $id, $name, $args) = @_;
133 103
134 if (my $w = $ns->{widget}{$pkt->{id}}) { 104 if (my $w = $ns->{widget}{$id}) {
135 if (my $cb = $w->{ev}{$pkt->{name}}) { 105 if (my $cb = $w->{ev}{$name}) {
136 $_->($w, @{ $pkt->{args} || [] }) 106 $_->($w, @$args)
137 for @$cb; 107 for @$cb;
138 } 108 }
139 } 109 }
140 110
141 () 111 ()
142}; 112};
143 113
144cf::register_exticmd w_r => sub { 114cf::register_exticmd w_r => sub {
145 my ($ns, $pkt) = @_; 115 my ($ns, $rid, $res) = @_;
146 116
147 if (my $cb = delete $ns->{widget_return}{$pkt->{rid}}) { 117 if (my $cb = delete $ns->{widget_return}{$rid}) {
148 $cb->(@{$pkt->{res} || [] }); 118 $cb->(@$res);
149 } 119 }
150 120
151 () 121 ()
152}; 122};
153 123
… …
157 my $id = ++$self->{id}; 127 my $id = ++$self->{id};
158 128
159 my $ws = bless { 129 my $ws = bless {
160 id => $id, 130 id => $id,
161 ns => $self, 131 ns => $self,
162 w => {}, 132 _w => {},
163 }, "ext::widget::set"; 133 }, "ext::widget::set";
164 134
165 $ws->msg (ws_n => id => $id); 135 $ws->msg (ws_n => $id);
166 136
167 $ws 137 $ws
168} 138}
169 139
170############################################################################# 140#############################################################################
… …
176} 146}
177 147
178sub destroy { 148sub destroy {
179 my ($self) = @_; 149 my ($self) = @_;
180 150
181 $self->msg (ws_d => id => $self->{id}); 151 $self->msg (ws_d => $self->{id});
182 delete $self->{ns}; 152 delete $self->{ns};
183 $_->destroy 153 $_->destroy
184 for values %{ $self->{w} }; 154 for values %{ $self->{w} };
185} 155}
186 156
187sub msg { 157sub msg {
188 my ($self, $type, %msg) = @_; 158 my ($self, @msg) = @_;
189 159
190 if (my $ns = shift->{ns}) { 160 if (my $ns = shift->{ns}) {
191 $msg{msgtype} = $type; 161 warn "msg " . $ns->{json_coder}->encode (\@msg) if $DEBUG;#d#
192 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\%msg)); 162 $ns->send_packet ("ext " . $ns->{json_coder}->encode (\@msg));
193 } 163 }
194} 164}
195 165
196sub new { 166sub new {
197 my ($self, $class, %args) = @_; 167 my ($self, $class, %args) = @_;
198 168
199 my $id = ++$self->{ns}{id}; 169 my $id = ++$self->{ns}{id};
200 170
201 my $proxy = $self->{w}{$id} = bless { 171 my $proxy = bless {
202 id => $id, 172 id => $id,
203 }, "ext::widget::proxy"; 173 }, "ext::widget::proxy";
204 174
175 Scalar::Util::weaken ($self->{_w}{$id} = $proxy);
205 Scalar::Util::weaken ($proxy->{ws} = $self); 176 Scalar::Util::weaken ($proxy->{ws} = $self);
206 Scalar::Util::weaken ($proxy->{ns} = $self->{ns}); 177 Scalar::Util::weaken ($proxy->{ns} = $self->{ns});
207 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy); 178 Scalar::Util::weaken ($self->{ns}{widget}{$id} = $proxy);
208 179
209 for my $ev (grep /^on_/, keys %args) { 180 for my $ev (grep /^on_/, keys %args) {
210 push @{$proxy->{ev}{$ev}}, $args{$ev}; 181 push @{$proxy->{ev}{$ev}}, $args{$ev};
211 $args{$ev} = 0; 182 $args{$ev} = 0;
212 } 183 }
213 184
214 $self->msg (ws_c => 185 $self->msg (ws_c =>
215 ws => $self->{w}{id}, 186 $proxy->{id},
216 id => $id, 187 $id,
217 class => $class, 188 $class,
218 args => \%args, 189 \%args,
219 ); 190 );
220 191
221 $proxy 192 $proxy
222} 193}
223 194
… …
229 my ($self) = @_; 200 my ($self) = @_;
230 201
231 delete $self->{ns}{widget}{$self->{id}}; 202 delete $self->{ns}{widget}{$self->{id}};
232 203
233 if (my $ws = $self->{ws}) { 204 if (my $ws = $self->{ws}) {
205 $self->msg (w_c => 0, "destroy");
234 delete $ws->{w}{$self->{id}}; 206 delete $ws->{_w}{$self->{id}};
235 $self->msg (w_c => name => "destroy");
236 } 207 }
237} 208}
238 209
239sub msg { 210sub msg {
240 my ($self, $type, %msg) = @_; 211 my ($self, $type, @arg) = @_;
241 212
242 if (my $ws = $self->{ws}) { 213 if (my $ws = $self->{ws}) {
243 $ws->msg ($type, 214 $ws->msg ($type, $self->{id}, @arg);
244 %msg,
245 id => $self->{id},
246 );
247 } 215 }
248} 216}
249 217
250sub msg_cb { 218sub msg_cb {
251 my ($self, $cb, $type, %msg) = @_; 219 my ($self, $cb, $type, @arg) = @_;
252 220
253 if (my $ws = $self->{ws}) { 221 if (my $ws = $self->{ws}) {
254
255 my $rid = ++$ws->{ns}{id}; 222 my $rid = ++$ws->{ns}{id};
256 223
257 $self->msg ($type, %msg, rid => $rid); 224 $self->msg ($type, $rid, @arg);
258 225
259 if ($cb) { 226 if ($cb) {
260 $ws->{ns}{widget_return}{$rid} = $cb; 227 $ws->{ns}{widget_return}{$rid} = $cb;
261 } else { 228 } else {
262 # synchronous case 229 # synchronous case
… …
275 242
276 () 243 ()
277} 244}
278 245
279sub set { 246sub set {
280 my ($self, $member, $value) = @_; 247 my ($self, @kv) = @_;
281 248
282 $self->msg (w_s => name => $member, value => $value); 249 $self->msg (w_s => \@kv);
283} 250}
284 251
285sub get { 252sub get {
286 my ($self, $member, $cb) = @_; 253 my ($self, $member, $cb) = @_;
287 254
288 $self->msg_cb ($cb, w_g => name => $member); 255 $self->msg_cb ($cb, w_g => [$member]);
289} 256}
290 257
291sub TO_JSON { 258sub TO_JSON {
292 { __widget_ref__ => $_[0]{id} } 259 { __widget_ref__ => $_[0]{id} }
293} 260}
… …
298 $AUTOLOAD =~ s/^.*:// 265 $AUTOLOAD =~ s/^.*://
299 or return; 266 or return;
300 267
301 my $self = shift; 268 my $self = shift;
302 269
303 $self->msg (w_c => name => $AUTOLOAD, args => \@_); 270 $self->msg (w_c => 0, $AUTOLOAD, \@_);
304 271
305 () 272 ()
306} 273}
307 274

Diff Legend

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