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

Diff Legend

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