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.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.206 by elmex, Sun Dec 7 16:20:44 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1;
22
23sub MIN_TEXTURE_UNUSED() { 1 }#d#
18 24
19sub new { 25sub new {
20 my ($class, %arg) = @_; 26 my ($class, %arg) = @_;
21 27
22 my $self = $class->SUPER::new (%arg, 28 my $self = $class->SUPER::new (%arg,
23 setup_req => { 29 setup_req => {
24 extmap => 1, 30 extmap => 1,
25 excmd => 1, 31 excmd => 1,
26 ywidget => 1, 32 widget => 2,
27 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
28 }, 34 },
29 ); 35 );
30 36
31 $self->{map_widget}->clr_commands; 37 $self->{map_widget}->clr_commands;
32 38
33 my @cmd_help = map { 39 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 40 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 41 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 42
37 my $cmd = $1; 43 my $cmd = $1;
38 my @args = split /\|/, $2; 44 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 45 @args = (".*") unless @args;
40 46
41 my (undef, @par) = CFPlus::Pod::section_of $_; 47 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 48 my $text = DC::Pod::as_label @par;
43 49
44 $_ = $_ eq ".*" ? "" : " $_" 50 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 51 for @args;
46 52
47 map ["$cmd$_", $text], 53 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 54 sort { (length $a) <=> (length $b) }
49 @args 55 @args
50 } sort { $a->{par} <=> $b->{par} } 56 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 57 DC::Pod::find command => "*";
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 resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118 58
119 $self->{json_coder} 59 $self->{json_coder}
120 ->convert_blessed 60 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 61 ->filter_json_single_key_object ("\fw" => sub {
122 $self->{widget}{$_[0]} 62 $self->{widget}{$_[0]}
63 })
64 ->filter_json_single_key_object ("\fc" => sub {
65 my ($id) = @_;
66 sub {
67 $self->send_exti_msg (w_e => $id, @_);
68 }
123 }); 69 });
124 70
125 $self->connect_ext (ws_n => sub { 71 # destroy widgets on logout
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
130 };
131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 72 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 73 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 74 $_->destroy
219 for values %{delete $ws->{w} || {}}; 75 for values %{delete $ws->{w} || {}};
220 } 76 }
77
78 delete $self->{items};
79 $::INV->clear;
80 $::INVR->clear;
81 $::INVR_HB->clear;
82 $::FLOORBOX->clear;
221 }); 83 });
222 84
223 $self->{map_widget}->add_command (@$_) 85 $self->{map_widget}->add_command (@$_)
224 for @cmd_help; 86 for @cmd_help;
225 87
226 { 88 {
227 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 89 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
228 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
229 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 90 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
230 } 91 }
231 92
232 { 93 {
233 $self->{noface} = my $tex = new_from_file CFPlus::Texture 94 $self->{noface} = my $tex = $TEX_NOFACE;
234 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
235 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 95 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
236 } 96 }
97
98# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
99# $self->{expire_w} = EV::timer 1, 1, sub {
100# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
101#
102# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
103# warn DC::SvREFCNT $self->{texture}[$_];
104# $self->{texture}[$_]->unload;
105# warn "expire texture $_\n";#d#
106# }
107#
108# ($self->{expire_count} += $count) < @{ $self->{texture} }
109# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
110# warn "count is $count\n";#d#
111# };
237 112
238 $self->{open_container} = 0; 113 $self->{open_container} = 0;
239 114
240 # per server 115 # per server
241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 116 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
242 117
243 $self 118 $self
244} 119}
245 120
121sub update_fx_want {
122 my ($self) = @_;
123
124 $self->send_exti_msg (fx_want => {
125 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
126 5 => !!$::CFG->{audio_enable}, # FT_SOUND
127 6 => 1, # FT_RSRC
128 });
129}
130
131sub ext_capabilities {
132 my ($self, %cap) = @_;
133
134 $self->update_fx_want;
135
136 $self->send_exti_req (resource => "exp_table", sub {
137 my ($exp_table) = @_;
138
139 $self->register_face_handler ($exp_table, sub {
140 my ($face) = @_;
141
142 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
143 $_->() for values %{ $self->{on_exp_update} || {} };
144 });
145
146 ()
147 });
148
149 if (my $ts = $cap{tileset}) {
150 if (my ($default) = grep $_->[2] & 1, @$ts) {
151 $self->{tileset} = $default;
152 $self->{tilesize} = $default->[3];
153 $self->setup_req (tileset => $default->[0]);
154
155 my $w = int $self->{mapw} * 32 / $self->{tilesize};
156 my $h = int $self->{maph} * 32 / $self->{tilesize};
157
158 $self->setup_req (mapsize => "${w}x${h}");
159 }
160 }
161}
162
163sub ext_ambient_music {
164 my ($self, $songs) = @_;
165 &::audio_music_set_ambient ($songs);
166}
167
168#############################################################################
169
170sub widget_associate {
171 my ($self, $ws, $id, $widget) = @_;
172
173 $widget ||= new DC::UI::Bin;
174
175 $widget->{s_id} = $id;
176 $self->{widget}{$id} = $widget;
177
178 if ($ws) {
179 $widget->{s_ws} = $ws;
180 $self->{widgetset}{$ws}{w}{$id} = $widget;
181 }
182
183 $widget->connect (on_destroy => sub {
184 my ($widget) = @_;
185
186 delete $self->{widget}{$widget->{s_id}};
187 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
188 if exists $widget->{s_ws};
189 });
190}
191
192# widgetset new
193sub ext_ws_n {
194 my ($self, $id) = @_;
195
196 $self->{widgetset}{$id} = {
197 w => {},
198 };
199}
200
201# widgetset destroy
202sub ext_ws_d {
203 my ($self, $id) = @_;
204
205 my $ws = delete $self->{widgetset}{$id}
206 or return;
207
208 $_->destroy
209 for values %{$ws->{w}};
210}
211
212# widgetset create
213sub ext_ws_c {
214 my ($self, $ws, $id, $class, $args) = @_;
215
216 $self->widget_associate (
217 $ws, $id => scalar eval {
218 local $SIG{__DIE__};
219 "DC::UI::$class"->new (%$args)
220 }
221 );
222}
223
224# widgetset create template
225sub ext_ws_ct {
226 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
227
228 $done_cb ||= sub { };
229
230 my $parse_list; $parse_list = sub {
231 my ($list) = @_;
232 my @w;
233
234 while (@$list) {
235 my ($class, $args) = splice @$list, 0, 2;
236 my $name = delete $args->{s_id};
237 my $cl = delete $args->{s_cl};
238 my $cfg = delete $cfg->{$name};
239 my $id = delete $cfg->{id};
240 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
241 or next;
242
243 $self->widget_associate ($ws, $id, $w)
244 if $id;
245
246 $w->add ($parse_list->($cl))
247 if $cl;
248
249 push @w, $w;
250 }
251
252 @w
253 };
254
255 # either array reference, or face #
256 if ($type eq "inline") {
257 $done_cb->();
258 $parse_list->($template);
259 } elsif ($type eq "face") {
260 my $handler; $handler = $self->register_face_handler ($template, sub {
261 my ($face) = @_;
262
263 undef $handler;
264 $done_cb->();
265 $parse_list->($self->{json_coder}->decode ($face->{data}));
266 });
267 } else {
268 $done_cb->(0);
269 }
270}
271
272# widgetset associate
273sub ext_ws_a {
274 my ($self, %ass) = @_;
275
276 # everything that has a name, wether conceivably useful or not
277 my %wkw = (
278 root => $DC::UI::ROOT,
279 tooltip => $DC::UI::TOOLTIP,
280
281 mapwidget => $::MAPWIDGET,
282 buttonbar => $::BUTTONBAR,
283 metaserver => $::METASERVER,
284 buttonbar => $::BUTTONBAR,
285 login_button => $::LOGIN_BUTTON,
286 quit_dialog => $::QUIT_DIALOG,
287 host_entry => $::HOST_ENTRY,
288 metaserver => $::METASERVER,
289 server_info => $::SERVER_INFO,
290
291 setup_dialog => $::SETUP_DIALOG,
292 setup_notebook => $::SETUP_NOTEBOOK,
293 setup_server => $::SETUP_SERVER,
294 setup_keyboard => $::SETUP_KEYBOARD,
295
296 pl_notebook => $::PL_NOTEBOOK,
297 pl_window => $::PL_WINDOW,
298 inventory_page => $::INVENTORY_PAGE,
299 stats_page => $::STATS_PAGE,
300 skill_page => $::SKILL_PAGE,
301 spell_page => $::SPELL_PAGE,
302 spell_list => $::SPELL_LIST,
303
304 floorbox => $::FLOORBOX,
305 help_window => $::HELP_WINDOW,
306 message_window => $::MESSAGE_WINDOW,
307 message_dist => $::MESSAGE_DIST,
308 statusbox => $::SDTATUSBOX,
309
310 inv => $::INV,
311 invr => $::INVR,
312 invr_hb => $::INVR_HB,
313 );
314
315 while (my ($id, $name) = each %ass) {
316 $self->widget_associate (undef, $id => $wkw{$name});
317 }
318}
319
320# widget call
321sub ext_w_c {
322 my ($self, $id, $rcb, $method, @args) = @_;
323
324 my $w = $self->{widget}{$id}
325 or return;
326
327 if ($rcb) {
328 $rcb->($w->$method (@args));
329 } else {
330 $w->$method (@args);
331 }
332}
333
334# widget set
335sub ext_w_s {
336 my ($self, $id, $attr) = @_;
337
338 my $w = $self->{widget}{$id}
339 or return;
340
341 for (my $i = 0; $i < $#$attr; $i += 2) {
342 my ($member, $value) = @$attr[$i, $i+1];
343 if (defined $value) {
344 $w->{$member} = $value;
345 } else {
346 delete $w->{$member};
347 }
348 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
349 }
350}
351
352# widget get
353sub ext_w_g {
354 my ($self, $id, $rid, @attr) = @_;
355
356 my $w = $self->{widget}{$id}
357 or return;
358
359 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
360}
361
362# message window
363sub ext_channel_info {
364 my ($self, $info) = @_;
365 $self->{channels}->{$info->{id}} = $info;
366 $::MESSAGE_DIST->add_channel ($info);
367}
368
369#############################################################################
370
246sub logprint { 371sub logprint {
247 my ($self, @a) = @_; 372 my ($self, @a) = @_;
248 373
249 $self->{log_fh} ||= do { 374 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
250 my $path = "$Crossfire::VARDIR/log.$self->{host}";
251
252 open my $fh, ">>:utf8", $path
253 or die "Couldn't open logfile $path: $!";
254
255 $fh->autoflush (1);
256
257 $fh;
258 };
259
260 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
261
262 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
263 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
264
265 print {$self->{log_fh}} "$ts ", @a, "\n";
266} 375}
267 376
268sub _stat_numdiff { 377sub _stat_numdiff {
269 my ($self, $name, $old, $new) = @_; 378 my ($self, $name, $old, $new) = @_;
270 379
… …
354 463
355 if ( 464 if (
356 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 465 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
357 ) { 466 ) {
358 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 467 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
359 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 468 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
360 } 469 }
361 470
362 $self->update_stats_window ($stats, $prev); 471 $self->update_stats_window ($stats, $prev);
363 472
364 $self->{prev_stats} = { %$stats }; 473 $self->{prev_stats} = { %$stats };
… …
403 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 512 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $::GAUGES->{food} ->set_value ($fo, $fo_m); 513 $::GAUGES->{food} ->set_value ($fo, $fo_m);
405 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 514 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 515 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
407 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 516 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
517 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
408 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 518 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
409 my $title = $stats->{+CS_STAT_TITLE}; 519 my $title = $stats->{+CS_STAT_TITLE};
410 $title =~ s/^Player: //; 520 $title =~ s/^Player: //;
411 $::STATWIDS->{title} ->set_text ("Title: " . $title); 521 $::STATWIDS->{title} ->set_text ("Title: " . $title);
412 522
… …
430 for keys %RES_TBL; 540 for keys %RES_TBL;
431 541
432 my $sktbl = $::STATWIDS->{skill_tbl}; 542 my $sktbl = $::STATWIDS->{skill_tbl};
433 my @skills = keys %{ $self->{skill_info} }; 543 my @skills = keys %{ $self->{skill_info} };
434 544
435 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 545 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
546 map [$_, $self->{skill_info}{$_}],
547 grep exists $stats->{$_},
548 @skills;
549
550 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
551 $self->{stat_order} = join ",", map $_->[0], @order;
552
436 $sktbl->clear; 553 $sktbl->clear;
437 554
555 my $sw = $self->{skillwid}{""} ||= [
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 556 0, 0, (new DC::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 557 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 558 2, 0, (new DC::UI::Label text => "Progress"),
559 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 560 4, 0, (new DC::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 561 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 562 6, 0, (new DC::UI::Label text => "Progress"),
563 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
564 ];
444 565
566 my @add = @$sw;
567
445 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 568 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
446 569
447 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 570 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
448 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 571 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
449 572
450 my ($x, $y) = (0, 1); 573 my ($x, $y) = (0, 1);
451 for ( 574 for (@order) {
452 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
453 map [$_, $self->{skill_info}{$_}],
454 grep exists $stats->{$_},
455 @skills
456 ) {
457 my ($idx, $name) = @$_; 575 my ($idx, $name) = @$_;
458 576
459 my $spell_cb = sub { 577 my $spell_cb = sub {
460 my ($widget, $ev) = @_; 578 my ($widget, $ev) = @_;
461 579
462 if ($ev->{button} == 1) { 580 if ($ev->{button} == 1) {
463 $::CONN->user_send ("ready_skill $name"); 581 $::CONN->user_send ("ready_skill $name");
464 } elsif ($ev->{button} == 2) { 582 } elsif ($ev->{button} == 2) {
465 $::CONN->user_send ("use_skill $name"); 583 $::CONN->user_send ("use_skill $name");
466 } elsif ($ev->{button} == 3) { 584 } elsif ($ev->{button} == 3) {
467 my $shortname = CFPlus::shorten $name, 14; 585 my $shortname = DC::shorten $name, 14;
468 (new CFPlus::UI::Menu 586 (new DC::UI::Menu
469 items => [ 587 items => [
470 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 588 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
471 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 589 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
472 ], 590 ],
473 )->popup ($ev); 591 )->popup ($ev);
474 } else { 592 } else {
475 return 0; 593 return 0;
476 } 594 }
477 595
478 1 596 1
479 }; 597 };
480 598
481 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 599 my $sw = $self->{skillwid}{$idx} ||= [
600 # exp
601 (new DC::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 602 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
483 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 603
604 # level
605 (new DC::UI::Label
484 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 606 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
607
608 # progress
609 (new DC::UI::ExperienceProgress),
610
611 # label
485 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 612 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
486 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 613 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
614 ];
615
616 push @add,
617 $x * 4 + 0, $y, $sw->[0],
618 $x * 4 + 1, $y, $sw->[1],
619 $x * 4 + 2, $y, $sw->[2],
620 $x * 4 + 3, $y, $sw->[3],
621 ;
487 622
488 $x++ and ($x, $y) = (0, $y + 1); 623 $x++ and ($x, $y) = (0, $y + 1);
489 } 624 }
490 }
491 625
492 for (grep exists $stats->{$_}, @skills) { 626 $sktbl->add_at (@add);
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
495 } 627 }
496}
497 628
498sub macro_send { 629 for (@order) {
499 my ($self, $macro) = @_; 630 my ($idx, $name) = @$_;
631 my $val = $stats->{$idx};
500 632
501 for my $cmd (@{ $macro->{action} }) { 633 next if $prev->{$idx}[1] eq $val->[1];
502 $self->send_command ($cmd); 634
635 my $sw = $self->{skillwid}{$idx};
636 $sw->[0]->set_text (::formsep ($val->[1]));
637 $sw->[1]->set_text ($val->[0] * 1);
638 $sw->[2]->set_value (@$val);
639
640 $::GAUGES->{sklprg}->set_label ("$name %d%%");
641 $::GAUGES->{sklprg}->set_value (@$val);
503 } 642 }
504} 643}
505 644
506sub user_send { 645sub user_send {
507 my ($self, $command) = @_; 646 my ($self, $command) = @_;
… …
509 $self->{record}->($command) 648 $self->{record}->($command)
510 if $self->{record}; 649 if $self->{record};
511 650
512 $self->logprint ("send: ", $command); 651 $self->logprint ("send: ", $command);
513 $self->send_command ($command); 652 $self->send_command ($command);
514 ::status ($command);
515} 653}
516 654
517sub record { 655sub record {
518 my ($self, $cb) = @_; 656 my ($self, $cb) = @_;
519 657
… …
521} 659}
522 660
523sub map_scroll { 661sub map_scroll {
524 my ($self, $dx, $dy) = @_; 662 my ($self, $dx, $dy) = @_;
525 663
526 $self->{map}->scroll ($dx, $dy); 664 $self->{map_widget}->scroll ($dx, $dy);
527} 665}
528 666
529sub feed_map1a { 667sub feed_map1a {
530 my ($self, $data) = @_; 668 my ($self, $data) = @_;
531 669
532 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 670 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
671 my $delay;
672
673 for my $tile (@$missing) {
674 next if $self->{delay}{$tile};
675
676 $delay = 1;
677
678 if (my $tex = $self->{texture}[$tile]) {
679 $tex->upload;
680 } else {
681 $self->{delay}{$tile} = 1;
682
683 # we assume the face is in-flight and will eventually arrive
684 push @{$self->{tile_cb}{$tile}}, sub {
685 delete $self->{delay}{$tile};
686 $_[0]->upload;
687 };
688 }
689 }
690
691 if ($delay) {
692 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
693 EV::once undef, 0, 0.03, sub {
694 $self->{map_widget}->update
695 if $self->{map_widget};
696 };
697 } else {
533 $self->{map_widget}->update; 698 $self->{map_widget}->update;
699 }
534} 700}
535 701
536sub magicmap { 702sub magicmap {
537 my ($self, $w, $h, $x, $y, $data) = @_; 703 my ($self, $w, $h, $x, $y, $data) = @_;
538 704
… …
540} 706}
541 707
542sub flush_map { 708sub flush_map {
543 my ($self) = @_; 709 my ($self) = @_;
544 710
545 my $map_info = delete $self->{map_info} 711 return unless $self->{map_info};
546 or return;
547 712
713 for my $map_info (values %{ $self->{map_cache} || {} }) {
548 my ($hash, $x, $y, $w, $h) = @$map_info; 714 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
549 715
550 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 716 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
717
718 if ($data ne $$rdata) {
719 $map_info->[1] = \$data;
720 my $cdata = Compress::LZF::compress $data;
551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 721 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 722 }
723 }
553} 724}
554 725
555sub map_clear { 726sub map_clear {
556 my ($self) = @_; 727 my ($self) = @_;
557 728
558 $self->flush_map; 729 $self->flush_map;
730 delete $self->{map_info};
559 delete $self->{neigh_map}; 731 delete $self->{neigh_map};
560 732
561 $self->{map}->clear; 733 $self->{map}->clear;
562 delete $self->{map_widget}{magicmap}; 734 delete $self->{map_widget}{magicmap};
563} 735}
564 736
565sub bg_fetch { 737sub bg_fetch {
566 my ($self) = @_; 738 my ($self) = @_;
567 739
568 my $id; 740 my $tile;
569 741
570 do { 742 do {
571 $id = pop @{$self->{bg_fetch}} 743 $tile = pop @{$self->{bg_fetch}}
572 or return; 744 or return;
573 } while $self->{texture}[$id]; 745 } while $self->{texture}[$tile];
574 746
575 CFPlus::DB::get tilecache => $id, sub { 747 DC::DB::get tilecache => $tile, sub {
576 my ($data) = @_; 748 my ($data) = @_;
577 749
578 return unless $self->{map}; # stop when destroyed 750 return unless $self->{map}; # stop when destroyed
579 751
580 $self->set_texture ($id => $data)
581 if defined $data; 752 if (defined $data) {
753 $self->have_tile ($tile, $data);
754 $self->{texture}[$tile]->upload;
755 }
582 756
583 $self->bg_fetch; 757 $self->bg_fetch;
584 }; 758 };
585} 759}
586 760
587sub load_map($$$) { 761sub load_map($$$$$$) {
588 my ($self, $hash, $x, $y) = @_; 762 my ($self, $hash, $x, $y, $w, $h) = @_;
589 763
590 my $gen = $self->{map_change_gen}; 764 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
591 765
592 CFPlus::DB::get $self->{mapcache} => $hash, sub { 766 my $cb = sub {
593 return unless $gen == $self->{map_change_gen}; 767 $map_info->[1] = \$_[0];
594 768
595 my ($data) = @_;
596
597 if (defined $data) {
598 $data = Compress::LZF::decompress $data;
599 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
600
601 my $inprogress = @{ $self->{bg_fetch} || [] }; 769 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 770 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
603 $self->bg_fetch unless $inprogress; 771 $self->bg_fetch unless $inprogress;
604 }
605 }; 772 };
773
774 if (my $map_info = $self->{map_cache_old}{$hash}) {
775 $cb->(${ $map_info->[1] });
776 } else {
777 my $gen = $self->{map_change_gen};
778
779 DC::DB::get $self->{mapcache} => $hash, sub {
780 return unless $gen == $self->{map_change_gen};
781 return unless defined $_[0];
782 $cb->(Compress::LZF::decompress $_[0]);
783 };
784 }
606} 785}
607 786
608# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 787# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
609# (server resource,s latency, bandwidth), so this hack is warranted. 788# (server resources, latency, bandwidth), so this hack is warranted.
610# the right fix is to make real tiled maps with an overview file 789# the right fix is to make real tiled maps with an overview file
611sub send_mapinfo { 790sub send_mapinfo {
612 my ($self, $data, $cb) = @_; 791 my ($self, $data, $cb) = @_;
613 792
614 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 793 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
639} 818}
640 819
641# this method does a "flood fill" into every tile direction 820# this method does a "flood fill" into every tile direction
642# it assumes that tiles are arranged in a rectangular grid, 821# it assumes that tiles are arranged in a rectangular grid,
643# i.e. a map is the same as the left of the right map etc. 822# i.e. a map is the same as the left of the right map etc.
644# failure to comply are harmless and result in display errors 823# failure to comply is harmless and results in display errors
645# at worst. 824# at worst.
646sub flood_fill { 825sub flood_fill {
647 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 826 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
648 827
649 # the server does not allow map paths > 6 828 # the server does not allow map paths > 6
… …
685 return if $mode ne "spatial"; 864 return if $mode ne "spatial";
686 865
687 $x += $self->{map}->ox; 866 $x += $self->{map}->ox;
688 $y += $self->{map}->oy; 867 $y += $self->{map}->oy;
689 868
690 $self->load_map ($hash, $x, $y) 869 $self->load_map ($hash, $x, $y, $w, $h)
691 unless $self->{neigh_map}{$hash}[5]++;#d# 870 unless $self->{neigh_map}{$hash}[5]++;#d#
692 871
693 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 872 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
694 873
695 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 874 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 882 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
704 883
705 $self->flush_map; 884 $self->flush_map;
706 885
707 ++$self->{map_change_gen}; 886 ++$self->{map_change_gen};
887 $self->{map_cache_old} = delete $self->{map_cache};
708 888
709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 889 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
710 890
711 my $mapmapw = $self->{mapmap}->{w}; 891 my $mapmapw = $self->{mapmap}->{w};
712 my $mapmaph = $self->{mapmap}->{h}; 892 my $mapmaph = $self->{mapmap}->{h};
… …
724 $self->{map_info} = [$hash, $x, $y, $w, $h]; 904 $self->{map_info} = [$hash, $x, $y, $w, $h];
725 905
726 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 906 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
727 $::STATWIDS->{map}->set_text ("Map: " . $map); 907 $::STATWIDS->{map}->set_text ("Map: " . $map);
728 908
729 $self->load_map ($hash, $x, $y); 909 $self->load_map ($hash, $x, $y, $w, $h);
730 $self->flood_fill (0, 0, 0, "", $hash, $flags); 910 $self->flood_fill (0, 0, 0, "", $hash, $flags);
731} 911}
732 912
733sub face_find { 913sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 914 my ($self, $facenum, $face, $cb) = @_;
735 915
736 my $hash = "$face->{chksum},$face->{name}"; 916 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 917 my $id = DC::DB::get_tile_id_sync $face->{name};
739 918
740 $face->{id} = $id; 919 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id;
742
743 $self->{map}->set_tileid ($facenum => $id); 920 $self->{map}->set_tileid ($facenum => $id);
744 921
745 CFPlus::DB::get tilecache => $id, $cb; 922 DC::DB::get tilecache => $id, $cb;
923
924 } elsif ($face->{type} & 1) { # with metadata
925 DC::DB::get res_meta => $face->{name}, $cb;
926
927 } else { # no metadata
928 DC::DB::get res_data => $face->{name}, $cb;
929 }
746} 930}
747 931
748sub face_update { 932sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 933 my ($self, $facenum, $face, $changed) = @_;
750 934
935 if ($face->{type} == 0) {
936 # image, FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 937 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 938 if $changed;
753 939
754 $self->set_texture ($face->{id} => delete $face->{image}); 940 $self->have_tile ($face->{id}, delete $face->{data});
941
942 } elsif ($face->{type} & 1) {
943 # split metadata case, FT_MUSIC, FT_SOUND
944 if ($changed) { # new data
945 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
946 $face->{data} = $meta;
947
948 # rely on strict ordering here and also on later fetch
949 DC::DB::put res_data => $face->{name} => $data, sub { };
950 DC::DB::put res_meta => $face->{name} => $meta, sub { };
951 }
952
953 $face->{data} = $self->{json_coder}->decode ($face->{data});
954 ::add_license ($face);
955 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
956 if $changed;
957
958 if ($face->{type} == 3) { # FT_MUSIC
959 &::audio_music_push ($facenum);
960 } elsif ($face->{type} == 5) { # FT_SOUND
961 &::audio_sound_push ($facenum);
962 }
963
964 } else {
965 # flat resource case, FT_RSRC
966 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
967 if $changed;
968 }
969
970 if (my $cbs = $self->{face_cb}{$facenum}) {
971 $_->($face, $changed) for @$cbs;
972 }
755} 973}
756 974
757sub smooth_update { 975sub smooth_update {
758 my ($self, $facenum, $face) = @_; 976 my ($self, $facenum, $face) = @_;
759 977
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 978 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 979}
762 980
763sub set_texture { 981sub have_tile {
764 my ($self, $id, $data) = @_; 982 my ($self, $tile, $data) = @_;
765 983
766 $self->{texture}[$id] = my $tex = 984 return unless $self->{map};
767 new_from_image CFPlus::Texture 985
986 my $tex = $self->{texture}[$tile] ||=
987 new DC::Texture
988 tile => $tile,
989 image => $data, delete_image => 1,
768 $data, minify => 1, mipmap => 1; 990 minify => 1, mipmap => 1;
769 991
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 992 if (my $cbs = delete $self->{tile_cb}{$tile}) {
771 $self->{map_widget}->update; 993 $_->($tex) for @$cbs;
994 }
995}
996
997# call in non-void context registers a temporary
998# hook with handle, otherwise its permanent
999sub on_face_change {
1000 my ($self, $num, $cb) = @_;
1001
1002 push @{$self->{face_cb}{$num}}, $cb;
1003
1004 defined wantarray
1005 ? DC::guard {
1006 @{$self->{face_cb}{$num}}
1007 = grep $_ != $cb,
1008 @{$self->{face_cb}{$num}};
1009 }
1010 : ()
1011}
1012
1013# call in non-void context registers a temporary
1014# hook with handle, otherwise its permanent
1015sub register_face_handler {
1016 my ($self, $num, $cb) = @_;
1017
1018 return unless $num;
1019
1020 # invoke if available right now
1021 $cb->($self->{face}[$num], 0)
1022 unless exists $self->{face}[$num]{loading};
1023
1024 # future changes
1025 $self->on_face_change ($num => $cb)
772} 1026}
773 1027
774sub sound_play { 1028sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 1029 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 1030
777 $self->{sound_play}->($x, $y, $soundnum, $type); 1031 &::audio_sound_play ($face, $dx, $dy, $vol)
1032 unless $type & 1; # odd types are silent for future expansion
778} 1033}
779 1034
780my $LAST_QUERY; # server is stupid, stupid, stupid 1035my $LAST_QUERY; # server is stupid, stupid, stupid
781 1036
782sub query { 1037sub query {
… …
790 1045
791sub sanitise_xml($) { 1046sub sanitise_xml($) {
792 local $_ = shift; 1047 local $_ = shift;
793 1048
794 # we now weed out all tags we do not support 1049 # we now weed out all tags we do not support
795 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1050 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1051 }{
1052 "&lt;"
1053 }gex;
1054
796 # now all entities 1055 # now all entities
797 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1056 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
798 1057
799 # handle some elements 1058 # handle some elements
800 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1059 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
801 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1060 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1061
1062 s/\s+$//;
802 1063
803 $_ 1064 $_
804} 1065}
805 1066
806our %NAME_TO_COLOR = ( 1067our %NAME_TO_COLOR = (
… …
847 $self->{$type} = $text; 1108 $self->{$type} = $text;
848 } else { 1109 } else {
849 $self->logprint ("msg: ", $text); 1110 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 1111 return if $color < 0; # negative color == ignore if not understood
851 1112
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1113 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
853 1114
854 ## try to create single paragraphs of multiple lines sent by the server 1115 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers 1116 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1117 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 1118
858 ::message ({ fg => $fg, markup => $_ }) 1119 ::message ({
859 for split /\n/, $text; 1120 fg => $fg,
1121 markup => $text,
1122 type => $type,
1123 extra => [@extra],
1124 color_flags => $color, #d# ugly, kill
1125 });
1126
1127# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1128# # actually, this is an ugly design. _we_ should control the channels,
1129# # not some random other widget, as the channels are clearly protocol-specific.
1130# # then we could also react to flags such as CLEAR without resorting to
1131# # hacks such as color_flags, above.
860 1132
861 $self->{statusbox}->add ($text, 1133 $self->{statusbox}->add ($text,
862 group => $text, 1134 group => $text,
863 fg => $fg, 1135 fg => $fg,
864 timeout => $color >= 2 ? 180 : 10, 1136 timeout => $color >= 2 ? 180 : 10,
865 tooltip_font => $::FONT_FIXED, 1137 tooltip_font => $::FONT_FIXED,
866 ); 1138 ) if $type eq "info";
867 } 1139 }
868} 1140}
869 1141
870sub spell_add { 1142sub spell_add {
871 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
… …
875 $spell->{message} =~ s/\n+$//; 1147 $spell->{message} =~ s/\n+$//;
876 $spell->{message} ||= "Server did not provide a description for this spell."; 1148 $spell->{message} ||= "Server did not provide a description for this spell.";
877 1149
878 $::SPELL_LIST->add_spell ($spell); 1150 $::SPELL_LIST->add_spell ($spell);
879 1151
880 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1152 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
881 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1153 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
882} 1154}
883 1155
884sub spell_delete { 1156sub spell_delete {
885 my ($self, $spell) = @_; 1157 my ($self, $spell) = @_;
886 1158
… …
897sub addme_success { 1169sub addme_success {
898 my ($self) = @_; 1170 my ($self) = @_;
899 1171
900 my %skill_help; 1172 my %skill_help;
901 1173
902 for my $node (CFPlus::Pod::find skill_description => "*") { 1174 for my $node (DC::Pod::find skill_description => "*") {
903 my (undef, @par) = CFPlus::Pod::section_of $node; 1175 my (undef, @par) = DC::Pod::section_of $node;
904 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1176 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
905 }; 1177 };
906 1178
907 for my $skill (values %{$self->{skill_info}}) { 1179 for my $skill (values %{$self->{skill_info}}) {
908 $self->{map_widget}->add_command ("ready_skill $skill", 1180 $self->{map_widget}->add_command ("ready_skill $skill",
909 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1181 (DC::asxml "Ready the skill '$skill'\n\n")
910 . $skill_help{$skill}); 1182 . $skill_help{$skill});
911 $self->{map_widget}->add_command ("use_skill $skill", 1183 $self->{map_widget}->add_command ("use_skill $skill",
912 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1184 (DC::asxml "Immediately use the skill '$skill'\n\n")
913 . $skill_help{$skill}); 1185 . $skill_help{$skill});
914 } 1186 }
915} 1187}
916 1188
917sub eof { 1189sub eof {
… …
920 $self->{map_widget}->clr_commands; 1192 $self->{map_widget}->clr_commands;
921 1193
922 ::stop_game (); 1194 ::stop_game ();
923} 1195}
924 1196
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 1197sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1198 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1199 return unless $::CONN;
962 1200
963 $::FLOORBOX->clear; 1201 $::FLOORBOX->clear;
964 1202
1203 my @add;
1204
965 my $row; 1205 my $row;
966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1206 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1207 next if $_->{tag} & 0x80000000;
967 if ($row < 6) { 1208 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1209 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1210 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1211 DC::Item::update_widgets $_;
971 1212
1213 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1214 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1215 1, $row, $_->{desc_widget};
974 1216
975 $row++; 1217 $row++;
976 } else { 1218 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1219 push @add, 1, $row, new DC::UI::Button
978 text => "More...", 1220 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1221 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1222 ;
981 last; 1223 last;
982 } 1224 }
983 } 1225 }
984 if ($::CONN->{open_container}) { 1226 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1227 push @add, 1, $row++, new DC::UI::Button
986 text => "Close container", 1228 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1229 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1230 ;
989 } 1231 }
1232
1233 $::FLOORBOX->add_at (@add);
990 }); 1234 });
991 1235
992 $::WANT_REFRESH++; 1236 $::WANT_REFRESH = 1;
993} 1237}
994 1238
995sub set_opencont { 1239sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1240 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1241 $conn->{open_container} = $tag;
998 update_floorbox; 1242 update_floorbox;
999 1243
1000 $::INV_RIGHT_HB->clear (); 1244 $::INVR_HB->clear;
1001 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1245 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1002 1246
1003 if ($tag != 0) { # Floor isn't closable, is it? 1247 if ($tag != 0) { # Floor isn't closable, is it?
1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1248 $::INVR_HB->add (new DC::UI::Button
1005 text => "Close container", 1249 text => "Close container",
1006 tooltip => "Close the currently open container (if one is open)", 1250 tooltip => "Close the currently open container (if one is open)",
1007 on_activate => sub { 1251 on_activate => sub {
1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1252 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1009 if $tag != 0; 1253 if $tag != 0;
1010 #if $CONN->{open_container} != 0;
1011 0 1254 0
1012 }, 1255 },
1013 ); 1256 );
1014 } 1257 }
1015 1258
… …
1017} 1260}
1018 1261
1019sub update_containers { 1262sub update_containers {
1020 my ($self) = @_; 1263 my ($self) = @_;
1021 1264
1022 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1265 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1023 my $todo = delete $self->{update_container} 1266 my $todo = delete $self->{update_container}
1024 or return; 1267 or return;
1025 1268
1026 for my $tag (keys %$todo) { 1269 for my $tag (keys %$todo) {
1027 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1270 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1062} 1305}
1063 1306
1064sub item_update { 1307sub item_update {
1065 my ($self, $item) = @_; 1308 my ($self, $item) = @_;
1066 1309
1067 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1310 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1068 1311
1069 CFPlus::Item::update_widgets $item; 1312 DC::Item::update_widgets $item;
1070 1313
1071 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1314 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1072 set_opencont ($::CONN, 0, "Floor"); 1315 set_opencont ($::CONN, 0, "Floor");
1073 1316
1074 } elsif ($item->{flags} & F_OPEN) { 1317 } elsif ($item->{flags} & F_OPEN) {
1075 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1318 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1076 1319
1077 } else { 1320 } else {
1078 $self->{update_container}{$item->{container}}++; 1321 $self->{update_container}{$item->{container}}++;
1079 $self->update_containers; 1322 $self->update_containers;
1080 } 1323 }
… …
1091 1334
1092 my $weight = .001 * $self->{player}{weight}; 1335 my $weight = .001 * $self->{player}{weight};
1093 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1336 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1094 1337
1095 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1338 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1096 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1339 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1097 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1340 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1098} 1341}
1099 1342
1100sub update_server_info { 1343sub update_server_info {
1101 my ($self) = @_; 1344 my ($self) = @_;
… …
1109 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1352 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1110 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1353 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1111 . "editing support $yesno[!!$self->{editor_support}]\n" 1354 . "editing support $yesno[!!$self->{editor_support}]\n"
1112 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1355 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1113 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1356 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1357 . "client support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1358 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1359 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1360 );
1118 1361
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1362}
1121 1363
1122sub logged_in { 1364sub logged_in {
1123 my ($self) = @_; 1365 my ($self) = @_;
1124 1366
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1367 $self->send_ext_req (cfplus_support => version => 2, sub {
1368 my (%msg) = @_;
1369
1126 $self->{cfplus_ext} = $_[0]{version}; 1370 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1371 $self->update_server_info;
1128 1372
1129 if ($self->{cfplus_ext} >= 2) { 1373 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1374 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1375 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1376 $self->update_server_info;
1133 1377
1134 0 1378 0
1135 }); 1379 });
1136 } 1380 }
… …
1138 0 1382 0
1139 }); 1383 });
1140 1384
1141 $self->update_server_info; 1385 $self->update_server_info;
1142 1386
1143 $self->send_command ("output-sync $::CFG->{output_sync}");
1144 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1387 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1388 $self->send_command ("pickup $::CFG->{pickup}");
1147}
1148 1389
1149sub buildat { 1390 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1150 my ($self, $builditem, $x, $y) = @_; 1391 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155} 1392}
1156 1393
1157sub lookat { 1394sub lookat {
1158 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1159 1396
1160 if ($self->{cfplus_ext}) { 1397 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1398 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1399 my (%msg) = @_;
1163 1400
1164 if (exists $msg->{npc_dialog}) { 1401 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1402 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1403 $self->{npc_dialog} = new DC::NPCDialog::
1167 dx => $x, 1404 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1405 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1406 conn => $self,
1171 ; 1407 ;
1172 } 1408 }
1173 }); 1409 });
1174 } 1410 }
… …
1185 $self->SUPER::destroy; 1421 $self->SUPER::destroy;
1186 1422
1187 %$self = (); 1423 %$self = ();
1188} 1424}
1189 1425
1190package CFPlus::NPCDialog; 1426package DC::NPCDialog;
1191 1427
1192our @ISA = 'CFPlus::UI::Toplevel'; 1428our @ISA = 'DC::UI::Toplevel';
1193 1429
1194sub new { 1430sub new {
1195 my $class = shift; 1431 my $class = shift;
1196 1432
1197 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
… …
1204 kw => { hi => 0, yes => 0, no => 0 }, 1440 kw => { hi => 0, yes => 0, no => 0 },
1205 has_close_button => 1, 1441 has_close_button => 1,
1206 @_, 1442 @_,
1207 ); 1443 );
1208 1444
1209 CFPlus::weaken (my $this = $self); 1445 DC::weaken (my $this = $self);
1210 1446
1211 $self->connect (delete => sub { $this->destroy; 1 }); 1447 $self->connect (delete => sub { $this->destroy; 1 });
1212 1448
1213 # better use a pane... 1449 # better use a pane...
1214 $self->add (my $hbox = new CFPlus::UI::HBox); 1450 $self->add (my $hbox = new DC::UI::HBox);
1215 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1451 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1216 1452
1217 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1453 $hbox->add (my $vbox = new DC::UI::VBox);
1218 1454
1219 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1455 $vbox->add (new DC::UI::Label text => "Message Entry:");
1220 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1456 $vbox->add ($self->{entry} = new DC::UI::Entry
1221 tooltip => "#npc_message_entry", 1457 tooltip => "#npc_message_entry",
1222 on_activate => sub { 1458 on_activate => sub {
1223 my ($entry, $text) = @_; 1459 my ($entry, $text) = @_;
1224 1460
1225 return unless $text =~ /\S/; 1461 return unless $text =~ /\S/;
… …
1229 1465
1230 0 1466 0
1231 }, 1467 },
1232 ); 1468 );
1233 1469
1234 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1470 $vbox->add ($self->{options} = new DC::UI::VBox);
1235 1471
1236 $self->{bye_button} = new CFPlus::UI::Button 1472 $self->{bye_button} = new DC::UI::Button
1237 text => "Bye (close)", 1473 text => "Bye (close)",
1238 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1474 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1239 on_activate => sub { $this->destroy; 1 }, 1475 on_activate => sub { $this->destroy; 1 },
1240 ; 1476 ;
1241 1477
1242 $self->update_options; 1478 $self->update_options;
1243 1479
1244 $self->{id} = $self->{conn}->send_ext_req ( 1480 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1481 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1482 $this->feed (@_) if $this;
1247 ); 1483 });
1484
1485 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1486
1249 $self->{entry}->grab_focus; 1487 $self->{entry}->grab_focus;
1250 1488
1251 $self->{textview}->add_paragraph ({ 1489 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1490 fg => [1, 1, 0, 1],
… …
1258}; 1496};
1259 1497
1260sub update_options { 1498sub update_options {
1261 my ($self) = @_; 1499 my ($self) = @_;
1262 1500
1263 CFPlus::weaken $self; 1501 DC::weaken $self;
1264 1502
1265 $self->{options}->clear; 1503 $self->{options}->clear;
1266 $self->{options}->add ($self->{bye_button}); 1504 $self->{options}->add ($self->{bye_button});
1267 1505
1268 for my $kw (sort keys %{ $self->{kw} }) { 1506 for my $kw (sort keys %{ $self->{kw} }) {
1269 $self->{options}->add (new CFPlus::UI::Button 1507 $self->{options}->add (new DC::UI::Button
1270 text => $kw, 1508 text => $kw,
1271 on_activate => sub { 1509 on_activate => sub {
1272 $self->send ($kw); 1510 $self->send ($kw);
1273 0 1511 0
1274 }, 1512 },
1275 ); 1513 );
1276 } 1514 }
1277} 1515}
1278 1516
1279sub feed { 1517sub feed {
1280 my ($self, $msg) = @_; 1518 my ($self, $type, @arg) = @_;
1281 1519
1282 CFPlus::weaken $self; 1520 DC::weaken $self;
1283 1521
1284 if ($msg->{msgtype} eq "reply") { 1522 if ($type eq "update") {
1523 my (%info) = @arg;
1524
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1525 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1526 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 1527
1528 if (exists $info{msg}) {
1529 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1530 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1531 my @link;
1532 $text =~ s{
1533 ($match)
1534 }{
1535 my $kw = $1;
1536
1537 push @link, new DC::UI::Label
1538 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1539 can_hover => 1,
1540 can_events => 1,
1541 padding_x => 0,
1542 padding_y => 0,
1543 on_button_up => sub {
1544 $self->send ($kw);
1545 };
1546
1547 "\x{fffc}"
1548 }giex;
1549
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1550 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1551 $self->{textview}->scroll_to_bottom;
1552 }
1553
1311 $self->update_options; 1554 $self->update_options;
1312 } else { 1555 } else {
1313 $self->destroy; 1556 $self->destroy;
1314 } 1557 }
1315 1558
… …
1317} 1560}
1318 1561
1319sub send { 1562sub send {
1320 my ($self, $msg) = @_; 1563 my ($self, $msg) = @_;
1321 1564
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1565 $self->{textview}->add_paragraph ({
1566 markup =>
1567 "\n<span foreground='#ffff00'><b>"
1568 . (DC::asxml $msg)
1569 . "</b></span>"
1570 });
1323 $self->{textview}->scroll_to_bottom; 1571 $self->{textview}->scroll_to_bottom;
1324 1572
1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1573 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1326} 1574}
1327 1575
1328sub destroy { 1576sub destroy {
1329 my ($self) = @_; 1577 my ($self) = @_;
1330 1578
1331 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1579 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1332 1580
1333 if ($self->{conn}) { 1581 if ($self->{conn}) {
1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1582 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1335 delete $self->{conn}{npc_dialog}; 1583 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1584 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1585 }
1338 1586
1339 $self->SUPER::destroy; 1587 $self->SUPER::destroy;

Diff Legend

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