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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.126 by root, Sun Jul 22 19:34:58 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;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 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 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 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 $w->{$attr->[$i]} = $attr->[$i+1];
218 $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really?
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($arg) = @_;
225
226 my $w = $self->{widget}{$arg->{id}}
227 or return;
228
229 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
237 }
238 });
239
40 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 241 for @cmd_help;
42 242
243 {
244 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
245 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
246 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
247 }
248
249 {
43 $self->{noface} = new_from_file CFPlus::Texture 250 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 251 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
252 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
253 }
45 254
46 $self->{open_container} = 0; 255 $self->{open_container} = 0;
47 256
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 257 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 258 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 259
55 $self 260 $self
56} 261}
57 262
58sub logprint { 263sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 420 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 421 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 422 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 424 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 425 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 426 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 427 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 428 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 429
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 430 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
247 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
248 451
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear; 453 $sktbl->clear;
251 454
455 my @add;
456
457 push @add,
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
258 465
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 467
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 470
265 my ($x, $y) = (0, 1); 471 my ($x, $y) = (0, 1);
266 for ( 472 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 473 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 474 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 483 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 484 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 485 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 486 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 487 } elsif ($ev->{button} == 3) {
488 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 489 (new CFPlus::UI::Menu
283 items => [ 490 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 491 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 492 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 493 ],
287 )->popup ($ev); 494 )->popup ($ev);
288 } else { 495 } else {
289 return 0; 496 return 0;
290 } 497 }
291 498
292 1 499 1
293 }; 500 };
294 501
502 push @add,
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
300 510
301 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
302 } 512 }
513
514 $sktbl->add_at (@add);
303 } 515 }
304 516
305 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 520 }
309} 521}
310 522
523sub macro_send {
524 my ($self, $macro) = @_;
525
526 for my $cmd (@{ $macro->{action} }) {
527 $self->send_command ($cmd);
528 }
529}
530
311sub user_send { 531sub user_send {
312 my ($self, $command) = @_; 532 my ($self, $command) = @_;
313 533
534 $self->{record}->($command)
314 if ($self->{record}) { 535 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 536
318 $self->logprint ("send: ", $command); 537 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 538 $self->send_command ($command);
320 ::status ($command); 539 ::status ($command);
321} 540}
322 541
323sub start_record { 542sub record {
324 my ($self) = @_; 543 my ($self, $cb) = @_;
325 544
326 $self->{record} = []; 545 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 546}
333 547
334sub map_scroll { 548sub map_scroll {
335 my ($self, $dx, $dy) = @_; 549 my ($self, $dx, $dy) = @_;
336 550
… …
338} 552}
339 553
340sub feed_map1a { 554sub feed_map1a {
341 my ($self, $data) = @_; 555 my ($self, $data) = @_;
342 556
343 $self->{map}->map1a_update ($data); 557 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 558 $self->{map_widget}->update;
345} 559}
346 560
347sub magicmap { 561sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 562 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 571 or return;
358 572
359 my ($hash, $x, $y, $w, $h) = @$map_info; 573 my ($hash, $x, $y, $w, $h) = @$map_info;
360 574
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 575 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 576 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 577 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 578}
365 579
366sub map_clear { 580sub map_clear {
367 my ($self) = @_; 581 my ($self) = @_;
… …
371 585
372 $self->{map}->clear; 586 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 587 delete $self->{map_widget}{magicmap};
374} 588}
375 589
590sub bg_fetch {
591 my ($self) = @_;
592
593 my $id;
594
595 do {
596 $id = pop @{$self->{bg_fetch}}
597 or return;
598 } while $self->{texture}[$id];
599
600 CFPlus::DB::get tilecache => $id, sub {
601 my ($data) = @_;
602
603 return unless $self->{map}; # stop when destroyed
604
605 $self->set_texture ($id => $data)
606 if defined $data;
607
608 $self->bg_fetch;
609 };
610}
376 611
377sub load_map($$$) { 612sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 613 my ($self, $hash, $x, $y) = @_;
379 614
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 615 my $gen = $self->{map_change_gen};
616
617 CFPlus::DB::get $self->{mapcache} => $hash, sub {
618 return unless $gen == $self->{map_change_gen};
619
620 my ($data) = @_;
621
622 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 623 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 624 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 625
387 $self->set_texture ($id => $data); 626 my $inprogress = @{ $self->{bg_fetch} || [] };
627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
628 $self->bg_fetch unless $inprogress;
388 } 629 }
389 } 630 };
390} 631}
391 632
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 633# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 634# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 635# the right fix is to make real tiled maps with an overview file
… …
458 699
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 700 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 701 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 702
462 } else { 703 } else {
704 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 705 $self->send_mapinfo ("spatial $path$tile", sub {
706 return unless $gen == $self->{map_change_gen};
707
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 709
466 return if $mode ne "spatial"; 710 return if $mode ne "spatial";
467 711
468 $x += $self->{map}->ox; 712 $x += $self->{map}->ox;
… …
482 726
483sub map_change { 727sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 729
486 $self->flush_map; 730 $self->flush_map;
731
732 ++$self->{map_change_gen};
487 733
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 735
490 my $mapmapw = $self->{mapmap}->{w}; 736 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 737 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 754 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 755 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 756}
511 757
512sub face_find { 758sub face_find {
513 my ($self, $facenum, $face) = @_; 759 my ($self, $facenum, $face, $cb) = @_;
514 760
515 my $hash = "$face->{chksum},$face->{name}"; 761 my $hash = "$face->{chksum},$face->{name}";
516 762
517 my $id = $self->{facemap}->get ($hash); 763 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 764
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 765 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 766 $self->{faceid}[$facenum] = $id;
544 767
545 my $face = $self->{tilecache}->get ($id); 768 $self->{map}->set_tileid ($facenum => $id);
546 769
547 if ($face) { 770 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 771}
556 772
557sub face_update { 773sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 774 my ($self, $facenum, $face, $changed) = @_;
559 775
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
777 if $changed;
561 778
562 $self->set_texture ($face->{id} => delete $face->{image}); 779 $self->set_texture ($face->{id} => delete $face->{image});
780}
781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 786}
564 787
565sub set_texture { 788sub set_texture {
566 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
567 790
791 return unless $self->{map};
792
568 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
572 796
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 798 $self->{map_widget}->update;
575 799
576 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
577 }; 812 }
578} 813}
579 814
580sub sound_play { 815sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
582 817
… …
592 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
593 828
594 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
595} 830}
596 831
597sub drawinfo { 832sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 833 local $_ = shift;
599 834
600 my @color = ( 835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
614 ); 877);
615 878
879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
616 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
617 892
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 893 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 894
620 # try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 898
623 $text = CFPlus::asxml $text; 899 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 900 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 901
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
632 group => $text, 903 group => $text,
633 fg => $color[$color], 904 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 905 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
636 ); 907 );
637} 908 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 909}
644 910
645sub spell_add { 911sub spell_add {
646 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
647 913
648 # try to create single paragraphs out of the multiple lines sent by the server 914 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 915 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 916 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 917 $spell->{message} ||= "Server did not provide a description for this spell.";
652 918
653 $::SPELL_PAGE->add_spell ($spell); 919 $::SPELL_LIST->add_spell ($spell);
654 920
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 921 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 922 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 923}
658 924
659sub spell_delete { 925sub spell_delete {
660 my ($self, $spell) = @_; 926 my ($self, $spell) = @_;
661 927
662 $::SPELL_PAGE->remove_spell ($spell); 928 $::SPELL_LIST->remove_spell ($spell);
929}
930
931sub setup {
932 my ($self, $setup) = @_;
933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
935 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 936}
664 937
665sub addme_success { 938sub addme_success {
666 my ($self) = @_; 939 my ($self) = @_;
667 940
… …
728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
729 return unless $::CONN; 1002 return unless $::CONN;
730 1003
731 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
732 1005
1006 my @add;
1007
733 my $row; 1008 my $row;
734 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
735 if ($row < 6) { 1010 if ($row < 6) {
736 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
737 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
738 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
739 1014
1015 push @add,
740 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
741 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
742 1018
743 $row++; 1019 $row++;
744 } else { 1020 } else {
745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
746 text => "More...", 1022 text => "More...",
747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
748 ); 1024 ;
749 last; 1025 last;
750 } 1026 }
751 } 1027 }
752 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
754 text => "Close container", 1030 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 ); 1032 ;
757 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
758 }); 1036 });
759 1037
760 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
761} 1039}
762 1040
… …
873 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1157 . "editing support $yesno[!!$self->{editor_support}]\n"
1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1163 );
1164
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1166}
883 1167
884sub logged_in { 1168sub logged_in {
885 my ($self) = @_; 1169 my ($self) = @_;
886 1170
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 1172 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 1173 $self->update_server_info;
890 1174
1175 if ($self->{cfplus_ext} >= 2) {
1176 $self->send_ext_req ("editor_support", sub {
1177 $self->{editor_support} = $_[0];
1178 $self->update_server_info;
1179
1180 0
1181 });
1182 }
1183
891 0 1184 0
892 }); 1185 });
893 1186
894 $self->update_server_info; 1187 $self->update_server_info;
895 1188
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1189 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1190 $self->send_command ("output-count $::CFG->{output_count}");
1191 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1192 $self->send_command ("pickup $::CFG->{pickup}");
1193}
1194
1195sub buildat {
1196 my ($self, $builditem, $x, $y) = @_;
1197
1198 if ($self->{cfplus_ext}) {
1199 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1200 }
899} 1201}
900 1202
901sub lookat { 1203sub lookat {
902 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
903 1205
… …
921} 1223}
922 1224
923sub destroy { 1225sub destroy {
924 my ($self) = @_; 1226 my ($self) = @_;
925 1227
926 $self->{npc_dialog}->destroy 1228 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1229 if $self->{npc_dialog};
928 1230
929 $self->SUPER::destroy; 1231 $self->SUPER::destroy;
1232
1233 %$self = ();
930} 1234}
931 1235
932package CFPlus::NPCDialog; 1236package CFPlus::NPCDialog;
933 1237
934our @ISA = 'CFPlus::UI::FancyFrame'; 1238our @ISA = 'CFPlus::UI::Toplevel';
935 1239
936sub new { 1240sub new {
937 my $class = shift; 1241 my $class = shift;
938 1242
939 my $self = $class->SUPER::new ( 1243 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1250 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1251 has_close_button => 1,
948 @_, 1252 @_,
949 ); 1253 );
950 1254
951 Scalar::Util::weaken (my $this = $self); 1255 CFPlus::weaken (my $this = $self);
952 1256
953 $self->connect (delete => sub { $this->destroy; 1 }); 1257 $self->connect (delete => sub { $this->destroy; 1 });
954 1258
955 # better use a pane... 1259 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1260 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1000}; 1304};
1001 1305
1002sub update_options { 1306sub update_options {
1003 my ($self) = @_; 1307 my ($self) = @_;
1004 1308
1005 Scalar::Util::weaken $self; 1309 CFPlus::weaken $self;
1006 1310
1007 $self->{options}->clear; 1311 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1312 $self->{options}->add ($self->{bye_button});
1009 1313
1010 for my $kw (sort keys %{ $self->{kw} }) { 1314 for my $kw (sort keys %{ $self->{kw} }) {
… …
1019} 1323}
1020 1324
1021sub feed { 1325sub feed {
1022 my ($self, $msg) = @_; 1326 my ($self, $msg) = @_;
1023 1327
1024 Scalar::Util::weaken $self; 1328 CFPlus::weaken $self;
1025 1329
1026 if ($msg->{msgtype} eq "reply") { 1330 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1331 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1332 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1029 1333
1030 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1334 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1031 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1335 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1032 my @link; 1336 my @link;
1033 $text =~ s{ 1337 $text =~ s{
1034 ($match) 1338 ($match)
1035 }{ 1339 }{
… …
1043 padding_y => 0, 1347 padding_y => 0,
1044 on_button_up => sub { 1348 on_button_up => sub {
1045 $self->send ($kw); 1349 $self->send ($kw);
1046 }; 1350 };
1047 1351
1048 chr 0xfffc 1352 "\x{fffc}"
1049 }giex; 1353 }giex;
1050 1354
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1355 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1356 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1357 $self->update_options;
… …
1080 1384
1081 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
1082} 1386}
1083 1387
10841 13881
1389

Diff Legend

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