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

Diff Legend

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