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.155 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.197 by root, Tue May 20 02:47:21 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines