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

Diff Legend

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