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

Diff Legend

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