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.185 by root, Thu Dec 27 19:12:19 2007 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;
… …
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->{par} <=> $b->{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
… …
243 70
244 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
245 for @cmd_help; 72 for @cmd_help;
246 73
247 { 74 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 } 78 }
252 79
253 { 80 {
254 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 } 84 }
258 85
259 $self->{open_container} = 0; 86 $self->{open_container} = 0;
260 87
261 # per server 88 # per server
262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
263 90
264 $self 91 $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} 92}
294 93
295sub update_fx_want { 94sub update_fx_want {
296 my ($self) = @_; 95 my ($self) = @_;
297 96
… …
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC 100 6 => 1, # FT_RSRC
302 }); 101 });
303} 102}
304 103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
171 };
172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $parse_list->($template);
231 $done_cb->();
232 } elsif ($type eq "face") {
233 #...
234 $done_cb->(0);
235 } else {
236 $done_cb->(0);
237 }
238}
239
240# widgetset associate
241sub ext_ws_a {
242 my ($self, %ass) = @_;
243
244 # everything that has a name, wether conceivably useful or not
245 my %wkw = (
246 root => $DC::UI::ROOT,
247 tooltip => $DC::UI::TOOLTIP,
248
249 mapwidget => $::MAPWIDGET,
250 buttonbar => $::BUTTONBAR,
251 metaserver => $::METASERVER,
252 buttonbar => $::BUTTONBAR,
253 login_button => $::LOGIN_BUTTON,
254 quit_dialog => $::QUIT_DIALOG,
255 host_entry => $::HOST_ENTRY,
256 metaserver => $::METASERVER,
257 server_info => $::SERVER_INFO,
258
259 setup_dialog => $::SETUP_DIALOG,
260 setup_notebook => $::SETUP_NOTEBOOK,
261 setup_server => $::SETUP_SERVER,
262 setup_keyboard => $::SETUP_KEYBOARD,
263
264 pl_notebook => $::PL_NOTEBOOK,
265 pl_window => $::PL_WINDOW,
266 inventory_page => $::INVENTORY_PAGE,
267 stats_page => $::STATS_PAGE,
268 skill_page => $::SKILL_PAGE,
269 spell_page => $::SPELL_PAGE,
270 spell_list => $::SPELL_LIST,
271
272 floorbox => $::FLOORBOX,
273 help_window => $::HELP_WINDOW,
274 message_window => $::MESSAGE_WINDOW,
275 statusbox => $::SDTATUSBOX,
276
277 inv => $::INV,
278 invr => $::INVR,
279 invr_hb => $::INVR_HB,
280 );
281
282 while (my ($id, $name) = each %ass) {
283 $self->widget_associate (undef, $id => $wkw{$name});
284 }
285}
286
287# widget call
288sub ext_w_c {
289 my ($self, $id, $rcb, $method, @args) = @_;
290
291 my $w = $self->{widget}{$id}
292 or return;
293
294 if ($rcb) {
295 $rcb->($w->$method (@args));
296 } else {
297 $w->$method (@args);
298 }
299}
300
301# widget set
302sub ext_w_s {
303 my ($self, $id, $attr) = @_;
304
305 my $w = $self->{widget}{$id}
306 or return;
307
308 for (my $i = 0; $i < $#$attr; $i += 2) {
309 my ($member, $value) = @$attr[$i, $i+1];
310 if (defined $value) {
311 $w->{$member} = $value;
312 } else {
313 delete $w->{$member};
314 }
315 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
316 }
317}
318
319# widget get
320sub ext_w_g {
321 my ($self, $id, $rid, @attr) = @_;
322
323 my $w = $self->{widget}{$id}
324 or return;
325
326 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
327}
328
329# message window
330sub ext_channel_info {
331 my ($self, $info) = @_;
332 $self->{channels}->{$info->{id}} = $info;
333 $::MESSAGE_WINDOW->add_channel ($info);
334}
335
336#############################################################################
337
305sub logprint { 338sub logprint {
306 my ($self, @a) = @_; 339 my ($self, @a) = @_;
307 340
308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
309} 342}
310 343
311sub _stat_numdiff { 344sub _stat_numdiff {
312 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
313 346
… …
397 430
398 if ( 431 if (
399 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
400 ) { 433 ) {
401 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 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); 435 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
403 } 436 }
404 437
405 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
406 439
407 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
474 for keys %RES_TBL; 507 for keys %RES_TBL;
475 508
476 my $sktbl = $::STATWIDS->{skill_tbl}; 509 my $sktbl = $::STATWIDS->{skill_tbl};
477 my @skills = keys %{ $self->{skill_info} }; 510 my @skills = keys %{ $self->{skill_info} };
478 511
479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 512 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
513 map [$_, $self->{skill_info}{$_}],
514 grep exists $stats->{$_},
515 @skills;
516
517 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
518 $self->{stat_order} = join ",", map $_->[0], @order;
519
480 $sktbl->clear; 520 $sktbl->clear;
481 521
482 my $sw = $self->{skillwid}{""} ||= [ 522 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
491 ]; 531 ];
492 532
493 my @add = @$sw; 533 my @add = @$sw;
494 534
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 535 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
496 536
497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 537 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); 538 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
499 539
500 my ($x, $y) = (0, 1); 540 my ($x, $y) = (0, 1);
501 for ( 541 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) = @$_; 542 my ($idx, $name) = @$_;
508 543
509 my $spell_cb = sub { 544 my $spell_cb = sub {
510 my ($widget, $ev) = @_; 545 my ($widget, $ev) = @_;
511 546
512 if ($ev->{button} == 1) { 547 if ($ev->{button} == 1) {
513 $::CONN->user_send ("ready_skill $name"); 548 $::CONN->user_send ("ready_skill $name");
514 } elsif ($ev->{button} == 2) { 549 } elsif ($ev->{button} == 2) {
515 $::CONN->user_send ("use_skill $name"); 550 $::CONN->user_send ("use_skill $name");
516 } elsif ($ev->{button} == 3) { 551 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14; 552 my $shortname = DC::shorten $name, 14;
518 (new CFPlus::UI::Menu 553 (new DC::UI::Menu
519 items => [ 554 items => [
520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 555 ["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"] }], 556 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
522 ], 557 ],
523 )->popup ($ev); 558 )->popup ($ev);
524 } else { 559 } else {
525 return 0; 560 return 0;
526 } 561 }
… …
528 1 563 1
529 }; 564 };
530 565
531 my $sw = $self->{skillwid}{$idx} ||= [ 566 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp 567 # exp
533 (new CFPlus::UI::Label 568 (new DC::UI::Label
534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
535 570
536 # level 571 # level
537 (new CFPlus::UI::Label 572 (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), 573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539 574
540 # progress 575 # progress
541 (new CFPlus::UI::ExperienceProgress), 576 (new DC::UI::ExperienceProgress),
542 577
543 # label 578 # label
544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ]; 581 ];
547 582
548 push @add, 583 push @add,
549 $x * 4 + 0, $y, $sw->[0], 584 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1], 585 $x * 4 + 1, $y, $sw->[1],
… …
556 } 591 }
557 592
558 $sktbl->add_at (@add); 593 $sktbl->add_at (@add);
559 } 594 }
560 595
561 for (grep exists $stats->{$_}, @skills) { 596 for (@order) {
597 my ($idx, $name) = @$_;
598 my $val = $stats->{$idx};
599
600 next if $prev->{$idx}[1] eq $val->[1];
601
562 my $sw = $self->{skillwid}{$_}; 602 my $sw = $self->{skillwid}{$idx};
563 $sw->[0]->set_text (::formsep ($stats->{$_}[1])); 603 $sw->[0]->set_text (::formsep ($val->[1]));
564 $sw->[1]->set_text ($stats->{$_}[0] * 1); 604 $sw->[1]->set_text ($val->[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}}); 605 $sw->[2]->set_value (@$val);
566 }
567}
568 606
569sub macro_send { 607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
570 my ($self, $macro) = @_; 608 $::GAUGES->{sklprg}->set_value (@$val);
571
572 for my $cmd (@{ $macro->{action} }) {
573 $self->send_command ($cmd);
574 } 609 }
575} 610}
576 611
577sub user_send { 612sub user_send {
578 my ($self, $command) = @_; 613 my ($self, $command) = @_;
… …
580 $self->{record}->($command) 615 $self->{record}->($command)
581 if $self->{record}; 616 if $self->{record};
582 617
583 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
584 $self->send_command ($command); 619 $self->send_command ($command);
585 ::status ($command);
586} 620}
587 621
588sub record { 622sub record {
589 my ($self, $cb) = @_; 623 my ($self, $cb) = @_;
590 624
… …
621 } 655 }
622 } 656 }
623 657
624 if ($delay) { 658 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched 659 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub { 660 EV::once undef, 0, 0.03, sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update; 661 $self->{map_widget}->update
662 if $self->{map_widget};
629 }); 663 };
630 } else { 664 } else {
631 $self->{map_widget}->update; 665 $self->{map_widget}->update;
632 } 666 }
633} 667}
634 668
… …
646 680
647 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
648 682
649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 683 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
650 $self->{map_cache_new}{$hash} = \$data; 684 $self->{map_cache_new}{$hash} = \$data;
651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
652} 686}
653 687
654sub map_clear { 688sub map_clear {
655 my ($self) = @_; 689 my ($self) = @_;
656 690
… …
669 do { 703 do {
670 $tile = pop @{$self->{bg_fetch}} 704 $tile = pop @{$self->{bg_fetch}}
671 or return; 705 or return;
672 } while $self->{texture}[$tile]; 706 } while $self->{texture}[$tile];
673 707
674 CFPlus::DB::get tilecache => $tile, sub { 708 DC::DB::get tilecache => $tile, sub {
675 my ($data) = @_; 709 my ($data) = @_;
676 710
677 return unless $self->{map}; # stop when destroyed 711 return unless $self->{map}; # stop when destroyed
678 712
679 if (defined $data) { 713 if (defined $data) {
… …
707 }; 741 };
708 742
709 if (my $rdata = $self->{map_cache_old}{$hash}) { 743 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata); 744 $cb->($$rdata);
711 } else { 745 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 746 DC::DB::get $self->{mapcache} => $hash, $cb;
713 } 747 }
714} 748}
715 749
716# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
717# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
… …
841 875
842sub face_find { 876sub face_find {
843 my ($self, $facenum, $face, $cb) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
844 878
845 if ($face->{type} == 0) { # FT_FACE 879 if ($face->{type} == 0) { # FT_FACE
846 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 880 my $id = DC::DB::get_tile_id_sync $face->{name};
847 881
848 $face->{id} = $id; 882 $face->{id} = $id;
849 $self->{map}->set_tileid ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
850 884
851 CFPlus::DB::get tilecache => $id, $cb; 885 DC::DB::get tilecache => $id, $cb;
852 886
853 } elsif ($face->{type} & 1) { # with metadata 887 } elsif ($face->{type} & 1) { # with metadata
854 CFPlus::DB::get res_meta => $face->{name}, $cb; 888 DC::DB::get res_meta => $face->{name}, $cb;
855 889
856 } else { # no metadata 890 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb; 891 DC::DB::get res_data => $face->{name}, $cb;
858 } 892 }
859} 893}
860 894
861sub face_update { 895sub face_update {
862 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
863 897
864 if ($face->{type} == 0) { 898 if ($face->{type} == 0) {
865 # image, FT_FACE 899 # image, FT_FACE
866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
867 if $changed; 901 if $changed;
868 902
869 $self->have_tile ($face->{id}, delete $face->{data}); 903 $self->have_tile ($face->{id}, delete $face->{data});
870 904
871 } elsif ($face->{type} & 1) { 905 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND 906 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data 907 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta; 909 $face->{data} = $meta;
876 910
911 # rely on strict ordering here and also on later fetch
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 912 DC::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
879 } 914 }
880 915
881 $face->{data} = $self->{json_coder}->decode ($face->{data}); 916 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face); 917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
884 920
885 if ($face->{type} == 3) { # FT_MUSIC 921 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum); 922 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND 923 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum); 924 &::audio_sound_push ($facenum);
895 } 925 }
896 926
897 } else { 927 } else {
898 # flat resource case, FT_RSRC 928 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed; 930 if $changed;
901 } 931 }
902 932
903 if (my $cbs = $self->{face_cb}{$facenum}) { 933 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs; 934 $_->($face, $changed) for @$cbs;
… …
915 my ($self, $tile, $data) = @_; 945 my ($self, $tile, $data) = @_;
916 946
917 return unless $self->{map}; 947 return unless $self->{map};
918 948
919 my $tex = $self->{texture}[$tile] ||= 949 my $tex = $self->{texture}[$tile] ||=
920 new CFPlus::Texture 950 new DC::Texture
921 tile => $tile, 951 tile => $tile,
922 image => $data, delete_image => 1, 952 image => $data, delete_image => 1,
923 minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
924 954
925 if (my $cbs = delete $self->{tile_cb}{$tile}) { 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
933 my ($self, $num, $cb) = @_; 963 my ($self, $num, $cb) = @_;
934 964
935 push @{$self->{face_cb}{$num}}, $cb; 965 push @{$self->{face_cb}{$num}}, $cb;
936 966
937 defined wantarray 967 defined wantarray
938 ? CFPlus::guard { 968 ? DC::guard {
939 @{$self->{face_cb}{$num}} 969 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb, 970 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}}; 971 @{$self->{face_cb}{$num}};
942 } 972 }
943 : () 973 : ()
… …
978 1008
979sub sanitise_xml($) { 1009sub sanitise_xml($) {
980 local $_ = shift; 1010 local $_ = shift;
981 1011
982 # we now weed out all tags we do not support 1012 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1013 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1014 }{
1015 "&lt;"
1016 }gex;
1017
984 # now all entities 1018 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1019 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986 1020
987 # handle some elements 1021 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1041 1075
1042 ## try to create single paragraphs of multiple lines sent by the server 1076 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers 1077 # no longer neecssary with TRT servers
1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1045 1079
1080 for (split /\n/, $text) {
1046 ::message ({ 1081 ::message ({
1047 fg => $fg, 1082 fg => $fg,
1048 markup => $_, 1083 markup => $_,
1049 type => $type, 1084 type => $type,
1050 extra => [@extra], 1085 extra => [@extra],
1051 color_flags => $color 1086 color_flags => $color, #d# ugly, kill
1052 }) for split /\n/, $text; 1087 });
1088
1089 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1090 # actually, this is an ugly design. _we_ should control the channels,
1091 # not some random other widget, as the channels are clearly protocol-specific.
1092 # then we could also react to flags such as CLEAR without resorting to
1093 # hacks such as color_flags, above.
1094 }
1053 1095
1054 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
1055 group => $text, 1097 group => $text,
1056 fg => $fg, 1098 fg => $fg,
1057 timeout => $color >= 2 ? 180 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
1058 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
1059 ); 1101 ) if $type eq "info";
1060 } 1102 }
1061} 1103}
1062 1104
1063sub spell_add { 1105sub spell_add {
1064 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
… …
1068 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1112
1071 $::SPELL_LIST->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
1072 1114
1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1115 $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}); 1116 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1075} 1117}
1076 1118
1077sub spell_delete { 1119sub spell_delete {
1078 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
1079 1121
… …
1090sub addme_success { 1132sub addme_success {
1091 my ($self) = @_; 1133 my ($self) = @_;
1092 1134
1093 my %skill_help; 1135 my %skill_help;
1094 1136
1095 for my $node (CFPlus::Pod::find skill_description => "*") { 1137 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = CFPlus::Pod::section_of $node; 1138 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1098 }; 1140 };
1099 1141
1100 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1145 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
1105 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1148 . $skill_help{$skill});
1107 } 1149 }
1108} 1150}
1109 1151
1110sub eof { 1152sub eof {
… …
1114 1156
1115 ::stop_game (); 1157 ::stop_game ();
1116} 1158}
1117 1159
1118sub update_floorbox { 1160sub update_floorbox {
1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1162 return unless $::CONN;
1121 1163
1122 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
1123 1165
1124 my @add; 1166 my @add;
… …
1126 my $row; 1168 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1169 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1128 if ($row < 6) { 1170 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
1131 CFPlus::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
1132 1174
1133 push @add, 1175 push @add,
1134 0, $row, $_->{face_widget}, 1176 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1177 1, $row, $_->{desc_widget};
1136 1178
1137 $row++; 1179 $row++;
1138 } else { 1180 } else {
1139 push @add, 1, $row, new CFPlus::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1182 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1184 ;
1143 last; 1185 last;
1144 } 1186 }
1145 } 1187 }
1146 if ($::CONN->{open_container}) { 1188 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new CFPlus::UI::Button 1189 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1190 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1192 ;
1151 } 1193 }
1152 1194
1153 $::FLOORBOX->add_at (@add); 1195 $::FLOORBOX->add_at (@add);
1154 }); 1196 });
1155 1197
1156 $::WANT_REFRESH->start; 1198 $::WANT_REFRESH = 1;
1157} 1199}
1158 1200
1159sub set_opencont { 1201sub set_opencont {
1160 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1162 update_floorbox; 1204 update_floorbox;
1163 1205
1164 $::INVR_HB->clear (); 1206 $::INVR_HB->clear ();
1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1207 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1166 1208
1167 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new CFPlus::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1211 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1213 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1215 if $tag != 0;
… …
1180} 1222}
1181 1223
1182sub update_containers { 1224sub update_containers {
1183 my ($self) = @_; 1225 my ($self) = @_;
1184 1226
1185 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
1187 or return; 1229 or return;
1188 1230
1189 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1227sub item_update { 1269sub item_update {
1228 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
1229 1271
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1272 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1231 1273
1232 CFPlus::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
1233 1275
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
1236 1278
1237 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1281
1240 } else { 1282 } else {
1241 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1284 $self->update_containers;
1243 } 1285 }
… …
1302 0 1344 0
1303 }); 1345 });
1304 1346
1305 $self->update_server_info; 1347 $self->update_server_info;
1306 1348
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; 1349 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1310 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
1311} 1351}
1312 1352
1313sub lookat { 1353sub lookat {
… …
1317 $self->send_ext_req (lookat => $x, $y, sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
1318 my (%msg) = @_; 1358 my (%msg) = @_;
1319 1359
1320 if (exists $msg{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
1321 # start npc chat dialog 1361 # start npc chat dialog
1322 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
1323 token => $msg{npc_dialog}, 1363 token => $msg{npc_dialog},
1324 title => "$msg{npc_dialog}[0] (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
1325 conn => $self, 1365 conn => $self,
1326 ; 1366 ;
1327 } 1367 }
… …
1340 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1341 1381
1342 %$self = (); 1382 %$self = ();
1343} 1383}
1344 1384
1345package CFPlus::NPCDialog; 1385package DC::NPCDialog;
1346 1386
1347our @ISA = 'CFPlus::UI::Toplevel'; 1387our @ISA = 'DC::UI::Toplevel';
1348 1388
1349sub new { 1389sub new {
1350 my $class = shift; 1390 my $class = shift;
1351 1391
1352 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
1359 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1360 has_close_button => 1, 1400 has_close_button => 1,
1361 @_, 1401 @_,
1362 ); 1402 );
1363 1403
1364 CFPlus::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1365 1405
1366 $self->connect (delete => sub { $this->destroy; 1 }); 1406 $self->connect (delete => sub { $this->destroy; 1 });
1367 1407
1368 # better use a pane... 1408 # better use a pane...
1369 $self->add (my $hbox = new CFPlus::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
1370 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1371 1411
1372 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
1373 1413
1374 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
1375 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
1376 tooltip => "#npc_message_entry", 1416 tooltip => "#npc_message_entry",
1377 on_activate => sub { 1417 on_activate => sub {
1378 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
1379 1419
1380 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
… …
1384 1424
1385 0 1425 0
1386 }, 1426 },
1387 ); 1427 );
1388 1428
1389 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
1390 1430
1391 $self->{bye_button} = new CFPlus::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
1392 text => "Bye (close)", 1432 text => "Bye (close)",
1393 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1433 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1394 on_activate => sub { $this->destroy; 1 }, 1434 on_activate => sub { $this->destroy; 1 },
1395 ; 1435 ;
1396 1436
… …
1415}; 1455};
1416 1456
1417sub update_options { 1457sub update_options {
1418 my ($self) = @_; 1458 my ($self) = @_;
1419 1459
1420 CFPlus::weaken $self; 1460 DC::weaken $self;
1421 1461
1422 $self->{options}->clear; 1462 $self->{options}->clear;
1423 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
1424 1464
1425 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
1426 $self->{options}->add (new CFPlus::UI::Button 1466 $self->{options}->add (new DC::UI::Button
1427 text => $kw, 1467 text => $kw,
1428 on_activate => sub { 1468 on_activate => sub {
1429 $self->send ($kw); 1469 $self->send ($kw);
1430 0 1470 0
1431 }, 1471 },
… …
1434} 1474}
1435 1475
1436sub feed { 1476sub feed {
1437 my ($self, $type, @arg) = @_; 1477 my ($self, $type, @arg) = @_;
1438 1478
1439 CFPlus::weaken $self; 1479 DC::weaken $self;
1440 1480
1441 if ($type eq "update") { 1481 if ($type eq "update") {
1442 my (%info) = @arg; 1482 my (%info) = @arg;
1443 1483
1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1446 1486
1447 if (exists $info{msg}) { 1487 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1488 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} }; 1489 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link; 1490 my @link;
1451 $text =~ s{ 1491 $text =~ s{
1452 ($match) 1492 ($match)
1453 }{ 1493 }{
1454 my $kw = $1; 1494 my $kw = $1;
1455 1495
1456 push @link, new CFPlus::UI::Label 1496 push @link, new DC::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1, 1498 can_hover => 1,
1459 can_events => 1, 1499 can_events => 1,
1460 padding_x => 0, 1500 padding_x => 0,
1461 padding_y => 0, 1501 padding_y => 0,
… …
1479} 1519}
1480 1520
1481sub send { 1521sub send {
1482 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1483 1523
1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1485 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1486 1526
1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1488} 1528}
1489 1529

Diff Legend

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