ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines