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.187 by root, Sat Dec 29 13:44:30 2007 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;
… …
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->{par} <=> $b->{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 statusbox => $::SDTATUSBOX,
281
282 inv => $::INV,
283 invr => $::INVR,
284 invr_hb => $::INVR_HB,
285 );
286
287 while (my ($id, $name) = each %ass) {
288 $self->widget_associate (undef, $id => $wkw{$name});
289 }
290}
291
292# widget call
293sub ext_w_c {
294 my ($self, $id, $rcb, $method, @args) = @_;
295
296 my $w = $self->{widget}{$id}
297 or return;
298
299 if ($rcb) {
300 $rcb->($w->$method (@args));
301 } else {
302 $w->$method (@args);
303 }
304}
305
306# widget set
307sub ext_w_s {
308 my ($self, $id, $attr) = @_;
309
310 my $w = $self->{widget}{$id}
311 or return;
312
313 for (my $i = 0; $i < $#$attr; $i += 2) {
314 my ($member, $value) = @$attr[$i, $i+1];
315 if (defined $value) {
316 $w->{$member} = $value;
317 } else {
318 delete $w->{$member};
319 }
320 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
321 }
322}
323
324# widget get
325sub ext_w_g {
326 my ($self, $id, $rid, @attr) = @_;
327
328 my $w = $self->{widget}{$id}
329 or return;
330
331 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
332}
333
334# message window
335sub ext_channel_info {
336 my ($self, $info) = @_;
337 $self->{channels}->{$info->{id}} = $info;
338 $::MESSAGE_WINDOW->add_channel ($info);
339}
340
341#############################################################################
342
237sub logprint { 343sub logprint {
238 my ($self, @a) = @_; 344 my ($self, @a) = @_;
239 345
240 $self->{log_fh} ||= do { 346 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} 347}
258 348
259sub _stat_numdiff { 349sub _stat_numdiff {
260 my ($self, $name, $old, $new) = @_; 350 my ($self, $name, $old, $new) = @_;
261 351
… …
345 435
346 if ( 436 if (
347 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 437 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
348 ) { 438 ) {
349 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 439 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); 440 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
351 } 441 }
352 442
353 $self->update_stats_window ($stats, $prev); 443 $self->update_stats_window ($stats, $prev);
354 444
355 $self->{prev_stats} = { %$stats }; 445 $self->{prev_stats} = { %$stats };
… …
394 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 484 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
395 $::GAUGES->{food} ->set_value ($fo, $fo_m); 485 $::GAUGES->{food} ->set_value ($fo, $fo_m);
396 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 486 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 487 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
398 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 488 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
489 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
399 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 490 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
400 my $title = $stats->{+CS_STAT_TITLE}; 491 my $title = $stats->{+CS_STAT_TITLE};
401 $title =~ s/^Player: //; 492 $title =~ s/^Player: //;
402 $::STATWIDS->{title} ->set_text ("Title: " . $title); 493 $::STATWIDS->{title} ->set_text ("Title: " . $title);
403 494
… …
421 for keys %RES_TBL; 512 for keys %RES_TBL;
422 513
423 my $sktbl = $::STATWIDS->{skill_tbl}; 514 my $sktbl = $::STATWIDS->{skill_tbl};
424 my @skills = keys %{ $self->{skill_info} }; 515 my @skills = keys %{ $self->{skill_info} };
425 516
426 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 517 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
518 map [$_, $self->{skill_info}{$_}],
519 grep exists $stats->{$_},
520 @skills;
521
522 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
523 $self->{stat_order} = join ",", map $_->[0], @order;
524
427 $sktbl->clear; 525 $sktbl->clear;
428 526
527 my $sw = $self->{skillwid}{""} ||= [
429 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 528 0, 0, (new DC::UI::Label text => "Experience", align => 1),
430 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
431 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 530 2, 0, (new DC::UI::Label text => "Progress"),
531 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); 532 4, 0, (new DC::UI::Label text => "Experience", align => 1),
433 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
434 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 534 6, 0, (new DC::UI::Label text => "Progress"),
535 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
536 ];
537
538 my @add = @$sw;
435 539
436 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 540 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
437 541
438 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 542 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); 543 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
440 544
441 my ($x, $y) = (0, 1); 545 my ($x, $y) = (0, 1);
442 for ( 546 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) = @$_; 547 my ($idx, $name) = @$_;
449 548
450 my $spell_cb = sub { 549 my $spell_cb = sub {
451 my ($widget, $ev) = @_; 550 my ($widget, $ev) = @_;
452 551
453 if ($ev->{button} == 1) { 552 if ($ev->{button} == 1) {
454 $::CONN->user_send ("ready_skill $name"); 553 $::CONN->user_send ("ready_skill $name");
455 } elsif ($ev->{button} == 2) { 554 } elsif ($ev->{button} == 2) {
456 $::CONN->user_send ("use_skill $name"); 555 $::CONN->user_send ("use_skill $name");
457 } elsif ($ev->{button} == 3) { 556 } elsif ($ev->{button} == 3) {
458 my $shortname = CFPlus::shorten $name, 14; 557 my $shortname = DC::shorten $name, 14;
459 (new CFPlus::UI::Menu 558 (new DC::UI::Menu
460 items => [ 559 items => [
461 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 560 ["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"] }], 561 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
463 ], 562 ],
464 )->popup ($ev); 563 )->popup ($ev);
465 } else { 564 } else {
466 return 0; 565 return 0;
467 } 566 }
468 567
469 1 568 1
470 }; 569 };
471 570
472 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 571 my $sw = $self->{skillwid}{$idx} ||= [
572 # exp
573 (new DC::UI::Label
473 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 574 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 575
576 # level
577 (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); 578 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
579
580 # progress
581 (new DC::UI::ExperienceProgress),
582
583 # label
476 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 584 (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); 585 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
586 ];
587
588 push @add,
589 $x * 4 + 0, $y, $sw->[0],
590 $x * 4 + 1, $y, $sw->[1],
591 $x * 4 + 2, $y, $sw->[2],
592 $x * 4 + 3, $y, $sw->[3],
593 ;
478 594
479 $x++ and ($x, $y) = (0, $y + 1); 595 $x++ and ($x, $y) = (0, $y + 1);
480 } 596 }
481 }
482 597
483 for (grep exists $stats->{$_}, @skills) { 598 $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 } 599 }
487}
488 600
489sub macro_send { 601 for (@order) {
490 my ($self, $macro) = @_; 602 my ($idx, $name) = @$_;
603 my $val = $stats->{$idx};
491 604
492 for my $cmd (@{ $macro->{action} }) { 605 next if $prev->{$idx}[1] eq $val->[1];
493 $self->send_command ($cmd); 606
607 my $sw = $self->{skillwid}{$idx};
608 $sw->[0]->set_text (::formsep ($val->[1]));
609 $sw->[1]->set_text ($val->[0] * 1);
610 $sw->[2]->set_value (@$val);
611
612 $::GAUGES->{sklprg}->set_label ("$name %d%%");
613 $::GAUGES->{sklprg}->set_value (@$val);
494 } 614 }
495} 615}
496 616
497sub user_send { 617sub user_send {
498 my ($self, $command) = @_; 618 my ($self, $command) = @_;
… …
500 $self->{record}->($command) 620 $self->{record}->($command)
501 if $self->{record}; 621 if $self->{record};
502 622
503 $self->logprint ("send: ", $command); 623 $self->logprint ("send: ", $command);
504 $self->send_command ($command); 624 $self->send_command ($command);
505 ::status ($command);
506} 625}
507 626
508sub record { 627sub record {
509 my ($self, $cb) = @_; 628 my ($self, $cb) = @_;
510 629
… …
518} 637}
519 638
520sub feed_map1a { 639sub feed_map1a {
521 my ($self, $data) = @_; 640 my ($self, $data) = @_;
522 641
523 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 642 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
643 my $delay;
644
645 for my $tile (@$missing) {
646 next if $self->{delay}{$tile};
647
648 $delay = 1;
649
650 if (my $tex = $::CONN->{texture}[$tile]) {
651 $tex->upload;
652 } else {
653 $self->{delay}{$tile} = 1;
654
655 # we assume the face is in-flight and will eventually come
656 push @{$self->{tile_cb}{$tile}}, sub {
657 delete $self->{delay}{$tile};
658 $_[0]->upload;
659 };
660 }
661 }
662
663 if ($delay) {
664 # delay the map drawing a tiny bit in the hope of getting the missing fetched
665 EV::once undef, 0, 0.03, sub {
666 $self->{map_widget}->update
667 if $self->{map_widget};
668 };
669 } else {
524 $self->{map_widget}->update; 670 $self->{map_widget}->update;
671 }
525} 672}
526 673
527sub magicmap { 674sub magicmap {
528 my ($self, $w, $h, $x, $y, $data) = @_; 675 my ($self, $w, $h, $x, $y, $data) = @_;
529 676
… …
536 my $map_info = delete $self->{map_info} 683 my $map_info = delete $self->{map_info}
537 or return; 684 or return;
538 685
539 my ($hash, $x, $y, $w, $h) = @$map_info; 686 my ($hash, $x, $y, $w, $h) = @$map_info;
540 687
541 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 688 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
689 $self->{map_cache_new}{$hash} = \$data;
542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 690 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
544} 691}
545 692
546sub map_clear { 693sub map_clear {
547 my ($self) = @_; 694 my ($self) = @_;
548 695
… …
554} 701}
555 702
556sub bg_fetch { 703sub bg_fetch {
557 my ($self) = @_; 704 my ($self) = @_;
558 705
559 my $id; 706 my $tile;
560 707
561 do { 708 do {
562 $id = pop @{$self->{bg_fetch}} 709 $tile = pop @{$self->{bg_fetch}}
563 or return; 710 or return;
564 } while $self->{texture}[$id]; 711 } while $self->{texture}[$tile];
565 712
566 CFPlus::DB::get tilecache => $id, sub { 713 DC::DB::get tilecache => $tile, sub {
567 my ($data) = @_; 714 my ($data) = @_;
568 715
569 return unless $self->{map}; # stop when destroyed 716 return unless $self->{map}; # stop when destroyed
570 717
571 $self->set_texture ($id => $data)
572 if defined $data; 718 if (defined $data) {
719 $self->have_tile ($tile, $data);
720 $self->{texture}[$tile]->upload;
721 }
573 722
574 $self->bg_fetch; 723 $self->bg_fetch;
575 }; 724 };
576} 725}
577 726
578sub load_map($$$) { 727sub load_map($$$) {
579 my ($self, $hash, $x, $y) = @_; 728 my ($self, $hash, $x, $y) = @_;
580 729
581 my $gen = $self->{map_change_gen}; 730 my $gen = $self->{map_change_gen};
582 731
583 CFPlus::DB::get $self->{mapcache} => $hash, sub { 732 my $cb = sub {
584 return unless $gen == $self->{map_change_gen}; 733 return unless $gen == $self->{map_change_gen};
585 734
586 my ($data) = @_; 735 my ($data) = @_;
587 736
588 if (defined $data) { 737 if (defined $data) {
738 $self->{map_cache_new}{$hash} = \$data;
739
589 $data = Compress::LZF::decompress $data; 740 my $data = Compress::LZF::decompress $data;
590 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
591 741
592 my $inprogress = @{ $self->{bg_fetch} || [] }; 742 my $inprogress = @{ $self->{bg_fetch} || [] };
593 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 743 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
594 $self->bg_fetch unless $inprogress; 744 $self->bg_fetch unless $inprogress;
595 } 745 }
596 }; 746 };
747
748 if (my $rdata = $self->{map_cache_old}{$hash}) {
749 $cb->($$rdata);
750 } else {
751 DC::DB::get $self->{mapcache} => $hash, $cb;
752 }
597} 753}
598 754
599# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 755# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
600# (server resource,s latency, bandwidth), so this hack is warranted. 756# (server resource,s latency, bandwidth), so this hack is warranted.
601# the right fix is to make real tiled maps with an overview file 757# the right fix is to make real tiled maps with an overview file
… …
694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 850 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
695 851
696 $self->flush_map; 852 $self->flush_map;
697 853
698 ++$self->{map_change_gen}; 854 ++$self->{map_change_gen};
855 $self->{map_cache_old} = delete $self->{map_cache_new};
699 856
700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 857 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
701 858
702 my $mapmapw = $self->{mapmap}->{w}; 859 my $mapmapw = $self->{mapmap}->{w};
703 my $mapmaph = $self->{mapmap}->{h}; 860 my $mapmaph = $self->{mapmap}->{h};
… …
722} 879}
723 880
724sub face_find { 881sub face_find {
725 my ($self, $facenum, $face, $cb) = @_; 882 my ($self, $facenum, $face, $cb) = @_;
726 883
727 my $hash = "$face->{chksum},$face->{name}"; 884 if ($face->{type} == 0) { # FT_FACE
728
729 my $id = CFPlus::DB::get_tile_id_sync $hash; 885 my $id = DC::DB::get_tile_id_sync $face->{name};
730 886
731 $face->{id} = $id; 887 $face->{id} = $id;
732 $self->{faceid}[$facenum] = $id;
733
734 $self->{map}->set_tileid ($facenum => $id); 888 $self->{map}->set_tileid ($facenum => $id);
735 889
736 CFPlus::DB::get tilecache => $id, $cb; 890 DC::DB::get tilecache => $id, $cb;
891
892 } elsif ($face->{type} & 1) { # with metadata
893 DC::DB::get res_meta => $face->{name}, $cb;
894
895 } else { # no metadata
896 DC::DB::get res_data => $face->{name}, $cb;
897 }
737} 898}
738 899
739sub face_update { 900sub face_update {
740 my ($self, $facenum, $face, $changed) = @_; 901 my ($self, $facenum, $face, $changed) = @_;
741 902
903 if ($face->{type} == 0) {
904 # image, FT_FACE
742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 905 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
743 if $changed; 906 if $changed;
744 907
745 $self->set_texture ($face->{id} => delete $face->{image}); 908 $self->have_tile ($face->{id}, delete $face->{data});
909
910 } elsif ($face->{type} & 1) {
911 # split metadata case, FT_MUSIC, FT_SOUND
912 if ($changed) { # new data
913 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
914 $face->{data} = $meta;
915
916 # rely on strict ordering here and also on later fetch
917 DC::DB::put res_data => $face->{name} => $data, sub { };
918 DC::DB::put res_meta => $face->{name} => $meta, sub { };
919 }
920
921 $face->{data} = $self->{json_coder}->decode ($face->{data});
922 ::add_license ($face);
923 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
924 if $changed;
925
926 if ($face->{type} == 3) { # FT_MUSIC
927 &::audio_music_push ($facenum);
928 } elsif ($face->{type} == 5) { # FT_SOUND
929 &::audio_sound_push ($facenum);
930 }
931
932 } else {
933 # flat resource case, FT_RSRC
934 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
935 if $changed;
936 }
937
938 if (my $cbs = $self->{face_cb}{$facenum}) {
939 $_->($face, $changed) for @$cbs;
940 }
746} 941}
747 942
748sub smooth_update { 943sub smooth_update {
749 my ($self, $facenum, $face) = @_; 944 my ($self, $facenum, $face) = @_;
750 945
751 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 946 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
752} 947}
753 948
754sub set_texture { 949sub have_tile {
755 my ($self, $id, $data) = @_; 950 my ($self, $tile, $data) = @_;
756 951
757 $self->{texture}[$id] = my $tex = 952 return unless $self->{map};
758 new_from_image CFPlus::Texture 953
954 my $tex = $self->{texture}[$tile] ||=
955 new DC::Texture
956 tile => $tile,
957 image => $data, delete_image => 1,
759 $data, minify => 1, mipmap => 1; 958 minify => 1, mipmap => 1;
760 959
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 960 if (my $cbs = delete $self->{tile_cb}{$tile}) {
762 $self->{map_widget}->update; 961 $_->($tex) for @$cbs;
962 }
963}
964
965# call in non-void context registers a temporary
966# hook with handle, otherwise its permanent
967sub on_face_change {
968 my ($self, $num, $cb) = @_;
969
970 push @{$self->{face_cb}{$num}}, $cb;
971
972 defined wantarray
973 ? DC::guard {
974 @{$self->{face_cb}{$num}}
975 = grep $_ != $cb,
976 @{$self->{face_cb}{$num}};
977 }
978 : ()
979}
980
981# call in non-void context registers a temporary
982# hook with handle, otherwise its permanent
983sub register_face_handler {
984 my ($self, $num, $cb) = @_;
985
986 return unless $num;
987
988 # invoke if available right now
989 $cb->($self->{face}[$num], 0)
990 unless exists $self->{face}[$num]{loading};
991
992 # future changes
993 $self->on_face_change ($num => $cb)
763} 994}
764 995
765sub sound_play { 996sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 997 my ($self, $type, $face, $dx, $dy, $vol) = @_;
767 998
768 $self->{sound_play}->($x, $y, $soundnum, $type); 999 &::audio_sound_play ($face, $dx, $dy, $vol)
1000 unless $type & 1; # odd types are silent for future expansion
769} 1001}
770 1002
771my $LAST_QUERY; # server is stupid, stupid, stupid 1003my $LAST_QUERY; # server is stupid, stupid, stupid
772 1004
773sub query { 1005sub query {
… …
781 1013
782sub sanitise_xml($) { 1014sub sanitise_xml($) {
783 local $_ = shift; 1015 local $_ = shift;
784 1016
785 # we now weed out all tags we do not support 1017 # we now weed out all tags we do not support
786 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1018 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1019 }{
1020 "&lt;"
1021 }gex;
1022
787 # now all entities 1023 # now all entities
788 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1024 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
789 1025
790 # handle some elements 1026 # handle some elements
791 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1027 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
838 $self->{$type} = $text; 1074 $self->{$type} = $text;
839 } else { 1075 } else {
840 $self->logprint ("msg: ", $text); 1076 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood 1077 return if $color < 0; # negative color == ignore if not understood
842 1078
843 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1079 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
844 1080
845 ## try to create single paragraphs of multiple lines sent by the server 1081 ## try to create single paragraphs of multiple lines sent by the server
846 # no longer neecssary with TRT servers 1082 # no longer neecssary with TRT servers
847 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1083 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
848 1084
849 ::message ({ fg => $fg, markup => $_ })
850 for split /\n/, $text; 1085 for (split /\n/, $text) {
1086 ::message ({
1087 fg => $fg,
1088 markup => $_,
1089 type => $type,
1090 extra => [@extra],
1091 color_flags => $color, #d# ugly, kill
1092 });
1093
1094 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1095 # actually, this is an ugly design. _we_ should control the channels,
1096 # not some random other widget, as the channels are clearly protocol-specific.
1097 # then we could also react to flags such as CLEAR without resorting to
1098 # hacks such as color_flags, above.
1099 }
851 1100
852 $self->{statusbox}->add ($text, 1101 $self->{statusbox}->add ($text,
853 group => $text, 1102 group => $text,
854 fg => $fg, 1103 fg => $fg,
855 timeout => $color >= 2 ? 180 : 10, 1104 timeout => $color >= 2 ? 180 : 10,
856 tooltip_font => $::FONT_FIXED, 1105 tooltip_font => $::FONT_FIXED,
857 ); 1106 ) if $type eq "info";
858 } 1107 }
859} 1108}
860 1109
861sub spell_add { 1110sub spell_add {
862 my ($self, $spell) = @_; 1111 my ($self, $spell) = @_;
… …
866 $spell->{message} =~ s/\n+$//; 1115 $spell->{message} =~ s/\n+$//;
867 $spell->{message} ||= "Server did not provide a description for this spell."; 1116 $spell->{message} ||= "Server did not provide a description for this spell.";
868 1117
869 $::SPELL_LIST->add_spell ($spell); 1118 $::SPELL_LIST->add_spell ($spell);
870 1119
871 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1120 $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}); 1121 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
873} 1122}
874 1123
875sub spell_delete { 1124sub spell_delete {
876 my ($self, $spell) = @_; 1125 my ($self, $spell) = @_;
877 1126
… …
888sub addme_success { 1137sub addme_success {
889 my ($self) = @_; 1138 my ($self) = @_;
890 1139
891 my %skill_help; 1140 my %skill_help;
892 1141
893 for my $node (CFPlus::Pod::find skill_description => "*") { 1142 for my $node (DC::Pod::find skill_description => "*") {
894 my (undef, @par) = CFPlus::Pod::section_of $node; 1143 my (undef, @par) = DC::Pod::section_of $node;
895 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
896 }; 1145 };
897 1146
898 for my $skill (values %{$self->{skill_info}}) { 1147 for my $skill (values %{$self->{skill_info}}) {
899 $self->{map_widget}->add_command ("ready_skill $skill", 1148 $self->{map_widget}->add_command ("ready_skill $skill",
900 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1149 (DC::asxml "Ready the skill '$skill'\n\n")
901 . $skill_help{$skill}); 1150 . $skill_help{$skill});
902 $self->{map_widget}->add_command ("use_skill $skill", 1151 $self->{map_widget}->add_command ("use_skill $skill",
903 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1152 (DC::asxml "Immediately use the skill '$skill'\n\n")
904 . $skill_help{$skill}); 1153 . $skill_help{$skill});
905 } 1154 }
906} 1155}
907 1156
908sub eof { 1157sub eof {
… …
911 $self->{map_widget}->clr_commands; 1160 $self->{map_widget}->clr_commands;
912 1161
913 ::stop_game (); 1162 ::stop_game ();
914} 1163}
915 1164
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 { 1165sub update_floorbox {
951 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1166 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
952 return unless $::CONN; 1167 return unless $::CONN;
953 1168
954 $::FLOORBOX->clear; 1169 $::FLOORBOX->clear;
1170
1171 my @add;
955 1172
956 my $row; 1173 my $row;
957 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1174 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
958 if ($row < 6) { 1175 if ($row < 6) {
959 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
960 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
961 CFPlus::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
962 1179
1180 push @add,
963 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1181 0, $row, $_->{face_widget},
964 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1182 1, $row, $_->{desc_widget};
965 1183
966 $row++; 1184 $row++;
967 } else { 1185 } else {
968 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
969 text => "More...", 1187 text => "More...",
970 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
971 ); 1189 ;
972 last; 1190 last;
973 } 1191 }
974 } 1192 }
975 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
976 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
977 text => "Close container", 1195 text => "Close container",
978 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
979 ); 1197 ;
980 } 1198 }
1199
1200 $::FLOORBOX->add_at (@add);
981 }); 1201 });
982 1202
983 $::WANT_REFRESH++; 1203 $::WANT_REFRESH = 1;
984} 1204}
985 1205
986sub set_opencont { 1206sub set_opencont {
987 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
988 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
989 update_floorbox; 1209 update_floorbox;
990 1210
991 $::INV_RIGHT_HB->clear (); 1211 $::INVR_HB->clear ();
992 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
993 1213
994 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
995 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
996 text => "Close container", 1216 text => "Close container",
997 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
998 on_activate => sub { 1218 on_activate => sub {
999 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1000 if $tag != 0; 1220 if $tag != 0;
1001 #if $CONN->{open_container} != 0;
1002 0 1221 0
1003 }, 1222 },
1004 ); 1223 );
1005 } 1224 }
1006 1225
… …
1008} 1227}
1009 1228
1010sub update_containers { 1229sub update_containers {
1011 my ($self) = @_; 1230 my ($self) = @_;
1012 1231
1013 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1014 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
1015 or return; 1234 or return;
1016 1235
1017 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
1018 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1055sub item_update { 1274sub item_update {
1056 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
1057 1276
1058 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1059 1278
1060 CFPlus::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
1061 1280
1062 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1063 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
1064 1283
1065 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
1066 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1067 1286
1068 } else { 1287 } else {
1069 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
1070 $self->update_containers; 1289 $self->update_containers;
1071 } 1290 }
… …
1082 1301
1083 my $weight = .001 * $self->{player}{weight}; 1302 my $weight = .001 * $self->{player}{weight};
1084 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1085 1304
1086 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1087 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1088 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1089} 1308}
1090 1309
1091sub update_server_info { 1310sub update_server_info {
1092 my ($self) = @_; 1311 my ($self) = @_;
… …
1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1324 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1325 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1107 . "map size $self->{mapw}×$self->{maph}\n" 1326 . "map size $self->{mapw}×$self->{maph}\n"
1108 ); 1327 );
1109 1328
1110 ::setup_build_button ($self->{editor_support}->{builder_ui});
1111} 1329}
1112 1330
1113sub logged_in { 1331sub logged_in {
1114 my ($self) = @_; 1332 my ($self) = @_;
1115 1333
1116 $self->send_ext_req (cfplus_support => version => 1, sub { 1334 $self->send_ext_req (cfplus_support => version => 2, sub {
1335 my (%msg) = @_;
1336
1117 $self->{cfplus_ext} = $_[0]{version}; 1337 $self->{cfplus_ext} = $msg{version};
1118 $self->update_server_info; 1338 $self->update_server_info;
1119 1339
1120 if ($self->{cfplus_ext} >= 2) { 1340 if ($self->{cfplus_ext} >= 2) {
1121 $self->send_ext_req ("editor_support", sub { 1341 $self->send_ext_req ("editor_support", sub {
1122 $self->{editor_support} = $_[0]; 1342 $self->{editor_support} = { @_ };
1123 $self->update_server_info; 1343 $self->update_server_info;
1124 1344
1125 0 1345 0
1126 }); 1346 });
1127 } 1347 }
… …
1129 0 1349 0
1130 }); 1350 });
1131 1351
1132 $self->update_server_info; 1352 $self->update_server_info;
1133 1353
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; 1354 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1137 $self->send_command ("pickup $::CFG->{pickup}"); 1355 $self->send_command ("pickup $::CFG->{pickup}");
1138} 1356}
1139 1357
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 { 1358sub lookat {
1149 my ($self, $x, $y) = @_; 1359 my ($self, $x, $y) = @_;
1150 1360
1151 if ($self->{cfplus_ext}) { 1361 if ($self->{cfplus_ext}) {
1152 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1362 $self->send_ext_req (lookat => $x, $y, sub {
1153 my ($msg) = @_; 1363 my (%msg) = @_;
1154 1364
1155 if (exists $msg->{npc_dialog}) { 1365 if (exists $msg{npc_dialog}) {
1156 # start npc chat dialog 1366 # start npc chat dialog
1157 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1367 $self->{npc_dialog} = new DC::NPCDialog::
1158 dx => $x, 1368 token => $msg{npc_dialog},
1159 dy => $y,
1160 title => "$msg->{npc_dialog} (NPC)", 1369 title => "$msg{npc_dialog}[0] (NPC)",
1161 conn => $self, 1370 conn => $self,
1162 ; 1371 ;
1163 } 1372 }
1164 }); 1373 });
1165 } 1374 }
… …
1176 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
1177 1386
1178 %$self = (); 1387 %$self = ();
1179} 1388}
1180 1389
1181package CFPlus::NPCDialog; 1390package DC::NPCDialog;
1182 1391
1183our @ISA = 'CFPlus::UI::Toplevel'; 1392our @ISA = 'DC::UI::Toplevel';
1184 1393
1185sub new { 1394sub new {
1186 my $class = shift; 1395 my $class = shift;
1187 1396
1188 my $self = $class->SUPER::new ( 1397 my $self = $class->SUPER::new (
… …
1195 kw => { hi => 0, yes => 0, no => 0 }, 1404 kw => { hi => 0, yes => 0, no => 0 },
1196 has_close_button => 1, 1405 has_close_button => 1,
1197 @_, 1406 @_,
1198 ); 1407 );
1199 1408
1200 CFPlus::weaken (my $this = $self); 1409 DC::weaken (my $this = $self);
1201 1410
1202 $self->connect (delete => sub { $this->destroy; 1 }); 1411 $self->connect (delete => sub { $this->destroy; 1 });
1203 1412
1204 # better use a pane... 1413 # better use a pane...
1205 $self->add (my $hbox = new CFPlus::UI::HBox); 1414 $self->add (my $hbox = new DC::UI::HBox);
1206 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1415 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1207 1416
1208 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1417 $hbox->add (my $vbox = new DC::UI::VBox);
1209 1418
1210 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1419 $vbox->add (new DC::UI::Label text => "Message Entry:");
1211 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1420 $vbox->add ($self->{entry} = new DC::UI::Entry
1212 tooltip => "#npc_message_entry", 1421 tooltip => "#npc_message_entry",
1213 on_activate => sub { 1422 on_activate => sub {
1214 my ($entry, $text) = @_; 1423 my ($entry, $text) = @_;
1215 1424
1216 return unless $text =~ /\S/; 1425 return unless $text =~ /\S/;
… …
1220 1429
1221 0 1430 0
1222 }, 1431 },
1223 ); 1432 );
1224 1433
1225 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1434 $vbox->add ($self->{options} = new DC::UI::VBox);
1226 1435
1227 $self->{bye_button} = new CFPlus::UI::Button 1436 $self->{bye_button} = new DC::UI::Button
1228 text => "Bye (close)", 1437 text => "Bye (close)",
1229 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1438 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1230 on_activate => sub { $this->destroy; 1 }, 1439 on_activate => sub { $this->destroy; 1 },
1231 ; 1440 ;
1232 1441
1233 $self->update_options; 1442 $self->update_options;
1234 1443
1235 $self->{id} = $self->{conn}->send_ext_req ( 1444 $self->{id} = "npc-channel-" . $self->{conn}->token;
1236 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1445 $self->{conn}->connect_ext ($self->{id} => sub {
1237 sub { $this && $this->feed (@_) } 1446 $this->feed (@_) if $this;
1238 ); 1447 });
1448
1449 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1239 1450
1240 $self->{entry}->grab_focus; 1451 $self->{entry}->grab_focus;
1241 1452
1242 $self->{textview}->add_paragraph ({ 1453 $self->{textview}->add_paragraph ({
1243 fg => [1, 1, 0, 1], 1454 fg => [1, 1, 0, 1],
… …
1249}; 1460};
1250 1461
1251sub update_options { 1462sub update_options {
1252 my ($self) = @_; 1463 my ($self) = @_;
1253 1464
1254 CFPlus::weaken $self; 1465 DC::weaken $self;
1255 1466
1256 $self->{options}->clear; 1467 $self->{options}->clear;
1257 $self->{options}->add ($self->{bye_button}); 1468 $self->{options}->add ($self->{bye_button});
1258 1469
1259 for my $kw (sort keys %{ $self->{kw} }) { 1470 for my $kw (sort keys %{ $self->{kw} }) {
1260 $self->{options}->add (new CFPlus::UI::Button 1471 $self->{options}->add (new DC::UI::Button
1261 text => $kw, 1472 text => $kw,
1262 on_activate => sub { 1473 on_activate => sub {
1263 $self->send ($kw); 1474 $self->send ($kw);
1264 0 1475 0
1265 }, 1476 },
1266 ); 1477 );
1267 } 1478 }
1268} 1479}
1269 1480
1270sub feed { 1481sub feed {
1271 my ($self, $msg) = @_; 1482 my ($self, $type, @arg) = @_;
1272 1483
1273 CFPlus::weaken $self; 1484 DC::weaken $self;
1274 1485
1275 if ($msg->{msgtype} eq "reply") { 1486 if ($type eq "update") {
1487 my (%info) = @arg;
1488
1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1489 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1490 $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 1491
1492 if (exists $info{msg}) {
1493 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1494 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1495 my @link;
1496 $text =~ s{
1497 ($match)
1498 }{
1499 my $kw = $1;
1500
1501 push @link, new DC::UI::Label
1502 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1503 can_hover => 1,
1504 can_events => 1,
1505 padding_x => 0,
1506 padding_y => 0,
1507 on_button_up => sub {
1508 $self->send ($kw);
1509 };
1510
1511 "\x{fffc}"
1512 }giex;
1513
1300 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1514 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1301 $self->{textview}->scroll_to_bottom; 1515 $self->{textview}->scroll_to_bottom;
1516 }
1517
1302 $self->update_options; 1518 $self->update_options;
1303 } else { 1519 } else {
1304 $self->destroy; 1520 $self->destroy;
1305 } 1521 }
1306 1522
… …
1308} 1524}
1309 1525
1310sub send { 1526sub send {
1311 my ($self, $msg) = @_; 1527 my ($self, $msg) = @_;
1312 1528
1313 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1529 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1314 $self->{textview}->scroll_to_bottom; 1530 $self->{textview}->scroll_to_bottom;
1315 1531
1316 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1532 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1317} 1533}
1318 1534
1319sub destroy { 1535sub destroy {
1320 my ($self) = @_; 1536 my ($self) = @_;
1321 1537
1322 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1538 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1323 1539
1324 if ($self->{conn}) { 1540 if ($self->{conn}) {
1325 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1541 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1326 delete $self->{conn}{npc_dialog}; 1542 delete $self->{conn}{npc_dialog};
1327 $self->{conn}->disconnect_ext ($self->{id}); 1543 $self->{conn}->disconnect_ext ($self->{id});
1328 } 1544 }
1329 1545
1330 $self->SUPER::destroy; 1546 $self->SUPER::destroy;

Diff Legend

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