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.156 by root, Tue Aug 21 00:59:34 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
72 #TODO: update all interested parties
73 });
74
75 ()
76 });
77
78 if (my $ts = $cap{tileset}) {
79 if (my ($default) = grep $_->[2] & 1, @$ts) {
80 $self->{tileset} = $default;
81 $self->{tilesize} = $default->[3];
82 $self->setup_req (tileset => $default->[0]);
83
84 my $w = int $self->{mapw} * 32 / $self->{tilesize};
85 my $h = int $self->{maph} * 32 / $self->{tilesize};
86
87 $self->setup_req (mapsize => "${w}x${h}");
88 }
89 }
90 });
91 50
92 $self->{json_coder} 51 $self->{json_coder}
93 ->convert_blessed 52 ->convert_blessed
94 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
95 $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 }
96 }); 61 });
97
98 # widgetset new
99 $self->connect_ext (ws_n => sub {
100 my ($id) = @_;
101
102 $self->{widgetset}{$id} = {
103 w => {},
104 };
105 });
106
107 # widgetset destroy
108 $self->connect_ext (ws_d => sub {
109 my ($id) = @_;
110
111 my $ws = delete $self->{widgetset}{$id}
112 or return;
113
114 $_->destroy
115 for values %{$ws->{w}};
116 });
117
118 # widgetset create
119 $self->connect_ext (ws_c => sub {
120 my ($ws, $id, $class, $args) = @_;
121
122 for my $ev (grep /^on_/, keys %$args) {
123 my $rid = $args->{$ev};
124 $args->{$ev} = sub {
125 my $id = shift->{s_id};
126 $self->send_exti_msg (w_e => $id, $rid, @_);
127
128 1
129 };
130 }
131
132 $self->widget_associate (
133 $ws, $id => scalar eval {
134 local $SIG{__DIE__};
135 "CFPlus::UI::$class"->new (%$args)
136 }
137 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 });
139
140 # widgetset associate
141 $self->connect_ext (ws_a => sub {
142 my (%ass) = @_;
143
144 # everything that has a name, wether conceivably useful or not
145 my %wkw = (
146 root => $CFPlus::UI::ROOT,
147 tooltip => $CFPlus::UI::TOOLTIP,
148
149 mapwidget => $::MAPWIDGET,
150 buttonbar => $::BUTTONBAR,
151 metaserver => $::METASERVER,
152 buttonbar => $::BUTTONBAR,
153 login_button => $::LOGIN_BUTTON,
154 quit_dialog => $::QUIT_DIALOG,
155 host_entry => $::HOST_ENTRY,
156 metaserver => $::METASERVER,
157 server_info => $::SERVER_INFO,
158
159 setup_dialog => $::SETUP_DIALOG,
160 setup_notebook => $::SETUP_NOTEBOOK,
161 setup_server => $::SETUP_SERVER,
162 setup_keyboard => $::SETUP_KEYBOARD,
163
164 pl_notebook => $::PL_NOTEBOOK,
165 pl_window => $::PL_WINDOW,
166 inventory_page => $::INVENTORY_PAGE,
167 stats_page => $::STATS_PAGE,
168 skill_page => $::SKILL_PAGE,
169 spell_page => $::SPELL_PAGE,
170 spell_list => $::SPELL_LIST,
171
172 floorbox => $::FLOORBOX,
173 help_window => $::HELP_WINDOW,
174 message_window => $::MESSAGE_WINDOW,
175 statusbox => $::SDTATUSBOX,
176
177 inv => $::INV,
178 invr => $::INVR,
179 invr_hb => $::INVR_HB,
180
181 );
182
183 while (my ($id, $name) = each %ass) {
184 $self->widget_associate (undef, $id => $wkw{$name})
185 or warn "server failed to associate non-existent well-known widget $name\n";
186 }
187 });
188
189 # widget call
190 $self->connect_ext (w_c => sub {
191 my ($id, $rid, $method, @args) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 if ($rid) {
197 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
198 } else {
199 $w->$method (@args);
200 }
201 });
202
203 # widget set
204 $self->connect_ext (w_s => sub {
205 my ($id, $attr) = @_;
206
207 my $w = $self->{widget}{$id}
208 or return;
209
210 for (my $i = 0; $i < $#$attr; $i += 2) {
211 my ($member, $value) = @$attr[$i, $i+1];
212 if (defined $value) {
213 $w->{$member} = $value;
214 } else {
215 delete $w->{$member};
216 }
217 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
218 }
219 });
220
221 # widget get
222 $self->connect_ext (w_g => sub {
223 my ($id, $rid, $attr) = @_;
224
225 my $w = $self->{widget}{$id}
226 or return;
227
228 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
229 });
230
231 # message window
232 $self->connect_ext (channel_info => sub {
233 my ($info) = @_;
234 $self->{channels}->{$info->{id}} = $info;
235 $::MESSAGE_WINDOW->add_channel ($info);
236 });
237 62
238 # destroy widgets on logout 63 # destroy widgets on logout
239 $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 {
240 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
241 $_->destroy 66 $_->destroy
… …
245 70
246 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
247 for @cmd_help; 72 for @cmd_help;
248 73
249 { 74 {
250 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
251 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
252 $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}});
253 } 78 }
254 79
255 { 80 {
256 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
257 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
258 $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}});
259 } 84 }
260 85
261 $self->{open_container} = 0; 86 $self->{open_container} = 0;
262 87
263 # per server 88 # per server
264 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
265 90
266 $self 91 $self
267}
268
269sub widget_associate {
270 my ($self, $ws, $id, $widget) = @_;
271
272 if ($widget) {
273 $widget->{s_id} = $id;
274 $self->{widget}{$id} = $widget;
275
276 if ($ws) {
277 $widget->{s_ws} = $ws;
278 $self->{widgetset}{$ws}{w}{$id} = $widget;
279 }
280
281 $widget->connect (on_destroy => sub {
282 my ($widget) = @_;
283
284 delete $self->{widget}{$widget->{s_id}};
285 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
286 if exists $widget->{s_ws};
287 });
288
289 1
290 } else {
291 $self->send_exti_msg (w_e => $id, undef);
292
293 0
294 }
295} 92}
296 93
297sub update_fx_want { 94sub update_fx_want {
298 my ($self) = @_; 95 my ($self) = @_;
299 96
… …
302 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
303 6 => 1, # FT_RSRC 100 6 => 1, # FT_RSRC
304 }); 101 });
305} 102}
306 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
307sub logprint { 338sub logprint {
308 my ($self, @a) = @_; 339 my ($self, @a) = @_;
309 340
310 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
311} 342}
312 343
313sub _stat_numdiff { 344sub _stat_numdiff {
314 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
315 346
… …
399 430
400 if ( 431 if (
401 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
402 ) { 433 ) {
403 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
404 $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);
405 } 436 }
406 437
407 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
408 439
409 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
448 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 479 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
449 $::GAUGES->{food} ->set_value ($fo, $fo_m); 480 $::GAUGES->{food} ->set_value ($fo, $fo_m);
450 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 481 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
451 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 482 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
452 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 483 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
484 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
453 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 485 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
454 my $title = $stats->{+CS_STAT_TITLE}; 486 my $title = $stats->{+CS_STAT_TITLE};
455 $title =~ s/^Player: //; 487 $title =~ s/^Player: //;
456 $::STATWIDS->{title} ->set_text ("Title: " . $title); 488 $::STATWIDS->{title} ->set_text ("Title: " . $title);
457 489
… …
475 for keys %RES_TBL; 507 for keys %RES_TBL;
476 508
477 my $sktbl = $::STATWIDS->{skill_tbl}; 509 my $sktbl = $::STATWIDS->{skill_tbl};
478 my @skills = keys %{ $self->{skill_info} }; 510 my @skills = keys %{ $self->{skill_info} };
479 511
480 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
481 $sktbl->clear; 520 $sktbl->clear;
482 521
483 my @add; 522 my $sw = $self->{skillwid}{""} ||= [
484
485 push @add,
486 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
487 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
488 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
489 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
490 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
491 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
492 ; 531 ];
532
533 my @add = @$sw;
493 534
494 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>";
495 536
496 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);
497 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);
498 539
499 my ($x, $y) = (0, 1); 540 my ($x, $y) = (0, 1);
500 for ( 541 for (@order) {
501 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
502 map [$_, $self->{skill_info}{$_}],
503 grep exists $stats->{$_},
504 @skills
505 ) {
506 my ($idx, $name) = @$_; 542 my ($idx, $name) = @$_;
507 543
508 my $spell_cb = sub { 544 my $spell_cb = sub {
509 my ($widget, $ev) = @_; 545 my ($widget, $ev) = @_;
510 546
511 if ($ev->{button} == 1) { 547 if ($ev->{button} == 1) {
512 $::CONN->user_send ("ready_skill $name"); 548 $::CONN->user_send ("ready_skill $name");
513 } elsif ($ev->{button} == 2) { 549 } elsif ($ev->{button} == 2) {
514 $::CONN->user_send ("use_skill $name"); 550 $::CONN->user_send ("use_skill $name");
515 } elsif ($ev->{button} == 3) { 551 } elsif ($ev->{button} == 3) {
516 my $shortname = CFPlus::shorten $name, 14; 552 my $shortname = DC::shorten $name, 14;
517 (new CFPlus::UI::Menu 553 (new DC::UI::Menu
518 items => [ 554 items => [
519 ["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"] }],
520 ["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"] }],
521 ], 557 ],
522 )->popup ($ev); 558 )->popup ($ev);
523 } else { 559 } else {
524 return 0; 560 return 0;
525 } 561 }
526 562
527 1 563 1
528 }; 564 };
529 565
566 my $sw = $self->{skillwid}{$idx} ||= [
567 # exp
568 (new DC::UI::Label
569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
570
571 # level
572 (new DC::UI::Label
573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
574
575 # progress
576 (new DC::UI::ExperienceProgress),
577
578 # label
579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
581 ];
582
530 push @add, 583 push @add,
531 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 584 $x * 4 + 0, $y, $sw->[0],
532 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 585 $x * 4 + 1, $y, $sw->[1],
533 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 586 $x * 4 + 2, $y, $sw->[2],
534 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 587 $x * 4 + 3, $y, $sw->[3],
535 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
536 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
537 ; 588 ;
538 589
539 $x++ and ($x, $y) = (0, $y + 1); 590 $x++ and ($x, $y) = (0, $y + 1);
540 } 591 }
541 592
542 $sktbl->add_at (@add); 593 $sktbl->add_at (@add);
543 } 594 }
544 595
545 for (grep exists $stats->{$_}, @skills) { 596 for (@order) {
546 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 597 my ($idx, $name) = @$_;
547 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 598 my $val = $stats->{$idx};
548 }
549}
550 599
551sub macro_send { 600 next if $prev->{$idx}[1] eq $val->[1];
552 my ($self, $macro) = @_;
553 601
554 for my $cmd (@{ $macro->{action} }) { 602 my $sw = $self->{skillwid}{$idx};
555 $self->send_command ($cmd); 603 $sw->[0]->set_text (::formsep ($val->[1]));
604 $sw->[1]->set_text ($val->[0] * 1);
605 $sw->[2]->set_value (@$val);
606
607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
608 $::GAUGES->{sklprg}->set_value (@$val);
556 } 609 }
557} 610}
558 611
559sub user_send { 612sub user_send {
560 my ($self, $command) = @_; 613 my ($self, $command) = @_;
… …
562 $self->{record}->($command) 615 $self->{record}->($command)
563 if $self->{record}; 616 if $self->{record};
564 617
565 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
566 $self->send_command ($command); 619 $self->send_command ($command);
567 ::status ($command);
568} 620}
569 621
570sub record { 622sub record {
571 my ($self, $cb) = @_; 623 my ($self, $cb) = @_;
572 624
… …
603 } 655 }
604 } 656 }
605 657
606 if ($delay) { 658 if ($delay) {
607 # 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
608 Event->timer (after => 0.03, cb => sub { 660 EV::once undef, 0, 0.03, sub {
609 $_[0]->w->cancel;
610 $self->{map_widget}->update; 661 $self->{map_widget}->update
662 if $self->{map_widget};
611 }); 663 };
612 } else { 664 } else {
613 $self->{map_widget}->update; 665 $self->{map_widget}->update;
614 } 666 }
615} 667}
616 668
… …
628 680
629 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
630 682
631 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);
632 $self->{map_cache_new}{$hash} = \$data; 684 $self->{map_cache_new}{$hash} = \$data;
633 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
634} 686}
635 687
636sub map_clear { 688sub map_clear {
637 my ($self) = @_; 689 my ($self) = @_;
638 690
… …
651 do { 703 do {
652 $tile = pop @{$self->{bg_fetch}} 704 $tile = pop @{$self->{bg_fetch}}
653 or return; 705 or return;
654 } while $self->{texture}[$tile]; 706 } while $self->{texture}[$tile];
655 707
656 CFPlus::DB::get tilecache => $tile, sub { 708 DC::DB::get tilecache => $tile, sub {
657 my ($data) = @_; 709 my ($data) = @_;
658 710
659 return unless $self->{map}; # stop when destroyed 711 return unless $self->{map}; # stop when destroyed
660 712
661 if (defined $data) { 713 if (defined $data) {
… …
689 }; 741 };
690 742
691 if (my $rdata = $self->{map_cache_old}{$hash}) { 743 if (my $rdata = $self->{map_cache_old}{$hash}) {
692 $cb->($$rdata); 744 $cb->($$rdata);
693 } else { 745 } else {
694 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 746 DC::DB::get $self->{mapcache} => $hash, $cb;
695 } 747 }
696} 748}
697 749
698# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
699# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
… …
823 875
824sub face_find { 876sub face_find {
825 my ($self, $facenum, $face, $cb) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
826 878
827 if ($face->{type} == 0) { # FT_FACE 879 if ($face->{type} == 0) { # FT_FACE
828 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 880 my $id = DC::DB::get_tile_id_sync $face->{name};
829 881
830 $face->{id} = $id; 882 $face->{id} = $id;
831 $self->{map}->set_tileid ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
832 884
833 CFPlus::DB::get tilecache => $id, $cb; 885 DC::DB::get tilecache => $id, $cb;
834 886
835 } elsif ($face->{type} & 1) { # with metadata 887 } elsif ($face->{type} & 1) { # with metadata
836 CFPlus::DB::get res_meta => $face->{name}, $cb; 888 DC::DB::get res_meta => $face->{name}, $cb;
837 889
838 } else { # no metadata 890 } else { # no metadata
839 CFPlus::DB::get res_data => $face->{name}, $cb; 891 DC::DB::get res_data => $face->{name}, $cb;
840 } 892 }
841} 893}
842 894
843sub face_update { 895sub face_update {
844 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
845 897
846 if ($face->{type} == 0) { 898 if ($face->{type} == 0) {
847 # image, FT_FACE 899 # image, FT_FACE
848 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
849 if $changed; 901 if $changed;
850 902
851 $self->have_tile ($face->{id}, delete $face->{data}); 903 $self->have_tile ($face->{id}, delete $face->{data});
852 904
853 } elsif ($face->{type} & 1) { 905 } elsif ($face->{type} & 1) {
854 # split metadata case, FT_MUSIC, FT_SOUND 906 # split metadata case, FT_MUSIC, FT_SOUND
855 if ($changed) { # new data 907 if ($changed) { # new data
856 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
857 $face->{data} = $meta; 909 $face->{data} = $meta;
858 910
911 # rely on strict ordering here and also on later fetch
859 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 912 DC::DB::put res_data => $face->{name} => $data, sub { };
860 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
861 } 914 }
862 915
863 $face->{data} = $self->{json_coder}->decode ($face->{data}); 916 $face->{data} = $self->{json_coder}->decode ($face->{data});
864
865 ::add_license ($face); 917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
866 920
867 if ($face->{type} == 3) { # FT_MUSIC 921 if ($face->{type} == 3) { # FT_MUSIC
868 ::message ({ markup => "downloaded song #$facenum" })
869 if $changed;
870
871 &::audio_music_push ($facenum); 922 &::audio_music_push ($facenum);
872 } elsif ($face->{type} == 5) { # FT_SOUND 923 } elsif ($face->{type} == 5) { # FT_SOUND
873 ::message ({ markup => "downloaded sound #$facenum" })
874 if $changed;
875
876 &::audio_sound_push ($facenum); 924 &::audio_sound_push ($facenum);
877 } 925 }
878 926
879 } else { 927 } else {
880 # flat resource case, FT_RSRC 928 # flat resource case, FT_RSRC
881 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
882 if $changed; 930 if $changed;
883 } 931 }
884 932
885 if (my $cbs = $self->{face_cb}{$facenum}) { 933 if (my $cbs = $self->{face_cb}{$facenum}) {
886 $_->($face, $changed) for @$cbs; 934 $_->($face, $changed) for @$cbs;
… …
897 my ($self, $tile, $data) = @_; 945 my ($self, $tile, $data) = @_;
898 946
899 return unless $self->{map}; 947 return unless $self->{map};
900 948
901 my $tex = $self->{texture}[$tile] ||= 949 my $tex = $self->{texture}[$tile] ||=
902 new CFPlus::Texture 950 new DC::Texture
903 tile => $tile, 951 tile => $tile,
904 image => $data, delete_image => 1, 952 image => $data, delete_image => 1,
905 minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
906 954
907 if (my $cbs = delete $self->{tile_cb}{$tile}) { 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
915 my ($self, $num, $cb) = @_; 963 my ($self, $num, $cb) = @_;
916 964
917 push @{$self->{face_cb}{$num}}, $cb; 965 push @{$self->{face_cb}{$num}}, $cb;
918 966
919 defined wantarray 967 defined wantarray
920 ? CFPlus::guard { 968 ? DC::guard {
921 @{$self->{face_cb}{$num}} 969 @{$self->{face_cb}{$num}}
922 = grep $_ != $cb, 970 = grep $_ != $cb,
923 @{$self->{face_cb}{$num}}; 971 @{$self->{face_cb}{$num}};
924 } 972 }
925 : () 973 : ()
… …
928# call in non-void context registers a temporary 976# call in non-void context registers a temporary
929# hook with handle, otherwise its permanent 977# hook with handle, otherwise its permanent
930sub register_face_handler { 978sub register_face_handler {
931 my ($self, $num, $cb) = @_; 979 my ($self, $num, $cb) = @_;
932 980
981 return unless $num;
982
933 # invoke if available right now 983 # invoke if available right now
934 $cb->($self->{face}[$num], 0) 984 $cb->($self->{face}[$num], 0)
935 unless exists $self->{face}[$num]{loading}; 985 unless exists $self->{face}[$num]{loading};
936 986
937 # future changes 987 # future changes
… …
958 1008
959sub sanitise_xml($) { 1009sub sanitise_xml($) {
960 local $_ = shift; 1010 local $_ = shift;
961 1011
962 # we now weed out all tags we do not support 1012 # we now weed out all tags we do not support
963 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
964 # now all entities 1018 # now all entities
965 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;
966 1020
967 # handle some elements 1021 # handle some elements
968 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1021 1075
1022 ## 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
1023 # no longer neecssary with TRT servers 1077 # no longer neecssary with TRT servers
1024 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1025 1079
1080 for (split /\n/, $text) {
1026 ::message ({ 1081 ::message ({
1027 fg => $fg, 1082 fg => $fg,
1028 markup => $_, 1083 markup => $_,
1029 type => $type, 1084 type => $type,
1030 extra => [@extra], 1085 extra => [@extra],
1031 color_flags => $color 1086 color_flags => $color, #d# ugly, kill
1032 }) 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 }
1033 1095
1034 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
1035 group => $text, 1097 group => $text,
1036 fg => $fg, 1098 fg => $fg,
1037 timeout => $color >= 2 ? 180 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
1038 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
1039 ); 1101 ) if $type eq "info";
1040 } 1102 }
1041} 1103}
1042 1104
1043sub spell_add { 1105sub spell_add {
1044 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
… …
1048 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
1049 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
1050 1112
1051 $::SPELL_LIST->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
1052 1114
1053 $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});
1054 $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});
1055} 1117}
1056 1118
1057sub spell_delete { 1119sub spell_delete {
1058 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
1059 1121
… …
1070sub addme_success { 1132sub addme_success {
1071 my ($self) = @_; 1133 my ($self) = @_;
1072 1134
1073 my %skill_help; 1135 my %skill_help;
1074 1136
1075 for my $node (CFPlus::Pod::find skill_description => "*") { 1137 for my $node (DC::Pod::find skill_description => "*") {
1076 my (undef, @par) = CFPlus::Pod::section_of $node; 1138 my (undef, @par) = DC::Pod::section_of $node;
1077 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1078 }; 1140 };
1079 1141
1080 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
1081 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
1082 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
1083 . $skill_help{$skill}); 1145 . $skill_help{$skill});
1084 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
1085 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
1086 . $skill_help{$skill}); 1148 . $skill_help{$skill});
1087 } 1149 }
1088} 1150}
1089 1151
1090sub eof { 1152sub eof {
… …
1094 1156
1095 ::stop_game (); 1157 ::stop_game ();
1096} 1158}
1097 1159
1098sub update_floorbox { 1160sub update_floorbox {
1099 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1100 return unless $::CONN; 1162 return unless $::CONN;
1101 1163
1102 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
1103 1165
1104 my @add; 1166 my @add;
… …
1106 my $row; 1168 my $row;
1107 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} }) {
1108 if ($row < 6) { 1170 if ($row < 6) {
1109 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
1110 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
1111 CFPlus::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
1112 1174
1113 push @add, 1175 push @add,
1114 0, $row, $_->{face_widget}, 1176 0, $row, $_->{face_widget},
1115 1, $row, $_->{desc_widget}; 1177 1, $row, $_->{desc_widget};
1116 1178
1117 $row++; 1179 $row++;
1118 } else { 1180 } else {
1119 push @add, 1, $row, new CFPlus::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
1120 text => "More...", 1182 text => "More...",
1121 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1122 ; 1184 ;
1123 last; 1185 last;
1124 } 1186 }
1125 } 1187 }
1126 if ($::CONN->{open_container}) { 1188 if ($::CONN->{open_container}) {
1127 push @add, 1, $row++, new CFPlus::UI::Button 1189 push @add, 1, $row++, new DC::UI::Button
1128 text => "Close container", 1190 text => "Close container",
1129 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1130 ; 1192 ;
1131 } 1193 }
1132 1194
1133 $::FLOORBOX->add_at (@add); 1195 $::FLOORBOX->add_at (@add);
1134 }); 1196 });
1135 1197
1136 $::WANT_REFRESH->start; 1198 $::WANT_REFRESH = 1;
1137} 1199}
1138 1200
1139sub set_opencont { 1201sub set_opencont {
1140 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
1141 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1142 update_floorbox; 1204 update_floorbox;
1143 1205
1144 $::INVR_HB->clear (); 1206 $::INVR_HB->clear ();
1145 $::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);
1146 1208
1147 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
1148 $::INVR_HB->add (new CFPlus::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
1149 text => "Close container", 1211 text => "Close container",
1150 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
1151 on_activate => sub { 1213 on_activate => sub {
1152 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1153 if $tag != 0; 1215 if $tag != 0;
… …
1160} 1222}
1161 1223
1162sub update_containers { 1224sub update_containers {
1163 my ($self) = @_; 1225 my ($self) = @_;
1164 1226
1165 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1166 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
1167 or return; 1229 or return;
1168 1230
1169 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1170 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1207sub item_update { 1269sub item_update {
1208 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
1209 1271
1210 #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";
1211 1273
1212 CFPlus::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
1213 1275
1214 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1215 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
1216 1278
1217 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
1218 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1219 1281
1220 } else { 1282 } else {
1221 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
1222 $self->update_containers; 1284 $self->update_containers;
1223 } 1285 }
… …
1282 0 1344 0
1283 }); 1345 });
1284 1346
1285 $self->update_server_info; 1347 $self->update_server_info;
1286 1348
1287 $self->send_command ("output-sync $::CFG->{output_sync}");
1288 $self->send_command ("output-count $::CFG->{output_count}");
1289 $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;
1290 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
1291} 1351}
1292 1352
1293sub lookat { 1353sub lookat {
… …
1297 $self->send_ext_req (lookat => $x, $y, sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
1298 my (%msg) = @_; 1358 my (%msg) = @_;
1299 1359
1300 if (exists $msg{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
1301 # start npc chat dialog 1361 # start npc chat dialog
1302 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
1303 token => $msg{npc_dialog}, 1363 token => $msg{npc_dialog},
1304 title => "$msg{npc_dialog}[0] (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
1305 conn => $self, 1365 conn => $self,
1306 ; 1366 ;
1307 } 1367 }
… …
1320 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1321 1381
1322 %$self = (); 1382 %$self = ();
1323} 1383}
1324 1384
1325package CFPlus::NPCDialog; 1385package DC::NPCDialog;
1326 1386
1327our @ISA = 'CFPlus::UI::Toplevel'; 1387our @ISA = 'DC::UI::Toplevel';
1328 1388
1329sub new { 1389sub new {
1330 my $class = shift; 1390 my $class = shift;
1331 1391
1332 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
1339 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1340 has_close_button => 1, 1400 has_close_button => 1,
1341 @_, 1401 @_,
1342 ); 1402 );
1343 1403
1344 CFPlus::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1345 1405
1346 $self->connect (delete => sub { $this->destroy; 1 }); 1406 $self->connect (delete => sub { $this->destroy; 1 });
1347 1407
1348 # better use a pane... 1408 # better use a pane...
1349 $self->add (my $hbox = new CFPlus::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
1350 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1351 1411
1352 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
1353 1413
1354 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
1355 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
1356 tooltip => "#npc_message_entry", 1416 tooltip => "#npc_message_entry",
1357 on_activate => sub { 1417 on_activate => sub {
1358 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
1359 1419
1360 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
… …
1364 1424
1365 0 1425 0
1366 }, 1426 },
1367 ); 1427 );
1368 1428
1369 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
1370 1430
1371 $self->{bye_button} = new CFPlus::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
1372 text => "Bye (close)", 1432 text => "Bye (close)",
1373 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.",
1374 on_activate => sub { $this->destroy; 1 }, 1434 on_activate => sub { $this->destroy; 1 },
1375 ; 1435 ;
1376 1436
… …
1395}; 1455};
1396 1456
1397sub update_options { 1457sub update_options {
1398 my ($self) = @_; 1458 my ($self) = @_;
1399 1459
1400 CFPlus::weaken $self; 1460 DC::weaken $self;
1401 1461
1402 $self->{options}->clear; 1462 $self->{options}->clear;
1403 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
1404 1464
1405 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
1406 $self->{options}->add (new CFPlus::UI::Button 1466 $self->{options}->add (new DC::UI::Button
1407 text => $kw, 1467 text => $kw,
1408 on_activate => sub { 1468 on_activate => sub {
1409 $self->send ($kw); 1469 $self->send ($kw);
1410 0 1470 0
1411 }, 1471 },
… …
1414} 1474}
1415 1475
1416sub feed { 1476sub feed {
1417 my ($self, $type, @arg) = @_; 1477 my ($self, $type, @arg) = @_;
1418 1478
1419 CFPlus::weaken $self; 1479 DC::weaken $self;
1420 1480
1421 if ($type eq "update") { 1481 if ($type eq "update") {
1422 my (%info) = @arg; 1482 my (%info) = @arg;
1423 1483
1424 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1425 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1426 1486
1427 if (exists $info{msg}) { 1487 if (exists $info{msg}) {
1428 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1488 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1429 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} };
1430 my @link; 1490 my @link;
1431 $text =~ s{ 1491 $text =~ s{
1432 ($match) 1492 ($match)
1433 }{ 1493 }{
1434 my $kw = $1; 1494 my $kw = $1;
1435 1495
1436 push @link, new CFPlus::UI::Label 1496 push @link, new DC::UI::Label
1437 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1438 can_hover => 1, 1498 can_hover => 1,
1439 can_events => 1, 1499 can_events => 1,
1440 padding_x => 0, 1500 padding_x => 0,
1441 padding_y => 0, 1501 padding_y => 0,
… …
1459} 1519}
1460 1520
1461sub send { 1521sub send {
1462 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1463 1523
1464 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1465 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1466 1526
1467 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1468} 1528}
1469 1529

Diff Legend

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