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.117 by root, Fri Jul 13 05:31:31 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 "res-metadata" => $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 "res-metadata" => $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 }
98 });
99
100 $self->connect_ext (event_capabilities => sub {
101 my ($cap) = @_;
102
103 if (my $ts = $cap->{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]);
108
109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
110 my $h = int $self->{maph} * 32 / $self->{tilesize};
111
112 $self->setup_req (mapsize => "${w}x${h}");
113 }
114 }
115 });
116 50
117 $self->{json_coder} 51 $self->{json_coder}
118 ->convert_blessed 52 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
120 $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 }
121 }); 61 });
122 62
123 $self->connect_ext (ws_n => sub { 63 # destroy widgets on logout
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
128 };
129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $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 {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 66 $_->destroy
217 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
218 } 68 }
… …
220 70
221 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
222 for @cmd_help; 72 for @cmd_help;
223 73
224 { 74 {
225 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
226 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
227 $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}});
228 } 78 }
229 79
230 { 80 {
231 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
232 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
233 $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}});
234 } 84 }
235 85
236 $self->{open_container} = 0; 86 $self->{open_container} = 0;
237 87
… …
239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
240 90
241 $self 91 $self
242} 92}
243 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
244sub logprint { 367sub logprint {
245 my ($self, @a) = @_; 368 my ($self, @a) = @_;
246 369
247 $self->{log_fh} ||= do { 370 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
248 my $path = "$Crossfire::VARDIR/log.$self->{host}";
249
250 open my $fh, ">>:utf8", $path
251 or die "Couldn't open logfile $path: $!";
252
253 $fh->autoflush (1);
254
255 $fh;
256 };
257
258 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
259
260 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
261 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
262
263 print {$self->{log_fh}} "$ts ", @a, "\n";
264} 371}
265 372
266sub _stat_numdiff { 373sub _stat_numdiff {
267 my ($self, $name, $old, $new) = @_; 374 my ($self, $name, $old, $new) = @_;
268 375
… …
352 459
353 if ( 460 if (
354 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 461 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
355 ) { 462 ) {
356 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 463 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
357 $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);
358 } 465 }
359 466
360 $self->update_stats_window ($stats, $prev); 467 $self->update_stats_window ($stats, $prev);
361 468
362 $self->{prev_stats} = { %$stats }; 469 $self->{prev_stats} = { %$stats };
… …
401 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 508 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
402 $::GAUGES->{food} ->set_value ($fo, $fo_m); 509 $::GAUGES->{food} ->set_value ($fo, $fo_m);
403 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 510 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 511 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
405 . " (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});
406 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 514 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
407 my $title = $stats->{+CS_STAT_TITLE}; 515 my $title = $stats->{+CS_STAT_TITLE};
408 $title =~ s/^Player: //; 516 $title =~ s/^Player: //;
409 $::STATWIDS->{title} ->set_text ("Title: " . $title); 517 $::STATWIDS->{title} ->set_text ("Title: " . $title);
410 518
… …
428 for keys %RES_TBL; 536 for keys %RES_TBL;
429 537
430 my $sktbl = $::STATWIDS->{skill_tbl}; 538 my $sktbl = $::STATWIDS->{skill_tbl};
431 my @skills = keys %{ $self->{skill_info} }; 539 my @skills = keys %{ $self->{skill_info} };
432 540
433 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
434 $sktbl->clear; 549 $sktbl->clear;
435 550
551 my $sw = $self->{skillwid}{""} ||= [
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 552 0, 0, (new DC::UI::Label text => "Experience", align => 1),
437 $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),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 555 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 556 4, 0, (new DC::UI::Label text => "Experience", align => 1),
440 $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),
441 $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;
442 563
443 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>";
444 565
445 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);
446 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);
447 568
448 my ($x, $y) = (0, 1); 569 my ($x, $y) = (0, 1);
449 for ( 570 for (@order) {
450 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
451 map [$_, $self->{skill_info}{$_}],
452 grep exists $stats->{$_},
453 @skills
454 ) {
455 my ($idx, $name) = @$_; 571 my ($idx, $name) = @$_;
456 572
457 my $spell_cb = sub { 573 my $spell_cb = sub {
458 my ($widget, $ev) = @_; 574 my ($widget, $ev) = @_;
459 575
460 if ($ev->{button} == 1) { 576 if ($ev->{button} == 1) {
461 $::CONN->user_send ("ready_skill $name"); 577 $::CONN->user_send ("ready_skill $name");
462 } elsif ($ev->{button} == 2) { 578 } elsif ($ev->{button} == 2) {
463 $::CONN->user_send ("use_skill $name"); 579 $::CONN->user_send ("use_skill $name");
464 } elsif ($ev->{button} == 3) { 580 } elsif ($ev->{button} == 3) {
465 my $shortname = CFPlus::shorten $name, 14; 581 my $shortname = DC::shorten $name, 14;
466 (new CFPlus::UI::Menu 582 (new DC::UI::Menu
467 items => [ 583 items => [
468 ["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"] }],
469 ["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"] }],
470 ], 586 ],
471 )->popup ($ev); 587 )->popup ($ev);
472 } else { 588 } else {
473 return 0; 589 return 0;
474 } 590 }
475 591
476 1 592 1
477 }; 593 };
478 594
479 $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
480 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),
481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 599
600 # level
601 (new DC::UI::Label
482 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
483 $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,
484 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 ;
485 618
486 $x++ and ($x, $y) = (0, $y + 1); 619 $x++ and ($x, $y) = (0, $y + 1);
487 } 620 }
488 }
489 621
490 for (grep exists $stats->{$_}, @skills) { 622 $sktbl->add_at (@add);
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
493 } 623 }
494}
495 624
496sub macro_send { 625 for (@order) {
497 my ($self, $macro) = @_; 626 my ($idx, $name) = @$_;
627 my $val = $stats->{$idx};
498 628
499 for my $cmd (@{ $macro->{action} }) { 629 next if $prev->{$idx}[1] eq $val->[1];
500 $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);
501 } 638 }
502} 639}
503 640
504sub user_send { 641sub user_send {
505 my ($self, $command) = @_; 642 my ($self, $command) = @_;
… …
507 $self->{record}->($command) 644 $self->{record}->($command)
508 if $self->{record}; 645 if $self->{record};
509 646
510 $self->logprint ("send: ", $command); 647 $self->logprint ("send: ", $command);
511 $self->send_command ($command); 648 $self->send_command ($command);
512 ::status ($command);
513} 649}
514 650
515sub record { 651sub record {
516 my ($self, $cb) = @_; 652 my ($self, $cb) = @_;
517 653
… …
525} 661}
526 662
527sub feed_map1a { 663sub feed_map1a {
528 my ($self, $data) = @_; 664 my ($self, $data) = @_;
529 665
530 $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 {
531 $self->{map_widget}->update; 694 $self->{map_widget}->update;
695 }
532} 696}
533 697
534sub magicmap { 698sub magicmap {
535 my ($self, $w, $h, $x, $y, $data) = @_; 699 my ($self, $w, $h, $x, $y, $data) = @_;
536 700
… …
543 my $map_info = delete $self->{map_info} 707 my $map_info = delete $self->{map_info}
544 or return; 708 or return;
545 709
546 my ($hash, $x, $y, $w, $h) = @$map_info; 710 my ($hash, $x, $y, $w, $h) = @$map_info;
547 711
548 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;
549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 714 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
551} 715}
552 716
553sub map_clear { 717sub map_clear {
554 my ($self) = @_; 718 my ($self) = @_;
555 719
… …
561} 725}
562 726
563sub bg_fetch { 727sub bg_fetch {
564 my ($self) = @_; 728 my ($self) = @_;
565 729
566 my $id; 730 my $tile;
567 731
568 do { 732 do {
569 $id = pop @{$self->{bg_fetch}} 733 $tile = pop @{$self->{bg_fetch}}
570 or return; 734 or return;
571 } while $self->{texture}[$id]; 735 } while $self->{texture}[$tile];
572 736
573 CFPlus::DB::get tilecache => $id, sub { 737 DC::DB::get tilecache => $tile, sub {
574 my ($data) = @_; 738 my ($data) = @_;
575 739
576 return unless $self->{map}; # stop when destroyed 740 return unless $self->{map}; # stop when destroyed
577 741
578 $self->set_texture ($id => $data)
579 if defined $data; 742 if (defined $data) {
743 $self->have_tile ($tile, $data);
744 $self->{texture}[$tile]->upload;
745 }
580 746
581 $self->bg_fetch; 747 $self->bg_fetch;
582 }; 748 };
583} 749}
584 750
585sub load_map($$$) { 751sub load_map($$$) {
586 my ($self, $hash, $x, $y) = @_; 752 my ($self, $hash, $x, $y) = @_;
587 753
588 my $gen = $self->{map_change_gen}; 754 my $gen = $self->{map_change_gen};
589 755
590 CFPlus::DB::get $self->{mapcache} => $hash, sub { 756 my $cb = sub {
591 return unless $gen == $self->{map_change_gen}; 757 return unless $gen == $self->{map_change_gen};
592 758
593 my ($data) = @_; 759 my ($data) = @_;
594 760
595 if (defined $data) { 761 if (defined $data) {
762 $self->{map_cache_new}{$hash} = \$data;
763
596 $data = Compress::LZF::decompress $data; 764 my $data = Compress::LZF::decompress $data;
597 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
598 765
599 my $inprogress = @{ $self->{bg_fetch} || [] }; 766 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 767 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress; 768 $self->bg_fetch unless $inprogress;
602 } 769 }
603 }; 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 }
604} 777}
605 778
606# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 779# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
607# (server resource,s latency, bandwidth), so this hack is warranted. 780# (server resource,s latency, bandwidth), so this hack is warranted.
608# 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
… …
701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 874 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
702 875
703 $self->flush_map; 876 $self->flush_map;
704 877
705 ++$self->{map_change_gen}; 878 ++$self->{map_change_gen};
879 $self->{map_cache_old} = delete $self->{map_cache_new};
706 880
707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 881 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
708 882
709 my $mapmapw = $self->{mapmap}->{w}; 883 my $mapmapw = $self->{mapmap}->{w};
710 my $mapmaph = $self->{mapmap}->{h}; 884 my $mapmaph = $self->{mapmap}->{h};
… …
729} 903}
730 904
731sub face_find { 905sub face_find {
732 my ($self, $facenum, $face, $cb) = @_; 906 my ($self, $facenum, $face, $cb) = @_;
733 907
734 my $hash = "$face->{chksum},$face->{name}"; 908 if ($face->{type} == 0) { # FT_FACE
735
736 my $id = CFPlus::DB::get_tile_id_sync $hash; 909 my $id = DC::DB::get_tile_id_sync $face->{name};
737 910
738 $face->{id} = $id; 911 $face->{id} = $id;
739 $self->{faceid}[$facenum] = $id;
740
741 $self->{map}->set_tileid ($facenum => $id); 912 $self->{map}->set_tileid ($facenum => $id);
742 913
743 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 }
744} 922}
745 923
746sub face_update { 924sub face_update {
747 my ($self, $facenum, $face, $changed) = @_; 925 my ($self, $facenum, $face, $changed) = @_;
748 926
927 if ($face->{type} == 0) {
928 # image, FT_FACE
749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 929 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
750 if $changed; 930 if $changed;
751 931
752 $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 }
753} 965}
754 966
755sub smooth_update { 967sub smooth_update {
756 my ($self, $facenum, $face) = @_; 968 my ($self, $facenum, $face) = @_;
757 969
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 970 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
759} 971}
760 972
761sub set_texture { 973sub have_tile {
762 my ($self, $id, $data) = @_; 974 my ($self, $tile, $data) = @_;
763 975
764 $self->{texture}[$id] = my $tex = 976 return unless $self->{map};
765 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,
766 $data, minify => 1, mipmap => 1; 982 minify => 1, mipmap => 1;
767 983
768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 984 if (my $cbs = delete $self->{tile_cb}{$tile}) {
769 $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)
770} 1018}
771 1019
772sub sound_play { 1020sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 1021 my ($self, $type, $face, $dx, $dy, $vol) = @_;
774 1022
775 $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
776} 1025}
777 1026
778my $LAST_QUERY; # server is stupid, stupid, stupid 1027my $LAST_QUERY; # server is stupid, stupid, stupid
779 1028
780sub query { 1029sub query {
… …
788 1037
789sub sanitise_xml($) { 1038sub sanitise_xml($) {
790 local $_ = shift; 1039 local $_ = shift;
791 1040
792 # we now weed out all tags we do not support 1041 # we now weed out all tags we do not support
793 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
794 # now all entities 1047 # now all entities
795 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;
796 1049
797 # handle some elements 1050 # handle some elements
798 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1051 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
845 $self->{$type} = $text; 1098 $self->{$type} = $text;
846 } else { 1099 } else {
847 $self->logprint ("msg: ", $text); 1100 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood 1101 return if $color < 0; # negative color == ignore if not understood
849 1102
850 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1103 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
851 1104
852 ## 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
853 # no longer neecssary with TRT servers 1106 # no longer neecssary with TRT servers
854 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1107 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
855 1108
856 ::message ({ fg => $fg, markup => $_ })
857 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 }
858 1124
859 $self->{statusbox}->add ($text, 1125 $self->{statusbox}->add ($text,
860 group => $text, 1126 group => $text,
861 fg => $fg, 1127 fg => $fg,
862 timeout => $color >= 2 ? 180 : 10, 1128 timeout => $color >= 2 ? 180 : 10,
863 tooltip_font => $::FONT_FIXED, 1129 tooltip_font => $::FONT_FIXED,
864 ); 1130 ) if $type eq "info";
865 } 1131 }
866} 1132}
867 1133
868sub spell_add { 1134sub spell_add {
869 my ($self, $spell) = @_; 1135 my ($self, $spell) = @_;
… …
873 $spell->{message} =~ s/\n+$//; 1139 $spell->{message} =~ s/\n+$//;
874 $spell->{message} ||= "Server did not provide a description for this spell."; 1140 $spell->{message} ||= "Server did not provide a description for this spell.";
875 1141
876 $::SPELL_LIST->add_spell ($spell); 1142 $::SPELL_LIST->add_spell ($spell);
877 1143
878 $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});
879 $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});
880} 1146}
881 1147
882sub spell_delete { 1148sub spell_delete {
883 my ($self, $spell) = @_; 1149 my ($self, $spell) = @_;
884 1150
… …
895sub addme_success { 1161sub addme_success {
896 my ($self) = @_; 1162 my ($self) = @_;
897 1163
898 my %skill_help; 1164 my %skill_help;
899 1165
900 for my $node (CFPlus::Pod::find skill_description => "*") { 1166 for my $node (DC::Pod::find skill_description => "*") {
901 my (undef, @par) = CFPlus::Pod::section_of $node; 1167 my (undef, @par) = DC::Pod::section_of $node;
902 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
903 }; 1169 };
904 1170
905 for my $skill (values %{$self->{skill_info}}) { 1171 for my $skill (values %{$self->{skill_info}}) {
906 $self->{map_widget}->add_command ("ready_skill $skill", 1172 $self->{map_widget}->add_command ("ready_skill $skill",
907 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1173 (DC::asxml "Ready the skill '$skill'\n\n")
908 . $skill_help{$skill}); 1174 . $skill_help{$skill});
909 $self->{map_widget}->add_command ("use_skill $skill", 1175 $self->{map_widget}->add_command ("use_skill $skill",
910 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1176 (DC::asxml "Immediately use the skill '$skill'\n\n")
911 . $skill_help{$skill}); 1177 . $skill_help{$skill});
912 } 1178 }
913} 1179}
914 1180
915sub eof { 1181sub eof {
… …
918 $self->{map_widget}->clr_commands; 1184 $self->{map_widget}->clr_commands;
919 1185
920 ::stop_game (); 1186 ::stop_game ();
921} 1187}
922 1188
923sub image_info {
924 my ($self, $numfaces) = @_;
925
926 $self->{num_faces} = $numfaces;
927 $self->{face_prefetch} = [1 .. $numfaces];
928 $self->face_prefetch;
929}
930
931sub face_prefetch {
932 my ($self) = @_;
933
934 return unless $::CFG->{face_prefetch};
935
936 if ($self->{num_faces}) {
937 return if @{ $self->{send_queue} || [] };
938 my $todo = @{ $self->{face_prefetch} }
939 or return;
940
941 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
942
943 $self->send ("requestinfo image_sums $face $face");
944
945 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
947 } elsif (!exists $self->{num_faces}) {
948 $self->send ("requestinfo image_info");
949
950 $self->{num_faces} = 0;
951
952 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
953 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
954 }
955}
956
957sub update_floorbox { 1189sub update_floorbox {
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1190 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 1191 return unless $::CONN;
960 1192
961 $::FLOORBOX->clear; 1193 $::FLOORBOX->clear;
1194
1195 my @add;
962 1196
963 my $row; 1197 my $row;
964 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} }) {
965 if ($row < 6) { 1199 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 1200 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 1201 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 1202 DC::Item::update_widgets $_;
969 1203
1204 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1205 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1206 1, $row, $_->{desc_widget};
972 1207
973 $row++; 1208 $row++;
974 } else { 1209 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1210 push @add, 1, $row, new DC::UI::Button
976 text => "More...", 1211 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1212 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 1213 ;
979 last; 1214 last;
980 } 1215 }
981 } 1216 }
982 if ($::CONN->{open_container}) { 1217 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1218 push @add, 1, $row++, new DC::UI::Button
984 text => "Close container", 1219 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1220 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 1221 ;
987 } 1222 }
1223
1224 $::FLOORBOX->add_at (@add);
988 }); 1225 });
989 1226
990 $::WANT_REFRESH++; 1227 $::WANT_REFRESH = 1;
991} 1228}
992 1229
993sub set_opencont { 1230sub set_opencont {
994 my ($conn, $tag, $name) = @_; 1231 my ($conn, $tag, $name) = @_;
995 $conn->{open_container} = $tag; 1232 $conn->{open_container} = $tag;
996 update_floorbox; 1233 update_floorbox;
997 1234
998 $::INV_RIGHT_HB->clear (); 1235 $::INVR_HB->clear ();
999 $::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);
1000 1237
1001 if ($tag != 0) { # Floor isn't closable, is it? 1238 if ($tag != 0) { # Floor isn't closable, is it?
1002 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1239 $::INVR_HB->add (new DC::UI::Button
1003 text => "Close container", 1240 text => "Close container",
1004 tooltip => "Close the currently open container (if one is open)", 1241 tooltip => "Close the currently open container (if one is open)",
1005 on_activate => sub { 1242 on_activate => sub {
1006 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1243 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1007 if $tag != 0; 1244 if $tag != 0;
1008 #if $CONN->{open_container} != 0;
1009 0 1245 0
1010 }, 1246 },
1011 ); 1247 );
1012 } 1248 }
1013 1249
… …
1015} 1251}
1016 1252
1017sub update_containers { 1253sub update_containers {
1018 my ($self) = @_; 1254 my ($self) = @_;
1019 1255
1020 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1256 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1021 my $todo = delete $self->{update_container} 1257 my $todo = delete $self->{update_container}
1022 or return; 1258 or return;
1023 1259
1024 for my $tag (keys %$todo) { 1260 for my $tag (keys %$todo) {
1025 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1261 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1062sub item_update { 1298sub item_update {
1063 my ($self, $item) = @_; 1299 my ($self, $item) = @_;
1064 1300
1065 #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";
1066 1302
1067 CFPlus::Item::update_widgets $item; 1303 DC::Item::update_widgets $item;
1068 1304
1069 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1070 set_opencont ($::CONN, 0, "Floor"); 1306 set_opencont ($::CONN, 0, "Floor");
1071 1307
1072 } elsif ($item->{flags} & F_OPEN) { 1308 } elsif ($item->{flags} & F_OPEN) {
1073 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1074 1310
1075 } else { 1311 } else {
1076 $self->{update_container}{$item->{container}}++; 1312 $self->{update_container}{$item->{container}}++;
1077 $self->update_containers; 1313 $self->update_containers;
1078 } 1314 }
… …
1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1348 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1349 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1114 . "map size $self->{mapw}×$self->{maph}\n" 1350 . "map size $self->{mapw}×$self->{maph}\n"
1115 ); 1351 );
1116 1352
1117 ::setup_build_button ($self->{editor_support}->{builder_ui});
1118} 1353}
1119 1354
1120sub logged_in { 1355sub logged_in {
1121 my ($self) = @_; 1356 my ($self) = @_;
1122 1357
1123 $self->send_ext_req (cfplus_support => version => 1, sub { 1358 $self->send_ext_req (cfplus_support => version => 2, sub {
1359 my (%msg) = @_;
1360
1124 $self->{cfplus_ext} = $_[0]{version}; 1361 $self->{cfplus_ext} = $msg{version};
1125 $self->update_server_info; 1362 $self->update_server_info;
1126 1363
1127 if ($self->{cfplus_ext} >= 2) { 1364 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub { 1365 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0]; 1366 $self->{editor_support} = { @_ };
1130 $self->update_server_info; 1367 $self->update_server_info;
1131 1368
1132 0 1369 0
1133 }); 1370 });
1134 } 1371 }
… …
1136 0 1373 0
1137 }); 1374 });
1138 1375
1139 $self->update_server_info; 1376 $self->update_server_info;
1140 1377
1141 $self->send_command ("output-sync $::CFG->{output_sync}");
1142 $self->send_command ("output-count $::CFG->{output_count}");
1143 $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;
1144 $self->send_command ("pickup $::CFG->{pickup}"); 1379 $self->send_command ("pickup $::CFG->{pickup}");
1145} 1380}
1146 1381
1147sub buildat {
1148 my ($self, $builditem, $x, $y) = @_;
1149
1150 if ($self->{cfplus_ext}) {
1151 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1152 }
1153}
1154
1155sub lookat { 1382sub lookat {
1156 my ($self, $x, $y) = @_; 1383 my ($self, $x, $y) = @_;
1157 1384
1158 if ($self->{cfplus_ext}) { 1385 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1386 $self->send_ext_req (lookat => $x, $y, sub {
1160 my ($msg) = @_; 1387 my (%msg) = @_;
1161 1388
1162 if (exists $msg->{npc_dialog}) { 1389 if (exists $msg{npc_dialog}) {
1163 # start npc chat dialog 1390 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1391 $self->{npc_dialog} = new DC::NPCDialog::
1165 dx => $x, 1392 token => $msg{npc_dialog},
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)", 1393 title => "$msg{npc_dialog}[0] (NPC)",
1168 conn => $self, 1394 conn => $self,
1169 ; 1395 ;
1170 } 1396 }
1171 }); 1397 });
1172 } 1398 }
… …
1183 $self->SUPER::destroy; 1409 $self->SUPER::destroy;
1184 1410
1185 %$self = (); 1411 %$self = ();
1186} 1412}
1187 1413
1188package CFPlus::NPCDialog; 1414package DC::NPCDialog;
1189 1415
1190our @ISA = 'CFPlus::UI::Toplevel'; 1416our @ISA = 'DC::UI::Toplevel';
1191 1417
1192sub new { 1418sub new {
1193 my $class = shift; 1419 my $class = shift;
1194 1420
1195 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
… …
1202 kw => { hi => 0, yes => 0, no => 0 }, 1428 kw => { hi => 0, yes => 0, no => 0 },
1203 has_close_button => 1, 1429 has_close_button => 1,
1204 @_, 1430 @_,
1205 ); 1431 );
1206 1432
1207 CFPlus::weaken (my $this = $self); 1433 DC::weaken (my $this = $self);
1208 1434
1209 $self->connect (delete => sub { $this->destroy; 1 }); 1435 $self->connect (delete => sub { $this->destroy; 1 });
1210 1436
1211 # better use a pane... 1437 # better use a pane...
1212 $self->add (my $hbox = new CFPlus::UI::HBox); 1438 $self->add (my $hbox = new DC::UI::HBox);
1213 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1439 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1214 1440
1215 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1441 $hbox->add (my $vbox = new DC::UI::VBox);
1216 1442
1217 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1443 $vbox->add (new DC::UI::Label text => "Message Entry:");
1218 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1444 $vbox->add ($self->{entry} = new DC::UI::Entry
1219 tooltip => "#npc_message_entry", 1445 tooltip => "#npc_message_entry",
1220 on_activate => sub { 1446 on_activate => sub {
1221 my ($entry, $text) = @_; 1447 my ($entry, $text) = @_;
1222 1448
1223 return unless $text =~ /\S/; 1449 return unless $text =~ /\S/;
… …
1227 1453
1228 0 1454 0
1229 }, 1455 },
1230 ); 1456 );
1231 1457
1232 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1458 $vbox->add ($self->{options} = new DC::UI::VBox);
1233 1459
1234 $self->{bye_button} = new CFPlus::UI::Button 1460 $self->{bye_button} = new DC::UI::Button
1235 text => "Bye (close)", 1461 text => "Bye (close)",
1236 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.",
1237 on_activate => sub { $this->destroy; 1 }, 1463 on_activate => sub { $this->destroy; 1 },
1238 ; 1464 ;
1239 1465
1240 $self->update_options; 1466 $self->update_options;
1241 1467
1242 $self->{id} = $self->{conn}->send_ext_req ( 1468 $self->{id} = "npc-channel-" . $self->{conn}->token;
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1469 $self->{conn}->connect_ext ($self->{id} => sub {
1244 sub { $this && $this->feed (@_) } 1470 $this->feed (@_) if $this;
1245 ); 1471 });
1472
1473 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1246 1474
1247 $self->{entry}->grab_focus; 1475 $self->{entry}->grab_focus;
1248 1476
1249 $self->{textview}->add_paragraph ({ 1477 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1], 1478 fg => [1, 1, 0, 1],
… …
1256}; 1484};
1257 1485
1258sub update_options { 1486sub update_options {
1259 my ($self) = @_; 1487 my ($self) = @_;
1260 1488
1261 CFPlus::weaken $self; 1489 DC::weaken $self;
1262 1490
1263 $self->{options}->clear; 1491 $self->{options}->clear;
1264 $self->{options}->add ($self->{bye_button}); 1492 $self->{options}->add ($self->{bye_button});
1265 1493
1266 for my $kw (sort keys %{ $self->{kw} }) { 1494 for my $kw (sort keys %{ $self->{kw} }) {
1267 $self->{options}->add (new CFPlus::UI::Button 1495 $self->{options}->add (new DC::UI::Button
1268 text => $kw, 1496 text => $kw,
1269 on_activate => sub { 1497 on_activate => sub {
1270 $self->send ($kw); 1498 $self->send ($kw);
1271 0 1499 0
1272 }, 1500 },
1273 ); 1501 );
1274 } 1502 }
1275} 1503}
1276 1504
1277sub feed { 1505sub feed {
1278 my ($self, $msg) = @_; 1506 my ($self, $type, @arg) = @_;
1279 1507
1280 CFPlus::weaken $self; 1508 DC::weaken $self;
1281 1509
1282 if ($msg->{msgtype} eq "reply") { 1510 if ($type eq "update") {
1511 my (%info) = @arg;
1512
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1513 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1514 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306 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
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1538 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom; 1539 $self->{textview}->scroll_to_bottom;
1540 }
1541
1309 $self->update_options; 1542 $self->update_options;
1310 } else { 1543 } else {
1311 $self->destroy; 1544 $self->destroy;
1312 } 1545 }
1313 1546
… …
1315} 1548}
1316 1549
1317sub send { 1550sub send {
1318 my ($self, $msg) = @_; 1551 my ($self, $msg) = @_;
1319 1552
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1553 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1321 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1322 1555
1323 $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);
1324} 1557}
1325 1558
1326sub destroy { 1559sub destroy {
1327 my ($self) = @_; 1560 my ($self) = @_;
1328 1561
1329 #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
1330 1563
1331 if ($self->{conn}) { 1564 if ($self->{conn}) {
1332 $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};
1333 delete $self->{conn}{npc_dialog}; 1566 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id}); 1567 $self->{conn}->disconnect_ext ($self->{id});
1335 } 1568 }
1336 1569
1337 $self->SUPER::destroy; 1570 $self->SUPER::destroy;

Diff Legend

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