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.100 by root, Tue Apr 10 11:12:53 2007 UTC vs.
Revision 1.109 by root, Mon Jun 25 05:43:37 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 (@_, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 smoothing => 1, 25 excmd => 1,
26 xwidget => 1,
27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
30 32
… …
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 63 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 64
63 $self->setup_req (mapsize => "${w}x${h}"); 65 $self->setup_req (mapsize => "${w}x${h}");
64 } 66 }
67 }
68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 };
76 });
77
78 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 "CFPlus::UI::$arg->{class}"->new (
104 %$args,
105 s_ws => $arg->{ws},
106 s_id => $arg->{id},
107 )
108 }
109 ) {
110 $self->{widget}{$arg->{id}}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
112 = $widget;
113
114 $widget->connect (on_destroy => sub {
115 my ($widget) = @_;
116
117 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 });
120 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
123 }
124 });
125
126 $self->connect_ext (w_c => sub {
127 my ($arg) = @_;
128
129 my $w = $self->{widget}{$arg->{id}}
130 or return;
131 my $m = $arg->{name};
132
133 my @a = map {
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138
139 if (exists $arg->{rid}) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
141 } else {
142 $w->$m (@a);
143 }
144 });
145
146 $self->connect_ext (w_s => sub {
147 my ($arg) = @_;
148
149 my $w = $self->{widget}{$arg->{id}}
150 or return;
151
152 $w->{$arg->{name}} = $arg->{value};
153 });
154
155 $self->connect_ext (w_g => sub {
156 my ($arg) = @_;
157
158 my $w = $self->{widget}{$arg->{id}}
159 or return;
160
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
162 });
163
164 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
165 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy
167 for values %{delete $ws->{w} || {}};
65 } 168 }
66 }); 169 });
67 170
68 $self->{map_widget}->add_command (@$_) 171 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 172 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 351 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 352 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 353 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 354 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 355 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 356 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 357 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 358 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 359 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 360
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 361 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
633 $LAST_QUERY = $prompt; 734 $LAST_QUERY = $prompt;
634 735
635 $self->{query}-> ($self, $flags, $prompt); 736 $self->{query}-> ($self, $flags, $prompt);
636} 737}
637 738
638sub drawinfo { 739sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 740 local $_ = shift;
640 741
641 my @color = ( 742 # we now weed out all tags we do not support
743 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
744 # now all entities
745 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
746
747 # handle some elements
748 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
749 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
750
751 $_
752}
753
754our %NAME_TO_COLOR = (
755 black => 0,
756 white => 1,
757 darkblue => 2,
758 red => 3,
759 orange => 4,
760 lightblue => 5,
761 darkorange => 6,
762 green => 7,
763 darkgreen => 8,
764 grey => 9,
765 brown => 10,
766 yellow => 11,
767 tan => 12,
768);
769
770our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 771 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 772 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 773 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 774 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 775 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 776 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 777 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 778 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 779 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 780 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 781 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 782 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 783 [0.74, 0.65, 0.41],
655 ); 784);
656 785
657 my $fg = $color[$color % @color]; 786sub msg {
787 my ($self, $color, $type, $text, @extra) = @_;
658 788
789 $text = sanitise_xml $text;
790
791 if (my $cb = $self->{cb_msg}{$type}) {
792 $_->($self, $color, $type, $text, @extra) for values %$cb;
793 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
794 $type =~ s/-/_/g;
795 $self->{$type} = $text;
796 } else {
659 $self->logprint ("info: ", $text); 797 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood
660 799
800 my $fg = $CF_COLOR[$color % @CF_COLOR];
801
661 # try to create single paragraphs of multiple lines sent by the server 802 ## try to create single paragraphs of multiple lines sent by the server
803 # no longer neecssary with TRT servers
662 $text =~ s/(?<=\S)\n(?=\w)/ /g; 804 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
663 805
664 $text = CFPlus::asxml $text;
665 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
666 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
667
668 ::message ({ fg => $fg, markup => $_ }) 806 ::message ({ fg => $fg, markup => $_ })
669 for split /\n/, $text; 807 for split /\n/, $text;
670 808
671 $self->{statusbox}->add ($text, 809 $self->{statusbox}->add ($text,
672 group => $text, 810 group => $text,
673 fg => $fg, 811 fg => $fg,
674 timeout => $color >= 2 ? 180 : 10, 812 timeout => $color >= 2 ? 180 : 10,
675 tooltip_font => $::FONT_FIXED, 813 tooltip_font => $::FONT_FIXED,
676 ); 814 );
677} 815 }
678
679sub drawextinfo {
680 my ($self, $color, $type, $subtype, $message) = @_;
681
682 $self->drawinfo ($color, $message);
683} 816}
684 817
685sub spell_add { 818sub spell_add {
686 my ($self, $spell) = @_; 819 my ($self, $spell) = @_;
687 820
… …
920 $::SERVER_INFO->set_markup ( 1053 $::SERVER_INFO->set_markup (
921 "server <tt>$self->{host}:$self->{port}</tt>\n" 1054 "server <tt>$self->{host}:$self->{port}</tt>\n"
922 . "protocol version <tt>$self->{version}</tt>\n" 1055 . "protocol version <tt>$self->{version}</tt>\n"
923 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1056 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
924 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1057 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1058 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
925 . "editing support $yesno[!!$self->{editor_support}]\n" 1059 . "editing support $yesno[!!$self->{editor_support}]\n"
926 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1060 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1061 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
927 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
928 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
929 . "map size $self->{mapw}×$self->{maph}\n" 1064 . "map size $self->{mapw}×$self->{maph}\n"
930 ); 1065 );
931 1066
… …
1094 1229
1095 if ($msg->{msgtype} eq "reply") { 1230 if ($msg->{msgtype} eq "reply") {
1096 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1097 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1098 1233
1099 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1234 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1100 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1235 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1101 my @link; 1236 my @link;
1102 $text =~ s{ 1237 $text =~ s{
1103 ($match) 1238 ($match)
1104 }{ 1239 }{

Diff Legend

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