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

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

Diff Legend

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