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.88 by root, Sun Nov 19 20:31:29 2006 UTC vs.
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
20 30
21 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
22 32
23 my @cmd_help = map { 33 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 45 for @args;
36 46
37 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
39 @args 49 @args
40 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
42 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
225 });
226
227 # widget get
228 $self->connect_ext (w_g => sub {
229 my ($arg) = @_;
230
231 my $w = $self->{widget}{$arg->{id}}
232 or return;
233
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
235 });
236
237 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) {
240 $_->destroy
241 for values %{delete $ws->{w} || {}};
242 }
243 });
244
43 $self->{map_widget}->add_command (@$_) 245 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 246 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 247
49 { 248 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 249 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 250 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 251 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 252 }
54 253
254 {
255 $self->{noface} = my $tex = new_from_file CFPlus::Texture
256 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
257 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
258 }
259
55 $self->{open_container} = 0; 260 $self->{open_container} = 0;
56 261
57 # "global"
58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
62
63 # per server 262 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 263 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 264
67 $self 265 $self
68} 266}
69 267
70sub logprint { 268sub logprint {
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 425 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 426 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 427 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 428 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 429 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 430 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233 $rng =~ s/^Range: //; # thank you so much dear server
234 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
235 my $title = $stats->{+CS_STAT_TITLE}; 431 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 432 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 433 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 434
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 435 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
259 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
260 456
261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262 $sktbl->clear; 458 $sktbl->clear;
263 459
460 my @add;
461
462 push @add,
264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
270 470
271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272 472
273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
288 if ($ev->{button} == 1) { 488 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 489 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 490 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 491 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 492 } elsif ($ev->{button} == 3) {
493 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 494 (new CFPlus::UI::Menu
294 items => [ 495 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 496 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 497 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 498 ],
298 )->popup ($ev); 499 )->popup ($ev);
299 } else { 500 } else {
300 return 0; 501 return 0;
301 } 502 }
302 503
303 1 504 1
304 }; 505 };
305 506
507 push @add,
306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
307 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
308 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
309 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
310 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ;
312 515
313 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
314 } 517 }
518
519 $sktbl->add_at (@add);
315 } 520 }
316 521
317 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 525 }
321} 526}
322 527
528sub macro_send {
529 my ($self, $macro) = @_;
530
531 for my $cmd (@{ $macro->{action} }) {
532 $self->send_command ($cmd);
533 }
534}
535
323sub user_send { 536sub user_send {
324 my ($self, $command) = @_; 537 my ($self, $command) = @_;
325 538
326 push @{$self->{record}}, $command 539 $self->{record}->($command)
327 if $self->{record}; 540 if $self->{record};
328 541
329 $self->logprint ("send: ", $command); 542 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 543 $self->send_command ($command);
331 ::status ($command); 544 ::status ($command);
332} 545}
333 546
334sub start_record { 547sub record {
335 my ($self) = @_; 548 my ($self, $cb) = @_;
336 549
337 $self->{record} = []; 550 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 551}
344 552
345sub map_scroll { 553sub map_scroll {
346 my ($self, $dx, $dy) = @_; 554 my ($self, $dx, $dy) = @_;
347 555
… …
368 or return; 576 or return;
369 577
370 my ($hash, $x, $y, $w, $h) = @$map_info; 578 my ($hash, $x, $y, $w, $h) = @$map_info;
371 579
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 580 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 581 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 582 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
375} 583}
376 584
377sub map_clear { 585sub map_clear {
378 my ($self) = @_; 586 my ($self) = @_;
… …
382 590
383 $self->{map}->clear; 591 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 592 delete $self->{map_widget}{magicmap};
385} 593}
386 594
595sub bg_fetch {
596 my ($self) = @_;
597
598 my $id;
599
600 do {
601 $id = pop @{$self->{bg_fetch}}
602 or return;
603 } while $self->{texture}[$id];
604
605 CFPlus::DB::get tilecache => $id, sub {
606 my ($data) = @_;
607
608 return unless $self->{map}; # stop when destroyed
609
610 $self->set_texture ($id => $data)
611 if defined $data;
612
613 $self->bg_fetch;
614 };
615}
387 616
388sub load_map($$$) { 617sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 618 my ($self, $hash, $x, $y) = @_;
390 619
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 620 my $gen = $self->{map_change_gen};
621
622 CFPlus::DB::get $self->{mapcache} => $hash, sub {
623 return unless $gen == $self->{map_change_gen};
624
625 my ($data) = @_;
626
627 if (defined $data) {
392 $data = Compress::LZF::decompress $data; 628 $data = Compress::LZF::decompress $data;
393 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 629 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
394 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395 my $data = $self->{tilecache}->get ($id)
396 or next;
397 630
398 $self->set_texture ($id => $data); 631 my $inprogress = @{ $self->{bg_fetch} || [] };
632 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
633 $self->bg_fetch unless $inprogress;
399 } 634 }
400 } 635 };
401} 636}
402 637
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 638# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 639# (server resource,s latency, bandwidth), so this hack is warranted.
405# the right fix is to make real tiled maps with an overview file 640# the right fix is to make real tiled maps with an overview file
… …
469 704
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 705 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 706 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 707
473 } else { 708 } else {
709 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 710 $self->send_mapinfo ("spatial $path$tile", sub {
711 return unless $gen == $self->{map_change_gen};
712
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 713 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 714
477 return if $mode ne "spatial"; 715 return if $mode ne "spatial";
478 716
479 $x += $self->{map}->ox; 717 $x += $self->{map}->ox;
… …
493 731
494sub map_change { 732sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 733 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 734
497 $self->flush_map; 735 $self->flush_map;
736
737 ++$self->{map_change_gen};
498 738
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 739 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 740
501 my $mapmapw = $self->{mapmap}->{w}; 741 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 742 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 759 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 760 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 761}
522 762
523sub face_find { 763sub face_find {
524 my ($self, $facenum, $face) = @_; 764 my ($self, $facenum, $face, $cb) = @_;
525 765
526 my $hash = "$face->{chksum},$face->{name}"; 766 my $hash = "$face->{chksum},$face->{name}";
527 767
528 my $id = $self->{facemap}->get ($hash); 768 my $id = CFPlus::DB::get_tile_id_sync $hash;
529 769
530 unless ($id) {
531 # create new id for face
532 # I love transactions
533 for (1..100) {
534 my $txn = $CFPlus::DB_ENV->txn_begin;
535 my $status = $self->{facemap}->db_get (id => $id);
536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
537 $id = ($id || 64) + 1;
538 if ($self->{facemap}->put (id => $id) == 0
539 && $self->{facemap}->put ($hash => $id) == 0) {
540 $txn->txn_commit;
541
542 goto gotid;
543 }
544 }
545 $txn->txn_abort;
546 }
547
548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549 }
550
551gotid:
552 $face->{id} = $id; 770 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d# 771 $self->{faceid}[$facenum] = $id;
555 772
556 my $face = $self->{tilecache}->get ($id); 773 $self->{map}->set_tileid ($facenum => $id);
557 774
558 if ($face) { 775 CFPlus::DB::get tilecache => $id, $cb;
559 #$self->face_prefetch;
560 $face
561 } else {
562 my $tex = $self->{noface};
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 };
566} 776}
567 777
568sub face_update { 778sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 779 my ($self, $facenum, $face, $changed) = @_;
570 780
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
782 if $changed;
572 783
573 $self->set_texture ($face->{id} => delete $face->{image}); 784 $self->set_texture ($face->{id} => delete $face->{image});
785}
786
787sub smooth_update {
788 my ($self, $facenum, $face) = @_;
789
790 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
574} 791}
575 792
576sub set_texture { 793sub set_texture {
577 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
578 795
796 return unless $self->{map};
797
579 $self->{texture}[$id] ||= do { 798 $self->{texture}[$id] = my $tex =
580 my $tex =
581 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
582 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
583 801
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
585 $self->{map_widget}->update; 803 $self->{map_widget}->update;
586 804
587 $tex 805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806}
807
808sub connect_face_update {
809 my ($self, $id, $cb) = @_;
810
811 push @{$self->{face_cb}{$id}}, $cb;
812
813 CFPlus::guard {
814 @{$self->{face_cb}{$id}}
815 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}};
588 }; 817 }
589} 818}
590 819
591sub sound_play { 820sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
593 822
… …
603 $LAST_QUERY = $prompt; 832 $LAST_QUERY = $prompt;
604 833
605 $self->{query}-> ($self, $flags, $prompt); 834 $self->{query}-> ($self, $flags, $prompt);
606} 835}
607 836
608sub drawinfo { 837sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 838 local $_ = shift;
610 839
611 my @color = ( 840 # we now weed out all tags we do not support
841 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
842 # now all entities
843 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
844
845 # handle some elements
846 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
847 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
848
849 $_
850}
851
852our %NAME_TO_COLOR = (
853 black => 0,
854 white => 1,
855 darkblue => 2,
856 red => 3,
857 orange => 4,
858 lightblue => 5,
859 darkorange => 6,
860 green => 7,
861 darkgreen => 8,
862 grey => 9,
863 brown => 10,
864 yellow => 11,
865 tan => 12,
866);
867
868our @CF_COLOR = (
612 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 869 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613 [1.00, 1.00, 1.00], 870 [1.00, 1.00, 1.00],
614 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 871 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615 [1.00, 0.00, 0.00], 872 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 873 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 874 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 875 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 876 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 877 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 878 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 879 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 880 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 881 [0.74, 0.65, 0.41],
625 ); 882);
626 883
884sub msg {
885 my ($self, $color, $type, $text, @extra) = @_;
886
887 $text = sanitise_xml $text;
888
889 if (my $cb = $self->{cb_msg}{$type}) {
890 $_->($self, $color, $type, $text, @extra) for values %$cb;
891 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
892 $type =~ s/-/_/g;
893 $self->{$type} = $text;
894 } else {
627 $self->logprint ("info: ", $text); 895 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood
628 897
898 my $fg = $CF_COLOR[$color % @CF_COLOR];
899
629 # try to create single paragraphs of multiple lines sent by the server 900 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 903
632 $text = CFPlus::asxml $text;
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
635
636 ::message ({ fg => $color[$color], markup => $_ }) 904 ::message ({ fg => $fg, markup => $_ })
637 for split /\n/, $text; 905 for split /\n/, $text;
638 906
639 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
640 group => $text, 908 group => $text,
641 fg => $color[$color], 909 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 910 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 911 tooltip_font => $::FONT_FIXED,
644 ); 912 );
645} 913 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 914}
652 915
653sub spell_add { 916sub spell_add {
654 my ($self, $spell) = @_; 917 my ($self, $spell) = @_;
655 918
… …
671} 934}
672 935
673sub setup { 936sub setup {
674 my ($self, $setup) = @_; 937 my ($self, $setup) = @_;
675 938
939 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 940 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 941}
678 942
679sub addme_success { 943sub addme_success {
680 my ($self) = @_; 944 my ($self) = @_;
… …
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1007 return unless $::CONN;
744 1008
745 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
746 1010
1011 my @add;
1012
747 my $row; 1013 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 1015 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
753 1019
1020 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
756 1023
757 $row++; 1024 $row++;
758 } else { 1025 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1027 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1029 ;
763 last; 1030 last;
764 } 1031 }
765 } 1032 }
766 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1035 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1037 ;
771 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
772 }); 1041 });
773 1042
774 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
775} 1044}
776 1045
… …
887 $::SERVER_INFO->set_markup ( 1156 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1157 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1158 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1159 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1160 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1161 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1162 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1163 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1164 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1168 );
1169
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
898} 1171}
899 1172
900sub logged_in { 1173sub logged_in {
901 my ($self) = @_; 1174 my ($self) = @_;
902 1175
… …
918 1191
919 $self->update_server_info; 1192 $self->update_server_info;
920 1193
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 1194 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $self->send_command ("output-count $::CFG->{output_count}"); 1195 $self->send_command ("output-count $::CFG->{output_count}");
1196 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
923 $self->send_command ("pickup $::CFG->{pickup}"); 1197 $self->send_command ("pickup $::CFG->{pickup}");
1198}
1199
1200sub buildat {
1201 my ($self, $builditem, $x, $y) = @_;
1202
1203 if ($self->{cfplus_ext}) {
1204 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1205 }
924} 1206}
925 1207
926sub lookat { 1208sub lookat {
927 my ($self, $x, $y) = @_; 1209 my ($self, $x, $y) = @_;
928 1210
… …
950 1232
951 (delete $self->{npc_dialog})->destroy 1233 (delete $self->{npc_dialog})->destroy
952 if $self->{npc_dialog}; 1234 if $self->{npc_dialog};
953 1235
954 $self->SUPER::destroy; 1236 $self->SUPER::destroy;
1237
1238 %$self = ();
955} 1239}
956 1240
957package CFPlus::NPCDialog; 1241package CFPlus::NPCDialog;
958 1242
959our @ISA = 'CFPlus::UI::Toplevel'; 1243our @ISA = 'CFPlus::UI::Toplevel';
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 1255 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 1256 has_close_button => 1,
973 @_, 1257 @_,
974 ); 1258 );
975 1259
976 Scalar::Util::weaken (my $this = $self); 1260 CFPlus::weaken (my $this = $self);
977 1261
978 $self->connect (delete => sub { $this->destroy; 1 }); 1262 $self->connect (delete => sub { $this->destroy; 1 });
979 1263
980 # better use a pane... 1264 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 1265 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1025}; 1309};
1026 1310
1027sub update_options { 1311sub update_options {
1028 my ($self) = @_; 1312 my ($self) = @_;
1029 1313
1030 Scalar::Util::weaken $self; 1314 CFPlus::weaken $self;
1031 1315
1032 $self->{options}->clear; 1316 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1317 $self->{options}->add ($self->{bye_button});
1034 1318
1035 for my $kw (sort keys %{ $self->{kw} }) { 1319 for my $kw (sort keys %{ $self->{kw} }) {
… …
1044} 1328}
1045 1329
1046sub feed { 1330sub feed {
1047 my ($self, $msg) = @_; 1331 my ($self, $msg) = @_;
1048 1332
1049 Scalar::Util::weaken $self; 1333 CFPlus::weaken $self;
1050 1334
1051 if ($msg->{msgtype} eq "reply") { 1335 if ($msg->{msgtype} eq "reply") {
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1054 1338
1055 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1339 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1056 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1340 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1057 my @link; 1341 my @link;
1058 $text =~ s{ 1342 $text =~ s{
1059 ($match) 1343 ($match)
1060 }{ 1344 }{

Diff Legend

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