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.98 by root, Fri Apr 6 19:17:25 2007 UTC vs.
Revision 1.133 by elmex, Tue Jul 24 18:39:39 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 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 );
23 30
24 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
25 32
26 my @cmd_help = map { 33 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
42 @args 49 @args
43 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
45 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
46 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
47 my ($cap) = @_; 61 my (%cap) = @_;
48 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
49 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default; 70 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
54 73
55 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
57 76
58 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
59 } 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 # message window
191 $self->connect_ext (channel_info => sub {
192 $::MESSAGE_WINDOW->add_channel ($_[0]);
193 });
194
195 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) {
198 $_->destroy
199 for values %{delete $ws->{w} || {}};
60 } 200 }
61 }); 201 });
62 202
63 $self->{map_widget}->add_command (@$_) 203 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 204 for @cmd_help;
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 383 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 384 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 385 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 386 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 387 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 388 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
249 $rng =~ s/^Range: //; # thank you so much dear server
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 389 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 390 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 391 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 392
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 393 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 413 my @skills = keys %{ $self->{skill_info} };
276 414
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 415 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 416 $sktbl->clear;
279 417
418 my @add;
419
420 push @add,
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 421 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 422 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 423 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 424 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 425 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 426 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
427 ;
286 428
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 429 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288 430
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 431 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 432 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
318 } 460 }
319 461
320 1 462 1
321 }; 463 };
322 464
465 push @add,
323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 466 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 467 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 469 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 470 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 471 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
472 ;
329 473
330 $x++ and ($x, $y) = (0, $y + 1); 474 $x++ and ($x, $y) = (0, $y + 1);
331 } 475 }
476
477 $sktbl->add_at (@add);
332 } 478 }
333 479
334 for (grep exists $stats->{$_}, @skills) { 480 for (grep exists $stats->{$_}, @skills) {
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 481 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 482 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
427} 573}
428 574
429sub load_map($$$) { 575sub load_map($$$) {
430 my ($self, $hash, $x, $y) = @_; 576 my ($self, $hash, $x, $y) = @_;
431 577
578 my $gen = $self->{map_change_gen};
579
432 CFPlus::DB::get $self->{mapcache} => $hash, sub { 580 CFPlus::DB::get $self->{mapcache} => $hash, sub {
581 return unless $gen == $self->{map_change_gen};
582
433 my ($data) = @_; 583 my ($data) = @_;
434 584
435 if (defined $data) { 585 if (defined $data) {
436 $data = Compress::LZF::decompress $data; 586 $data = Compress::LZF::decompress $data;
437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 587 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
… …
512 662
513 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 663 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
514 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 664 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
515 665
516 } else { 666 } else {
667 my $gen = $self->{map_change_gen};
517 $self->send_mapinfo ("spatial $path$tile", sub { 668 $self->send_mapinfo ("spatial $path$tile", sub {
669 return unless $gen == $self->{map_change_gen};
670
518 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 671 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 672
520 return if $mode ne "spatial"; 673 return if $mode ne "spatial";
521 674
522 $x += $self->{map}->ox; 675 $x += $self->{map}->ox;
… …
536 689
537sub map_change { 690sub map_change {
538 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 691 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
539 692
540 $self->flush_map; 693 $self->flush_map;
694
695 ++$self->{map_change_gen};
541 696
542 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 697 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
543 698
544 my $mapmapw = $self->{mapmap}->{w}; 699 my $mapmapw = $self->{mapmap}->{w};
545 my $mapmaph = $self->{mapmap}->{h}; 700 my $mapmaph = $self->{mapmap}->{h};
… …
564} 719}
565 720
566sub face_find { 721sub face_find {
567 my ($self, $facenum, $face, $cb) = @_; 722 my ($self, $facenum, $face, $cb) = @_;
568 723
569 my $hash = "$face->{chksum},$face->{name}"; 724 if ($face->{type} == 0) { # FT_FACE
570
571 my $id = CFPlus::DB::get_tile_id_sync $hash; 725 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
572 726
573 $face->{id} = $id; 727 $face->{id} = $id;
574 $self->{faceid}[$facenum] = $id; 728 $self->{faceid}[$facenum] = $id;
575 729
576 $self->{map}->set_tileid ($facenum => $id); 730 $self->{map}->set_tileid ($facenum => $id);
577 731
578 CFPlus::DB::get tilecache => $id, $cb; 732 CFPlus::DB::get tilecache => $id, $cb;
733
734 } elsif ($face->{type} & 1) { # with metadata
735 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
737 }
579} 738}
580 739
581sub face_update { 740sub face_update {
582 my ($self, $facenum, $face, $changed) = @_; 741 my ($self, $facenum, $face, $changed) = @_;
583 742
743 if ($face->{type} == 0) { # FT_FACE
584 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
585 if $changed; 745 if $changed;
586 746
587 $self->set_texture ($face->{id} => delete $face->{image}); 747 $self->set_texture ($face->{id} => delete $face->{data});
748
749 } elsif ($face->{type} & 1) { # split metadata
750 my $cb = sub { };
751
752 if ($face->{type} == 3) { # FT_MUSIC
753 $cb = sub {
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_set ($self->{songs});
760 };
761 }
762
763 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766
767 CFPlus::DB::write_file $path, $data, sub {
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771
772 $cb->();
773 };
774 };
775 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->();
778 }
779 }
780}
781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
588} 786}
589 787
590sub set_texture { 788sub set_texture {
591 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
790
791 return unless $self->{map};
592 792
593 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
594 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
595 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
596 796
597 $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}});
598 $self->{map_widget}->update; 798 $self->{map_widget}->update;
799
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}};
812 }
599} 813}
600 814
601sub sound_play { 815sub sound_play {
602 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
603 817
… …
613 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
614 828
615 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
616} 830}
617 831
618sub drawinfo { 832sub sanitise_xml($) {
619 my ($self, $color, $text) = @_; 833 local $_ = shift;
620 834
621 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 = (
622 [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],
623 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
624 [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]
625 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
630 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
631 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
632 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
633 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
634 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
635 ); 877);
636 878
637 my $fg = $color[$color % @color]; 879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
638 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 {
639 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
640 892
893 my $fg = $CF_COLOR[$color % @CF_COLOR];
894
641 # 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
642 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
643 898
644 $text = CFPlus::asxml $text;
645 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
646 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
647
648 ::message ({ fg => $fg, markup => $_ }) 899 ::message ({ fg => $fg, markup => $_, type => $type })
649 for split /\n/, $text; 900 for split /\n/, $text;
650 901
651 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
652 group => $text, 903 group => $text,
653 fg => $fg, 904 fg => $fg,
654 timeout => $color >= 2 ? 180 : 10, 905 timeout => $color >= 2 ? 180 : 10,
655 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
656 ); 907 );
657} 908 }
658
659sub drawextinfo {
660 my ($self, $color, $type, $subtype, $message) = @_;
661
662 $self->drawinfo ($color, $message);
663} 909}
664 910
665sub spell_add { 911sub spell_add {
666 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
667 913
… …
755 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
756 return unless $::CONN; 1002 return unless $::CONN;
757 1003
758 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
759 1005
1006 my @add;
1007
760 my $row; 1008 my $row;
761 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} }) {
762 if ($row < 6) { 1010 if ($row < 6) {
763 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
764 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
765 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
766 1014
1015 push @add,
767 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
768 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
769 1018
770 $row++; 1019 $row++;
771 } else { 1020 } else {
772 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
773 text => "More...", 1022 text => "More...",
774 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
775 ); 1024 ;
776 last; 1025 last;
777 } 1026 }
778 } 1027 }
779 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
780 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
781 text => "Close container", 1030 text => "Close container",
782 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
783 ); 1032 ;
784 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
785 }); 1036 });
786 1037
787 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
788} 1039}
789 1040
… …
900 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
901 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
902 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
904 . "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"
905 . "editing support $yesno[!!$self->{editor_support}]\n" 1157 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
909 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
910 ); 1163 );
911 1164
… …
913} 1166}
914 1167
915sub logged_in { 1168sub logged_in {
916 my ($self) = @_; 1169 my ($self) = @_;
917 1170
918 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
919 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
920 $self->update_server_info; 1175 $self->update_server_info;
921 1176
922 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
923 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
924 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
925 $self->update_server_info; 1180 $self->update_server_info;
926 1181
927 0 1182 0
928 }); 1183 });
929 } 1184 }
… …
949 1204
950sub lookat { 1205sub lookat {
951 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
952 1207
953 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
954 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
955 my ($msg) = @_; 1210 my (%msg) = @_;
956 1211
957 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
958 # start npc chat dialog 1213 # start npc chat dialog
959 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
960 dx => $x, 1215 token => $msg{npc_dialog},
961 dy => $y,
962 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
963 conn => $self, 1217 conn => $self,
964 ; 1218 ;
965 } 1219 }
966 }); 1220 });
967 } 1221 }
… …
974 1228
975 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
976 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
977 1231
978 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
979} 1235}
980 1236
981package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
982 1238
983our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1030 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1031 ; 1287 ;
1032 1288
1033 $self->update_options; 1289 $self->update_options;
1034 1290
1035 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1036 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1037 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1038 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1039 1297
1040 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1041 1299
1042 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1043 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1066 ); 1324 );
1067 } 1325 }
1068} 1326}
1069 1327
1070sub feed { 1328sub feed {
1071 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1072 1330
1073 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1074 1332
1075 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1078
1079 my $text = "\n" . CFPlus::asxml $msg->{msg};
1080 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1081 my @link;
1082 $text =~ s{
1083 ($match)
1084 }{
1085 my $kw = $1;
1086
1087 push @link, new CFPlus::UI::Label
1088 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1089 can_hover => 1,
1090 can_events => 1,
1091 padding_x => 0,
1092 padding_y => 0,
1093 on_button_up => sub {
1094 $self->send ($kw);
1095 };
1096
1097 "\x{fffc}"
1098 }giex;
1099 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1100 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1101 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1102 $self->update_options; 1365 $self->update_options;
1103 } else { 1366 } else {
1104 $self->destroy; 1367 $self->destroy;
1105 } 1368 }
1106 1369
… …
1111 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1112 1375
1113 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1114 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1115 1378
1116 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1117} 1380}
1118 1381
1119sub destroy { 1382sub destroy {
1120 my ($self) = @_; 1383 my ($self) = @_;
1121 1384
1122 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1123 1386
1124 if ($self->{conn}) { 1387 if ($self->{conn}) {
1125 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1126 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1127 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1128 } 1391 }
1129 1392
1130 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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