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.204 by elmex, Fri Oct 17 11:21:55 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines