ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

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

Diff Legend

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