… | |
… | |
20 | my ($class, %arg) = @_; |
20 | my ($class, %arg) = @_; |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
|
|
25 | excmd => 1, |
|
|
26 | xwidget1 => 1,#d# |
25 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
26 | }, |
28 | }, |
27 | ); |
29 | ); |
28 | |
30 | |
29 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
46 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
47 | @args |
49 | @args |
48 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
49 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
50 | |
52 | |
|
|
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
51 | $self->connect_ext (event_capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
52 | my ($cap) = @_; |
59 | my (%cap) = @_; |
53 | |
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
|
|
63 | |
|
|
64 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
65 | my ($exp_table) = @_; |
|
|
66 | |
|
|
67 | $self->register_face_handler ($exp_table, sub { |
|
|
68 | my ($face) = @_; |
|
|
69 | |
|
|
70 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
71 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
72 | }); |
|
|
73 | |
|
|
74 | () |
|
|
75 | }); |
|
|
76 | |
54 | if (my $ts = $cap->{tileset}) { |
77 | if (my $ts = $cap{tileset}) { |
55 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
78 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
56 | $self->{tileset} = $default; |
79 | $self->{tileset} = $default; |
57 | $self->{tilesize} = $default->[3]; |
80 | $self->{tilesize} = $default->[3]; |
58 | $self->setup_req (tileset => $default->[0]); |
81 | $self->setup_req (tileset => $default->[0]); |
59 | |
82 | |
… | |
… | |
63 | $self->setup_req (mapsize => "${w}x${h}"); |
86 | $self->setup_req (mapsize => "${w}x${h}"); |
64 | } |
87 | } |
65 | } |
88 | } |
66 | }); |
89 | }); |
67 | |
90 | |
|
|
91 | $self->{json_coder} |
|
|
92 | ->convert_blessed |
|
|
93 | ->filter_json_single_key_object (__w_ => sub { |
|
|
94 | $self->{widget}{$_[0]} |
|
|
95 | }); |
|
|
96 | |
|
|
97 | # widgetset new |
|
|
98 | $self->connect_ext (ws_n => sub { |
|
|
99 | my ($id) = @_; |
|
|
100 | |
|
|
101 | $self->{widgetset}{$id} = { |
|
|
102 | w => {}, |
|
|
103 | }; |
|
|
104 | }); |
|
|
105 | |
|
|
106 | # widgetset destroy |
|
|
107 | $self->connect_ext (ws_d => sub { |
|
|
108 | my ($id) = @_; |
|
|
109 | |
|
|
110 | my $ws = delete $self->{widgetset}{$id} |
|
|
111 | or return; |
|
|
112 | |
|
|
113 | $_->destroy |
|
|
114 | for values %{$ws->{w}}; |
|
|
115 | }); |
|
|
116 | |
|
|
117 | # widgetset create |
|
|
118 | $self->connect_ext (ws_c => sub { |
|
|
119 | my ($ws, $id, $class, $args) = @_; |
|
|
120 | |
|
|
121 | for my $ev (grep /^on_/, keys %$args) { |
|
|
122 | my $rid = $args->{$ev}; |
|
|
123 | $args->{$ev} = sub { |
|
|
124 | my $id = shift->{s_id}; |
|
|
125 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
126 | |
|
|
127 | 1 |
|
|
128 | }; |
|
|
129 | } |
|
|
130 | |
|
|
131 | $self->widget_associate ( |
|
|
132 | $ws, $id => scalar eval { |
|
|
133 | local $SIG{__DIE__}; |
|
|
134 | "CFPlus::UI::$class"->new (%$args) |
|
|
135 | } |
|
|
136 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
137 | }); |
|
|
138 | |
|
|
139 | # widgetset associate |
|
|
140 | $self->connect_ext (ws_a => sub { |
|
|
141 | my (%ass) = @_; |
|
|
142 | |
|
|
143 | # everything that has a name, wether conceivably useful or not |
|
|
144 | my %wkw = ( |
|
|
145 | root => $CFPlus::UI::ROOT, |
|
|
146 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
147 | |
|
|
148 | mapwidget => $::MAPWIDGET, |
|
|
149 | buttonbar => $::BUTTONBAR, |
|
|
150 | metaserver => $::METASERVER, |
|
|
151 | buttonbar => $::BUTTONBAR, |
|
|
152 | login_button => $::LOGIN_BUTTON, |
|
|
153 | quit_dialog => $::QUIT_DIALOG, |
|
|
154 | host_entry => $::HOST_ENTRY, |
|
|
155 | metaserver => $::METASERVER, |
|
|
156 | server_info => $::SERVER_INFO, |
|
|
157 | |
|
|
158 | setup_dialog => $::SETUP_DIALOG, |
|
|
159 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
160 | setup_server => $::SETUP_SERVER, |
|
|
161 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
162 | |
|
|
163 | pl_notebook => $::PL_NOTEBOOK, |
|
|
164 | pl_window => $::PL_WINDOW, |
|
|
165 | inventory_page => $::INVENTORY_PAGE, |
|
|
166 | stats_page => $::STATS_PAGE, |
|
|
167 | skill_page => $::SKILL_PAGE, |
|
|
168 | spell_page => $::SPELL_PAGE, |
|
|
169 | spell_list => $::SPELL_LIST, |
|
|
170 | |
|
|
171 | floorbox => $::FLOORBOX, |
|
|
172 | help_window => $::HELP_WINDOW, |
|
|
173 | message_window => $::MESSAGE_WINDOW, |
|
|
174 | statusbox => $::SDTATUSBOX, |
|
|
175 | |
|
|
176 | inv => $::INV, |
|
|
177 | invr => $::INVR, |
|
|
178 | invr_hb => $::INVR_HB, |
|
|
179 | ); |
|
|
180 | |
|
|
181 | while (my ($id, $name) = each %ass) { |
|
|
182 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
183 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
184 | } |
|
|
185 | }); |
|
|
186 | |
|
|
187 | # widget call |
|
|
188 | $self->connect_ext (w_c => sub { |
|
|
189 | my ($id, $rid, $method, @args) = @_; |
|
|
190 | |
|
|
191 | my $w = $self->{widget}{$id} |
|
|
192 | or return; |
|
|
193 | |
|
|
194 | if ($rid) { |
|
|
195 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
196 | } else { |
|
|
197 | $w->$method (@args); |
|
|
198 | } |
|
|
199 | }); |
|
|
200 | |
|
|
201 | # widget set |
|
|
202 | $self->connect_ext (w_s => sub { |
|
|
203 | my ($id, $attr) = @_; |
|
|
204 | |
|
|
205 | my $w = $self->{widget}{$id} |
|
|
206 | or return; |
|
|
207 | |
|
|
208 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
209 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
210 | if (defined $value) { |
|
|
211 | $w->{$member} = $value; |
|
|
212 | } else { |
|
|
213 | delete $w->{$member}; |
|
|
214 | } |
|
|
215 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
216 | } |
|
|
217 | }); |
|
|
218 | |
|
|
219 | # widget get |
|
|
220 | $self->connect_ext (w_g => sub { |
|
|
221 | my ($id, $rid, $attr) = @_; |
|
|
222 | |
|
|
223 | my $w = $self->{widget}{$id} |
|
|
224 | or return; |
|
|
225 | |
|
|
226 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
227 | }); |
|
|
228 | |
|
|
229 | # message window |
|
|
230 | $self->connect_ext (channel_info => sub { |
|
|
231 | my ($info) = @_; |
|
|
232 | $self->{channels}->{$info->{id}} = $info; |
|
|
233 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
234 | }); |
|
|
235 | |
|
|
236 | # destroy widgets on logout |
|
|
237 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
238 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
239 | $_->destroy |
|
|
240 | for values %{delete $ws->{w} || {}}; |
|
|
241 | } |
|
|
242 | }); |
|
|
243 | |
68 | $self->{map_widget}->add_command (@$_) |
244 | $self->{map_widget}->add_command (@$_) |
69 | for @cmd_help; |
245 | for @cmd_help; |
70 | |
246 | |
71 | { |
247 | { |
72 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
248 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
… | |
… | |
86 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
262 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
87 | |
263 | |
88 | $self |
264 | $self |
89 | } |
265 | } |
90 | |
266 | |
|
|
267 | sub widget_associate { |
|
|
268 | my ($self, $ws, $id, $widget) = @_; |
|
|
269 | |
|
|
270 | if ($widget) { |
|
|
271 | $widget->{s_id} = $id; |
|
|
272 | $self->{widget}{$id} = $widget; |
|
|
273 | |
|
|
274 | if ($ws) { |
|
|
275 | $widget->{s_ws} = $ws; |
|
|
276 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
277 | } |
|
|
278 | |
|
|
279 | $widget->connect (on_destroy => sub { |
|
|
280 | my ($widget) = @_; |
|
|
281 | |
|
|
282 | delete $self->{widget}{$widget->{s_id}}; |
|
|
283 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
284 | if exists $widget->{s_ws}; |
|
|
285 | }); |
|
|
286 | |
|
|
287 | 1 |
|
|
288 | } else { |
|
|
289 | $self->send_exti_msg (w_e => $id, undef); |
|
|
290 | |
|
|
291 | 0 |
|
|
292 | } |
|
|
293 | } |
|
|
294 | |
|
|
295 | sub update_fx_want { |
|
|
296 | my ($self) = @_; |
|
|
297 | |
|
|
298 | $self->send_exti_msg (fx_want => { |
|
|
299 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
300 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
301 | 6 => 1, # FT_RSRC |
|
|
302 | }); |
|
|
303 | } |
|
|
304 | |
91 | sub logprint { |
305 | sub logprint { |
92 | my ($self, @a) = @_; |
306 | my ($self, @a) = @_; |
93 | |
307 | |
94 | $self->{log_fh} ||= do { |
308 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
95 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
96 | |
|
|
97 | open my $fh, ">>:utf8", $path |
|
|
98 | or die "Couldn't open logfile $path: $!"; |
|
|
99 | |
|
|
100 | $fh->autoflush (1); |
|
|
101 | |
|
|
102 | $fh; |
|
|
103 | }; |
|
|
104 | |
|
|
105 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
106 | |
|
|
107 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
108 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
109 | |
|
|
110 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
111 | } |
309 | } |
112 | |
310 | |
113 | sub _stat_numdiff { |
311 | sub _stat_numdiff { |
114 | my ($self, $name, $old, $new) = @_; |
312 | my ($self, $name, $old, $new) = @_; |
115 | |
313 | |
… | |
… | |
248 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
446 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
249 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
447 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
250 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
448 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
251 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
449 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
252 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
450 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
253 | my $rng = $stats->{+CS_STAT_RANGE}; |
451 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
254 | $rng =~ s/^Range: //; # thank you so much dear server |
452 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
255 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
256 | my $title = $stats->{+CS_STAT_TITLE}; |
453 | my $title = $stats->{+CS_STAT_TITLE}; |
257 | $title =~ s/^Player: //; |
454 | $title =~ s/^Player: //; |
258 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
455 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
259 | |
456 | |
260 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
457 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
280 | my @skills = keys %{ $self->{skill_info} }; |
477 | my @skills = keys %{ $self->{skill_info} }; |
281 | |
478 | |
282 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
479 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
283 | $sktbl->clear; |
480 | $sktbl->clear; |
284 | |
481 | |
|
|
482 | my $sw = $self->{skillwid}{""} ||= [ |
285 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
286 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
287 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
288 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
289 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
290 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
491 | ]; |
|
|
492 | |
|
|
493 | my @add = @$sw; |
291 | |
494 | |
292 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
293 | |
496 | |
294 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
295 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
… | |
… | |
323 | } |
526 | } |
324 | |
527 | |
325 | 1 |
528 | 1 |
326 | }; |
529 | }; |
327 | |
530 | |
328 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
531 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
532 | # exp |
|
|
533 | (new CFPlus::UI::Label |
329 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
534 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
330 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
535 | |
|
|
536 | # level |
|
|
537 | (new CFPlus::UI::Label |
331 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
538 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
539 | |
|
|
540 | # progress |
|
|
541 | (new CFPlus::UI::ExperienceProgress), |
|
|
542 | |
|
|
543 | # label |
332 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
544 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
333 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
545 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
546 | ]; |
|
|
547 | |
|
|
548 | push @add, |
|
|
549 | $x * 4 + 0, $y, $sw->[0], |
|
|
550 | $x * 4 + 1, $y, $sw->[1], |
|
|
551 | $x * 4 + 2, $y, $sw->[2], |
|
|
552 | $x * 4 + 3, $y, $sw->[3], |
|
|
553 | ; |
334 | |
554 | |
335 | $x++ and ($x, $y) = (0, $y + 1); |
555 | $x++ and ($x, $y) = (0, $y + 1); |
336 | } |
556 | } |
|
|
557 | |
|
|
558 | $sktbl->add_at (@add); |
337 | } |
559 | } |
338 | |
560 | |
339 | for (grep exists $stats->{$_}, @skills) { |
561 | for (grep exists $stats->{$_}, @skills) { |
|
|
562 | my $sw = $self->{skillwid}{$_}; |
340 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
563 | $sw->[0]->set_text (::formsep ($stats->{$_}[1])); |
341 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
564 | $sw->[1]->set_text ($stats->{$_}[0] * 1); |
|
|
565 | $sw->[2]->set_value (@{$stats->{$_}}); |
342 | } |
566 | } |
343 | } |
567 | } |
344 | |
568 | |
345 | sub macro_send { |
569 | sub macro_send { |
346 | my ($self, $macro) = @_; |
570 | my ($self, $macro) = @_; |
… | |
… | |
374 | } |
598 | } |
375 | |
599 | |
376 | sub feed_map1a { |
600 | sub feed_map1a { |
377 | my ($self, $data) = @_; |
601 | my ($self, $data) = @_; |
378 | |
602 | |
379 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
603 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
604 | my $delay; |
|
|
605 | |
|
|
606 | for my $tile (@$missing) { |
|
|
607 | next if $self->{delay}{$tile}; |
|
|
608 | |
|
|
609 | $delay = 1; |
|
|
610 | |
|
|
611 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
612 | $tex->upload; |
|
|
613 | } else { |
|
|
614 | $self->{delay}{$tile} = 1; |
|
|
615 | |
|
|
616 | # we assume the face is in-flight and will eventually come |
|
|
617 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
618 | delete $self->{delay}{$tile}; |
|
|
619 | $_[0]->upload; |
|
|
620 | }; |
|
|
621 | } |
|
|
622 | } |
|
|
623 | |
|
|
624 | if ($delay) { |
|
|
625 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
626 | Event->timer (after => 0.03, cb => sub { |
|
|
627 | $_[0]->w->cancel; |
|
|
628 | $self->{map_widget}->update; |
|
|
629 | }); |
|
|
630 | } else { |
380 | $self->{map_widget}->update; |
631 | $self->{map_widget}->update; |
|
|
632 | } |
381 | } |
633 | } |
382 | |
634 | |
383 | sub magicmap { |
635 | sub magicmap { |
384 | my ($self, $w, $h, $x, $y, $data) = @_; |
636 | my ($self, $w, $h, $x, $y, $data) = @_; |
385 | |
637 | |
… | |
… | |
392 | my $map_info = delete $self->{map_info} |
644 | my $map_info = delete $self->{map_info} |
393 | or return; |
645 | or return; |
394 | |
646 | |
395 | my ($hash, $x, $y, $w, $h) = @$map_info; |
647 | my ($hash, $x, $y, $w, $h) = @$map_info; |
396 | |
648 | |
397 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
649 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
650 | $self->{map_cache_new}{$hash} = \$data; |
398 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
651 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
399 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
400 | } |
652 | } |
401 | |
653 | |
402 | sub map_clear { |
654 | sub map_clear { |
403 | my ($self) = @_; |
655 | my ($self) = @_; |
404 | |
656 | |
… | |
… | |
410 | } |
662 | } |
411 | |
663 | |
412 | sub bg_fetch { |
664 | sub bg_fetch { |
413 | my ($self) = @_; |
665 | my ($self) = @_; |
414 | |
666 | |
415 | my $id; |
667 | my $tile; |
416 | |
668 | |
417 | do { |
669 | do { |
418 | $id = pop @{$self->{bg_fetch}} |
670 | $tile = pop @{$self->{bg_fetch}} |
419 | or return; |
671 | or return; |
420 | } while $self->{texture}[$id]; |
672 | } while $self->{texture}[$tile]; |
421 | |
673 | |
422 | CFPlus::DB::get tilecache => $id, sub { |
674 | CFPlus::DB::get tilecache => $tile, sub { |
423 | my ($data) = @_; |
675 | my ($data) = @_; |
424 | |
676 | |
425 | return unless $self->{map}; # stop when destroyed |
677 | return unless $self->{map}; # stop when destroyed |
426 | |
678 | |
427 | $self->set_texture ($id => $data) |
|
|
428 | if defined $data; |
679 | if (defined $data) { |
|
|
680 | $self->have_tile ($tile, $data); |
|
|
681 | $self->{texture}[$tile]->upload; |
|
|
682 | } |
429 | |
683 | |
430 | $self->bg_fetch; |
684 | $self->bg_fetch; |
431 | }; |
685 | }; |
432 | } |
686 | } |
433 | |
687 | |
434 | sub load_map($$$) { |
688 | sub load_map($$$) { |
435 | my ($self, $hash, $x, $y) = @_; |
689 | my ($self, $hash, $x, $y) = @_; |
436 | |
690 | |
437 | my $gen = $self->{map_change_gen}; |
691 | my $gen = $self->{map_change_gen}; |
438 | |
692 | |
439 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
693 | my $cb = sub { |
440 | return unless $gen == $self->{map_change_gen}; |
694 | return unless $gen == $self->{map_change_gen}; |
441 | |
695 | |
442 | my ($data) = @_; |
696 | my ($data) = @_; |
443 | |
697 | |
444 | if (defined $data) { |
698 | if (defined $data) { |
|
|
699 | $self->{map_cache_new}{$hash} = \$data; |
|
|
700 | |
445 | $data = Compress::LZF::decompress $data; |
701 | my $data = Compress::LZF::decompress $data; |
446 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
447 | |
702 | |
448 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
703 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
449 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
704 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
450 | $self->bg_fetch unless $inprogress; |
705 | $self->bg_fetch unless $inprogress; |
451 | } |
706 | } |
452 | }; |
707 | }; |
|
|
708 | |
|
|
709 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
710 | $cb->($$rdata); |
|
|
711 | } else { |
|
|
712 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
713 | } |
453 | } |
714 | } |
454 | |
715 | |
455 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
716 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
456 | # (server resource,s latency, bandwidth), so this hack is warranted. |
717 | # (server resource,s latency, bandwidth), so this hack is warranted. |
457 | # the right fix is to make real tiled maps with an overview file |
718 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
550 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
811 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
551 | |
812 | |
552 | $self->flush_map; |
813 | $self->flush_map; |
553 | |
814 | |
554 | ++$self->{map_change_gen}; |
815 | ++$self->{map_change_gen}; |
|
|
816 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
555 | |
817 | |
556 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
818 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
557 | |
819 | |
558 | my $mapmapw = $self->{mapmap}->{w}; |
820 | my $mapmapw = $self->{mapmap}->{w}; |
559 | my $mapmaph = $self->{mapmap}->{h}; |
821 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
578 | } |
840 | } |
579 | |
841 | |
580 | sub face_find { |
842 | sub face_find { |
581 | my ($self, $facenum, $face, $cb) = @_; |
843 | my ($self, $facenum, $face, $cb) = @_; |
582 | |
844 | |
583 | my $hash = "$face->{chksum},$face->{name}"; |
845 | if ($face->{type} == 0) { # FT_FACE |
584 | |
|
|
585 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
846 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
586 | |
847 | |
587 | $face->{id} = $id; |
848 | $face->{id} = $id; |
588 | $self->{faceid}[$facenum] = $id; |
|
|
589 | |
|
|
590 | $self->{map}->set_tileid ($facenum => $id); |
849 | $self->{map}->set_tileid ($facenum => $id); |
591 | |
850 | |
592 | CFPlus::DB::get tilecache => $id, $cb; |
851 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
852 | |
|
|
853 | } elsif ($face->{type} & 1) { # with metadata |
|
|
854 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
855 | |
|
|
856 | } else { # no metadata |
|
|
857 | CFPlus::DB::get res_data => $face->{name}, $cb; |
|
|
858 | } |
593 | } |
859 | } |
594 | |
860 | |
595 | sub face_update { |
861 | sub face_update { |
596 | my ($self, $facenum, $face, $changed) = @_; |
862 | my ($self, $facenum, $face, $changed) = @_; |
597 | |
863 | |
|
|
864 | if ($face->{type} == 0) { |
|
|
865 | # image, FT_FACE |
598 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
866 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
599 | if $changed; |
867 | if $changed; |
600 | |
868 | |
601 | $self->set_texture ($face->{id} => delete $face->{image}); |
869 | $self->have_tile ($face->{id}, delete $face->{data}); |
|
|
870 | |
|
|
871 | } elsif ($face->{type} & 1) { |
|
|
872 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
873 | if ($changed) { # new data |
|
|
874 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
875 | $face->{data} = $meta; |
|
|
876 | |
|
|
877 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
878 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
879 | } |
|
|
880 | |
|
|
881 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
882 | |
|
|
883 | ::add_license ($face); |
|
|
884 | |
|
|
885 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
886 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
887 | if $changed; |
|
|
888 | |
|
|
889 | &::audio_music_push ($facenum); |
|
|
890 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
891 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
892 | if $changed; |
|
|
893 | |
|
|
894 | &::audio_sound_push ($facenum); |
|
|
895 | } |
|
|
896 | |
|
|
897 | } else { |
|
|
898 | # flat resource case, FT_RSRC |
|
|
899 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
900 | if $changed; |
|
|
901 | } |
|
|
902 | |
|
|
903 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
904 | $_->($face, $changed) for @$cbs; |
|
|
905 | } |
602 | } |
906 | } |
603 | |
907 | |
604 | sub smooth_update { |
908 | sub smooth_update { |
605 | my ($self, $facenum, $face) = @_; |
909 | my ($self, $facenum, $face) = @_; |
606 | |
910 | |
607 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
911 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
608 | } |
912 | } |
609 | |
913 | |
610 | sub set_texture { |
914 | sub have_tile { |
611 | my ($self, $id, $data) = @_; |
915 | my ($self, $tile, $data) = @_; |
612 | |
916 | |
613 | $self->{texture}[$id] = my $tex = |
917 | return unless $self->{map}; |
|
|
918 | |
|
|
919 | my $tex = $self->{texture}[$tile] ||= |
614 | new_from_image CFPlus::Texture |
920 | new CFPlus::Texture |
|
|
921 | tile => $tile, |
|
|
922 | image => $data, delete_image => 1, |
615 | $data, minify => 1, mipmap => 1; |
923 | minify => 1, mipmap => 1; |
616 | |
924 | |
617 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
925 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
618 | $self->{map_widget}->update; |
926 | $_->($tex) for @$cbs; |
|
|
927 | } |
|
|
928 | } |
|
|
929 | |
|
|
930 | # call in non-void context registers a temporary |
|
|
931 | # hook with handle, otherwise its permanent |
|
|
932 | sub on_face_change { |
|
|
933 | my ($self, $num, $cb) = @_; |
|
|
934 | |
|
|
935 | push @{$self->{face_cb}{$num}}, $cb; |
|
|
936 | |
|
|
937 | defined wantarray |
|
|
938 | ? CFPlus::guard { |
|
|
939 | @{$self->{face_cb}{$num}} |
|
|
940 | = grep $_ != $cb, |
|
|
941 | @{$self->{face_cb}{$num}}; |
|
|
942 | } |
|
|
943 | : () |
|
|
944 | } |
|
|
945 | |
|
|
946 | # call in non-void context registers a temporary |
|
|
947 | # hook with handle, otherwise its permanent |
|
|
948 | sub register_face_handler { |
|
|
949 | my ($self, $num, $cb) = @_; |
|
|
950 | |
|
|
951 | return unless $num; |
|
|
952 | |
|
|
953 | # invoke if available right now |
|
|
954 | $cb->($self->{face}[$num], 0) |
|
|
955 | unless exists $self->{face}[$num]{loading}; |
|
|
956 | |
|
|
957 | # future changes |
|
|
958 | $self->on_face_change ($num => $cb) |
619 | } |
959 | } |
620 | |
960 | |
621 | sub sound_play { |
961 | sub sound_play { |
622 | my ($self, $x, $y, $soundnum, $type) = @_; |
962 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
623 | |
963 | |
624 | $self->{sound_play}->($x, $y, $soundnum, $type); |
964 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
965 | unless $type & 1; # odd types are silent for future expansion |
625 | } |
966 | } |
626 | |
967 | |
627 | my $LAST_QUERY; # server is stupid, stupid, stupid |
968 | my $LAST_QUERY; # server is stupid, stupid, stupid |
628 | |
969 | |
629 | sub query { |
970 | sub query { |
… | |
… | |
633 | $LAST_QUERY = $prompt; |
974 | $LAST_QUERY = $prompt; |
634 | |
975 | |
635 | $self->{query}-> ($self, $flags, $prompt); |
976 | $self->{query}-> ($self, $flags, $prompt); |
636 | } |
977 | } |
637 | |
978 | |
638 | sub drawinfo { |
979 | sub sanitise_xml($) { |
639 | my ($self, $color, $text) = @_; |
980 | local $_ = shift; |
640 | |
981 | |
641 | my @color = ( |
982 | # we now weed out all tags we do not support |
|
|
983 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
984 | # now all entities |
|
|
985 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
986 | |
|
|
987 | # handle some elements |
|
|
988 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
989 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
990 | |
|
|
991 | $_ |
|
|
992 | } |
|
|
993 | |
|
|
994 | our %NAME_TO_COLOR = ( |
|
|
995 | black => 0, |
|
|
996 | white => 1, |
|
|
997 | darkblue => 2, |
|
|
998 | red => 3, |
|
|
999 | orange => 4, |
|
|
1000 | lightblue => 5, |
|
|
1001 | darkorange => 6, |
|
|
1002 | green => 7, |
|
|
1003 | darkgreen => 8, |
|
|
1004 | grey => 9, |
|
|
1005 | brown => 10, |
|
|
1006 | yellow => 11, |
|
|
1007 | tan => 12, |
|
|
1008 | ); |
|
|
1009 | |
|
|
1010 | our @CF_COLOR = ( |
642 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
1011 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
643 | [1.00, 1.00, 1.00], |
1012 | [1.00, 1.00, 1.00], |
644 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
1013 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
645 | [1.00, 0.00, 0.00], |
1014 | [1.00, 0.00, 0.00], |
646 | [1.00, 0.54, 0.00], |
1015 | [1.00, 0.54, 0.00], |
647 | [0.11, 0.56, 1.00], |
1016 | [0.11, 0.56, 1.00], |
648 | [0.93, 0.46, 0.00], |
1017 | [0.93, 0.46, 0.00], |
649 | [0.18, 0.54, 0.34], |
1018 | [0.18, 0.54, 0.34], |
650 | [0.56, 0.73, 0.56], |
1019 | [0.56, 0.73, 0.56], |
651 | [0.80, 0.80, 0.80], |
1020 | [0.80, 0.80, 0.80], |
652 | [0.75, 0.61, 0.20], |
1021 | [0.75, 0.61, 0.20], |
653 | [0.99, 0.77, 0.26], |
1022 | [0.99, 0.77, 0.26], |
654 | [0.74, 0.65, 0.41], |
1023 | [0.74, 0.65, 0.41], |
655 | ); |
1024 | ); |
656 | |
1025 | |
657 | my $fg = $color[$color % @color]; |
1026 | sub msg { |
|
|
1027 | my ($self, $color, $type, $text, @extra) = @_; |
658 | |
1028 | |
|
|
1029 | $text = sanitise_xml $text; |
|
|
1030 | |
|
|
1031 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
1032 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
1033 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
1034 | $type =~ s/-/_/g; |
|
|
1035 | $self->{$type} = $text; |
|
|
1036 | } else { |
659 | $self->logprint ("info: ", $text); |
1037 | $self->logprint ("msg: ", $text); |
|
|
1038 | return if $color < 0; # negative color == ignore if not understood |
660 | |
1039 | |
|
|
1040 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
|
|
1041 | |
661 | ## try to create single paragraphs of multiple lines sent by the server |
1042 | ## try to create single paragraphs of multiple lines sent by the server |
662 | # no longer neecssary with TRT servers |
1043 | # no longer neecssary with TRT servers |
663 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1044 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
664 | |
1045 | |
665 | $text = CFPlus::asxml $text; |
1046 | ::message ({ |
666 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1047 | fg => $fg, |
667 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1048 | markup => $_, |
668 | |
1049 | type => $type, |
669 | ::message ({ fg => $fg, markup => $_ }) |
1050 | extra => [@extra], |
|
|
1051 | color_flags => $color |
670 | for split /\n/, $text; |
1052 | }) for split /\n/, $text; |
671 | |
1053 | |
672 | $self->{statusbox}->add ($text, |
1054 | $self->{statusbox}->add ($text, |
673 | group => $text, |
1055 | group => $text, |
674 | fg => $fg, |
1056 | fg => $fg, |
675 | timeout => $color >= 2 ? 180 : 10, |
1057 | timeout => $color >= 2 ? 180 : 10, |
676 | tooltip_font => $::FONT_FIXED, |
1058 | tooltip_font => $::FONT_FIXED, |
677 | ); |
1059 | ); |
678 | } |
1060 | } |
679 | |
|
|
680 | sub drawextinfo { |
|
|
681 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
682 | |
|
|
683 | $self->drawinfo ($color, $message); |
|
|
684 | } |
1061 | } |
685 | |
1062 | |
686 | sub spell_add { |
1063 | sub spell_add { |
687 | my ($self, $spell) = @_; |
1064 | my ($self, $spell) = @_; |
688 | |
1065 | |
… | |
… | |
736 | $self->{map_widget}->clr_commands; |
1113 | $self->{map_widget}->clr_commands; |
737 | |
1114 | |
738 | ::stop_game (); |
1115 | ::stop_game (); |
739 | } |
1116 | } |
740 | |
1117 | |
741 | sub image_info { |
|
|
742 | my ($self, $numfaces) = @_; |
|
|
743 | |
|
|
744 | $self->{num_faces} = $numfaces; |
|
|
745 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
746 | $self->face_prefetch; |
|
|
747 | } |
|
|
748 | |
|
|
749 | sub face_prefetch { |
|
|
750 | my ($self) = @_; |
|
|
751 | |
|
|
752 | return unless $::CFG->{face_prefetch}; |
|
|
753 | |
|
|
754 | if ($self->{num_faces}) { |
|
|
755 | return if @{ $self->{send_queue} || [] }; |
|
|
756 | my $todo = @{ $self->{face_prefetch} } |
|
|
757 | or return; |
|
|
758 | |
|
|
759 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
760 | |
|
|
761 | $self->send ("requestinfo image_sums $face $face"); |
|
|
762 | |
|
|
763 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
764 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
765 | } elsif (!exists $self->{num_faces}) { |
|
|
766 | $self->send ("requestinfo image_info"); |
|
|
767 | |
|
|
768 | $self->{num_faces} = 0; |
|
|
769 | |
|
|
770 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
771 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
772 | } |
|
|
773 | } |
|
|
774 | |
|
|
775 | sub update_floorbox { |
1118 | sub update_floorbox { |
776 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1119 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
777 | return unless $::CONN; |
1120 | return unless $::CONN; |
778 | |
1121 | |
779 | $::FLOORBOX->clear; |
1122 | $::FLOORBOX->clear; |
|
|
1123 | |
|
|
1124 | my @add; |
780 | |
1125 | |
781 | my $row; |
1126 | my $row; |
782 | 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} }) { |
783 | if ($row < 6) { |
1128 | if ($row < 6) { |
784 | local $_->{face_widget}; # hack to force recreation of widget |
1129 | local $_->{face_widget}; # hack to force recreation of widget |
785 | local $_->{desc_widget}; # hack to force recreation of widget |
1130 | local $_->{desc_widget}; # hack to force recreation of widget |
786 | CFPlus::Item::update_widgets $_; |
1131 | CFPlus::Item::update_widgets $_; |
787 | |
1132 | |
|
|
1133 | push @add, |
788 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1134 | 0, $row, $_->{face_widget}, |
789 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1135 | 1, $row, $_->{desc_widget}; |
790 | |
1136 | |
791 | $row++; |
1137 | $row++; |
792 | } else { |
1138 | } else { |
793 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1139 | push @add, 1, $row, new CFPlus::UI::Button |
794 | text => "More...", |
1140 | text => "More...", |
795 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1141 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
796 | ); |
1142 | ; |
797 | last; |
1143 | last; |
798 | } |
1144 | } |
799 | } |
1145 | } |
800 | if ($::CONN->{open_container}) { |
1146 | if ($::CONN->{open_container}) { |
801 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1147 | push @add, 1, $row++, new CFPlus::UI::Button |
802 | text => "Close container", |
1148 | text => "Close container", |
803 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1149 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
804 | ); |
1150 | ; |
805 | } |
1151 | } |
806 | }); |
|
|
807 | |
1152 | |
|
|
1153 | $::FLOORBOX->add_at (@add); |
|
|
1154 | }); |
|
|
1155 | |
808 | $::WANT_REFRESH++; |
1156 | $::WANT_REFRESH->start; |
809 | } |
1157 | } |
810 | |
1158 | |
811 | sub set_opencont { |
1159 | sub set_opencont { |
812 | my ($conn, $tag, $name) = @_; |
1160 | my ($conn, $tag, $name) = @_; |
813 | $conn->{open_container} = $tag; |
1161 | $conn->{open_container} = $tag; |
814 | update_floorbox; |
1162 | update_floorbox; |
815 | |
1163 | |
816 | $::INV_RIGHT_HB->clear (); |
1164 | $::INVR_HB->clear (); |
817 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1165 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
818 | |
1166 | |
819 | if ($tag != 0) { # Floor isn't closable, is it? |
1167 | if ($tag != 0) { # Floor isn't closable, is it? |
820 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1168 | $::INVR_HB->add (new CFPlus::UI::Button |
821 | text => "Close container", |
1169 | text => "Close container", |
822 | tooltip => "Close the currently open container (if one is open)", |
1170 | tooltip => "Close the currently open container (if one is open)", |
823 | on_activate => sub { |
1171 | on_activate => sub { |
824 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1172 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
825 | if $tag != 0; |
1173 | if $tag != 0; |
826 | #if $CONN->{open_container} != 0; |
|
|
827 | 0 |
1174 | 0 |
828 | }, |
1175 | }, |
829 | ); |
1176 | ); |
830 | } |
1177 | } |
831 | |
1178 | |
… | |
… | |
921 | $::SERVER_INFO->set_markup ( |
1268 | $::SERVER_INFO->set_markup ( |
922 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1269 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
923 | . "protocol version <tt>$self->{version}</tt>\n" |
1270 | . "protocol version <tt>$self->{version}</tt>\n" |
924 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1271 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
925 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1272 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1273 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
926 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1274 | . "editing support $yesno[!!$self->{editor_support}]\n" |
927 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1275 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1276 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
928 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1277 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
929 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1278 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
930 | . "map size $self->{mapw}×$self->{maph}\n" |
1279 | . "map size $self->{mapw}×$self->{maph}\n" |
931 | ); |
1280 | ); |
932 | |
1281 | |
933 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
934 | } |
1282 | } |
935 | |
1283 | |
936 | sub logged_in { |
1284 | sub logged_in { |
937 | my ($self) = @_; |
1285 | my ($self) = @_; |
938 | |
1286 | |
939 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1287 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1288 | my (%msg) = @_; |
|
|
1289 | |
940 | $self->{cfplus_ext} = $_[0]{version}; |
1290 | $self->{cfplus_ext} = $msg{version}; |
941 | $self->update_server_info; |
1291 | $self->update_server_info; |
942 | |
1292 | |
943 | if ($self->{cfplus_ext} >= 2) { |
1293 | if ($self->{cfplus_ext} >= 2) { |
944 | $self->send_ext_req ("editor_support", sub { |
1294 | $self->send_ext_req ("editor_support", sub { |
945 | $self->{editor_support} = $_[0]; |
1295 | $self->{editor_support} = { @_ }; |
946 | $self->update_server_info; |
1296 | $self->update_server_info; |
947 | |
1297 | |
948 | 0 |
1298 | 0 |
949 | }); |
1299 | }); |
950 | } |
1300 | } |
… | |
… | |
958 | $self->send_command ("output-count $::CFG->{output_count}"); |
1308 | $self->send_command ("output-count $::CFG->{output_count}"); |
959 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1309 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
960 | $self->send_command ("pickup $::CFG->{pickup}"); |
1310 | $self->send_command ("pickup $::CFG->{pickup}"); |
961 | } |
1311 | } |
962 | |
1312 | |
963 | sub buildat { |
|
|
964 | my ($self, $builditem, $x, $y) = @_; |
|
|
965 | |
|
|
966 | if ($self->{cfplus_ext}) { |
|
|
967 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
968 | } |
|
|
969 | } |
|
|
970 | |
|
|
971 | sub lookat { |
1313 | sub lookat { |
972 | my ($self, $x, $y) = @_; |
1314 | my ($self, $x, $y) = @_; |
973 | |
1315 | |
974 | if ($self->{cfplus_ext}) { |
1316 | if ($self->{cfplus_ext}) { |
975 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1317 | $self->send_ext_req (lookat => $x, $y, sub { |
976 | my ($msg) = @_; |
1318 | my (%msg) = @_; |
977 | |
1319 | |
978 | if (exists $msg->{npc_dialog}) { |
1320 | if (exists $msg{npc_dialog}) { |
979 | # start npc chat dialog |
1321 | # start npc chat dialog |
980 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1322 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
981 | dx => $x, |
1323 | token => $msg{npc_dialog}, |
982 | dy => $y, |
|
|
983 | title => "$msg->{npc_dialog} (NPC)", |
1324 | title => "$msg{npc_dialog}[0] (NPC)", |
984 | conn => $self, |
1325 | conn => $self, |
985 | ; |
1326 | ; |
986 | } |
1327 | } |
987 | }); |
1328 | }); |
988 | } |
1329 | } |
… | |
… | |
995 | |
1336 | |
996 | (delete $self->{npc_dialog})->destroy |
1337 | (delete $self->{npc_dialog})->destroy |
997 | if $self->{npc_dialog}; |
1338 | if $self->{npc_dialog}; |
998 | |
1339 | |
999 | $self->SUPER::destroy; |
1340 | $self->SUPER::destroy; |
|
|
1341 | |
|
|
1342 | %$self = (); |
1000 | } |
1343 | } |
1001 | |
1344 | |
1002 | package CFPlus::NPCDialog; |
1345 | package CFPlus::NPCDialog; |
1003 | |
1346 | |
1004 | our @ISA = 'CFPlus::UI::Toplevel'; |
1347 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1051 | on_activate => sub { $this->destroy; 1 }, |
1394 | on_activate => sub { $this->destroy; 1 }, |
1052 | ; |
1395 | ; |
1053 | |
1396 | |
1054 | $self->update_options; |
1397 | $self->update_options; |
1055 | |
1398 | |
1056 | $self->{id} = $self->{conn}->send_ext_req ( |
1399 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1057 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1400 | $self->{conn}->connect_ext ($self->{id} => sub { |
1058 | sub { $this && $this->feed (@_) } |
1401 | $this->feed (@_) if $this; |
1059 | ); |
1402 | }); |
|
|
1403 | |
|
|
1404 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1060 | |
1405 | |
1061 | $self->{entry}->grab_focus; |
1406 | $self->{entry}->grab_focus; |
1062 | |
1407 | |
1063 | $self->{textview}->add_paragraph ({ |
1408 | $self->{textview}->add_paragraph ({ |
1064 | fg => [1, 1, 0, 1], |
1409 | fg => [1, 1, 0, 1], |
… | |
… | |
1087 | ); |
1432 | ); |
1088 | } |
1433 | } |
1089 | } |
1434 | } |
1090 | |
1435 | |
1091 | sub feed { |
1436 | sub feed { |
1092 | my ($self, $msg) = @_; |
1437 | my ($self, $type, @arg) = @_; |
1093 | |
1438 | |
1094 | CFPlus::weaken $self; |
1439 | CFPlus::weaken $self; |
1095 | |
1440 | |
1096 | if ($msg->{msgtype} eq "reply") { |
1441 | if ($type eq "update") { |
|
|
1442 | my (%info) = @arg; |
|
|
1443 | |
1097 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1444 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1098 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1445 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1099 | |
|
|
1100 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
|
|
1101 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1102 | my @link; |
|
|
1103 | $text =~ s{ |
|
|
1104 | ($match) |
|
|
1105 | }{ |
|
|
1106 | my $kw = $1; |
|
|
1107 | |
|
|
1108 | push @link, new CFPlus::UI::Label |
|
|
1109 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1110 | can_hover => 1, |
|
|
1111 | can_events => 1, |
|
|
1112 | padding_x => 0, |
|
|
1113 | padding_y => 0, |
|
|
1114 | on_button_up => sub { |
|
|
1115 | $self->send ($kw); |
|
|
1116 | }; |
|
|
1117 | |
|
|
1118 | "\x{fffc}" |
|
|
1119 | }giex; |
|
|
1120 | |
1446 | |
|
|
1447 | if (exists $info{msg}) { |
|
|
1448 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1449 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1450 | my @link; |
|
|
1451 | $text =~ s{ |
|
|
1452 | ($match) |
|
|
1453 | }{ |
|
|
1454 | my $kw = $1; |
|
|
1455 | |
|
|
1456 | push @link, new CFPlus::UI::Label |
|
|
1457 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1458 | can_hover => 1, |
|
|
1459 | can_events => 1, |
|
|
1460 | padding_x => 0, |
|
|
1461 | padding_y => 0, |
|
|
1462 | on_button_up => sub { |
|
|
1463 | $self->send ($kw); |
|
|
1464 | }; |
|
|
1465 | |
|
|
1466 | "\x{fffc}" |
|
|
1467 | }giex; |
|
|
1468 | |
1121 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1469 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1122 | $self->{textview}->scroll_to_bottom; |
1470 | $self->{textview}->scroll_to_bottom; |
|
|
1471 | } |
|
|
1472 | |
1123 | $self->update_options; |
1473 | $self->update_options; |
1124 | } else { |
1474 | } else { |
1125 | $self->destroy; |
1475 | $self->destroy; |
1126 | } |
1476 | } |
1127 | |
1477 | |
… | |
… | |
1132 | my ($self, $msg) = @_; |
1482 | my ($self, $msg) = @_; |
1133 | |
1483 | |
1134 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1484 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1135 | $self->{textview}->scroll_to_bottom; |
1485 | $self->{textview}->scroll_to_bottom; |
1136 | |
1486 | |
1137 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1487 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1138 | } |
1488 | } |
1139 | |
1489 | |
1140 | sub destroy { |
1490 | sub destroy { |
1141 | my ($self) = @_; |
1491 | my ($self) = @_; |
1142 | |
1492 | |
1143 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1493 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1144 | |
1494 | |
1145 | if ($self->{conn}) { |
1495 | if ($self->{conn}) { |
1146 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1496 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1147 | delete $self->{conn}{npc_dialog}; |
1497 | delete $self->{conn}{npc_dialog}; |
1148 | $self->{conn}->disconnect_ext ($self->{id}); |
1498 | $self->{conn}->disconnect_ext ($self->{id}); |
1149 | } |
1499 | } |
1150 | |
1500 | |
1151 | $self->SUPER::destroy; |
1501 | $self->SUPER::destroy; |