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.196 by root, Thu May 8 21:30:23 2008 UTC

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

Diff Legend

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