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

Diff Legend

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