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.68 by elmex, Sun Jul 30 12:51:32 2006 UTC vs.
Revision 1.176 by root, Sun Oct 14 15:33:30 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
10use CFClient::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
11 14
12use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
13 16
14sub new { 17sub new {
15 my $class = shift; 18 my ($class, %arg) = @_;
16 19
17 my $self = $class->SUPER::new (@_); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 xwidget2 => 1,#d#
25 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 33 or die "unparseable command help: $_->{kw}[0]";
29 34
30 my $cmd = $1; 35 my $cmd = $1;
31 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 37 @args = (".*") unless @args;
33 38
39 my (undef, @par) = CFPlus::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par;
41
34 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 43 for @args;
36 44
37 my $text = CFClient::Pod::as_markup $head2->content; 45 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
41 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*";
50
51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
42 } 55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
61 });
43 62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
68 }
69 });
70
71 $self->{map_widget}->add_command (@$_)
44 \@cmd_help 72 for @cmd_help;
73
74 {
75 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
76 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 }
79
80 {
81 $self->{noface} = my $tex = new_from_file CFPlus::Texture
82 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 }
85
86 $self->{open_container} = 0;
87
88 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
90
91 $self
92}
93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]);
128
129 my $w = int $self->{mapw} * 32 / $self->{tilesize};
130 my $h = int $self->{maph} * 32 / $self->{tilesize};
131
132 $self->setup_req (mapsize => "${w}x${h}");
133 }
134 }
135}
136
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_;
146
147 $widget ||= new CFPlus::UI::Bin;
148
149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget;
151
152 if ($ws) {
153 $widget->{s_ws} = $ws;
154 $self->{widgetset}{$ws}{w}{$id} = $widget;
155 }
156
157 $widget->connect (on_destroy => sub {
158 my ($widget) = @_;
159
160 delete $self->{widget}{$widget->{s_id}};
161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
162 if exists $widget->{s_ws};
163 });
164}
165
166# widgetset new
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
45 }; 172 };
46
47 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help;
49
50 $self->{noface} = new_from_file CFClient::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
52
53 $self->{open_container} = 0;
54
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
61
62 $self
63} 173}
174
175# widgetset destroy
176sub ext_ws_d {
177 my ($self, $id) = @_;
178
179 my $ws = delete $self->{widgetset}{$id}
180 or return;
181
182 $_->destroy
183 for values %{$ws->{w}};
184}
185
186# widgetset create
187sub ext_ws_c {
188 my ($self, $ws, $id, $class, $args) = @_;
189
190 $self->widget_associate (
191 $ws, $id => scalar eval {
192 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args)
194 }
195 );
196}
197
198# widgetset associate
199sub ext_ws_a {
200 my ($self, %ass) = @_;
201
202 # everything that has a name, wether conceivably useful or not
203 my %wkw = (
204 root => $CFPlus::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP,
206
207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG,
213 host_entry => $::HOST_ENTRY,
214 metaserver => $::METASERVER,
215 server_info => $::SERVER_INFO,
216
217 setup_dialog => $::SETUP_DIALOG,
218 setup_notebook => $::SETUP_NOTEBOOK,
219 setup_server => $::SETUP_SERVER,
220 setup_keyboard => $::SETUP_KEYBOARD,
221
222 pl_notebook => $::PL_NOTEBOOK,
223 pl_window => $::PL_WINDOW,
224 inventory_page => $::INVENTORY_PAGE,
225 stats_page => $::STATS_PAGE,
226 skill_page => $::SKILL_PAGE,
227 spell_page => $::SPELL_PAGE,
228 spell_list => $::SPELL_LIST,
229
230 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW,
233 statusbox => $::SDTATUSBOX,
234
235 inv => $::INV,
236 invr => $::INVR,
237 invr_hb => $::INVR_HB,
238 );
239
240 while (my ($id, $name) = each %ass) {
241 $self->widget_associate (undef, $id => $wkw{$name});
242 }
243}
244
245# widget call
246sub ext_w_c {
247 my ($self, $id, $rcb, $method, @args) = @_;
248
249 my $w = $self->{widget}{$id}
250 or return;
251
252 if ($rcb) {
253 $rcb->($w->$method (@args));
254 } else {
255 $w->$method (@args);
256 }
257}
258
259# widget set
260sub ext_w_s {
261 my ($self, $id, $attr) = @_;
262
263 my $w = $self->{widget}{$id}
264 or return;
265
266 for (my $i = 0; $i < $#$attr; $i += 2) {
267 my ($member, $value) = @$attr[$i, $i+1];
268 if (defined $value) {
269 $w->{$member} = $value;
270 } else {
271 delete $w->{$member};
272 }
273 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
274 }
275}
276
277# widget get
278sub ext_w_g {
279 my ($self, $id, $rid, @attr) = @_;
280
281 my $w = $self->{widget}{$id}
282 or return;
283
284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
285}
286
287# message window
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
64 295
65sub logprint { 296sub logprint {
66 my ($self, @a) = @_; 297 my ($self, @a) = @_;
67 298
68 $self->{log_fh} ||= do { 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
69 my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71 open my $fh, ">>:utf8", $path
72 or die "Couldn't open logfile $path: $!";
73
74 $fh->autoflush (1);
75
76 $fh;
77 };
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print {$self->{log_fh}} "$ts ", @a, "\n";
85} 300}
86 301
87sub _stat_numdiff { 302sub _stat_numdiff {
88 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
89 304
… …
173 388
174 if ( 389 if (
175 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
176 ) { 391 ) {
177 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
178 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
179 } 394 }
180 395
181 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
182 397
183 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
228 $rng =~ s/^Range: //; # thank you so much dear server 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 447
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 448 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
251 for keys %RES_TBL; 465 for keys %RES_TBL;
252 466
253 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
254 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
255 469
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 470 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
471 map [$_, $self->{skill_info}{$_}],
472 grep exists $stats->{$_},
473 @skills;
474
475 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
476 $self->{stat_order} = join ",", map $_->[0], @order;
477
257 $sktbl->clear; 478 $sktbl->clear;
258 479
480 my $sw = $self->{skillwid}{""} ||= [
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
489 ];
490
491 my @add = @$sw;
265 492
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 494
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 497
272 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
273 for ( 499 for (@order) {
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}],
276 grep exists $stats->{$_},
277 @skills
278 ) {
279 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
280 501
281 my $spell_cb = sub { 502 my $spell_cb = sub {
282 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
283 504
284 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14;
289 (new CFClient::UI::Menu 511 (new CFPlus::UI::Menu
290 items => [ 512 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 513 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 514 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 515 ],
294 )->popup ($ev); 516 )->popup ($ev);
295 } else { 517 } else {
296 return 0; 518 return 0;
297 } 519 }
298 520
299 1 521 1
300 }; 522 };
301 523
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 528
529 # level
530 (new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
306 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 532
533 # progress
534 (new CFPlus::UI::ExperienceProgress),
535
536 # label
537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
541 push @add,
542 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1],
544 $x * 4 + 2, $y, $sw->[2],
545 $x * 4 + 3, $y, $sw->[3],
546 ;
307 547
308 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
309 } 549 }
310 }
311 550
312 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 552 }
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 553
554 for (@order) {
555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
557
558 next if $prev->{$idx}[1] eq $val->[1];
559
560 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val);
564
565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val);
315 } 567 }
316} 568}
317 569
318sub user_send { 570sub user_send {
319 my ($self, $command) = @_; 571 my ($self, $command) = @_;
320 572
573 $self->{record}->($command)
321 if ($self->{record}) { 574 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 575
325 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 577 $self->send_command ($command);
327 ::status ($command);
328} 578}
329 579
330sub start_record { 580sub record {
331 my ($self) = @_; 581 my ($self, $cb) = @_;
332 582
333 $self->{record} = []; 583 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 584}
340 585
341sub map_scroll { 586sub map_scroll {
342 my ($self, $dx, $dy) = @_; 587 my ($self, $dx, $dy) = @_;
343 588
… …
345} 590}
346 591
347sub feed_map1a { 592sub feed_map1a {
348 my ($self, $data) = @_; 593 my ($self, $data) = @_;
349 594
350 $self->{map}->map1a_update ($data); 595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
596 my $delay;
597
598 for my $tile (@$missing) {
599 next if $self->{delay}{$tile};
600
601 $delay = 1;
602
603 if (my $tex = $::CONN->{texture}[$tile]) {
604 $tex->upload;
605 } else {
606 $self->{delay}{$tile} = 1;
607
608 # we assume the face is in-flight and will eventually come
609 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile};
611 $_[0]->upload;
612 };
613 }
614 }
615
616 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
618 Event->timer (after => 0.03, cb => sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update
621 if $self->{map_widget};
622 });
623 } else {
351 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
352} 626}
353 627
354sub magicmap { 628sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
356 630
… …
363 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
364 or return; 638 or return;
365 639
366 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
367 641
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 643 $self->{map_cache_new}{$hash} = \$data;
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
371} 645}
372 646
373sub map_clear { 647sub map_clear {
374 my ($self) = @_; 648 my ($self) = @_;
375 649
… …
378 652
379 $self->{map}->clear; 653 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 654 delete $self->{map_widget}{magicmap};
381} 655}
382 656
657sub bg_fetch {
658 my ($self) = @_;
659
660 my $tile;
661
662 do {
663 $tile = pop @{$self->{bg_fetch}}
664 or return;
665 } while $self->{texture}[$tile];
666
667 CFPlus::DB::get tilecache => $tile, sub {
668 my ($data) = @_;
669
670 return unless $self->{map}; # stop when destroyed
671
672 if (defined $data) {
673 $self->have_tile ($tile, $data);
674 $self->{texture}[$tile]->upload;
675 }
676
677 $self->bg_fetch;
678 };
679}
383 680
384sub load_map($$$) { 681sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
386 683
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 684 my $gen = $self->{map_change_gen};
685
686 my $cb = sub {
687 return unless $gen == $self->{map_change_gen};
688
689 my ($data) = @_;
690
691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
388 $data = Compress::LZF::decompress $data; 694 my $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 695
394 $self->set_texture ($id => $data); 696 my $inprogress = @{ $self->{bg_fetch} || [] };
697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
698 $self->bg_fetch unless $inprogress;
395 } 699 }
700 };
701
702 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata);
704 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
396 } 706 }
397} 707}
398 708
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
… …
465 775
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 776 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 777 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 778
469 } else { 779 } else {
780 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 781 $self->send_mapinfo ("spatial $path$tile", sub {
782 return unless $gen == $self->{map_change_gen};
783
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 784 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 785
473 return if $mode ne "spatial"; 786 return if $mode ne "spatial";
474 787
475 $x += $self->{map}->ox; 788 $x += $self->{map}->ox;
… …
489 802
490sub map_change { 803sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 805
493 $self->flush_map; 806 $self->flush_map;
807
808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
494 810
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 812
497 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 831 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 832 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 833}
518 834
519sub face_find { 835sub face_find {
520 my ($self, $facenum, $face) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
521 837
522 my $hash = "$face->{chksum},$face->{name}"; 838 if ($face->{type} == 0) { # FT_FACE
839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
523 840
524 my $id = $self->{facemap}->get ($hash);
525
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFClient::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFClient::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 841 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d#
551 843
552 my $face = $self->{tilecache}->get ($id); 844 CFPlus::DB::get tilecache => $id, $cb;
553 845
554 if ($face) { 846 } elsif ($face->{type} & 1) { # with metadata
555 #$self->face_prefetch; 847 CFPlus::DB::get res_meta => $face->{name}, $cb;
556 $face 848
557 } else { 849 } else { # no metadata
558 my $tex = $self->{noface}; 850 CFPlus::DB::get res_data => $face->{name}, $cb;
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 }; 851 }
562} 852}
563 853
564sub face_update { 854sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
566 856
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 857 if ($face->{type} == 0) {
858 # image, FT_FACE
859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
860 if $changed;
568 861
569 $self->set_texture ($face->{id} => delete $face->{image}); 862 $self->have_tile ($face->{id}, delete $face->{data});
570}
571 863
572sub set_texture { 864 } elsif ($face->{type} & 1) {
865 # split metadata case, FT_MUSIC, FT_SOUND
866 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta;
869
870 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
873 }
874
875 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
879
880 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum);
884 }
885
886 } else {
887 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed;
890 }
891
892 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs;
894 }
895}
896
897sub smooth_update {
898 my ($self, $facenum, $face) = @_;
899
900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
901}
902
903sub have_tile {
573 my ($self, $id, $data) = @_; 904 my ($self, $tile, $data) = @_;
574 905
575 $self->{texture}[$id] ||= do { 906 return unless $self->{map};
576 my $tex = 907
577 new_from_image CFClient::Texture 908 my $tex = $self->{texture}[$tile] ||=
909 new CFPlus::Texture
910 tile => $tile,
911 image => $data, delete_image => 1,
578 $data, minify => 1, mipmap => 1; 912 minify => 1, mipmap => 1;
579 913
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
581 $self->{map_widget}->update; 915 $_->($tex) for @$cbs;
582
583 $tex
584 }; 916 }
917}
918
919# call in non-void context registers a temporary
920# hook with handle, otherwise its permanent
921sub on_face_change {
922 my ($self, $num, $cb) = @_;
923
924 push @{$self->{face_cb}{$num}}, $cb;
925
926 defined wantarray
927 ? CFPlus::guard {
928 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}};
931 }
932 : ()
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub register_face_handler {
938 my ($self, $num, $cb) = @_;
939
940 return unless $num;
941
942 # invoke if available right now
943 $cb->($self->{face}[$num], 0)
944 unless exists $self->{face}[$num]{loading};
945
946 # future changes
947 $self->on_face_change ($num => $cb)
585} 948}
586 949
587sub sound_play { 950sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
589 952
590 $self->{sound_play}->($x, $y, $soundnum, $type); 953 &::audio_sound_play ($face, $dx, $dy, $vol)
954 unless $type & 1; # odd types are silent for future expansion
591} 955}
592 956
593my $LAST_QUERY; # server is stupid, stupid, stupid 957my $LAST_QUERY; # server is stupid, stupid, stupid
594 958
595sub query { 959sub query {
… …
599 $LAST_QUERY = $prompt; 963 $LAST_QUERY = $prompt;
600 964
601 $self->{query}-> ($self, $flags, $prompt); 965 $self->{query}-> ($self, $flags, $prompt);
602} 966}
603 967
604sub drawinfo { 968sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 969 local $_ = shift;
606 970
607 my @color = ( 971 # we now weed out all tags we do not support
972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
977 # now all entities
978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
979
980 # handle some elements
981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
982 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
983
984 $_
985}
986
987our %NAME_TO_COLOR = (
988 black => 0,
989 white => 1,
990 darkblue => 2,
991 red => 3,
992 orange => 4,
993 lightblue => 5,
994 darkorange => 6,
995 green => 7,
996 darkgreen => 8,
997 grey => 9,
998 brown => 10,
999 yellow => 11,
1000 tan => 12,
1001);
1002
1003our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1004 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 1005 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1006 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 1007 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 1008 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 1009 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 1010 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 1011 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 1012 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 1013 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 1014 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 1015 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 1016 [0.74, 0.65, 0.41],
621 ); 1017);
622 1018
1019sub msg {
1020 my ($self, $color, $type, $text, @extra) = @_;
1021
1022 $text = sanitise_xml $text;
1023
1024 if (my $cb = $self->{cb_msg}{$type}) {
1025 $_->($self, $color, $type, $text, @extra) for values %$cb;
1026 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1027 $type =~ s/-/_/g;
1028 $self->{$type} = $text;
1029 } else {
623 $self->logprint ("info: ", $text); 1030 $self->logprint ("msg: ", $text);
1031 return if $color < 0; # negative color == ignore if not understood
624 1032
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
626 1034
627 # try to create single paragraphs of multiple lines sent by the server 1035 ## try to create single paragraphs of multiple lines sent by the server
1036 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 1038
630 $text = CFClient::asxml $text; 1039 for (split /\n/, $text) {
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1040 ::message ({
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1041 fg => $fg,
1042 markup => $_,
1043 type => $type,
1044 extra => [@extra],
1045 color_flags => $color, #d# ugly, kill
1046 });
633 1047
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 1049 # actually, this is an ugly design. _we_ should control the channels,
636 $self->{logview}->scroll_to_bottom; 1050 # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above.
1053 }
637 1054
638 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
639 group => $text, 1056 group => $text,
640 fg => $color[$color], 1057 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
643 ); 1060 ) if $type eq "info";
644} 1061 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 1062}
651 1063
652sub spell_add { 1064sub spell_add {
653 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
654 1066
655 # try to create single paragraphs out of the multiple lines sent by the server 1067 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1068 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 1069 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 1070 $spell->{message} ||= "Server did not provide a description for this spell.";
659 1071
660 $::SPELL_PAGE->add_spell ($spell); 1072 $::SPELL_LIST->add_spell ($spell);
661 1073
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 1074 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 1075 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 1076}
665 1077
666sub spell_delete { 1078sub spell_delete {
667 my ($self, $spell) = @_; 1079 my ($self, $spell) = @_;
668 1080
669 $::SPELL_PAGE->remove_spell ($spell); 1081 $::SPELL_LIST->remove_spell ($spell);
1082}
1083
1084sub setup {
1085 my ($self, $setup) = @_;
1086
1087 $self->{map_widget}->set_tilesize ($self->{tilesize});
1088 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 1089}
671 1090
672sub addme_success { 1091sub addme_success {
673 my ($self) = @_; 1092 my ($self) = @_;
674 1093
675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 1094 my %skill_help;
679 1095
680 for my $head2 ($pom->head1->[3]->head2) { 1096 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 1097 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 1098 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 1099 };
686 1100
687 for my $skill (values %{$self->{skill_info}}) { 1101 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 1102 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFClient::asxml "Ready the skill '$skill'\n\n") 1103 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 1104 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 1105 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 1106 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 1107 . $skill_help{$skill});
694 } 1108 }
695} 1109}
696 1110
697sub eof { 1111sub eof {
698 my ($self) = @_; 1112 my ($self) = @_;
… …
700 $self->{map_widget}->clr_commands; 1114 $self->{map_widget}->clr_commands;
701 1115
702 ::stop_game (); 1116 ::stop_game ();
703} 1117}
704 1118
705sub image_info {
706 my ($self, $numfaces) = @_;
707
708 $self->{num_faces} = $numfaces;
709 $self->{face_prefetch} = [1 .. $numfaces];
710 $self->face_prefetch;
711}
712
713sub face_prefetch {
714 my ($self) = @_;
715
716 return unless $::CFG->{face_prefetch};
717
718 if ($self->{num_faces}) {
719 return if @{ $self->{send_queue} || [] };
720 my $todo = @{ $self->{face_prefetch} }
721 or return;
722
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724
725 $self->send ("requestinfo image_sums $face $face");
726
727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info");
731
732 $self->{num_faces} = 0;
733
734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 }
737}
738
739sub update_floorbox { 1119sub update_floorbox {
740 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 1121 return unless $::CONN;
742 1122
743 $::FLOORBOX->clear; 1123 $::FLOORBOX->clear;
1124
1125 my @add;
744 1126
745 my $row; 1127 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1128 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 1129 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 1130 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 1131 local $_->{desc_widget}; # hack to force recreation of widget
750 CFClient::Item::update_widgets $_; 1132 CFPlus::Item::update_widgets $_;
751 1133
1134 push @add,
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1135 0, $row, $_->{face_widget},
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1136 1, $row, $_->{desc_widget};
754 1137
755 $row++; 1138 $row++;
756 } else { 1139 } else {
757 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1140 push @add, 1, $row, new CFPlus::UI::Button
758 text => "More...", 1141 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 1143 ;
761 last; 1144 last;
762 } 1145 }
763 } 1146 }
764 if ($::CONN->{open_container}) { 1147 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1148 push @add, 1, $row++, new CFPlus::UI::Button
766 text => "Close container", 1149 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 1151 ;
769 } 1152 }
1153
1154 $::FLOORBOX->add_at (@add);
770 }); 1155 });
771 1156
772 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
773} 1158}
774 1159
775sub set_opencont { 1160sub set_opencont {
776 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
778 update_floorbox; 1163 update_floorbox;
779 1164
780 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
781 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
782 1167
783 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
784 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
785 text => "Close container", 1170 text => "Close container",
786 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
787 on_activate => sub { 1172 on_activate => sub {
788 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
789 if $tag != 0; 1174 if $tag != 0;
790 #if $CONN->{open_container} != 0;
791 0 1175 0
792 }, 1176 },
793 ); 1177 );
794 } 1178 }
795 1179
… …
797} 1181}
798 1182
799sub update_containers { 1183sub update_containers {
800 my ($self) = @_; 1184 my ($self) = @_;
801 1185
802 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1186 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
803 my $todo = delete $self->{update_container} 1187 my $todo = delete $self->{update_container}
804 or return; 1188 or return;
805 1189
806 for my $tag (keys %$todo) { 1190 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1191 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
844sub item_update { 1228sub item_update {
845 my ($self, $item) = @_; 1229 my ($self, $item) = @_;
846 1230
847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1231 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
848 1232
849 CFClient::Item::update_widgets $item; 1233 CFPlus::Item::update_widgets $item;
850 1234
851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1235 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
852 set_opencont ($::CONN, 0, "Floor"); 1236 set_opencont ($::CONN, 0, "Floor");
853 1237
854 } elsif ($item->{flags} & F_OPEN) { 1238 } elsif ($item->{flags} & F_OPEN) {
855 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1239 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
856 1240
857 } else { 1241 } else {
858 $self->{update_container}{$item->{container}}++; 1242 $self->{update_container}{$item->{container}}++;
859 $self->update_containers; 1243 $self->update_containers;
860 } 1244 }
… …
885 $::SERVER_INFO->set_markup ( 1269 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1270 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1271 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1272 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1273 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1274 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1275 . "editing support $yesno[!!$self->{editor_support}]\n"
1276 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1277 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1280 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1281 );
1282
894} 1283}
895 1284
896sub logged_in { 1285sub logged_in {
897 my ($self) = @_; 1286 my ($self) = @_;
898 1287
899 $self->send_ext_req (cfplus_support => "1", sub { 1288 $self->send_ext_req (cfplus_support => version => 2, sub {
1289 my (%msg) = @_;
1290
900 $self->{cfplus_ext} = $_[0]; 1291 $self->{cfplus_ext} = $msg{version};
901 $self->update_server_info; 1292 $self->update_server_info;
1293
1294 if ($self->{cfplus_ext} >= 2) {
1295 $self->send_ext_req ("editor_support", sub {
1296 $self->{editor_support} = { @_ };
1297 $self->update_server_info;
1298
1299 0
1300 });
1301 }
1302
1303 0
902 }); 1304 });
903 1305
904 $self->update_server_info; 1306 $self->update_server_info;
905 1307
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
907 $self->send_command ("output-count $::CFG->{output_count}");
908 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
909} 1310}
910 1311
911sub lookat { 1312sub lookat {
912 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
913 1314
914 if ($self->{cfplus_ext}) { 1315 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1316 $self->send_ext_req (lookat => $x, $y, sub {
916 my %res = split /\x00/, $_[0]; 1317 my (%msg) = @_;
917 1318
918 if (exists $res{npc_dialog}) { 1319 if (exists $msg{npc_dialog}) {
919 # start npc chat dialog 1320 # start npc chat dialog
920 $self->{npc_dialog} = new CFClient::NPCDialog:: 1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1322 token => $msg{npc_dialog},
922 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1323 title => "$msg{npc_dialog}[0] (NPC)",
924 conn => $self, 1324 conn => $self,
925 ; 1325 ;
926 } 1326 }
927 }); 1327 });
928 } 1328 }
… …
931} 1331}
932 1332
933sub destroy { 1333sub destroy {
934 my ($self) = @_; 1334 my ($self) = @_;
935 1335
936 $self->{npc_dialog}->destroy 1336 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1337 if $self->{npc_dialog};
938 1338
939 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
940}
941 1340
1341 %$self = ();
1342}
1343
942package CFClient::NPCDialog; 1344package CFPlus::NPCDialog;
943 1345
944our @ISA = 'CFClient::UI::FancyFrame'; 1346our @ISA = 'CFPlus::UI::Toplevel';
945 1347
946sub new { 1348sub new {
947 my $class = shift; 1349 my $class = shift;
948 1350
949 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1358 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1359 has_close_button => 1,
958 @_, 1360 @_,
959 ); 1361 );
960 1362
961 Scalar::Util::weaken (my $this = $self); 1363 CFPlus::weaken (my $this = $self);
962 1364
963 $self->connect (delete => sub { $this->destroy; 1 }); 1365 $self->connect (delete => sub { $this->destroy; 1 });
964 1366
965 # better use a pane... 1367 # better use a pane...
966 $self->add (my $hbox = new CFClient::UI::HBox); 1368 $self->add (my $hbox = new CFPlus::UI::HBox);
967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
968 1370
969 $hbox->add (my $vbox = new CFClient::UI::VBox); 1371 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1372
971 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1375 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 1376 on_activate => sub {
979 my ($entry, $text) = @_; 1377 my ($entry, $text) = @_;
980 1378
981 return unless $text =~ /\S/; 1379 return unless $text =~ /\S/;
982 1380
… …
985 1383
986 0 1384 0
987 }, 1385 },
988 ); 1386 );
989 1387
990 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
991 1389
992 $self->{bye_button} = new CFClient::UI::Button 1390 $self->{bye_button} = new CFPlus::UI::Button
993 text => "Bye (close)", 1391 text => "Bye (close)",
994 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1392 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
995 on_activate => sub { $this->destroy; 1 }, 1393 on_activate => sub { $this->destroy; 1 },
996 ; 1394 ;
997 1395
998 $self->update_options; 1396 $self->update_options;
999 1397
1000 $self->{token} = $self->{conn}->ext_token; 1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1399 $self->{conn}->connect_ext ($self->{id} => sub {
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1400 $this->feed (@_) if $this;
1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1003 1404
1004 $self->{entry}->grab_focus; 1405 $self->{entry}->grab_focus;
1005 1406
1006 $self->{textview}->add_paragraph ({ 1407 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1408 fg => [1, 1, 0, 1],
… …
1013}; 1414};
1014 1415
1015sub update_options { 1416sub update_options {
1016 my ($self) = @_; 1417 my ($self) = @_;
1017 1418
1018 Scalar::Util::weaken $self; 1419 CFPlus::weaken $self;
1019 1420
1020 $self->{options}->clear; 1421 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1422 $self->{options}->add ($self->{bye_button});
1022 1423
1023 for my $kw (sort keys %{ $self->{kw} }) { 1424 for my $kw (sort keys %{ $self->{kw} }) {
1024 $self->{options}->add (new CFClient::UI::Button 1425 $self->{options}->add (new CFPlus::UI::Button
1025 text => $kw, 1426 text => $kw,
1026 on_activate => sub { 1427 on_activate => sub {
1027 $self->send ($kw); 1428 $self->send ($kw);
1028 0 1429 0
1029 }, 1430 },
1030 ); 1431 );
1031 } 1432 }
1032} 1433}
1033 1434
1034sub feed { 1435sub feed {
1035 my ($self, $data) = @_; 1436 my ($self, $type, @arg) = @_;
1036 1437
1037 Scalar::Util::weaken $self; 1438 CFPlus::weaken $self;
1038 1439
1039 my ($type, $msg) = split / /, $data, 2;
1040
1041 if ($type eq "msg") { 1440 if ($type eq "update") {
1042 my ($msg, @kw) = split /\x00/, $msg; 1441 my (%info) = @arg;
1043 1442
1044 utf8::decode $_ for ($msg, @kw); 1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1045 1445
1046 $self->{kw}{$_} = 1 for @kw; 1446 if (exists $info{msg}) {
1047 1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1048 $msg = "\n" . CFClient::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1448 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1449 my @link;
1051 $msg =~ s{ 1450 $text =~ s{
1052 ($match) 1451 ($match)
1053 }{ 1452 }{
1054 my $kw = $1; 1453 my $kw = $1;
1055 1454
1056 push @link, new CFClient::UI::Label 1455 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1457 can_hover => 1,
1059 can_events => 1, 1458 can_events => 1,
1060 padding_x => 0, 1459 padding_x => 0,
1061 padding_y => 0, 1460 padding_y => 0,
1062 on_button_up => sub { 1461 on_button_up => sub {
1063 $self->send ($kw); 1462 $self->send ($kw);
1064 }; 1463 };
1065 1464
1066 chr 0xfffc 1465 "\x{fffc}"
1067 }giex; 1466 }giex;
1068 1467
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1071 $self->update_options; 1472 $self->update_options;
1072 } else { 1473 } else {
1073 $self->destroy; 1474 $self->destroy;
1074 } 1475 }
1075 1476
… …
1077} 1478}
1078 1479
1079sub send { 1480sub send {
1080 my ($self, $msg) = @_; 1481 my ($self, $msg) = @_;
1081 1482
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1484 $self->{textview}->scroll_to_bottom;
1084 1485
1085 utf8::encode $msg;
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1087} 1487}
1088 1488
1089sub destroy { 1489sub destroy {
1090 my ($self) = @_; 1490 my ($self) = @_;
1091 1491
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1492 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1493
1494 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1495 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1496 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1497 $self->{conn}->disconnect_ext ($self->{id});
1498 }
1097 1499
1098 $self->SUPER::destroy; 1500 $self->SUPER::destroy;
1099} 1501}
1100 1502
11011 15031
1504

Diff Legend

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