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.113 by root, Thu Jul 12 17:56:51 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs});
83 });
84 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 }
89
90 &::audio_music_set ($self->{songs} = \@songs);
91 });
92
93 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_;
95
96 if (my $ts = $cap->{tileset}) {
97 if (my ($default) = grep $_->[2] & 1, @$ts) {
98 $self->{tileset} = $default;
99 $self->{tilesize} = $default->[3];
100 $self->setup_req (tileset => $default->[0]);
101
102 my $w = int $self->{mapw} * 32 / $self->{tilesize};
103 my $h = int $self->{maph} * 32 / $self->{tilesize};
104
105 $self->setup_req (mapsize => "${w}x${h}");
106 }
107 }
108 });
109
110 $self->{json_coder}
111 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub {
113 $self->{widget}{$_[0]}
114 });
115
116 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_;
118
119 $self->{widgetset}{$arg{id}} = {
120 w => {},
121 };
122 });
123
124 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_;
126
127 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return;
129
130 $_->destroy
131 for values %{$ws->{w}};
132 });
133
134 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_;
136
137 my $args = $arg->{args} || {};
138
139 for my $ev (grep /^on_/, keys %$args) {
140 $args->{$ev} = sub {
141 my $id = shift->{s_id};
142 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
143
144 1
145 };
146 }
147
148 if (my $widget = eval {
149 local $SIG{__DIE__};
150 "CFPlus::UI::$arg->{class}"->new (
151 %$args,
152 s_ws => $arg->{ws},
153 s_id => $arg->{id},
154 )
155 }
156 ) {
157 $self->{widget}{$arg->{id}}
158 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
159 = $widget;
160
161 $widget->connect (on_destroy => sub {
162 my ($widget) = @_;
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
166 });
167 } else {
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 }
171 });
172
173 $self->connect_ext (w_c => sub {
174 my ($arg) = @_;
175
176 my $w = $self->{widget}{$arg->{id}}
177 or return;
178 my $m = $arg->{name};
179
180 my $a = $arg->{args} || [];
181
182 if (exists $arg->{rid}) {
183 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
184 } else {
185 $w->$m (@$a);
186 }
187 });
188
189 $self->connect_ext (w_s => sub {
190 my ($arg) = @_;
191
192 my $w = $self->{widget}{$arg->{id}}
193 or return;
194
195 $w->{$arg->{name}} = $arg->{value};
196 });
197
198 $self->connect_ext (w_g => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 });
206
207 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
208 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy
210 for values %{delete $ws->{w} || {}};
211 }
212 });
213
40 $self->{map_widget}->add_command (@$_) 214 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 215 for @cmd_help;
42 216
217 {
218 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
219 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
220 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
221 }
222
223 {
43 $self->{noface} = new_from_file CFPlus::Texture 224 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 225 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
226 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
227 }
45 228
46 $self->{open_container} = 0; 229 $self->{open_container} = 0;
47 230
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 231 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 232 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 233
55 $self 234 $self
56} 235}
57 236
58sub logprint { 237sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 394 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 395 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 396 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 398 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 399 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 400 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 401 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 402 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 403
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 404 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
258 435
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 436 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 437
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 438 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); 439 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 440
265 my ($x, $y) = (0, 1); 441 my ($x, $y) = (0, 1);
266 for ( 442 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 443 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 444 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 453 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 454 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 455 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 456 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 457 } elsif ($ev->{button} == 3) {
458 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 459 (new CFPlus::UI::Menu
283 items => [ 460 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 461 ["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"]) }], 462 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 463 ],
287 )->popup ($ev); 464 )->popup ($ev);
288 } else { 465 } else {
289 return 0; 466 return 0;
290 } 467 }
… …
294 471
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 472 $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); 473 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 474 $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); 475 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); 476 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
477 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 478
301 $x++ and ($x, $y) = (0, $y + 1); 479 $x++ and ($x, $y) = (0, $y + 1);
302 } 480 }
303 } 481 }
304 482
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 486 }
309} 487}
310 488
489sub macro_send {
490 my ($self, $macro) = @_;
491
492 for my $cmd (@{ $macro->{action} }) {
493 $self->send_command ($cmd);
494 }
495}
496
311sub user_send { 497sub user_send {
312 my ($self, $command) = @_; 498 my ($self, $command) = @_;
313 499
500 $self->{record}->($command)
314 if ($self->{record}) { 501 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 502
318 $self->logprint ("send: ", $command); 503 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 504 $self->send_command ($command);
320 ::status ($command); 505 ::status ($command);
321} 506}
322 507
323sub start_record { 508sub record {
324 my ($self) = @_; 509 my ($self, $cb) = @_;
325 510
326 $self->{record} = []; 511 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 512}
333 513
334sub map_scroll { 514sub map_scroll {
335 my ($self, $dx, $dy) = @_; 515 my ($self, $dx, $dy) = @_;
336 516
… …
338} 518}
339 519
340sub feed_map1a { 520sub feed_map1a {
341 my ($self, $data) = @_; 521 my ($self, $data) = @_;
342 522
343 $self->{map}->map1a_update ($data); 523 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 524 $self->{map_widget}->update;
345} 525}
346 526
347sub magicmap { 527sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 528 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 537 or return;
358 538
359 my ($hash, $x, $y, $w, $h) = @$map_info; 539 my ($hash, $x, $y, $w, $h) = @$map_info;
360 540
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 541 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 544}
365 545
366sub map_clear { 546sub map_clear {
367 my ($self) = @_; 547 my ($self) = @_;
… …
371 551
372 $self->{map}->clear; 552 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 553 delete $self->{map_widget}{magicmap};
374} 554}
375 555
556sub bg_fetch {
557 my ($self) = @_;
558
559 my $id;
560
561 do {
562 $id = pop @{$self->{bg_fetch}}
563 or return;
564 } while $self->{texture}[$id];
565
566 CFPlus::DB::get tilecache => $id, sub {
567 my ($data) = @_;
568
569 return unless $self->{map}; # stop when destroyed
570
571 $self->set_texture ($id => $data)
572 if defined $data;
573
574 $self->bg_fetch;
575 };
576}
376 577
377sub load_map($$$) { 578sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 579 my ($self, $hash, $x, $y) = @_;
379 580
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 581 my $gen = $self->{map_change_gen};
582
583 CFPlus::DB::get $self->{mapcache} => $hash, sub {
584 return unless $gen == $self->{map_change_gen};
585
586 my ($data) = @_;
587
588 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 589 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 590 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 591
387 $self->set_texture ($id => $data); 592 my $inprogress = @{ $self->{bg_fetch} || [] };
593 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
594 $self->bg_fetch unless $inprogress;
388 } 595 }
389 } 596 };
390} 597}
391 598
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 599# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 600# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 601# the right fix is to make real tiled maps with an overview file
… …
458 665
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 666 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 667 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 668
462 } else { 669 } else {
670 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 671 $self->send_mapinfo ("spatial $path$tile", sub {
672 return unless $gen == $self->{map_change_gen};
673
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 674 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 675
466 return if $mode ne "spatial"; 676 return if $mode ne "spatial";
467 677
468 $x += $self->{map}->ox; 678 $x += $self->{map}->ox;
… …
482 692
483sub map_change { 693sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 695
486 $self->flush_map; 696 $self->flush_map;
697
698 ++$self->{map_change_gen};
487 699
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 701
490 my $mapmapw = $self->{mapmap}->{w}; 702 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 703 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 720 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 721 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 722}
511 723
512sub face_find { 724sub face_find {
513 my ($self, $facenum, $face) = @_; 725 my ($self, $facenum, $face, $cb) = @_;
514 726
515 my $hash = "$face->{chksum},$face->{name}"; 727 my $hash = "$face->{chksum},$face->{name}";
516 728
517 my $id = $self->{facemap}->get ($hash); 729 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 730
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 731 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 732 $self->{faceid}[$facenum] = $id;
544 733
545 my $face = $self->{tilecache}->get ($id); 734 $self->{map}->set_tileid ($facenum => $id);
546 735
547 if ($face) { 736 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 737}
556 738
557sub face_update { 739sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 740 my ($self, $facenum, $face, $changed) = @_;
559 741
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
743 if $changed;
561 744
562 $self->set_texture ($face->{id} => delete $face->{image}); 745 $self->set_texture ($face->{id} => delete $face->{image});
746}
747
748sub smooth_update {
749 my ($self, $facenum, $face) = @_;
750
751 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 752}
564 753
565sub set_texture { 754sub set_texture {
566 my ($self, $id, $data) = @_; 755 my ($self, $id, $data) = @_;
567 756
568 $self->{texture}[$id] ||= do { 757 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 758 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 759 $data, minify => 1, mipmap => 1;
572 760
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 762 $self->{map_widget}->update;
575
576 $tex
577 };
578} 763}
579 764
580sub sound_play { 765sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 766 my ($self, $x, $y, $soundnum, $type) = @_;
582 767
… …
592 $LAST_QUERY = $prompt; 777 $LAST_QUERY = $prompt;
593 778
594 $self->{query}-> ($self, $flags, $prompt); 779 $self->{query}-> ($self, $flags, $prompt);
595} 780}
596 781
597sub drawinfo { 782sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 783 local $_ = shift;
599 784
600 my @color = ( 785 # we now weed out all tags we do not support
786 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
787 # now all entities
788 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
789
790 # handle some elements
791 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
792 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
793
794 $_
795}
796
797our %NAME_TO_COLOR = (
798 black => 0,
799 white => 1,
800 darkblue => 2,
801 red => 3,
802 orange => 4,
803 lightblue => 5,
804 darkorange => 6,
805 green => 7,
806 darkgreen => 8,
807 grey => 9,
808 brown => 10,
809 yellow => 11,
810 tan => 12,
811);
812
813our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 814 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 815 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 816 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 817 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 818 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 819 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 820 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 821 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 822 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 823 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 824 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 825 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 826 [0.74, 0.65, 0.41],
614 ); 827);
615 828
829sub msg {
830 my ($self, $color, $type, $text, @extra) = @_;
831
832 $text = sanitise_xml $text;
833
834 if (my $cb = $self->{cb_msg}{$type}) {
835 $_->($self, $color, $type, $text, @extra) for values %$cb;
836 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
837 $type =~ s/-/_/g;
838 $self->{$type} = $text;
839 } else {
616 $self->logprint ("info: ", $text); 840 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood
617 842
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 843 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 844
620 # try to create single paragraphs of multiple lines sent by the server 845 ## try to create single paragraphs of multiple lines sent by the server
846 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 847 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 848
623 $text = CFPlus::asxml $text; 849 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 850 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 851
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 852 $self->{statusbox}->add ($text,
632 group => $text, 853 group => $text,
633 fg => $color[$color], 854 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 855 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 856 tooltip_font => $::FONT_FIXED,
636 ); 857 );
637} 858 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 859}
644 860
645sub spell_add { 861sub spell_add {
646 my ($self, $spell) = @_; 862 my ($self, $spell) = @_;
647 863
648 # try to create single paragraphs out of the multiple lines sent by the server 864 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 865 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 866 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 867 $spell->{message} ||= "Server did not provide a description for this spell.";
652 868
653 $::SPELL_PAGE->add_spell ($spell); 869 $::SPELL_LIST->add_spell ($spell);
654 870
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 871 $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}); 872 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 873}
658 874
659sub spell_delete { 875sub spell_delete {
660 my ($self, $spell) = @_; 876 my ($self, $spell) = @_;
661 877
662 $::SPELL_PAGE->remove_spell ($spell); 878 $::SPELL_LIST->remove_spell ($spell);
879}
880
881sub setup {
882 my ($self, $setup) = @_;
883
884 $self->{map_widget}->set_tilesize ($self->{tilesize});
885 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 886}
664 887
665sub addme_success { 888sub addme_success {
666 my ($self) = @_; 889 my ($self) = @_;
667 890
… …
873 $::SERVER_INFO->set_markup ( 1096 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1097 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1098 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1099 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1100 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1101 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1102 . "editing support $yesno[!!$self->{editor_support}]\n"
1103 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1104 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1107 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1108 );
1109
1110 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1111}
883 1112
884sub logged_in { 1113sub logged_in {
885 my ($self) = @_; 1114 my ($self) = @_;
886 1115
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1116 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 1117 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 1118 $self->update_server_info;
890 1119
1120 if ($self->{cfplus_ext} >= 2) {
1121 $self->send_ext_req ("editor_support", sub {
1122 $self->{editor_support} = $_[0];
1123 $self->update_server_info;
1124
1125 0
1126 });
1127 }
1128
891 0 1129 0
892 }); 1130 });
893 1131
894 $self->update_server_info; 1132 $self->update_server_info;
895 1133
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1134 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1135 $self->send_command ("output-count $::CFG->{output_count}");
1136 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1137 $self->send_command ("pickup $::CFG->{pickup}");
1138}
1139
1140sub buildat {
1141 my ($self, $builditem, $x, $y) = @_;
1142
1143 if ($self->{cfplus_ext}) {
1144 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1145 }
899} 1146}
900 1147
901sub lookat { 1148sub lookat {
902 my ($self, $x, $y) = @_; 1149 my ($self, $x, $y) = @_;
903 1150
… …
921} 1168}
922 1169
923sub destroy { 1170sub destroy {
924 my ($self) = @_; 1171 my ($self) = @_;
925 1172
926 $self->{npc_dialog}->destroy 1173 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1174 if $self->{npc_dialog};
928 1175
929 $self->SUPER::destroy; 1176 $self->SUPER::destroy;
1177
1178 %$self = ();
930} 1179}
931 1180
932package CFPlus::NPCDialog; 1181package CFPlus::NPCDialog;
933 1182
934our @ISA = 'CFPlus::UI::FancyFrame'; 1183our @ISA = 'CFPlus::UI::Toplevel';
935 1184
936sub new { 1185sub new {
937 my $class = shift; 1186 my $class = shift;
938 1187
939 my $self = $class->SUPER::new ( 1188 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1195 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1196 has_close_button => 1,
948 @_, 1197 @_,
949 ); 1198 );
950 1199
951 Scalar::Util::weaken (my $this = $self); 1200 CFPlus::weaken (my $this = $self);
952 1201
953 $self->connect (delete => sub { $this->destroy; 1 }); 1202 $self->connect (delete => sub { $this->destroy; 1 });
954 1203
955 # better use a pane... 1204 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1205 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1207
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1208 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1209
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1210 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1211 $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" 1212 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 { 1213 on_activate => sub {
969 my ($entry, $text) = @_; 1214 my ($entry, $text) = @_;
970 1215
971 return unless $text =~ /\S/; 1216 return unless $text =~ /\S/;
972 1217
… …
1004}; 1249};
1005 1250
1006sub update_options { 1251sub update_options {
1007 my ($self) = @_; 1252 my ($self) = @_;
1008 1253
1009 Scalar::Util::weaken $self; 1254 CFPlus::weaken $self;
1010 1255
1011 $self->{options}->clear; 1256 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1257 $self->{options}->add ($self->{bye_button});
1013 1258
1014 for my $kw (sort keys %{ $self->{kw} }) { 1259 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1268}
1024 1269
1025sub feed { 1270sub feed {
1026 my ($self, $msg) = @_; 1271 my ($self, $msg) = @_;
1027 1272
1028 Scalar::Util::weaken $self; 1273 CFPlus::weaken $self;
1029 1274
1030 if ($msg->{msgtype} eq "reply") { 1275 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1278
1034 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1035 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1280 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1036 my @link; 1281 my @link;
1037 $text =~ s{ 1282 $text =~ s{
1038 ($match) 1283 ($match)
1039 }{ 1284 }{
… …
1047 padding_y => 0, 1292 padding_y => 0,
1048 on_button_up => sub { 1293 on_button_up => sub {
1049 $self->send ($kw); 1294 $self->send ($kw);
1050 }; 1295 };
1051 1296
1052 chr 0xfffc 1297 "\x{fffc}"
1053 }giex; 1298 }giex;
1054 1299
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1300 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1301 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1302 $self->update_options;
… …
1084 1329
1085 $self->SUPER::destroy; 1330 $self->SUPER::destroy;
1086} 1331}
1087 1332
10881 13331
1334

Diff Legend

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