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.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 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 xwidget => 1, 26 xwidget2 => 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_capabilities => sub { 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 {
54 my ($cap) = @_; 59 my ($id) = @_;
55 60 sub {
56 if (my $ts = $cap->{tileset}) { 61 $self->send_exti_msg (w_e => $id, @_);
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 } 62 }
67 }
68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 }; 63 });
76 });
77 64
78 $self->connect_ext (ws_d => sub { 65 # destroy widgets on logout
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new (
105 %$args,
106 s_ws => $arg->{ws},
107 s_id => $arg->{id},
108 )
109 }
110 ) {
111 $self->{widget}{$arg->{id}}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
113 = $widget;
114
115 $widget->connect (on_destroy => sub {
116 my ($widget) = @_;
117
118 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 });
121 } else {
122 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124 }
125 });
126
127 $self->connect_ext (w_c => sub {
128 my ($arg) = @_;
129
130 my $w = $self->{widget}{$arg->{id}}
131 or return;
132 my $m = $arg->{name};
133
134 my @a = map {
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139
140 if (exists $arg->{rid}) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
142 } else {
143 $w->$m (@a);
144 }
145 });
146
147 $self->connect_ext (w_s => sub {
148 my ($arg) = @_;
149
150 my $w = $self->{widget}{$arg->{id}}
151 or return;
152
153 $w->{$arg->{name}} = $arg->{value};
154 });
155
156 $self->connect_ext (w_g => sub {
157 my ($arg) = @_;
158
159 my $w = $self->{widget}{$arg->{id}}
160 or return;
161
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
163 });
164
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 66 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 67 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 68 $_->destroy
168 for values %{delete $ws->{w} || {}}; 69 for values %{delete $ws->{w} || {}};
169 } 70 }
… …
190 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 91 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
191 92
192 $self 93 $self
193} 94}
194 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#############################################################################
297
195sub logprint { 298sub logprint {
196 my ($self, @a) = @_; 299 my ($self, @a) = @_;
197 300
198 $self->{log_fh} ||= do { 301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
199 my $path = "$Crossfire::VARDIR/log.$self->{host}";
200
201 open my $fh, ">>:utf8", $path
202 or die "Couldn't open logfile $path: $!";
203
204 $fh->autoflush (1);
205
206 $fh;
207 };
208
209 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
210
211 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
212 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
213
214 print {$self->{log_fh}} "$ts ", @a, "\n";
215} 302}
216 303
217sub _stat_numdiff { 304sub _stat_numdiff {
218 my ($self, $name, $old, $new) = @_; 305 my ($self, $name, $old, $new) = @_;
219 306
… …
303 390
304 if ( 391 if (
305 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 392 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
306 ) { 393 ) {
307 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 394 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
308 $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);
309 } 396 }
310 397
311 $self->update_stats_window ($stats, $prev); 398 $self->update_stats_window ($stats, $prev);
312 399
313 $self->{prev_stats} = { %$stats }; 400 $self->{prev_stats} = { %$stats };
… …
352 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 439 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
353 $::GAUGES->{food} ->set_value ($fo, $fo_m); 440 $::GAUGES->{food} ->set_value ($fo, $fo_m);
354 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 441 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
355 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 442 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
356 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 443 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
444 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
357 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 445 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
358 my $title = $stats->{+CS_STAT_TITLE}; 446 my $title = $stats->{+CS_STAT_TITLE};
359 $title =~ s/^Player: //; 447 $title =~ s/^Player: //;
360 $::STATWIDS->{title} ->set_text ("Title: " . $title); 448 $::STATWIDS->{title} ->set_text ("Title: " . $title);
361 449
… …
379 for keys %RES_TBL; 467 for keys %RES_TBL;
380 468
381 my $sktbl = $::STATWIDS->{skill_tbl}; 469 my $sktbl = $::STATWIDS->{skill_tbl};
382 my @skills = keys %{ $self->{skill_info} }; 470 my @skills = keys %{ $self->{skill_info} };
383 471
384 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
385 $sktbl->clear; 480 $sktbl->clear;
386 481
482 my $sw = $self->{skillwid}{""} ||= [
387 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388 $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),
389 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391 $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),
392 $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;
393 494
394 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>";
395 496
396 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);
397 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);
398 499
399 my ($x, $y) = (0, 1); 500 my ($x, $y) = (0, 1);
400 for ( 501 for (@order) {
401 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
402 map [$_, $self->{skill_info}{$_}],
403 grep exists $stats->{$_},
404 @skills
405 ) {
406 my ($idx, $name) = @$_; 502 my ($idx, $name) = @$_;
407 503
408 my $spell_cb = sub { 504 my $spell_cb = sub {
409 my ($widget, $ev) = @_; 505 my ($widget, $ev) = @_;
410 506
… …
425 } 521 }
426 522
427 1 523 1
428 }; 524 };
429 525
430 $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
431 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),
432 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 530
531 # level
532 (new CFPlus::UI::Label
433 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
434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 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 ;
436 549
437 $x++ and ($x, $y) = (0, $y + 1); 550 $x++ and ($x, $y) = (0, $y + 1);
438 } 551 }
439 }
440 552
441 for (grep exists $stats->{$_}, @skills) { 553 $sktbl->add_at (@add);
442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
444 } 554 }
445}
446 555
447sub macro_send { 556 for (@order) {
448 my ($self, $macro) = @_; 557 my ($idx, $name) = @$_;
558 my $val = $stats->{$idx};
449 559
450 for my $cmd (@{ $macro->{action} }) { 560 next if $prev->{$idx}[1] eq $val->[1];
451 $self->send_command ($cmd); 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);
452 } 569 }
453} 570}
454 571
455sub user_send { 572sub user_send {
456 my ($self, $command) = @_; 573 my ($self, $command) = @_;
… …
458 $self->{record}->($command) 575 $self->{record}->($command)
459 if $self->{record}; 576 if $self->{record};
460 577
461 $self->logprint ("send: ", $command); 578 $self->logprint ("send: ", $command);
462 $self->send_command ($command); 579 $self->send_command ($command);
463 ::status ($command);
464} 580}
465 581
466sub record { 582sub record {
467 my ($self, $cb) = @_; 583 my ($self, $cb) = @_;
468 584
… …
476} 592}
477 593
478sub feed_map1a { 594sub feed_map1a {
479 my ($self, $data) = @_; 595 my ($self, $data) = @_;
480 596
481 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 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 {
482 $self->{map_widget}->update; 626 $self->{map_widget}->update;
627 }
483} 628}
484 629
485sub magicmap { 630sub magicmap {
486 my ($self, $w, $h, $x, $y, $data) = @_; 631 my ($self, $w, $h, $x, $y, $data) = @_;
487 632
… …
494 my $map_info = delete $self->{map_info} 639 my $map_info = delete $self->{map_info}
495 or return; 640 or return;
496 641
497 my ($hash, $x, $y, $w, $h) = @$map_info; 642 my ($hash, $x, $y, $w, $h) = @$map_info;
498 643
499 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
645 $self->{map_cache_new}{$hash} = \$data;
500 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
501 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
502} 647}
503 648
504sub map_clear { 649sub map_clear {
505 my ($self) = @_; 650 my ($self) = @_;
506 651
… …
512} 657}
513 658
514sub bg_fetch { 659sub bg_fetch {
515 my ($self) = @_; 660 my ($self) = @_;
516 661
517 my $id; 662 my $tile;
518 663
519 do { 664 do {
520 $id = pop @{$self->{bg_fetch}} 665 $tile = pop @{$self->{bg_fetch}}
521 or return; 666 or return;
522 } while $self->{texture}[$id]; 667 } while $self->{texture}[$tile];
523 668
524 CFPlus::DB::get tilecache => $id, sub { 669 CFPlus::DB::get tilecache => $tile, sub {
525 my ($data) = @_; 670 my ($data) = @_;
526 671
527 return unless $self->{map}; # stop when destroyed 672 return unless $self->{map}; # stop when destroyed
528 673
529 $self->set_texture ($id => $data)
530 if defined $data; 674 if (defined $data) {
675 $self->have_tile ($tile, $data);
676 $self->{texture}[$tile]->upload;
677 }
531 678
532 $self->bg_fetch; 679 $self->bg_fetch;
533 }; 680 };
534} 681}
535 682
536sub load_map($$$) { 683sub load_map($$$) {
537 my ($self, $hash, $x, $y) = @_; 684 my ($self, $hash, $x, $y) = @_;
538 685
539 my $gen = $self->{map_change_gen}; 686 my $gen = $self->{map_change_gen};
540 687
541 CFPlus::DB::get $self->{mapcache} => $hash, sub { 688 my $cb = sub {
542 return unless $gen == $self->{map_change_gen}; 689 return unless $gen == $self->{map_change_gen};
543 690
544 my ($data) = @_; 691 my ($data) = @_;
545 692
546 if (defined $data) { 693 if (defined $data) {
694 $self->{map_cache_new}{$hash} = \$data;
695
547 $data = Compress::LZF::decompress $data; 696 my $data = Compress::LZF::decompress $data;
548 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
549 697
550 my $inprogress = @{ $self->{bg_fetch} || [] }; 698 my $inprogress = @{ $self->{bg_fetch} || [] };
551 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 699 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552 $self->bg_fetch unless $inprogress; 700 $self->bg_fetch unless $inprogress;
553 } 701 }
554 }; 702 };
703
704 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata);
706 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
708 }
555} 709}
556 710
557# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 711# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
558# (server resource,s latency, bandwidth), so this hack is warranted. 712# (server resource,s latency, bandwidth), so this hack is warranted.
559# the right fix is to make real tiled maps with an overview file 713# the right fix is to make real tiled maps with an overview file
… …
652 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 806 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
653 807
654 $self->flush_map; 808 $self->flush_map;
655 809
656 ++$self->{map_change_gen}; 810 ++$self->{map_change_gen};
811 $self->{map_cache_old} = delete $self->{map_cache_new};
657 812
658 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 813 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
659 814
660 my $mapmapw = $self->{mapmap}->{w}; 815 my $mapmapw = $self->{mapmap}->{w};
661 my $mapmaph = $self->{mapmap}->{h}; 816 my $mapmaph = $self->{mapmap}->{h};
… …
680} 835}
681 836
682sub face_find { 837sub face_find {
683 my ($self, $facenum, $face, $cb) = @_; 838 my ($self, $facenum, $face, $cb) = @_;
684 839
685 my $hash = "$face->{chksum},$face->{name}"; 840 if ($face->{type} == 0) { # FT_FACE
686
687 my $id = CFPlus::DB::get_tile_id_sync $hash; 841 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688 842
689 $face->{id} = $id; 843 $face->{id} = $id;
690 $self->{faceid}[$facenum] = $id;
691
692 $self->{map}->set_tileid ($facenum => $id); 844 $self->{map}->set_tileid ($facenum => $id);
693 845
694 CFPlus::DB::get tilecache => $id, $cb; 846 CFPlus::DB::get tilecache => $id, $cb;
847
848 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb;
850
851 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb;
853 }
695} 854}
696 855
697sub face_update { 856sub face_update {
698 my ($self, $facenum, $face, $changed) = @_; 857 my ($self, $facenum, $face, $changed) = @_;
699 858
859 if ($face->{type} == 0) {
860 # image, FT_FACE
700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701 if $changed; 862 if $changed;
702 863
703 $self->set_texture ($face->{id} => delete $face->{image}); 864 $self->have_tile ($face->{id}, delete $face->{data});
865
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 }
704} 897}
705 898
706sub smooth_update { 899sub smooth_update {
707 my ($self, $facenum, $face) = @_; 900 my ($self, $facenum, $face) = @_;
708 901
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 902 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710} 903}
711 904
712sub set_texture { 905sub have_tile {
713 my ($self, $id, $data) = @_; 906 my ($self, $tile, $data) = @_;
714 907
715 $self->{texture}[$id] = my $tex = 908 return unless $self->{map};
909
910 my $tex = $self->{texture}[$tile] ||=
716 new_from_image CFPlus::Texture 911 new CFPlus::Texture
912 tile => $tile,
913 image => $data, delete_image => 1,
717 $data, minify => 1, mipmap => 1; 914 minify => 1, mipmap => 1;
718 915
719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 916 if (my $cbs = delete $self->{tile_cb}{$tile}) {
720 $self->{map_widget}->update; 917 $_->($tex) for @$cbs;
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)
721} 950}
722 951
723sub sound_play { 952sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 953 my ($self, $type, $face, $dx, $dy, $vol) = @_;
725 954
726 $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
727} 957}
728 958
729my $LAST_QUERY; # server is stupid, stupid, stupid 959my $LAST_QUERY; # server is stupid, stupid, stupid
730 960
731sub query { 961sub query {
… …
796 $self->{$type} = $text; 1026 $self->{$type} = $text;
797 } else { 1027 } else {
798 $self->logprint ("msg: ", $text); 1028 $self->logprint ("msg: ", $text);
799 return if $color < 0; # negative color == ignore if not understood 1029 return if $color < 0; # negative color == ignore if not understood
800 1030
801 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1031 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
802 1032
803 ## 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
804 # no longer neecssary with TRT servers 1034 # no longer neecssary with TRT servers
805 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1035 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
806 1036
807 ::message ({ fg => $fg, markup => $_ })
808 for split /\n/, $text; 1037 for (split /\n/, $text) {
1038 ::message ({
1039 fg => $fg,
1040 markup => $_,
1041 type => $type,
1042 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill
1044 });
1045
1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1047 # actually, this is an ugly design. _we_ should control the channels,
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 }
809 1052
810 $self->{statusbox}->add ($text, 1053 $self->{statusbox}->add ($text,
811 group => $text, 1054 group => $text,
812 fg => $fg, 1055 fg => $fg,
813 timeout => $color >= 2 ? 180 : 10, 1056 timeout => $color >= 2 ? 180 : 10,
… …
869 $self->{map_widget}->clr_commands; 1112 $self->{map_widget}->clr_commands;
870 1113
871 ::stop_game (); 1114 ::stop_game ();
872} 1115}
873 1116
874sub image_info {
875 my ($self, $numfaces) = @_;
876
877 $self->{num_faces} = $numfaces;
878 $self->{face_prefetch} = [1 .. $numfaces];
879 $self->face_prefetch;
880}
881
882sub face_prefetch {
883 my ($self) = @_;
884
885 return unless $::CFG->{face_prefetch};
886
887 if ($self->{num_faces}) {
888 return if @{ $self->{send_queue} || [] };
889 my $todo = @{ $self->{face_prefetch} }
890 or return;
891
892 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
893
894 $self->send ("requestinfo image_sums $face $face");
895
896 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
897 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
898 } elsif (!exists $self->{num_faces}) {
899 $self->send ("requestinfo image_info");
900
901 $self->{num_faces} = 0;
902
903 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
904 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
905 }
906}
907
908sub update_floorbox { 1117sub update_floorbox {
909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910 return unless $::CONN; 1119 return unless $::CONN;
911 1120
912 $::FLOORBOX->clear; 1121 $::FLOORBOX->clear;
1122
1123 my @add;
913 1124
914 my $row; 1125 my $row;
915 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} }) {
916 if ($row < 6) { 1127 if ($row < 6) {
917 local $_->{face_widget}; # hack to force recreation of widget 1128 local $_->{face_widget}; # hack to force recreation of widget
918 local $_->{desc_widget}; # hack to force recreation of widget 1129 local $_->{desc_widget}; # hack to force recreation of widget
919 CFPlus::Item::update_widgets $_; 1130 CFPlus::Item::update_widgets $_;
920 1131
1132 push @add,
921 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1133 0, $row, $_->{face_widget},
922 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1134 1, $row, $_->{desc_widget};
923 1135
924 $row++; 1136 $row++;
925 } else { 1137 } else {
926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1138 push @add, 1, $row, new CFPlus::UI::Button
927 text => "More...", 1139 text => "More...",
928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929 ); 1141 ;
930 last; 1142 last;
931 } 1143 }
932 } 1144 }
933 if ($::CONN->{open_container}) { 1145 if ($::CONN->{open_container}) {
934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1146 push @add, 1, $row++, new CFPlus::UI::Button
935 text => "Close container", 1147 text => "Close container",
936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937 ); 1149 ;
938 } 1150 }
1151
1152 $::FLOORBOX->add_at (@add);
939 }); 1153 });
940 1154
941 $::WANT_REFRESH++; 1155 $::WANT_REFRESH->start;
942} 1156}
943 1157
944sub set_opencont { 1158sub set_opencont {
945 my ($conn, $tag, $name) = @_; 1159 my ($conn, $tag, $name) = @_;
946 $conn->{open_container} = $tag; 1160 $conn->{open_container} = $tag;
947 update_floorbox; 1161 update_floorbox;
948 1162
949 $::INV_RIGHT_HB->clear (); 1163 $::INVR_HB->clear ();
950 $::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);
951 1165
952 if ($tag != 0) { # Floor isn't closable, is it? 1166 if ($tag != 0) { # Floor isn't closable, is it?
953 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1167 $::INVR_HB->add (new CFPlus::UI::Button
954 text => "Close container", 1168 text => "Close container",
955 tooltip => "Close the currently open container (if one is open)", 1169 tooltip => "Close the currently open container (if one is open)",
956 on_activate => sub { 1170 on_activate => sub {
957 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
958 if $tag != 0; 1172 if $tag != 0;
959 #if $CONN->{open_container} != 0;
960 0 1173 0
961 }, 1174 },
962 ); 1175 );
963 } 1176 }
964 1177
… …
1063 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1276 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1277 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065 . "map size $self->{mapw}×$self->{maph}\n" 1278 . "map size $self->{mapw}×$self->{maph}\n"
1066 ); 1279 );
1067 1280
1068 ::setup_build_button ($self->{editor_support}->{builder_ui});
1069} 1281}
1070 1282
1071sub logged_in { 1283sub logged_in {
1072 my ($self) = @_; 1284 my ($self) = @_;
1073 1285
1074 $self->send_ext_req (cfplus_support => version => 1, sub { 1286 $self->send_ext_req (cfplus_support => version => 2, sub {
1287 my (%msg) = @_;
1288
1075 $self->{cfplus_ext} = $_[0]{version}; 1289 $self->{cfplus_ext} = $msg{version};
1076 $self->update_server_info; 1290 $self->update_server_info;
1077 1291
1078 if ($self->{cfplus_ext} >= 2) { 1292 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub { 1293 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0]; 1294 $self->{editor_support} = { @_ };
1081 $self->update_server_info; 1295 $self->update_server_info;
1082 1296
1083 0 1297 0
1084 }); 1298 });
1085 } 1299 }
… …
1093 $self->send_command ("output-count $::CFG->{output_count}"); 1307 $self->send_command ("output-count $::CFG->{output_count}");
1094 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
1096} 1310}
1097 1311
1098sub buildat {
1099 my ($self, $builditem, $x, $y) = @_;
1100
1101 if ($self->{cfplus_ext}) {
1102 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103 }
1104}
1105
1106sub lookat { 1312sub lookat {
1107 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
1108 1314
1109 if ($self->{cfplus_ext}) { 1315 if ($self->{cfplus_ext}) {
1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1316 $self->send_ext_req (lookat => $x, $y, sub {
1111 my ($msg) = @_; 1317 my (%msg) = @_;
1112 1318
1113 if (exists $msg->{npc_dialog}) { 1319 if (exists $msg{npc_dialog}) {
1114 # start npc chat dialog 1320 # start npc chat dialog
1115 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
1116 dx => $x, 1322 token => $msg{npc_dialog},
1117 dy => $y,
1118 title => "$msg->{npc_dialog} (NPC)", 1323 title => "$msg{npc_dialog}[0] (NPC)",
1119 conn => $self, 1324 conn => $self,
1120 ; 1325 ;
1121 } 1326 }
1122 }); 1327 });
1123 } 1328 }
… …
1130 1335
1131 (delete $self->{npc_dialog})->destroy 1336 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1337 if $self->{npc_dialog};
1133 1338
1134 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
1340
1341 %$self = ();
1135} 1342}
1136 1343
1137package CFPlus::NPCDialog; 1344package CFPlus::NPCDialog;
1138 1345
1139our @ISA = 'CFPlus::UI::Toplevel'; 1346our @ISA = 'CFPlus::UI::Toplevel';
… …
1186 on_activate => sub { $this->destroy; 1 }, 1393 on_activate => sub { $this->destroy; 1 },
1187 ; 1394 ;
1188 1395
1189 $self->update_options; 1396 $self->update_options;
1190 1397
1191 $self->{id} = $self->{conn}->send_ext_req ( 1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1399 $self->{conn}->connect_ext ($self->{id} => sub {
1193 sub { $this && $this->feed (@_) } 1400 $this->feed (@_) if $this;
1194 ); 1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195 1404
1196 $self->{entry}->grab_focus; 1405 $self->{entry}->grab_focus;
1197 1406
1198 $self->{textview}->add_paragraph ({ 1407 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1], 1408 fg => [1, 1, 0, 1],
… …
1222 ); 1431 );
1223 } 1432 }
1224} 1433}
1225 1434
1226sub feed { 1435sub feed {
1227 my ($self, $msg) = @_; 1436 my ($self, $type, @arg) = @_;
1228 1437
1229 CFPlus::weaken $self; 1438 CFPlus::weaken $self;
1230 1439
1231 if ($msg->{msgtype} eq "reply") { 1440 if ($type eq "update") {
1441 my (%info) = @arg;
1442
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1234
1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237 my @link;
1238 $text =~ s{
1239 ($match)
1240 }{
1241 my $kw = $1;
1242
1243 push @link, new CFPlus::UI::Label
1244 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245 can_hover => 1,
1246 can_events => 1,
1247 padding_x => 0,
1248 padding_y => 0,
1249 on_button_up => sub {
1250 $self->send ($kw);
1251 };
1252
1253 "\x{fffc}"
1254 }giex;
1255 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
1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257 $self->{textview}->scroll_to_bottom; 1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1258 $self->update_options; 1472 $self->update_options;
1259 } else { 1473 } else {
1260 $self->destroy; 1474 $self->destroy;
1261 } 1475 }
1262 1476
… …
1267 my ($self, $msg) = @_; 1481 my ($self, $msg) = @_;
1268 1482
1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270 $self->{textview}->scroll_to_bottom; 1484 $self->{textview}->scroll_to_bottom;
1271 1485
1272 $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);
1273} 1487}
1274 1488
1275sub destroy { 1489sub destroy {
1276 my ($self) = @_; 1490 my ($self) = @_;
1277 1491
1278 #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
1279 1493
1280 if ($self->{conn}) { 1494 if ($self->{conn}) {
1281 $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};
1282 delete $self->{conn}{npc_dialog}; 1496 delete $self->{conn}{npc_dialog};
1283 $self->{conn}->disconnect_ext ($self->{id}); 1497 $self->{conn}->disconnect_ext ($self->{id});
1284 } 1498 }
1285 1499
1286 $self->SUPER::destroy; 1500 $self->SUPER::destroy;

Diff Legend

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