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.109 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.200 by root, Tue Sep 2 04:16:42 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 xwidget => 1, 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 50
53 $self->connect_ext (event_capabilities => sub { 51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
54 my ($cap) = @_; 57 my ($id) = @_;
55 58 sub {
56 if (my $ts = $cap->{tileset}) { 59 $self->send_exti_msg (w_e => $id, @_);
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 } 60 }
67 }
68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 }; 61 });
76 });
77 62
78 $self->connect_ext (ws_d => sub { 63 # destroy widgets on logout
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 "CFPlus::UI::$arg->{class}"->new (
104 %$args,
105 s_ws => $arg->{ws},
106 s_id => $arg->{id},
107 )
108 }
109 ) {
110 $self->{widget}{$arg->{id}}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
112 = $widget;
113
114 $widget->connect (on_destroy => sub {
115 my ($widget) = @_;
116
117 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 });
120 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
123 }
124 });
125
126 $self->connect_ext (w_c => sub {
127 my ($arg) = @_;
128
129 my $w = $self->{widget}{$arg->{id}}
130 or return;
131 my $m = $arg->{name};
132
133 my @a = map {
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138
139 if (exists $arg->{rid}) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
141 } else {
142 $w->$m (@a);
143 }
144 });
145
146 $self->connect_ext (w_s => sub {
147 my ($arg) = @_;
148
149 my $w = $self->{widget}{$arg->{id}}
150 or return;
151
152 $w->{$arg->{name}} = $arg->{value};
153 });
154
155 $self->connect_ext (w_g => sub {
156 my ($arg) = @_;
157
158 my $w = $self->{widget}{$arg->{id}}
159 or return;
160
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
162 });
163
164 $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 {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 66 $_->destroy
167 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
168 } 68 }
69
70 delete $self->{items};
71 $::INV->clear;
72 $::INVR_HB->clear;
73 $::FLOORBOX->clear;
169 }); 74 });
170 75
171 $self->{map_widget}->add_command (@$_) 76 $self->{map_widget}->add_command (@$_)
172 for @cmd_help; 77 for @cmd_help;
173 78
174 { 79 {
175 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 80 $self->{dialogue} = my $tex = new_from_file DC::Texture
176 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
177 $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}});
178 } 83 }
179 84
180 { 85 {
181 $self->{noface} = my $tex = new_from_file CFPlus::Texture 86 $self->{noface} = my $tex = new_from_file DC::Texture
182 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
183 $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}});
184 } 89 }
185 90
186 $self->{open_container} = 0; 91 $self->{open_container} = 0;
187 92
… …
189 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 94 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
190 95
191 $self 96 $self
192} 97}
193 98
99sub update_fx_want {
100 my ($self) = @_;
101
102 $self->send_exti_msg (fx_want => {
103 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
104 5 => !!$::CFG->{audio_enable}, # FT_SOUND
105 6 => 1, # FT_RSRC
106 });
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#############################################################################
348
194sub logprint { 349sub logprint {
195 my ($self, @a) = @_; 350 my ($self, @a) = @_;
196 351
197 $self->{log_fh} ||= do { 352 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
198 my $path = "$Crossfire::VARDIR/log.$self->{host}";
199
200 open my $fh, ">>:utf8", $path
201 or die "Couldn't open logfile $path: $!";
202
203 $fh->autoflush (1);
204
205 $fh;
206 };
207
208 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
209
210 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
211 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
212
213 print {$self->{log_fh}} "$ts ", @a, "\n";
214} 353}
215 354
216sub _stat_numdiff { 355sub _stat_numdiff {
217 my ($self, $name, $old, $new) = @_; 356 my ($self, $name, $old, $new) = @_;
218 357
… …
302 441
303 if ( 442 if (
304 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 443 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
305 ) { 444 ) {
306 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 445 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
307 $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);
308 } 447 }
309 448
310 $self->update_stats_window ($stats, $prev); 449 $self->update_stats_window ($stats, $prev);
311 450
312 $self->{prev_stats} = { %$stats }; 451 $self->{prev_stats} = { %$stats };
… …
351 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 490 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
352 $::GAUGES->{food} ->set_value ($fo, $fo_m); 491 $::GAUGES->{food} ->set_value ($fo, $fo_m);
353 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 492 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
354 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 493 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
355 . " (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});
356 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 496 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
357 my $title = $stats->{+CS_STAT_TITLE}; 497 my $title = $stats->{+CS_STAT_TITLE};
358 $title =~ s/^Player: //; 498 $title =~ s/^Player: //;
359 $::STATWIDS->{title} ->set_text ("Title: " . $title); 499 $::STATWIDS->{title} ->set_text ("Title: " . $title);
360 500
… …
378 for keys %RES_TBL; 518 for keys %RES_TBL;
379 519
380 my $sktbl = $::STATWIDS->{skill_tbl}; 520 my $sktbl = $::STATWIDS->{skill_tbl};
381 my @skills = keys %{ $self->{skill_info} }; 521 my @skills = keys %{ $self->{skill_info} };
382 522
383 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
384 $sktbl->clear; 531 $sktbl->clear;
385 532
533 my $sw = $self->{skillwid}{""} ||= [
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 534 0, 0, (new DC::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 535 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 536 2, 0, (new DC::UI::Label text => "Progress"),
537 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 538 4, 0, (new DC::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 539 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 540 6, 0, (new DC::UI::Label text => "Progress"),
541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
542 ];
543
544 my @add = @$sw;
392 545
393 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>";
394 547
395 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);
396 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);
397 550
398 my ($x, $y) = (0, 1); 551 my ($x, $y) = (0, 1);
399 for ( 552 for (@order) {
400 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
401 map [$_, $self->{skill_info}{$_}],
402 grep exists $stats->{$_},
403 @skills
404 ) {
405 my ($idx, $name) = @$_; 553 my ($idx, $name) = @$_;
406 554
407 my $spell_cb = sub { 555 my $spell_cb = sub {
408 my ($widget, $ev) = @_; 556 my ($widget, $ev) = @_;
409 557
410 if ($ev->{button} == 1) { 558 if ($ev->{button} == 1) {
411 $::CONN->user_send ("ready_skill $name"); 559 $::CONN->user_send ("ready_skill $name");
412 } elsif ($ev->{button} == 2) { 560 } elsif ($ev->{button} == 2) {
413 $::CONN->user_send ("use_skill $name"); 561 $::CONN->user_send ("use_skill $name");
414 } elsif ($ev->{button} == 3) { 562 } elsif ($ev->{button} == 3) {
415 my $shortname = CFPlus::shorten $name, 14; 563 my $shortname = DC::shorten $name, 14;
416 (new CFPlus::UI::Menu 564 (new DC::UI::Menu
417 items => [ 565 items => [
418 ["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"] }],
419 ["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"] }],
420 ], 568 ],
421 )->popup ($ev); 569 )->popup ($ev);
422 } else { 570 } else {
423 return 0; 571 return 0;
424 } 572 }
425 573
426 1 574 1
427 }; 575 };
428 576
429 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 577 my $sw = $self->{skillwid}{$idx} ||= [
578 # exp
579 (new DC::UI::Label
430 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 580 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
431 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 581
582 # level
583 (new DC::UI::Label
432 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 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
433 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 590 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
434 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 591 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
592 ];
593
594 push @add,
595 $x * 4 + 0, $y, $sw->[0],
596 $x * 4 + 1, $y, $sw->[1],
597 $x * 4 + 2, $y, $sw->[2],
598 $x * 4 + 3, $y, $sw->[3],
599 ;
435 600
436 $x++ and ($x, $y) = (0, $y + 1); 601 $x++ and ($x, $y) = (0, $y + 1);
437 } 602 }
438 }
439 603
440 for (grep exists $stats->{$_}, @skills) { 604 $sktbl->add_at (@add);
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
443 } 605 }
444}
445 606
446sub macro_send { 607 for (@order) {
447 my ($self, $macro) = @_; 608 my ($idx, $name) = @$_;
609 my $val = $stats->{$idx};
448 610
449 for my $cmd (@{ $macro->{action} }) { 611 next if $prev->{$idx}[1] eq $val->[1];
450 $self->send_command ($cmd); 612
613 my $sw = $self->{skillwid}{$idx};
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);
451 } 620 }
452} 621}
453 622
454sub user_send { 623sub user_send {
455 my ($self, $command) = @_; 624 my ($self, $command) = @_;
… …
457 $self->{record}->($command) 626 $self->{record}->($command)
458 if $self->{record}; 627 if $self->{record};
459 628
460 $self->logprint ("send: ", $command); 629 $self->logprint ("send: ", $command);
461 $self->send_command ($command); 630 $self->send_command ($command);
462 ::status ($command);
463} 631}
464 632
465sub record { 633sub record {
466 my ($self, $cb) = @_; 634 my ($self, $cb) = @_;
467 635
… …
469} 637}
470 638
471sub map_scroll { 639sub map_scroll {
472 my ($self, $dx, $dy) = @_; 640 my ($self, $dx, $dy) = @_;
473 641
474 $self->{map}->scroll ($dx, $dy); 642 $self->{map_widget}->scroll ($dx, $dy);
475} 643}
476 644
477sub feed_map1a { 645sub feed_map1a {
478 my ($self, $data) = @_; 646 my ($self, $data) = @_;
479 647
480 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 648 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
649 my $delay;
650
651 for my $tile (@$missing) {
652 next if $self->{delay}{$tile};
653
654 $delay = 1;
655
656 if (my $tex = $::CONN->{texture}[$tile]) {
657 $tex->upload;
658 } else {
659 $self->{delay}{$tile} = 1;
660
661 # we assume the face is in-flight and will eventually come
662 push @{$self->{tile_cb}{$tile}}, sub {
663 delete $self->{delay}{$tile};
664 $_[0]->upload;
665 };
666 }
667 }
668
669 if ($delay) {
670 # delay the map drawing a tiny bit in the hope of getting the missing fetched
671 EV::once undef, 0, 0.03, sub {
672 $self->{map_widget}->update
673 if $self->{map_widget};
674 };
675 } else {
481 $self->{map_widget}->update; 676 $self->{map_widget}->update;
677 }
482} 678}
483 679
484sub magicmap { 680sub magicmap {
485 my ($self, $w, $h, $x, $y, $data) = @_; 681 my ($self, $w, $h, $x, $y, $data) = @_;
486 682
… …
488} 684}
489 685
490sub flush_map { 686sub flush_map {
491 my ($self) = @_; 687 my ($self) = @_;
492 688
493 my $map_info = delete $self->{map_info} 689 return unless $self->{map_info};
494 or return;
495 690
691 for my $map_info (values %{ $self->{map_cache} || {} }) {
496 my ($hash, $x, $y, $w, $h) = @$map_info; 692 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
497 693
498 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 694 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
695
696 if ($data ne $$rdata) {
697 $map_info->[1] = \$data;
698 my $cdata = Compress::LZF::compress $data;
499 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 699 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
500 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 700 }
701 }
501} 702}
502 703
503sub map_clear { 704sub map_clear {
504 my ($self) = @_; 705 my ($self) = @_;
505 706
506 $self->flush_map; 707 $self->flush_map;
708 delete $self->{map_info};
507 delete $self->{neigh_map}; 709 delete $self->{neigh_map};
508 710
509 $self->{map}->clear; 711 $self->{map}->clear;
510 delete $self->{map_widget}{magicmap}; 712 delete $self->{map_widget}{magicmap};
511} 713}
512 714
513sub bg_fetch { 715sub bg_fetch {
514 my ($self) = @_; 716 my ($self) = @_;
515 717
516 my $id; 718 my $tile;
517 719
518 do { 720 do {
519 $id = pop @{$self->{bg_fetch}} 721 $tile = pop @{$self->{bg_fetch}}
520 or return; 722 or return;
521 } while $self->{texture}[$id]; 723 } while $self->{texture}[$tile];
522 724
523 CFPlus::DB::get tilecache => $id, sub { 725 DC::DB::get tilecache => $tile, sub {
524 my ($data) = @_; 726 my ($data) = @_;
525 727
526 return unless $self->{map}; # stop when destroyed 728 return unless $self->{map}; # stop when destroyed
527 729
528 $self->set_texture ($id => $data)
529 if defined $data; 730 if (defined $data) {
731 $self->have_tile ($tile, $data);
732 $self->{texture}[$tile]->upload;
733 }
530 734
531 $self->bg_fetch; 735 $self->bg_fetch;
532 }; 736 };
533} 737}
534 738
535sub load_map($$$) { 739sub load_map($$$$$$) {
536 my ($self, $hash, $x, $y) = @_; 740 my ($self, $hash, $x, $y, $w, $h) = @_;
537 741
538 my $gen = $self->{map_change_gen}; 742 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
539 743
540 CFPlus::DB::get $self->{mapcache} => $hash, sub { 744 my $cb = sub {
541 return unless $gen == $self->{map_change_gen}; 745 $map_info->[1] = \$_[0];
542 746
543 my ($data) = @_;
544
545 if (defined $data) {
546 $data = Compress::LZF::decompress $data;
547 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
548
549 my $inprogress = @{ $self->{bg_fetch} || [] }; 747 my $inprogress = @{ $self->{bg_fetch} || [] };
550 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 748 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
551 $self->bg_fetch unless $inprogress; 749 $self->bg_fetch unless $inprogress;
552 }
553 }; 750 };
751
752 if (my $map_info = $self->{map_cache_old}{$hash}) {
753 $cb->(${ $map_info->[1] });
754 } else {
755 my $gen = $self->{map_change_gen};
756
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 };
762 }
554} 763}
555 764
556# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 765# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
557# (server resource,s latency, bandwidth), so this hack is warranted. 766# (server resources, latency, bandwidth), so this hack is warranted.
558# 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
559sub send_mapinfo { 768sub send_mapinfo {
560 my ($self, $data, $cb) = @_; 769 my ($self, $data, $cb) = @_;
561 770
562 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)$%) {
… …
587} 796}
588 797
589# this method does a "flood fill" into every tile direction 798# this method does a "flood fill" into every tile direction
590# it assumes that tiles are arranged in a rectangular grid, 799# it assumes that tiles are arranged in a rectangular grid,
591# 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.
592# failure to comply are harmless and result in display errors 801# failure to comply is harmless and results in display errors
593# at worst. 802# at worst.
594sub flood_fill { 803sub flood_fill {
595 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 804 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
596 805
597 # the server does not allow map paths > 6 806 # the server does not allow map paths > 6
… …
633 return if $mode ne "spatial"; 842 return if $mode ne "spatial";
634 843
635 $x += $self->{map}->ox; 844 $x += $self->{map}->ox;
636 $y += $self->{map}->oy; 845 $y += $self->{map}->oy;
637 846
638 $self->load_map ($hash, $x, $y) 847 $self->load_map ($hash, $x, $y, $w, $h)
639 unless $self->{neigh_map}{$hash}[5]++;#d# 848 unless $self->{neigh_map}{$hash}[5]++;#d#
640 849
641 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 850 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
642 851
643 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 852 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
651 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 860 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
652 861
653 $self->flush_map; 862 $self->flush_map;
654 863
655 ++$self->{map_change_gen}; 864 ++$self->{map_change_gen};
865 $self->{map_cache_old} = delete $self->{map_cache};
656 866
657 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 867 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
658 868
659 my $mapmapw = $self->{mapmap}->{w}; 869 my $mapmapw = $self->{mapmap}->{w};
660 my $mapmaph = $self->{mapmap}->{h}; 870 my $mapmaph = $self->{mapmap}->{h};
… …
672 $self->{map_info} = [$hash, $x, $y, $w, $h]; 882 $self->{map_info} = [$hash, $x, $y, $w, $h];
673 883
674 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 884 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
675 $::STATWIDS->{map}->set_text ("Map: " . $map); 885 $::STATWIDS->{map}->set_text ("Map: " . $map);
676 886
677 $self->load_map ($hash, $x, $y); 887 $self->load_map ($hash, $x, $y, $w, $h);
678 $self->flood_fill (0, 0, 0, "", $hash, $flags); 888 $self->flood_fill (0, 0, 0, "", $hash, $flags);
679} 889}
680 890
681sub face_find { 891sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 892 my ($self, $facenum, $face, $cb) = @_;
683 893
684 my $hash = "$face->{chksum},$face->{name}"; 894 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 895 my $id = DC::DB::get_tile_id_sync $face->{name};
687 896
688 $face->{id} = $id; 897 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id;
690
691 $self->{map}->set_tileid ($facenum => $id); 898 $self->{map}->set_tileid ($facenum => $id);
692 899
693 CFPlus::DB::get tilecache => $id, $cb; 900 DC::DB::get tilecache => $id, $cb;
901
902 } elsif ($face->{type} & 1) { # with metadata
903 DC::DB::get res_meta => $face->{name}, $cb;
904
905 } else { # no metadata
906 DC::DB::get res_data => $face->{name}, $cb;
907 }
694} 908}
695 909
696sub face_update { 910sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 911 my ($self, $facenum, $face, $changed) = @_;
698 912
913 if ($face->{type} == 0) {
914 # image, FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 915 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 916 if $changed;
701 917
702 $self->set_texture ($face->{id} => delete $face->{image}); 918 $self->have_tile ($face->{id}, delete $face->{data});
919
920 } elsif ($face->{type} & 1) {
921 # split metadata case, FT_MUSIC, FT_SOUND
922 if ($changed) { # new data
923 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
924 $face->{data} = $meta;
925
926 # rely on strict ordering here and also on later fetch
927 DC::DB::put res_data => $face->{name} => $data, sub { };
928 DC::DB::put res_meta => $face->{name} => $meta, sub { };
929 }
930
931 $face->{data} = $self->{json_coder}->decode ($face->{data});
932 ::add_license ($face);
933 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
934 if $changed;
935
936 if ($face->{type} == 3) { # FT_MUSIC
937 &::audio_music_push ($facenum);
938 } elsif ($face->{type} == 5) { # FT_SOUND
939 &::audio_sound_push ($facenum);
940 }
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;
950 }
703} 951}
704 952
705sub smooth_update { 953sub smooth_update {
706 my ($self, $facenum, $face) = @_; 954 my ($self, $facenum, $face) = @_;
707 955
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 956 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 957}
710 958
711sub set_texture { 959sub have_tile {
712 my ($self, $id, $data) = @_; 960 my ($self, $tile, $data) = @_;
713 961
714 $self->{texture}[$id] = my $tex = 962 return unless $self->{map};
715 new_from_image CFPlus::Texture 963
964 my $tex = $self->{texture}[$tile] ||=
965 new DC::Texture
966 tile => $tile,
967 image => $data, delete_image => 1,
716 $data, minify => 1, mipmap => 1; 968 minify => 1, mipmap => 1;
717 969
718 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 970 if (my $cbs = delete $self->{tile_cb}{$tile}) {
719 $self->{map_widget}->update; 971 $_->($tex) for @$cbs;
972 }
973}
974
975# call in non-void context registers a temporary
976# hook with handle, otherwise its permanent
977sub on_face_change {
978 my ($self, $num, $cb) = @_;
979
980 push @{$self->{face_cb}{$num}}, $cb;
981
982 defined wantarray
983 ? DC::guard {
984 @{$self->{face_cb}{$num}}
985 = grep $_ != $cb,
986 @{$self->{face_cb}{$num}};
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)
720} 1004}
721 1005
722sub sound_play { 1006sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 1007 my ($self, $type, $face, $dx, $dy, $vol) = @_;
724 1008
725 $self->{sound_play}->($x, $y, $soundnum, $type); 1009 &::audio_sound_play ($face, $dx, $dy, $vol)
1010 unless $type & 1; # odd types are silent for future expansion
726} 1011}
727 1012
728my $LAST_QUERY; # server is stupid, stupid, stupid 1013my $LAST_QUERY; # server is stupid, stupid, stupid
729 1014
730sub query { 1015sub query {
… …
738 1023
739sub sanitise_xml($) { 1024sub sanitise_xml($) {
740 local $_ = shift; 1025 local $_ = shift;
741 1026
742 # we now weed out all tags we do not support 1027 # we now weed out all tags we do not support
743 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
744 # now all entities 1033 # now all entities
745 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;
746 1035
747 # handle some elements 1036 # handle some elements
748 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1037 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
749 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+$//;
750 1041
751 $_ 1042 $_
752} 1043}
753 1044
754our %NAME_TO_COLOR = ( 1045our %NAME_TO_COLOR = (
… …
795 $self->{$type} = $text; 1086 $self->{$type} = $text;
796 } else { 1087 } else {
797 $self->logprint ("msg: ", $text); 1088 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 1089 return if $color < 0; # negative color == ignore if not understood
799 1090
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1091 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
801 1092
802 ## 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
803 # no longer neecssary with TRT servers 1094 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1095 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 1096
806 ::message ({ fg => $fg, markup => $_ })
807 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 }
808 1112
809 $self->{statusbox}->add ($text, 1113 $self->{statusbox}->add ($text,
810 group => $text, 1114 group => $text,
811 fg => $fg, 1115 fg => $fg,
812 timeout => $color >= 2 ? 180 : 10, 1116 timeout => $color >= 2 ? 180 : 10,
813 tooltip_font => $::FONT_FIXED, 1117 tooltip_font => $::FONT_FIXED,
814 ); 1118 ) if $type eq "info";
815 } 1119 }
816} 1120}
817 1121
818sub spell_add { 1122sub spell_add {
819 my ($self, $spell) = @_; 1123 my ($self, $spell) = @_;
… …
823 $spell->{message} =~ s/\n+$//; 1127 $spell->{message} =~ s/\n+$//;
824 $spell->{message} ||= "Server did not provide a description for this spell."; 1128 $spell->{message} ||= "Server did not provide a description for this spell.";
825 1129
826 $::SPELL_LIST->add_spell ($spell); 1130 $::SPELL_LIST->add_spell ($spell);
827 1131
828 $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});
829 $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});
830} 1134}
831 1135
832sub spell_delete { 1136sub spell_delete {
833 my ($self, $spell) = @_; 1137 my ($self, $spell) = @_;
834 1138
… …
845sub addme_success { 1149sub addme_success {
846 my ($self) = @_; 1150 my ($self) = @_;
847 1151
848 my %skill_help; 1152 my %skill_help;
849 1153
850 for my $node (CFPlus::Pod::find skill_description => "*") { 1154 for my $node (DC::Pod::find skill_description => "*") {
851 my (undef, @par) = CFPlus::Pod::section_of $node; 1155 my (undef, @par) = DC::Pod::section_of $node;
852 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1156 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
853 }; 1157 };
854 1158
855 for my $skill (values %{$self->{skill_info}}) { 1159 for my $skill (values %{$self->{skill_info}}) {
856 $self->{map_widget}->add_command ("ready_skill $skill", 1160 $self->{map_widget}->add_command ("ready_skill $skill",
857 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1161 (DC::asxml "Ready the skill '$skill'\n\n")
858 . $skill_help{$skill}); 1162 . $skill_help{$skill});
859 $self->{map_widget}->add_command ("use_skill $skill", 1163 $self->{map_widget}->add_command ("use_skill $skill",
860 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1164 (DC::asxml "Immediately use the skill '$skill'\n\n")
861 . $skill_help{$skill}); 1165 . $skill_help{$skill});
862 } 1166 }
863} 1167}
864 1168
865sub eof { 1169sub eof {
… …
868 $self->{map_widget}->clr_commands; 1172 $self->{map_widget}->clr_commands;
869 1173
870 ::stop_game (); 1174 ::stop_game ();
871} 1175}
872 1176
873sub image_info {
874 my ($self, $numfaces) = @_;
875
876 $self->{num_faces} = $numfaces;
877 $self->{face_prefetch} = [1 .. $numfaces];
878 $self->face_prefetch;
879}
880
881sub face_prefetch {
882 my ($self) = @_;
883
884 return unless $::CFG->{face_prefetch};
885
886 if ($self->{num_faces}) {
887 return if @{ $self->{send_queue} || [] };
888 my $todo = @{ $self->{face_prefetch} }
889 or return;
890
891 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
892
893 $self->send ("requestinfo image_sums $face $face");
894
895 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
896 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
897 } elsif (!exists $self->{num_faces}) {
898 $self->send ("requestinfo image_info");
899
900 $self->{num_faces} = 0;
901
902 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
903 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
904 }
905}
906
907sub update_floorbox { 1177sub update_floorbox {
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1178 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 1179 return unless $::CONN;
910 1180
911 $::FLOORBOX->clear; 1181 $::FLOORBOX->clear;
912 1182
1183 my @add;
1184
913 my $row; 1185 my $row;
914 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;
915 if ($row < 6) { 1188 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 1189 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 1190 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 1191 DC::Item::update_widgets $_;
919 1192
1193 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1194 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1195 1, $row, $_->{desc_widget};
922 1196
923 $row++; 1197 $row++;
924 } else { 1198 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1199 push @add, 1, $row, new DC::UI::Button
926 text => "More...", 1200 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1201 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 1202 ;
929 last; 1203 last;
930 } 1204 }
931 } 1205 }
932 if ($::CONN->{open_container}) { 1206 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1207 push @add, 1, $row++, new DC::UI::Button
934 text => "Close container", 1208 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1209 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 1210 ;
937 } 1211 }
1212
1213 $::FLOORBOX->add_at (@add);
938 }); 1214 });
939 1215
940 $::WANT_REFRESH++; 1216 $::WANT_REFRESH = 1;
941} 1217}
942 1218
943sub set_opencont { 1219sub set_opencont {
944 my ($conn, $tag, $name) = @_; 1220 my ($conn, $tag, $name) = @_;
945 $conn->{open_container} = $tag; 1221 $conn->{open_container} = $tag;
946 update_floorbox; 1222 update_floorbox;
947 1223
948 $::INV_RIGHT_HB->clear (); 1224 $::INVR_HB->clear;
949 $::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);
950 1226
951 if ($tag != 0) { # Floor isn't closable, is it? 1227 if ($tag != 0) { # Floor isn't closable, is it?
952 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1228 $::INVR_HB->add (new DC::UI::Button
953 text => "Close container", 1229 text => "Close container",
954 tooltip => "Close the currently open container (if one is open)", 1230 tooltip => "Close the currently open container (if one is open)",
955 on_activate => sub { 1231 on_activate => sub {
956 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1232 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
957 if $tag != 0; 1233 if $tag != 0;
958 #if $CONN->{open_container} != 0;
959 0 1234 0
960 }, 1235 },
961 ); 1236 );
962 } 1237 }
963 1238
… …
965} 1240}
966 1241
967sub update_containers { 1242sub update_containers {
968 my ($self) = @_; 1243 my ($self) = @_;
969 1244
970 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1245 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
971 my $todo = delete $self->{update_container} 1246 my $todo = delete $self->{update_container}
972 or return; 1247 or return;
973 1248
974 for my $tag (keys %$todo) { 1249 for my $tag (keys %$todo) {
975 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1250 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1010} 1285}
1011 1286
1012sub item_update { 1287sub item_update {
1013 my ($self, $item) = @_; 1288 my ($self, $item) = @_;
1014 1289
1015 #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";
1016 1291
1017 CFPlus::Item::update_widgets $item; 1292 DC::Item::update_widgets $item;
1018 1293
1019 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1294 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1020 set_opencont ($::CONN, 0, "Floor"); 1295 set_opencont ($::CONN, 0, "Floor");
1021 1296
1022 } elsif ($item->{flags} & F_OPEN) { 1297 } elsif ($item->{flags} & F_OPEN) {
1023 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1298 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1024 1299
1025 } else { 1300 } else {
1026 $self->{update_container}{$item->{container}}++; 1301 $self->{update_container}{$item->{container}}++;
1027 $self->update_containers; 1302 $self->update_containers;
1028 } 1303 }
… …
1039 1314
1040 my $weight = .001 * $self->{player}{weight}; 1315 my $weight = .001 * $self->{player}{weight};
1041 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1316 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1042 1317
1043 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1318 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1044 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1319 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1045 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1320 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1046} 1321}
1047 1322
1048sub update_server_info { 1323sub update_server_info {
1049 my ($self) = @_; 1324 my ($self) = @_;
… …
1057 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1332 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1058 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1333 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1059 . "editing support $yesno[!!$self->{editor_support}]\n" 1334 . "editing support $yesno[!!$self->{editor_support}]\n"
1060 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1335 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1061 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1336 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1337 . "client support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1338 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1339 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1340 );
1066 1341
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1342}
1069 1343
1070sub logged_in { 1344sub logged_in {
1071 my ($self) = @_; 1345 my ($self) = @_;
1072 1346
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1347 $self->send_ext_req (cfplus_support => version => 2, sub {
1348 my (%msg) = @_;
1349
1074 $self->{cfplus_ext} = $_[0]{version}; 1350 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1351 $self->update_server_info;
1076 1352
1077 if ($self->{cfplus_ext} >= 2) { 1353 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1354 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1355 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1356 $self->update_server_info;
1081 1357
1082 0 1358 0
1083 }); 1359 });
1084 } 1360 }
… …
1086 0 1362 0
1087 }); 1363 });
1088 1364
1089 $self->update_server_info; 1365 $self->update_server_info;
1090 1366
1091 $self->send_command ("output-sync $::CFG->{output_sync}");
1092 $self->send_command ("output-count $::CFG->{output_count}");
1093 $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;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1368 $self->send_command ("pickup $::CFG->{pickup}");
1095}
1096 1369
1097sub buildat { 1370 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1098 my ($self, $builditem, $x, $y) = @_; 1371 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1099
1100 if ($self->{cfplus_ext}) {
1101 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1102 }
1103} 1372}
1104 1373
1105sub lookat { 1374sub lookat {
1106 my ($self, $x, $y) = @_; 1375 my ($self, $x, $y) = @_;
1107 1376
1108 if ($self->{cfplus_ext}) { 1377 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1378 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1379 my (%msg) = @_;
1111 1380
1112 if (exists $msg->{npc_dialog}) { 1381 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1382 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1383 $self->{npc_dialog} = new DC::NPCDialog::
1115 dx => $x, 1384 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1385 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1386 conn => $self,
1119 ; 1387 ;
1120 } 1388 }
1121 }); 1389 });
1122 } 1390 }
… …
1129 1397
1130 (delete $self->{npc_dialog})->destroy 1398 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1399 if $self->{npc_dialog};
1132 1400
1133 $self->SUPER::destroy; 1401 $self->SUPER::destroy;
1134}
1135 1402
1403 %$self = ();
1404}
1405
1136package CFPlus::NPCDialog; 1406package DC::NPCDialog;
1137 1407
1138our @ISA = 'CFPlus::UI::Toplevel'; 1408our @ISA = 'DC::UI::Toplevel';
1139 1409
1140sub new { 1410sub new {
1141 my $class = shift; 1411 my $class = shift;
1142 1412
1143 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
… …
1150 kw => { hi => 0, yes => 0, no => 0 }, 1420 kw => { hi => 0, yes => 0, no => 0 },
1151 has_close_button => 1, 1421 has_close_button => 1,
1152 @_, 1422 @_,
1153 ); 1423 );
1154 1424
1155 CFPlus::weaken (my $this = $self); 1425 DC::weaken (my $this = $self);
1156 1426
1157 $self->connect (delete => sub { $this->destroy; 1 }); 1427 $self->connect (delete => sub { $this->destroy; 1 });
1158 1428
1159 # better use a pane... 1429 # better use a pane...
1160 $self->add (my $hbox = new CFPlus::UI::HBox); 1430 $self->add (my $hbox = new DC::UI::HBox);
1161 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1431 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1162 1432
1163 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1433 $hbox->add (my $vbox = new DC::UI::VBox);
1164 1434
1165 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1435 $vbox->add (new DC::UI::Label text => "Message Entry:");
1166 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1436 $vbox->add ($self->{entry} = new DC::UI::Entry
1167 tooltip => "#npc_message_entry", 1437 tooltip => "#npc_message_entry",
1168 on_activate => sub { 1438 on_activate => sub {
1169 my ($entry, $text) = @_; 1439 my ($entry, $text) = @_;
1170 1440
1171 return unless $text =~ /\S/; 1441 return unless $text =~ /\S/;
… …
1175 1445
1176 0 1446 0
1177 }, 1447 },
1178 ); 1448 );
1179 1449
1180 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1450 $vbox->add ($self->{options} = new DC::UI::VBox);
1181 1451
1182 $self->{bye_button} = new CFPlus::UI::Button 1452 $self->{bye_button} = new DC::UI::Button
1183 text => "Bye (close)", 1453 text => "Bye (close)",
1184 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1454 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1185 on_activate => sub { $this->destroy; 1 }, 1455 on_activate => sub { $this->destroy; 1 },
1186 ; 1456 ;
1187 1457
1188 $self->update_options; 1458 $self->update_options;
1189 1459
1190 $self->{id} = $self->{conn}->send_ext_req ( 1460 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1461 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1462 $this->feed (@_) if $this;
1193 ); 1463 });
1464
1465 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1466
1195 $self->{entry}->grab_focus; 1467 $self->{entry}->grab_focus;
1196 1468
1197 $self->{textview}->add_paragraph ({ 1469 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1470 fg => [1, 1, 0, 1],
… …
1204}; 1476};
1205 1477
1206sub update_options { 1478sub update_options {
1207 my ($self) = @_; 1479 my ($self) = @_;
1208 1480
1209 CFPlus::weaken $self; 1481 DC::weaken $self;
1210 1482
1211 $self->{options}->clear; 1483 $self->{options}->clear;
1212 $self->{options}->add ($self->{bye_button}); 1484 $self->{options}->add ($self->{bye_button});
1213 1485
1214 for my $kw (sort keys %{ $self->{kw} }) { 1486 for my $kw (sort keys %{ $self->{kw} }) {
1215 $self->{options}->add (new CFPlus::UI::Button 1487 $self->{options}->add (new DC::UI::Button
1216 text => $kw, 1488 text => $kw,
1217 on_activate => sub { 1489 on_activate => sub {
1218 $self->send ($kw); 1490 $self->send ($kw);
1219 0 1491 0
1220 }, 1492 },
1221 ); 1493 );
1222 } 1494 }
1223} 1495}
1224 1496
1225sub feed { 1497sub feed {
1226 my ($self, $msg) = @_; 1498 my ($self, $type, @arg) = @_;
1227 1499
1228 CFPlus::weaken $self; 1500 DC::weaken $self;
1229 1501
1230 if ($msg->{msgtype} eq "reply") { 1502 if ($type eq "update") {
1503 my (%info) = @arg;
1504
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1505 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1506 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1233
1234 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1235 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1236 my @link;
1237 $text =~ s{
1238 ($match)
1239 }{
1240 my $kw = $1;
1241
1242 push @link, new CFPlus::UI::Label
1243 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1244 can_hover => 1,
1245 can_events => 1,
1246 padding_x => 0,
1247 padding_y => 0,
1248 on_button_up => sub {
1249 $self->send ($kw);
1250 };
1251
1252 "\x{fffc}"
1253 }giex;
1254 1507
1508 if (exists $info{msg}) {
1509 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1510 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1511 my @link;
1512 $text =~ s{
1513 ($match)
1514 }{
1515 my $kw = $1;
1516
1517 push @link, new DC::UI::Label
1518 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1519 can_hover => 1,
1520 can_events => 1,
1521 padding_x => 0,
1522 padding_y => 0,
1523 on_button_up => sub {
1524 $self->send ($kw);
1525 };
1526
1527 "\x{fffc}"
1528 }giex;
1529
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1530 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1531 $self->{textview}->scroll_to_bottom;
1532 }
1533
1257 $self->update_options; 1534 $self->update_options;
1258 } else { 1535 } else {
1259 $self->destroy; 1536 $self->destroy;
1260 } 1537 }
1261 1538
… …
1263} 1540}
1264 1541
1265sub send { 1542sub send {
1266 my ($self, $msg) = @_; 1543 my ($self, $msg) = @_;
1267 1544
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1545 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1546 $self->{textview}->scroll_to_bottom;
1270 1547
1271 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1548 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1272} 1549}
1273 1550
1274sub destroy { 1551sub destroy {
1275 my ($self) = @_; 1552 my ($self) = @_;
1276 1553
1277 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1554 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1278 1555
1279 if ($self->{conn}) { 1556 if ($self->{conn}) {
1280 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1557 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1281 delete $self->{conn}{npc_dialog}; 1558 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1559 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1560 }
1284 1561
1285 $self->SUPER::destroy; 1562 $self->SUPER::destroy;

Diff Legend

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