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.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines