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.153 by root, Mon Aug 13 14:24:17 2007 UTC vs.
Revision 1.199 by root, Sat Jul 19 20:33:47 2008 UTC

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

Diff Legend

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