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.184 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.195 by root, Thu May 8 20:19:49 2008 UTC

… …
27 ); 27 );
28 28
29 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
30 30
31 my @cmd_help = map { 31 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 34
35 my $cmd = $1; 35 my $cmd = $1;
36 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 37 @args = (".*") unless @args;
38 38
… …
43 for @args; 43 for @args;
44 44
45 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
47 @args 47 @args
48 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 DC::Pod::find command => "*"; 49 DC::Pod::find command => "*";
50 50
51 $self->{json_coder} 51 $self->{json_coder}
52 ->convert_blessed 52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
… …
194 ); 194 );
195} 195}
196 196
197# widgetset create template 197# widgetset create template
198sub ext_ws_ct { 198sub ext_ws_ct {
199 my ($self, $ws, $template, $cfg) = @_; 199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200 200
201 $template = eval <<EOF; 201 $done_cb ||= sub { };
202[
203 Toplevel => {
204 s_id => "toplevel",
205 title => "Character Creation",
206 x => "center",
207 y => "center",
208 z => 5,
209 s_cl => [VBox => {s_cl => [
210 Label => {
211 text => "Character Creation",
212 fontsize => 1,
213 align => 0,
214 },
215 Label => {
216 markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
217 fontsize => 0.8,
218 align => 0,
219 },
220 Notebook => {
221 s_cl => [
222 Label => {
223 text => "hulla-hoop"
224 },
225 Entry => {
226 s_id => "entry",
227 },
228 ],
229 },
230 Button => {
231 s_id => "finish",
232 title => "Finish",
233 },
234 ]}],
235 },
236]
237EOF
238 die if $@;
239 202
240 my $parse_list; $parse_list = sub { 203 my $parse_list; $parse_list = sub {
241 my ($list) = @_; 204 my ($list) = @_;
242 my @w; 205 my @w;
243 206
… …
260 } 223 }
261 224
262 @w 225 @w
263 }; 226 };
264 227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
265 $parse_list->($template); 231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
266 235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
267} 243}
268 244
269# widgetset associate 245# widgetset associate
270sub ext_ws_a { 246sub ext_ws_a {
271 my ($self, %ass) = @_; 247 my ($self, %ass) = @_;
… …
299 spell_list => $::SPELL_LIST, 275 spell_list => $::SPELL_LIST,
300 276
301 floorbox => $::FLOORBOX, 277 floorbox => $::FLOORBOX,
302 help_window => $::HELP_WINDOW, 278 help_window => $::HELP_WINDOW,
303 message_window => $::MESSAGE_WINDOW, 279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
304 statusbox => $::SDTATUSBOX, 281 statusbox => $::SDTATUSBOX,
305 282
306 inv => $::INV, 283 inv => $::INV,
307 invr => $::INVR, 284 invr => $::INVR,
308 invr_hb => $::INVR_HB, 285 invr_hb => $::INVR_HB,
… …
357 334
358# message window 335# message window
359sub ext_channel_info { 336sub ext_channel_info {
360 my ($self, $info) = @_; 337 my ($self, $info) = @_;
361 $self->{channels}->{$info->{id}} = $info; 338 $self->{channels}->{$info->{id}} = $info;
362 $::MESSAGE_WINDOW->add_channel ($info); 339 $::MESSAGE_DIST->add_channel ($info);
363} 340}
364 341
365############################################################################# 342#############################################################################
366 343
367sub logprint { 344sub logprint {
… …
549 $sktbl->clear; 526 $sktbl->clear;
550 527
551 my $sw = $self->{skillwid}{""} ||= [ 528 my $sw = $self->{skillwid}{""} ||= [
552 0, 0, (new DC::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
553 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
554 2, 0, (new DC::UI::Label text => "Progress", align => 0), 531 2, 0, (new DC::UI::Label text => "Progress"),
555 3, 0, (new DC::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
556 4, 0, (new DC::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
557 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
558 6, 0, (new DC::UI::Label text => "Progress", align => 0), 535 6, 0, (new DC::UI::Label text => "Progress"),
559 7, 0, (new DC::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
560 ]; 537 ];
561 538
562 my @add = @$sw; 539 my @add = @$sw;
563 540
564 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
603 580
604 # progress 581 # progress
605 (new DC::UI::ExperienceProgress), 582 (new DC::UI::ExperienceProgress),
606 583
607 # label 584 # label
608 (new DC::UI::Label text => $name, on_button_down => $spell_cb, 585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
609 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
610 ]; 587 ];
611 588
612 push @add, 589 push @add,
613 $x * 4 + 0, $y, $sw->[0], 590 $x * 4 + 0, $y, $sw->[0],
… …
1048 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1049 1026
1050 # handle some elements 1027 # handle some elements
1051 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1052 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1029 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1030
1031 s/\s+$//;
1053 1032
1054 $_ 1033 $_
1055} 1034}
1056 1035
1057our %NAME_TO_COLOR = ( 1036our %NAME_TO_COLOR = (
… …
1163 1142
1164 my %skill_help; 1143 my %skill_help;
1165 1144
1166 for my $node (DC::Pod::find skill_description => "*") { 1145 for my $node (DC::Pod::find skill_description => "*") {
1167 my (undef, @par) = DC::Pod::section_of $node; 1146 my (undef, @par) = DC::Pod::section_of $node;
1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; 1147 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1169 }; 1148 };
1170 1149
1171 for my $skill (values %{$self->{skill_info}}) { 1150 for my $skill (values %{$self->{skill_info}}) {
1172 $self->{map_widget}->add_command ("ready_skill $skill", 1151 $self->{map_widget}->add_command ("ready_skill $skill",
1173 (DC::asxml "Ready the skill '$skill'\n\n") 1152 (DC::asxml "Ready the skill '$skill'\n\n")
… …
1193 $::FLOORBOX->clear; 1172 $::FLOORBOX->clear;
1194 1173
1195 my @add; 1174 my @add;
1196 1175
1197 my $row; 1176 my $row;
1198 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1177 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1178 next if $_->{tag} & 0x80000000;
1199 if ($row < 6) { 1179 if ($row < 6) {
1200 local $_->{face_widget}; # hack to force recreation of widget 1180 local $_->{face_widget}; # hack to force recreation of widget
1201 local $_->{desc_widget}; # hack to force recreation of widget 1181 local $_->{desc_widget}; # hack to force recreation of widget
1202 DC::Item::update_widgets $_; 1182 DC::Item::update_widgets $_;
1203 1183
… …
1231 my ($conn, $tag, $name) = @_; 1211 my ($conn, $tag, $name) = @_;
1232 $conn->{open_container} = $tag; 1212 $conn->{open_container} = $tag;
1233 update_floorbox; 1213 update_floorbox;
1234 1214
1235 $::INVR_HB->clear (); 1215 $::INVR_HB->clear ();
1236 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); 1216 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1237 1217
1238 if ($tag != 0) { # Floor isn't closable, is it? 1218 if ($tag != 0) { # Floor isn't closable, is it?
1239 $::INVR_HB->add (new DC::UI::Button 1219 $::INVR_HB->add (new DC::UI::Button
1240 text => "Close container", 1220 text => "Close container",
1241 tooltip => "Close the currently open container (if one is open)", 1221 tooltip => "Close the currently open container (if one is open)",
… …
1296} 1276}
1297 1277
1298sub item_update { 1278sub item_update {
1299 my ($self, $item) = @_; 1279 my ($self, $item) = @_;
1300 1280
1301 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1281 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1302 1282
1303 DC::Item::update_widgets $item; 1283 DC::Item::update_widgets $item;
1304 1284
1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1285 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1306 set_opencont ($::CONN, 0, "Floor"); 1286 set_opencont ($::CONN, 0, "Floor");
1307 1287
1308 } elsif ($item->{flags} & F_OPEN) { 1288 } elsif ($item->{flags} & F_OPEN) {
1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); 1289 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
… …
1325 1305
1326 my $weight = .001 * $self->{player}{weight}; 1306 my $weight = .001 * $self->{player}{weight};
1327 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1307 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1328 1308
1329 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1309 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1330 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1310 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1331 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1311 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1332} 1312}
1333 1313
1334sub update_server_info { 1314sub update_server_info {
1335 my ($self) = @_; 1315 my ($self) = @_;
… …
1343 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1323 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1344 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1324 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1345 . "editing support $yesno[!!$self->{editor_support}]\n" 1325 . "editing support $yesno[!!$self->{editor_support}]\n"
1346 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1326 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1347 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1327 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1348 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1328 . "client support $yesno[$self->{cfplus_ext} > 0]"
1349 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1329 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1350 . "map size $self->{mapw}×$self->{maph}\n" 1330 . "map size $self->{mapw}×$self->{maph}\n"
1351 ); 1331 );
1352 1332
1353} 1333}

Diff Legend

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