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.62 by elmex, Sat Jul 22 12:18:02 2006 UTC vs.
Revision 1.150 by root, Sun Aug 12 09:39:36 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;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
10 16
11use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
12 18
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 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 );
17 30
18 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
19 32
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 35 or die "unparseable command help: $_->{kw}[0]";
28 36
29 my $cmd = $1; 37 my $cmd = $1;
30 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 39 @args = (".*") unless @args;
32 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
33 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 45 for @args;
35 46
36 my $text = CFClient::pod_to_pango $head2->content; 47 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
40 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
41 } 90 };
42
43 \@cmd_help
44 }; 91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
45 200
46 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 202 for @cmd_help;
48 203
204 {
205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
206 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
207 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
208 }
209
210 {
49 $self->{noface} = new_from_file CFClient::Texture 211 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 212 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
213 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
214 }
51 215
52 $self->{open_container} = 0; 216 $self->{open_container} = 0;
53 217
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 218 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 220
61 $self 221 $self
222}
223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
62} 231}
63 232
64sub logprint { 233sub logprint {
65 my ($self, @a) = @_; 234 my ($self, @a) = @_;
66 235
67 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 237}
85 238
86sub _stat_numdiff { 239sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
88 241
… …
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
227 $rng =~ s/^Range: //; # thank you so much dear server
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 380 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 383
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 393 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 394 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 395 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 396 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 397
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 398 $self->update_weight;
248 399
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 400 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 401 for keys %RES_TBL;
251 402
252 my $sktbl = $::STATWIDS->{skill_tbl}; 403 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
254 405
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 407 $sktbl->clear;
257 408
409 my @add;
410
411 push @add,
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
264 419
420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
421
422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
424
265 my ($x, $y) = (1, 0); 425 my ($x, $y) = (0, 1);
266 for ( 426 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 428 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 429 grep exists $stats->{$_},
270 @skills 430 @skills
271 ) { 431 ) {
272 my ($idx, $name) = @$_; 432 my ($idx, $name) = @$_;
273 433
434 my $spell_cb = sub {
435 my ($widget, $ev) = @_;
436
437 if ($ev->{button} == 1) {
438 $::CONN->user_send ("ready_skill $name");
439 } elsif ($ev->{button} == 2) {
440 $::CONN->user_send ("use_skill $name");
441 } elsif ($ev->{button} == 3) {
442 my $shortname = CFPlus::shorten $name, 14;
443 (new CFPlus::UI::Menu
444 items => [
445 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
446 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
447 ],
448 )->popup ($ev);
449 } else {
450 return 0;
451 }
452
453 1
454 };
455
456 push @add,
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
279 464
280 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
281 } 466 }
467
468 $sktbl->add_at (@add);
282 } 469 }
283 470
284 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 474 }
288} 475}
289 476
477sub macro_send {
478 my ($self, $macro) = @_;
479
480 for my $cmd (@{ $macro->{action} }) {
481 $self->send_command ($cmd);
482 }
483}
484
290sub user_send { 485sub user_send {
291 my ($self, $command) = @_; 486 my ($self, $command) = @_;
292 487
488 $self->{record}->($command)
293 if ($self->{record}) { 489 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 490
297 $self->logprint ("send: ", $command); 491 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 492 $self->send_command ($command);
299 ::status ($command); 493 ::status ($command);
300} 494}
301 495
302sub start_record { 496sub record {
303 my ($self) = @_; 497 my ($self, $cb) = @_;
304 498
305 $self->{record} = []; 499 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 500}
312 501
313sub map_scroll { 502sub map_scroll {
314 my ($self, $dx, $dy) = @_; 503 my ($self, $dx, $dy) = @_;
315 504
… …
317} 506}
318 507
319sub feed_map1a { 508sub feed_map1a {
320 my ($self, $data) = @_; 509 my ($self, $data) = @_;
321 510
322 $self->{map}->map1a_update ($data); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
323 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
324} 541}
325 542
326sub magicmap { 543sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
328 545
… …
336 or return; 553 or return;
337 554
338 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
339 556
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 558 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 559 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
343} 560}
344 561
345sub map_clear { 562sub map_clear {
346 my ($self) = @_; 563 my ($self) = @_;
… …
350 567
351 $self->{map}->clear; 568 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 569 delete $self->{map_widget}{magicmap};
353} 570}
354 571
572sub bg_fetch {
573 my ($self) = @_;
574
575 my $id;
576
577 do {
578 $id = pop @{$self->{bg_fetch}}
579 or return;
580 } while $self->{texture}[$id];
581
582 CFPlus::DB::exists tilecache => $id, sub {
583 my ($exists) = @_;
584
585 return unless $self->{map}; # stop when destroyed
586
587 if ($exists) {
588 $self->have_tile ($id)
589 $self->{texture}[$id]->upload;
590 }
591
592 $self->bg_fetch;
593 };
594}
355 595
356sub load_map($$$) { 596sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
358 598
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 599 my $gen = $self->{map_change_gen};
600
601 CFPlus::DB::get $self->{mapcache} => $hash, sub {
602 return unless $gen == $self->{map_change_gen};
603
604 my ($data) = @_;
605
606 if (defined $data) {
360 $data = Compress::LZF::decompress $data; 607 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 608 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 609
366 $self->set_texture ($id => $data); 610 my $inprogress = @{ $self->{bg_fetch} || [] };
611 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
612 $self->bg_fetch unless $inprogress;
367 } 613 }
368 } 614 };
369} 615}
370 616
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 617# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 618# (server resource,s latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 619# the right fix is to make real tiled maps with an overview file
… …
437 683
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 684 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 685 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 686
441 } else { 687 } else {
688 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 689 $self->send_mapinfo ("spatial $path$tile", sub {
690 return unless $gen == $self->{map_change_gen};
691
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 692 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 693
445 return if $mode ne "spatial"; 694 return if $mode ne "spatial";
446 695
447 $x += $self->{map}->ox; 696 $x += $self->{map}->ox;
… …
461 710
462sub map_change { 711sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 712 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 713
465 $self->flush_map; 714 $self->flush_map;
715
716 ++$self->{map_change_gen};
466 717
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 718 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 719
469 my $mapmapw = $self->{mapmap}->{w}; 720 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 721 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 738 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 739 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 740}
490 741
491sub face_find { 742sub face_find {
492 my ($self, $facenum, $face) = @_; 743 my ($self, $facenum, $face, $cb) = @_;
493 744
494 my $hash = "$face->{chksum},$face->{name}"; 745 if ($face->{type} == 0) { # FT_FACE
746 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
495 747
496 my $id = $self->{facemap}->get ($hash); 748 $face->{id} = $id;
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d# 749 $self->{faceid}[$facenum] = $id;
523 750
524 my $face = $self->{tilecache}->get ($id); 751 $self->{map}->set_tileid ($facenum => $id);
525 752
526 if ($face) { 753 CFPlus::DB::get tilecache => $id, $cb;
527 #$self->face_prefetch; 754
528 $face 755 } elsif ($face->{type} & 1) { # with metadata
529 } else { 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
530 my $tex = $self->{noface};
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 757 }
534} 758}
535 759
536sub face_update { 760sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
538 762
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 763 if ($face->{type} == 0) { # FT_FACE
764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
765 if $changed;
540 766
541 $self->set_texture ($face->{id} => delete $face->{image}); 767 $self->have_tile ($face->{id});
542}
543 768
544sub set_texture { 769 } elsif ($face->{type} & 1) { # split metadata
770 if ($changed) { # new data
771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
773
774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 } else {
777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
778 }
779
780 ::add_license ($face);
781
782 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed;
787
788 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed;
794
795 &::audio_sound_push ($facenum);
796 }
797
798 }
799}
800
801sub smooth_update {
802 my ($self, $facenum, $face) = @_;
803
804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
805}
806
807sub have_tile {
808 my ($self, $tile) = @_;
809
810 return unless $self->{map};
811
812 my $tex = $self->{texture}[$tile] ||=
813 new CFPlus::Texture
814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
815
816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
817}
818
819sub connect_face_update {
545 my ($self, $id, $data) = @_; 820 my ($self, $id, $cb) = @_;
546 821
547 $self->{texture}[$id] ||= do { 822 push @{$self->{face_cb}{$id}}, $cb;
548 my $tex =
549 new_from_image CFClient::Texture
550 $data, minify => 1, mipmap => 1;
551 823
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 824 CFPlus::guard {
553 $self->{map_widget}->update; 825 @{$self->{face_cb}{$id}}
554 826 = grep $_ != $cb,
555 $tex 827 @{$self->{face_cb}{$id}};
556 }; 828 }
557} 829}
558 830
559sub sound_play { 831sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 833
562 $self->{sound_play}->($x, $y, $soundnum, $type); 834 &::audio_sound_play ($face, $dx, $dy, $vol)
835 unless $type & 1; # odd types are silent for future expansion
563} 836}
564 837
565my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
566 839
567sub query { 840sub query {
… …
571 $LAST_QUERY = $prompt; 844 $LAST_QUERY = $prompt;
572 845
573 $self->{query}-> ($self, $flags, $prompt); 846 $self->{query}-> ($self, $flags, $prompt);
574} 847}
575 848
576sub drawinfo { 849sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 850 local $_ = shift;
578 851
579 my @color = ( 852 # we now weed out all tags we do not support
853 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
854 # now all entities
855 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
856
857 # handle some elements
858 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
859 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
860
861 $_
862}
863
864our %NAME_TO_COLOR = (
865 black => 0,
866 white => 1,
867 darkblue => 2,
868 red => 3,
869 orange => 4,
870 lightblue => 5,
871 darkorange => 6,
872 green => 7,
873 darkgreen => 8,
874 grey => 9,
875 brown => 10,
876 yellow => 11,
877 tan => 12,
878);
879
880our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 881 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 882 [1.00, 1.00, 1.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 883 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
583 [1.00, 0.00, 0.00], 884 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 885 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 886 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 887 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 888 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 889 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 890 [0.80, 0.80, 0.80],
590 [0.75, 0.61, 0.20], 891 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 892 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 893 [0.74, 0.65, 0.41],
593 ); 894);
594 895
896sub msg {
897 my ($self, $color, $type, $text, @extra) = @_;
898
899 $text = sanitise_xml $text;
900
901 if (my $cb = $self->{cb_msg}{$type}) {
902 $_->($self, $color, $type, $text, @extra) for values %$cb;
903 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
904 $type =~ s/-/_/g;
905 $self->{$type} = $text;
906 } else {
595 $self->logprint ("info: ", $text); 907 $self->logprint ("msg: ", $text);
908 return if $color < 0; # negative color == ignore if not understood
596 909
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
598 911
599 # try to create single paragraphs of multiple lines sent by the server 912 ## try to create single paragraphs of multiple lines sent by the server
913 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 915
602 $text = CFClient::UI::Label::escape $text; 916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 917 for split /\n/, $text;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 918
606 $self->{logview}->add_paragraph ($color[$color], $_)
607 for map "$time $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609
610 $self->{statusbox}->add ($text, 919 $self->{statusbox}->add ($text,
611 group => $text, 920 group => $text,
612 fg => $color[$color], 921 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 922 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 923 tooltip_font => $::FONT_FIXED,
615 ); 924 );
616} 925 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 926}
623 927
624sub spell_add { 928sub spell_add {
625 my ($self, $spell) = @_; 929 my ($self, $spell) = @_;
626 930
627 # try to create single paragraphs of multiple lines sent by the server 931 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 932 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 933 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 934 $spell->{message} ||= "Server did not provide a description for this spell.";
631 935
632 $::SPELL_PAGE->add_spell ($spell); 936 $::SPELL_LIST->add_spell ($spell);
633 937
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 938 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 939 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 940}
637 941
638sub spell_delete { 942sub spell_delete {
639 my ($self, $spell) = @_; 943 my ($self, $spell) = @_;
640 944
641 $::SPELL_PAGE->remove_spell ($spell); 945 $::SPELL_LIST->remove_spell ($spell);
946}
947
948sub setup {
949 my ($self, $setup) = @_;
950
951 $self->{map_widget}->set_tilesize ($self->{tilesize});
952 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 953}
643 954
644sub addme_success { 955sub addme_success {
645 my ($self) = @_; 956 my ($self) = @_;
646 957
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 958 my %skill_help;
651 959
652 for my $head2 ($pom->head1->[3]->head2) { 960 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 961 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 962 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 963 };
658 964
659 for my $skill (values %{$self->{skill_info}}) { 965 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 966 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 967 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 968 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 969 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 970 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 971 . $skill_help{$skill});
666 } 972 }
667} 973}
668 974
669sub eof { 975sub eof {
670 my ($self) = @_; 976 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
673 979
674 ::stop_game (); 980 ::stop_game ();
675} 981}
676 982
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 983sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 985 return unless $::CONN;
714 986
715 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
988
989 my @add;
716 990
717 my $row; 991 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 992 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 993 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 994 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 995 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 996 CFPlus::Item::update_widgets $_;
723 997
998 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 999 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1000 1, $row, $_->{desc_widget};
726 1001
727 $row++; 1002 $row++;
728 } else { 1003 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1004 push @add, 1, $row, new CFPlus::UI::Button
730 text => "More...", 1005 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1006 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1007 ;
733 last; 1008 last;
734 } 1009 }
735 } 1010 }
736 if ($::CONN->{open_container}) { 1011 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1012 push @add, 1, $row++, new CFPlus::UI::Button
738 text => "Close container", 1013 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1014 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 1015 ;
741 } 1016 }
742 });
743 1017
1018 $::FLOORBOX->add_at (@add);
1019 });
1020
744 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
745} 1022}
746 1023
747sub set_opencont { 1024sub set_opencont {
748 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;
750 update_floorbox; 1027 update_floorbox;
751 1028
752 $::INV_RIGHT_HB->clear (); 1029 $::INV_RIGHT_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1030 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 1031
755 if ($tag != 0) { # Floor isn't closable, is it? 1032 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1033 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
757 text => "Close container", 1034 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 1035 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 1036 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1037 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 1038 if $tag != 0;
… …
769} 1046}
770 1047
771sub update_containers { 1048sub update_containers {
772 my ($self) = @_; 1049 my ($self) = @_;
773 1050
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1051 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 1052 my $todo = delete $self->{update_container}
776 or return; 1053 or return;
777 1054
778 for my $tag (keys %$todo) { 1055 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1056 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 1093sub item_update {
817 my ($self, $item) = @_; 1094 my ($self, $item) = @_;
818 1095
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1096 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 1097
821 CFClient::Item::update_widgets $item; 1098 CFPlus::Item::update_widgets $item;
822 1099
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1100 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 1101 set_opencont ($::CONN, 0, "Floor");
825 1102
826 } elsif ($item->{flags} & F_OPEN) { 1103 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1104 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 1105
829 } else { 1106 } else {
830 $self->{update_container}{$item->{container}}++; 1107 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 1108 $self->update_containers;
832 } 1109 }
833} 1110}
834 1111
835sub player_update { 1112sub player_update {
836 my ($self, $player) = @_; 1113 my ($self, $player) = @_;
1114
1115 $self->update_weight;
1116}
1117
1118sub update_weight {
1119 my ($self) = @_;
1120
1121 my $weight = .001 * $self->{player}{weight};
1122 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1123
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1124 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1125 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1126 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 1127}
839 1128
840sub update_server_info { 1129sub update_server_info {
841 my ($self) = @_; 1130 my ($self) = @_;
842 1131
… …
845 $::SERVER_INFO->set_markup ( 1134 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 1135 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 1136 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1137 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1138 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1139 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1140 . "editing support $yesno[!!$self->{editor_support}]\n"
1141 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1142 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1143 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1144 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 1145 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 1146 );
1147
854} 1148}
855 1149
856sub logged_in { 1150sub logged_in {
857 my ($self) = @_; 1151 my ($self) = @_;
858 1152
859 $self->send_ext_req (cfplus_support => "1", sub { 1153 $self->send_ext_req (cfplus_support => version => 2, sub {
1154 my (%msg) = @_;
1155
860 $self->{cfplus_ext} = $_[0]; 1156 $self->{cfplus_ext} = $msg{version};
861 $self->update_server_info; 1157 $self->update_server_info;
1158
1159 if ($self->{cfplus_ext} >= 2) {
1160 $self->send_ext_req ("editor_support", sub {
1161 $self->{editor_support} = { @_ };
1162 $self->update_server_info;
1163
1164 0
1165 });
1166 }
1167
1168 0
862 }); 1169 });
863 1170
864 $self->update_server_info; 1171 $self->update_server_info;
865 1172
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 1173 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 1174 $self->send_command ("output-count $::CFG->{output_count}");
1175 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
868 $self->send_command ("pickup $::CFG->{pickup}"); 1176 $self->send_command ("pickup $::CFG->{pickup}");
869} 1177}
870 1178
871sub lookat { 1179sub lookat {
872 my ($self, $x, $y) = @_; 1180 my ($self, $x, $y) = @_;
873 1181
874 if ($self->{cfplus_ext}) { 1182 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 1183 $self->send_ext_req (lookat => $x, $y, sub {
876 my %res = split /\x00/, $_[0]; 1184 my (%msg) = @_;
877 1185
878 if (exists $res{npc_dialog}) { 1186 if (exists $msg{npc_dialog}) {
879 # start npc chat dialog 1187 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 1188 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 1189 token => $msg{npc_dialog},
882 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 1190 title => "$msg{npc_dialog}[0] (NPC)",
884 conn => $self, 1191 conn => $self,
885 ; 1192 ;
886 } 1193 }
887 }); 1194 });
888 } 1195 }
… …
891} 1198}
892 1199
893sub destroy { 1200sub destroy {
894 my ($self) = @_; 1201 my ($self) = @_;
895 1202
896 $self->{npc_dialog}->destroy 1203 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 1204 if $self->{npc_dialog};
898 1205
899 $self->SUPER::destroy; 1206 $self->SUPER::destroy;
900}
901 1207
1208 %$self = ();
1209}
1210
902package CFClient::NPCDialog; 1211package CFPlus::NPCDialog;
903 1212
904our @ISA = 'CFClient::UI::FancyFrame'; 1213our @ISA = 'CFPlus::UI::Toplevel';
905 1214
906sub new { 1215sub new {
907 my $class = shift; 1216 my $class = shift;
908 1217
909 my $self = $class->SUPER::new ( 1218 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 1221 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1222 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1223 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1224 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1225 kw => { hi => 0, yes => 0, no => 0 },
1226 has_close_button => 1,
917 @_, 1227 @_,
918 ); 1228 );
919 1229
920 Scalar::Util::weaken (my $this = $self); 1230 CFPlus::weaken (my $this = $self);
1231
1232 $self->connect (delete => sub { $this->destroy; 1 });
921 1233
922 # better use a pane... 1234 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1235 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1236 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 1237
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1238 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1239
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1240 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1241 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1242 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1243 on_activate => sub {
936 my ($entry, $text) = @_; 1244 my ($entry, $text) = @_;
937 1245
938 return unless $text =~ /\S/; 1246 return unless $text =~ /\S/;
939 1247
… …
942 1250
943 0 1251 0
944 }, 1252 },
945 ); 1253 );
946 1254
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1255 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1256
949 $self->{bye_button} = new CFClient::UI::Button 1257 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1258 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1259 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1260 on_activate => sub { $this->destroy; 1 },
953 ; 1261 ;
954 1262
955 $self->update_options; 1263 $self->update_options;
956 1264
957 $self->{token} = $self->{conn}->ext_token; 1265 $self->{id} = "npc-channel-" . $self->{conn}->token;
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1266 $self->{conn}->connect_ext ($self->{id} => sub {
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1267 $this->feed (@_) if $this;
1268 });
1269
1270 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
960 1271
961 $self->{entry}->grab_focus; 1272 $self->{entry}->grab_focus;
962 1273
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1274 $self->{textview}->add_paragraph ({
1275 fg => [1, 1, 0, 1],
1276 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1277 });
964 1278
965 $self->show; 1279 $self->show;
966 $self 1280 $self
967}; 1281};
968 1282
969sub update_options { 1283sub update_options {
970 my ($self) = @_; 1284 my ($self) = @_;
971 1285
972 Scalar::Util::weaken $self; 1286 CFPlus::weaken $self;
973 1287
974 $self->{options}->clear; 1288 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1289 $self->{options}->add ($self->{bye_button});
976 1290
977 for my $kw (sort keys %{ $self->{kw} }) { 1291 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1292 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1293 text => $kw,
980 on_activate => sub { 1294 on_activate => sub {
981 $self->send ($kw); 1295 $self->send ($kw);
982 0 1296 0
983 }, 1297 },
984 ); 1298 );
985 } 1299 }
986} 1300}
987 1301
988sub feed { 1302sub feed {
989 my ($self, $data) = @_; 1303 my ($self, $type, @arg) = @_;
990 1304
991 Scalar::Util::weaken $self; 1305 CFPlus::weaken $self;
992 1306
993 my ($type, $msg) = split / /, $data, 2;
994
995 if ($type eq "msg") { 1307 if ($type eq "update") {
996 my ($msg, @kw) = split /\x00/, $msg; 1308 my (%info) = @arg;
997 1309
998 utf8::decode $_ for ($msg, @kw); 1310 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1311 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
999 1312
1000 $self->{kw}{$_} = 1 for @kw; 1313 if (exists $info{msg}) {
1001 1314 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1315 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1316 my @link;
1005 $msg =~ s{ 1317 $text =~ s{
1006 ($match) 1318 ($match)
1007 }{ 1319 }{
1008 my $kw = $1; 1320 my $kw = $1;
1009 1321
1010 push @link, new CFClient::UI::Label 1322 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1323 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1324 can_hover => 1,
1013 can_events => 1, 1325 can_events => 1,
1014 padding_x => 0, 1326 padding_x => 0,
1015 padding_y => 0, 1327 padding_y => 0,
1016 on_button_up => sub { 1328 on_button_up => sub {
1017 $self->send ($kw); 1329 $self->send ($kw);
1018 }; 1330 };
1019 1331
1020 chr 0xfffc 1332 "\x{fffc}"
1021 }giex; 1333 }giex;
1022 1334
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1335 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1336 $self->{textview}->scroll_to_bottom;
1337 }
1338
1025 $self->update_options; 1339 $self->update_options;
1026 } else { 1340 } else {
1027 $self->destroy; 1341 $self->destroy;
1028 } 1342 }
1029 1343
… …
1031} 1345}
1032 1346
1033sub send { 1347sub send {
1034 my ($self, $msg) = @_; 1348 my ($self, $msg) = @_;
1035 1349
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1038 1352
1039 utf8::encode $msg;
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1353 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1041} 1354}
1042 1355
1043sub destroy { 1356sub destroy {
1044 my ($self) = @_; 1357 my ($self) = @_;
1045 1358
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1360
1361 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1362 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1363 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1364 $self->{conn}->disconnect_ext ($self->{id});
1365 }
1051 1366
1052 $self->SUPER::destroy; 1367 $self->SUPER::destroy;
1053} 1368}
1054 1369
10551; 13701
1371

Diff Legend

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