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.197 by root, Tue May 20 02:47:21 2008 UTC vs.
Revision 1.218 by root, Thu Apr 8 19:11:21 2010 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use DC; 9use DC;
9use DC::DB; 10use DC::DB;
11use DC::Pod; 12use DC::Pod;
12use DC::Macro; 13use DC::Macro;
13use DC::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
16 25
17sub new { 26sub new {
18 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
19 28
20 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
67 for values %{delete $ws->{w} || {}}; 76 for values %{delete $ws->{w} || {}};
68 } 77 }
69 78
70 delete $self->{items}; 79 delete $self->{items};
71 $::INV->clear; 80 $::INV->clear;
81 $::INVR->clear;
72 $::INVR_HB->clear; 82 $::INVR_HB->clear;
73 $::FLOORBOX->clear; 83 $::FLOORBOX->clear;
74 }); 84 });
75 85
76 $self->{map_widget}->add_command (@$_) 86 $self->{map_widget}->add_command (@$_)
77 for @cmd_help; 87 for @cmd_help;
78 88
79 { 89 {
80 $self->{dialogue} = my $tex = new_from_file DC::Texture 90 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
82 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 91 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
83 } 92 }
84 93
85 { 94 {
86 $self->{noface} = my $tex = new_from_file DC::Texture 95 $self->{noface} = my $tex = $TEX_NOFACE;
87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
88 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 96 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
89 } 97 }
98
99# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
100# $self->{expire_w} = EV::timer 1, 1, sub {
101# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
102#
103# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
104# warn DC::SvREFCNT $self->{texture}[$_];
105# $self->{texture}[$_]->unload;
106# warn "expire texture $_\n";#d#
107# }
108#
109# ($self->{expire_count} += $count) < @{ $self->{texture} }
110# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
111# warn "count is $count\n";#d#
112# };
90 113
91 $self->{open_container} = 0; 114 $self->{open_container} = 0;
92 115
93 # per server 116 # per server
94 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 117 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
255 my %wkw = ( 278 my %wkw = (
256 root => $DC::UI::ROOT, 279 root => $DC::UI::ROOT,
257 tooltip => $DC::UI::TOOLTIP, 280 tooltip => $DC::UI::TOOLTIP,
258 281
259 mapwidget => $::MAPWIDGET, 282 mapwidget => $::MAPWIDGET,
283 menubar => $::MENUBAR,
284 menupopup => $::MENUPOPUP,
285 pickup_enable => $::PICKUP_ENABLE,
260 buttonbar => $::BUTTONBAR, 286 buttonbar => $::BUTTONBAR,
261 metaserver => $::METASERVER, 287 metaserver => $::METASERVER,
262 buttonbar => $::BUTTONBAR, 288 buttonbar => $::BUTTONBAR,
263 login_button => $::LOGIN_BUTTON, 289 login_button => $::LOGIN_BUTTON,
264 quit_dialog => $::QUIT_DIALOG, 290 quit_dialog => $::QUIT_DIALOG,
281 307
282 floorbox => $::FLOORBOX, 308 floorbox => $::FLOORBOX,
283 help_window => $::HELP_WINDOW, 309 help_window => $::HELP_WINDOW,
284 message_window => $::MESSAGE_WINDOW, 310 message_window => $::MESSAGE_WINDOW,
285 message_dist => $::MESSAGE_DIST, 311 message_dist => $::MESSAGE_DIST,
286 statusbox => $::SDTATUSBOX, 312 statusbox => $::STATUSBOX,
287 313
288 inv => $::INV, 314 inv => $::INV,
289 invr => $::INVR, 315 invr => $::INVR,
290 invr_hb => $::INVR_HB, 316 invr_hb => $::INVR_HB,
291 ); 317 );
375 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 401 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
376 : () 402 : ()
377 } 403 }
378 sort { $a <=> $b } keys %{$self->{spell_paths}}; 404 sort { $a <=> $b } keys %{$self->{spell_paths}};
379 405
380 join "", @diff 406 "\u$name: " . (join ", ", @diff)
381} 407}
382 408
383# all stats that are chacked against changes 409# all stats that are chacked against changes
384my @statchange = ( 410my @statchange = (
385 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 411 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
440 } 466 }
441 467
442 if ( 468 if (
443 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 469 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
444 ) { 470 ) {
445 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 471 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
446 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 472 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
447 } 473 }
448 474
449 $self->update_stats_window ($stats, $prev); 475 $self->update_stats_window ($stats, $prev);
450 476
488 514
489 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 515 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
490 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 516 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
491 $::GAUGES->{food} ->set_value ($fo, $fo_m); 517 $::GAUGES->{food} ->set_value ($fo, $fo_m);
492 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 518 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
493 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 519 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
494 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 520 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
495 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 521 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
496 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 522 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
497 my $title = $stats->{+CS_STAT_TITLE}; 523 my $title = $stats->{+CS_STAT_TITLE};
498 $title =~ s/^Player: //; 524 $title =~ s/^Player: //;
499 $::STATWIDS->{title} ->set_text ("Title: " . $title); 525 $::STATWIDS->{title} ->set_text ("Title: " . $title);
500 526
512 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 538 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
513 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 539 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
514 540
515 $self->update_weight; 541 $self->update_weight;
516 542
517 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 543 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
518 for keys %RES_TBL; 544 for keys %RES_TBL;
519 545
520 my $sktbl = $::STATWIDS->{skill_tbl}; 546 my $sktbl = $::STATWIDS->{skill_tbl};
521 my @skills = keys %{ $self->{skill_info} }; 547 my @skills = keys %{ $self->{skill_info} };
522 548
541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 567 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
542 ]; 568 ];
543 569
544 my @add = @$sw; 570 my @add = @$sw;
545 571
546 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 572 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
547 573
548 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 574 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
549 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 575 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
550 576
551 my ($x, $y) = (0, 1); 577 my ($x, $y) = (0, 1);
613 my $sw = $self->{skillwid}{$idx}; 639 my $sw = $self->{skillwid}{$idx};
614 $sw->[0]->set_text (::formsep ($val->[1])); 640 $sw->[0]->set_text (::formsep ($val->[1]));
615 $sw->[1]->set_text ($val->[0] * 1); 641 $sw->[1]->set_text ($val->[0] * 1);
616 $sw->[2]->set_value (@$val); 642 $sw->[2]->set_value (@$val);
617 643
618 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 644 $::GAUGES->{skillexp}->set_label ("$name %d%%");
619 $::GAUGES->{sklprg}->set_value (@$val); 645 $::GAUGES->{skillexp}->set_value (@$val);
620 } 646 }
621} 647}
622 648
623sub user_send { 649sub user_send {
624 my ($self, $command) = @_; 650 my ($self, $command) = @_;
637} 663}
638 664
639sub map_scroll { 665sub map_scroll {
640 my ($self, $dx, $dy) = @_; 666 my ($self, $dx, $dy) = @_;
641 667
642 $self->{map}->scroll ($dx, $dy); 668 $self->{map_widget}->scroll ($dx, $dy);
643} 669}
644 670
645sub feed_map1a { 671sub feed_map1a {
646 my ($self, $data) = @_; 672 my ($self, $data) = @_;
647 673
651 for my $tile (@$missing) { 677 for my $tile (@$missing) {
652 next if $self->{delay}{$tile}; 678 next if $self->{delay}{$tile};
653 679
654 $delay = 1; 680 $delay = 1;
655 681
656 if (my $tex = $::CONN->{texture}[$tile]) { 682 if (my $tex = $self->{texture}[$tile]) {
657 $tex->upload; 683 $tex->upload;
658 } else { 684 } else {
659 $self->{delay}{$tile} = 1; 685 $self->{delay}{$tile} = 1;
660 686
661 # we assume the face is in-flight and will eventually come 687 # we assume the face is in-flight and will eventually arrive
662 push @{$self->{tile_cb}{$tile}}, sub { 688 push @{$self->{tile_cb}{$tile}}, sub {
663 delete $self->{delay}{$tile}; 689 delete $self->{delay}{$tile};
664 $_[0]->upload; 690 $_[0]->upload;
665 }; 691 };
666 } 692 }
667 } 693 }
668 694
669 if ($delay) { 695 if ($delay) {
670 # delay the map drawing a tiny bit in the hope of getting the missing fetched 696 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
671 EV::once undef, 0, 0.03, sub { 697 EV::once undef, 0, 0.03, sub {
672 $self->{map_widget}->update 698 $self->{map_widget}->update
673 if $self->{map_widget}; 699 if $self->{map_widget};
674 }; 700 };
675 } else { 701 } else {
694 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 720 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
695 721
696 if ($data ne $$rdata) { 722 if ($data ne $$rdata) {
697 $map_info->[1] = \$data; 723 $map_info->[1] = \$data;
698 my $cdata = Compress::LZF::compress $data; 724 my $cdata = Compress::LZF::compress $data;
699 warn "db_put $hash $x $y ", length $data, " > ", length $cdata;
700 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; 725 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
701 } 726 }
702 } 727 }
703} 728}
704 729
742 767
743 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; 768 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
744 769
745 my $cb = sub { 770 my $cb = sub {
746 $map_info->[1] = \$_[0]; 771 $map_info->[1] = \$_[0];
747
748 return if 2505 == length $_[0];#d#
749 warn "map_cache $hash $x $y $w $h ", length $_[0];#d#
750 772
751 my $inprogress = @{ $self->{bg_fetch} || [] }; 773 my $inprogress = @{ $self->{bg_fetch} || [] };
752 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); 774 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
753 $self->bg_fetch unless $inprogress; 775 $self->bg_fetch unless $inprogress;
754 }; 776 };
967 989
968 my $tex = $self->{texture}[$tile] ||= 990 my $tex = $self->{texture}[$tile] ||=
969 new DC::Texture 991 new DC::Texture
970 tile => $tile, 992 tile => $tile,
971 image => $data, delete_image => 1, 993 image => $data, delete_image => 1,
972 minify => 1, mipmap => 1; 994 minify => 1;
973 995
974 if (my $cbs = delete $self->{tile_cb}{$tile}) { 996 if (my $cbs = delete $self->{tile_cb}{$tile}) {
975 $_->($tex) for @$cbs; 997 $_->($tex) for @$cbs;
976 } 998 }
977} 999}
982 my ($self, $num, $cb) = @_; 1004 my ($self, $num, $cb) = @_;
983 1005
984 push @{$self->{face_cb}{$num}}, $cb; 1006 push @{$self->{face_cb}{$num}}, $cb;
985 1007
986 defined wantarray 1008 defined wantarray
987 ? DC::guard { 1009 ? Guard::guard {
988 @{$self->{face_cb}{$num}} 1010 @{$self->{face_cb}{$num}}
989 = grep $_ != $cb, 1011 = grep $_ != $cb,
990 @{$self->{face_cb}{$num}}; 1012 @{$self->{face_cb}{$num}};
991 } 1013 }
992 : () 1014 : ()
1096 1118
1097 ## try to create single paragraphs of multiple lines sent by the server 1119 ## try to create single paragraphs of multiple lines sent by the server
1098 # no longer neecssary with TRT servers 1120 # no longer neecssary with TRT servers
1099 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1121 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1100 1122
1101 for (split /\n/, $text) {
1102 ::message ({ 1123 ::message ({
1103 fg => $fg, 1124 fg => $fg,
1104 markup => $_, 1125 markup => $text,
1105 type => $type, 1126 type => $type,
1106 extra => [@extra], 1127 extra => [@extra],
1107 color_flags => $color, #d# ugly, kill 1128 color_flags => $color, #d# ugly, kill
1108 }); 1129 });
1109 1130
1110 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1131# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1111 # actually, this is an ugly design. _we_ should control the channels, 1132# # actually, this is an ugly design. _we_ should control the channels,
1112 # not some random other widget, as the channels are clearly protocol-specific. 1133# # not some random other widget, as the channels are clearly protocol-specific.
1113 # then we could also react to flags such as CLEAR without resorting to 1134# # then we could also react to flags such as CLEAR without resorting to
1114 # hacks such as color_flags, above. 1135# # hacks such as color_flags, above.
1115 }
1116 1136
1117 $self->{statusbox}->add ($text, 1137 $self->{statusbox}->add ($text,
1118 group => $text, 1138 group => $text,
1119 fg => $fg, 1139 fg => $fg,
1120 timeout => $color >= 2 ? 180 : 10, 1140 timeout => $color >= 2 ? 180 : 10,
1327sub update_server_info { 1347sub update_server_info {
1328 my ($self) = @_; 1348 my ($self) = @_;
1329 1349
1330 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1350 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1331 1351
1352 my $version = JSON::XS->new->encode ($self->{s_version});
1353
1332 $::SERVER_INFO->set_markup ( 1354 $::SERVER_INFO->set_markup (
1333 "server <tt>$self->{host}:$self->{port}</tt>\n" 1355 "server <tt>$self->{host}:$self->{port}</tt>\n"
1334 . "protocol version <tt>$self->{version}</tt>\n" 1356 . "protocol version <tt>$version</tt>\n"
1335 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1357 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1336 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1358 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1337 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1359 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1338 . "editing support $yesno[!!$self->{editor_support}]\n" 1360 . "editing support $yesno[!!$self->{editor_support}]\n"
1339 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1361 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1367 }); 1389 });
1368 1390
1369 $self->update_server_info; 1391 $self->update_server_info;
1370 1392
1371 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1393 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1372 $self->send_command ("pickup $::CFG->{pickup}"); 1394 $self->send_pickup ($::CFG->{pickup});
1373} 1395}
1374 1396
1375sub lookat { 1397sub lookat {
1376 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1377 1399
1541} 1563}
1542 1564
1543sub send { 1565sub send {
1544 my ($self, $msg) = @_; 1566 my ($self, $msg) = @_;
1545 1567
1546 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1568 $self->{textview}->add_paragraph ({
1569 markup =>
1570 "\n<span foreground='#ffff00'><b>"
1571 . (DC::asxml $msg)
1572 . "</b></span>"
1573 });
1547 $self->{textview}->scroll_to_bottom; 1574 $self->{textview}->scroll_to_bottom;
1548 1575
1549 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1576 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1550} 1577}
1551 1578

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines