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.112 by root, Tue Jul 10 16:25:16 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_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
67 }
68 });
69
70 $self->{json_coder}
71 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub {
73 $self->{widget}{$_[0]}
74 });
75
76 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_;
78
79 $self->{widgetset}{$arg{id}} = {
80 w => {},
81 };
82 });
83
84 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_;
86
87 my $ws = delete $self->{widgetset}{$arg{id}}
88 or return;
89
90 $_->destroy
91 for values %{$ws->{w}};
92 });
93
94 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_;
96
97 my $args = $arg->{args} || {};
98
99 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub {
101 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
103
104 1
105 };
106 }
107
108 if (my $widget = eval {
109 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new (
111 %$args,
112 s_ws => $arg->{ws},
113 s_id => $arg->{id},
114 )
115 }
116 ) {
117 $self->{widget}{$arg->{id}}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
119 = $widget;
120
121 $widget->connect (on_destroy => sub {
122 my ($widget) = @_;
123
124 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 });
127 } else {
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
130 }
131 });
132
133 $self->connect_ext (w_c => sub {
134 my ($arg) = @_;
135
136 my $w = $self->{widget}{$arg->{id}}
137 or return;
138 my $m = $arg->{name};
139
140 my $a = $arg->{args} || [];
141
142 if (exists $arg->{rid}) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
144 } else {
145 $w->$m (@$a);
146 }
147 });
148
149 $self->connect_ext (w_s => sub {
150 my ($arg) = @_;
151
152 my $w = $self->{widget}{$arg->{id}}
153 or return;
154
155 $w->{$arg->{name}} = $arg->{value};
156 });
157
158 $self->connect_ext (w_g => sub {
159 my ($arg) = @_;
160
161 my $w = $self->{widget}{$arg->{id}}
162 or return;
163
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
165 });
166
167 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
168 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy
170 for values %{delete $ws->{w} || {}};
171 }
172 });
173
40 $self->{map_widget}->add_command (@$_) 174 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 175 for @cmd_help;
42 176
177 {
178 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
179 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
180 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
181 }
182
183 {
43 $self->{noface} = new_from_file CFPlus::Texture 184 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 185 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
186 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
187 }
45 188
46 $self->{open_container} = 0; 189 $self->{open_container} = 0;
47 190
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 191 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 192 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 193
55 $self 194 $self
56} 195}
57 196
58sub logprint { 197sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 354 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 355 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 356 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 357 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 358 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 359 $::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}; 360 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 361 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 362 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 363
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 364 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
258 395
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 396 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 397
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 398 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); 399 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 400
265 my ($x, $y) = (0, 1); 401 my ($x, $y) = (0, 1);
266 for ( 402 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 403 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 404 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 413 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 414 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 415 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 416 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 417 } elsif ($ev->{button} == 3) {
418 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 419 (new CFPlus::UI::Menu
283 items => [ 420 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 421 ["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"]) }], 422 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 423 ],
287 )->popup ($ev); 424 )->popup ($ev);
288 } else { 425 } else {
289 return 0; 426 return 0;
290 } 427 }
… …
294 431
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 432 $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); 433 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 434 $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); 435 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); 436 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
437 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 438
301 $x++ and ($x, $y) = (0, $y + 1); 439 $x++ and ($x, $y) = (0, $y + 1);
302 } 440 }
303 } 441 }
304 442
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 446 }
309} 447}
310 448
449sub macro_send {
450 my ($self, $macro) = @_;
451
452 for my $cmd (@{ $macro->{action} }) {
453 $self->send_command ($cmd);
454 }
455}
456
311sub user_send { 457sub user_send {
312 my ($self, $command) = @_; 458 my ($self, $command) = @_;
313 459
460 $self->{record}->($command)
314 if ($self->{record}) { 461 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 462
318 $self->logprint ("send: ", $command); 463 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 464 $self->send_command ($command);
320 ::status ($command); 465 ::status ($command);
321} 466}
322 467
323sub start_record { 468sub record {
324 my ($self) = @_; 469 my ($self, $cb) = @_;
325 470
326 $self->{record} = []; 471 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 472}
333 473
334sub map_scroll { 474sub map_scroll {
335 my ($self, $dx, $dy) = @_; 475 my ($self, $dx, $dy) = @_;
336 476
… …
338} 478}
339 479
340sub feed_map1a { 480sub feed_map1a {
341 my ($self, $data) = @_; 481 my ($self, $data) = @_;
342 482
343 $self->{map}->map1a_update ($data); 483 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 484 $self->{map_widget}->update;
345} 485}
346 486
347sub magicmap { 487sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 488 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 497 or return;
358 498
359 my ($hash, $x, $y, $w, $h) = @$map_info; 499 my ($hash, $x, $y, $w, $h) = @$map_info;
360 500
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 501 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 502 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 503 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 504}
365 505
366sub map_clear { 506sub map_clear {
367 my ($self) = @_; 507 my ($self) = @_;
… …
371 511
372 $self->{map}->clear; 512 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 513 delete $self->{map_widget}{magicmap};
374} 514}
375 515
516sub bg_fetch {
517 my ($self) = @_;
518
519 my $id;
520
521 do {
522 $id = pop @{$self->{bg_fetch}}
523 or return;
524 } while $self->{texture}[$id];
525
526 CFPlus::DB::get tilecache => $id, sub {
527 my ($data) = @_;
528
529 return unless $self->{map}; # stop when destroyed
530
531 $self->set_texture ($id => $data)
532 if defined $data;
533
534 $self->bg_fetch;
535 };
536}
376 537
377sub load_map($$$) { 538sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 539 my ($self, $hash, $x, $y) = @_;
379 540
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 541 my $gen = $self->{map_change_gen};
542
543 CFPlus::DB::get $self->{mapcache} => $hash, sub {
544 return unless $gen == $self->{map_change_gen};
545
546 my ($data) = @_;
547
548 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 549 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 550 #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 551
387 $self->set_texture ($id => $data); 552 my $inprogress = @{ $self->{bg_fetch} || [] };
553 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
554 $self->bg_fetch unless $inprogress;
388 } 555 }
389 } 556 };
390} 557}
391 558
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 559# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 560# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 561# the right fix is to make real tiled maps with an overview file
… …
458 625
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 626 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 627 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 628
462 } else { 629 } else {
630 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 631 $self->send_mapinfo ("spatial $path$tile", sub {
632 return unless $gen == $self->{map_change_gen};
633
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 634 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 635
466 return if $mode ne "spatial"; 636 return if $mode ne "spatial";
467 637
468 $x += $self->{map}->ox; 638 $x += $self->{map}->ox;
… …
482 652
483sub map_change { 653sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 654 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 655
486 $self->flush_map; 656 $self->flush_map;
657
658 ++$self->{map_change_gen};
487 659
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 660 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 661
490 my $mapmapw = $self->{mapmap}->{w}; 662 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 663 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 680 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 681 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 682}
511 683
512sub face_find { 684sub face_find {
513 my ($self, $facenum, $face) = @_; 685 my ($self, $facenum, $face, $cb) = @_;
514 686
515 my $hash = "$face->{chksum},$face->{name}"; 687 my $hash = "$face->{chksum},$face->{name}";
516 688
517 my $id = $self->{facemap}->get ($hash); 689 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 690
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; 691 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 692 $self->{faceid}[$facenum] = $id;
544 693
545 my $face = $self->{tilecache}->get ($id); 694 $self->{map}->set_tileid ($facenum => $id);
546 695
547 if ($face) { 696 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} 697}
556 698
557sub face_update { 699sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 700 my ($self, $facenum, $face, $changed) = @_;
559 701
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
703 if $changed;
561 704
562 $self->set_texture ($face->{id} => delete $face->{image}); 705 $self->set_texture ($face->{id} => delete $face->{image});
706}
707
708sub smooth_update {
709 my ($self, $facenum, $face) = @_;
710
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 712}
564 713
565sub set_texture { 714sub set_texture {
566 my ($self, $id, $data) = @_; 715 my ($self, $id, $data) = @_;
567 716
568 $self->{texture}[$id] ||= do { 717 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 718 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 719 $data, minify => 1, mipmap => 1;
572 720
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 722 $self->{map_widget}->update;
575
576 $tex
577 };
578} 723}
579 724
580sub sound_play { 725sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 726 my ($self, $x, $y, $soundnum, $type) = @_;
582 727
… …
592 $LAST_QUERY = $prompt; 737 $LAST_QUERY = $prompt;
593 738
594 $self->{query}-> ($self, $flags, $prompt); 739 $self->{query}-> ($self, $flags, $prompt);
595} 740}
596 741
597sub drawinfo { 742sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 743 local $_ = shift;
599 744
600 my @color = ( 745 # we now weed out all tags we do not support
746 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
747 # now all entities
748 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
749
750 # handle some elements
751 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
752 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
753
754 $_
755}
756
757our %NAME_TO_COLOR = (
758 black => 0,
759 white => 1,
760 darkblue => 2,
761 red => 3,
762 orange => 4,
763 lightblue => 5,
764 darkorange => 6,
765 green => 7,
766 darkgreen => 8,
767 grey => 9,
768 brown => 10,
769 yellow => 11,
770 tan => 12,
771);
772
773our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 774 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 775 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 776 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 777 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 778 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 779 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 780 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 781 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 782 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 783 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 784 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 785 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 786 [0.74, 0.65, 0.41],
614 ); 787);
615 788
789sub msg {
790 my ($self, $color, $type, $text, @extra) = @_;
791
792 $text = sanitise_xml $text;
793
794 if (my $cb = $self->{cb_msg}{$type}) {
795 $_->($self, $color, $type, $text, @extra) for values %$cb;
796 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
797 $type =~ s/-/_/g;
798 $self->{$type} = $text;
799 } else {
616 $self->logprint ("info: ", $text); 800 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood
617 802
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 803 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 804
620 # try to create single paragraphs of multiple lines sent by the server 805 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 807 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 808
623 $text = CFPlus::asxml $text; 809 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 810 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 811
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, 812 $self->{statusbox}->add ($text,
632 group => $text, 813 group => $text,
633 fg => $color[$color], 814 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 815 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 816 tooltip_font => $::FONT_FIXED,
636 ); 817 );
637} 818 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 819}
644 820
645sub spell_add { 821sub spell_add {
646 my ($self, $spell) = @_; 822 my ($self, $spell) = @_;
647 823
648 # try to create single paragraphs out of the multiple lines sent by the server 824 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 825 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 826 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 827 $spell->{message} ||= "Server did not provide a description for this spell.";
652 828
653 $::SPELL_PAGE->add_spell ($spell); 829 $::SPELL_LIST->add_spell ($spell);
654 830
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 831 $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}); 832 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 833}
658 834
659sub spell_delete { 835sub spell_delete {
660 my ($self, $spell) = @_; 836 my ($self, $spell) = @_;
661 837
662 $::SPELL_PAGE->remove_spell ($spell); 838 $::SPELL_LIST->remove_spell ($spell);
839}
840
841sub setup {
842 my ($self, $setup) = @_;
843
844 $self->{map_widget}->set_tilesize ($self->{tilesize});
845 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 846}
664 847
665sub addme_success { 848sub addme_success {
666 my ($self) = @_; 849 my ($self) = @_;
667 850
… …
873 $::SERVER_INFO->set_markup ( 1056 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1057 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1058 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1059 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1060 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1061 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1062 . "editing support $yesno[!!$self->{editor_support}]\n"
1063 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1064 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1067 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1068 );
1069
1070 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1071}
883 1072
884sub logged_in { 1073sub logged_in {
885 my ($self) = @_; 1074 my ($self) = @_;
886 1075
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1076 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 1077 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 1078 $self->update_server_info;
890 1079
1080 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0];
1083 $self->update_server_info;
1084
1085 0
1086 });
1087 }
1088
891 0 1089 0
892 }); 1090 });
893 1091
894 $self->update_server_info; 1092 $self->update_server_info;
895 1093
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1094 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1095 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1097 $self->send_command ("pickup $::CFG->{pickup}");
1098}
1099
1100sub buildat {
1101 my ($self, $builditem, $x, $y) = @_;
1102
1103 if ($self->{cfplus_ext}) {
1104 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1105 }
899} 1106}
900 1107
901sub lookat { 1108sub lookat {
902 my ($self, $x, $y) = @_; 1109 my ($self, $x, $y) = @_;
903 1110
… …
921} 1128}
922 1129
923sub destroy { 1130sub destroy {
924 my ($self) = @_; 1131 my ($self) = @_;
925 1132
926 $self->{npc_dialog}->destroy 1133 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1134 if $self->{npc_dialog};
928 1135
929 $self->SUPER::destroy; 1136 $self->SUPER::destroy;
1137
1138 %$self = ();
930} 1139}
931 1140
932package CFPlus::NPCDialog; 1141package CFPlus::NPCDialog;
933 1142
934our @ISA = 'CFPlus::UI::FancyFrame'; 1143our @ISA = 'CFPlus::UI::Toplevel';
935 1144
936sub new { 1145sub new {
937 my $class = shift; 1146 my $class = shift;
938 1147
939 my $self = $class->SUPER::new ( 1148 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1155 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1156 has_close_button => 1,
948 @_, 1157 @_,
949 ); 1158 );
950 1159
951 Scalar::Util::weaken (my $this = $self); 1160 CFPlus::weaken (my $this = $self);
952 1161
953 $self->connect (delete => sub { $this->destroy; 1 }); 1162 $self->connect (delete => sub { $this->destroy; 1 });
954 1163
955 # better use a pane... 1164 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1165 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1167
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1168 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1169
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1170 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1171 $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" 1172 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 { 1173 on_activate => sub {
969 my ($entry, $text) = @_; 1174 my ($entry, $text) = @_;
970 1175
971 return unless $text =~ /\S/; 1176 return unless $text =~ /\S/;
972 1177
… …
1004}; 1209};
1005 1210
1006sub update_options { 1211sub update_options {
1007 my ($self) = @_; 1212 my ($self) = @_;
1008 1213
1009 Scalar::Util::weaken $self; 1214 CFPlus::weaken $self;
1010 1215
1011 $self->{options}->clear; 1216 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1217 $self->{options}->add ($self->{bye_button});
1013 1218
1014 for my $kw (sort keys %{ $self->{kw} }) { 1219 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1228}
1024 1229
1025sub feed { 1230sub feed {
1026 my ($self, $msg) = @_; 1231 my ($self, $msg) = @_;
1027 1232
1028 Scalar::Util::weaken $self; 1233 CFPlus::weaken $self;
1029 1234
1030 if ($msg->{msgtype} eq "reply") { 1235 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1238
1034 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1239 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} }; 1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1036 my @link; 1241 my @link;
1037 $text =~ s{ 1242 $text =~ s{
1038 ($match) 1243 ($match)
1039 }{ 1244 }{
… …
1047 padding_y => 0, 1252 padding_y => 0,
1048 on_button_up => sub { 1253 on_button_up => sub {
1049 $self->send ($kw); 1254 $self->send ($kw);
1050 }; 1255 };
1051 1256
1052 chr 0xfffc 1257 "\x{fffc}"
1053 }giex; 1258 }giex;
1054 1259
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1261 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1262 $self->update_options;
… …
1084 1289
1085 $self->SUPER::destroy; 1290 $self->SUPER::destroy;
1086} 1291}
1087 1292
10881 12931
1294

Diff Legend

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