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.113 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.194 by root, Mon May 5 20:22:03 2008 UTC

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

Diff Legend

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