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.186 by root, Thu Dec 27 19:35:09 2007 UTC

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

Diff Legend

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