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.125 by root, Sat Jul 21 15:04:27 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1, 26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder} 53 $self->{json_coder}
125 ->convert_blessed 54 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
128 }); 57 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$_->[0]} = $_->[1]
215 for @{ $arg->{attr} };
216 });
217
218 # widget get
219 $self->connect_ext (w_g => sub {
220 my ($arg) = @_;
221
222 my $w = $self->{widget}{$arg->{id}}
223 or return;
224
225 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
226 });
227 58
228 # destroy widgets on logout 59 # destroy widgets on logout
229 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
230 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
231 $_->destroy 62 $_->destroy
… …
254 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
255 86
256 $self 87 $self
257} 88}
258 89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
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 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my ($self, %ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($self, $id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298}
299
300# message window
301sub ext_channel_info {
302 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
308
259sub logprint { 309sub logprint {
260 my ($self, @a) = @_; 310 my ($self, @a) = @_;
261 311
262 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
263 my $path = "$Crossfire::VARDIR/log.$self->{host}";
264
265 open my $fh, ">>:utf8", $path
266 or die "Couldn't open logfile $path: $!";
267
268 $fh->autoflush (1);
269
270 $fh;
271 };
272
273 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
274
275 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
276 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
277
278 print {$self->{log_fh}} "$ts ", @a, "\n";
279} 313}
280 314
281sub _stat_numdiff { 315sub _stat_numdiff {
282 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
283 317
… …
367 401
368 if ( 402 if (
369 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
370 ) { 404 ) {
371 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
372 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
373 } 407 }
374 408
375 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
376 410
377 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
416 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
417 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
418 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
419 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
420 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
421 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
422 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
423 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
424 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
425 460
… …
443 for keys %RES_TBL; 478 for keys %RES_TBL;
444 479
445 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
446 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
447 482
448 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
484 map [$_, $self->{skill_info}{$_}],
485 grep exists $stats->{$_},
486 @skills;
487
488 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
489 $self->{stat_order} = join ",", map $_->[0], @order;
490
449 $sktbl->clear; 491 $sktbl->clear;
450 492
451 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
452
453 push @add,
454 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
455 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
456 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
457 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
458 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
459 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
460 ; 502 ];
503
504 my @add = @$sw;
461 505
462 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
463 507
464 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
465 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
466 510
467 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
468 for ( 512 for (@order) {
469 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
470 map [$_, $self->{skill_info}{$_}],
471 grep exists $stats->{$_},
472 @skills
473 ) {
474 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
475 514
476 my $spell_cb = sub { 515 my $spell_cb = sub {
477 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
478 517
… …
493 } 532 }
494 533
495 1 534 1
496 }; 535 };
497 536
537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541
542 # level
543 (new CFPlus::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ];
553
498 push @add, 554 push @add,
499 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
500 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
501 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $x * 4 + 2, $y, $sw->[2],
502 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 558 $x * 4 + 3, $y, $sw->[3],
503 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
504 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
505 ; 559 ;
506 560
507 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
508 } 562 }
509 563
510 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
511 } 565 }
512 566
513 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
514 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
515 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 569 my $val = $stats->{$idx};
516 }
517}
518 570
519sub macro_send { 571 next if $prev->{$idx}[1] eq $val->[1];
520 my ($self, $macro) = @_;
521 572
522 for my $cmd (@{ $macro->{action} }) { 573 my $sw = $self->{skillwid}{$idx};
523 $self->send_command ($cmd); 574 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val);
577
578 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val);
524 } 580 }
525} 581}
526 582
527sub user_send { 583sub user_send {
528 my ($self, $command) = @_; 584 my ($self, $command) = @_;
… …
530 $self->{record}->($command) 586 $self->{record}->($command)
531 if $self->{record}; 587 if $self->{record};
532 588
533 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
534 $self->send_command ($command); 590 $self->send_command ($command);
535 ::status ($command);
536} 591}
537 592
538sub record { 593sub record {
539 my ($self, $cb) = @_; 594 my ($self, $cb) = @_;
540 595
… …
548} 603}
549 604
550sub feed_map1a { 605sub feed_map1a {
551 my ($self, $data) = @_; 606 my ($self, $data) = @_;
552 607
553 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 608 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
609 my $delay;
610
611 for my $tile (@$missing) {
612 next if $self->{delay}{$tile};
613
614 $delay = 1;
615
616 if (my $tex = $::CONN->{texture}[$tile]) {
617 $tex->upload;
618 } else {
619 $self->{delay}{$tile} = 1;
620
621 # we assume the face is in-flight and will eventually come
622 push @{$self->{tile_cb}{$tile}}, sub {
623 delete $self->{delay}{$tile};
624 $_[0]->upload;
625 };
626 }
627 }
628
629 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched
631 Event->timer (after => 0.03, cb => sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update
634 if $self->{map_widget};
635 });
636 } else {
554 $self->{map_widget}->update; 637 $self->{map_widget}->update;
638 }
555} 639}
556 640
557sub magicmap { 641sub magicmap {
558 my ($self, $w, $h, $x, $y, $data) = @_; 642 my ($self, $w, $h, $x, $y, $data) = @_;
559 643
… …
566 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
567 or return; 651 or return;
568 652
569 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
570 654
571 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data;
572 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
573 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574} 658}
575 659
576sub map_clear { 660sub map_clear {
577 my ($self) = @_; 661 my ($self) = @_;
578 662
… …
584} 668}
585 669
586sub bg_fetch { 670sub bg_fetch {
587 my ($self) = @_; 671 my ($self) = @_;
588 672
589 my $id; 673 my $tile;
590 674
591 do { 675 do {
592 $id = pop @{$self->{bg_fetch}} 676 $tile = pop @{$self->{bg_fetch}}
593 or return; 677 or return;
594 } while $self->{texture}[$id]; 678 } while $self->{texture}[$tile];
595 679
596 CFPlus::DB::get tilecache => $id, sub { 680 CFPlus::DB::get tilecache => $tile, sub {
597 my ($data) = @_; 681 my ($data) = @_;
598 682
599 return unless $self->{map}; # stop when destroyed 683 return unless $self->{map}; # stop when destroyed
600 684
601 $self->set_texture ($id => $data)
602 if defined $data; 685 if (defined $data) {
686 $self->have_tile ($tile, $data);
687 $self->{texture}[$tile]->upload;
688 }
603 689
604 $self->bg_fetch; 690 $self->bg_fetch;
605 }; 691 };
606} 692}
607 693
608sub load_map($$$) { 694sub load_map($$$) {
609 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
610 696
611 my $gen = $self->{map_change_gen}; 697 my $gen = $self->{map_change_gen};
612 698
613 CFPlus::DB::get $self->{mapcache} => $hash, sub { 699 my $cb = sub {
614 return unless $gen == $self->{map_change_gen}; 700 return unless $gen == $self->{map_change_gen};
615 701
616 my ($data) = @_; 702 my ($data) = @_;
617 703
618 if (defined $data) { 704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
619 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
620 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
621 708
622 my $inprogress = @{ $self->{bg_fetch} || [] }; 709 my $inprogress = @{ $self->{bg_fetch} || [] };
623 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
624 $self->bg_fetch unless $inprogress; 711 $self->bg_fetch unless $inprogress;
625 } 712 }
626 }; 713 };
714
715 if (my $rdata = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata);
717 } else {
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
719 }
627} 720}
628 721
629# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
630# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
631# the right fix is to make real tiled maps with an overview file 724# the right fix is to make real tiled maps with an overview file
… …
724 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
725 818
726 $self->flush_map; 819 $self->flush_map;
727 820
728 ++$self->{map_change_gen}; 821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
729 823
730 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
731 825
732 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
733 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
752} 846}
753 847
754sub face_find { 848sub face_find {
755 my ($self, $facenum, $face, $cb) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
756 850
757 my $hash = "$face->{chksum},$face->{name}"; 851 if ($face->{type} == 0) { # FT_FACE
758
759 my $id = CFPlus::DB::get_tile_id_sync $hash; 852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
760 853
761 $face->{id} = $id; 854 $face->{id} = $id;
762 $self->{faceid}[$facenum] = $id;
763
764 $self->{map}->set_tileid ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
765 856
766 CFPlus::DB::get tilecache => $id, $cb; 857 CFPlus::DB::get tilecache => $id, $cb;
858
859 } elsif ($face->{type} & 1) { # with metadata
860 CFPlus::DB::get res_meta => $face->{name}, $cb;
861
862 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb;
864 }
767} 865}
768 866
769sub face_update { 867sub face_update {
770 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
771 869
870 if ($face->{type} == 0) {
871 # image, FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed; 873 if $changed;
774 874
775 $self->set_texture ($face->{id} => delete $face->{image}); 875 $self->have_tile ($face->{id}, delete $face->{data});
876
877 } elsif ($face->{type} & 1) {
878 # split metadata case, FT_MUSIC, FT_SOUND
879 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta;
882
883 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
884 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
885 }
886
887 $face->{data} = $self->{json_coder}->decode ($face->{data});
888
889 ::add_license ($face);
890
891 if ($face->{type} == 3) { # FT_MUSIC
892 ::message ({ markup => "downloaded song #$facenum" })
893 if $changed;
894
895 &::audio_music_push ($facenum);
896 } elsif ($face->{type} == 5) { # FT_SOUND
897 ::message ({ markup => "downloaded sound #$facenum" })
898 if $changed;
899
900 &::audio_sound_push ($facenum);
901 }
902
903 } else {
904 # flat resource case, FT_RSRC
905 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
906 if $changed;
907 }
908
909 if (my $cbs = $self->{face_cb}{$facenum}) {
910 $_->($face, $changed) for @$cbs;
911 }
776} 912}
777 913
778sub smooth_update { 914sub smooth_update {
779 my ($self, $facenum, $face) = @_; 915 my ($self, $facenum, $face) = @_;
780 916
781 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 917 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
782} 918}
783 919
784sub set_texture { 920sub have_tile {
785 my ($self, $id, $data) = @_; 921 my ($self, $tile, $data) = @_;
786 922
787 return unless $self->{map}; 923 return unless $self->{map};
788 924
789 $self->{texture}[$id] = my $tex = 925 my $tex = $self->{texture}[$tile] ||=
790 new_from_image CFPlus::Texture 926 new CFPlus::Texture
927 tile => $tile,
928 image => $data, delete_image => 1,
791 $data, minify => 1, mipmap => 1; 929 minify => 1, mipmap => 1;
792 930
793 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 931 if (my $cbs = delete $self->{tile_cb}{$tile}) {
794 $self->{map_widget}->update; 932 $_->($tex) for @$cbs;
795 933 }
796 $_->() for @{(delete $self->{face_cb}{$id}) || []};
797} 934}
798 935
799sub connect_face_update { 936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub on_face_change {
800 my ($self, $id, $cb) = @_; 939 my ($self, $num, $cb) = @_;
801 940
802 push @{$self->{face_cb}{$id}}, $cb; 941 push @{$self->{face_cb}{$num}}, $cb;
803 942
943 defined wantarray
804 CFPlus::guard { 944 ? CFPlus::guard {
805 @{$self->{face_cb}{$id}} 945 @{$self->{face_cb}{$num}}
806 = grep $_ != $cb, 946 = grep $_ != $cb,
807 @{$self->{face_cb}{$id}}; 947 @{$self->{face_cb}{$num}};
808 } 948 }
949 : ()
950}
951
952# call in non-void context registers a temporary
953# hook with handle, otherwise its permanent
954sub register_face_handler {
955 my ($self, $num, $cb) = @_;
956
957 return unless $num;
958
959 # invoke if available right now
960 $cb->($self->{face}[$num], 0)
961 unless exists $self->{face}[$num]{loading};
962
963 # future changes
964 $self->on_face_change ($num => $cb)
809} 965}
810 966
811sub sound_play { 967sub sound_play {
812 my ($self, $x, $y, $soundnum, $type) = @_; 968 my ($self, $type, $face, $dx, $dy, $vol) = @_;
813 969
814 $self->{sound_play}->($x, $y, $soundnum, $type); 970 &::audio_sound_play ($face, $dx, $dy, $vol)
971 unless $type & 1; # odd types are silent for future expansion
815} 972}
816 973
817my $LAST_QUERY; # server is stupid, stupid, stupid 974my $LAST_QUERY; # server is stupid, stupid, stupid
818 975
819sub query { 976sub query {
… …
884 $self->{$type} = $text; 1041 $self->{$type} = $text;
885 } else { 1042 } else {
886 $self->logprint ("msg: ", $text); 1043 $self->logprint ("msg: ", $text);
887 return if $color < 0; # negative color == ignore if not understood 1044 return if $color < 0; # negative color == ignore if not understood
888 1045
889 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1046 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
890 1047
891 ## try to create single paragraphs of multiple lines sent by the server 1048 ## try to create single paragraphs of multiple lines sent by the server
892 # no longer neecssary with TRT servers 1049 # no longer neecssary with TRT servers
893 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1050 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
894 1051
895 ::message ({ fg => $fg, markup => $_ }) 1052 ::message ({
1053 fg => $fg,
1054 markup => $_,
1055 type => $type,
1056 extra => [@extra],
1057 color_flags => $color
896 for split /\n/, $text; 1058 }) for split /\n/, $text;
897 1059
898 $self->{statusbox}->add ($text, 1060 $self->{statusbox}->add ($text,
899 group => $text, 1061 group => $text,
900 fg => $fg, 1062 fg => $fg,
901 timeout => $color >= 2 ? 180 : 10, 1063 timeout => $color >= 2 ? 180 : 10,
… …
957 $self->{map_widget}->clr_commands; 1119 $self->{map_widget}->clr_commands;
958 1120
959 ::stop_game (); 1121 ::stop_game ();
960} 1122}
961 1123
962sub image_info {
963 my ($self, $numfaces) = @_;
964
965 $self->{num_faces} = $numfaces;
966 $self->{face_prefetch} = [1 .. $numfaces];
967 $self->face_prefetch;
968}
969
970sub face_prefetch {
971 my ($self) = @_;
972
973 return unless $::CFG->{face_prefetch};
974
975 if ($self->{num_faces}) {
976 return if @{ $self->{send_queue} || [] };
977 my $todo = @{ $self->{face_prefetch} }
978 or return;
979
980 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
981
982 $self->send ("requestinfo image_sums $face $face");
983
984 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
985 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
986 } elsif (!exists $self->{num_faces}) {
987 $self->send ("requestinfo image_info");
988
989 $self->{num_faces} = 0;
990
991 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
992 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
993 }
994}
995
996sub update_floorbox { 1124sub update_floorbox {
997 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1125 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
998 return unless $::CONN; 1126 return unless $::CONN;
999 1127
1000 $::FLOORBOX->clear; 1128 $::FLOORBOX->clear;
… …
1029 } 1157 }
1030 1158
1031 $::FLOORBOX->add_at (@add); 1159 $::FLOORBOX->add_at (@add);
1032 }); 1160 });
1033 1161
1034 $::WANT_REFRESH++; 1162 $::WANT_REFRESH->start;
1035} 1163}
1036 1164
1037sub set_opencont { 1165sub set_opencont {
1038 my ($conn, $tag, $name) = @_; 1166 my ($conn, $tag, $name) = @_;
1039 $conn->{open_container} = $tag; 1167 $conn->{open_container} = $tag;
1040 update_floorbox; 1168 update_floorbox;
1041 1169
1042 $::INV_RIGHT_HB->clear (); 1170 $::INVR_HB->clear ();
1043 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1171 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1044 1172
1045 if ($tag != 0) { # Floor isn't closable, is it? 1173 if ($tag != 0) { # Floor isn't closable, is it?
1046 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1174 $::INVR_HB->add (new CFPlus::UI::Button
1047 text => "Close container", 1175 text => "Close container",
1048 tooltip => "Close the currently open container (if one is open)", 1176 tooltip => "Close the currently open container (if one is open)",
1049 on_activate => sub { 1177 on_activate => sub {
1050 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1178 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1051 if $tag != 0; 1179 if $tag != 0;
1052 #if $CONN->{open_container} != 0;
1053 0 1180 0
1054 }, 1181 },
1055 ); 1182 );
1056 } 1183 }
1057 1184
… …
1156 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1283 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1157 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1284 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1158 . "map size $self->{mapw}×$self->{maph}\n" 1285 . "map size $self->{mapw}×$self->{maph}\n"
1159 ); 1286 );
1160 1287
1161 ::setup_build_button ($self->{editor_support}->{builder_ui});
1162} 1288}
1163 1289
1164sub logged_in { 1290sub logged_in {
1165 my ($self) = @_; 1291 my ($self) = @_;
1166 1292
1167 $self->send_ext_req (cfplus_support => version => 1, sub { 1293 $self->send_ext_req (cfplus_support => version => 2, sub {
1294 my (%msg) = @_;
1295
1168 $self->{cfplus_ext} = $_[0]{version}; 1296 $self->{cfplus_ext} = $msg{version};
1169 $self->update_server_info; 1297 $self->update_server_info;
1170 1298
1171 if ($self->{cfplus_ext} >= 2) { 1299 if ($self->{cfplus_ext} >= 2) {
1172 $self->send_ext_req ("editor_support", sub { 1300 $self->send_ext_req ("editor_support", sub {
1173 $self->{editor_support} = $_[0]; 1301 $self->{editor_support} = { @_ };
1174 $self->update_server_info; 1302 $self->update_server_info;
1175 1303
1176 0 1304 0
1177 }); 1305 });
1178 } 1306 }
… …
1186 $self->send_command ("output-count $::CFG->{output_count}"); 1314 $self->send_command ("output-count $::CFG->{output_count}");
1187 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1315 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1188 $self->send_command ("pickup $::CFG->{pickup}"); 1316 $self->send_command ("pickup $::CFG->{pickup}");
1189} 1317}
1190 1318
1191sub buildat {
1192 my ($self, $builditem, $x, $y) = @_;
1193
1194 if ($self->{cfplus_ext}) {
1195 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1196 }
1197}
1198
1199sub lookat { 1319sub lookat {
1200 my ($self, $x, $y) = @_; 1320 my ($self, $x, $y) = @_;
1201 1321
1202 if ($self->{cfplus_ext}) { 1322 if ($self->{cfplus_ext}) {
1203 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1323 $self->send_ext_req (lookat => $x, $y, sub {
1204 my ($msg) = @_; 1324 my (%msg) = @_;
1205 1325
1206 if (exists $msg->{npc_dialog}) { 1326 if (exists $msg{npc_dialog}) {
1207 # start npc chat dialog 1327 # start npc chat dialog
1208 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1328 $self->{npc_dialog} = new CFPlus::NPCDialog::
1209 dx => $x, 1329 token => $msg{npc_dialog},
1210 dy => $y,
1211 title => "$msg->{npc_dialog} (NPC)", 1330 title => "$msg{npc_dialog}[0] (NPC)",
1212 conn => $self, 1331 conn => $self,
1213 ; 1332 ;
1214 } 1333 }
1215 }); 1334 });
1216 } 1335 }
… …
1281 on_activate => sub { $this->destroy; 1 }, 1400 on_activate => sub { $this->destroy; 1 },
1282 ; 1401 ;
1283 1402
1284 $self->update_options; 1403 $self->update_options;
1285 1404
1286 $self->{id} = $self->{conn}->send_ext_req ( 1405 $self->{id} = "npc-channel-" . $self->{conn}->token;
1287 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1406 $self->{conn}->connect_ext ($self->{id} => sub {
1288 sub { $this && $this->feed (@_) } 1407 $this->feed (@_) if $this;
1289 ); 1408 });
1409
1410 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1290 1411
1291 $self->{entry}->grab_focus; 1412 $self->{entry}->grab_focus;
1292 1413
1293 $self->{textview}->add_paragraph ({ 1414 $self->{textview}->add_paragraph ({
1294 fg => [1, 1, 0, 1], 1415 fg => [1, 1, 0, 1],
… …
1317 ); 1438 );
1318 } 1439 }
1319} 1440}
1320 1441
1321sub feed { 1442sub feed {
1322 my ($self, $msg) = @_; 1443 my ($self, $type, @arg) = @_;
1323 1444
1324 CFPlus::weaken $self; 1445 CFPlus::weaken $self;
1325 1446
1326 if ($msg->{msgtype} eq "reply") { 1447 if ($type eq "update") {
1448 my (%info) = @arg;
1449
1327 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1450 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1328 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1451 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1329
1330 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1331 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1332 my @link;
1333 $text =~ s{
1334 ($match)
1335 }{
1336 my $kw = $1;
1337
1338 push @link, new CFPlus::UI::Label
1339 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1340 can_hover => 1,
1341 can_events => 1,
1342 padding_x => 0,
1343 padding_y => 0,
1344 on_button_up => sub {
1345 $self->send ($kw);
1346 };
1347
1348 "\x{fffc}"
1349 }giex;
1350 1452
1453 if (exists $info{msg}) {
1454 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1455 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1456 my @link;
1457 $text =~ s{
1458 ($match)
1459 }{
1460 my $kw = $1;
1461
1462 push @link, new CFPlus::UI::Label
1463 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1464 can_hover => 1,
1465 can_events => 1,
1466 padding_x => 0,
1467 padding_y => 0,
1468 on_button_up => sub {
1469 $self->send ($kw);
1470 };
1471
1472 "\x{fffc}"
1473 }giex;
1474
1351 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1475 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1352 $self->{textview}->scroll_to_bottom; 1476 $self->{textview}->scroll_to_bottom;
1477 }
1478
1353 $self->update_options; 1479 $self->update_options;
1354 } else { 1480 } else {
1355 $self->destroy; 1481 $self->destroy;
1356 } 1482 }
1357 1483
… …
1362 my ($self, $msg) = @_; 1488 my ($self, $msg) = @_;
1363 1489
1364 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1490 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1365 $self->{textview}->scroll_to_bottom; 1491 $self->{textview}->scroll_to_bottom;
1366 1492
1367 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1493 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1368} 1494}
1369 1495
1370sub destroy { 1496sub destroy {
1371 my ($self) = @_; 1497 my ($self) = @_;
1372 1498
1373 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1499 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1374 1500
1375 if ($self->{conn}) { 1501 if ($self->{conn}) {
1376 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1502 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1377 delete $self->{conn}{npc_dialog}; 1503 delete $self->{conn}{npc_dialog};
1378 $self->{conn}->disconnect_ext ($self->{id}); 1504 $self->{conn}->disconnect_ext ($self->{id});
1379 } 1505 }
1380 1506
1381 $self->SUPER::destroy; 1507 $self->SUPER::destroy;

Diff Legend

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