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