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.62 by elmex, Sat Jul 22 12:18:02 2006 UTC vs.
Revision 1.159 by root, Tue Aug 21 17:54:02 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
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
17 30
18 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
19 32
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 35 or die "unparseable command help: $_->{kw}[0]";
28 36
29 my $cmd = $1; 37 my $cmd = $1;
30 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 39 @args = (".*") unless @args;
32 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
33 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 45 for @args;
35 46
36 my $text = CFClient::pod_to_pango $head2->content; 47 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
40 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->{json_coder}
54 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub {
56 $self->{widget}{$_[0]}
41 } 57 });
42 58
59 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) {
62 $_->destroy
63 for values %{delete $ws->{w} || {}};
64 }
65 });
66
67 $self->{map_widget}->add_command (@$_)
43 \@cmd_help 68 for @cmd_help;
69
70 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 }
75
76 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 }
81
82 $self->{open_container} = 0;
83
84 # per server
85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
86
87 $self
88}
89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
44 }; 174 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c => sub {
190 my ($ws, $id, $class, $args) = @_;
191
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my (%ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298})
299
300# message window
301sub ext_channel_info {
302 my ($info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
63 308
64sub logprint { 309sub logprint {
65 my ($self, @a) = @_; 310 my ($self, @a) = @_;
66 311
67 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 313}
85 314
86sub _stat_numdiff { 315sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
88 317
… …
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 460
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 461 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 470 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 471 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 472 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 473 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 474
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 475 $self->update_weight;
248 476
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 477 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 478 for keys %RES_TBL;
251 479
252 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
254 482
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 484 $sktbl->clear;
257 485
486 my $sw = $self->{skillwid}{""} ||= [
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 487 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 488 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 490 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 491 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 492 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
493 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 494 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
495 ];
264 496
497 my @add = @$sw;
498
499 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
500
501 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
502 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
503
265 my ($x, $y) = (1, 0); 504 my ($x, $y) = (0, 1);
266 for ( 505 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 506 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 507 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 508 grep exists $stats->{$_},
270 @skills 509 @skills
271 ) { 510 ) {
272 my ($idx, $name) = @$_; 511 my ($idx, $name) = @$_;
273 512
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 513 my $spell_cb = sub {
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 514 my ($widget, $ev) = @_;
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 515
516 if ($ev->{button} == 1) {
517 $::CONN->user_send ("ready_skill $name");
518 } elsif ($ev->{button} == 2) {
519 $::CONN->user_send ("use_skill $name");
520 } elsif ($ev->{button} == 3) {
521 my $shortname = CFPlus::shorten $name, 14;
522 (new CFPlus::UI::Menu
523 items => [
524 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
525 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
526 ],
527 )->popup ($ev);
528 } else {
529 return 0;
530 }
531
532 1
533 };
534
535 my $sw = $self->{skillwid}{$idx} ||= [
536 # exp
537 (new CFPlus::UI::Label
538 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
539
540 # level
541 (new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 542 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 543
544 # progress
545 (new CFPlus::UI::ExperienceProgress),
546
547 # label
548 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
549 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
550 ];
551
552 push @add,
553 $x * 4 + 0, $y, $sw->[0],
554 $x * 4 + 1, $y, $sw->[1],
555 $x * 4 + 2, $y, $sw->[2],
556 $x * 4 + 3, $y, $sw->[3],
557 ;
279 558
280 $x++ and ($x, $y) = (0, $y + 1); 559 $x++ and ($x, $y) = (0, $y + 1);
281 } 560 }
561
562 $sktbl->add_at (@add);
282 } 563 }
283 564
284 for (grep exists $stats->{$_}, @skills) { 565 for (grep exists $stats->{$_}, @skills) {
566 my $sw = $self->{skillwid}{$_};
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 567 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 568 $sw->[1]->set_text ($stats->{$_}[0] * 1);
569 $sw->[2]->set_value (@{$stats->{$_}});
570 }
571}
572
573sub macro_send {
574 my ($self, $macro) = @_;
575
576 for my $cmd (@{ $macro->{action} }) {
577 $self->send_command ($cmd);
287 } 578 }
288} 579}
289 580
290sub user_send { 581sub user_send {
291 my ($self, $command) = @_; 582 my ($self, $command) = @_;
292 583
584 $self->{record}->($command)
293 if ($self->{record}) { 585 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 586
297 $self->logprint ("send: ", $command); 587 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 588 $self->send_command ($command);
299 ::status ($command); 589 ::status ($command);
300} 590}
301 591
302sub start_record { 592sub record {
303 my ($self) = @_; 593 my ($self, $cb) = @_;
304 594
305 $self->{record} = []; 595 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 596}
312 597
313sub map_scroll { 598sub map_scroll {
314 my ($self, $dx, $dy) = @_; 599 my ($self, $dx, $dy) = @_;
315 600
… …
317} 602}
318 603
319sub feed_map1a { 604sub feed_map1a {
320 my ($self, $data) = @_; 605 my ($self, $data) = @_;
321 606
322 $self->{map}->map1a_update ($data); 607 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
608 my $delay;
609
610 for my $tile (@$missing) {
611 next if $self->{delay}{$tile};
612
613 $delay = 1;
614
615 if (my $tex = $::CONN->{texture}[$tile]) {
616 $tex->upload;
617 } else {
618 $self->{delay}{$tile} = 1;
619
620 # we assume the face is in-flight and will eventually come
621 push @{$self->{tile_cb}{$tile}}, sub {
622 delete $self->{delay}{$tile};
623 $_[0]->upload;
624 };
625 }
626 }
627
628 if ($delay) {
629 # delay the map drawing a tiny bit in the hope of getting the missing fetched
630 Event->timer (after => 0.03, cb => sub {
631 $_[0]->w->cancel;
632 $self->{map_widget}->update;
633 });
634 } else {
323 $self->{map_widget}->update; 635 $self->{map_widget}->update;
636 }
324} 637}
325 638
326sub magicmap { 639sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 640 my ($self, $w, $h, $x, $y, $data) = @_;
328 641
… …
335 my $map_info = delete $self->{map_info} 648 my $map_info = delete $self->{map_info}
336 or return; 649 or return;
337 650
338 my ($hash, $x, $y, $w, $h) = @$map_info; 651 my ($hash, $x, $y, $w, $h) = @$map_info;
339 652
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 653 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 654 $self->{map_cache_new}{$hash} = \$data;
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 655 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
343} 656}
344 657
345sub map_clear { 658sub map_clear {
346 my ($self) = @_; 659 my ($self) = @_;
347 660
… …
350 663
351 $self->{map}->clear; 664 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 665 delete $self->{map_widget}{magicmap};
353} 666}
354 667
668sub bg_fetch {
669 my ($self) = @_;
670
671 my $tile;
672
673 do {
674 $tile = pop @{$self->{bg_fetch}}
675 or return;
676 } while $self->{texture}[$tile];
677
678 CFPlus::DB::get tilecache => $tile, sub {
679 my ($data) = @_;
680
681 return unless $self->{map}; # stop when destroyed
682
683 if (defined $data) {
684 $self->have_tile ($tile, $data);
685 $self->{texture}[$tile]->upload;
686 }
687
688 $self->bg_fetch;
689 };
690}
355 691
356sub load_map($$$) { 692sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 693 my ($self, $hash, $x, $y) = @_;
358 694
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 695 my $gen = $self->{map_change_gen};
696
697 my $cb = sub {
698 return unless $gen == $self->{map_change_gen};
699
700 my ($data) = @_;
701
702 if (defined $data) {
703 $self->{map_cache_new}{$hash} = \$data;
704
360 $data = Compress::LZF::decompress $data; 705 my $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 706
366 $self->set_texture ($id => $data); 707 my $inprogress = @{ $self->{bg_fetch} || [] };
708 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
709 $self->bg_fetch unless $inprogress;
367 } 710 }
711 };
712
713 if (my $rdata = $self->{map_cache_old}{$hash}) {
714 $cb->($$rdata);
715 } else {
716 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
368 } 717 }
369} 718}
370 719
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 720# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 721# (server resource,s latency, bandwidth), so this hack is warranted.
… …
437 786
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 787 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 788 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 789
441 } else { 790 } else {
791 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 792 $self->send_mapinfo ("spatial $path$tile", sub {
793 return unless $gen == $self->{map_change_gen};
794
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 795 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 796
445 return if $mode ne "spatial"; 797 return if $mode ne "spatial";
446 798
447 $x += $self->{map}->ox; 799 $x += $self->{map}->ox;
… …
461 813
462sub map_change { 814sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 815 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 816
465 $self->flush_map; 817 $self->flush_map;
818
819 ++$self->{map_change_gen};
820 $self->{map_cache_old} = delete $self->{map_cache_new};
466 821
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 822 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 823
469 my $mapmapw = $self->{mapmap}->{w}; 824 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 825 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 842 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 843 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 844}
490 845
491sub face_find { 846sub face_find {
492 my ($self, $facenum, $face) = @_; 847 my ($self, $facenum, $face, $cb) = @_;
493 848
494 my $hash = "$face->{chksum},$face->{name}"; 849 if ($face->{type} == 0) { # FT_FACE
850 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
495 851
496 my $id = $self->{facemap}->get ($hash);
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 852 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 853 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 854
524 my $face = $self->{tilecache}->get ($id); 855 CFPlus::DB::get tilecache => $id, $cb;
525 856
526 if ($face) { 857 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 858 CFPlus::DB::get res_meta => $face->{name}, $cb;
528 $face 859
529 } else { 860 } else { # no metadata
530 my $tex = $self->{noface}; 861 CFPlus::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 862 }
534} 863}
535 864
536sub face_update { 865sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 866 my ($self, $facenum, $face, $changed) = @_;
538 867
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 868 if ($face->{type} == 0) {
869 # image, FT_FACE
870 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
871 if $changed;
540 872
541 $self->set_texture ($face->{id} => delete $face->{image}); 873 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 874
544sub set_texture { 875 } elsif ($face->{type} & 1) {
876 # split metadata case, FT_MUSIC, FT_SOUND
877 if ($changed) { # new data
878 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
879 $face->{data} = $meta;
880
881 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
882 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
883 }
884
885 $face->{data} = $self->{json_coder}->decode ($face->{data});
886
887 ::add_license ($face);
888
889 if ($face->{type} == 3) { # FT_MUSIC
890 ::message ({ markup => "downloaded song #$facenum" })
891 if $changed;
892
893 &::audio_music_push ($facenum);
894 } elsif ($face->{type} == 5) { # FT_SOUND
895 ::message ({ markup => "downloaded sound #$facenum" })
896 if $changed;
897
898 &::audio_sound_push ($facenum);
899 }
900
901 } else {
902 # flat resource case, FT_RSRC
903 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
904 if $changed;
905 }
906
907 if (my $cbs = $self->{face_cb}{$facenum}) {
908 $_->($face, $changed) for @$cbs;
909 }
910}
911
912sub smooth_update {
913 my ($self, $facenum, $face) = @_;
914
915 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
916}
917
918sub have_tile {
545 my ($self, $id, $data) = @_; 919 my ($self, $tile, $data) = @_;
546 920
547 $self->{texture}[$id] ||= do { 921 return unless $self->{map};
548 my $tex = 922
549 new_from_image CFClient::Texture 923 my $tex = $self->{texture}[$tile] ||=
924 new CFPlus::Texture
925 tile => $tile,
926 image => $data, delete_image => 1,
550 $data, minify => 1, mipmap => 1; 927 minify => 1, mipmap => 1;
551 928
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 929 if (my $cbs = delete $self->{tile_cb}{$tile}) {
553 $self->{map_widget}->update; 930 $_->($tex) for @$cbs;
554
555 $tex
556 }; 931 }
932}
933
934# call in non-void context registers a temporary
935# hook with handle, otherwise its permanent
936sub on_face_change {
937 my ($self, $num, $cb) = @_;
938
939 push @{$self->{face_cb}{$num}}, $cb;
940
941 defined wantarray
942 ? CFPlus::guard {
943 @{$self->{face_cb}{$num}}
944 = grep $_ != $cb,
945 @{$self->{face_cb}{$num}};
946 }
947 : ()
948}
949
950# call in non-void context registers a temporary
951# hook with handle, otherwise its permanent
952sub register_face_handler {
953 my ($self, $num, $cb) = @_;
954
955 return unless $num;
956
957 # invoke if available right now
958 $cb->($self->{face}[$num], 0)
959 unless exists $self->{face}[$num]{loading};
960
961 # future changes
962 $self->on_face_change ($num => $cb)
557} 963}
558 964
559sub sound_play { 965sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 966 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 967
562 $self->{sound_play}->($x, $y, $soundnum, $type); 968 &::audio_sound_play ($face, $dx, $dy, $vol)
969 unless $type & 1; # odd types are silent for future expansion
563} 970}
564 971
565my $LAST_QUERY; # server is stupid, stupid, stupid 972my $LAST_QUERY; # server is stupid, stupid, stupid
566 973
567sub query { 974sub query {
… …
571 $LAST_QUERY = $prompt; 978 $LAST_QUERY = $prompt;
572 979
573 $self->{query}-> ($self, $flags, $prompt); 980 $self->{query}-> ($self, $flags, $prompt);
574} 981}
575 982
576sub drawinfo { 983sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 984 local $_ = shift;
578 985
579 my @color = ( 986 # we now weed out all tags we do not support
987 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
988 # now all entities
989 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
990
991 # handle some elements
992 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
993 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
994
995 $_
996}
997
998our %NAME_TO_COLOR = (
999 black => 0,
1000 white => 1,
1001 darkblue => 2,
1002 red => 3,
1003 orange => 4,
1004 lightblue => 5,
1005 darkorange => 6,
1006 green => 7,
1007 darkgreen => 8,
1008 grey => 9,
1009 brown => 10,
1010 yellow => 11,
1011 tan => 12,
1012);
1013
1014our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1015 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 1016 [1.00, 1.00, 1.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1017 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
583 [1.00, 0.00, 0.00], 1018 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1019 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1020 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1021 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1022 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1023 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1024 [0.80, 0.80, 0.80],
590 [0.75, 0.61, 0.20], 1025 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1026 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1027 [0.74, 0.65, 0.41],
593 ); 1028);
594 1029
1030sub msg {
1031 my ($self, $color, $type, $text, @extra) = @_;
1032
1033 $text = sanitise_xml $text;
1034
1035 if (my $cb = $self->{cb_msg}{$type}) {
1036 $_->($self, $color, $type, $text, @extra) for values %$cb;
1037 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1038 $type =~ s/-/_/g;
1039 $self->{$type} = $text;
1040 } else {
595 $self->logprint ("info: ", $text); 1041 $self->logprint ("msg: ", $text);
1042 return if $color < 0; # negative color == ignore if not understood
596 1043
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1044 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1045
599 # try to create single paragraphs of multiple lines sent by the server 1046 ## try to create single paragraphs of multiple lines sent by the server
1047 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1048 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 1049
602 $text = CFClient::UI::Label::escape $text; 1050 ::message ({
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1051 fg => $fg,
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1052 markup => $_,
1053 type => $type,
1054 extra => [@extra],
1055 color_flags => $color
1056 }) for split /\n/, $text;
605 1057
606 $self->{logview}->add_paragraph ($color[$color], $_)
607 for map "$time $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609
610 $self->{statusbox}->add ($text, 1058 $self->{statusbox}->add ($text,
611 group => $text, 1059 group => $text,
612 fg => $color[$color], 1060 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1061 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1062 tooltip_font => $::FONT_FIXED,
615 ); 1063 );
616} 1064 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1065}
623 1066
624sub spell_add { 1067sub spell_add {
625 my ($self, $spell) = @_; 1068 my ($self, $spell) = @_;
626 1069
627 # try to create single paragraphs of multiple lines sent by the server 1070 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1071 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 1072 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 1073 $spell->{message} ||= "Server did not provide a description for this spell.";
631 1074
632 $::SPELL_PAGE->add_spell ($spell); 1075 $::SPELL_LIST->add_spell ($spell);
633 1076
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1077 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1078 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 1079}
637 1080
638sub spell_delete { 1081sub spell_delete {
639 my ($self, $spell) = @_; 1082 my ($self, $spell) = @_;
640 1083
641 $::SPELL_PAGE->remove_spell ($spell); 1084 $::SPELL_LIST->remove_spell ($spell);
1085}
1086
1087sub setup {
1088 my ($self, $setup) = @_;
1089
1090 $self->{map_widget}->set_tilesize ($self->{tilesize});
1091 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 1092}
643 1093
644sub addme_success { 1094sub addme_success {
645 my ($self) = @_; 1095 my ($self) = @_;
646 1096
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 1097 my %skill_help;
651 1098
652 for my $head2 ($pom->head1->[3]->head2) { 1099 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1100 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 1101 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 1102 };
658 1103
659 for my $skill (values %{$self->{skill_info}}) { 1104 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 1105 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1106 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 1107 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 1108 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1109 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 1110 . $skill_help{$skill});
666 } 1111 }
667} 1112}
668 1113
669sub eof { 1114sub eof {
670 my ($self) = @_; 1115 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 1117 $self->{map_widget}->clr_commands;
673 1118
674 ::stop_game (); 1119 ::stop_game ();
675} 1120}
676 1121
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 1122sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1123 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1124 return unless $::CONN;
714 1125
715 $::FLOORBOX->clear; 1126 $::FLOORBOX->clear;
1127
1128 my @add;
716 1129
717 my $row; 1130 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1131 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 1132 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1133 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1134 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1135 CFPlus::Item::update_widgets $_;
723 1136
1137 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1138 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1139 1, $row, $_->{desc_widget};
726 1140
727 $row++; 1141 $row++;
728 } else { 1142 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1143 push @add, 1, $row, new CFPlus::UI::Button
730 text => "More...", 1144 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1145 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1146 ;
733 last; 1147 last;
734 } 1148 }
735 } 1149 }
736 if ($::CONN->{open_container}) { 1150 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1151 push @add, 1, $row++, new CFPlus::UI::Button
738 text => "Close container", 1152 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1153 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 1154 ;
741 } 1155 }
1156
1157 $::FLOORBOX->add_at (@add);
742 }); 1158 });
743 1159
744 $::WANT_REFRESH++; 1160 $::WANT_REFRESH->start;
745} 1161}
746 1162
747sub set_opencont { 1163sub set_opencont {
748 my ($conn, $tag, $name) = @_; 1164 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 1165 $conn->{open_container} = $tag;
750 update_floorbox; 1166 update_floorbox;
751 1167
752 $::INV_RIGHT_HB->clear (); 1168 $::INVR_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1169 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 1170
755 if ($tag != 0) { # Floor isn't closable, is it? 1171 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1172 $::INVR_HB->add (new CFPlus::UI::Button
757 text => "Close container", 1173 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 1174 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 1175 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1176 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 1177 if $tag != 0;
762 #if $CONN->{open_container} != 0;
763 0 1178 0
764 }, 1179 },
765 ); 1180 );
766 } 1181 }
767 1182
… …
769} 1184}
770 1185
771sub update_containers { 1186sub update_containers {
772 my ($self) = @_; 1187 my ($self) = @_;
773 1188
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1189 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 1190 my $todo = delete $self->{update_container}
776 or return; 1191 or return;
777 1192
778 for my $tag (keys %$todo) { 1193 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1194 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 1231sub item_update {
817 my ($self, $item) = @_; 1232 my ($self, $item) = @_;
818 1233
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1234 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 1235
821 CFClient::Item::update_widgets $item; 1236 CFPlus::Item::update_widgets $item;
822 1237
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1238 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 1239 set_opencont ($::CONN, 0, "Floor");
825 1240
826 } elsif ($item->{flags} & F_OPEN) { 1241 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1242 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 1243
829 } else { 1244 } else {
830 $self->{update_container}{$item->{container}}++; 1245 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 1246 $self->update_containers;
832 } 1247 }
833} 1248}
834 1249
835sub player_update { 1250sub player_update {
836 my ($self, $player) = @_; 1251 my ($self, $player) = @_;
1252
1253 $self->update_weight;
1254}
1255
1256sub update_weight {
1257 my ($self) = @_;
1258
1259 my $weight = .001 * $self->{player}{weight};
1260 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1261
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1262 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1263 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1264 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 1265}
839 1266
840sub update_server_info { 1267sub update_server_info {
841 my ($self) = @_; 1268 my ($self) = @_;
842 1269
… …
845 $::SERVER_INFO->set_markup ( 1272 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 1273 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 1274 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1275 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1276 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1277 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1278 . "editing support $yesno[!!$self->{editor_support}]\n"
1279 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1280 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1281 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1282 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 1283 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 1284 );
1285
854} 1286}
855 1287
856sub logged_in { 1288sub logged_in {
857 my ($self) = @_; 1289 my ($self) = @_;
858 1290
859 $self->send_ext_req (cfplus_support => "1", sub { 1291 $self->send_ext_req (cfplus_support => version => 2, sub {
1292 my (%msg) = @_;
1293
860 $self->{cfplus_ext} = $_[0]; 1294 $self->{cfplus_ext} = $msg{version};
861 $self->update_server_info; 1295 $self->update_server_info;
1296
1297 if ($self->{cfplus_ext} >= 2) {
1298 $self->send_ext_req ("editor_support", sub {
1299 $self->{editor_support} = { @_ };
1300 $self->update_server_info;
1301
1302 0
1303 });
1304 }
1305
1306 0
862 }); 1307 });
863 1308
864 $self->update_server_info; 1309 $self->update_server_info;
865 1310
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 1311 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 1312 $self->send_command ("output-count $::CFG->{output_count}");
1313 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
868 $self->send_command ("pickup $::CFG->{pickup}"); 1314 $self->send_command ("pickup $::CFG->{pickup}");
869} 1315}
870 1316
871sub lookat { 1317sub lookat {
872 my ($self, $x, $y) = @_; 1318 my ($self, $x, $y) = @_;
873 1319
874 if ($self->{cfplus_ext}) { 1320 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 1321 $self->send_ext_req (lookat => $x, $y, sub {
876 my %res = split /\x00/, $_[0]; 1322 my (%msg) = @_;
877 1323
878 if (exists $res{npc_dialog}) { 1324 if (exists $msg{npc_dialog}) {
879 # start npc chat dialog 1325 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 1326 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 1327 token => $msg{npc_dialog},
882 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 1328 title => "$msg{npc_dialog}[0] (NPC)",
884 conn => $self, 1329 conn => $self,
885 ; 1330 ;
886 } 1331 }
887 }); 1332 });
888 } 1333 }
… …
891} 1336}
892 1337
893sub destroy { 1338sub destroy {
894 my ($self) = @_; 1339 my ($self) = @_;
895 1340
896 $self->{npc_dialog}->destroy 1341 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 1342 if $self->{npc_dialog};
898 1343
899 $self->SUPER::destroy; 1344 $self->SUPER::destroy;
900}
901 1345
1346 %$self = ();
1347}
1348
902package CFClient::NPCDialog; 1349package CFPlus::NPCDialog;
903 1350
904our @ISA = 'CFClient::UI::FancyFrame'; 1351our @ISA = 'CFPlus::UI::Toplevel';
905 1352
906sub new { 1353sub new {
907 my $class = shift; 1354 my $class = shift;
908 1355
909 my $self = $class->SUPER::new ( 1356 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 1359 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1360 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1361 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1362 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1363 kw => { hi => 0, yes => 0, no => 0 },
1364 has_close_button => 1,
917 @_, 1365 @_,
918 ); 1366 );
919 1367
920 Scalar::Util::weaken (my $this = $self); 1368 CFPlus::weaken (my $this = $self);
1369
1370 $self->connect (delete => sub { $this->destroy; 1 });
921 1371
922 # better use a pane... 1372 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1373 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1374 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 1375
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1376 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1377
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1378 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1379 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1380 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1381 on_activate => sub {
936 my ($entry, $text) = @_; 1382 my ($entry, $text) = @_;
937 1383
938 return unless $text =~ /\S/; 1384 return unless $text =~ /\S/;
939 1385
… …
942 1388
943 0 1389 0
944 }, 1390 },
945 ); 1391 );
946 1392
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1393 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1394
949 $self->{bye_button} = new CFClient::UI::Button 1395 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1396 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1397 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1398 on_activate => sub { $this->destroy; 1 },
953 ; 1399 ;
954 1400
955 $self->update_options; 1401 $self->update_options;
956 1402
957 $self->{token} = $self->{conn}->ext_token; 1403 $self->{id} = "npc-channel-" . $self->{conn}->token;
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1404 $self->{conn}->connect_ext ($self->{id} => sub {
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1405 $this->feed (@_) if $this;
1406 });
1407
1408 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
960 1409
961 $self->{entry}->grab_focus; 1410 $self->{entry}->grab_focus;
962 1411
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1412 $self->{textview}->add_paragraph ({
1413 fg => [1, 1, 0, 1],
1414 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1415 });
964 1416
965 $self->show; 1417 $self->show;
966 $self 1418 $self
967}; 1419};
968 1420
969sub update_options { 1421sub update_options {
970 my ($self) = @_; 1422 my ($self) = @_;
971 1423
972 Scalar::Util::weaken $self; 1424 CFPlus::weaken $self;
973 1425
974 $self->{options}->clear; 1426 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1427 $self->{options}->add ($self->{bye_button});
976 1428
977 for my $kw (sort keys %{ $self->{kw} }) { 1429 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1430 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1431 text => $kw,
980 on_activate => sub { 1432 on_activate => sub {
981 $self->send ($kw); 1433 $self->send ($kw);
982 0 1434 0
983 }, 1435 },
984 ); 1436 );
985 } 1437 }
986} 1438}
987 1439
988sub feed { 1440sub feed {
989 my ($self, $data) = @_; 1441 my ($self, $type, @arg) = @_;
990 1442
991 Scalar::Util::weaken $self; 1443 CFPlus::weaken $self;
992 1444
993 my ($type, $msg) = split / /, $data, 2;
994
995 if ($type eq "msg") { 1445 if ($type eq "update") {
996 my ($msg, @kw) = split /\x00/, $msg; 1446 my (%info) = @arg;
997 1447
998 utf8::decode $_ for ($msg, @kw); 1448 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1449 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
999 1450
1000 $self->{kw}{$_} = 1 for @kw; 1451 if (exists $info{msg}) {
1001 1452 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1453 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1454 my @link;
1005 $msg =~ s{ 1455 $text =~ s{
1006 ($match) 1456 ($match)
1007 }{ 1457 }{
1008 my $kw = $1; 1458 my $kw = $1;
1009 1459
1010 push @link, new CFClient::UI::Label 1460 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1461 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1462 can_hover => 1,
1013 can_events => 1, 1463 can_events => 1,
1014 padding_x => 0, 1464 padding_x => 0,
1015 padding_y => 0, 1465 padding_y => 0,
1016 on_button_up => sub { 1466 on_button_up => sub {
1017 $self->send ($kw); 1467 $self->send ($kw);
1018 }; 1468 };
1019 1469
1020 chr 0xfffc 1470 "\x{fffc}"
1021 }giex; 1471 }giex;
1022 1472
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1473 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1474 $self->{textview}->scroll_to_bottom;
1475 }
1476
1025 $self->update_options; 1477 $self->update_options;
1026 } else { 1478 } else {
1027 $self->destroy; 1479 $self->destroy;
1028 } 1480 }
1029 1481
… …
1031} 1483}
1032 1484
1033sub send { 1485sub send {
1034 my ($self, $msg) = @_; 1486 my ($self, $msg) = @_;
1035 1487
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1488 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1489 $self->{textview}->scroll_to_bottom;
1038 1490
1039 utf8::encode $msg;
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1491 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1041} 1492}
1042 1493
1043sub destroy { 1494sub destroy {
1044 my ($self) = @_; 1495 my ($self) = @_;
1045 1496
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1497 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1498
1499 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1500 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1501 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1502 $self->{conn}->disconnect_ext ($self->{id});
1503 }
1051 1504
1052 $self->SUPER::destroy; 1505 $self->SUPER::destroy;
1053} 1506}
1054 1507
10551; 15081
1509

Diff Legend

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