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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC

… …
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::UI; 9use CFPlus::UI;
10use CFPlus::Pod; 10use CFPlus::Pod;
11use CFPlus::Macro;
12use CFPlus::Item;
13
14use Crossfire::Protocol::Base 0.95;
11 15
12use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
13 17
14sub new { 18sub new {
15 my $class = shift; 19 my $class = shift;
16 20
17 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 22
19 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
20 24
21 my @cmd_help = map { 25 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 37 for @args;
34 38
35 map ["$cmd$_", $text], 39 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 40 sort { (length $a) <=> (length $b) }
37 @args 41 @args
42 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 43 CFPlus::Pod::find command => "*";
39 44
40 $self->{map_widget}->add_command (@$_) 45 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 46 for @cmd_help;
42 47
43 $self->{noface} = new_from_file CFPlus::Texture 48 $self->{noface} = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
45 50
51 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 }
56
46 $self->{open_container} = 0; 57 $self->{open_container} = 0;
47 58
48 # "global" 59 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache"; 60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
50 $self->{facemap} = CFPlus::db_table "facemap"; 62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
51 64
52 # per server 65 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
54 68
55 $self 69 $self
56} 70}
57 71
58sub logprint { 72sub logprint {
… …
258 272
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 274
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 276 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 277
265 my ($x, $y) = (0, 1); 278 my ($x, $y) = (0, 1);
266 for ( 279 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 280 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 281 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 290 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 291 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 292 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 293 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 296 (new CFPlus::UI::Menu
283 items => [ 297 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 298 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 299 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 300 ],
287 )->popup ($ev); 301 )->popup ($ev);
288 } else { 302 } else {
289 return 0; 303 return 0;
290 } 304 }
… …
294 308
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 310 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 312 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 313 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 315
301 $x++ and ($x, $y) = (0, $y + 1); 316 $x++ and ($x, $y) = (0, $y + 1);
302 } 317 }
303 } 318 }
304 319
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 323 }
309} 324}
310 325
326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
332}
333
311sub user_send { 334sub user_send {
312 my ($self, $command) = @_; 335 my ($self, $command) = @_;
313 336
337 $self->{record}->($command)
314 if ($self->{record}) { 338 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 339
318 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 341 $self->send_command ($command);
320 ::status ($command); 342 ::status ($command);
321} 343}
322 344
323sub start_record { 345sub record {
324 my ($self) = @_; 346 my ($self, $cb) = @_;
325 347
326 $self->{record} = []; 348 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 349}
333 350
334sub map_scroll { 351sub map_scroll {
335 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
336 353
… …
338} 355}
339 356
340sub feed_map1a { 357sub feed_map1a {
341 my ($self, $data) = @_; 358 my ($self, $data) = @_;
342 359
343 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 361 $self->{map_widget}->update;
345} 362}
346 363
347sub magicmap { 364sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 365 my ($self, $w, $h, $x, $y, $data) = @_;
… …
613 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
614 ); 631 );
615 632
616 $self->logprint ("info: ", $text); 633 $self->logprint ("info: ", $text);
617 634
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
619
620 # try to create single paragraphs of multiple lines sent by the server 635 # try to create single paragraphs of multiple lines sent by the server
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 636 $text =~ s/(?<=\S)\n(?=\w)/ /g;
622 637
623 $text = CFPlus::asxml $text; 638 $text = CFPlus::asxml $text;
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 639 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 640 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 641
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 642 ::message ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 643 for split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630 644
631 $self->{statusbox}->add ($text, 645 $self->{statusbox}->add ($text,
632 group => $text, 646 group => $text,
633 fg => $color[$color], 647 fg => $color[$color],
634 timeout => $color >= 2 ? 180 : 10, 648 timeout => $color >= 2 ? 180 : 10,
… …
648 # try to create single paragraphs out of the multiple lines sent by the server 662 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 663 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 664 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 665 $spell->{message} ||= "Server did not provide a description for this spell.";
652 666
653 $::SPELL_PAGE->add_spell ($spell); 667 $::SPELL_LIST->add_spell ($spell);
654 668
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 669 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 670 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 671}
658 672
659sub spell_delete { 673sub spell_delete {
660 my ($self, $spell) = @_; 674 my ($self, $spell) = @_;
661 675
662 $::SPELL_PAGE->remove_spell ($spell); 676 $::SPELL_LIST->remove_spell ($spell);
677}
678
679sub setup {
680 my ($self, $setup) = @_;
681
682 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 683}
664 684
665sub addme_success { 685sub addme_success {
666 my ($self) = @_; 686 my ($self) = @_;
667 687
… …
873 $::SERVER_INFO->set_markup ( 893 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 894 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 895 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 896 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 897 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
898 . "editing support $yesno[!!$self->{editor_support}]\n"
899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 902 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 903 );
904
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 906}
883 907
884sub logged_in { 908sub logged_in {
885 my ($self) = @_; 909 my ($self) = @_;
886 910
887 $self->send_ext_req (cfplus_support => version => 1, sub { 911 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 912 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 913 $self->update_server_info;
890 914
915 if ($self->{cfplus_ext} >= 2) {
916 $self->send_ext_req ("editor_support", sub {
917 $self->{editor_support} = $_[0];
918 $self->update_server_info;
919
920 0
921 });
922 }
923
891 0 924 0
892 }); 925 });
893 926
894 $self->update_server_info; 927 $self->update_server_info;
895 928
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 929 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 930 $self->send_command ("output-count $::CFG->{output_count}");
898 $self->send_command ("pickup $::CFG->{pickup}"); 931 $self->send_command ("pickup $::CFG->{pickup}");
932}
933
934sub buildat {
935 my ($self, $builditem, $x, $y) = @_;
936
937 if ($self->{cfplus_ext}) {
938 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939 }
899} 940}
900 941
901sub lookat { 942sub lookat {
902 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
903 944
… …
921} 962}
922 963
923sub destroy { 964sub destroy {
924 my ($self) = @_; 965 my ($self) = @_;
925 966
926 $self->{npc_dialog}->destroy 967 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 968 if $self->{npc_dialog};
928 969
929 $self->SUPER::destroy; 970 $self->SUPER::destroy;
930} 971}
931 972
932package CFPlus::NPCDialog; 973package CFPlus::NPCDialog;
933 974
934our @ISA = 'CFPlus::UI::FancyFrame'; 975our @ISA = 'CFPlus::UI::Toplevel';
935 976
936sub new { 977sub new {
937 my $class = shift; 978 my $class = shift;
938 979
939 my $self = $class->SUPER::new ( 980 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 987 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 988 has_close_button => 1,
948 @_, 989 @_,
949 ); 990 );
950 991
951 Scalar::Util::weaken (my $this = $self); 992 CFPlus::weaken (my $this = $self);
952 993
953 $self->connect (delete => sub { $this->destroy; 1 }); 994 $self->connect (delete => sub { $this->destroy; 1 });
954 995
955 # better use a pane... 996 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 997 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 999
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1000 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1001
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1002 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1003 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1004 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 1005 on_activate => sub {
969 my ($entry, $text) = @_; 1006 my ($entry, $text) = @_;
970 1007
971 return unless $text =~ /\S/; 1008 return unless $text =~ /\S/;
972 1009
… …
1004}; 1041};
1005 1042
1006sub update_options { 1043sub update_options {
1007 my ($self) = @_; 1044 my ($self) = @_;
1008 1045
1009 Scalar::Util::weaken $self; 1046 CFPlus::weaken $self;
1010 1047
1011 $self->{options}->clear; 1048 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1049 $self->{options}->add ($self->{bye_button});
1013 1050
1014 for my $kw (sort keys %{ $self->{kw} }) { 1051 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1060}
1024 1061
1025sub feed { 1062sub feed {
1026 my ($self, $msg) = @_; 1063 my ($self, $msg) = @_;
1027 1064
1028 Scalar::Util::weaken $self; 1065 CFPlus::weaken $self;
1029 1066
1030 if ($msg->{msgtype} eq "reply") { 1067 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1068 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1069 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1070
… …
1047 padding_y => 0, 1084 padding_y => 0,
1048 on_button_up => sub { 1085 on_button_up => sub {
1049 $self->send ($kw); 1086 $self->send ($kw);
1050 }; 1087 };
1051 1088
1052 chr 0xfffc 1089 "\x{fffc}"
1053 }giex; 1090 }giex;
1054 1091
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1092 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1093 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1094 $self->update_options;
… …
1084 1121
1085 $self->SUPER::destroy; 1122 $self->SUPER::destroy;
1086} 1123}
1087 1124
10881 11251
1126

Diff Legend

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