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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 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, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
90 241
91 my $diff = $new - $old; 242 my $diff = $new - $old;
92 $diff > 0 ? "+$diff" : $diff 243
244 $diff = 0.01 * int $diff * 100;
245
246 0.1 >= abs $diff ? ()
247 : $diff < 0 ? "$name$diff" : "$name+$diff"
93} 248}
94 249
95sub _stat_skillmaskdiff { 250sub _stat_skillmaskdiff {
96 my ($self, $old, $new) = @_; 251 my ($self, $name, $old, $new) = @_;
97 252
98 my $diff = $old ^ $new; 253 my $diff = $old ^ $new
254 or return;
99 255
100 my @diff = map 256 my @diff = map
101 { 257 {
102 $diff & $_ 258 $diff & $_
103 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 259 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
… …
150); 306);
151 307
152sub stats_update { 308sub stats_update {
153 my ($self, $stats) = @_; 309 my ($self, $stats) = @_;
154 310
155 if (my $prev = $self->{prev_stats}) { 311 my $prev = $self->{prev_stats} || { };
156 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;
157 $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);
324 }
325
326 if (
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),
158 } 418 ;
159 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);
160 if ( 426 for (
161 my @diffs = map { 427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
162 $stats->{$_->[0]} != $prev->{$_->[0]} 428 map [$_, $self->{skill_info}{$_}],
163 ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : (); 429 grep exists $stats->{$_},
164 } 430 @skills
165 @statchange
166 ) { 431 ) {
167 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 432 my ($idx, $name) = @$_;
168 $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
169 } 454 };
170 }
171 455
172 $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 ;
173 464
174 ::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 }
175} 483}
176 484
177sub user_send { 485sub user_send {
178 my ($self, $command) = @_; 486 my ($self, $command) = @_;
179 487
488 $self->{record}->($command)
180 if ($self->{record}) { 489 if $self->{record};
181 push @{$self->{record}}, $command;
182 }
183 490
184 $self->logprint ("send: ", $command); 491 $self->logprint ("send: ", $command);
185 $self->send_command ($command); 492 $self->send_command ($command);
186 ::status ($command); 493 ::status ($command);
187} 494}
188 495
189sub start_record { 496sub record {
190 my ($self) = @_; 497 my ($self, $cb) = @_;
191 498
192 $self->{record} = []; 499 $self->{record} = $cb;
193}
194
195sub stop_record {
196 my ($self) = @_;
197 return delete $self->{record};
198} 500}
199 501
200sub map_scroll { 502sub map_scroll {
201 my ($self, $dx, $dy) = @_; 503 my ($self, $dx, $dy) = @_;
202 504
… …
204} 506}
205 507
206sub feed_map1a { 508sub feed_map1a {
207 my ($self, $data) = @_; 509 my ($self, $data) = @_;
208 510
209 $self->{map}->map1a_update ($data); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
210 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
211} 541}
212 542
213sub magicmap { 543sub magicmap {
214 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
215 545
… …
222 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
223 or return; 553 or return;
224 554
225 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
226 556
227 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
228 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 558 $self->{map_cache_new}{$hash} = \$data;
229 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
230} 560}
231 561
232sub map_clear { 562sub map_clear {
233 my ($self) = @_; 563 my ($self) = @_;
234 564
… …
237 567
238 $self->{map}->clear; 568 $self->{map}->clear;
239 delete $self->{map_widget}{magicmap}; 569 delete $self->{map_widget}{magicmap};
240} 570}
241 571
572sub bg_fetch {
573 my ($self) = @_;
574
575 my $id;
576
577 do {
578 $id = pop @{$self->{bg_fetch}}
579 or return;
580 } while $self->{texture}[$id];
581
582 CFPlus::DB::exists tilecache => $id, sub {
583 my ($exists) = @_;
584
585 return unless $self->{map}; # stop when destroyed
586
587 if ($exists) {
588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
591
592 $self->bg_fetch;
593 };
594}
242 595
243sub load_map($$$) { 596sub load_map($$$) {
244 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
245 598
246 if (defined (my $data = $self->{mapcache}->get ($hash))) { 599 my $gen = $self->{map_change_gen};
600
601 my $cb = sub {
602 return unless $gen == $self->{map_change_gen};
603
604 my ($data) = @_;
605
606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
247 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
248 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
249 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
250 my $data = $self->{tilecache}->get ($id)
251 or next;
252 610
253 $self->set_texture ($id => $data); 611 my $inprogress = @{ $self->{bg_fetch} || [] };
612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
613 $self->bg_fetch unless $inprogress;
254 } 614 }
615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
255 } 621 }
256} 622}
257 623
258# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
259# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
… …
324 690
325 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 691 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
326 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 692 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
327 693
328 } else { 694 } else {
695 my $gen = $self->{map_change_gen};
329 $self->send_mapinfo ("spatial $path$tile", sub { 696 $self->send_mapinfo ("spatial $path$tile", sub {
697 return unless $gen == $self->{map_change_gen};
698
330 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 699 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
331 700
332 return if $mode ne "spatial"; 701 return if $mode ne "spatial";
333 702
334 $x += $self->{map}->ox; 703 $x += $self->{map}->ox;
… …
348 717
349sub map_change { 718sub map_change {
350 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
351 720
352 $self->flush_map; 721 $self->flush_map;
722
723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
353 725
354 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
355 727
356 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
357 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
374 $self->load_map ($hash, $x, $y); 746 $self->load_map ($hash, $x, $y);
375 $self->flood_fill (0, 0, 0, "", $hash, $flags); 747 $self->flood_fill (0, 0, 0, "", $hash, $flags);
376} 748}
377 749
378sub face_find { 750sub face_find {
751 my ($self, $facenum, $face, $cb) = @_;
752
753 if ($face->{type} == 0) { # FT_FACE
754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
755
756 $face->{id} = $id;
757 $self->{faceid}[$facenum] = $id;
758
759 $self->{map}->set_tileid ($facenum => $id);
760
761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
766}
767
768sub face_update {
769 my ($self, $facenum, $face, $changed) = @_;
770
771 if ($face->{type} == 0) { # FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed;
774
775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
807}
808
809sub smooth_update {
379 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
380 811
381 my $hash = "$face->{chksum},$face->{name}"; 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
382
383 my $id = $self->{facemap}->get ($hash);
384
385 unless ($id) {
386 # create new id for face
387 # I love transactions
388 for (1..100) {
389 my $txn = $CFClient::DB_ENV->txn_begin;
390 my $status = $self->{facemap}->db_get (id => $id);
391 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392 $id = ($id || 64) + 1;
393 if ($self->{facemap}->put (id => $id) == 0
394 && $self->{facemap}->put ($hash => $id) == 0) {
395 $txn->txn_commit;
396
397 goto gotid;
398 }
399 }
400 $txn->txn_abort;
401 }
402
403 CFClient::fatal "maximum number of transaction retries reached - database problems?";
404 }
405
406gotid:
407 $face->{id} = $id;
408 $self->{map}->set_face ($facenum => $id);
409 $self->{faceid}[$facenum] = $id;#d#
410
411 my $face = $self->{tilecache}->get ($id);
412
413 if ($face) {
414 #$self->face_prefetch;
415 $face
416 } else {
417 my $tex = $self->{noface};
418 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
419 undef
420 };
421} 813}
422 814
815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
423sub face_update { 827sub connect_face_update {
424 my ($self, $facenum, $face) = @_;
425
426 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
427
428 $self->set_texture ($face->{id} => delete $face->{image});
429}
430
431sub set_texture {
432 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
433 829
434 $self->{texture}[$id] ||= do { 830 push @{$self->{face_cb}{$id}}, $cb;
435 my $tex =
436 new_from_image CFClient::Texture
437 $data, minify => 1, mipmap => 1;
438 831
439 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
440 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
441 834 = grep $_ != $cb,
442 $tex 835 @{$self->{face_cb}{$id}};
443 }; 836 }
444} 837}
445 838
446sub sound_play { 839sub sound_play {
447 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
448 841
449 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
450} 844}
451 845
452my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
453 847
454sub query { 848sub query {
… …
458 $LAST_QUERY = $prompt; 852 $LAST_QUERY = $prompt;
459 853
460 $self->{query}-> ($self, $flags, $prompt); 854 $self->{query}-> ($self, $flags, $prompt);
461} 855}
462 856
463sub drawinfo { 857sub sanitise_xml($) {
464 my ($self, $color, $text) = @_; 858 local $_ = shift;
465 859
466 my @color = ( 860 # we now weed out all tags we do not support
861 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
862 # now all entities
863 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
864
865 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
867 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
868
869 $_
870}
871
872our %NAME_TO_COLOR = (
873 black => 0,
874 white => 1,
875 darkblue => 2,
876 red => 3,
877 orange => 4,
878 lightblue => 5,
879 darkorange => 6,
880 green => 7,
881 darkgreen => 8,
882 grey => 9,
883 brown => 10,
884 yellow => 11,
885 tan => 12,
886);
887
888our @CF_COLOR = (
467 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 889 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
468 [1.00, 1.00, 1.00], 890 [1.00, 1.00, 1.00],
469 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 891 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
470 [1.00, 0.00, 0.00], 892 [1.00, 0.00, 0.00],
471 [1.00, 0.54, 0.00], 893 [1.00, 0.54, 0.00],
472 [0.11, 0.56, 1.00], 894 [0.11, 0.56, 1.00],
473 [0.93, 0.46, 0.00], 895 [0.93, 0.46, 0.00],
474 [0.18, 0.54, 0.34], 896 [0.18, 0.54, 0.34],
475 [0.56, 0.73, 0.56], 897 [0.56, 0.73, 0.56],
476 [0.80, 0.80, 0.80], 898 [0.80, 0.80, 0.80],
477 [0.55, 0.41, 0.13], 899 [0.75, 0.61, 0.20],
478 [0.99, 0.77, 0.26], 900 [0.99, 0.77, 0.26],
479 [0.74, 0.65, 0.41], 901 [0.74, 0.65, 0.41],
480 ); 902);
481 903
904sub msg {
905 my ($self, $color, $type, $text, @extra) = @_;
906
907 $text = sanitise_xml $text;
908
909 if (my $cb = $self->{cb_msg}{$type}) {
910 $_->($self, $color, $type, $text, @extra) for values %$cb;
911 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
912 $type =~ s/-/_/g;
913 $self->{$type} = $text;
914 } else {
482 $self->logprint ("info: ", $text); 915 $self->logprint ("msg: ", $text);
916 return if $color < 0; # negative color == ignore if not understood
483 917
484 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
485 919
486 # try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
921 # no longer neecssary with TRT servers
487 $text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
488 923
489 $text = CFClient::UI::Label::escape $text; 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
490 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 925 for split /\n/, $text;
491 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
492 926
493 $self->{logview}->add_paragraph ($color[$color], $_)
494 for map "$time $_", split /\n/, $text;
495 $self->{logview}->scroll_to_bottom;
496
497 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
498 group => $text, 928 group => $text,
499 fg => $color[$color], 929 fg => $fg,
500 timeout => $color >= 2 ? 60 : 10, 930 timeout => $color >= 2 ? 180 : 10,
501 tooltip_font => $::FONT_FIXED, 931 tooltip_font => $::FONT_FIXED,
502 ); 932 );
503} 933 }
504
505sub drawextinfo {
506 my ($self, $color, $type, $subtype, $message) = @_;
507
508 $self->drawinfo ($color, $message);
509} 934}
510 935
511sub spell_add { 936sub spell_add {
512 my ($self, $spell) = @_; 937 my ($self, $spell) = @_;
513 938
514 # try to create single paragraphs of multiple lines sent by the server 939 # try to create single paragraphs out of the multiple lines sent by the server
515 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 940 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516 $spell->{message} =~ s/\n+$//; 941 $spell->{message} =~ s/\n+$//;
517 $spell->{message} ||= "Server did not provide a description for this spell."; 942 $spell->{message} ||= "Server did not provide a description for this spell.";
518 943
519 $::SPELL_PAGE->add_spell ($spell); 944 $::SPELL_LIST->add_spell ($spell);
520 945
521 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 946 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 947 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523} 948}
524 949
525sub spell_delete { 950sub spell_delete {
526 my ($self, $spell) = @_; 951 my ($self, $spell) = @_;
527 952
528 $::SPELL_PAGE->remove_spell ($spell); 953 $::SPELL_LIST->remove_spell ($spell);
954}
955
956sub setup {
957 my ($self, $setup) = @_;
958
959 $self->{map_widget}->set_tilesize ($self->{tilesize});
960 $::MAP->resize ($self->{mapw}, $self->{maph});
529} 961}
530 962
531sub addme_success { 963sub addme_success {
532 my ($self) = @_; 964 my ($self) = @_;
533 965
534 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535 my ($pom) = @_;
536
537 my %skill_help; 966 my %skill_help;
538 967
539 for my $head2 ($pom->head1->[3]->head2) { 968 for my $node (CFPlus::Pod::find skill_description => "*") {
540 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 969 my (undef, @par) = CFPlus::Pod::section_of $node;
541 } 970 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543 \%skill_help
544 }; 971 };
545 972
546 for my $skill (values %{$self->{skill_info}}) { 973 for my $skill (values %{$self->{skill_info}}) {
547 $self->{map_widget}->add_command ("ready_skill $skill", 974 $self->{map_widget}->add_command ("ready_skill $skill",
548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 975 (CFPlus::asxml "Ready the skill '$skill'\n\n")
549 . $skill_help->{$skill}); 976 . $skill_help{$skill});
550 $self->{map_widget}->add_command ("use_skill $skill", 977 $self->{map_widget}->add_command ("use_skill $skill",
551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 978 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552 . $skill_help->{$skill}); 979 . $skill_help{$skill});
553 } 980 }
554} 981}
555 982
556sub eof { 983sub eof {
557 my ($self) = @_; 984 my ($self) = @_;
… …
559 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
560 987
561 ::stop_game (); 988 ::stop_game ();
562} 989}
563 990
564sub image_info {
565 my ($self, $numfaces) = @_;
566
567 $self->{num_faces} = $numfaces;
568 $self->{face_prefetch} = [1 .. $numfaces];
569 $self->face_prefetch;
570}
571
572sub face_prefetch {
573 my ($self) = @_;
574
575 return unless $::CFG->{face_prefetch};
576
577 if ($self->{num_faces}) {
578 return if @{ $self->{send_queue} || [] };
579 my $todo = @{ $self->{face_prefetch} }
580 or return;
581
582 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583
584 $self->send ("requestinfo image_sums $face $face");
585
586 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
587 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588 } elsif (!exists $self->{num_faces}) {
589 $self->send ("requestinfo image_info");
590
591 $self->{num_faces} = 0;
592
593 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
594 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595 }
596}
597
598sub update_floorbox { 991sub update_floorbox {
599 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600 return unless $::CONN; 993 return unless $::CONN;
601 994
602 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
603 996
997 my @add;
998
604 my $row; 999 my $row;
605 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606 if ($row < 6) { 1001 if ($row < 6) {
607 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
608 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
609 CFClient::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
610 1005
1006 push @add,
611 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
612 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
613 1009
614 $row++; 1010 $row++;
615 } else { 1011 } else {
616 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
617 text => "More...", 1013 text => "More...",
618 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619 ); 1015 ;
620 last; 1016 last;
621 } 1017 }
622 } 1018 }
1019 if ($::CONN->{open_container}) {
1020 push @add, 1, $row++, new CFPlus::UI::Button
1021 text => "Close container",
1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1023 ;
1024 }
1025
1026 $::FLOORBOX->add_at (@add);
623 }); 1027 });
624 1028
625 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
626} 1030}
627 1031
628sub set_opencont { 1032sub set_opencont {
629 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
630 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
1035 update_floorbox;
631 1036
632 $::INV_RIGHT_HB->clear (); 1037 $::INV_RIGHT_HB->clear ();
633 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1038 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634 1039
635 if ($tag != 0) { # Floor isn't closable, is it? 1040 if ($tag != 0) { # Floor isn't closable, is it?
636 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1041 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
637 text => "Close container", 1042 text => "Close container",
638 tooltip => "Close the currently open container (if one is open)", 1043 tooltip => "Close the currently open container (if one is open)",
639 on_activate => sub { 1044 on_activate => sub {
640 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1045 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
641 if $tag != 0; 1046 if $tag != 0;
… …
649} 1054}
650 1055
651sub update_containers { 1056sub update_containers {
652 my ($self) = @_; 1057 my ($self) = @_;
653 1058
654 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1059 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655 for my $tag (keys %{ delete $self->{update_container} }) { 1060 my $todo = delete $self->{update_container}
1061 or return;
1062
1063 for my $tag (keys %$todo) {
1064 update_floorbox if $tag == 0 or $tag == $self->{open_container};
656 if ($tag == 0) { 1065 if ($tag == 0) {
657 update_floorbox;
658 $::INVR->set_items ($self->{container}{0}) 1066 $::INVR->set_items ($self->{container}{0})
659 if $tag == $self->{open_container}; 1067 if $tag == $self->{open_container};
660 } elsif ($tag == $self->{player}{tag}) { 1068 } elsif ($tag == $self->{player}{tag}) {
661 $::INV->set_items ($self->{container}{$tag}) 1069 $::INV->set_items ($self->{container}{$tag})
662 } else { 1070 } else {
… …
693sub item_update { 1101sub item_update {
694 my ($self, $item) = @_; 1102 my ($self, $item) = @_;
695 1103
696 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1104 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697 1105
698 CFClient::Item::update_widgets $item; 1106 CFPlus::Item::update_widgets $item;
699 1107
700 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1108 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701 set_opencont ($::CONN, 0, "Floor"); 1109 set_opencont ($::CONN, 0, "Floor");
702 1110
703 } elsif ($item->{flags} & F_OPEN) { 1111 } elsif ($item->{flags} & F_OPEN) {
704 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1112 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705 1113
706 } else { 1114 } else {
707 $self->{update_container}{$item->{container}}++; 1115 $self->{update_container}{$item->{container}}++;
708 $self->update_containers; 1116 $self->update_containers;
709# if ($item->{container} == 0) {
710# update_floorbox;
711# update_container (0);
712# } elsif ($item->{container} == $self->{player}{tag}) {
713# $::INV->set_items ($self->{container}{$item->{container}})
714# }
715 } 1117 }
716} 1118}
717 1119
718sub player_update { 1120sub player_update {
719 my ($self, $player) = @_; 1121 my ($self, $player) = @_;
1122
1123 $self->update_weight;
1124}
1125
1126sub update_weight {
1127 my ($self) = @_;
1128
1129 my $weight = .001 * $self->{player}{weight};
1130 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1131
720 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1132 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1133 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1134 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721} 1135}
722 1136
723sub update_server_info { 1137sub update_server_info {
724 my ($self) = @_; 1138 my ($self) = @_;
725 1139
… …
728 $::SERVER_INFO->set_markup ( 1142 $::SERVER_INFO->set_markup (
729 "server <tt>$self->{host}:$self->{port}</tt>\n" 1143 "server <tt>$self->{host}:$self->{port}</tt>\n"
730 . "protocol version <tt>$self->{version}</tt>\n" 1144 . "protocol version <tt>$self->{version}</tt>\n"
731 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1145 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
732 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1146 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1147 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1148 . "editing support $yesno[!!$self->{editor_support}]\n"
1149 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1150 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
733 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
734 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
735 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
736 ); 1154 );
1155
737} 1156}
738 1157
739sub logged_in { 1158sub logged_in {
740 my ($self) = @_; 1159 my ($self) = @_;
741 1160
742 $self->send_ext_req (cfplus_support => "1", sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
743 $self->{cfplus_ext} = $_[0]; 1164 $self->{cfplus_ext} = $msg{version};
744 $self->update_server_info; 1165 $self->update_server_info;
1166
1167 if ($self->{cfplus_ext} >= 2) {
1168 $self->send_ext_req ("editor_support", sub {
1169 $self->{editor_support} = { @_ };
1170 $self->update_server_info;
1171
1172 0
1173 });
1174 }
1175
1176 0
745 }); 1177 });
746 1178
747 $self->update_server_info; 1179 $self->update_server_info;
748 1180
749 $self->send_command ("output-sync $::CFG->{output_sync}"); 1181 $self->send_command ("output-sync $::CFG->{output_sync}");
750 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
751 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
752} 1185}
753 1186
754sub lookat { 1187sub lookat {
755 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
756 1189
757 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
758 $self->send_ext_req (lookat => "$x $y", sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
759 my %res = split /\x00/, $_[0]; 1192 my (%msg) = @_;
760 1193
761 if (exists $res{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
762 # start npc chat dialog 1195 # start npc chat dialog
763 $self->{npc_dialog} = new CFClient::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
764 dx => $x, 1197 token => $msg{npc_dialog},
765 dy => $y,
766 title => "$res{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
767 conn => $self, 1199 conn => $self,
768 ; 1200 ;
769 } 1201 }
770 }); 1202 });
771 } 1203 }
… …
774} 1206}
775 1207
776sub destroy { 1208sub destroy {
777 my ($self) = @_; 1209 my ($self) = @_;
778 1210
779 $self->{npc_dialog}->destroy 1211 (delete $self->{npc_dialog})->destroy
780 if $self->{npc_dialog}; 1212 if $self->{npc_dialog};
781 1213
782 $self->SUPER::destroy; 1214 $self->SUPER::destroy;
783}
784 1215
1216 %$self = ();
1217}
1218
785package CFClient::NPCDialog; 1219package CFPlus::NPCDialog;
786 1220
787our @ISA = 'CFClient::UI::FancyFrame'; 1221our @ISA = 'CFPlus::UI::Toplevel';
788 1222
789sub new { 1223sub new {
790 my $class = shift; 1224 my $class = shift;
791 1225
792 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
… …
795 name => "npc_dialog", 1229 name => "npc_dialog",
796 force_w => $::WIDTH * 0.7, 1230 force_w => $::WIDTH * 0.7,
797 force_h => $::HEIGHT * 0.7, 1231 force_h => $::HEIGHT * 0.7,
798 title => "NPC Dialog", 1232 title => "NPC Dialog",
799 kw => { hi => 0, yes => 0, no => 0 }, 1233 kw => { hi => 0, yes => 0, no => 0 },
1234 has_close_button => 1,
800 @_, 1235 @_,
801 ); 1236 );
802 1237
803 Scalar::Util::weaken (my $this = $self); 1238 CFPlus::weaken (my $this = $self);
1239
1240 $self->connect (delete => sub { $this->destroy; 1 });
804 1241
805 # better use a pane... 1242 # better use a pane...
806 $self->add (my $hbox = new CFClient::UI::HBox); 1243 $self->add (my $hbox = new CFPlus::UI::HBox);
807 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1244 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808 1245
809 $hbox->add (my $vbox = new CFClient::UI::VBox); 1246 $hbox->add (my $vbox = new CFPlus::UI::VBox);
810 1247
811 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1248 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1249 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
813 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1250 tooltip => "#npc_message_entry",
814 . "Sometimes you have to tell an NPC something you cannot find out during "
815 . "a normal conversation (such as a password). In those cases you have to use "
816 . "this text entry. You can also enter responses manually instead of using the response "
817 . "buttons below.",
818 on_activate => sub { 1251 on_activate => sub {
819 my ($entry, $text) = @_; 1252 my ($entry, $text) = @_;
820 1253
821 return unless $text =~ /\S/; 1254 return unless $text =~ /\S/;
822 1255
… …
825 1258
826 0 1259 0
827 }, 1260 },
828 ); 1261 );
829 1262
830 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1263 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
831 1264
832 $self->{bye_button} = new CFClient::UI::Button 1265 $self->{bye_button} = new CFPlus::UI::Button
833 text => "Bye (close)", 1266 text => "Bye (close)",
834 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1267 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835 on_activate => sub { $this->destroy; 0 }, 1268 on_activate => sub { $this->destroy; 1 },
836 ; 1269 ;
837 1270
838 $self->update_options; 1271 $self->update_options;
839 1272
840 $self->{token} = $self->{conn}->ext_token; 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
841 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1274 $self->{conn}->connect_ext ($self->{id} => sub {
842 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1275 $this->feed (@_) if $this;
1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
843 1279
844 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
845 1281
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1282 $self->{textview}->add_paragraph ({
1283 fg => [1, 1, 0, 1],
1284 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1285 });
847 1286
848 $self->show; 1287 $self->show;
849 $self 1288 $self
850}; 1289};
851 1290
852sub update_options { 1291sub update_options {
853 my ($self) = @_; 1292 my ($self) = @_;
854 1293
855 Scalar::Util::weaken $self; 1294 CFPlus::weaken $self;
856 1295
857 $self->{options}->clear; 1296 $self->{options}->clear;
858 $self->{options}->add ($self->{bye_button}); 1297 $self->{options}->add ($self->{bye_button});
859 1298
860 for my $kw (sort keys %{ $self->{kw} }) { 1299 for my $kw (sort keys %{ $self->{kw} }) {
861 $self->{options}->add (new CFClient::UI::Button 1300 $self->{options}->add (new CFPlus::UI::Button
862 text => $kw, 1301 text => $kw,
863 on_activate => sub { 1302 on_activate => sub {
864 $self->send ($kw); 1303 $self->send ($kw);
865 0 1304 0
866 }, 1305 },
867 ); 1306 );
868 } 1307 }
869} 1308}
870 1309
871sub feed { 1310sub feed {
872 my ($self, $data) = @_; 1311 my ($self, $type, @arg) = @_;
873 1312
874 Scalar::Util::weaken $self; 1313 CFPlus::weaken $self;
875 1314
876 my ($type, $msg) = split / /, $data, 2;
877
878 if ($type eq "msg") { 1315 if ($type eq "update") {
879 my ($msg, @kw) = split /\x00/, $msg; 1316 my (%info) = @arg;
880 $self->{kw}{$_} = 1 for @kw;
881 1317
882 $msg = "\n" . CFClient::UI::Label::escape $msg; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
883 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
884 my @link;
885 $msg =~ s{
886 ($match)
887 }{
888 my $kw = $1;
889
890 push @link, new CFClient::UI::Label
891 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892 can_hover => 1,
893 can_events => 1,
894 padding_x => 0,
895 padding_y => 0,
896 on_button_up => sub {
897 $self->send ($kw);
898 };
899
900 chr 0xfffc
901 }giex;
902 1320
903 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
905 $self->update_options; 1347 $self->update_options;
906 } else { 1348 } else {
907 $self->destroy; 1349 $self->destroy;
908 } 1350 }
909 1351
… …
911} 1353}
912 1354
913sub send { 1355sub send {
914 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
915 1357
916 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1360
1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
919} 1362}
920 1363
921sub destroy { 1364sub destroy {
922 my ($self) = @_; 1365 my ($self) = @_;
923 1366
924 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925 1368
1369 if ($self->{conn}) {
1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1373 }
928 1374
929 $self->SUPER::destroy; 1375 $self->SUPER::destroy;
930} 1376}
931 1377
9321; 13781
1379

Diff Legend

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