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

Diff Legend

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