ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC vs.
Revision 1.196 by root, Thu May 8 21:30:23 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
32 30
33 my @cmd_help = map { 31 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
77 if (my $ts = $cap{tileset}) {
78 if (my ($default) = grep $_->[2] & 1, @$ts) {
79 $self->{tileset} = $default;
80 $self->{tilesize} = $default->[3];
81 $self->setup_req (tileset => $default->[0]);
82
83 my $w = int $self->{mapw} * 32 / $self->{tilesize};
84 my $h = int $self->{maph} * 32 / $self->{tilesize};
85
86 $self->setup_req (mapsize => "${w}x${h}");
87 }
88 }
89 });
90 50
91 $self->{json_coder} 51 $self->{json_coder}
92 ->convert_blessed 52 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
94 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
95 }); 61 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
103 };
104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235 62
236 # destroy widgets on logout 63 # destroy widgets on logout
237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
238 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy 66 $_->destroy
240 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
241 } 68 }
69
70 delete $self->{items};
71 $::INV->clear;
72 $::INVR_HB->clear;
73 $::FLOORBOX->clear;
242 }); 74 });
243 75
244 $self->{map_widget}->add_command (@$_) 76 $self->{map_widget}->add_command (@$_)
245 for @cmd_help; 77 for @cmd_help;
246 78
247 { 79 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 80 $self->{dialogue} = my $tex = new_from_file DC::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 82 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 } 83 }
252 84
253 { 85 {
254 $self->{noface} = my $tex = new_from_file CFPlus::Texture 86 $self->{noface} = my $tex = new_from_file DC::Texture
255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 88 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 } 89 }
258 90
259 $self->{open_container} = 0; 91 $self->{open_container} = 0;
260 92
261 # per server 93 # per server
262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 94 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
263 95
264 $self 96 $self
265}
266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293} 97}
294 98
295sub update_fx_want { 99sub update_fx_want {
296 my ($self) = @_; 100 my ($self) = @_;
297 101
… …
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND 104 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC 105 6 => 1, # FT_RSRC
302 }); 106 });
303} 107}
304 108
109sub ext_capabilities {
110 my ($self, %cap) = @_;
111
112 $self->update_fx_want;
113
114 $self->send_exti_req (resource => "exp_table", sub {
115 my ($exp_table) = @_;
116
117 $self->register_face_handler ($exp_table, sub {
118 my ($face) = @_;
119
120 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
121 $_->() for values %{ $self->{on_exp_update} || {} };
122 });
123
124 ()
125 });
126
127 if (my $ts = $cap{tileset}) {
128 if (my ($default) = grep $_->[2] & 1, @$ts) {
129 $self->{tileset} = $default;
130 $self->{tilesize} = $default->[3];
131 $self->setup_req (tileset => $default->[0]);
132
133 my $w = int $self->{mapw} * 32 / $self->{tilesize};
134 my $h = int $self->{maph} * 32 / $self->{tilesize};
135
136 $self->setup_req (mapsize => "${w}x${h}");
137 }
138 }
139}
140
141sub ext_ambient_music {
142 my ($self, $songs) = @_;
143 &::audio_music_set_ambient ($songs);
144}
145
146#############################################################################
147
148sub widget_associate {
149 my ($self, $ws, $id, $widget) = @_;
150
151 $widget ||= new DC::UI::Bin;
152
153 $widget->{s_id} = $id;
154 $self->{widget}{$id} = $widget;
155
156 if ($ws) {
157 $widget->{s_ws} = $ws;
158 $self->{widgetset}{$ws}{w}{$id} = $widget;
159 }
160
161 $widget->connect (on_destroy => sub {
162 my ($widget) = @_;
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
166 if exists $widget->{s_ws};
167 });
168}
169
170# widgetset new
171sub ext_ws_n {
172 my ($self, $id) = @_;
173
174 $self->{widgetset}{$id} = {
175 w => {},
176 };
177}
178
179# widgetset destroy
180sub ext_ws_d {
181 my ($self, $id) = @_;
182
183 my $ws = delete $self->{widgetset}{$id}
184 or return;
185
186 $_->destroy
187 for values %{$ws->{w}};
188}
189
190# widgetset create
191sub ext_ws_c {
192 my ($self, $ws, $id, $class, $args) = @_;
193
194 $self->widget_associate (
195 $ws, $id => scalar eval {
196 local $SIG{__DIE__};
197 "DC::UI::$class"->new (%$args)
198 }
199 );
200}
201
202# widgetset create template
203sub ext_ws_ct {
204 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
205
206 $done_cb ||= sub { };
207
208 my $parse_list; $parse_list = sub {
209 my ($list) = @_;
210 my @w;
211
212 while (@$list) {
213 my ($class, $args) = splice @$list, 0, 2;
214 my $name = delete $args->{s_id};
215 my $cl = delete $args->{s_cl};
216 my $cfg = delete $cfg->{$name};
217 my $id = delete $cfg->{id};
218 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
219 or next;
220
221 $self->widget_associate ($ws, $id, $w)
222 if $id;
223
224 $w->add ($parse_list->($cl))
225 if $cl;
226
227 push @w, $w;
228 }
229
230 @w
231 };
232
233 # either array reference, or face #
234 if ($type eq "inline") {
235 $done_cb->();
236 $parse_list->($template);
237 } elsif ($type eq "face") {
238 my $handler; $handler = $self->register_face_handler ($template, sub {
239 my ($face) = @_;
240
241 undef $handler;
242 $done_cb->();
243 $parse_list->($self->{json_coder}->decode ($face->{data}));
244 });
245 } else {
246 $done_cb->(0);
247 }
248}
249
250# widgetset associate
251sub ext_ws_a {
252 my ($self, %ass) = @_;
253
254 # everything that has a name, wether conceivably useful or not
255 my %wkw = (
256 root => $DC::UI::ROOT,
257 tooltip => $DC::UI::TOOLTIP,
258
259 mapwidget => $::MAPWIDGET,
260 buttonbar => $::BUTTONBAR,
261 metaserver => $::METASERVER,
262 buttonbar => $::BUTTONBAR,
263 login_button => $::LOGIN_BUTTON,
264 quit_dialog => $::QUIT_DIALOG,
265 host_entry => $::HOST_ENTRY,
266 metaserver => $::METASERVER,
267 server_info => $::SERVER_INFO,
268
269 setup_dialog => $::SETUP_DIALOG,
270 setup_notebook => $::SETUP_NOTEBOOK,
271 setup_server => $::SETUP_SERVER,
272 setup_keyboard => $::SETUP_KEYBOARD,
273
274 pl_notebook => $::PL_NOTEBOOK,
275 pl_window => $::PL_WINDOW,
276 inventory_page => $::INVENTORY_PAGE,
277 stats_page => $::STATS_PAGE,
278 skill_page => $::SKILL_PAGE,
279 spell_page => $::SPELL_PAGE,
280 spell_list => $::SPELL_LIST,
281
282 floorbox => $::FLOORBOX,
283 help_window => $::HELP_WINDOW,
284 message_window => $::MESSAGE_WINDOW,
285 message_dist => $::MESSAGE_DIST,
286 statusbox => $::SDTATUSBOX,
287
288 inv => $::INV,
289 invr => $::INVR,
290 invr_hb => $::INVR_HB,
291 );
292
293 while (my ($id, $name) = each %ass) {
294 $self->widget_associate (undef, $id => $wkw{$name});
295 }
296}
297
298# widget call
299sub ext_w_c {
300 my ($self, $id, $rcb, $method, @args) = @_;
301
302 my $w = $self->{widget}{$id}
303 or return;
304
305 if ($rcb) {
306 $rcb->($w->$method (@args));
307 } else {
308 $w->$method (@args);
309 }
310}
311
312# widget set
313sub ext_w_s {
314 my ($self, $id, $attr) = @_;
315
316 my $w = $self->{widget}{$id}
317 or return;
318
319 for (my $i = 0; $i < $#$attr; $i += 2) {
320 my ($member, $value) = @$attr[$i, $i+1];
321 if (defined $value) {
322 $w->{$member} = $value;
323 } else {
324 delete $w->{$member};
325 }
326 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
327 }
328}
329
330# widget get
331sub ext_w_g {
332 my ($self, $id, $rid, @attr) = @_;
333
334 my $w = $self->{widget}{$id}
335 or return;
336
337 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
338}
339
340# message window
341sub ext_channel_info {
342 my ($self, $info) = @_;
343 $self->{channels}->{$info->{id}} = $info;
344 $::MESSAGE_DIST->add_channel ($info);
345}
346
347#############################################################################
348
305sub logprint { 349sub logprint {
306 my ($self, @a) = @_; 350 my ($self, @a) = @_;
307 351
308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 352 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
309} 353}
310 354
311sub _stat_numdiff { 355sub _stat_numdiff {
312 my ($self, $name, $old, $new) = @_; 356 my ($self, $name, $old, $new) = @_;
313 357
… …
397 441
398 if ( 442 if (
399 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 443 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
400 ) { 444 ) {
401 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 445 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
402 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 446 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
403 } 447 }
404 448
405 $self->update_stats_window ($stats, $prev); 449 $self->update_stats_window ($stats, $prev);
406 450
407 $self->{prev_stats} = { %$stats }; 451 $self->{prev_stats} = { %$stats };
… …
474 for keys %RES_TBL; 518 for keys %RES_TBL;
475 519
476 my $sktbl = $::STATWIDS->{skill_tbl}; 520 my $sktbl = $::STATWIDS->{skill_tbl};
477 my @skills = keys %{ $self->{skill_info} }; 521 my @skills = keys %{ $self->{skill_info} };
478 522
479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 523 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
524 map [$_, $self->{skill_info}{$_}],
525 grep exists $stats->{$_},
526 @skills;
527
528 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
529 $self->{stat_order} = join ",", map $_->[0], @order;
530
480 $sktbl->clear; 531 $sktbl->clear;
481 532
482 my $sw = $self->{skillwid}{""} ||= [ 533 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 534 0, 0, (new DC::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 535 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 536 2, 0, (new DC::UI::Label text => "Progress"),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 537 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 538 4, 0, (new DC::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 539 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 540 6, 0, (new DC::UI::Label text => "Progress"),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
491 ]; 542 ];
492 543
493 my @add = @$sw; 544 my @add = @$sw;
494 545
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 546 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496 547
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 548 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 549 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499 550
500 my ($x, $y) = (0, 1); 551 my ($x, $y) = (0, 1);
501 for ( 552 for (@order) {
502 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
503 map [$_, $self->{skill_info}{$_}],
504 grep exists $stats->{$_},
505 @skills
506 ) {
507 my ($idx, $name) = @$_; 553 my ($idx, $name) = @$_;
508 554
509 my $spell_cb = sub { 555 my $spell_cb = sub {
510 my ($widget, $ev) = @_; 556 my ($widget, $ev) = @_;
511 557
512 if ($ev->{button} == 1) { 558 if ($ev->{button} == 1) {
513 $::CONN->user_send ("ready_skill $name"); 559 $::CONN->user_send ("ready_skill $name");
514 } elsif ($ev->{button} == 2) { 560 } elsif ($ev->{button} == 2) {
515 $::CONN->user_send ("use_skill $name"); 561 $::CONN->user_send ("use_skill $name");
516 } elsif ($ev->{button} == 3) { 562 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14; 563 my $shortname = DC::shorten $name, 14;
518 (new CFPlus::UI::Menu 564 (new DC::UI::Menu
519 items => [ 565 items => [
520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 566 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 567 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
522 ], 568 ],
523 )->popup ($ev); 569 )->popup ($ev);
524 } else { 570 } else {
525 return 0; 571 return 0;
526 } 572 }
… …
528 1 574 1
529 }; 575 };
530 576
531 my $sw = $self->{skillwid}{$idx} ||= [ 577 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp 578 # exp
533 (new CFPlus::UI::Label 579 (new DC::UI::Label
534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 580 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
535 581
536 # level 582 # level
537 (new CFPlus::UI::Label 583 (new DC::UI::Label
538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 584 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539 585
540 # progress 586 # progress
541 (new CFPlus::UI::ExperienceProgress), 587 (new DC::UI::ExperienceProgress),
542 588
543 # label 589 # label
544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 590 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 591 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ]; 592 ];
547 593
548 push @add, 594 push @add,
549 $x * 4 + 0, $y, $sw->[0], 595 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1], 596 $x * 4 + 1, $y, $sw->[1],
… …
556 } 602 }
557 603
558 $sktbl->add_at (@add); 604 $sktbl->add_at (@add);
559 } 605 }
560 606
561 for (grep exists $stats->{$_}, @skills) { 607 for (@order) {
608 my ($idx, $name) = @$_;
609 my $val = $stats->{$idx};
610
611 next if $prev->{$idx}[1] eq $val->[1];
612
562 my $sw = $self->{skillwid}{$_}; 613 my $sw = $self->{skillwid}{$idx};
563 $sw->[0]->set_text (::formsep ($stats->{$_}[1])); 614 $sw->[0]->set_text (::formsep ($val->[1]));
564 $sw->[1]->set_text ($stats->{$_}[0] * 1); 615 $sw->[1]->set_text ($val->[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}}); 616 $sw->[2]->set_value (@$val);
566 }
567}
568 617
569sub macro_send { 618 $::GAUGES->{sklprg}->set_label ("$name %d%%");
570 my ($self, $macro) = @_; 619 $::GAUGES->{sklprg}->set_value (@$val);
571
572 for my $cmd (@{ $macro->{action} }) {
573 $self->send_command ($cmd);
574 } 620 }
575} 621}
576 622
577sub user_send { 623sub user_send {
578 my ($self, $command) = @_; 624 my ($self, $command) = @_;
… …
580 $self->{record}->($command) 626 $self->{record}->($command)
581 if $self->{record}; 627 if $self->{record};
582 628
583 $self->logprint ("send: ", $command); 629 $self->logprint ("send: ", $command);
584 $self->send_command ($command); 630 $self->send_command ($command);
585 ::status ($command);
586} 631}
587 632
588sub record { 633sub record {
589 my ($self, $cb) = @_; 634 my ($self, $cb) = @_;
590 635
… …
621 } 666 }
622 } 667 }
623 668
624 if ($delay) { 669 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched 670 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub { 671 EV::once undef, 0, 0.03, sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update; 672 $self->{map_widget}->update
673 if $self->{map_widget};
629 }); 674 };
630 } else { 675 } else {
631 $self->{map_widget}->update; 676 $self->{map_widget}->update;
632 } 677 }
633} 678}
634 679
… …
646 691
647 my ($hash, $x, $y, $w, $h) = @$map_info; 692 my ($hash, $x, $y, $w, $h) = @$map_info;
648 693
649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 694 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
650 $self->{map_cache_new}{$hash} = \$data; 695 $self->{map_cache_new}{$hash} = \$data;
651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 696 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
652} 697}
653 698
654sub map_clear { 699sub map_clear {
655 my ($self) = @_; 700 my ($self) = @_;
656 701
… …
669 do { 714 do {
670 $tile = pop @{$self->{bg_fetch}} 715 $tile = pop @{$self->{bg_fetch}}
671 or return; 716 or return;
672 } while $self->{texture}[$tile]; 717 } while $self->{texture}[$tile];
673 718
674 CFPlus::DB::get tilecache => $tile, sub { 719 DC::DB::get tilecache => $tile, sub {
675 my ($data) = @_; 720 my ($data) = @_;
676 721
677 return unless $self->{map}; # stop when destroyed 722 return unless $self->{map}; # stop when destroyed
678 723
679 if (defined $data) { 724 if (defined $data) {
… …
707 }; 752 };
708 753
709 if (my $rdata = $self->{map_cache_old}{$hash}) { 754 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata); 755 $cb->($$rdata);
711 } else { 756 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 757 DC::DB::get $self->{mapcache} => $hash, $cb;
713 } 758 }
714} 759}
715 760
716# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 761# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
717# (server resource,s latency, bandwidth), so this hack is warranted. 762# (server resource,s latency, bandwidth), so this hack is warranted.
… …
841 886
842sub face_find { 887sub face_find {
843 my ($self, $facenum, $face, $cb) = @_; 888 my ($self, $facenum, $face, $cb) = @_;
844 889
845 if ($face->{type} == 0) { # FT_FACE 890 if ($face->{type} == 0) { # FT_FACE
846 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 891 my $id = DC::DB::get_tile_id_sync $face->{name};
847 892
848 $face->{id} = $id; 893 $face->{id} = $id;
849 $self->{map}->set_tileid ($facenum => $id); 894 $self->{map}->set_tileid ($facenum => $id);
850 895
851 CFPlus::DB::get tilecache => $id, $cb; 896 DC::DB::get tilecache => $id, $cb;
852 897
853 } elsif ($face->{type} & 1) { # with metadata 898 } elsif ($face->{type} & 1) { # with metadata
854 CFPlus::DB::get res_meta => $face->{name}, $cb; 899 DC::DB::get res_meta => $face->{name}, $cb;
855 900
856 } else { # no metadata 901 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb; 902 DC::DB::get res_data => $face->{name}, $cb;
858 } 903 }
859} 904}
860 905
861sub face_update { 906sub face_update {
862 my ($self, $facenum, $face, $changed) = @_; 907 my ($self, $facenum, $face, $changed) = @_;
863 908
864 if ($face->{type} == 0) { 909 if ($face->{type} == 0) {
865 # image, FT_FACE 910 # image, FT_FACE
866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 911 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
867 if $changed; 912 if $changed;
868 913
869 $self->have_tile ($face->{id}, delete $face->{data}); 914 $self->have_tile ($face->{id}, delete $face->{data});
870 915
871 } elsif ($face->{type} & 1) { 916 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND 917 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data 918 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 919 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta; 920 $face->{data} = $meta;
876 921
922 # rely on strict ordering here and also on later fetch
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 923 DC::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 924 DC::DB::put res_meta => $face->{name} => $meta, sub { };
879 } 925 }
880 926
881 $face->{data} = $self->{json_coder}->decode ($face->{data}); 927 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face); 928 ::add_license ($face);
929 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
930 if $changed;
884 931
885 if ($face->{type} == 3) { # FT_MUSIC 932 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum); 933 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND 934 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum); 935 &::audio_sound_push ($facenum);
895 } 936 }
896 937
897 } else { 938 } else {
898 # flat resource case, FT_RSRC 939 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 940 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed; 941 if $changed;
901 } 942 }
902 943
903 if (my $cbs = $self->{face_cb}{$facenum}) { 944 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs; 945 $_->($face, $changed) for @$cbs;
… …
915 my ($self, $tile, $data) = @_; 956 my ($self, $tile, $data) = @_;
916 957
917 return unless $self->{map}; 958 return unless $self->{map};
918 959
919 my $tex = $self->{texture}[$tile] ||= 960 my $tex = $self->{texture}[$tile] ||=
920 new CFPlus::Texture 961 new DC::Texture
921 tile => $tile, 962 tile => $tile,
922 image => $data, delete_image => 1, 963 image => $data, delete_image => 1,
923 minify => 1, mipmap => 1; 964 minify => 1, mipmap => 1;
924 965
925 if (my $cbs = delete $self->{tile_cb}{$tile}) { 966 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
933 my ($self, $num, $cb) = @_; 974 my ($self, $num, $cb) = @_;
934 975
935 push @{$self->{face_cb}{$num}}, $cb; 976 push @{$self->{face_cb}{$num}}, $cb;
936 977
937 defined wantarray 978 defined wantarray
938 ? CFPlus::guard { 979 ? DC::guard {
939 @{$self->{face_cb}{$num}} 980 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb, 981 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}}; 982 @{$self->{face_cb}{$num}};
942 } 983 }
943 : () 984 : ()
… …
978 1019
979sub sanitise_xml($) { 1020sub sanitise_xml($) {
980 local $_ = shift; 1021 local $_ = shift;
981 1022
982 # we now weed out all tags we do not support 1023 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1024 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1025 }{
1026 "&lt;"
1027 }gex;
1028
984 # now all entities 1029 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1030 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986 1031
987 # handle some elements 1032 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1033 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
989 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1034 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1035
1036 s/\s+$//;
990 1037
991 $_ 1038 $_
992} 1039}
993 1040
994our %NAME_TO_COLOR = ( 1041our %NAME_TO_COLOR = (
… …
1041 1088
1042 ## try to create single paragraphs of multiple lines sent by the server 1089 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers 1090 # no longer neecssary with TRT servers
1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1091 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1045 1092
1093 for (split /\n/, $text) {
1046 ::message ({ 1094 ::message ({
1047 fg => $fg, 1095 fg => $fg,
1048 markup => $_, 1096 markup => $_,
1049 type => $type, 1097 type => $type,
1050 extra => [@extra], 1098 extra => [@extra],
1051 color_flags => $color 1099 color_flags => $color, #d# ugly, kill
1052 }) for split /\n/, $text; 1100 });
1101
1102 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1103 # actually, this is an ugly design. _we_ should control the channels,
1104 # not some random other widget, as the channels are clearly protocol-specific.
1105 # then we could also react to flags such as CLEAR without resorting to
1106 # hacks such as color_flags, above.
1107 }
1053 1108
1054 $self->{statusbox}->add ($text, 1109 $self->{statusbox}->add ($text,
1055 group => $text, 1110 group => $text,
1056 fg => $fg, 1111 fg => $fg,
1057 timeout => $color >= 2 ? 180 : 10, 1112 timeout => $color >= 2 ? 180 : 10,
1058 tooltip_font => $::FONT_FIXED, 1113 tooltip_font => $::FONT_FIXED,
1059 ); 1114 ) if $type eq "info";
1060 } 1115 }
1061} 1116}
1062 1117
1063sub spell_add { 1118sub spell_add {
1064 my ($self, $spell) = @_; 1119 my ($self, $spell) = @_;
… …
1068 $spell->{message} =~ s/\n+$//; 1123 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1124 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1125
1071 $::SPELL_LIST->add_spell ($spell); 1126 $::SPELL_LIST->add_spell ($spell);
1072 1127
1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1128 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1074 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1129 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1075} 1130}
1076 1131
1077sub spell_delete { 1132sub spell_delete {
1078 my ($self, $spell) = @_; 1133 my ($self, $spell) = @_;
1079 1134
… …
1090sub addme_success { 1145sub addme_success {
1091 my ($self) = @_; 1146 my ($self) = @_;
1092 1147
1093 my %skill_help; 1148 my %skill_help;
1094 1149
1095 for my $node (CFPlus::Pod::find skill_description => "*") { 1150 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = CFPlus::Pod::section_of $node; 1151 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1152 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1098 }; 1153 };
1099 1154
1100 for my $skill (values %{$self->{skill_info}}) { 1155 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1156 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1157 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1158 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1159 $self->{map_widget}->add_command ("use_skill $skill",
1105 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1160 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1161 . $skill_help{$skill});
1107 } 1162 }
1108} 1163}
1109 1164
1110sub eof { 1165sub eof {
… …
1114 1169
1115 ::stop_game (); 1170 ::stop_game ();
1116} 1171}
1117 1172
1118sub update_floorbox { 1173sub update_floorbox {
1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1174 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1175 return unless $::CONN;
1121 1176
1122 $::FLOORBOX->clear; 1177 $::FLOORBOX->clear;
1123 1178
1124 my @add; 1179 my @add;
1125 1180
1126 my $row; 1181 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1182 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1183 next if $_->{tag} & 0x80000000;
1128 if ($row < 6) { 1184 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1185 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1186 local $_->{desc_widget}; # hack to force recreation of widget
1131 CFPlus::Item::update_widgets $_; 1187 DC::Item::update_widgets $_;
1132 1188
1133 push @add, 1189 push @add,
1134 0, $row, $_->{face_widget}, 1190 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1191 1, $row, $_->{desc_widget};
1136 1192
1137 $row++; 1193 $row++;
1138 } else { 1194 } else {
1139 push @add, 1, $row, new CFPlus::UI::Button 1195 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1196 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1197 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1198 ;
1143 last; 1199 last;
1144 } 1200 }
1145 } 1201 }
1146 if ($::CONN->{open_container}) { 1202 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new CFPlus::UI::Button 1203 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1204 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1205 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1206 ;
1151 } 1207 }
1152 1208
1153 $::FLOORBOX->add_at (@add); 1209 $::FLOORBOX->add_at (@add);
1154 }); 1210 });
1155 1211
1156 $::WANT_REFRESH->start; 1212 $::WANT_REFRESH = 1;
1157} 1213}
1158 1214
1159sub set_opencont { 1215sub set_opencont {
1160 my ($conn, $tag, $name) = @_; 1216 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1217 $conn->{open_container} = $tag;
1162 update_floorbox; 1218 update_floorbox;
1163 1219
1164 $::INVR_HB->clear (); 1220 $::INVR_HB->clear;
1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1221 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1166 1222
1167 if ($tag != 0) { # Floor isn't closable, is it? 1223 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new CFPlus::UI::Button 1224 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1225 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1226 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1227 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1228 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1229 if $tag != 0;
… …
1180} 1236}
1181 1237
1182sub update_containers { 1238sub update_containers {
1183 my ($self) = @_; 1239 my ($self) = @_;
1184 1240
1185 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1241 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1242 my $todo = delete $self->{update_container}
1187 or return; 1243 or return;
1188 1244
1189 for my $tag (keys %$todo) { 1245 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1246 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1225} 1281}
1226 1282
1227sub item_update { 1283sub item_update {
1228 my ($self, $item) = @_; 1284 my ($self, $item) = @_;
1229 1285
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1286 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1231 1287
1232 CFPlus::Item::update_widgets $item; 1288 DC::Item::update_widgets $item;
1233 1289
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1290 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1291 set_opencont ($::CONN, 0, "Floor");
1236 1292
1237 } elsif ($item->{flags} & F_OPEN) { 1293 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1294 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1295
1240 } else { 1296 } else {
1241 $self->{update_container}{$item->{container}}++; 1297 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1298 $self->update_containers;
1243 } 1299 }
… …
1254 1310
1255 my $weight = .001 * $self->{player}{weight}; 1311 my $weight = .001 * $self->{player}{weight};
1256 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1312 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1257 1313
1258 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1314 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1259 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1315 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1260 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1316 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1261} 1317}
1262 1318
1263sub update_server_info { 1319sub update_server_info {
1264 my ($self) = @_; 1320 my ($self) = @_;
… …
1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1328 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1329 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n" 1330 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1331 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1332 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1333 . "client support $yesno[$self->{cfplus_ext} > 0]"
1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1334 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1279 . "map size $self->{mapw}×$self->{maph}\n" 1335 . "map size $self->{mapw}×$self->{maph}\n"
1280 ); 1336 );
1281 1337
1282} 1338}
… …
1302 0 1358 0
1303 }); 1359 });
1304 1360
1305 $self->update_server_info; 1361 $self->update_server_info;
1306 1362
1307 $self->send_command ("output-sync $::CFG->{output_sync}");
1308 $self->send_command ("output-count $::CFG->{output_count}");
1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1363 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1310 $self->send_command ("pickup $::CFG->{pickup}"); 1364 $self->send_command ("pickup $::CFG->{pickup}");
1311} 1365}
1312 1366
1313sub lookat { 1367sub lookat {
… …
1317 $self->send_ext_req (lookat => $x, $y, sub { 1371 $self->send_ext_req (lookat => $x, $y, sub {
1318 my (%msg) = @_; 1372 my (%msg) = @_;
1319 1373
1320 if (exists $msg{npc_dialog}) { 1374 if (exists $msg{npc_dialog}) {
1321 # start npc chat dialog 1375 # start npc chat dialog
1322 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1376 $self->{npc_dialog} = new DC::NPCDialog::
1323 token => $msg{npc_dialog}, 1377 token => $msg{npc_dialog},
1324 title => "$msg{npc_dialog}[0] (NPC)", 1378 title => "$msg{npc_dialog}[0] (NPC)",
1325 conn => $self, 1379 conn => $self,
1326 ; 1380 ;
1327 } 1381 }
… …
1340 $self->SUPER::destroy; 1394 $self->SUPER::destroy;
1341 1395
1342 %$self = (); 1396 %$self = ();
1343} 1397}
1344 1398
1345package CFPlus::NPCDialog; 1399package DC::NPCDialog;
1346 1400
1347our @ISA = 'CFPlus::UI::Toplevel'; 1401our @ISA = 'DC::UI::Toplevel';
1348 1402
1349sub new { 1403sub new {
1350 my $class = shift; 1404 my $class = shift;
1351 1405
1352 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
… …
1359 kw => { hi => 0, yes => 0, no => 0 }, 1413 kw => { hi => 0, yes => 0, no => 0 },
1360 has_close_button => 1, 1414 has_close_button => 1,
1361 @_, 1415 @_,
1362 ); 1416 );
1363 1417
1364 CFPlus::weaken (my $this = $self); 1418 DC::weaken (my $this = $self);
1365 1419
1366 $self->connect (delete => sub { $this->destroy; 1 }); 1420 $self->connect (delete => sub { $this->destroy; 1 });
1367 1421
1368 # better use a pane... 1422 # better use a pane...
1369 $self->add (my $hbox = new CFPlus::UI::HBox); 1423 $self->add (my $hbox = new DC::UI::HBox);
1370 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1424 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1371 1425
1372 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1426 $hbox->add (my $vbox = new DC::UI::VBox);
1373 1427
1374 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1428 $vbox->add (new DC::UI::Label text => "Message Entry:");
1375 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1429 $vbox->add ($self->{entry} = new DC::UI::Entry
1376 tooltip => "#npc_message_entry", 1430 tooltip => "#npc_message_entry",
1377 on_activate => sub { 1431 on_activate => sub {
1378 my ($entry, $text) = @_; 1432 my ($entry, $text) = @_;
1379 1433
1380 return unless $text =~ /\S/; 1434 return unless $text =~ /\S/;
… …
1384 1438
1385 0 1439 0
1386 }, 1440 },
1387 ); 1441 );
1388 1442
1389 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1443 $vbox->add ($self->{options} = new DC::UI::VBox);
1390 1444
1391 $self->{bye_button} = new CFPlus::UI::Button 1445 $self->{bye_button} = new DC::UI::Button
1392 text => "Bye (close)", 1446 text => "Bye (close)",
1393 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1447 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1394 on_activate => sub { $this->destroy; 1 }, 1448 on_activate => sub { $this->destroy; 1 },
1395 ; 1449 ;
1396 1450
… …
1415}; 1469};
1416 1470
1417sub update_options { 1471sub update_options {
1418 my ($self) = @_; 1472 my ($self) = @_;
1419 1473
1420 CFPlus::weaken $self; 1474 DC::weaken $self;
1421 1475
1422 $self->{options}->clear; 1476 $self->{options}->clear;
1423 $self->{options}->add ($self->{bye_button}); 1477 $self->{options}->add ($self->{bye_button});
1424 1478
1425 for my $kw (sort keys %{ $self->{kw} }) { 1479 for my $kw (sort keys %{ $self->{kw} }) {
1426 $self->{options}->add (new CFPlus::UI::Button 1480 $self->{options}->add (new DC::UI::Button
1427 text => $kw, 1481 text => $kw,
1428 on_activate => sub { 1482 on_activate => sub {
1429 $self->send ($kw); 1483 $self->send ($kw);
1430 0 1484 0
1431 }, 1485 },
… …
1434} 1488}
1435 1489
1436sub feed { 1490sub feed {
1437 my ($self, $type, @arg) = @_; 1491 my ($self, $type, @arg) = @_;
1438 1492
1439 CFPlus::weaken $self; 1493 DC::weaken $self;
1440 1494
1441 if ($type eq "update") { 1495 if ($type eq "update") {
1442 my (%info) = @arg; 1496 my (%info) = @arg;
1443 1497
1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1498 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1499 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1446 1500
1447 if (exists $info{msg}) { 1501 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1502 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1449 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1503 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link; 1504 my @link;
1451 $text =~ s{ 1505 $text =~ s{
1452 ($match) 1506 ($match)
1453 }{ 1507 }{
1454 my $kw = $1; 1508 my $kw = $1;
1455 1509
1456 push @link, new CFPlus::UI::Label 1510 push @link, new DC::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1511 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1, 1512 can_hover => 1,
1459 can_events => 1, 1513 can_events => 1,
1460 padding_x => 0, 1514 padding_x => 0,
1461 padding_y => 0, 1515 padding_y => 0,
… …
1479} 1533}
1480 1534
1481sub send { 1535sub send {
1482 my ($self, $msg) = @_; 1536 my ($self, $msg) = @_;
1483 1537
1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1538 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1485 $self->{textview}->scroll_to_bottom; 1539 $self->{textview}->scroll_to_bottom;
1486 1540
1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1541 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1488} 1542}
1489 1543

Diff Legend

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