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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 2007 UTC

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

Diff Legend

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