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.94 by root, Fri Mar 16 02:33:49 2007 UTC vs.
Revision 1.131 by root, Tue Jul 24 04:54:48 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;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 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,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
22 30
23 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
24 32
25 my @cmd_help = map { 33 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 45 for @args;
38 46
39 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args 49 @args
42 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
44 52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # destroy widgets on logout
191 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
192 for my $ws (values %{delete $self->{widgetset} || {}}) {
193 $_->destroy
194 for values %{delete $ws->{w} || {}};
195 }
196 });
197
45 $self->{map_widget}->add_command (@$_) 198 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 199 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 200
51 { 201 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 202 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 203 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 204 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 205 }
56 206
207 {
208 $self->{noface} = my $tex = new_from_file CFPlus::Texture
209 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
210 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
211 }
212
57 $self->{open_container} = 0; 213 $self->{open_container} = 0;
58 214
59 # "global"
60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
64
65 # per server 215 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 216 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 217
69 $self 218 $self
70} 219}
71 220
72sub logprint { 221sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 378 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 379 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 380 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 381 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 382 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 383 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
235 $rng =~ s/^Range: //; # thank you so much dear server
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE}; 384 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 385 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 386 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 387
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 388 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
261 my @skills = keys %{ $self->{skill_info} }; 408 my @skills = keys %{ $self->{skill_info} };
262 409
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 410 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear; 411 $sktbl->clear;
265 412
413 my @add;
414
415 push @add,
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 416 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 417 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 418 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 419 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 420 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 421 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
422 ;
272 423
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 424 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274 425
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 426 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 427 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
304 } 455 }
305 456
306 1 457 1
307 }; 458 };
308 459
460 push @add,
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 461 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
310 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 462 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 463 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
312 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 464 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
313 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 465 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 466 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
467 ;
315 468
316 $x++ and ($x, $y) = (0, $y + 1); 469 $x++ and ($x, $y) = (0, $y + 1);
317 } 470 }
471
472 $sktbl->add_at (@add);
318 } 473 }
319 474
320 for (grep exists $stats->{$_}, @skills) { 475 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 476 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 477 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374 or return; 529 or return;
375 530
376 my ($hash, $x, $y, $w, $h) = @$map_info; 531 my ($hash, $x, $y, $w, $h) = @$map_info;
377 532
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 533 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 534 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 535 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 536}
382 537
383sub map_clear { 538sub map_clear {
384 my ($self) = @_; 539 my ($self) = @_;
… …
388 543
389 $self->{map}->clear; 544 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 545 delete $self->{map_widget}{magicmap};
391} 546}
392 547
548sub bg_fetch {
549 my ($self) = @_;
550
551 my $id;
552
553 do {
554 $id = pop @{$self->{bg_fetch}}
555 or return;
556 } while $self->{texture}[$id];
557
558 CFPlus::DB::get tilecache => $id, sub {
559 my ($data) = @_;
560
561 return unless $self->{map}; # stop when destroyed
562
563 $self->set_texture ($id => $data)
564 if defined $data;
565
566 $self->bg_fetch;
567 };
568}
393 569
394sub load_map($$$) { 570sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 571 my ($self, $hash, $x, $y) = @_;
396 572
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 573 my $gen = $self->{map_change_gen};
574
575 CFPlus::DB::get $self->{mapcache} => $hash, sub {
576 return unless $gen == $self->{map_change_gen};
577
578 my ($data) = @_;
579
580 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 581 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 582 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401 my $data = $self->{tilecache}->get ($id)
402 or next;
403 583
404 $self->set_texture ($id => $data); 584 my $inprogress = @{ $self->{bg_fetch} || [] };
585 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
586 $self->bg_fetch unless $inprogress;
405 } 587 }
406 } 588 };
407} 589}
408 590
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 591# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 592# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 593# the right fix is to make real tiled maps with an overview file
… …
475 657
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 658 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 659 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 660
479 } else { 661 } else {
662 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 663 $self->send_mapinfo ("spatial $path$tile", sub {
664 return unless $gen == $self->{map_change_gen};
665
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 666 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 667
483 return if $mode ne "spatial"; 668 return if $mode ne "spatial";
484 669
485 $x += $self->{map}->ox; 670 $x += $self->{map}->ox;
… …
499 684
500sub map_change { 685sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 686 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 687
503 $self->flush_map; 688 $self->flush_map;
689
690 ++$self->{map_change_gen};
504 691
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 692 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 693
507 my $mapmapw = $self->{mapmap}->{w}; 694 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 695 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 712 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 713 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 714}
528 715
529sub face_find { 716sub face_find {
530 my ($self, $facenum, $face) = @_; 717 my ($self, $facenum, $face, $cb) = @_;
531 718
532 my $hash = "$face->{chksum},$face->{name}"; 719 if ($face->{type} == 0) { # FT_FACE
720 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533 721
534 my $id = $self->{facemap}->get ($hash); 722 $face->{id} = $id;
535
536 unless ($id) {
537 # create new id for face
538 # I love transactions
539 for (1..100) {
540 my $txn = $CFPlus::DB_ENV->txn_begin;
541 my $status = $self->{facemap}->db_get (id => $id);
542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
543 $id = ($id || 64) + 1;
544 if ($self->{facemap}->put (id => $id) == 0
545 && $self->{facemap}->put ($hash => $id) == 0) {
546 $txn->txn_commit;
547
548 goto gotid;
549 }
550 }
551 $txn->txn_abort;
552 }
553
554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555 }
556
557gotid:
558 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 723 $self->{faceid}[$facenum] = $id;
561 724
562 my $face = $self->{tilecache}->get ($id); 725 $self->{map}->set_tileid ($facenum => $id);
563 726
564 if ($face) { 727 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch; 728
566 $face 729 } elsif ($face->{type} & 1) { # with metadata
567 } else { 730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
568 my $tex = $self->{noface}; 731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 }; 732 }
572} 733}
573 734
574sub face_update { 735sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 736 my ($self, $facenum, $face, $changed) = @_;
576 737
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 738 if ($face->{type} == 0) { # FT_FACE
739 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
740 if $changed;
578 741
579 $self->set_texture ($face->{id} => delete $face->{image}); 742 $self->set_texture ($face->{id} => delete $face->{data});
743
744 } elsif ($face->{type} & 1) { # split metadata
745 my $cb = sub { };
746
747 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub {
749 $self->{music_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed;
753
754 &::audio_music_set ($self->{songs});
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
772 $cb->();
773 }
774 }
775}
776
777sub smooth_update {
778 my ($self, $facenum, $face) = @_;
779
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 781}
581 782
582sub set_texture { 783sub set_texture {
583 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
584 785
786 return unless $self->{map};
787
585 $self->{texture}[$id] ||= do { 788 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
589 791
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 793 $self->{map_widget}->update;
592 794
593 $tex 795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
594 }; 807 }
595} 808}
596 809
597sub sound_play { 810sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
599 812
… …
609 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
610 823
611 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
612} 825}
613 826
614sub drawinfo { 827sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 828 local $_ = shift;
616 829
617 my @color = ( 830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
840}
841
842our %NAME_TO_COLOR = (
843 black => 0,
844 white => 1,
845 darkblue => 2,
846 red => 3,
847 orange => 4,
848 lightblue => 5,
849 darkorange => 6,
850 green => 7,
851 darkgreen => 8,
852 grey => 9,
853 brown => 10,
854 yellow => 11,
855 tan => 12,
856);
857
858our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 859 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 860 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 861 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 862 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 863 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 864 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 865 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 866 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 867 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 868 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 869 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 870 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 871 [0.74, 0.65, 0.41],
631 ); 872);
632 873
633 my $fg = $color[$color % @color]; 874sub msg {
875 my ($self, $color, $type, $text, @extra) = @_;
634 876
877 $text = sanitise_xml $text;
878
879 if (my $cb = $self->{cb_msg}{$type}) {
880 $_->($self, $color, $type, $text, @extra) for values %$cb;
881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
882 $type =~ s/-/_/g;
883 $self->{$type} = $text;
884 } else {
635 $self->logprint ("info: ", $text); 885 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood
636 887
888 my $fg = $CF_COLOR[$color % @CF_COLOR];
889
637 # try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 893
640 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644 ::message ({ fg => $fg, markup => $_ }) 894 ::message ({ fg => $fg, markup => $_ })
645 for split /\n/, $text; 895 for split /\n/, $text;
646 896
647 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
648 group => $text, 898 group => $text,
649 fg => $fg, 899 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 900 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 901 tooltip_font => $::FONT_FIXED,
652 ); 902 );
653} 903 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 904}
660 905
661sub spell_add { 906sub spell_add {
662 my ($self, $spell) = @_; 907 my ($self, $spell) = @_;
663 908
… …
679} 924}
680 925
681sub setup { 926sub setup {
682 my ($self, $setup) = @_; 927 my ($self, $setup) = @_;
683 928
929 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 930 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 931}
686 932
687sub addme_success { 933sub addme_success {
688 my ($self) = @_; 934 my ($self) = @_;
… …
750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751 return unless $::CONN; 997 return unless $::CONN;
752 998
753 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
754 1000
1001 my @add;
1002
755 my $row; 1003 my $row;
756 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
757 if ($row < 6) { 1005 if ($row < 6) {
758 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
759 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
760 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
761 1009
1010 push @add,
762 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
763 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
764 1013
765 $row++; 1014 $row++;
766 } else { 1015 } else {
767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
768 text => "More...", 1017 text => "More...",
769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770 ); 1019 ;
771 last; 1020 last;
772 } 1021 }
773 } 1022 }
774 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
776 text => "Close container", 1025 text => "Close container",
777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778 ); 1027 ;
779 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
780 }); 1031 });
781 1032
782 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
783} 1034}
784 1035
… …
895 $::SERVER_INFO->set_markup ( 1146 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1147 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1148 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1149 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1150 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1151 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1152 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1153 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1154 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1157 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1158 );
906 1159
… …
908} 1161}
909 1162
910sub logged_in { 1163sub logged_in {
911 my ($self) = @_; 1164 my ($self) = @_;
912 1165
913 $self->send_ext_req (cfplus_support => version => 1, sub { 1166 $self->send_ext_req (cfplus_support => version => 2, sub {
1167 my (%msg) = @_;
1168
914 $self->{cfplus_ext} = $_[0]{version}; 1169 $self->{cfplus_ext} = $msg{version};
915 $self->update_server_info; 1170 $self->update_server_info;
916 1171
917 if ($self->{cfplus_ext} >= 2) { 1172 if ($self->{cfplus_ext} >= 2) {
918 $self->send_ext_req ("editor_support", sub { 1173 $self->send_ext_req ("editor_support", sub {
919 $self->{editor_support} = $_[0]; 1174 $self->{editor_support} = { @_ };
920 $self->update_server_info; 1175 $self->update_server_info;
921 1176
922 0 1177 0
923 }); 1178 });
924 } 1179 }
… …
944 1199
945sub lookat { 1200sub lookat {
946 my ($self, $x, $y) = @_; 1201 my ($self, $x, $y) = @_;
947 1202
948 if ($self->{cfplus_ext}) { 1203 if ($self->{cfplus_ext}) {
949 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1204 $self->send_ext_req (lookat => $x, $y, sub {
950 my ($msg) = @_; 1205 my (%msg) = @_;
951 1206
952 if (exists $msg->{npc_dialog}) { 1207 if (exists $msg{npc_dialog}) {
953 # start npc chat dialog 1208 # start npc chat dialog
954 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1209 $self->{npc_dialog} = new CFPlus::NPCDialog::
955 dx => $x, 1210 token => $msg{npc_dialog},
956 dy => $y,
957 title => "$msg->{npc_dialog} (NPC)", 1211 title => "$msg{npc_dialog}[0] (NPC)",
958 conn => $self, 1212 conn => $self,
959 ; 1213 ;
960 } 1214 }
961 }); 1215 });
962 } 1216 }
… …
969 1223
970 (delete $self->{npc_dialog})->destroy 1224 (delete $self->{npc_dialog})->destroy
971 if $self->{npc_dialog}; 1225 if $self->{npc_dialog};
972 1226
973 $self->SUPER::destroy; 1227 $self->SUPER::destroy;
1228
1229 %$self = ();
974} 1230}
975 1231
976package CFPlus::NPCDialog; 1232package CFPlus::NPCDialog;
977 1233
978our @ISA = 'CFPlus::UI::Toplevel'; 1234our @ISA = 'CFPlus::UI::Toplevel';
… …
1025 on_activate => sub { $this->destroy; 1 }, 1281 on_activate => sub { $this->destroy; 1 },
1026 ; 1282 ;
1027 1283
1028 $self->update_options; 1284 $self->update_options;
1029 1285
1030 $self->{id} = $self->{conn}->send_ext_req ( 1286 $self->{id} = "npc-channel-" . $self->{conn}->token;
1031 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1287 $self->{conn}->connect_ext ($self->{id} => sub {
1032 sub { $this && $this->feed (@_) } 1288 $this->feed (@_) if $this;
1033 ); 1289 });
1290
1291 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1034 1292
1035 $self->{entry}->grab_focus; 1293 $self->{entry}->grab_focus;
1036 1294
1037 $self->{textview}->add_paragraph ({ 1295 $self->{textview}->add_paragraph ({
1038 fg => [1, 1, 0, 1], 1296 fg => [1, 1, 0, 1],
… …
1061 ); 1319 );
1062 } 1320 }
1063} 1321}
1064 1322
1065sub feed { 1323sub feed {
1066 my ($self, $msg) = @_; 1324 my ($self, $type, @arg) = @_;
1067 1325
1068 CFPlus::weaken $self; 1326 CFPlus::weaken $self;
1069 1327
1070 if ($msg->{msgtype} eq "reply") { 1328 if ($type eq "update") {
1329 my (%info) = @arg;
1330
1071 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1331 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1072 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1332 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1073
1074 my $text = "\n" . CFPlus::asxml $msg->{msg};
1075 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1076 my @link;
1077 $text =~ s{
1078 ($match)
1079 }{
1080 my $kw = $1;
1081
1082 push @link, new CFPlus::UI::Label
1083 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1084 can_hover => 1,
1085 can_events => 1,
1086 padding_x => 0,
1087 padding_y => 0,
1088 on_button_up => sub {
1089 $self->send ($kw);
1090 };
1091
1092 "\x{fffc}"
1093 }giex;
1094 1333
1334 if (exists $info{msg}) {
1335 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1336 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1337 my @link;
1338 $text =~ s{
1339 ($match)
1340 }{
1341 my $kw = $1;
1342
1343 push @link, new CFPlus::UI::Label
1344 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1345 can_hover => 1,
1346 can_events => 1,
1347 padding_x => 0,
1348 padding_y => 0,
1349 on_button_up => sub {
1350 $self->send ($kw);
1351 };
1352
1353 "\x{fffc}"
1354 }giex;
1355
1095 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1356 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1096 $self->{textview}->scroll_to_bottom; 1357 $self->{textview}->scroll_to_bottom;
1358 }
1359
1097 $self->update_options; 1360 $self->update_options;
1098 } else { 1361 } else {
1099 $self->destroy; 1362 $self->destroy;
1100 } 1363 }
1101 1364
… …
1106 my ($self, $msg) = @_; 1369 my ($self, $msg) = @_;
1107 1370
1108 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1371 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1109 $self->{textview}->scroll_to_bottom; 1372 $self->{textview}->scroll_to_bottom;
1110 1373
1111 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1374 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1112} 1375}
1113 1376
1114sub destroy { 1377sub destroy {
1115 my ($self) = @_; 1378 my ($self) = @_;
1116 1379
1117 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1380 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1118 1381
1119 if ($self->{conn}) { 1382 if ($self->{conn}) {
1120 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1383 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1121 delete $self->{conn}{npc_dialog}; 1384 delete $self->{conn}{npc_dialog};
1122 $self->{conn}->disconnect_ext ($self->{id}); 1385 $self->{conn}->disconnect_ext ($self->{id});
1123 } 1386 }
1124 1387
1125 $self->SUPER::destroy; 1388 $self->SUPER::destroy;

Diff Legend

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