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.101 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC

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

Diff Legend

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