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.32 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9use CFClient::UI; 9use CFClient::UI;
10 10
11use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
12 14
13sub new { 15sub new {
14 my $class = shift; 16 my $class = shift;
15 17
16 my $self = $class->SUPER::new (@_); 18 my $self = $class->SUPER::new (@_);
… …
58 # per server 60 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60 62
61 $self 63 $self
62} 64}
65
66sub logprint {
67 my ($self, @a) = @_;
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}";
69
70 my $fh = $open_logs{$filename};
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!";
75
76 $open_logs{$filename} = $fh;
77 }
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print $fh "$ts ", @a, "\n";
85 $fh->flush;
86}
87
88
63 89
64sub stats_update { 90sub stats_update {
65 my ($self, $stats) = @_; 91 my ($self, $stats) = @_;
66 92
67 if (my $exp = $stats->{+CS_STAT_EXP64}) { 93 if (my $exp = $stats->{+CS_STAT_EXP64}) {
… …
79 105
80 if ($self->{record}) { 106 if ($self->{record}) {
81 push @{$self->{record}}, $command; 107 push @{$self->{record}}, $command;
82 } 108 }
83 109
110 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 111 $self->send_command ($command);
85 ::status $command; 112 ::status $command;
86} 113}
87 114
88sub start_record { 115sub start_record {
… …
105sub feed_map1a { 132sub feed_map1a {
106 my ($self, $data) = @_; 133 my ($self, $data) = @_;
107 134
108 $self->{map}->map1a_update ($data); 135 $self->{map}->map1a_update ($data);
109 $self->{map_widget}->update; 136 $self->{map_widget}->update;
137}
138
139sub magicmap {
140 my ($self, $w, $h, $x, $y, $data) = @_;
141
142 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110} 143}
111 144
112sub flush_map { 145sub flush_map {
113 my ($self) = @_; 146 my ($self) = @_;
114 147
… …
127 160
128 $self->flush_map; 161 $self->flush_map;
129 delete $self->{neigh_map}; 162 delete $self->{neigh_map};
130 163
131 $self->{map}->clear; 164 $self->{map}->clear;
165 delete $self->{map_widget}{magicmap};
132} 166}
133 167
134 168
135sub load_map($$$) { 169sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 170 my ($self, $hash, $x, $y) = @_;
… …
279 # I love transactions 313 # I love transactions
280 for (1..100) { 314 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin; 315 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id); 316 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 317 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1; 318 $id = ($id || 64) + 1;
285 if ($self->{facemap}->put (id => $id) == 0 319 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) { 320 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit; 321 $txn->txn_commit;
288 322
289 goto gotid; 323 goto gotid;
… …
369 [0.55, 0.41, 0.13], 403 [0.55, 0.41, 0.13],
370 [0.99, 0.77, 0.26], 404 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 405 [0.74, 0.65, 0.41],
372 ); 406 );
373 407
408 $self->logprint ("info: ", $text);
409
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 410 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375 411
376 # try to create single paragraphs of multiple lines sent by the server 412 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 413 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378 414
… …
779 815
780 if ($type eq "msg") { 816 if ($type eq "msg") {
781 my ($msg, @kw) = split /\x00/, $msg; 817 my ($msg, @kw) = split /\x00/, $msg;
782 $self->{kw}{$_} = 1 for @kw; 818 $self->{kw}{$_} = 1 for @kw;
783 819
784 warn "<<<<@kw>>>>\n";#d#
785
786 $msg = CFClient::UI::Label::escape $msg; 820 $msg = CFClient::UI::Label::escape $msg;
787 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
788 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 822 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
789 823
790 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");

Diff Legend

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