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

Diff Legend

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