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.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.217 by root, Thu Apr 8 04:49:32 2010 UTC

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

Diff Legend

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