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.218 by root, Thu Apr 8 19:11:21 2010 UTC

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

Diff Legend

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