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

Diff Legend

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