… | |
… | |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | excmd => 1, |
25 | excmd => 1, |
26 | xwidget => 1, |
26 | xwidget1 => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
49 | @args |
49 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
52 | |
52 | |
|
|
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
53 | $self->connect_ext (event_capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
54 | my ($cap) = @_; |
59 | my (%cap) = @_; |
55 | |
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 | |
56 | if (my $ts = $cap->{tileset}) { |
77 | if (my $ts = $cap{tileset}) { |
57 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
78 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
58 | $self->{tileset} = $default; |
79 | $self->{tileset} = $default; |
59 | $self->{tilesize} = $default->[3]; |
80 | $self->{tilesize} = $default->[3]; |
60 | $self->setup_req (tileset => $default->[0]); |
81 | $self->setup_req (tileset => $default->[0]); |
61 | |
82 | |
… | |
… | |
65 | $self->setup_req (mapsize => "${w}x${h}"); |
86 | $self->setup_req (mapsize => "${w}x${h}"); |
66 | } |
87 | } |
67 | } |
88 | } |
68 | }); |
89 | }); |
69 | |
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 |
70 | $self->connect_ext (ws_n => sub { |
98 | $self->connect_ext (ws_n => sub { |
71 | my ($arg) = @_; |
99 | my ($id) = @_; |
72 | |
100 | |
73 | $self->{widgetset}{$arg{id}} = { |
101 | $self->{widgetset}{$id} = { |
74 | w => {}, |
102 | w => {}, |
75 | }; |
103 | }; |
76 | }); |
104 | }); |
77 | |
105 | |
|
|
106 | # widgetset destroy |
78 | $self->connect_ext (ws_d => sub { |
107 | $self->connect_ext (ws_d => sub { |
79 | my ($arg) = @_; |
108 | my ($id) = @_; |
80 | |
109 | |
81 | my $ws = delete $self->{widgetset}{$arg{id}} |
110 | my $ws = delete $self->{widgetset}{$id} |
82 | or return; |
111 | or return; |
83 | |
112 | |
84 | $_->destroy |
113 | $_->destroy |
85 | for values %{$ws->{w}}; |
114 | for values %{$ws->{w}}; |
86 | }); |
115 | }); |
87 | |
116 | |
|
|
117 | # widgetset create |
88 | $self->connect_ext (ws_c => sub { |
118 | $self->connect_ext (ws_c => sub { |
89 | my ($arg) = @_; |
119 | my ($ws, $id, $class, $args) = @_; |
90 | |
|
|
91 | my $args = $arg->{args} || {}; |
|
|
92 | |
120 | |
93 | for my $ev (grep /^on_/, keys %$args) { |
121 | for my $ev (grep /^on_/, keys %$args) { |
|
|
122 | my $rid = $args->{$ev}; |
94 | $args->{$ev} = sub { |
123 | $args->{$ev} = sub { |
95 | my $id = shift->{s_id}; |
124 | my $id = shift->{s_id}; |
96 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
125 | $self->send_exti_msg (w_e => $id, $rid, @_); |
97 | |
126 | |
98 | 1 |
127 | 1 |
99 | }; |
128 | }; |
100 | } |
129 | } |
101 | |
130 | |
102 | if (my $widget = eval { |
131 | $self->widget_associate ( |
|
|
132 | $ws, $id => scalar eval { |
|
|
133 | local $SIG{__DIE__}; |
103 | "CFPlus::UI::$arg->{class}"->new ( |
134 | "CFPlus::UI::$class"->new (%$args) |
104 | %$args, |
|
|
105 | s_ws => $arg->{ws}, |
|
|
106 | s_id => $arg->{id}, |
|
|
107 | ) |
|
|
108 | } |
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, |
109 | ) { |
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 | |
110 | $self->{widget}{$arg->{id}} |
191 | my $w = $self->{widget}{$id} |
111 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
192 | or return; |
112 | = $widget; |
|
|
113 | |
193 | |
114 | $widget->connect (on_destroy => sub { |
194 | if ($rid) { |
115 | my ($widget) = @_; |
195 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
116 | |
|
|
117 | delete $self->{widget}{$widget->{s_id}}; |
|
|
118 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
119 | }); |
|
|
120 | } else { |
196 | } else { |
121 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
197 | $w->$method (@args); |
122 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
123 | } |
198 | } |
124 | }); |
199 | }); |
125 | |
200 | |
|
|
201 | # widget set |
126 | $self->connect_ext (w_c => sub { |
202 | $self->connect_ext (w_s => sub { |
127 | my ($arg) = @_; |
203 | my ($id, $attr) = @_; |
128 | |
204 | |
129 | my $w = $self->{widget}{$arg->{id}} |
205 | my $w = $self->{widget}{$id} |
130 | or return; |
206 | or return; |
131 | my $m = $arg->{name}; |
|
|
132 | |
207 | |
133 | my @a = map { |
208 | for (my $i = 0; $i < $#$attr; $i += 2) { |
134 | "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__} |
209 | my ($member, $value) = @$attr[$i, $i+1]; |
135 | ? $self->{widget}{$_->{__widget_ref__}} |
210 | if (defined $value) { |
136 | : $_ |
211 | $w->{$member} = $value; |
137 | } @{ $arg->{args} || [] }; |
|
|
138 | |
|
|
139 | if (exists $arg->{rid}) { |
|
|
140 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); |
|
|
141 | } else { |
212 | } else { |
142 | $w->$m (@a); |
213 | delete $w->{$member}; |
143 | } |
214 | } |
|
|
215 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
216 | } |
144 | }); |
217 | }); |
145 | |
218 | |
|
|
219 | # widget get |
146 | $self->connect_ext (w_s => sub { |
220 | $self->connect_ext (w_g => sub { |
147 | my ($arg) = @_; |
221 | my ($id, $rid, $attr) = @_; |
148 | |
222 | |
149 | my $w = $self->{widget}{$arg->{id}} |
223 | my $w = $self->{widget}{$id} |
150 | or return; |
224 | or return; |
151 | |
225 | |
152 | $w->{$arg->{name}} = $arg->{value}; |
226 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
153 | }); |
227 | }); |
154 | |
228 | |
|
|
229 | # message window |
155 | $self->connect_ext (w_g => sub { |
230 | $self->connect_ext (channel_info => sub { |
156 | my ($arg) = @_; |
231 | my ($info) = @_; |
157 | |
232 | $self->{channels}->{$info->{id}} = $info; |
158 | my $w = $self->{widget}{$arg->{id}} |
233 | $::MESSAGE_WINDOW->add_channel ($info); |
159 | or return; |
|
|
160 | |
|
|
161 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
162 | }); |
234 | }); |
163 | |
235 | |
|
|
236 | # destroy widgets on logout |
164 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
237 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
165 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
238 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
166 | $_->destroy |
239 | $_->destroy |
167 | for values %{delete $ws->{w} || {}}; |
240 | for values %{delete $ws->{w} || {}}; |
168 | } |
241 | } |
… | |
… | |
189 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
262 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
190 | |
263 | |
191 | $self |
264 | $self |
192 | } |
265 | } |
193 | |
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 | |
194 | sub logprint { |
305 | sub logprint { |
195 | my ($self, @a) = @_; |
306 | my ($self, @a) = @_; |
196 | |
307 | |
197 | $self->{log_fh} ||= do { |
308 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
198 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
199 | |
|
|
200 | open my $fh, ">>:utf8", $path |
|
|
201 | or die "Couldn't open logfile $path: $!"; |
|
|
202 | |
|
|
203 | $fh->autoflush (1); |
|
|
204 | |
|
|
205 | $fh; |
|
|
206 | }; |
|
|
207 | |
|
|
208 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
209 | |
|
|
210 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
211 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
212 | |
|
|
213 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
214 | } |
309 | } |
215 | |
310 | |
216 | sub _stat_numdiff { |
311 | sub _stat_numdiff { |
217 | my ($self, $name, $old, $new) = @_; |
312 | my ($self, $name, $old, $new) = @_; |
218 | |
313 | |
… | |
… | |
351 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
446 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
352 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
447 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
353 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
448 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
354 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
449 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
355 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
450 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
451 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
356 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
452 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
357 | my $title = $stats->{+CS_STAT_TITLE}; |
453 | my $title = $stats->{+CS_STAT_TITLE}; |
358 | $title =~ s/^Player: //; |
454 | $title =~ s/^Player: //; |
359 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
455 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
360 | |
456 | |
… | |
… | |
381 | my @skills = keys %{ $self->{skill_info} }; |
477 | my @skills = keys %{ $self->{skill_info} }; |
382 | |
478 | |
383 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
479 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
384 | $sktbl->clear; |
480 | $sktbl->clear; |
385 | |
481 | |
|
|
482 | my @add; |
|
|
483 | |
|
|
484 | push @add, |
386 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
485 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
387 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
486 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
487 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
388 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
488 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
389 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
489 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
390 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
490 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
491 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
391 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
492 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
493 | ; |
392 | |
494 | |
393 | 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>"; |
394 | |
496 | |
395 | 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); |
396 | 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); |
… | |
… | |
424 | } |
526 | } |
425 | |
527 | |
426 | 1 |
528 | 1 |
427 | }; |
529 | }; |
428 | |
530 | |
|
|
531 | push @add, |
429 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
532 | $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label |
430 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
533 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
431 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
534 | $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label |
432 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
535 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
433 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
536 | $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress), |
|
|
537 | $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
434 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
538 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
539 | ; |
435 | |
540 | |
436 | $x++ and ($x, $y) = (0, $y + 1); |
541 | $x++ and ($x, $y) = (0, $y + 1); |
437 | } |
542 | } |
|
|
543 | |
|
|
544 | $sktbl->add_at (@add); |
438 | } |
545 | } |
439 | |
546 | |
440 | for (grep exists $stats->{$_}, @skills) { |
547 | for (grep exists $stats->{$_}, @skills) { |
441 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
548 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
442 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
549 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
|
|
550 | $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}}); |
443 | } |
551 | } |
444 | } |
552 | } |
445 | |
553 | |
446 | sub macro_send { |
554 | sub macro_send { |
447 | my ($self, $macro) = @_; |
555 | my ($self, $macro) = @_; |
… | |
… | |
475 | } |
583 | } |
476 | |
584 | |
477 | sub feed_map1a { |
585 | sub feed_map1a { |
478 | my ($self, $data) = @_; |
586 | my ($self, $data) = @_; |
479 | |
587 | |
480 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
588 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
589 | my $delay; |
|
|
590 | |
|
|
591 | for my $tile (@$missing) { |
|
|
592 | next if $self->{delay}{$tile}; |
|
|
593 | |
|
|
594 | $delay = 1; |
|
|
595 | |
|
|
596 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
597 | $tex->upload; |
|
|
598 | } else { |
|
|
599 | $self->{delay}{$tile} = 1; |
|
|
600 | |
|
|
601 | # we assume the face is in-flight and will eventually come |
|
|
602 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
603 | delete $self->{delay}{$tile}; |
|
|
604 | $_[0]->upload; |
|
|
605 | }; |
|
|
606 | } |
|
|
607 | } |
|
|
608 | |
|
|
609 | if ($delay) { |
|
|
610 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
611 | Event->timer (after => 0.03, cb => sub { |
|
|
612 | $_[0]->w->cancel; |
|
|
613 | $self->{map_widget}->update; |
|
|
614 | }); |
|
|
615 | } else { |
481 | $self->{map_widget}->update; |
616 | $self->{map_widget}->update; |
|
|
617 | } |
482 | } |
618 | } |
483 | |
619 | |
484 | sub magicmap { |
620 | sub magicmap { |
485 | my ($self, $w, $h, $x, $y, $data) = @_; |
621 | my ($self, $w, $h, $x, $y, $data) = @_; |
486 | |
622 | |
… | |
… | |
493 | my $map_info = delete $self->{map_info} |
629 | my $map_info = delete $self->{map_info} |
494 | or return; |
630 | or return; |
495 | |
631 | |
496 | my ($hash, $x, $y, $w, $h) = @$map_info; |
632 | my ($hash, $x, $y, $w, $h) = @$map_info; |
497 | |
633 | |
498 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
634 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
635 | $self->{map_cache_new}{$hash} = \$data; |
499 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
636 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
500 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
501 | } |
637 | } |
502 | |
638 | |
503 | sub map_clear { |
639 | sub map_clear { |
504 | my ($self) = @_; |
640 | my ($self) = @_; |
505 | |
641 | |
… | |
… | |
511 | } |
647 | } |
512 | |
648 | |
513 | sub bg_fetch { |
649 | sub bg_fetch { |
514 | my ($self) = @_; |
650 | my ($self) = @_; |
515 | |
651 | |
516 | my $id; |
652 | my $tile; |
517 | |
653 | |
518 | do { |
654 | do { |
519 | $id = pop @{$self->{bg_fetch}} |
655 | $tile = pop @{$self->{bg_fetch}} |
520 | or return; |
656 | or return; |
521 | } while $self->{texture}[$id]; |
657 | } while $self->{texture}[$tile]; |
522 | |
658 | |
523 | CFPlus::DB::get tilecache => $id, sub { |
659 | CFPlus::DB::get tilecache => $tile, sub { |
524 | my ($data) = @_; |
660 | my ($data) = @_; |
525 | |
661 | |
526 | return unless $self->{map}; # stop when destroyed |
662 | return unless $self->{map}; # stop when destroyed |
527 | |
663 | |
528 | $self->set_texture ($id => $data) |
|
|
529 | if defined $data; |
664 | if (defined $data) { |
|
|
665 | $self->have_tile ($tile, $data); |
|
|
666 | $self->{texture}[$tile]->upload; |
|
|
667 | } |
530 | |
668 | |
531 | $self->bg_fetch; |
669 | $self->bg_fetch; |
532 | }; |
670 | }; |
533 | } |
671 | } |
534 | |
672 | |
535 | sub load_map($$$) { |
673 | sub load_map($$$) { |
536 | my ($self, $hash, $x, $y) = @_; |
674 | my ($self, $hash, $x, $y) = @_; |
537 | |
675 | |
538 | my $gen = $self->{map_change_gen}; |
676 | my $gen = $self->{map_change_gen}; |
539 | |
677 | |
540 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
678 | my $cb = sub { |
541 | return unless $gen == $self->{map_change_gen}; |
679 | return unless $gen == $self->{map_change_gen}; |
542 | |
680 | |
543 | my ($data) = @_; |
681 | my ($data) = @_; |
544 | |
682 | |
545 | if (defined $data) { |
683 | if (defined $data) { |
|
|
684 | $self->{map_cache_new}{$hash} = \$data; |
|
|
685 | |
546 | $data = Compress::LZF::decompress $data; |
686 | my $data = Compress::LZF::decompress $data; |
547 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
548 | |
687 | |
549 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
688 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
550 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
689 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
551 | $self->bg_fetch unless $inprogress; |
690 | $self->bg_fetch unless $inprogress; |
552 | } |
691 | } |
553 | }; |
692 | }; |
|
|
693 | |
|
|
694 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
695 | $cb->($$rdata); |
|
|
696 | } else { |
|
|
697 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
698 | } |
554 | } |
699 | } |
555 | |
700 | |
556 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
701 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
557 | # (server resource,s latency, bandwidth), so this hack is warranted. |
702 | # (server resource,s latency, bandwidth), so this hack is warranted. |
558 | # the right fix is to make real tiled maps with an overview file |
703 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
651 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
796 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
652 | |
797 | |
653 | $self->flush_map; |
798 | $self->flush_map; |
654 | |
799 | |
655 | ++$self->{map_change_gen}; |
800 | ++$self->{map_change_gen}; |
|
|
801 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
656 | |
802 | |
657 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
803 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
658 | |
804 | |
659 | my $mapmapw = $self->{mapmap}->{w}; |
805 | my $mapmapw = $self->{mapmap}->{w}; |
660 | my $mapmaph = $self->{mapmap}->{h}; |
806 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
679 | } |
825 | } |
680 | |
826 | |
681 | sub face_find { |
827 | sub face_find { |
682 | my ($self, $facenum, $face, $cb) = @_; |
828 | my ($self, $facenum, $face, $cb) = @_; |
683 | |
829 | |
684 | my $hash = "$face->{chksum},$face->{name}"; |
830 | if ($face->{type} == 0) { # FT_FACE |
685 | |
|
|
686 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
831 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
687 | |
832 | |
688 | $face->{id} = $id; |
833 | $face->{id} = $id; |
689 | $self->{faceid}[$facenum] = $id; |
|
|
690 | |
|
|
691 | $self->{map}->set_tileid ($facenum => $id); |
834 | $self->{map}->set_tileid ($facenum => $id); |
692 | |
835 | |
693 | CFPlus::DB::get tilecache => $id, $cb; |
836 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
837 | |
|
|
838 | } elsif ($face->{type} & 1) { # with metadata |
|
|
839 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
840 | |
|
|
841 | } else { # no metadata |
|
|
842 | CFPlus::DB::get res_data => $face->{name}, $cb; |
|
|
843 | } |
694 | } |
844 | } |
695 | |
845 | |
696 | sub face_update { |
846 | sub face_update { |
697 | my ($self, $facenum, $face, $changed) = @_; |
847 | my ($self, $facenum, $face, $changed) = @_; |
698 | |
848 | |
|
|
849 | if ($face->{type} == 0) { |
|
|
850 | # image, FT_FACE |
699 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
851 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
700 | if $changed; |
852 | if $changed; |
701 | |
853 | |
702 | $self->set_texture ($face->{id} => delete $face->{image}); |
854 | $self->have_tile ($face->{id}, delete $face->{data}); |
|
|
855 | |
|
|
856 | } elsif ($face->{type} & 1) { |
|
|
857 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
858 | if ($changed) { # new data |
|
|
859 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
860 | $face->{data} = $meta; |
|
|
861 | |
|
|
862 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
863 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
864 | } |
|
|
865 | |
|
|
866 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
867 | |
|
|
868 | ::add_license ($face); |
|
|
869 | |
|
|
870 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
871 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
872 | if $changed; |
|
|
873 | |
|
|
874 | &::audio_music_push ($facenum); |
|
|
875 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
876 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
877 | if $changed; |
|
|
878 | |
|
|
879 | &::audio_sound_push ($facenum); |
|
|
880 | } |
|
|
881 | |
|
|
882 | } else { |
|
|
883 | # flat resource case, FT_RSRC |
|
|
884 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
885 | if $changed; |
|
|
886 | } |
|
|
887 | |
|
|
888 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
889 | $_->($face, $changed) for @$cbs; |
|
|
890 | } |
703 | } |
891 | } |
704 | |
892 | |
705 | sub smooth_update { |
893 | sub smooth_update { |
706 | my ($self, $facenum, $face) = @_; |
894 | my ($self, $facenum, $face) = @_; |
707 | |
895 | |
708 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
896 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
709 | } |
897 | } |
710 | |
898 | |
711 | sub set_texture { |
899 | sub have_tile { |
712 | my ($self, $id, $data) = @_; |
900 | my ($self, $tile, $data) = @_; |
713 | |
901 | |
714 | $self->{texture}[$id] = my $tex = |
902 | return unless $self->{map}; |
|
|
903 | |
|
|
904 | my $tex = $self->{texture}[$tile] ||= |
715 | new_from_image CFPlus::Texture |
905 | new CFPlus::Texture |
|
|
906 | tile => $tile, |
|
|
907 | image => $data, delete_image => 1, |
716 | $data, minify => 1, mipmap => 1; |
908 | minify => 1, mipmap => 1; |
717 | |
909 | |
718 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
910 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
719 | $self->{map_widget}->update; |
911 | $_->($tex) for @$cbs; |
|
|
912 | } |
|
|
913 | } |
|
|
914 | |
|
|
915 | # call in non-void context registers a temporary |
|
|
916 | # hook with handle, otherwise its permanent |
|
|
917 | sub on_face_change { |
|
|
918 | my ($self, $num, $cb) = @_; |
|
|
919 | |
|
|
920 | push @{$self->{face_cb}{$num}}, $cb; |
|
|
921 | |
|
|
922 | defined wantarray |
|
|
923 | ? CFPlus::guard { |
|
|
924 | @{$self->{face_cb}{$num}} |
|
|
925 | = grep $_ != $cb, |
|
|
926 | @{$self->{face_cb}{$num}}; |
|
|
927 | } |
|
|
928 | : () |
|
|
929 | } |
|
|
930 | |
|
|
931 | # call in non-void context registers a temporary |
|
|
932 | # hook with handle, otherwise its permanent |
|
|
933 | sub register_face_handler { |
|
|
934 | my ($self, $num, $cb) = @_; |
|
|
935 | |
|
|
936 | return unless $num; |
|
|
937 | |
|
|
938 | # invoke if available right now |
|
|
939 | $cb->($self->{face}[$num], 0) |
|
|
940 | unless exists $self->{face}[$num]{loading}; |
|
|
941 | |
|
|
942 | # future changes |
|
|
943 | $self->on_face_change ($num => $cb) |
720 | } |
944 | } |
721 | |
945 | |
722 | sub sound_play { |
946 | sub sound_play { |
723 | my ($self, $x, $y, $soundnum, $type) = @_; |
947 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
724 | |
948 | |
725 | $self->{sound_play}->($x, $y, $soundnum, $type); |
949 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
950 | unless $type & 1; # odd types are silent for future expansion |
726 | } |
951 | } |
727 | |
952 | |
728 | my $LAST_QUERY; # server is stupid, stupid, stupid |
953 | my $LAST_QUERY; # server is stupid, stupid, stupid |
729 | |
954 | |
730 | sub query { |
955 | sub query { |
… | |
… | |
795 | $self->{$type} = $text; |
1020 | $self->{$type} = $text; |
796 | } else { |
1021 | } else { |
797 | $self->logprint ("msg: ", $text); |
1022 | $self->logprint ("msg: ", $text); |
798 | return if $color < 0; # negative color == ignore if not understood |
1023 | return if $color < 0; # negative color == ignore if not understood |
799 | |
1024 | |
800 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
1025 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
801 | |
1026 | |
802 | ## try to create single paragraphs of multiple lines sent by the server |
1027 | ## try to create single paragraphs of multiple lines sent by the server |
803 | # no longer neecssary with TRT servers |
1028 | # no longer neecssary with TRT servers |
804 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1029 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
805 | |
1030 | |
806 | ::message ({ fg => $fg, markup => $_ }) |
1031 | ::message ({ |
|
|
1032 | fg => $fg, |
|
|
1033 | markup => $_, |
|
|
1034 | type => $type, |
|
|
1035 | extra => [@extra], |
|
|
1036 | color_flags => $color |
807 | for split /\n/, $text; |
1037 | }) for split /\n/, $text; |
808 | |
1038 | |
809 | $self->{statusbox}->add ($text, |
1039 | $self->{statusbox}->add ($text, |
810 | group => $text, |
1040 | group => $text, |
811 | fg => $fg, |
1041 | fg => $fg, |
812 | timeout => $color >= 2 ? 180 : 10, |
1042 | timeout => $color >= 2 ? 180 : 10, |
… | |
… | |
868 | $self->{map_widget}->clr_commands; |
1098 | $self->{map_widget}->clr_commands; |
869 | |
1099 | |
870 | ::stop_game (); |
1100 | ::stop_game (); |
871 | } |
1101 | } |
872 | |
1102 | |
873 | sub image_info { |
|
|
874 | my ($self, $numfaces) = @_; |
|
|
875 | |
|
|
876 | $self->{num_faces} = $numfaces; |
|
|
877 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
878 | $self->face_prefetch; |
|
|
879 | } |
|
|
880 | |
|
|
881 | sub face_prefetch { |
|
|
882 | my ($self) = @_; |
|
|
883 | |
|
|
884 | return unless $::CFG->{face_prefetch}; |
|
|
885 | |
|
|
886 | if ($self->{num_faces}) { |
|
|
887 | return if @{ $self->{send_queue} || [] }; |
|
|
888 | my $todo = @{ $self->{face_prefetch} } |
|
|
889 | or return; |
|
|
890 | |
|
|
891 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
892 | |
|
|
893 | $self->send ("requestinfo image_sums $face $face"); |
|
|
894 | |
|
|
895 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
896 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
897 | } elsif (!exists $self->{num_faces}) { |
|
|
898 | $self->send ("requestinfo image_info"); |
|
|
899 | |
|
|
900 | $self->{num_faces} = 0; |
|
|
901 | |
|
|
902 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
903 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
904 | } |
|
|
905 | } |
|
|
906 | |
|
|
907 | sub update_floorbox { |
1103 | sub update_floorbox { |
908 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1104 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
909 | return unless $::CONN; |
1105 | return unless $::CONN; |
910 | |
1106 | |
911 | $::FLOORBOX->clear; |
1107 | $::FLOORBOX->clear; |
|
|
1108 | |
|
|
1109 | my @add; |
912 | |
1110 | |
913 | my $row; |
1111 | my $row; |
914 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1112 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
915 | if ($row < 6) { |
1113 | if ($row < 6) { |
916 | local $_->{face_widget}; # hack to force recreation of widget |
1114 | local $_->{face_widget}; # hack to force recreation of widget |
917 | local $_->{desc_widget}; # hack to force recreation of widget |
1115 | local $_->{desc_widget}; # hack to force recreation of widget |
918 | CFPlus::Item::update_widgets $_; |
1116 | CFPlus::Item::update_widgets $_; |
919 | |
1117 | |
|
|
1118 | push @add, |
920 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1119 | 0, $row, $_->{face_widget}, |
921 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1120 | 1, $row, $_->{desc_widget}; |
922 | |
1121 | |
923 | $row++; |
1122 | $row++; |
924 | } else { |
1123 | } else { |
925 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1124 | push @add, 1, $row, new CFPlus::UI::Button |
926 | text => "More...", |
1125 | text => "More...", |
927 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1126 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
928 | ); |
1127 | ; |
929 | last; |
1128 | last; |
930 | } |
1129 | } |
931 | } |
1130 | } |
932 | if ($::CONN->{open_container}) { |
1131 | if ($::CONN->{open_container}) { |
933 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1132 | push @add, 1, $row++, new CFPlus::UI::Button |
934 | text => "Close container", |
1133 | text => "Close container", |
935 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1134 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
936 | ); |
1135 | ; |
937 | } |
1136 | } |
938 | }); |
|
|
939 | |
1137 | |
|
|
1138 | $::FLOORBOX->add_at (@add); |
|
|
1139 | }); |
|
|
1140 | |
940 | $::WANT_REFRESH++; |
1141 | $::WANT_REFRESH->start; |
941 | } |
1142 | } |
942 | |
1143 | |
943 | sub set_opencont { |
1144 | sub set_opencont { |
944 | my ($conn, $tag, $name) = @_; |
1145 | my ($conn, $tag, $name) = @_; |
945 | $conn->{open_container} = $tag; |
1146 | $conn->{open_container} = $tag; |
946 | update_floorbox; |
1147 | update_floorbox; |
947 | |
1148 | |
948 | $::INV_RIGHT_HB->clear (); |
1149 | $::INVR_HB->clear (); |
949 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1150 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
950 | |
1151 | |
951 | if ($tag != 0) { # Floor isn't closable, is it? |
1152 | if ($tag != 0) { # Floor isn't closable, is it? |
952 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1153 | $::INVR_HB->add (new CFPlus::UI::Button |
953 | text => "Close container", |
1154 | text => "Close container", |
954 | tooltip => "Close the currently open container (if one is open)", |
1155 | tooltip => "Close the currently open container (if one is open)", |
955 | on_activate => sub { |
1156 | on_activate => sub { |
956 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1157 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
957 | if $tag != 0; |
1158 | if $tag != 0; |
958 | #if $CONN->{open_container} != 0; |
|
|
959 | 0 |
1159 | 0 |
960 | }, |
1160 | }, |
961 | ); |
1161 | ); |
962 | } |
1162 | } |
963 | |
1163 | |
… | |
… | |
1062 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1262 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1063 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1263 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1064 | . "map size $self->{mapw}×$self->{maph}\n" |
1264 | . "map size $self->{mapw}×$self->{maph}\n" |
1065 | ); |
1265 | ); |
1066 | |
1266 | |
1067 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1068 | } |
1267 | } |
1069 | |
1268 | |
1070 | sub logged_in { |
1269 | sub logged_in { |
1071 | my ($self) = @_; |
1270 | my ($self) = @_; |
1072 | |
1271 | |
1073 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1272 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1273 | my (%msg) = @_; |
|
|
1274 | |
1074 | $self->{cfplus_ext} = $_[0]{version}; |
1275 | $self->{cfplus_ext} = $msg{version}; |
1075 | $self->update_server_info; |
1276 | $self->update_server_info; |
1076 | |
1277 | |
1077 | if ($self->{cfplus_ext} >= 2) { |
1278 | if ($self->{cfplus_ext} >= 2) { |
1078 | $self->send_ext_req ("editor_support", sub { |
1279 | $self->send_ext_req ("editor_support", sub { |
1079 | $self->{editor_support} = $_[0]; |
1280 | $self->{editor_support} = { @_ }; |
1080 | $self->update_server_info; |
1281 | $self->update_server_info; |
1081 | |
1282 | |
1082 | 0 |
1283 | 0 |
1083 | }); |
1284 | }); |
1084 | } |
1285 | } |
… | |
… | |
1092 | $self->send_command ("output-count $::CFG->{output_count}"); |
1293 | $self->send_command ("output-count $::CFG->{output_count}"); |
1093 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1294 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1094 | $self->send_command ("pickup $::CFG->{pickup}"); |
1295 | $self->send_command ("pickup $::CFG->{pickup}"); |
1095 | } |
1296 | } |
1096 | |
1297 | |
1097 | sub buildat { |
|
|
1098 | my ($self, $builditem, $x, $y) = @_; |
|
|
1099 | |
|
|
1100 | if ($self->{cfplus_ext}) { |
|
|
1101 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1102 | } |
|
|
1103 | } |
|
|
1104 | |
|
|
1105 | sub lookat { |
1298 | sub lookat { |
1106 | my ($self, $x, $y) = @_; |
1299 | my ($self, $x, $y) = @_; |
1107 | |
1300 | |
1108 | if ($self->{cfplus_ext}) { |
1301 | if ($self->{cfplus_ext}) { |
1109 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1302 | $self->send_ext_req (lookat => $x, $y, sub { |
1110 | my ($msg) = @_; |
1303 | my (%msg) = @_; |
1111 | |
1304 | |
1112 | if (exists $msg->{npc_dialog}) { |
1305 | if (exists $msg{npc_dialog}) { |
1113 | # start npc chat dialog |
1306 | # start npc chat dialog |
1114 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1307 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1115 | dx => $x, |
1308 | token => $msg{npc_dialog}, |
1116 | dy => $y, |
|
|
1117 | title => "$msg->{npc_dialog} (NPC)", |
1309 | title => "$msg{npc_dialog}[0] (NPC)", |
1118 | conn => $self, |
1310 | conn => $self, |
1119 | ; |
1311 | ; |
1120 | } |
1312 | } |
1121 | }); |
1313 | }); |
1122 | } |
1314 | } |
… | |
… | |
1129 | |
1321 | |
1130 | (delete $self->{npc_dialog})->destroy |
1322 | (delete $self->{npc_dialog})->destroy |
1131 | if $self->{npc_dialog}; |
1323 | if $self->{npc_dialog}; |
1132 | |
1324 | |
1133 | $self->SUPER::destroy; |
1325 | $self->SUPER::destroy; |
|
|
1326 | |
|
|
1327 | %$self = (); |
1134 | } |
1328 | } |
1135 | |
1329 | |
1136 | package CFPlus::NPCDialog; |
1330 | package CFPlus::NPCDialog; |
1137 | |
1331 | |
1138 | our @ISA = 'CFPlus::UI::Toplevel'; |
1332 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1185 | on_activate => sub { $this->destroy; 1 }, |
1379 | on_activate => sub { $this->destroy; 1 }, |
1186 | ; |
1380 | ; |
1187 | |
1381 | |
1188 | $self->update_options; |
1382 | $self->update_options; |
1189 | |
1383 | |
1190 | $self->{id} = $self->{conn}->send_ext_req ( |
1384 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1191 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1385 | $self->{conn}->connect_ext ($self->{id} => sub { |
1192 | sub { $this && $this->feed (@_) } |
1386 | $this->feed (@_) if $this; |
1193 | ); |
1387 | }); |
|
|
1388 | |
|
|
1389 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1194 | |
1390 | |
1195 | $self->{entry}->grab_focus; |
1391 | $self->{entry}->grab_focus; |
1196 | |
1392 | |
1197 | $self->{textview}->add_paragraph ({ |
1393 | $self->{textview}->add_paragraph ({ |
1198 | fg => [1, 1, 0, 1], |
1394 | fg => [1, 1, 0, 1], |
… | |
… | |
1221 | ); |
1417 | ); |
1222 | } |
1418 | } |
1223 | } |
1419 | } |
1224 | |
1420 | |
1225 | sub feed { |
1421 | sub feed { |
1226 | my ($self, $msg) = @_; |
1422 | my ($self, $type, @arg) = @_; |
1227 | |
1423 | |
1228 | CFPlus::weaken $self; |
1424 | CFPlus::weaken $self; |
1229 | |
1425 | |
1230 | if ($msg->{msgtype} eq "reply") { |
1426 | if ($type eq "update") { |
|
|
1427 | my (%info) = @arg; |
|
|
1428 | |
1231 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1429 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1232 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1430 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1233 | |
|
|
1234 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
|
|
1235 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1236 | my @link; |
|
|
1237 | $text =~ s{ |
|
|
1238 | ($match) |
|
|
1239 | }{ |
|
|
1240 | my $kw = $1; |
|
|
1241 | |
|
|
1242 | push @link, new CFPlus::UI::Label |
|
|
1243 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1244 | can_hover => 1, |
|
|
1245 | can_events => 1, |
|
|
1246 | padding_x => 0, |
|
|
1247 | padding_y => 0, |
|
|
1248 | on_button_up => sub { |
|
|
1249 | $self->send ($kw); |
|
|
1250 | }; |
|
|
1251 | |
|
|
1252 | "\x{fffc}" |
|
|
1253 | }giex; |
|
|
1254 | |
1431 | |
|
|
1432 | if (exists $info{msg}) { |
|
|
1433 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1434 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1435 | my @link; |
|
|
1436 | $text =~ s{ |
|
|
1437 | ($match) |
|
|
1438 | }{ |
|
|
1439 | my $kw = $1; |
|
|
1440 | |
|
|
1441 | push @link, new CFPlus::UI::Label |
|
|
1442 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1443 | can_hover => 1, |
|
|
1444 | can_events => 1, |
|
|
1445 | padding_x => 0, |
|
|
1446 | padding_y => 0, |
|
|
1447 | on_button_up => sub { |
|
|
1448 | $self->send ($kw); |
|
|
1449 | }; |
|
|
1450 | |
|
|
1451 | "\x{fffc}" |
|
|
1452 | }giex; |
|
|
1453 | |
1255 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1454 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1256 | $self->{textview}->scroll_to_bottom; |
1455 | $self->{textview}->scroll_to_bottom; |
|
|
1456 | } |
|
|
1457 | |
1257 | $self->update_options; |
1458 | $self->update_options; |
1258 | } else { |
1459 | } else { |
1259 | $self->destroy; |
1460 | $self->destroy; |
1260 | } |
1461 | } |
1261 | |
1462 | |
… | |
… | |
1266 | my ($self, $msg) = @_; |
1467 | my ($self, $msg) = @_; |
1267 | |
1468 | |
1268 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1469 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1269 | $self->{textview}->scroll_to_bottom; |
1470 | $self->{textview}->scroll_to_bottom; |
1270 | |
1471 | |
1271 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1472 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1272 | } |
1473 | } |
1273 | |
1474 | |
1274 | sub destroy { |
1475 | sub destroy { |
1275 | my ($self) = @_; |
1476 | my ($self) = @_; |
1276 | |
1477 | |
1277 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1478 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1278 | |
1479 | |
1279 | if ($self->{conn}) { |
1480 | if ($self->{conn}) { |
1280 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1481 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1281 | delete $self->{conn}{npc_dialog}; |
1482 | delete $self->{conn}{npc_dialog}; |
1282 | $self->{conn}->disconnect_ext ($self->{id}); |
1483 | $self->{conn}->disconnect_ext ($self->{id}); |
1283 | } |
1484 | } |
1284 | |
1485 | |
1285 | $self->SUPER::destroy; |
1486 | $self->SUPER::destroy; |