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