| 1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
| 2 | |
2 | |
| 3 | use utf8; |
3 | use common::sense; |
| 4 | use strict; |
|
|
| 5 | |
4 | |
|
|
5 | use Guard (); |
|
|
6 | |
| 6 | use Crossfire::Protocol::Constants; |
7 | use Deliantra::Protocol::Constants; |
| 7 | |
8 | |
| 8 | use CFPlus; |
9 | use DC; |
| 9 | use CFPlus::DB; |
10 | use DC::DB; |
| 10 | use CFPlus::UI; |
11 | use DC::UI; |
| 11 | use CFPlus::Pod; |
12 | use DC::Pod; |
| 12 | use CFPlus::Macro; |
13 | use DC::Macro; |
| 13 | use CFPlus::Item; |
14 | use DC::Item; |
| 14 | |
15 | |
| 15 | use Crossfire::Protocol::Base 0.95; |
|
|
| 16 | |
|
|
| 17 | use base 'Crossfire::Protocol::Base'; |
16 | use base 'Deliantra::Protocol::Base'; |
|
|
17 | |
|
|
18 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
19 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
20 | |
|
|
21 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
22 | "noface.png", minify => 1, mipmap => 1, wrap => 1; |
|
|
23 | |
|
|
24 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
| 18 | |
25 | |
| 19 | sub new { |
26 | sub new { |
| 20 | my ($class, %arg) = @_; |
27 | my ($class, %arg) = @_; |
| 21 | |
28 | |
| 22 | my $self = $class->SUPER::new (%arg, |
29 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
30 | setup_req => { |
| 24 | extmap => 1, |
31 | extmap => 1, |
| 25 | excmd => 1, |
32 | excmd => 1, |
| 26 | xwidget1 => 1,#d# |
33 | widget => 2, |
| 27 | %{$arg{setup_req} || {}}, |
34 | %{$arg{setup_req} || {}}, |
| 28 | }, |
35 | }, |
| 29 | ); |
36 | ); |
| 30 | |
37 | |
| 31 | $self->{map_widget}->clr_commands; |
38 | $self->{map_widget}->clr_commands; |
| 32 | |
39 | |
| 33 | my @cmd_help = map { |
40 | my @cmd_help = map { |
| 34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
41 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| 35 | or die "unparseable command help: $_->{kw}[0]"; |
42 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
| 36 | |
43 | |
| 37 | my $cmd = $1; |
44 | my $cmd = $1; |
| 38 | my @args = split /\|/, $2; |
45 | my @args = split /\|/, $2; |
| 39 | @args = (".*") unless @args; |
46 | @args = (".*") unless @args; |
| 40 | |
47 | |
| 41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
48 | my (undef, @par) = DC::Pod::section_of $_; |
| 42 | my $text = CFPlus::Pod::as_label @par; |
49 | my $text = DC::Pod::as_label @par; |
| 43 | |
50 | |
| 44 | $_ = $_ eq ".*" ? "" : " $_" |
51 | $_ = $_ eq ".*" ? "" : " $_" |
| 45 | for @args; |
52 | for @args; |
| 46 | |
53 | |
| 47 | map ["$cmd$_", $text], |
54 | map ["$cmd$_", $text], |
| 48 | sort { (length $a) <=> (length $b) } |
55 | sort { (length $a) <=> (length $b) } |
| 49 | @args |
56 | @args |
| 50 | } sort { $a->{par} <=> $b->{par} } |
57 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
| 51 | CFPlus::Pod::find command => "*"; |
58 | DC::Pod::find command => "*"; |
| 52 | |
|
|
| 53 | $self->connect_ext (ambient_music => sub { |
|
|
| 54 | my ($songs) = @_; |
|
|
| 55 | &::audio_music_set_ambient ($songs); |
|
|
| 56 | }); |
|
|
| 57 | |
|
|
| 58 | $self->connect_ext (capabilities => sub { |
|
|
| 59 | my (%cap) = @_; |
|
|
| 60 | |
|
|
| 61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
| 62 | $self->update_fx_want; |
|
|
| 63 | |
|
|
| 64 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
| 65 | my ($exp_table) = @_; |
|
|
| 66 | |
|
|
| 67 | $self->register_face_handler ($exp_table, sub { |
|
|
| 68 | my ($face) = @_; |
|
|
| 69 | |
|
|
| 70 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
| 71 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
| 72 | }); |
|
|
| 73 | |
|
|
| 74 | () |
|
|
| 75 | }); |
|
|
| 76 | |
|
|
| 77 | if (my $ts = $cap{tileset}) { |
|
|
| 78 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
| 79 | $self->{tileset} = $default; |
|
|
| 80 | $self->{tilesize} = $default->[3]; |
|
|
| 81 | $self->setup_req (tileset => $default->[0]); |
|
|
| 82 | |
|
|
| 83 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
| 84 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
| 85 | |
|
|
| 86 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
| 87 | } |
|
|
| 88 | } |
|
|
| 89 | }); |
|
|
| 90 | |
59 | |
| 91 | $self->{json_coder} |
60 | $self->{json_coder} |
| 92 | ->convert_blessed |
61 | ->convert_blessed |
| 93 | ->filter_json_single_key_object (__w_ => sub { |
62 | ->filter_json_single_key_object ("\fw" => sub { |
| 94 | $self->{widget}{$_[0]} |
63 | $self->{widget}{$_[0]} |
|
|
64 | }) |
|
|
65 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
66 | my ($id) = @_; |
|
|
67 | sub { |
|
|
68 | $self->send_exti_msg (w_e => $id, @_); |
|
|
69 | } |
| 95 | }); |
70 | }); |
| 96 | |
|
|
| 97 | # widgetset new |
|
|
| 98 | $self->connect_ext (ws_n => sub { |
|
|
| 99 | my ($id) = @_; |
|
|
| 100 | |
|
|
| 101 | $self->{widgetset}{$id} = { |
|
|
| 102 | w => {}, |
|
|
| 103 | }; |
|
|
| 104 | }); |
|
|
| 105 | |
|
|
| 106 | # widgetset destroy |
|
|
| 107 | $self->connect_ext (ws_d => sub { |
|
|
| 108 | my ($id) = @_; |
|
|
| 109 | |
|
|
| 110 | my $ws = delete $self->{widgetset}{$id} |
|
|
| 111 | or return; |
|
|
| 112 | |
|
|
| 113 | $_->destroy |
|
|
| 114 | for values %{$ws->{w}}; |
|
|
| 115 | }); |
|
|
| 116 | |
|
|
| 117 | # widgetset create |
|
|
| 118 | $self->connect_ext (ws_c => sub { |
|
|
| 119 | my ($ws, $id, $class, $args) = @_; |
|
|
| 120 | |
|
|
| 121 | for my $ev (grep /^on_/, keys %$args) { |
|
|
| 122 | my $rid = $args->{$ev}; |
|
|
| 123 | $args->{$ev} = sub { |
|
|
| 124 | my $id = shift->{s_id}; |
|
|
| 125 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
| 126 | |
|
|
| 127 | 1 |
|
|
| 128 | }; |
|
|
| 129 | } |
|
|
| 130 | |
|
|
| 131 | $self->widget_associate ( |
|
|
| 132 | $ws, $id => scalar eval { |
|
|
| 133 | local $SIG{__DIE__}; |
|
|
| 134 | "CFPlus::UI::$class"->new (%$args) |
|
|
| 135 | } |
|
|
| 136 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
| 137 | }); |
|
|
| 138 | |
|
|
| 139 | # widgetset associate |
|
|
| 140 | $self->connect_ext (ws_a => sub { |
|
|
| 141 | my (%ass) = @_; |
|
|
| 142 | |
|
|
| 143 | # everything that has a name, wether conceivably useful or not |
|
|
| 144 | my %wkw = ( |
|
|
| 145 | root => $CFPlus::UI::ROOT, |
|
|
| 146 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
| 147 | |
|
|
| 148 | mapwidget => $::MAPWIDGET, |
|
|
| 149 | buttonbar => $::BUTTONBAR, |
|
|
| 150 | metaserver => $::METASERVER, |
|
|
| 151 | buttonbar => $::BUTTONBAR, |
|
|
| 152 | login_button => $::LOGIN_BUTTON, |
|
|
| 153 | quit_dialog => $::QUIT_DIALOG, |
|
|
| 154 | host_entry => $::HOST_ENTRY, |
|
|
| 155 | metaserver => $::METASERVER, |
|
|
| 156 | server_info => $::SERVER_INFO, |
|
|
| 157 | |
|
|
| 158 | setup_dialog => $::SETUP_DIALOG, |
|
|
| 159 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
| 160 | setup_server => $::SETUP_SERVER, |
|
|
| 161 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
| 162 | |
|
|
| 163 | pl_notebook => $::PL_NOTEBOOK, |
|
|
| 164 | pl_window => $::PL_WINDOW, |
|
|
| 165 | inventory_page => $::INVENTORY_PAGE, |
|
|
| 166 | stats_page => $::STATS_PAGE, |
|
|
| 167 | skill_page => $::SKILL_PAGE, |
|
|
| 168 | spell_page => $::SPELL_PAGE, |
|
|
| 169 | spell_list => $::SPELL_LIST, |
|
|
| 170 | |
|
|
| 171 | floorbox => $::FLOORBOX, |
|
|
| 172 | help_window => $::HELP_WINDOW, |
|
|
| 173 | message_window => $::MESSAGE_WINDOW, |
|
|
| 174 | statusbox => $::SDTATUSBOX, |
|
|
| 175 | |
|
|
| 176 | inv => $::INV, |
|
|
| 177 | invr => $::INVR, |
|
|
| 178 | invr_hb => $::INVR_HB, |
|
|
| 179 | ); |
|
|
| 180 | |
|
|
| 181 | while (my ($id, $name) = each %ass) { |
|
|
| 182 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
| 183 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
| 184 | } |
|
|
| 185 | }); |
|
|
| 186 | |
|
|
| 187 | # widget call |
|
|
| 188 | $self->connect_ext (w_c => sub { |
|
|
| 189 | my ($id, $rid, $method, @args) = @_; |
|
|
| 190 | |
|
|
| 191 | my $w = $self->{widget}{$id} |
|
|
| 192 | or return; |
|
|
| 193 | |
|
|
| 194 | if ($rid) { |
|
|
| 195 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
| 196 | } else { |
|
|
| 197 | $w->$method (@args); |
|
|
| 198 | } |
|
|
| 199 | }); |
|
|
| 200 | |
|
|
| 201 | # widget set |
|
|
| 202 | $self->connect_ext (w_s => sub { |
|
|
| 203 | my ($id, $attr) = @_; |
|
|
| 204 | |
|
|
| 205 | my $w = $self->{widget}{$id} |
|
|
| 206 | or return; |
|
|
| 207 | |
|
|
| 208 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
| 209 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
| 210 | if (defined $value) { |
|
|
| 211 | $w->{$member} = $value; |
|
|
| 212 | } else { |
|
|
| 213 | delete $w->{$member}; |
|
|
| 214 | } |
|
|
| 215 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
| 216 | } |
|
|
| 217 | }); |
|
|
| 218 | |
|
|
| 219 | # widget get |
|
|
| 220 | $self->connect_ext (w_g => sub { |
|
|
| 221 | my ($id, $rid, $attr) = @_; |
|
|
| 222 | |
|
|
| 223 | my $w = $self->{widget}{$id} |
|
|
| 224 | or return; |
|
|
| 225 | |
|
|
| 226 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
| 227 | }); |
|
|
| 228 | |
|
|
| 229 | # message window |
|
|
| 230 | $self->connect_ext (channel_info => sub { |
|
|
| 231 | my ($info) = @_; |
|
|
| 232 | $self->{channels}->{$info->{id}} = $info; |
|
|
| 233 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
| 234 | }); |
|
|
| 235 | |
71 | |
| 236 | # destroy widgets on logout |
72 | # destroy widgets on logout |
| 237 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
73 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 238 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
74 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 239 | $_->destroy |
75 | $_->destroy |
| 240 | for values %{delete $ws->{w} || {}}; |
76 | for values %{delete $ws->{w} || {}}; |
| 241 | } |
77 | } |
|
|
78 | |
|
|
79 | delete $self->{items}; |
|
|
80 | $::INV->clear; |
|
|
81 | $::INVR->clear; |
|
|
82 | $::INVR_HB->clear; |
|
|
83 | $::FLOORBOX->clear; |
| 242 | }); |
84 | }); |
| 243 | |
85 | |
| 244 | $self->{map_widget}->add_command (@$_) |
86 | $self->{map_widget}->add_command (@$_) |
| 245 | for @cmd_help; |
87 | for @cmd_help; |
| 246 | |
88 | |
| 247 | { |
89 | { |
| 248 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
90 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
| 249 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
| 250 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
91 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 251 | } |
92 | } |
| 252 | |
93 | |
| 253 | { |
94 | { |
| 254 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
95 | $self->{noface} = my $tex = $TEX_NOFACE; |
| 255 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
| 256 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
96 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 257 | } |
97 | } |
|
|
98 | |
|
|
99 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
100 | # $self->{expire_w} = AE::timer 1, 1, sub { |
|
|
101 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
102 | # |
|
|
103 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
104 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
105 | # $self->{texture}[$_]->unload; |
|
|
106 | # warn "expire texture $_\n";#d# |
|
|
107 | # } |
|
|
108 | # |
|
|
109 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
110 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
111 | # warn "count is $count\n";#d# |
|
|
112 | # }; |
| 258 | |
113 | |
| 259 | $self->{open_container} = 0; |
114 | $self->{open_container} = 0; |
| 260 | |
115 | |
| 261 | # per server |
116 | # per server |
| 262 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
117 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| 263 | |
118 | |
| 264 | $self |
119 | $self |
| 265 | } |
|
|
| 266 | |
|
|
| 267 | sub widget_associate { |
|
|
| 268 | my ($self, $ws, $id, $widget) = @_; |
|
|
| 269 | |
|
|
| 270 | if ($widget) { |
|
|
| 271 | $widget->{s_id} = $id; |
|
|
| 272 | $self->{widget}{$id} = $widget; |
|
|
| 273 | |
|
|
| 274 | if ($ws) { |
|
|
| 275 | $widget->{s_ws} = $ws; |
|
|
| 276 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
| 277 | } |
|
|
| 278 | |
|
|
| 279 | $widget->connect (on_destroy => sub { |
|
|
| 280 | my ($widget) = @_; |
|
|
| 281 | |
|
|
| 282 | delete $self->{widget}{$widget->{s_id}}; |
|
|
| 283 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
| 284 | if exists $widget->{s_ws}; |
|
|
| 285 | }); |
|
|
| 286 | |
|
|
| 287 | 1 |
|
|
| 288 | } else { |
|
|
| 289 | $self->send_exti_msg (w_e => $id, undef); |
|
|
| 290 | |
|
|
| 291 | 0 |
|
|
| 292 | } |
|
|
| 293 | } |
120 | } |
| 294 | |
121 | |
| 295 | sub update_fx_want { |
122 | sub update_fx_want { |
| 296 | my ($self) = @_; |
123 | my ($self) = @_; |
| 297 | |
124 | |
| … | |
… | |
| 300 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
127 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
| 301 | 6 => 1, # FT_RSRC |
128 | 6 => 1, # FT_RSRC |
| 302 | }); |
129 | }); |
| 303 | } |
130 | } |
| 304 | |
131 | |
|
|
132 | sub ext_capabilities { |
|
|
133 | my ($self, %cap) = @_; |
|
|
134 | |
|
|
135 | $self->update_fx_want; |
|
|
136 | |
|
|
137 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
138 | my ($exp_table) = @_; |
|
|
139 | |
|
|
140 | $self->register_face_handler ($exp_table, sub { |
|
|
141 | my ($face) = @_; |
|
|
142 | |
|
|
143 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
144 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
145 | }); |
|
|
146 | |
|
|
147 | () |
|
|
148 | }); |
|
|
149 | |
|
|
150 | if (my $ts = $cap{tileset}) { |
|
|
151 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
152 | $self->{tileset} = $default; |
|
|
153 | $self->{tilesize} = $default->[3]; |
|
|
154 | $self->setup_req (tileset => $default->[0]); |
|
|
155 | |
|
|
156 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
157 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
158 | |
|
|
159 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
160 | } |
|
|
161 | } |
|
|
162 | } |
|
|
163 | |
|
|
164 | sub ext_ambient_music { |
|
|
165 | my ($self, $songs) = @_; |
|
|
166 | &::audio_music_set_ambient ($songs); |
|
|
167 | } |
|
|
168 | |
|
|
169 | ############################################################################# |
|
|
170 | |
|
|
171 | sub widget_associate { |
|
|
172 | my ($self, $ws, $id, $widget) = @_; |
|
|
173 | |
|
|
174 | $widget ||= new DC::UI::Bin; |
|
|
175 | |
|
|
176 | $widget->{s_id} = $id; |
|
|
177 | $self->{widget}{$id} = $widget; |
|
|
178 | |
|
|
179 | if ($ws) { |
|
|
180 | $widget->{s_ws} = $ws; |
|
|
181 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
182 | } |
|
|
183 | |
|
|
184 | $widget->connect (on_destroy => sub { |
|
|
185 | my ($widget) = @_; |
|
|
186 | |
|
|
187 | delete $self->{widget}{$widget->{s_id}}; |
|
|
188 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
189 | if exists $widget->{s_ws}; |
|
|
190 | }); |
|
|
191 | } |
|
|
192 | |
|
|
193 | # widgetset new |
|
|
194 | sub ext_ws_n { |
|
|
195 | my ($self, $id) = @_; |
|
|
196 | |
|
|
197 | $self->{widgetset}{$id} = { |
|
|
198 | w => {}, |
|
|
199 | }; |
|
|
200 | } |
|
|
201 | |
|
|
202 | # widgetset destroy |
|
|
203 | sub ext_ws_d { |
|
|
204 | my ($self, $id) = @_; |
|
|
205 | |
|
|
206 | my $ws = delete $self->{widgetset}{$id} |
|
|
207 | or return; |
|
|
208 | |
|
|
209 | $_->destroy |
|
|
210 | for values %{$ws->{w}}; |
|
|
211 | } |
|
|
212 | |
|
|
213 | # widgetset create |
|
|
214 | sub ext_ws_c { |
|
|
215 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
216 | |
|
|
217 | $self->widget_associate ( |
|
|
218 | $ws, $id => scalar eval { |
|
|
219 | local $SIG{__DIE__}; |
|
|
220 | "DC::UI::$class"->new (%$args) |
|
|
221 | } |
|
|
222 | ); |
|
|
223 | } |
|
|
224 | |
|
|
225 | # widgetset create template |
|
|
226 | sub ext_ws_ct { |
|
|
227 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
228 | |
|
|
229 | $done_cb ||= sub { }; |
|
|
230 | |
|
|
231 | my $parse_list; $parse_list = sub { |
|
|
232 | my ($list) = @_; |
|
|
233 | my @w; |
|
|
234 | |
|
|
235 | while (@$list) { |
|
|
236 | my ($class, $args) = splice @$list, 0, 2; |
|
|
237 | my $name = delete $args->{s_id}; |
|
|
238 | my $cl = delete $args->{s_cl}; |
|
|
239 | my $cfg = delete $cfg->{$name}; |
|
|
240 | my $id = delete $cfg->{id}; |
|
|
241 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
242 | or next; |
|
|
243 | |
|
|
244 | $self->widget_associate ($ws, $id, $w) |
|
|
245 | if $id; |
|
|
246 | |
|
|
247 | $w->add ($parse_list->($cl)) |
|
|
248 | if $cl; |
|
|
249 | |
|
|
250 | push @w, $w; |
|
|
251 | } |
|
|
252 | |
|
|
253 | @w |
|
|
254 | }; |
|
|
255 | |
|
|
256 | # either array reference, or face # |
|
|
257 | if ($type eq "inline") { |
|
|
258 | $done_cb->(); |
|
|
259 | $parse_list->($template); |
|
|
260 | } elsif ($type eq "face") { |
|
|
261 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
262 | my ($face) = @_; |
|
|
263 | |
|
|
264 | undef $handler; |
|
|
265 | $done_cb->(); |
|
|
266 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
267 | }); |
|
|
268 | } else { |
|
|
269 | $done_cb->(0); |
|
|
270 | } |
|
|
271 | } |
|
|
272 | |
|
|
273 | # widgetset associate |
|
|
274 | sub ext_ws_a { |
|
|
275 | my ($self, %ass) = @_; |
|
|
276 | |
|
|
277 | # everything that has a name, wether conceivably useful or not |
|
|
278 | my %wkw = ( |
|
|
279 | root => $DC::UI::ROOT, |
|
|
280 | tooltip => $DC::UI::TOOLTIP, |
|
|
281 | |
|
|
282 | mapwidget => $::MAPWIDGET, |
|
|
283 | menubar => $::MENUBAR, |
|
|
284 | menupopup => $::MENUPOPUP, |
|
|
285 | pickup_enable => $::PICKUP_ENABLE, |
|
|
286 | buttonbar => $::BUTTONBAR, |
|
|
287 | metaserver => $::METASERVER, |
|
|
288 | buttonbar => $::BUTTONBAR, |
|
|
289 | login_button => $::LOGIN_BUTTON, |
|
|
290 | quit_dialog => $::QUIT_DIALOG, |
|
|
291 | host_entry => $::HOST_ENTRY, |
|
|
292 | metaserver => $::METASERVER, |
|
|
293 | server_info => $::SERVER_INFO, |
|
|
294 | |
|
|
295 | setup_dialog => $::SETUP_DIALOG, |
|
|
296 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
297 | setup_server => $::SETUP_SERVER, |
|
|
298 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
299 | |
|
|
300 | pl_notebook => $::PL_NOTEBOOK, |
|
|
301 | pl_window => $::PL_WINDOW, |
|
|
302 | inventory_page => $::INVENTORY_PAGE, |
|
|
303 | stats_page => $::STATS_PAGE, |
|
|
304 | skill_page => $::SKILL_PAGE, |
|
|
305 | spell_page => $::SPELL_PAGE, |
|
|
306 | spell_list => $::SPELL_LIST, |
|
|
307 | |
|
|
308 | floorbox => $::FLOORBOX, |
|
|
309 | help_window => $::HELP_WINDOW, |
|
|
310 | message_window => $::MESSAGE_WINDOW, |
|
|
311 | message_dist => $::MESSAGE_DIST, |
|
|
312 | statusbox => $::STATUSBOX, |
|
|
313 | |
|
|
314 | inv => $::INV, |
|
|
315 | invr => $::INVR, |
|
|
316 | invr_hb => $::INVR_HB, |
|
|
317 | ); |
|
|
318 | |
|
|
319 | while (my ($id, $name) = each %ass) { |
|
|
320 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
321 | } |
|
|
322 | } |
|
|
323 | |
|
|
324 | # widget call |
|
|
325 | sub ext_w_c { |
|
|
326 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
327 | |
|
|
328 | my $w = $self->{widget}{$id} |
|
|
329 | or return; |
|
|
330 | |
|
|
331 | if ($rcb) { |
|
|
332 | $rcb->($w->$method (@args)); |
|
|
333 | } else { |
|
|
334 | $w->$method (@args); |
|
|
335 | } |
|
|
336 | } |
|
|
337 | |
|
|
338 | # widget set |
|
|
339 | sub ext_w_s { |
|
|
340 | my ($self, $id, $attr) = @_; |
|
|
341 | |
|
|
342 | my $w = $self->{widget}{$id} |
|
|
343 | or return; |
|
|
344 | |
|
|
345 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
346 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
347 | if (defined $value) { |
|
|
348 | $w->{$member} = $value; |
|
|
349 | } else { |
|
|
350 | delete $w->{$member}; |
|
|
351 | } |
|
|
352 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
353 | } |
|
|
354 | } |
|
|
355 | |
|
|
356 | # widget get |
|
|
357 | sub ext_w_g { |
|
|
358 | my ($self, $id, $rid, @attr) = @_; |
|
|
359 | |
|
|
360 | my $w = $self->{widget}{$id} |
|
|
361 | or return; |
|
|
362 | |
|
|
363 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
364 | } |
|
|
365 | |
|
|
366 | # message window |
|
|
367 | sub ext_channel_info { |
|
|
368 | my ($self, $info) = @_; |
|
|
369 | $self->{channels}->{$info->{id}} = $info; |
|
|
370 | $::MESSAGE_DIST->add_channel ($info); |
|
|
371 | } |
|
|
372 | |
|
|
373 | ############################################################################# |
|
|
374 | |
| 305 | sub logprint { |
375 | sub logprint { |
| 306 | my ($self, @a) = @_; |
376 | my ($self, @a) = @_; |
| 307 | |
377 | |
| 308 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
378 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
| 309 | } |
379 | } |
| 310 | |
380 | |
| 311 | sub _stat_numdiff { |
381 | sub _stat_numdiff { |
| 312 | my ($self, $name, $old, $new) = @_; |
382 | my ($self, $name, $old, $new) = @_; |
| 313 | |
383 | |
| … | |
… | |
| 331 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
401 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
| 332 | : () |
402 | : () |
| 333 | } |
403 | } |
| 334 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
404 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
| 335 | |
405 | |
| 336 | join "", @diff |
406 | "\u$name: " . (join ", ", @diff) |
| 337 | } |
407 | } |
| 338 | |
408 | |
| 339 | # all stats that are chacked against changes |
409 | # all stats that are chacked against changes |
| 340 | my @statchange = ( |
410 | my @statchange = ( |
| 341 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
411 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
| … | |
… | |
| 396 | } |
466 | } |
| 397 | |
467 | |
| 398 | if ( |
468 | if ( |
| 399 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
469 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
| 400 | ) { |
470 | ) { |
| 401 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
471 | my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs); |
| 402 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
472 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
| 403 | } |
473 | } |
| 404 | |
474 | |
| 405 | $self->update_stats_window ($stats, $prev); |
475 | $self->update_stats_window ($stats, $prev); |
| 406 | |
476 | |
| 407 | $self->{prev_stats} = { %$stats }; |
477 | $self->{prev_stats} = { %$stats }; |
| … | |
… | |
| 444 | |
514 | |
| 445 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
515 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
| 446 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
516 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 447 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
517 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 448 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
518 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 449 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
519 | $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d# |
| 450 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
520 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 451 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
521 | $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
| 452 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
522 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 453 | my $title = $stats->{+CS_STAT_TITLE}; |
523 | my $title = $stats->{+CS_STAT_TITLE}; |
| 454 | $title =~ s/^Player: //; |
524 | $title =~ s/^Player: //; |
| 455 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
525 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 456 | |
526 | |
| … | |
… | |
| 468 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
538 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
| 469 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
539 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
| 470 | |
540 | |
| 471 | $self->update_weight; |
541 | $self->update_weight; |
| 472 | |
542 | |
| 473 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
543 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}}) |
| 474 | for keys %RES_TBL; |
544 | for keys %RES_TBL; |
| 475 | |
545 | |
| 476 | my $sktbl = $::STATWIDS->{skill_tbl}; |
546 | my $sktbl = $::STATWIDS->{skill_tbl}; |
| 477 | my @skills = keys %{ $self->{skill_info} }; |
547 | my @skills = keys %{ $self->{skill_info} }; |
| 478 | |
548 | |
| 479 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
549 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
550 | map [$_, $self->{skill_info}{$_}], |
|
|
551 | grep exists $stats->{$_}, |
|
|
552 | @skills; |
|
|
553 | |
|
|
554 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
555 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
556 | |
| 480 | $sktbl->clear; |
557 | $sktbl->clear; |
| 481 | |
558 | |
| 482 | my $sw = $self->{skillwid}{""} ||= [ |
559 | my $sw = $self->{skillwid}{""} ||= [ |
| 483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
560 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
561 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
562 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
563 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
564 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
565 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
566 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
567 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 491 | ]; |
568 | ]; |
| 492 | |
569 | |
| 493 | my @add = @$sw; |
570 | my @add = @$sw; |
| 494 | |
571 | |
| 495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
572 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
| 496 | |
573 | |
| 497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
574 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the 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); |
575 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 499 | |
576 | |
| 500 | my ($x, $y) = (0, 1); |
577 | my ($x, $y) = (0, 1); |
| 501 | for ( |
578 | for (@order) { |
| 502 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
| 503 | map [$_, $self->{skill_info}{$_}], |
|
|
| 504 | grep exists $stats->{$_}, |
|
|
| 505 | @skills |
|
|
| 506 | ) { |
|
|
| 507 | my ($idx, $name) = @$_; |
579 | my ($idx, $name) = @$_; |
| 508 | |
580 | |
| 509 | my $spell_cb = sub { |
581 | my $spell_cb = sub { |
| 510 | my ($widget, $ev) = @_; |
582 | my ($widget, $ev) = @_; |
| 511 | |
583 | |
| 512 | if ($ev->{button} == 1) { |
584 | if ($ev->{button} == 1) { |
| 513 | $::CONN->user_send ("ready_skill $name"); |
585 | $::CONN->user_send ("ready_skill $name"); |
| 514 | } elsif ($ev->{button} == 2) { |
586 | } elsif ($ev->{button} == 2) { |
| 515 | $::CONN->user_send ("use_skill $name"); |
587 | $::CONN->user_send ("use_skill $name"); |
| 516 | } elsif ($ev->{button} == 3) { |
588 | } elsif ($ev->{button} == 3) { |
| 517 | my $shortname = CFPlus::shorten $name, 14; |
589 | my $shortname = DC::shorten $name, 14; |
| 518 | (new CFPlus::UI::Menu |
590 | (new DC::UI::Menu |
| 519 | items => [ |
591 | items => [ |
| 520 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
592 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
| 521 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
593 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
| 522 | ], |
594 | ], |
| 523 | )->popup ($ev); |
595 | )->popup ($ev); |
| 524 | } else { |
596 | } else { |
| 525 | return 0; |
597 | return 0; |
| 526 | } |
598 | } |
| … | |
… | |
| 528 | 1 |
600 | 1 |
| 529 | }; |
601 | }; |
| 530 | |
602 | |
| 531 | my $sw = $self->{skillwid}{$idx} ||= [ |
603 | my $sw = $self->{skillwid}{$idx} ||= [ |
| 532 | # exp |
604 | # exp |
| 533 | (new CFPlus::UI::Label |
605 | (new DC::UI::Label |
| 534 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
606 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
| 535 | |
607 | |
| 536 | # level |
608 | # level |
| 537 | (new CFPlus::UI::Label |
609 | (new DC::UI::Label |
| 538 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
610 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
| 539 | |
611 | |
| 540 | # progress |
612 | # progress |
| 541 | (new CFPlus::UI::ExperienceProgress), |
613 | (new DC::UI::ExperienceProgress), |
| 542 | |
614 | |
| 543 | # label |
615 | # label |
| 544 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
616 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
| 545 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
617 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
| 546 | ]; |
618 | ]; |
| 547 | |
619 | |
| 548 | push @add, |
620 | push @add, |
| 549 | $x * 4 + 0, $y, $sw->[0], |
621 | $x * 4 + 0, $y, $sw->[0], |
| 550 | $x * 4 + 1, $y, $sw->[1], |
622 | $x * 4 + 1, $y, $sw->[1], |
| … | |
… | |
| 556 | } |
628 | } |
| 557 | |
629 | |
| 558 | $sktbl->add_at (@add); |
630 | $sktbl->add_at (@add); |
| 559 | } |
631 | } |
| 560 | |
632 | |
| 561 | for (grep exists $stats->{$_}, @skills) { |
633 | for (@order) { |
|
|
634 | my ($idx, $name) = @$_; |
|
|
635 | my $val = $stats->{$idx}; |
|
|
636 | |
|
|
637 | next if $prev->{$idx}[1] eq $val->[1]; |
|
|
638 | |
| 562 | my $sw = $self->{skillwid}{$_}; |
639 | my $sw = $self->{skillwid}{$idx}; |
| 563 | $sw->[0]->set_text (::formsep ($stats->{$_}[1])); |
640 | $sw->[0]->set_text (::formsep ($val->[1])); |
| 564 | $sw->[1]->set_text ($stats->{$_}[0] * 1); |
641 | $sw->[1]->set_text ($val->[0] * 1); |
| 565 | $sw->[2]->set_value (@{$stats->{$_}}); |
642 | $sw->[2]->set_value (@$val); |
| 566 | } |
|
|
| 567 | } |
|
|
| 568 | |
643 | |
| 569 | sub macro_send { |
644 | $::GAUGES->{skillexp}->set_label ("$name %d%%"); |
| 570 | my ($self, $macro) = @_; |
645 | $::GAUGES->{skillexp}->set_value (@$val); |
| 571 | |
|
|
| 572 | for my $cmd (@{ $macro->{action} }) { |
|
|
| 573 | $self->send_command ($cmd); |
|
|
| 574 | } |
646 | } |
| 575 | } |
647 | } |
| 576 | |
648 | |
| 577 | sub user_send { |
649 | sub user_send { |
| 578 | my ($self, $command) = @_; |
650 | my ($self, $command) = @_; |
| … | |
… | |
| 580 | $self->{record}->($command) |
652 | $self->{record}->($command) |
| 581 | if $self->{record}; |
653 | if $self->{record}; |
| 582 | |
654 | |
| 583 | $self->logprint ("send: ", $command); |
655 | $self->logprint ("send: ", $command); |
| 584 | $self->send_command ($command); |
656 | $self->send_command ($command); |
| 585 | ::status ($command); |
|
|
| 586 | } |
657 | } |
| 587 | |
658 | |
| 588 | sub record { |
659 | sub record { |
| 589 | my ($self, $cb) = @_; |
660 | my ($self, $cb) = @_; |
| 590 | |
661 | |
| … | |
… | |
| 592 | } |
663 | } |
| 593 | |
664 | |
| 594 | sub map_scroll { |
665 | sub map_scroll { |
| 595 | my ($self, $dx, $dy) = @_; |
666 | my ($self, $dx, $dy) = @_; |
| 596 | |
667 | |
| 597 | $self->{map}->scroll ($dx, $dy); |
668 | $self->{map_widget}->scroll ($dx, $dy); |
| 598 | } |
669 | } |
| 599 | |
670 | |
| 600 | sub feed_map1a { |
671 | sub feed_map1a { |
| 601 | my ($self, $data) = @_; |
672 | my ($self, $data) = @_; |
| 602 | |
673 | |
| … | |
… | |
| 606 | for my $tile (@$missing) { |
677 | for my $tile (@$missing) { |
| 607 | next if $self->{delay}{$tile}; |
678 | next if $self->{delay}{$tile}; |
| 608 | |
679 | |
| 609 | $delay = 1; |
680 | $delay = 1; |
| 610 | |
681 | |
| 611 | if (my $tex = $::CONN->{texture}[$tile]) { |
682 | if (my $tex = $self->{texture}[$tile]) { |
| 612 | $tex->upload; |
683 | $tex->upload; |
| 613 | } else { |
684 | } else { |
| 614 | $self->{delay}{$tile} = 1; |
685 | $self->{delay}{$tile} = 1; |
| 615 | |
686 | |
| 616 | # we assume the face is in-flight and will eventually come |
687 | # we assume the face is in-flight and will eventually arrive |
| 617 | push @{$self->{tile_cb}{$tile}}, sub { |
688 | push @{$self->{tile_cb}{$tile}}, sub { |
| 618 | delete $self->{delay}{$tile}; |
689 | delete $self->{delay}{$tile}; |
| 619 | $_[0]->upload; |
690 | $_[0]->upload; |
| 620 | }; |
691 | }; |
| 621 | } |
692 | } |
| 622 | } |
693 | } |
| 623 | |
694 | |
| 624 | if ($delay) { |
695 | if ($delay) { |
| 625 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
696 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
| 626 | Event->timer (after => 0.03, cb => sub { |
697 | EV::once undef, 0, 0.03, sub { |
| 627 | $_[0]->w->cancel; |
|
|
| 628 | $self->{map_widget}->update; |
698 | $self->{map_widget}->update |
|
|
699 | if $self->{map_widget}; |
| 629 | }); |
700 | }; |
| 630 | } else { |
701 | } else { |
| 631 | $self->{map_widget}->update; |
702 | $self->{map_widget}->update; |
| 632 | } |
703 | } |
| 633 | } |
704 | } |
| 634 | |
705 | |
| … | |
… | |
| 639 | } |
710 | } |
| 640 | |
711 | |
| 641 | sub flush_map { |
712 | sub flush_map { |
| 642 | my ($self) = @_; |
713 | my ($self) = @_; |
| 643 | |
714 | |
| 644 | my $map_info = delete $self->{map_info} |
715 | return unless $self->{map_info}; |
| 645 | or return; |
|
|
| 646 | |
716 | |
|
|
717 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 647 | my ($hash, $x, $y, $w, $h) = @$map_info; |
718 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 648 | |
719 | |
| 649 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
720 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 650 | $self->{map_cache_new}{$hash} = \$data; |
721 | |
|
|
722 | if ($data ne $$rdata) { |
|
|
723 | $map_info->[1] = \$data; |
|
|
724 | my $cdata = Compress::LZF::compress $data; |
| 651 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
725 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
726 | } |
|
|
727 | } |
| 652 | } |
728 | } |
| 653 | |
729 | |
| 654 | sub map_clear { |
730 | sub map_clear { |
| 655 | my ($self) = @_; |
731 | my ($self) = @_; |
| 656 | |
732 | |
| 657 | $self->flush_map; |
733 | $self->flush_map; |
|
|
734 | delete $self->{map_info}; |
| 658 | delete $self->{neigh_map}; |
735 | delete $self->{neigh_map}; |
| 659 | |
736 | |
| 660 | $self->{map}->clear; |
737 | $self->{map}->clear; |
| 661 | delete $self->{map_widget}{magicmap}; |
738 | delete $self->{map_widget}{magicmap}; |
| 662 | } |
739 | } |
| … | |
… | |
| 669 | do { |
746 | do { |
| 670 | $tile = pop @{$self->{bg_fetch}} |
747 | $tile = pop @{$self->{bg_fetch}} |
| 671 | or return; |
748 | or return; |
| 672 | } while $self->{texture}[$tile]; |
749 | } while $self->{texture}[$tile]; |
| 673 | |
750 | |
| 674 | CFPlus::DB::get tilecache => $tile, sub { |
751 | DC::DB::get tilecache => $tile, sub { |
| 675 | my ($data) = @_; |
752 | my ($data) = @_; |
| 676 | |
753 | |
| 677 | return unless $self->{map}; # stop when destroyed |
754 | return unless $self->{map}; # stop when destroyed |
| 678 | |
755 | |
| 679 | if (defined $data) { |
756 | if (defined $data) { |
| … | |
… | |
| 683 | |
760 | |
| 684 | $self->bg_fetch; |
761 | $self->bg_fetch; |
| 685 | }; |
762 | }; |
| 686 | } |
763 | } |
| 687 | |
764 | |
| 688 | sub load_map($$$) { |
765 | sub load_map($$$$$$) { |
| 689 | my ($self, $hash, $x, $y) = @_; |
766 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 690 | |
767 | |
| 691 | my $gen = $self->{map_change_gen}; |
768 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 692 | |
769 | |
| 693 | my $cb = sub { |
770 | my $cb = sub { |
| 694 | return unless $gen == $self->{map_change_gen}; |
771 | $map_info->[1] = \$_[0]; |
| 695 | |
772 | |
| 696 | my ($data) = @_; |
|
|
| 697 | |
|
|
| 698 | if (defined $data) { |
|
|
| 699 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 700 | |
|
|
| 701 | my $data = Compress::LZF::decompress $data; |
|
|
| 702 | |
|
|
| 703 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
773 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 704 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
774 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 705 | $self->bg_fetch unless $inprogress; |
775 | $self->bg_fetch unless $inprogress; |
| 706 | } |
|
|
| 707 | }; |
776 | }; |
| 708 | |
777 | |
| 709 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
778 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 710 | $cb->($$rdata); |
779 | $cb->(${ $map_info->[1] }); |
| 711 | } else { |
780 | } else { |
|
|
781 | my $gen = $self->{map_change_gen}; |
|
|
782 | |
| 712 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
783 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
784 | return unless $gen == $self->{map_change_gen}; |
|
|
785 | return unless defined $_[0]; |
|
|
786 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
787 | }; |
| 713 | } |
788 | } |
| 714 | } |
789 | } |
| 715 | |
790 | |
| 716 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
791 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 717 | # (server resource,s latency, bandwidth), so this hack is warranted. |
792 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 718 | # the right fix is to make real tiled maps with an overview file |
793 | # the right fix is to make real tiled maps with an overview file |
| 719 | sub send_mapinfo { |
794 | sub send_mapinfo { |
| 720 | my ($self, $data, $cb) = @_; |
795 | my ($self, $data, $cb) = @_; |
| 721 | |
796 | |
| 722 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
797 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 747 | } |
822 | } |
| 748 | |
823 | |
| 749 | # this method does a "flood fill" into every tile direction |
824 | # this method does a "flood fill" into every tile direction |
| 750 | # it assumes that tiles are arranged in a rectangular grid, |
825 | # it assumes that tiles are arranged in a rectangular grid, |
| 751 | # i.e. a map is the same as the left of the right map etc. |
826 | # i.e. a map is the same as the left of the right map etc. |
| 752 | # failure to comply are harmless and result in display errors |
827 | # failure to comply is harmless and results in display errors |
| 753 | # at worst. |
828 | # at worst. |
| 754 | sub flood_fill { |
829 | sub flood_fill { |
| 755 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
830 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 756 | |
831 | |
| 757 | # the server does not allow map paths > 6 |
832 | # the server does not allow map paths > 6 |
| … | |
… | |
| 793 | return if $mode ne "spatial"; |
868 | return if $mode ne "spatial"; |
| 794 | |
869 | |
| 795 | $x += $self->{map}->ox; |
870 | $x += $self->{map}->ox; |
| 796 | $y += $self->{map}->oy; |
871 | $y += $self->{map}->oy; |
| 797 | |
872 | |
| 798 | $self->load_map ($hash, $x, $y) |
873 | $self->load_map ($hash, $x, $y, $w, $h) |
| 799 | unless $self->{neigh_map}{$hash}[5]++;#d# |
874 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 800 | |
875 | |
| 801 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
876 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 802 | |
877 | |
| 803 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
878 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 811 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
886 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 812 | |
887 | |
| 813 | $self->flush_map; |
888 | $self->flush_map; |
| 814 | |
889 | |
| 815 | ++$self->{map_change_gen}; |
890 | ++$self->{map_change_gen}; |
| 816 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
891 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 817 | |
892 | |
| 818 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
893 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 819 | |
894 | |
| 820 | my $mapmapw = $self->{mapmap}->{w}; |
895 | my $mapmapw = $self->{mapmap}->{w}; |
| 821 | my $mapmaph = $self->{mapmap}->{h}; |
896 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 833 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
908 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 834 | |
909 | |
| 835 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
910 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 836 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
911 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 837 | |
912 | |
| 838 | $self->load_map ($hash, $x, $y); |
913 | $self->load_map ($hash, $x, $y, $w, $h); |
| 839 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
914 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 840 | } |
915 | } |
| 841 | |
916 | |
| 842 | sub face_find { |
917 | sub face_find { |
| 843 | my ($self, $facenum, $face, $cb) = @_; |
918 | my ($self, $facenum, $face, $cb) = @_; |
| 844 | |
919 | |
| 845 | if ($face->{type} == 0) { # FT_FACE |
920 | if ($face->{type} == 0) { # FT_FACE |
| 846 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
921 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
| 847 | |
922 | |
| 848 | $face->{id} = $id; |
923 | $face->{id} = $id; |
| 849 | $self->{map}->set_tileid ($facenum => $id); |
924 | $self->{map}->set_tileid ($facenum => $id); |
| 850 | |
925 | |
| 851 | CFPlus::DB::get tilecache => $id, $cb; |
926 | DC::DB::get tilecache => $id, $cb; |
| 852 | |
927 | |
| 853 | } elsif ($face->{type} & 1) { # with metadata |
928 | } elsif ($face->{type} & 1) { # with metadata |
| 854 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
929 | DC::DB::get res_meta => $face->{name}, $cb; |
| 855 | |
930 | |
| 856 | } else { # no metadata |
931 | } else { # no metadata |
| 857 | CFPlus::DB::get res_data => $face->{name}, $cb; |
932 | DC::DB::get res_data => $face->{name}, $cb; |
| 858 | } |
933 | } |
| 859 | } |
934 | } |
| 860 | |
935 | |
| 861 | sub face_update { |
936 | sub face_update { |
| 862 | my ($self, $facenum, $face, $changed) = @_; |
937 | my ($self, $facenum, $face, $changed) = @_; |
| 863 | |
938 | |
| 864 | if ($face->{type} == 0) { |
939 | if ($face->{type} == 0) { |
| 865 | # image, FT_FACE |
940 | # image, FT_FACE |
| 866 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
941 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
| 867 | if $changed; |
942 | if $changed; |
| 868 | |
943 | |
| 869 | $self->have_tile ($face->{id}, delete $face->{data}); |
944 | $self->have_tile ($face->{id}, delete $face->{data}); |
| 870 | |
945 | |
| 871 | } elsif ($face->{type} & 1) { |
946 | } elsif ($face->{type} & 1) { |
| 872 | # split metadata case, FT_MUSIC, FT_SOUND |
947 | # split metadata case, FT_MUSIC, FT_SOUND |
| 873 | if ($changed) { # new data |
948 | if ($changed) { # new data |
| 874 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
949 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
| 875 | $face->{data} = $meta; |
950 | $face->{data} = $meta; |
| 876 | |
951 | |
|
|
952 | # rely on strict ordering here and also on later fetch |
| 877 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
953 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
| 878 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
954 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
| 879 | } |
955 | } |
| 880 | |
956 | |
| 881 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
957 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
| 882 | |
|
|
| 883 | ::add_license ($face); |
958 | ::add_license ($face); |
|
|
959 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
960 | if $changed; |
| 884 | |
961 | |
| 885 | if ($face->{type} == 3) { # FT_MUSIC |
962 | if ($face->{type} == 3) { # FT_MUSIC |
| 886 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
| 887 | if $changed; |
|
|
| 888 | |
|
|
| 889 | &::audio_music_push ($facenum); |
963 | &::audio_music_push ($facenum); |
| 890 | } elsif ($face->{type} == 5) { # FT_SOUND |
964 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 891 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
| 892 | if $changed; |
|
|
| 893 | |
|
|
| 894 | &::audio_sound_push ($facenum); |
965 | &::audio_sound_push ($facenum); |
| 895 | } |
966 | } |
| 896 | |
967 | |
| 897 | } else { |
968 | } else { |
| 898 | # flat resource case, FT_RSRC |
969 | # flat resource case, FT_RSRC |
| 899 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
970 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
| 900 | if $changed; |
971 | if $changed; |
| 901 | } |
972 | } |
| 902 | |
973 | |
| 903 | if (my $cbs = $self->{face_cb}{$facenum}) { |
974 | if (my $cbs = $self->{face_cb}{$facenum}) { |
| 904 | $_->($face, $changed) for @$cbs; |
975 | $_->($face, $changed) for @$cbs; |
| … | |
… | |
| 915 | my ($self, $tile, $data) = @_; |
986 | my ($self, $tile, $data) = @_; |
| 916 | |
987 | |
| 917 | return unless $self->{map}; |
988 | return unless $self->{map}; |
| 918 | |
989 | |
| 919 | my $tex = $self->{texture}[$tile] ||= |
990 | my $tex = $self->{texture}[$tile] ||= |
| 920 | new CFPlus::Texture |
991 | new DC::Texture |
| 921 | tile => $tile, |
992 | tile => $tile, |
| 922 | image => $data, delete_image => 1, |
993 | image => $data, delete_image => 1, |
| 923 | minify => 1, mipmap => 1; |
994 | minify => 1; |
| 924 | |
995 | |
| 925 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
996 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
| 926 | $_->($tex) for @$cbs; |
997 | $_->($tex) for @$cbs; |
| 927 | } |
998 | } |
| 928 | } |
999 | } |
| … | |
… | |
| 933 | my ($self, $num, $cb) = @_; |
1004 | my ($self, $num, $cb) = @_; |
| 934 | |
1005 | |
| 935 | push @{$self->{face_cb}{$num}}, $cb; |
1006 | push @{$self->{face_cb}{$num}}, $cb; |
| 936 | |
1007 | |
| 937 | defined wantarray |
1008 | defined wantarray |
| 938 | ? CFPlus::guard { |
1009 | ? Guard::guard { |
| 939 | @{$self->{face_cb}{$num}} |
1010 | @{$self->{face_cb}{$num}} |
| 940 | = grep $_ != $cb, |
1011 | = grep $_ != $cb, |
| 941 | @{$self->{face_cb}{$num}}; |
1012 | @{$self->{face_cb}{$num}}; |
| 942 | } |
1013 | } |
| 943 | : () |
1014 | : () |
| … | |
… | |
| 971 | my ($self, $flags, $prompt) = @_; |
1042 | my ($self, $flags, $prompt) = @_; |
| 972 | |
1043 | |
| 973 | $prompt = $LAST_QUERY unless length $prompt; |
1044 | $prompt = $LAST_QUERY unless length $prompt; |
| 974 | $LAST_QUERY = $prompt; |
1045 | $LAST_QUERY = $prompt; |
| 975 | |
1046 | |
| 976 | $self->{query}-> ($self, $flags, $prompt); |
1047 | $self->{query}->($self, $flags, $prompt); |
| 977 | } |
1048 | } |
| 978 | |
1049 | |
| 979 | sub sanitise_xml($) { |
1050 | sub sanitise_xml($) { |
| 980 | local $_ = shift; |
1051 | local $_ = shift; |
| 981 | |
1052 | |
| 982 | # we now weed out all tags we do not support |
1053 | # we now weed out all tags we do not support |
| 983 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1054 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1055 | }{ |
|
|
1056 | "<" |
|
|
1057 | }gex; |
|
|
1058 | |
| 984 | # now all entities |
1059 | # now all entities |
| 985 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1060 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 986 | |
1061 | |
| 987 | # handle some elements |
1062 | # handle some elements |
| 988 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1063 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 989 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1064 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1065 | |
|
|
1066 | s/\s+$//; |
| 990 | |
1067 | |
| 991 | $_ |
1068 | $_ |
| 992 | } |
1069 | } |
| 993 | |
1070 | |
| 994 | our %NAME_TO_COLOR = ( |
1071 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1037 | $self->logprint ("msg: ", $text); |
1114 | $self->logprint ("msg: ", $text); |
| 1038 | return if $color < 0; # negative color == ignore if not understood |
1115 | return if $color < 0; # negative color == ignore if not understood |
| 1039 | |
1116 | |
| 1040 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
1117 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
| 1041 | |
1118 | |
| 1042 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
| 1043 | # no longer neecssary with TRT servers |
|
|
| 1044 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
|
|
| 1045 | |
|
|
| 1046 | ::message ({ |
1119 | ::message ({ |
| 1047 | fg => $fg, |
1120 | fg => $fg, |
| 1048 | markup => $_, |
1121 | markup => $text, |
| 1049 | type => $type, |
1122 | type => $type, |
| 1050 | extra => [@extra], |
1123 | extra => [@extra], |
| 1051 | color_flags => $color |
1124 | color_flags => $color, #d# ugly, kill |
| 1052 | }) for split /\n/, $text; |
1125 | }); |
|
|
1126 | |
|
|
1127 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1128 | # # actually, this is an ugly design. _we_ should control the channels, |
|
|
1129 | # # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1130 | # # then we could also react to flags such as CLEAR without resorting to |
|
|
1131 | # # hacks such as color_flags, above. |
| 1053 | |
1132 | |
| 1054 | $self->{statusbox}->add ($text, |
1133 | $self->{statusbox}->add ($text, |
| 1055 | group => $text, |
1134 | group => $text, |
| 1056 | fg => $fg, |
1135 | fg => $fg, |
| 1057 | timeout => $color >= 2 ? 180 : 10, |
1136 | timeout => $color >= 2 ? 180 : 10, |
| 1058 | tooltip_font => $::FONT_FIXED, |
1137 | tooltip_font => $::FONT_FIXED, |
| 1059 | ); |
1138 | ) if $type eq "info"; |
| 1060 | } |
1139 | } |
| 1061 | } |
1140 | } |
| 1062 | |
1141 | |
| 1063 | sub spell_add { |
1142 | sub spell_add { |
| 1064 | my ($self, $spell) = @_; |
1143 | my ($self, $spell) = @_; |
| … | |
… | |
| 1068 | $spell->{message} =~ s/\n+$//; |
1147 | $spell->{message} =~ s/\n+$//; |
| 1069 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1148 | $spell->{message} ||= "Server did not provide a description for this spell."; |
| 1070 | |
1149 | |
| 1071 | $::SPELL_LIST->add_spell ($spell); |
1150 | $::SPELL_LIST->add_spell ($spell); |
| 1072 | |
1151 | |
| 1073 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1152 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
| 1074 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1153 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
| 1075 | } |
1154 | } |
| 1076 | |
1155 | |
| 1077 | sub spell_delete { |
1156 | sub spell_delete { |
| 1078 | my ($self, $spell) = @_; |
1157 | my ($self, $spell) = @_; |
| 1079 | |
1158 | |
| … | |
… | |
| 1090 | sub addme_success { |
1169 | sub addme_success { |
| 1091 | my ($self) = @_; |
1170 | my ($self) = @_; |
| 1092 | |
1171 | |
| 1093 | my %skill_help; |
1172 | my %skill_help; |
| 1094 | |
1173 | |
| 1095 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1174 | for my $node (DC::Pod::find skill_description => "*") { |
| 1096 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1175 | my (undef, @par) = DC::Pod::section_of $node; |
| 1097 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1176 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1098 | }; |
1177 | }; |
| 1099 | |
1178 | |
| 1100 | for my $skill (values %{$self->{skill_info}}) { |
1179 | for my $skill (values %{$self->{skill_info}}) { |
| 1101 | $self->{map_widget}->add_command ("ready_skill $skill", |
1180 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1102 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1181 | (DC::asxml "Ready the skill '$skill'\n\n") |
| 1103 | . $skill_help{$skill}); |
1182 | . $skill_help{$skill}); |
| 1104 | $self->{map_widget}->add_command ("use_skill $skill", |
1183 | $self->{map_widget}->add_command ("use_skill $skill", |
| 1105 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1184 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
| 1106 | . $skill_help{$skill}); |
1185 | . $skill_help{$skill}); |
| 1107 | } |
1186 | } |
| 1108 | } |
1187 | } |
| 1109 | |
1188 | |
| 1110 | sub eof { |
1189 | sub eof { |
| … | |
… | |
| 1114 | |
1193 | |
| 1115 | ::stop_game (); |
1194 | ::stop_game (); |
| 1116 | } |
1195 | } |
| 1117 | |
1196 | |
| 1118 | sub update_floorbox { |
1197 | sub update_floorbox { |
| 1119 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1198 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 1120 | return unless $::CONN; |
1199 | return unless $::CONN; |
| 1121 | |
1200 | |
| 1122 | $::FLOORBOX->clear; |
1201 | $::FLOORBOX->clear; |
| 1123 | |
1202 | |
| 1124 | my @add; |
1203 | my @add; |
| 1125 | |
1204 | |
| 1126 | my $row; |
1205 | my $row; |
| 1127 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1206 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1207 | next if $_->{tag} & 0x80000000; |
| 1128 | if ($row < 6) { |
1208 | if ($row < 6) { |
| 1129 | local $_->{face_widget}; # hack to force recreation of widget |
1209 | local $_->{face_widget}; # hack to force recreation of widget |
| 1130 | local $_->{desc_widget}; # hack to force recreation of widget |
1210 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1131 | CFPlus::Item::update_widgets $_; |
1211 | DC::Item::update_widgets $_; |
| 1132 | |
1212 | |
| 1133 | push @add, |
1213 | push @add, |
| 1134 | 0, $row, $_->{face_widget}, |
1214 | 0, $row, $_->{face_widget}, |
| 1135 | 1, $row, $_->{desc_widget}; |
1215 | 1, $row, $_->{desc_widget}; |
| 1136 | |
1216 | |
| 1137 | $row++; |
1217 | $row++; |
| 1138 | } else { |
1218 | } else { |
| 1139 | push @add, 1, $row, new CFPlus::UI::Button |
1219 | push @add, 1, $row, new DC::UI::Button |
| 1140 | text => "More...", |
1220 | text => "More...", |
| 1141 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1221 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
| 1142 | ; |
1222 | ; |
| 1143 | last; |
1223 | last; |
| 1144 | } |
1224 | } |
| 1145 | } |
1225 | } |
| 1146 | if ($::CONN->{open_container}) { |
1226 | if ($::CONN->{open_container}) { |
| 1147 | push @add, 1, $row++, new CFPlus::UI::Button |
1227 | push @add, 1, $row++, new DC::UI::Button |
| 1148 | text => "Close container", |
1228 | text => "Close container", |
| 1149 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1229 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
| 1150 | ; |
1230 | ; |
| 1151 | } |
1231 | } |
| 1152 | |
1232 | |
| 1153 | $::FLOORBOX->add_at (@add); |
1233 | $::FLOORBOX->add_at (@add); |
| 1154 | }); |
1234 | }); |
| 1155 | |
1235 | |
| 1156 | $::WANT_REFRESH->start; |
1236 | $::WANT_REFRESH = 1; |
| 1157 | } |
1237 | } |
| 1158 | |
1238 | |
| 1159 | sub set_opencont { |
1239 | sub set_opencont { |
| 1160 | my ($conn, $tag, $name) = @_; |
1240 | my ($conn, $tag, $name) = @_; |
| 1161 | $conn->{open_container} = $tag; |
1241 | $conn->{open_container} = $tag; |
| 1162 | update_floorbox; |
1242 | update_floorbox; |
| 1163 | |
1243 | |
| 1164 | $::INVR_HB->clear (); |
1244 | $::INVR_HB->clear; |
| 1165 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1245 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1166 | |
1246 | |
| 1167 | if ($tag != 0) { # Floor isn't closable, is it? |
1247 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1168 | $::INVR_HB->add (new CFPlus::UI::Button |
1248 | $::INVR_HB->add (new DC::UI::Button |
| 1169 | text => "Close container", |
1249 | text => "Close container", |
| 1170 | tooltip => "Close the currently open container (if one is open)", |
1250 | tooltip => "Close the currently open container (if one is open)", |
| 1171 | on_activate => sub { |
1251 | on_activate => sub { |
| 1172 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1252 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
| 1173 | if $tag != 0; |
1253 | if $tag != 0; |
| … | |
… | |
| 1180 | } |
1260 | } |
| 1181 | |
1261 | |
| 1182 | sub update_containers { |
1262 | sub update_containers { |
| 1183 | my ($self) = @_; |
1263 | my ($self) = @_; |
| 1184 | |
1264 | |
| 1185 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1265 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
| 1186 | my $todo = delete $self->{update_container} |
1266 | my $todo = delete $self->{update_container} |
| 1187 | or return; |
1267 | or return; |
| 1188 | |
1268 | |
| 1189 | for my $tag (keys %$todo) { |
1269 | for my $tag (keys %$todo) { |
| 1190 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1270 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
| … | |
… | |
| 1225 | } |
1305 | } |
| 1226 | |
1306 | |
| 1227 | sub item_update { |
1307 | sub item_update { |
| 1228 | my ($self, $item) = @_; |
1308 | my ($self, $item) = @_; |
| 1229 | |
1309 | |
| 1230 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1310 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1231 | |
1311 | |
| 1232 | CFPlus::Item::update_widgets $item; |
1312 | DC::Item::update_widgets $item; |
| 1233 | |
1313 | |
| 1234 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1314 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1235 | set_opencont ($::CONN, 0, "Floor"); |
1315 | set_opencont ($::CONN, 0, "Floor"); |
| 1236 | |
1316 | |
| 1237 | } elsif ($item->{flags} & F_OPEN) { |
1317 | } elsif ($item->{flags} & F_OPEN) { |
| 1238 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1318 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| 1239 | |
1319 | |
| 1240 | } else { |
1320 | } else { |
| 1241 | $self->{update_container}{$item->{container}}++; |
1321 | $self->{update_container}{$item->{container}}++; |
| 1242 | $self->update_containers; |
1322 | $self->update_containers; |
| 1243 | } |
1323 | } |
| … | |
… | |
| 1254 | |
1334 | |
| 1255 | my $weight = .001 * $self->{player}{weight}; |
1335 | my $weight = .001 * $self->{player}{weight}; |
| 1256 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1336 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1257 | |
1337 | |
| 1258 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1338 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1259 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1339 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1260 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1340 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1261 | } |
1341 | } |
| 1262 | |
1342 | |
| 1263 | sub update_server_info { |
1343 | sub update_server_info { |
| 1264 | my ($self) = @_; |
1344 | my ($self) = @_; |
| 1265 | |
1345 | |
| 1266 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
1346 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
| 1267 | |
1347 | |
|
|
1348 | my $version = JSON::XS->new->encode ($self->{s_version}); |
|
|
1349 | |
| 1268 | $::SERVER_INFO->set_markup ( |
1350 | $::SERVER_INFO->set_markup ( |
| 1269 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1351 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 1270 | . "protocol version <tt>$self->{version}</tt>\n" |
1352 | . "protocol version <tt>$version</tt>\n" |
| 1271 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1353 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
| 1272 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1354 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
| 1273 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1355 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 1274 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1356 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1275 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1357 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
| 1276 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1358 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 1277 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1359 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1278 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1360 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1279 | . "map size $self->{mapw}×$self->{maph}\n" |
1361 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1280 | ); |
1362 | ); |
| 1281 | |
1363 | |
| 1282 | } |
1364 | } |
| … | |
… | |
| 1302 | 0 |
1384 | 0 |
| 1303 | }); |
1385 | }); |
| 1304 | |
1386 | |
| 1305 | $self->update_server_info; |
1387 | $self->update_server_info; |
| 1306 | |
1388 | |
| 1307 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
| 1308 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
| 1309 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1389 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1310 | $self->send_command ("pickup $::CFG->{pickup}"); |
1390 | $self->send_pickup ($::CFG->{pickup}); |
| 1311 | } |
1391 | } |
| 1312 | |
1392 | |
| 1313 | sub lookat { |
1393 | sub lookat { |
| 1314 | my ($self, $x, $y) = @_; |
1394 | my ($self, $x, $y) = @_; |
| 1315 | |
1395 | |
| … | |
… | |
| 1317 | $self->send_ext_req (lookat => $x, $y, sub { |
1397 | $self->send_ext_req (lookat => $x, $y, sub { |
| 1318 | my (%msg) = @_; |
1398 | my (%msg) = @_; |
| 1319 | |
1399 | |
| 1320 | if (exists $msg{npc_dialog}) { |
1400 | if (exists $msg{npc_dialog}) { |
| 1321 | # start npc chat dialog |
1401 | # start npc chat dialog |
| 1322 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1402 | $self->{w}{npc_dialog} = new DC::NPCDialog:: |
| 1323 | token => $msg{npc_dialog}, |
1403 | token => $msg{npc_dialog}, |
| 1324 | title => "$msg{npc_dialog}[0] (NPC)", |
1404 | title => "$msg{npc_dialog}[0] (NPC)", |
| 1325 | conn => $self, |
1405 | conn => $self, |
| 1326 | ; |
1406 | ; |
| 1327 | } |
1407 | } |
| … | |
… | |
| 1332 | } |
1412 | } |
| 1333 | |
1413 | |
| 1334 | sub destroy { |
1414 | sub destroy { |
| 1335 | my ($self) = @_; |
1415 | my ($self) = @_; |
| 1336 | |
1416 | |
| 1337 | (delete $self->{npc_dialog})->destroy |
1417 | $_->destroy |
| 1338 | if $self->{npc_dialog}; |
1418 | for values %{ $self->{w} }; |
| 1339 | |
1419 | |
| 1340 | $self->SUPER::destroy; |
1420 | $self->SUPER::destroy; |
| 1341 | |
1421 | |
| 1342 | %$self = (); |
1422 | %$self = (); |
| 1343 | } |
1423 | } |
| 1344 | |
1424 | |
| 1345 | package CFPlus::NPCDialog; |
1425 | package DC::NPCDialog; |
| 1346 | |
1426 | |
| 1347 | our @ISA = 'CFPlus::UI::Toplevel'; |
1427 | our @ISA = 'DC::UI::Toplevel'; |
| 1348 | |
1428 | |
| 1349 | sub new { |
1429 | sub new { |
| 1350 | my $class = shift; |
1430 | my $class = shift; |
| 1351 | |
1431 | |
| 1352 | my $self = $class->SUPER::new ( |
1432 | my $self = $class->SUPER::new ( |
| … | |
… | |
| 1359 | kw => { hi => 0, yes => 0, no => 0 }, |
1439 | kw => { hi => 0, yes => 0, no => 0 }, |
| 1360 | has_close_button => 1, |
1440 | has_close_button => 1, |
| 1361 | @_, |
1441 | @_, |
| 1362 | ); |
1442 | ); |
| 1363 | |
1443 | |
| 1364 | CFPlus::weaken (my $this = $self); |
1444 | DC::weaken (my $this = $self); |
| 1365 | |
1445 | |
| 1366 | $self->connect (delete => sub { $this->destroy; 1 }); |
1446 | $self->connect (delete => sub { $this->destroy; 1 }); |
| 1367 | |
1447 | |
| 1368 | # better use a pane... |
1448 | # better use a pane... |
| 1369 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1449 | $self->add (my $hbox = new DC::UI::HBox); |
| 1370 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1450 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
| 1371 | |
1451 | |
| 1372 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1452 | $hbox->add (my $vbox = new DC::UI::VBox); |
| 1373 | |
1453 | |
| 1374 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1454 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
| 1375 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1455 | $vbox->add ($self->{entry} = new DC::UI::Entry |
| 1376 | tooltip => "#npc_message_entry", |
1456 | tooltip => "#npc_message_entry", |
| 1377 | on_activate => sub { |
1457 | on_activate => sub { |
| 1378 | my ($entry, $text) = @_; |
1458 | my ($entry, $text) = @_; |
| 1379 | |
1459 | |
| 1380 | return unless $text =~ /\S/; |
1460 | return unless $text =~ /\S/; |
| … | |
… | |
| 1384 | |
1464 | |
| 1385 | 0 |
1465 | 0 |
| 1386 | }, |
1466 | }, |
| 1387 | ); |
1467 | ); |
| 1388 | |
1468 | |
| 1389 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1469 | $vbox->add ($self->{options} = new DC::UI::VBox); |
| 1390 | |
1470 | |
| 1391 | $self->{bye_button} = new CFPlus::UI::Button |
1471 | $self->{bye_button} = new DC::UI::Button |
| 1392 | text => "Bye (close)", |
1472 | text => "Bye (close)", |
| 1393 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1473 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
| 1394 | on_activate => sub { $this->destroy; 1 }, |
1474 | on_activate => sub { $this->destroy; 1 }, |
| 1395 | ; |
1475 | ; |
| 1396 | |
1476 | |
| … | |
… | |
| 1415 | }; |
1495 | }; |
| 1416 | |
1496 | |
| 1417 | sub update_options { |
1497 | sub update_options { |
| 1418 | my ($self) = @_; |
1498 | my ($self) = @_; |
| 1419 | |
1499 | |
| 1420 | CFPlus::weaken $self; |
1500 | DC::weaken $self; |
| 1421 | |
1501 | |
| 1422 | $self->{options}->clear; |
1502 | $self->{options}->clear; |
| 1423 | $self->{options}->add ($self->{bye_button}); |
1503 | $self->{options}->add ($self->{bye_button}); |
| 1424 | |
1504 | |
| 1425 | for my $kw (sort keys %{ $self->{kw} }) { |
1505 | for my $kw (sort keys %{ $self->{kw} }) { |
| 1426 | $self->{options}->add (new CFPlus::UI::Button |
1506 | $self->{options}->add (new DC::UI::Button |
| 1427 | text => $kw, |
1507 | text => $kw, |
| 1428 | on_activate => sub { |
1508 | on_activate => sub { |
| 1429 | $self->send ($kw); |
1509 | $self->send ($kw); |
| 1430 | 0 |
1510 | 0 |
| 1431 | }, |
1511 | }, |
| … | |
… | |
| 1434 | } |
1514 | } |
| 1435 | |
1515 | |
| 1436 | sub feed { |
1516 | sub feed { |
| 1437 | my ($self, $type, @arg) = @_; |
1517 | my ($self, $type, @arg) = @_; |
| 1438 | |
1518 | |
| 1439 | CFPlus::weaken $self; |
1519 | DC::weaken $self; |
| 1440 | |
1520 | |
| 1441 | if ($type eq "update") { |
1521 | if ($type eq "update") { |
| 1442 | my (%info) = @arg; |
1522 | my (%info) = @arg; |
| 1443 | |
1523 | |
| 1444 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1524 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
| 1445 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1525 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
| 1446 | |
1526 | |
| 1447 | if (exists $info{msg}) { |
1527 | if (exists $info{msg}) { |
| 1448 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1528 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
| 1449 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1529 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1450 | my @link; |
1530 | my @link; |
| 1451 | $text =~ s{ |
1531 | $text =~ s{ |
| 1452 | ($match) |
1532 | ($match) |
| 1453 | }{ |
1533 | }{ |
| 1454 | my $kw = $1; |
1534 | my $kw = $1; |
| 1455 | |
1535 | |
| 1456 | push @link, new CFPlus::UI::Label |
1536 | push @link, new DC::UI::Label |
| 1457 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1537 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
| 1458 | can_hover => 1, |
1538 | can_hover => 1, |
| 1459 | can_events => 1, |
1539 | can_events => 1, |
| 1460 | padding_x => 0, |
1540 | padding_x => 0, |
| 1461 | padding_y => 0, |
1541 | padding_y => 0, |
| … | |
… | |
| 1479 | } |
1559 | } |
| 1480 | |
1560 | |
| 1481 | sub send { |
1561 | sub send { |
| 1482 | my ($self, $msg) = @_; |
1562 | my ($self, $msg) = @_; |
| 1483 | |
1563 | |
| 1484 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1564 | $self->{textview}->add_paragraph ({ |
|
|
1565 | markup => |
|
|
1566 | "\n<span foreground='#ffff00'><b>" |
|
|
1567 | . (DC::asxml $msg) |
|
|
1568 | . "</b></span>" |
|
|
1569 | }); |
| 1485 | $self->{textview}->scroll_to_bottom; |
1570 | $self->{textview}->scroll_to_bottom; |
| 1486 | |
1571 | |
| 1487 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1572 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
| 1488 | } |
1573 | } |
| 1489 | |
1574 | |
| … | |
… | |
| 1492 | |
1577 | |
| 1493 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1578 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
| 1494 | |
1579 | |
| 1495 | if ($self->{conn}) { |
1580 | if ($self->{conn}) { |
| 1496 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1581 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
| 1497 | delete $self->{conn}{npc_dialog}; |
1582 | delete $self->{conn}{w}{npc_dialog}; |
| 1498 | $self->{conn}->disconnect_ext ($self->{id}); |
1583 | $self->{conn}->disconnect_ext ($self->{id}); |
| 1499 | } |
1584 | } |
| 1500 | |
1585 | |
| 1501 | $self->SUPER::destroy; |
1586 | $self->SUPER::destroy; |
| 1502 | } |
1587 | } |
