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.112 by root, Tue Jul 10 16:25:16 2007 UTC vs.
Revision 1.203 by elmex, Sun Sep 21 12:34:14 2008 UTC

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

Diff Legend

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