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.95 by root, Wed Apr 4 02:43:30 2007 UTC vs.
Revision 1.135 by elmex, Fri Jul 27 17:24:29 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;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
22 30
23 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
24 32
25 my @cmd_help = map { 33 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 45 for @args;
38 46
39 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args 49 @args
42 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
44 52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
45 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
46 my ($cap) = @_; 61 my (%cap) = @_;
47 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
48 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
49 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
50 $self->{tileset} = $default; 70 $self->{tileset} = $default;
51 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
52 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
53 73
54 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
55 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
56 76
57 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
58 } 78 }
59 } 79 }
60 }); 80 });
61 81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
202 }
203 });
204
62 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
63 for @cmd_help; 206 for @cmd_help;
64
65 $self->{noface} = new_from_file CFPlus::Texture
66 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
67 207
68 { 208 {
69 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
72 } 212 }
73 213
214 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 }
219
74 $self->{open_container} = 0; 220 $self->{open_container} = 0;
75 221
76 # "global"
77 $self->{tilecache} = CFPlus::db_table "tilecache"
78 or die "tilecache: unable to open database table";
79 $self->{facemap} = CFPlus::db_table "facemap"
80 or die "facemap: unable to open database table";
81
82 # per server 222 # per server
83 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
84 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
85 224
86 $self 225 $self
87} 226}
88 227
89sub logprint { 228sub logprint {
… …
246 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 385 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
247 $::GAUGES->{food} ->set_value ($fo, $fo_m); 386 $::GAUGES->{food} ->set_value ($fo, $fo_m);
248 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 387 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
249 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
250 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
251 my $rng = $stats->{+CS_STAT_RANGE}; 390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
252 $rng =~ s/^Range: //; # thank you so much dear server
253 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
254 my $title = $stats->{+CS_STAT_TITLE}; 391 my $title = $stats->{+CS_STAT_TITLE};
255 $title =~ s/^Player: //; 392 $title =~ s/^Player: //;
256 $::STATWIDS->{title} ->set_text ("Title: " . $title); 393 $::STATWIDS->{title} ->set_text ("Title: " . $title);
257 394
258 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 395 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
278 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
279 416
280 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
281 $sktbl->clear; 418 $sktbl->clear;
282 419
420 my @add;
421
422 push @add,
283 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
286 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
289 430
290 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
291 432
292 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
293 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
321 } 462 }
322 463
323 1 464 1
324 }; 465 };
325 466
467 push @add,
326 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
327 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
328 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
330 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
331 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
332 475
333 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
334 } 477 }
478
479 $sktbl->add_at (@add);
335 } 480 }
336 481
337 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
338 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
339 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
391 or return; 536 or return;
392 537
393 my ($hash, $x, $y, $w, $h) = @$map_info; 538 my ($hash, $x, $y, $w, $h) = @$map_info;
394 539
395 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 540 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
396 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
397 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
398} 543}
399 544
400sub map_clear { 545sub map_clear {
401 my ($self) = @_; 546 my ($self) = @_;
… …
405 550
406 $self->{map}->clear; 551 $self->{map}->clear;
407 delete $self->{map_widget}{magicmap}; 552 delete $self->{map_widget}{magicmap};
408} 553}
409 554
555sub bg_fetch {
556 my ($self) = @_;
557
558 my $id;
559
560 do {
561 $id = pop @{$self->{bg_fetch}}
562 or return;
563 } while $self->{texture}[$id];
564
565 CFPlus::DB::get tilecache => $id, sub {
566 my ($data) = @_;
567
568 return unless $self->{map}; # stop when destroyed
569
570 $self->set_texture ($id => $data)
571 if defined $data;
572
573 $self->bg_fetch;
574 };
575}
410 576
411sub load_map($$$) { 577sub load_map($$$) {
412 my ($self, $hash, $x, $y) = @_; 578 my ($self, $hash, $x, $y) = @_;
413 579
414 if (defined (my $data = $self->{mapcache}->get ($hash))) { 580 my $gen = $self->{map_change_gen};
581
582 CFPlus::DB::get $self->{mapcache} => $hash, sub {
583 return unless $gen == $self->{map_change_gen};
584
585 my ($data) = @_;
586
587 if (defined $data) {
415 $data = Compress::LZF::decompress $data; 588 $data = Compress::LZF::decompress $data;
416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
418 my $data = $self->{tilecache}->get ($id)
419 or next;
420 590
421 $self->set_texture ($id => $data); 591 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593 $self->bg_fetch unless $inprogress;
422 } 594 }
423 } 595 };
424} 596}
425 597
426# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 598# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
427# (server resource,s latency, bandwidth), so this hack is warranted. 599# (server resource,s latency, bandwidth), so this hack is warranted.
428# the right fix is to make real tiled maps with an overview file 600# the right fix is to make real tiled maps with an overview file
… …
492 664
493 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 665 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
494 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 666 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
495 667
496 } else { 668 } else {
669 my $gen = $self->{map_change_gen};
497 $self->send_mapinfo ("spatial $path$tile", sub { 670 $self->send_mapinfo ("spatial $path$tile", sub {
671 return unless $gen == $self->{map_change_gen};
672
498 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 673 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
499 674
500 return if $mode ne "spatial"; 675 return if $mode ne "spatial";
501 676
502 $x += $self->{map}->ox; 677 $x += $self->{map}->ox;
… …
516 691
517sub map_change { 692sub map_change {
518 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 694
520 $self->flush_map; 695 $self->flush_map;
696
697 ++$self->{map_change_gen};
521 698
522 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
523 700
524 my $mapmapw = $self->{mapmap}->{w}; 701 my $mapmapw = $self->{mapmap}->{w};
525 my $mapmaph = $self->{mapmap}->{h}; 702 my $mapmaph = $self->{mapmap}->{h};
… …
542 $self->load_map ($hash, $x, $y); 719 $self->load_map ($hash, $x, $y);
543 $self->flood_fill (0, 0, 0, "", $hash, $flags); 720 $self->flood_fill (0, 0, 0, "", $hash, $flags);
544} 721}
545 722
546sub face_find { 723sub face_find {
547 my ($self, $facenum, $face) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
548 725
549 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
550 728
551 my $id = $self->{facemap}->get ($hash); 729 $face->{id} = $id;
552
553 unless ($id) {
554 # create new id for face
555 # I love transactions
556 for (1..100) {
557 my $txn = $CFPlus::DB_ENV->txn_begin;
558 my $status = $self->{facemap}->db_get (id => $id);
559 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
560 $id = ($id || 64) + 1;
561 if ($self->{facemap}->put (id => $id) == 0
562 && $self->{facemap}->put ($hash => $id) == 0) {
563 $txn->txn_commit;
564
565 goto gotid;
566 }
567 }
568 $txn->txn_abort;
569 }
570
571 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
572 }
573
574gotid:
575 $face->{id} = $id;
576 $self->{map}->set_face ($facenum => $id);
577 $self->{faceid}[$facenum] = $id;#d# 730 $self->{faceid}[$facenum] = $id;
578 731
579 my $face = $self->{tilecache}->get ($id); 732 $self->{map}->set_tileid ($facenum => $id);
580 733
581 if ($face) { 734 CFPlus::DB::get tilecache => $id, $cb;
582 #$self->face_prefetch; 735
583 $face 736 } elsif ($face->{type} & 1) { # with metadata
584 } else { 737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
585 my $tex = $self->{noface}; 738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
586 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
587 undef
588 }; 739 }
589} 740}
590 741
591sub face_update { 742sub face_update {
592 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
593 744
594 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 745 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed;
595 748
596 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 };
763 }
764
765 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 }
781 }
782}
783
784sub smooth_update {
785 my ($self, $facenum, $face) = @_;
786
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
597} 788}
598 789
599sub set_texture { 790sub set_texture {
600 my ($self, $id, $data) = @_; 791 my ($self, $id, $data) = @_;
601 792
793 return unless $self->{map};
794
602 $self->{texture}[$id] ||= do { 795 $self->{texture}[$id] = my $tex =
603 my $tex =
604 new_from_image CFPlus::Texture 796 new_from_image CFPlus::Texture
605 $data, minify => 1, mipmap => 1; 797 $data, minify => 1, mipmap => 1;
606 798
607 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
608 $self->{map_widget}->update; 800 $self->{map_widget}->update;
609 801
610 $tex 802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803}
804
805sub connect_face_update {
806 my ($self, $id, $cb) = @_;
807
808 push @{$self->{face_cb}{$id}}, $cb;
809
810 CFPlus::guard {
811 @{$self->{face_cb}{$id}}
812 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}};
611 }; 814 }
612} 815}
613 816
614sub sound_play { 817sub sound_play {
615 my ($self, $x, $y, $soundnum, $type) = @_; 818 my ($self, $x, $y, $soundnum, $type) = @_;
616 819
… …
626 $LAST_QUERY = $prompt; 829 $LAST_QUERY = $prompt;
627 830
628 $self->{query}-> ($self, $flags, $prompt); 831 $self->{query}-> ($self, $flags, $prompt);
629} 832}
630 833
631sub drawinfo { 834sub sanitise_xml($) {
632 my ($self, $color, $text) = @_; 835 local $_ = shift;
633 836
634 my @color = ( 837 # we now weed out all tags we do not support
838 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
839 # now all entities
840 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
841
842 # handle some elements
843 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
844 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
845
846 $_
847}
848
849our %NAME_TO_COLOR = (
850 black => 0,
851 white => 1,
852 darkblue => 2,
853 red => 3,
854 orange => 4,
855 lightblue => 5,
856 darkorange => 6,
857 green => 7,
858 darkgreen => 8,
859 grey => 9,
860 brown => 10,
861 yellow => 11,
862 tan => 12,
863);
864
865our @CF_COLOR = (
635 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 866 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
636 [1.00, 1.00, 1.00], 867 [1.00, 1.00, 1.00],
637 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 868 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
638 [1.00, 0.00, 0.00], 869 [1.00, 0.00, 0.00],
639 [1.00, 0.54, 0.00], 870 [1.00, 0.54, 0.00],
640 [0.11, 0.56, 1.00], 871 [0.11, 0.56, 1.00],
641 [0.93, 0.46, 0.00], 872 [0.93, 0.46, 0.00],
642 [0.18, 0.54, 0.34], 873 [0.18, 0.54, 0.34],
643 [0.56, 0.73, 0.56], 874 [0.56, 0.73, 0.56],
644 [0.80, 0.80, 0.80], 875 [0.80, 0.80, 0.80],
645 [0.75, 0.61, 0.20], 876 [0.75, 0.61, 0.20],
646 [0.99, 0.77, 0.26], 877 [0.99, 0.77, 0.26],
647 [0.74, 0.65, 0.41], 878 [0.74, 0.65, 0.41],
648 ); 879);
649 880
650 my $fg = $color[$color % @color]; 881sub msg {
882 my ($self, $color, $type, $text, @extra) = @_;
651 883
884 $text = sanitise_xml $text;
885
886 if (my $cb = $self->{cb_msg}{$type}) {
887 $_->($self, $color, $type, $text, @extra) for values %$cb;
888 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
889 $type =~ s/-/_/g;
890 $self->{$type} = $text;
891 } else {
652 $self->logprint ("info: ", $text); 892 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood
653 894
895 my $fg = $CF_COLOR[$color % @CF_COLOR];
896
654 # try to create single paragraphs of multiple lines sent by the server 897 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers
655 $text =~ s/(?<=\S)\n(?=\w)/ /g; 899 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
656 900
657 $text = CFPlus::asxml $text; 901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
658 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
659 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
660
661 ::message ({ fg => $fg, markup => $_ })
662 for split /\n/, $text; 902 for split /\n/, $text;
663 903
664 $self->{statusbox}->add ($text, 904 $self->{statusbox}->add ($text,
665 group => $text, 905 group => $text,
666 fg => $fg, 906 fg => $fg,
667 timeout => $color >= 2 ? 180 : 10, 907 timeout => $color >= 2 ? 180 : 10,
668 tooltip_font => $::FONT_FIXED, 908 tooltip_font => $::FONT_FIXED,
669 ); 909 );
670} 910 }
671
672sub drawextinfo {
673 my ($self, $color, $type, $subtype, $message) = @_;
674
675 $self->drawinfo ($color, $message);
676} 911}
677 912
678sub spell_add { 913sub spell_add {
679 my ($self, $spell) = @_; 914 my ($self, $spell) = @_;
680 915
… …
768 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
769 return unless $::CONN; 1004 return unless $::CONN;
770 1005
771 $::FLOORBOX->clear; 1006 $::FLOORBOX->clear;
772 1007
1008 my @add;
1009
773 my $row; 1010 my $row;
774 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1011 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
775 if ($row < 6) { 1012 if ($row < 6) {
776 local $_->{face_widget}; # hack to force recreation of widget 1013 local $_->{face_widget}; # hack to force recreation of widget
777 local $_->{desc_widget}; # hack to force recreation of widget 1014 local $_->{desc_widget}; # hack to force recreation of widget
778 CFPlus::Item::update_widgets $_; 1015 CFPlus::Item::update_widgets $_;
779 1016
1017 push @add,
780 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1018 0, $row, $_->{face_widget},
781 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1019 1, $row, $_->{desc_widget};
782 1020
783 $row++; 1021 $row++;
784 } else { 1022 } else {
785 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1023 push @add, 1, $row, new CFPlus::UI::Button
786 text => "More...", 1024 text => "More...",
787 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1025 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
788 ); 1026 ;
789 last; 1027 last;
790 } 1028 }
791 } 1029 }
792 if ($::CONN->{open_container}) { 1030 if ($::CONN->{open_container}) {
793 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1031 push @add, 1, $row++, new CFPlus::UI::Button
794 text => "Close container", 1032 text => "Close container",
795 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1033 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
796 ); 1034 ;
797 } 1035 }
1036
1037 $::FLOORBOX->add_at (@add);
798 }); 1038 });
799 1039
800 $::WANT_REFRESH++; 1040 $::WANT_REFRESH++;
801} 1041}
802 1042
… …
913 $::SERVER_INFO->set_markup ( 1153 $::SERVER_INFO->set_markup (
914 "server <tt>$self->{host}:$self->{port}</tt>\n" 1154 "server <tt>$self->{host}:$self->{port}</tt>\n"
915 . "protocol version <tt>$self->{version}</tt>\n" 1155 . "protocol version <tt>$self->{version}</tt>\n"
916 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1156 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
917 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1157 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1158 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
918 . "editing support $yesno[!!$self->{editor_support}]\n" 1159 . "editing support $yesno[!!$self->{editor_support}]\n"
919 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1160 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1161 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
920 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
921 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
922 . "map size $self->{mapw}×$self->{maph}\n" 1164 . "map size $self->{mapw}×$self->{maph}\n"
923 ); 1165 );
924 1166
… …
926} 1168}
927 1169
928sub logged_in { 1170sub logged_in {
929 my ($self) = @_; 1171 my ($self) = @_;
930 1172
931 $self->send_ext_req (cfplus_support => version => 1, sub { 1173 $self->send_ext_req (cfplus_support => version => 2, sub {
1174 my (%msg) = @_;
1175
932 $self->{cfplus_ext} = $_[0]{version}; 1176 $self->{cfplus_ext} = $msg{version};
933 $self->update_server_info; 1177 $self->update_server_info;
934 1178
935 if ($self->{cfplus_ext} >= 2) { 1179 if ($self->{cfplus_ext} >= 2) {
936 $self->send_ext_req ("editor_support", sub { 1180 $self->send_ext_req ("editor_support", sub {
937 $self->{editor_support} = $_[0]; 1181 $self->{editor_support} = { @_ };
938 $self->update_server_info; 1182 $self->update_server_info;
939 1183
940 0 1184 0
941 }); 1185 });
942 } 1186 }
… …
962 1206
963sub lookat { 1207sub lookat {
964 my ($self, $x, $y) = @_; 1208 my ($self, $x, $y) = @_;
965 1209
966 if ($self->{cfplus_ext}) { 1210 if ($self->{cfplus_ext}) {
967 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1211 $self->send_ext_req (lookat => $x, $y, sub {
968 my ($msg) = @_; 1212 my (%msg) = @_;
969 1213
970 if (exists $msg->{npc_dialog}) { 1214 if (exists $msg{npc_dialog}) {
971 # start npc chat dialog 1215 # start npc chat dialog
972 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1216 $self->{npc_dialog} = new CFPlus::NPCDialog::
973 dx => $x, 1217 token => $msg{npc_dialog},
974 dy => $y,
975 title => "$msg->{npc_dialog} (NPC)", 1218 title => "$msg{npc_dialog}[0] (NPC)",
976 conn => $self, 1219 conn => $self,
977 ; 1220 ;
978 } 1221 }
979 }); 1222 });
980 } 1223 }
… …
987 1230
988 (delete $self->{npc_dialog})->destroy 1231 (delete $self->{npc_dialog})->destroy
989 if $self->{npc_dialog}; 1232 if $self->{npc_dialog};
990 1233
991 $self->SUPER::destroy; 1234 $self->SUPER::destroy;
1235
1236 %$self = ();
992} 1237}
993 1238
994package CFPlus::NPCDialog; 1239package CFPlus::NPCDialog;
995 1240
996our @ISA = 'CFPlus::UI::Toplevel'; 1241our @ISA = 'CFPlus::UI::Toplevel';
… …
1043 on_activate => sub { $this->destroy; 1 }, 1288 on_activate => sub { $this->destroy; 1 },
1044 ; 1289 ;
1045 1290
1046 $self->update_options; 1291 $self->update_options;
1047 1292
1048 $self->{id} = $self->{conn}->send_ext_req ( 1293 $self->{id} = "npc-channel-" . $self->{conn}->token;
1049 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1294 $self->{conn}->connect_ext ($self->{id} => sub {
1050 sub { $this && $this->feed (@_) } 1295 $this->feed (@_) if $this;
1051 ); 1296 });
1297
1298 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1052 1299
1053 $self->{entry}->grab_focus; 1300 $self->{entry}->grab_focus;
1054 1301
1055 $self->{textview}->add_paragraph ({ 1302 $self->{textview}->add_paragraph ({
1056 fg => [1, 1, 0, 1], 1303 fg => [1, 1, 0, 1],
… …
1079 ); 1326 );
1080 } 1327 }
1081} 1328}
1082 1329
1083sub feed { 1330sub feed {
1084 my ($self, $msg) = @_; 1331 my ($self, $type, @arg) = @_;
1085 1332
1086 CFPlus::weaken $self; 1333 CFPlus::weaken $self;
1087 1334
1088 if ($msg->{msgtype} eq "reply") { 1335 if ($type eq "update") {
1336 my (%info) = @arg;
1337
1089 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1338 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1090 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1339 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1091
1092 my $text = "\n" . CFPlus::asxml $msg->{msg};
1093 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1094 my @link;
1095 $text =~ s{
1096 ($match)
1097 }{
1098 my $kw = $1;
1099
1100 push @link, new CFPlus::UI::Label
1101 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1102 can_hover => 1,
1103 can_events => 1,
1104 padding_x => 0,
1105 padding_y => 0,
1106 on_button_up => sub {
1107 $self->send ($kw);
1108 };
1109
1110 "\x{fffc}"
1111 }giex;
1112 1340
1341 if (exists $info{msg}) {
1342 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1343 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1344 my @link;
1345 $text =~ s{
1346 ($match)
1347 }{
1348 my $kw = $1;
1349
1350 push @link, new CFPlus::UI::Label
1351 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1352 can_hover => 1,
1353 can_events => 1,
1354 padding_x => 0,
1355 padding_y => 0,
1356 on_button_up => sub {
1357 $self->send ($kw);
1358 };
1359
1360 "\x{fffc}"
1361 }giex;
1362
1113 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1363 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1114 $self->{textview}->scroll_to_bottom; 1364 $self->{textview}->scroll_to_bottom;
1365 }
1366
1115 $self->update_options; 1367 $self->update_options;
1116 } else { 1368 } else {
1117 $self->destroy; 1369 $self->destroy;
1118 } 1370 }
1119 1371
… …
1124 my ($self, $msg) = @_; 1376 my ($self, $msg) = @_;
1125 1377
1126 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1378 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1127 $self->{textview}->scroll_to_bottom; 1379 $self->{textview}->scroll_to_bottom;
1128 1380
1129 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1381 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1130} 1382}
1131 1383
1132sub destroy { 1384sub destroy {
1133 my ($self) = @_; 1385 my ($self) = @_;
1134 1386
1135 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1387 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1136 1388
1137 if ($self->{conn}) { 1389 if ($self->{conn}) {
1138 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1390 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1139 delete $self->{conn}{npc_dialog}; 1391 delete $self->{conn}{npc_dialog};
1140 $self->{conn}->disconnect_ext ($self->{id}); 1392 $self->{conn}->disconnect_ext ($self->{id});
1141 } 1393 }
1142 1394
1143 $self->SUPER::destroy; 1395 $self->SUPER::destroy;

Diff Legend

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