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

Diff Legend

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