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

Diff Legend

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