… | |
… | |
15 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
16 | |
16 | |
17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my ($class, %arg) = @_; |
21 | |
21 | |
22 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
22 | my $self = $class->SUPER::new (%arg, |
|
|
23 | setup_req => { |
|
|
24 | extmap => 1, |
|
|
25 | excmd => 1, |
|
|
26 | xwidget1 => 1,#d# |
|
|
27 | %{$arg{setup_req} || {}}, |
|
|
28 | }, |
|
|
29 | ); |
23 | |
30 | |
24 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
25 | |
32 | |
26 | my @cmd_help = map { |
33 | my @cmd_help = map { |
27 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
… | |
… | |
41 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
42 | @args |
49 | @args |
43 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
44 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
45 | |
52 | |
|
|
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
46 | $self->connect_ext (event_capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
47 | my ($cap) = @_; |
59 | my (%cap) = @_; |
48 | |
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
|
|
63 | |
49 | if (my $ts = $cap->{tileset}) { |
64 | if (my $ts = $cap{tileset}) { |
50 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
51 | $self->{tileset} = $default; |
66 | $self->{tileset} = $default; |
52 | $self->{tilesize} = $default->[3]; |
67 | $self->{tilesize} = $default->[3]; |
53 | $self->setup_req (tileset => $default->[0]); |
68 | $self->setup_req (tileset => $default->[0]); |
54 | |
69 | |
… | |
… | |
58 | $self->setup_req (mapsize => "${w}x${h}"); |
73 | $self->setup_req (mapsize => "${w}x${h}"); |
59 | } |
74 | } |
60 | } |
75 | } |
61 | }); |
76 | }); |
62 | |
77 | |
|
|
78 | $self->{json_coder} |
|
|
79 | ->convert_blessed |
|
|
80 | ->filter_json_single_key_object (__w_ => sub { |
|
|
81 | $self->{widget}{$_[0]} |
|
|
82 | }); |
|
|
83 | |
|
|
84 | # widgetset new |
|
|
85 | $self->connect_ext (ws_n => sub { |
|
|
86 | my ($id) = @_; |
|
|
87 | |
|
|
88 | $self->{widgetset}{$id} = { |
|
|
89 | w => {}, |
|
|
90 | }; |
|
|
91 | }); |
|
|
92 | |
|
|
93 | # widgetset destroy |
|
|
94 | $self->connect_ext (ws_d => sub { |
|
|
95 | my ($id) = @_; |
|
|
96 | |
|
|
97 | my $ws = delete $self->{widgetset}{$id} |
|
|
98 | or return; |
|
|
99 | |
|
|
100 | $_->destroy |
|
|
101 | for values %{$ws->{w}}; |
|
|
102 | }); |
|
|
103 | |
|
|
104 | # widgetset create |
|
|
105 | $self->connect_ext (ws_c => sub { |
|
|
106 | my ($ws, $id, $class, $args) = @_; |
|
|
107 | |
|
|
108 | for my $ev (grep /^on_/, keys %$args) { |
|
|
109 | my $rid = $args->{$ev}; |
|
|
110 | $args->{$ev} = sub { |
|
|
111 | my $id = shift->{s_id}; |
|
|
112 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
113 | |
|
|
114 | 1 |
|
|
115 | }; |
|
|
116 | } |
|
|
117 | |
|
|
118 | $self->widget_associate ( |
|
|
119 | $ws, $id => scalar eval { |
|
|
120 | local $SIG{__DIE__}; |
|
|
121 | "CFPlus::UI::$class"->new (%$args) |
|
|
122 | } |
|
|
123 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
124 | }); |
|
|
125 | |
|
|
126 | # widgetset associate |
|
|
127 | $self->connect_ext (ws_a => sub { |
|
|
128 | my (%ass) = @_; |
|
|
129 | |
|
|
130 | # everything that has a name, wether conceivably useful or not |
|
|
131 | my %wkw = ( |
|
|
132 | root => $CFPlus::UI::ROOT, |
|
|
133 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
134 | |
|
|
135 | mapwidget => $::MAPWIDGET, |
|
|
136 | buttonbar => $::BUTTONBAR, |
|
|
137 | metaserver => $::METASERVER, |
|
|
138 | buttonbar => $::BUTTONBAR, |
|
|
139 | login_button => $::LOGIN_BUTTON, |
|
|
140 | quit_dialog => $::QUIT_DIALOG, |
|
|
141 | host_entry => $::HOST_ENTRY, |
|
|
142 | metaserver => $::METASERVER, |
|
|
143 | server_info => $::SERVER_INFO, |
|
|
144 | |
|
|
145 | setup_dialog => $::SETUP_DIALOG, |
|
|
146 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
147 | setup_server => $::SETUP_SERVER, |
|
|
148 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
149 | |
|
|
150 | pl_notebook => $::PL_NOTEBOOK, |
|
|
151 | pl_window => $::PL_WINDOW, |
|
|
152 | inventory_page => $::INVENTORY_PAGE, |
|
|
153 | stats_page => $::STATS_PAGE, |
|
|
154 | skill_page => $::SKILL_PAGE, |
|
|
155 | spell_page => $::SPELL_PAGE, |
|
|
156 | spell_list => $::SPELL_LIST, |
|
|
157 | |
|
|
158 | floorbox => $::FLOORBOX, |
|
|
159 | help_window => $::HELP_WINDOW, |
|
|
160 | message_window => $::MESSAGE_WINDOW, |
|
|
161 | statusbox => $::SDTATUSBOX, |
|
|
162 | |
|
|
163 | inv => $::INV, |
|
|
164 | invr => $::INVR, |
|
|
165 | invr_hb => $::INVR_HB, |
|
|
166 | |
|
|
167 | ); |
|
|
168 | |
|
|
169 | while (my ($id, $name) = each %ass) { |
|
|
170 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
171 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
172 | } |
|
|
173 | }); |
|
|
174 | |
|
|
175 | # widget call |
|
|
176 | $self->connect_ext (w_c => sub { |
|
|
177 | my ($id, $rid, $method, @args) = @_; |
|
|
178 | |
|
|
179 | my $w = $self->{widget}{$id} |
|
|
180 | or return; |
|
|
181 | |
|
|
182 | if ($rid) { |
|
|
183 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
184 | } else { |
|
|
185 | $w->$method (@args); |
|
|
186 | } |
|
|
187 | }); |
|
|
188 | |
|
|
189 | # widget set |
|
|
190 | $self->connect_ext (w_s => sub { |
|
|
191 | my ($id, $attr) = @_; |
|
|
192 | |
|
|
193 | my $w = $self->{widget}{$id} |
|
|
194 | or return; |
|
|
195 | |
|
|
196 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
197 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
198 | if (defined $value) { |
|
|
199 | $w->{$member} = $value; |
|
|
200 | } else { |
|
|
201 | delete $w->{$member}; |
|
|
202 | } |
|
|
203 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
204 | } |
|
|
205 | }); |
|
|
206 | |
|
|
207 | # widget get |
|
|
208 | $self->connect_ext (w_g => sub { |
|
|
209 | my ($id, $rid, $attr) = @_; |
|
|
210 | |
|
|
211 | my $w = $self->{widget}{$id} |
|
|
212 | or return; |
|
|
213 | |
|
|
214 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
215 | }); |
|
|
216 | |
|
|
217 | # message window |
|
|
218 | $self->connect_ext (channel_info => sub { |
|
|
219 | my ($info) = @_; |
|
|
220 | $self->{channels}->{$info->{id}} = $info; |
|
|
221 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
222 | }); |
|
|
223 | |
|
|
224 | # destroy widgets on logout |
|
|
225 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
226 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
227 | $_->destroy |
|
|
228 | for values %{delete $ws->{w} || {}}; |
|
|
229 | } |
|
|
230 | }); |
|
|
231 | |
63 | $self->{map_widget}->add_command (@$_) |
232 | $self->{map_widget}->add_command (@$_) |
64 | for @cmd_help; |
233 | for @cmd_help; |
65 | |
234 | |
66 | { |
235 | { |
67 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
236 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
… | |
… | |
81 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
250 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
82 | |
251 | |
83 | $self |
252 | $self |
84 | } |
253 | } |
85 | |
254 | |
|
|
255 | sub widget_associate { |
|
|
256 | my ($self, $ws, $id, $widget) = @_; |
|
|
257 | |
|
|
258 | if ($widget) { |
|
|
259 | $widget->{s_id} = $id; |
|
|
260 | $self->{widget}{$id} = $widget; |
|
|
261 | |
|
|
262 | if ($ws) { |
|
|
263 | $widget->{s_ws} = $ws; |
|
|
264 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
265 | } |
|
|
266 | |
|
|
267 | $widget->connect (on_destroy => sub { |
|
|
268 | my ($widget) = @_; |
|
|
269 | |
|
|
270 | delete $self->{widget}{$widget->{s_id}}; |
|
|
271 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
272 | if exists $widget->{s_ws}; |
|
|
273 | }); |
|
|
274 | |
|
|
275 | 1 |
|
|
276 | } else { |
|
|
277 | $self->send_exti_msg (w_e => $id, undef); |
|
|
278 | |
|
|
279 | 0 |
|
|
280 | } |
|
|
281 | } |
|
|
282 | |
|
|
283 | sub update_fx_want { |
|
|
284 | my ($self) = @_; |
|
|
285 | |
|
|
286 | $self->send_exti_msg (fx_want => { |
|
|
287 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
288 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
289 | }); |
|
|
290 | } |
|
|
291 | |
86 | sub logprint { |
292 | sub logprint { |
87 | my ($self, @a) = @_; |
293 | my ($self, @a) = @_; |
88 | |
294 | |
89 | $self->{log_fh} ||= do { |
295 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
90 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
91 | |
|
|
92 | open my $fh, ">>:utf8", $path |
|
|
93 | or die "Couldn't open logfile $path: $!"; |
|
|
94 | |
|
|
95 | $fh->autoflush (1); |
|
|
96 | |
|
|
97 | $fh; |
|
|
98 | }; |
|
|
99 | |
|
|
100 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
101 | |
|
|
102 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
103 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
104 | |
|
|
105 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
106 | } |
296 | } |
107 | |
297 | |
108 | sub _stat_numdiff { |
298 | sub _stat_numdiff { |
109 | my ($self, $name, $old, $new) = @_; |
299 | my ($self, $name, $old, $new) = @_; |
110 | |
300 | |
… | |
… | |
243 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
433 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
244 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
434 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
245 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
435 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
246 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
436 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
247 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
437 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
248 | my $rng = $stats->{+CS_STAT_RANGE}; |
438 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
249 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
250 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
251 | my $title = $stats->{+CS_STAT_TITLE}; |
439 | my $title = $stats->{+CS_STAT_TITLE}; |
252 | $title =~ s/^Player: //; |
440 | $title =~ s/^Player: //; |
253 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
441 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
254 | |
442 | |
255 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
443 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
275 | my @skills = keys %{ $self->{skill_info} }; |
463 | my @skills = keys %{ $self->{skill_info} }; |
276 | |
464 | |
277 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
465 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
278 | $sktbl->clear; |
466 | $sktbl->clear; |
279 | |
467 | |
|
|
468 | my @add; |
|
|
469 | |
|
|
470 | push @add, |
280 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
471 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
281 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
472 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
282 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
473 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
283 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
474 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
284 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
475 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
285 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
476 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
477 | ; |
286 | |
478 | |
287 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
479 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
288 | |
480 | |
289 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
481 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
290 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
482 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
… | |
… | |
318 | } |
510 | } |
319 | |
511 | |
320 | 1 |
512 | 1 |
321 | }; |
513 | }; |
322 | |
514 | |
|
|
515 | push @add, |
323 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
516 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
324 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
517 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
325 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
518 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
326 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
519 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
327 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
520 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
328 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
521 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
522 | ; |
329 | |
523 | |
330 | $x++ and ($x, $y) = (0, $y + 1); |
524 | $x++ and ($x, $y) = (0, $y + 1); |
331 | } |
525 | } |
|
|
526 | |
|
|
527 | $sktbl->add_at (@add); |
332 | } |
528 | } |
333 | |
529 | |
334 | for (grep exists $stats->{$_}, @skills) { |
530 | for (grep exists $stats->{$_}, @skills) { |
335 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
531 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
336 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
532 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
… | |
… | |
369 | } |
565 | } |
370 | |
566 | |
371 | sub feed_map1a { |
567 | sub feed_map1a { |
372 | my ($self, $data) = @_; |
568 | my ($self, $data) = @_; |
373 | |
569 | |
374 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
570 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
571 | my $delay; |
|
|
572 | |
|
|
573 | for my $tile (@$missing) { |
|
|
574 | next if $self->{delay}{$tile}; |
|
|
575 | |
|
|
576 | $delay = 1; |
|
|
577 | |
|
|
578 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
579 | $tex->upload; |
|
|
580 | } else { |
|
|
581 | $self->{delay}{$tile} = 1; |
|
|
582 | |
|
|
583 | # we assume the face is in-flight and will eventually come |
|
|
584 | push @{$self->{face_cb}{$tile}}, sub { |
|
|
585 | delete $self->{delay}{$tile}; |
|
|
586 | $_[0]->upload; |
|
|
587 | }; |
|
|
588 | } |
|
|
589 | } |
|
|
590 | |
|
|
591 | if ($delay) { |
|
|
592 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
593 | Event->timer (after => 0.03, cb => sub { |
|
|
594 | $_[0]->w->cancel; |
|
|
595 | $self->{map_widget}->update; |
|
|
596 | }); |
|
|
597 | } else { |
375 | $self->{map_widget}->update; |
598 | $self->{map_widget}->update; |
|
|
599 | } |
376 | } |
600 | } |
377 | |
601 | |
378 | sub magicmap { |
602 | sub magicmap { |
379 | my ($self, $w, $h, $x, $y, $data) = @_; |
603 | my ($self, $w, $h, $x, $y, $data) = @_; |
380 | |
604 | |
… | |
… | |
387 | my $map_info = delete $self->{map_info} |
611 | my $map_info = delete $self->{map_info} |
388 | or return; |
612 | or return; |
389 | |
613 | |
390 | my ($hash, $x, $y, $w, $h) = @$map_info; |
614 | my ($hash, $x, $y, $w, $h) = @$map_info; |
391 | |
615 | |
392 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
616 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
617 | $self->{map_cache_new}{$hash} = \$data; |
393 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
618 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
394 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
395 | } |
619 | } |
396 | |
620 | |
397 | sub map_clear { |
621 | sub map_clear { |
398 | my ($self) = @_; |
622 | my ($self) = @_; |
399 | |
623 | |
… | |
… | |
412 | do { |
636 | do { |
413 | $id = pop @{$self->{bg_fetch}} |
637 | $id = pop @{$self->{bg_fetch}} |
414 | or return; |
638 | or return; |
415 | } while $self->{texture}[$id]; |
639 | } while $self->{texture}[$id]; |
416 | |
640 | |
417 | CFPlus::DB::get tilecache => $id, sub { |
641 | CFPlus::DB::exists tilecache => $id, sub { |
418 | my ($data) = @_; |
642 | my ($exists) = @_; |
419 | |
643 | |
420 | $self->set_texture ($id => $data) |
644 | return unless $self->{map}; # stop when destroyed |
421 | if defined $data; |
645 | |
|
|
646 | if ($exists) { |
|
|
647 | $self->have_tile ($id); |
|
|
648 | $self->{texture}[$id]->upload; |
|
|
649 | } |
422 | |
650 | |
423 | $self->bg_fetch; |
651 | $self->bg_fetch; |
424 | }; |
652 | }; |
425 | } |
653 | } |
426 | |
654 | |
427 | sub load_map($$$) { |
655 | sub load_map($$$) { |
428 | my ($self, $hash, $x, $y) = @_; |
656 | my ($self, $hash, $x, $y) = @_; |
429 | |
657 | |
430 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
658 | my $gen = $self->{map_change_gen}; |
|
|
659 | |
|
|
660 | my $cb = sub { |
|
|
661 | return unless $gen == $self->{map_change_gen}; |
|
|
662 | |
431 | my ($data) = @_; |
663 | my ($data) = @_; |
432 | |
664 | |
433 | if (defined $data) { |
665 | if (defined $data) { |
|
|
666 | $self->{map_cache_new}{$hash} = \$data; |
|
|
667 | |
434 | $data = Compress::LZF::decompress $data; |
668 | my $data = Compress::LZF::decompress $data; |
435 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
436 | |
669 | |
437 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
670 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
438 | push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
671 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
439 | $self->bg_fetch unless $inprogress; |
672 | $self->bg_fetch unless $inprogress; |
440 | } |
673 | } |
441 | }; |
674 | }; |
|
|
675 | |
|
|
676 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
677 | $cb->($$rdata); |
|
|
678 | } else { |
|
|
679 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
680 | } |
442 | } |
681 | } |
443 | |
682 | |
444 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
683 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
445 | # (server resource,s latency, bandwidth), so this hack is warranted. |
684 | # (server resource,s latency, bandwidth), so this hack is warranted. |
446 | # the right fix is to make real tiled maps with an overview file |
685 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
510 | |
749 | |
511 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
750 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
512 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
751 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
513 | |
752 | |
514 | } else { |
753 | } else { |
|
|
754 | my $gen = $self->{map_change_gen}; |
515 | $self->send_mapinfo ("spatial $path$tile", sub { |
755 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
756 | return unless $gen == $self->{map_change_gen}; |
|
|
757 | |
516 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
758 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
517 | |
759 | |
518 | return if $mode ne "spatial"; |
760 | return if $mode ne "spatial"; |
519 | |
761 | |
520 | $x += $self->{map}->ox; |
762 | $x += $self->{map}->ox; |
… | |
… | |
534 | |
776 | |
535 | sub map_change { |
777 | sub map_change { |
536 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
778 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
537 | |
779 | |
538 | $self->flush_map; |
780 | $self->flush_map; |
|
|
781 | |
|
|
782 | ++$self->{map_change_gen}; |
|
|
783 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
539 | |
784 | |
540 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
785 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
541 | |
786 | |
542 | my $mapmapw = $self->{mapmap}->{w}; |
787 | my $mapmapw = $self->{mapmap}->{w}; |
543 | my $mapmaph = $self->{mapmap}->{h}; |
788 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
562 | } |
807 | } |
563 | |
808 | |
564 | sub face_find { |
809 | sub face_find { |
565 | my ($self, $facenum, $face, $cb) = @_; |
810 | my ($self, $facenum, $face, $cb) = @_; |
566 | |
811 | |
567 | my $hash = "$face->{chksum},$face->{name}"; |
812 | if ($face->{type} == 0) { # FT_FACE |
568 | |
|
|
569 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
813 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
570 | |
814 | |
571 | $face->{id} = $id; |
815 | $face->{id} = $id; |
572 | $self->{faceid}[$facenum] = $id; |
816 | $self->{faceid}[$facenum] = $id; |
573 | |
817 | |
574 | $self->{map}->set_tileid ($facenum => $id); |
818 | $self->{map}->set_tileid ($facenum => $id); |
575 | |
819 | |
576 | CFPlus::DB::get tilecache => $id, $cb; |
820 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
821 | |
|
|
822 | } elsif ($face->{type} & 1) { # with metadata |
|
|
823 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
824 | } |
577 | } |
825 | } |
578 | |
826 | |
579 | sub face_update { |
827 | sub face_update { |
580 | my ($self, $facenum, $face, $changed) = @_; |
828 | my ($self, $facenum, $face, $changed) = @_; |
581 | |
829 | |
|
|
830 | if ($face->{type} == 0) { # FT_FACE |
582 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
831 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
583 | if $changed; |
832 | if $changed; |
584 | |
833 | |
585 | $self->set_texture ($face->{id} => delete $face->{image}); |
834 | $self->have_tile ($face->{id}); |
586 | } |
|
|
587 | |
835 | |
588 | sub set_texture { |
836 | } elsif ($face->{type} & 1) { # split metadata |
|
|
837 | if ($changed) { # new data |
|
|
838 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
839 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
840 | |
|
|
841 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
842 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
|
|
843 | } else { |
|
|
844 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
845 | } |
|
|
846 | |
|
|
847 | ::add_license ($face); |
|
|
848 | |
|
|
849 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
850 | $self->{music_meta}{$facenum} = $face; |
|
|
851 | |
|
|
852 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
853 | if $changed; |
|
|
854 | |
|
|
855 | &::audio_music_push ($facenum); |
|
|
856 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
857 | $self->{sound_meta}{$facenum} = $face; |
|
|
858 | |
|
|
859 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
860 | if $changed; |
|
|
861 | |
|
|
862 | &::audio_sound_push ($facenum); |
|
|
863 | } |
|
|
864 | |
|
|
865 | } |
|
|
866 | } |
|
|
867 | |
|
|
868 | sub smooth_update { |
|
|
869 | my ($self, $facenum, $face) = @_; |
|
|
870 | |
|
|
871 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
872 | } |
|
|
873 | |
|
|
874 | sub have_tile { |
|
|
875 | my ($self, $tile) = @_; |
|
|
876 | |
|
|
877 | return unless $self->{map}; |
|
|
878 | |
|
|
879 | my $tex = $self->{texture}[$tile] ||= |
|
|
880 | new CFPlus::Texture |
|
|
881 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
|
|
882 | |
|
|
883 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
|
|
884 | } |
|
|
885 | |
|
|
886 | sub connect_face_update { |
589 | my ($self, $id, $data) = @_; |
887 | my ($self, $id, $cb) = @_; |
590 | |
888 | |
591 | $self->{texture}[$id] ||= do { |
889 | push @{$self->{face_cb}{$id}}, $cb; |
592 | my $tex = |
|
|
593 | new_from_image CFPlus::Texture |
|
|
594 | $data, minify => 1, mipmap => 1; |
|
|
595 | |
890 | |
596 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
891 | CFPlus::guard { |
597 | $self->{map_widget}->update; |
892 | @{$self->{face_cb}{$id}} |
598 | |
893 | = grep $_ != $cb, |
599 | $tex |
894 | @{$self->{face_cb}{$id}}; |
600 | }; |
895 | } |
601 | } |
896 | } |
602 | |
897 | |
603 | sub sound_play { |
898 | sub sound_play { |
604 | my ($self, $x, $y, $soundnum, $type) = @_; |
899 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
605 | |
900 | |
606 | $self->{sound_play}->($x, $y, $soundnum, $type); |
901 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
902 | unless $type & 1; # odd types are silent for future expansion |
607 | } |
903 | } |
608 | |
904 | |
609 | my $LAST_QUERY; # server is stupid, stupid, stupid |
905 | my $LAST_QUERY; # server is stupid, stupid, stupid |
610 | |
906 | |
611 | sub query { |
907 | sub query { |
… | |
… | |
615 | $LAST_QUERY = $prompt; |
911 | $LAST_QUERY = $prompt; |
616 | |
912 | |
617 | $self->{query}-> ($self, $flags, $prompt); |
913 | $self->{query}-> ($self, $flags, $prompt); |
618 | } |
914 | } |
619 | |
915 | |
620 | sub drawinfo { |
916 | sub sanitise_xml($) { |
621 | my ($self, $color, $text) = @_; |
917 | local $_ = shift; |
622 | |
918 | |
623 | my @color = ( |
919 | # we now weed out all tags we do not support |
|
|
920 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
921 | # now all entities |
|
|
922 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
923 | |
|
|
924 | # handle some elements |
|
|
925 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
926 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
927 | |
|
|
928 | $_ |
|
|
929 | } |
|
|
930 | |
|
|
931 | our %NAME_TO_COLOR = ( |
|
|
932 | black => 0, |
|
|
933 | white => 1, |
|
|
934 | darkblue => 2, |
|
|
935 | red => 3, |
|
|
936 | orange => 4, |
|
|
937 | lightblue => 5, |
|
|
938 | darkorange => 6, |
|
|
939 | green => 7, |
|
|
940 | darkgreen => 8, |
|
|
941 | grey => 9, |
|
|
942 | brown => 10, |
|
|
943 | yellow => 11, |
|
|
944 | tan => 12, |
|
|
945 | ); |
|
|
946 | |
|
|
947 | our @CF_COLOR = ( |
624 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
948 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
625 | [1.00, 1.00, 1.00], |
949 | [1.00, 1.00, 1.00], |
626 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
950 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
627 | [1.00, 0.00, 0.00], |
951 | [1.00, 0.00, 0.00], |
628 | [1.00, 0.54, 0.00], |
952 | [1.00, 0.54, 0.00], |
629 | [0.11, 0.56, 1.00], |
953 | [0.11, 0.56, 1.00], |
630 | [0.93, 0.46, 0.00], |
954 | [0.93, 0.46, 0.00], |
631 | [0.18, 0.54, 0.34], |
955 | [0.18, 0.54, 0.34], |
632 | [0.56, 0.73, 0.56], |
956 | [0.56, 0.73, 0.56], |
633 | [0.80, 0.80, 0.80], |
957 | [0.80, 0.80, 0.80], |
634 | [0.75, 0.61, 0.20], |
958 | [0.75, 0.61, 0.20], |
635 | [0.99, 0.77, 0.26], |
959 | [0.99, 0.77, 0.26], |
636 | [0.74, 0.65, 0.41], |
960 | [0.74, 0.65, 0.41], |
637 | ); |
961 | ); |
638 | |
962 | |
639 | my $fg = $color[$color % @color]; |
963 | sub msg { |
|
|
964 | my ($self, $color, $type, $text, @extra) = @_; |
640 | |
965 | |
|
|
966 | $text = sanitise_xml $text; |
|
|
967 | |
|
|
968 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
969 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
970 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
971 | $type =~ s/-/_/g; |
|
|
972 | $self->{$type} = $text; |
|
|
973 | } else { |
641 | $self->logprint ("info: ", $text); |
974 | $self->logprint ("msg: ", $text); |
|
|
975 | return if $color < 0; # negative color == ignore if not understood |
642 | |
976 | |
|
|
977 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
|
|
978 | |
643 | # try to create single paragraphs of multiple lines sent by the server |
979 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
980 | # no longer neecssary with TRT servers |
644 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
981 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
645 | |
982 | |
646 | $text = CFPlus::asxml $text; |
983 | ::message ({ |
647 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
984 | fg => $fg, |
648 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
985 | markup => $_, |
649 | |
986 | type => $type, |
650 | ::message ({ fg => $fg, markup => $_ }) |
987 | extra => [@extra], |
|
|
988 | color_flags => $color |
651 | for split /\n/, $text; |
989 | }) for split /\n/, $text; |
652 | |
990 | |
653 | $self->{statusbox}->add ($text, |
991 | $self->{statusbox}->add ($text, |
654 | group => $text, |
992 | group => $text, |
655 | fg => $fg, |
993 | fg => $fg, |
656 | timeout => $color >= 2 ? 180 : 10, |
994 | timeout => $color >= 2 ? 180 : 10, |
657 | tooltip_font => $::FONT_FIXED, |
995 | tooltip_font => $::FONT_FIXED, |
658 | ); |
996 | ); |
659 | } |
997 | } |
660 | |
|
|
661 | sub drawextinfo { |
|
|
662 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
663 | |
|
|
664 | $self->drawinfo ($color, $message); |
|
|
665 | } |
998 | } |
666 | |
999 | |
667 | sub spell_add { |
1000 | sub spell_add { |
668 | my ($self, $spell) = @_; |
1001 | my ($self, $spell) = @_; |
669 | |
1002 | |
… | |
… | |
717 | $self->{map_widget}->clr_commands; |
1050 | $self->{map_widget}->clr_commands; |
718 | |
1051 | |
719 | ::stop_game (); |
1052 | ::stop_game (); |
720 | } |
1053 | } |
721 | |
1054 | |
722 | sub image_info { |
|
|
723 | my ($self, $numfaces) = @_; |
|
|
724 | |
|
|
725 | $self->{num_faces} = $numfaces; |
|
|
726 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
727 | $self->face_prefetch; |
|
|
728 | } |
|
|
729 | |
|
|
730 | sub face_prefetch { |
|
|
731 | my ($self) = @_; |
|
|
732 | |
|
|
733 | return unless $::CFG->{face_prefetch}; |
|
|
734 | |
|
|
735 | if ($self->{num_faces}) { |
|
|
736 | return if @{ $self->{send_queue} || [] }; |
|
|
737 | my $todo = @{ $self->{face_prefetch} } |
|
|
738 | or return; |
|
|
739 | |
|
|
740 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
741 | |
|
|
742 | $self->send ("requestinfo image_sums $face $face"); |
|
|
743 | |
|
|
744 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
745 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
746 | } elsif (!exists $self->{num_faces}) { |
|
|
747 | $self->send ("requestinfo image_info"); |
|
|
748 | |
|
|
749 | $self->{num_faces} = 0; |
|
|
750 | |
|
|
751 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
752 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
753 | } |
|
|
754 | } |
|
|
755 | |
|
|
756 | sub update_floorbox { |
1055 | sub update_floorbox { |
757 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1056 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
758 | return unless $::CONN; |
1057 | return unless $::CONN; |
759 | |
1058 | |
760 | $::FLOORBOX->clear; |
1059 | $::FLOORBOX->clear; |
|
|
1060 | |
|
|
1061 | my @add; |
761 | |
1062 | |
762 | my $row; |
1063 | my $row; |
763 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1064 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
764 | if ($row < 6) { |
1065 | if ($row < 6) { |
765 | local $_->{face_widget}; # hack to force recreation of widget |
1066 | local $_->{face_widget}; # hack to force recreation of widget |
766 | local $_->{desc_widget}; # hack to force recreation of widget |
1067 | local $_->{desc_widget}; # hack to force recreation of widget |
767 | CFPlus::Item::update_widgets $_; |
1068 | CFPlus::Item::update_widgets $_; |
768 | |
1069 | |
|
|
1070 | push @add, |
769 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1071 | 0, $row, $_->{face_widget}, |
770 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1072 | 1, $row, $_->{desc_widget}; |
771 | |
1073 | |
772 | $row++; |
1074 | $row++; |
773 | } else { |
1075 | } else { |
774 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1076 | push @add, 1, $row, new CFPlus::UI::Button |
775 | text => "More...", |
1077 | text => "More...", |
776 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1078 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
777 | ); |
1079 | ; |
778 | last; |
1080 | last; |
779 | } |
1081 | } |
780 | } |
1082 | } |
781 | if ($::CONN->{open_container}) { |
1083 | if ($::CONN->{open_container}) { |
782 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1084 | push @add, 1, $row++, new CFPlus::UI::Button |
783 | text => "Close container", |
1085 | text => "Close container", |
784 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1086 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
785 | ); |
1087 | ; |
786 | } |
1088 | } |
787 | }); |
|
|
788 | |
1089 | |
|
|
1090 | $::FLOORBOX->add_at (@add); |
|
|
1091 | }); |
|
|
1092 | |
789 | $::WANT_REFRESH++; |
1093 | $::WANT_REFRESH->start; |
790 | } |
1094 | } |
791 | |
1095 | |
792 | sub set_opencont { |
1096 | sub set_opencont { |
793 | my ($conn, $tag, $name) = @_; |
1097 | my ($conn, $tag, $name) = @_; |
794 | $conn->{open_container} = $tag; |
1098 | $conn->{open_container} = $tag; |
795 | update_floorbox; |
1099 | update_floorbox; |
796 | |
1100 | |
797 | $::INV_RIGHT_HB->clear (); |
1101 | $::INVR_HB->clear (); |
798 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1102 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
799 | |
1103 | |
800 | if ($tag != 0) { # Floor isn't closable, is it? |
1104 | if ($tag != 0) { # Floor isn't closable, is it? |
801 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1105 | $::INVR_HB->add (new CFPlus::UI::Button |
802 | text => "Close container", |
1106 | text => "Close container", |
803 | tooltip => "Close the currently open container (if one is open)", |
1107 | tooltip => "Close the currently open container (if one is open)", |
804 | on_activate => sub { |
1108 | on_activate => sub { |
805 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1109 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
806 | if $tag != 0; |
1110 | if $tag != 0; |
807 | #if $CONN->{open_container} != 0; |
|
|
808 | 0 |
1111 | 0 |
809 | }, |
1112 | }, |
810 | ); |
1113 | ); |
811 | } |
1114 | } |
812 | |
1115 | |
… | |
… | |
902 | $::SERVER_INFO->set_markup ( |
1205 | $::SERVER_INFO->set_markup ( |
903 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1206 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
904 | . "protocol version <tt>$self->{version}</tt>\n" |
1207 | . "protocol version <tt>$self->{version}</tt>\n" |
905 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1208 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
906 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1209 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1210 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
907 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1211 | . "editing support $yesno[!!$self->{editor_support}]\n" |
908 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1212 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1213 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
909 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1214 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
910 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1215 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
911 | . "map size $self->{mapw}×$self->{maph}\n" |
1216 | . "map size $self->{mapw}×$self->{maph}\n" |
912 | ); |
1217 | ); |
913 | |
1218 | |
914 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
915 | } |
1219 | } |
916 | |
1220 | |
917 | sub logged_in { |
1221 | sub logged_in { |
918 | my ($self) = @_; |
1222 | my ($self) = @_; |
919 | |
1223 | |
920 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1224 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1225 | my (%msg) = @_; |
|
|
1226 | |
921 | $self->{cfplus_ext} = $_[0]{version}; |
1227 | $self->{cfplus_ext} = $msg{version}; |
922 | $self->update_server_info; |
1228 | $self->update_server_info; |
923 | |
1229 | |
924 | if ($self->{cfplus_ext} >= 2) { |
1230 | if ($self->{cfplus_ext} >= 2) { |
925 | $self->send_ext_req ("editor_support", sub { |
1231 | $self->send_ext_req ("editor_support", sub { |
926 | $self->{editor_support} = $_[0]; |
1232 | $self->{editor_support} = { @_ }; |
927 | $self->update_server_info; |
1233 | $self->update_server_info; |
928 | |
1234 | |
929 | 0 |
1235 | 0 |
930 | }); |
1236 | }); |
931 | } |
1237 | } |
… | |
… | |
939 | $self->send_command ("output-count $::CFG->{output_count}"); |
1245 | $self->send_command ("output-count $::CFG->{output_count}"); |
940 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1246 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
941 | $self->send_command ("pickup $::CFG->{pickup}"); |
1247 | $self->send_command ("pickup $::CFG->{pickup}"); |
942 | } |
1248 | } |
943 | |
1249 | |
944 | sub buildat { |
|
|
945 | my ($self, $builditem, $x, $y) = @_; |
|
|
946 | |
|
|
947 | if ($self->{cfplus_ext}) { |
|
|
948 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
949 | } |
|
|
950 | } |
|
|
951 | |
|
|
952 | sub lookat { |
1250 | sub lookat { |
953 | my ($self, $x, $y) = @_; |
1251 | my ($self, $x, $y) = @_; |
954 | |
1252 | |
955 | if ($self->{cfplus_ext}) { |
1253 | if ($self->{cfplus_ext}) { |
956 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1254 | $self->send_ext_req (lookat => $x, $y, sub { |
957 | my ($msg) = @_; |
1255 | my (%msg) = @_; |
958 | |
1256 | |
959 | if (exists $msg->{npc_dialog}) { |
1257 | if (exists $msg{npc_dialog}) { |
960 | # start npc chat dialog |
1258 | # start npc chat dialog |
961 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1259 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
962 | dx => $x, |
1260 | token => $msg{npc_dialog}, |
963 | dy => $y, |
|
|
964 | title => "$msg->{npc_dialog} (NPC)", |
1261 | title => "$msg{npc_dialog}[0] (NPC)", |
965 | conn => $self, |
1262 | conn => $self, |
966 | ; |
1263 | ; |
967 | } |
1264 | } |
968 | }); |
1265 | }); |
969 | } |
1266 | } |
… | |
… | |
976 | |
1273 | |
977 | (delete $self->{npc_dialog})->destroy |
1274 | (delete $self->{npc_dialog})->destroy |
978 | if $self->{npc_dialog}; |
1275 | if $self->{npc_dialog}; |
979 | |
1276 | |
980 | $self->SUPER::destroy; |
1277 | $self->SUPER::destroy; |
|
|
1278 | |
|
|
1279 | %$self = (); |
981 | } |
1280 | } |
982 | |
1281 | |
983 | package CFPlus::NPCDialog; |
1282 | package CFPlus::NPCDialog; |
984 | |
1283 | |
985 | our @ISA = 'CFPlus::UI::Toplevel'; |
1284 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1032 | on_activate => sub { $this->destroy; 1 }, |
1331 | on_activate => sub { $this->destroy; 1 }, |
1033 | ; |
1332 | ; |
1034 | |
1333 | |
1035 | $self->update_options; |
1334 | $self->update_options; |
1036 | |
1335 | |
1037 | $self->{id} = $self->{conn}->send_ext_req ( |
1336 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1038 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1337 | $self->{conn}->connect_ext ($self->{id} => sub { |
1039 | sub { $this && $this->feed (@_) } |
1338 | $this->feed (@_) if $this; |
1040 | ); |
1339 | }); |
|
|
1340 | |
|
|
1341 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1041 | |
1342 | |
1042 | $self->{entry}->grab_focus; |
1343 | $self->{entry}->grab_focus; |
1043 | |
1344 | |
1044 | $self->{textview}->add_paragraph ({ |
1345 | $self->{textview}->add_paragraph ({ |
1045 | fg => [1, 1, 0, 1], |
1346 | fg => [1, 1, 0, 1], |
… | |
… | |
1068 | ); |
1369 | ); |
1069 | } |
1370 | } |
1070 | } |
1371 | } |
1071 | |
1372 | |
1072 | sub feed { |
1373 | sub feed { |
1073 | my ($self, $msg) = @_; |
1374 | my ($self, $type, @arg) = @_; |
1074 | |
1375 | |
1075 | CFPlus::weaken $self; |
1376 | CFPlus::weaken $self; |
1076 | |
1377 | |
1077 | if ($msg->{msgtype} eq "reply") { |
1378 | if ($type eq "update") { |
|
|
1379 | my (%info) = @arg; |
|
|
1380 | |
1078 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1381 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1079 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1382 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1080 | |
|
|
1081 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
|
|
1082 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1083 | my @link; |
|
|
1084 | $text =~ s{ |
|
|
1085 | ($match) |
|
|
1086 | }{ |
|
|
1087 | my $kw = $1; |
|
|
1088 | |
|
|
1089 | push @link, new CFPlus::UI::Label |
|
|
1090 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1091 | can_hover => 1, |
|
|
1092 | can_events => 1, |
|
|
1093 | padding_x => 0, |
|
|
1094 | padding_y => 0, |
|
|
1095 | on_button_up => sub { |
|
|
1096 | $self->send ($kw); |
|
|
1097 | }; |
|
|
1098 | |
|
|
1099 | "\x{fffc}" |
|
|
1100 | }giex; |
|
|
1101 | |
1383 | |
|
|
1384 | if (exists $info{msg}) { |
|
|
1385 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1386 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1387 | my @link; |
|
|
1388 | $text =~ s{ |
|
|
1389 | ($match) |
|
|
1390 | }{ |
|
|
1391 | my $kw = $1; |
|
|
1392 | |
|
|
1393 | push @link, new CFPlus::UI::Label |
|
|
1394 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1395 | can_hover => 1, |
|
|
1396 | can_events => 1, |
|
|
1397 | padding_x => 0, |
|
|
1398 | padding_y => 0, |
|
|
1399 | on_button_up => sub { |
|
|
1400 | $self->send ($kw); |
|
|
1401 | }; |
|
|
1402 | |
|
|
1403 | "\x{fffc}" |
|
|
1404 | }giex; |
|
|
1405 | |
1102 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1406 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1103 | $self->{textview}->scroll_to_bottom; |
1407 | $self->{textview}->scroll_to_bottom; |
|
|
1408 | } |
|
|
1409 | |
1104 | $self->update_options; |
1410 | $self->update_options; |
1105 | } else { |
1411 | } else { |
1106 | $self->destroy; |
1412 | $self->destroy; |
1107 | } |
1413 | } |
1108 | |
1414 | |
… | |
… | |
1113 | my ($self, $msg) = @_; |
1419 | my ($self, $msg) = @_; |
1114 | |
1420 | |
1115 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1421 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1116 | $self->{textview}->scroll_to_bottom; |
1422 | $self->{textview}->scroll_to_bottom; |
1117 | |
1423 | |
1118 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1424 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1119 | } |
1425 | } |
1120 | |
1426 | |
1121 | sub destroy { |
1427 | sub destroy { |
1122 | my ($self) = @_; |
1428 | my ($self) = @_; |
1123 | |
1429 | |
1124 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1430 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1125 | |
1431 | |
1126 | if ($self->{conn}) { |
1432 | if ($self->{conn}) { |
1127 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1433 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1128 | delete $self->{conn}{npc_dialog}; |
1434 | delete $self->{conn}{npc_dialog}; |
1129 | $self->{conn}->disconnect_ext ($self->{id}); |
1435 | $self->{conn}->disconnect_ext ($self->{id}); |
1130 | } |
1436 | } |
1131 | |
1437 | |
1132 | $self->SUPER::destroy; |
1438 | $self->SUPER::destroy; |