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

Diff Legend

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