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

Diff Legend

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