ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.195 by root, Thu May 8 20:19:49 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
32 30
33 my @cmd_help = map { 31 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 49 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 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77 50
78 $self->{json_coder} 51 $self->{json_coder}
79 ->convert_blessed 52 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
81 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
82 }); 61 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 my $rid = $args->{$ev};
110 $args->{$ev} = sub {
111 my $id = shift->{s_id};
112 $self->send_exti_msg (w_e => $id, $rid, @_);
113
114 1
115 };
116 }
117
118 $self->widget_associate (
119 $ws, $id => scalar eval {
120 local $SIG{__DIE__};
121 "CFPlus::UI::$class"->new (%$args)
122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
179 my $w = $self->{widget}{$id}
180 or return;
181
182 if ($rid) {
183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
184 } else {
185 $w->$method (@args);
186 }
187 });
188
189 # widget set
190 $self->connect_ext (w_s => sub {
191 my ($id, $attr) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 for (my $i = 0; $i < $#$attr; $i += 2) {
197 my ($member, $value) = @$attr[$i, $i+1];
198 if (defined $value) {
199 $w->{$member} = $value;
200 } else {
201 delete $w->{$member};
202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
205 });
206
207 # widget get
208 $self->connect_ext (w_g => sub {
209 my ($id, $rid, $attr) = @_;
210
211 my $w = $self->{widget}{$id}
212 or return;
213
214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
215 });
216
217 # message window
218 $self->connect_ext (channel_info => sub {
219 my ($info) = @_;
220 $self->{channels}->{$info->{id}} = $info;
221 $::MESSAGE_WINDOW->add_channel ($info);
222 });
223 62
224 # destroy widgets on logout 63 # destroy widgets on logout
225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
226 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
227 $_->destroy 66 $_->destroy
… …
231 70
232 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
233 for @cmd_help; 72 for @cmd_help;
234 73
235 { 74 {
236 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
237 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
238 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
239 } 78 }
240 79
241 { 80 {
242 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
243 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
244 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
245 } 84 }
246 85
247 $self->{open_container} = 0; 86 $self->{open_container} = 0;
248 87
249 # per server 88 # per server
250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
251 90
252 $self 91 $self
253}
254
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281} 92}
282 93
283sub update_fx_want { 94sub update_fx_want {
284 my ($self) = @_; 95 my ($self) = @_;
285 96
286 $self->send_exti_msg (fx_want => { 97 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
289 }); 101 });
290} 102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
171 };
172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
243}
244
245# widgetset associate
246sub ext_ws_a {
247 my ($self, %ass) = @_;
248
249 # everything that has a name, wether conceivably useful or not
250 my %wkw = (
251 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP,
253
254 mapwidget => $::MAPWIDGET,
255 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG,
260 host_entry => $::HOST_ENTRY,
261 metaserver => $::METASERVER,
262 server_info => $::SERVER_INFO,
263
264 setup_dialog => $::SETUP_DIALOG,
265 setup_notebook => $::SETUP_NOTEBOOK,
266 setup_server => $::SETUP_SERVER,
267 setup_keyboard => $::SETUP_KEYBOARD,
268
269 pl_notebook => $::PL_NOTEBOOK,
270 pl_window => $::PL_WINDOW,
271 inventory_page => $::INVENTORY_PAGE,
272 stats_page => $::STATS_PAGE,
273 skill_page => $::SKILL_PAGE,
274 spell_page => $::SPELL_PAGE,
275 spell_list => $::SPELL_LIST,
276
277 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
281 statusbox => $::SDTATUSBOX,
282
283 inv => $::INV,
284 invr => $::INVR,
285 invr_hb => $::INVR_HB,
286 );
287
288 while (my ($id, $name) = each %ass) {
289 $self->widget_associate (undef, $id => $wkw{$name});
290 }
291}
292
293# widget call
294sub ext_w_c {
295 my ($self, $id, $rcb, $method, @args) = @_;
296
297 my $w = $self->{widget}{$id}
298 or return;
299
300 if ($rcb) {
301 $rcb->($w->$method (@args));
302 } else {
303 $w->$method (@args);
304 }
305}
306
307# widget set
308sub ext_w_s {
309 my ($self, $id, $attr) = @_;
310
311 my $w = $self->{widget}{$id}
312 or return;
313
314 for (my $i = 0; $i < $#$attr; $i += 2) {
315 my ($member, $value) = @$attr[$i, $i+1];
316 if (defined $value) {
317 $w->{$member} = $value;
318 } else {
319 delete $w->{$member};
320 }
321 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
322 }
323}
324
325# widget get
326sub ext_w_g {
327 my ($self, $id, $rid, @attr) = @_;
328
329 my $w = $self->{widget}{$id}
330 or return;
331
332 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
333}
334
335# message window
336sub ext_channel_info {
337 my ($self, $info) = @_;
338 $self->{channels}->{$info->{id}} = $info;
339 $::MESSAGE_DIST->add_channel ($info);
340}
341
342#############################################################################
291 343
292sub logprint { 344sub logprint {
293 my ($self, @a) = @_; 345 my ($self, @a) = @_;
294 346
295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
296} 348}
297 349
298sub _stat_numdiff { 350sub _stat_numdiff {
299 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
300 352
… …
384 436
385 if ( 437 if (
386 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
387 ) { 439 ) {
388 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 440 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
389 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
390 } 442 }
391 443
392 $self->update_stats_window ($stats, $prev); 444 $self->update_stats_window ($stats, $prev);
393 445
394 $self->{prev_stats} = { %$stats }; 446 $self->{prev_stats} = { %$stats };
… …
433 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 485 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
434 $::GAUGES->{food} ->set_value ($fo, $fo_m); 486 $::GAUGES->{food} ->set_value ($fo, $fo_m);
435 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 487 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
436 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 488 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
437 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 489 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
490 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
438 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 491 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
439 my $title = $stats->{+CS_STAT_TITLE}; 492 my $title = $stats->{+CS_STAT_TITLE};
440 $title =~ s/^Player: //; 493 $title =~ s/^Player: //;
441 $::STATWIDS->{title} ->set_text ("Title: " . $title); 494 $::STATWIDS->{title} ->set_text ("Title: " . $title);
442 495
… …
460 for keys %RES_TBL; 513 for keys %RES_TBL;
461 514
462 my $sktbl = $::STATWIDS->{skill_tbl}; 515 my $sktbl = $::STATWIDS->{skill_tbl};
463 my @skills = keys %{ $self->{skill_info} }; 516 my @skills = keys %{ $self->{skill_info} };
464 517
465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 518 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
519 map [$_, $self->{skill_info}{$_}],
520 grep exists $stats->{$_},
521 @skills;
522
523 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
524 $self->{stat_order} = join ",", map $_->[0], @order;
525
466 $sktbl->clear; 526 $sktbl->clear;
467 527
468 my @add; 528 my $sw = $self->{skillwid}{""} ||= [
469
470 push @add,
471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
531 2, 0, (new DC::UI::Label text => "Progress"),
473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
535 6, 0, (new DC::UI::Label text => "Progress"),
476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
477 ; 537 ];
538
539 my @add = @$sw;
478 540
479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
480 542
481 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 543 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
482 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 544 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
483 545
484 my ($x, $y) = (0, 1); 546 my ($x, $y) = (0, 1);
485 for ( 547 for (@order) {
486 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
487 map [$_, $self->{skill_info}{$_}],
488 grep exists $stats->{$_},
489 @skills
490 ) {
491 my ($idx, $name) = @$_; 548 my ($idx, $name) = @$_;
492 549
493 my $spell_cb = sub { 550 my $spell_cb = sub {
494 my ($widget, $ev) = @_; 551 my ($widget, $ev) = @_;
495 552
496 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
497 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
498 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
499 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
500 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
501 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
502 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
503 items => [ 560 items => [
504 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 561 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
505 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 562 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
506 ], 563 ],
507 )->popup ($ev); 564 )->popup ($ev);
508 } else { 565 } else {
509 return 0; 566 return 0;
510 } 567 }
511 568
512 1 569 1
513 }; 570 };
514 571
572 my $sw = $self->{skillwid}{$idx} ||= [
573 # exp
574 (new DC::UI::Label
575 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
576
577 # level
578 (new DC::UI::Label
579 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
580
581 # progress
582 (new DC::UI::ExperienceProgress),
583
584 # label
585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
587 ];
588
515 push @add, 589 push @add,
516 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 590 $x * 4 + 0, $y, $sw->[0],
517 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 591 $x * 4 + 1, $y, $sw->[1],
518 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 592 $x * 4 + 2, $y, $sw->[2],
519 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 593 $x * 4 + 3, $y, $sw->[3],
520 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ; 594 ;
523 595
524 $x++ and ($x, $y) = (0, $y + 1); 596 $x++ and ($x, $y) = (0, $y + 1);
525 } 597 }
526 598
527 $sktbl->add_at (@add); 599 $sktbl->add_at (@add);
528 } 600 }
529 601
530 for (grep exists $stats->{$_}, @skills) { 602 for (@order) {
531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 603 my ($idx, $name) = @$_;
532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 604 my $val = $stats->{$idx};
533 }
534}
535 605
536sub macro_send { 606 next if $prev->{$idx}[1] eq $val->[1];
537 my ($self, $macro) = @_;
538 607
539 for my $cmd (@{ $macro->{action} }) { 608 my $sw = $self->{skillwid}{$idx};
540 $self->send_command ($cmd); 609 $sw->[0]->set_text (::formsep ($val->[1]));
610 $sw->[1]->set_text ($val->[0] * 1);
611 $sw->[2]->set_value (@$val);
612
613 $::GAUGES->{sklprg}->set_label ("$name %d%%");
614 $::GAUGES->{sklprg}->set_value (@$val);
541 } 615 }
542} 616}
543 617
544sub user_send { 618sub user_send {
545 my ($self, $command) = @_; 619 my ($self, $command) = @_;
… …
547 $self->{record}->($command) 621 $self->{record}->($command)
548 if $self->{record}; 622 if $self->{record};
549 623
550 $self->logprint ("send: ", $command); 624 $self->logprint ("send: ", $command);
551 $self->send_command ($command); 625 $self->send_command ($command);
552 ::status ($command);
553} 626}
554 627
555sub record { 628sub record {
556 my ($self, $cb) = @_; 629 my ($self, $cb) = @_;
557 630
… …
579 $tex->upload; 652 $tex->upload;
580 } else { 653 } else {
581 $self->{delay}{$tile} = 1; 654 $self->{delay}{$tile} = 1;
582 655
583 # we assume the face is in-flight and will eventually come 656 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub { 657 push @{$self->{tile_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile}; 658 delete $self->{delay}{$tile};
586 $_[0]->upload; 659 $_[0]->upload;
587 }; 660 };
588 } 661 }
589 } 662 }
590 663
591 if ($delay) { 664 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched 665 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub { 666 EV::once undef, 0, 0.03, sub {
594 $_[0]->w->cancel;
595 $self->{map_widget}->update; 667 $self->{map_widget}->update
668 if $self->{map_widget};
596 }); 669 };
597 } else { 670 } else {
598 $self->{map_widget}->update; 671 $self->{map_widget}->update;
599 } 672 }
600} 673}
601 674
… …
613 686
614 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
615 688
616 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
617 $self->{map_cache_new}{$hash} = \$data; 690 $self->{map_cache_new}{$hash} = \$data;
618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
619} 692}
620 693
621sub map_clear { 694sub map_clear {
622 my ($self) = @_; 695 my ($self) = @_;
623 696
… …
629} 702}
630 703
631sub bg_fetch { 704sub bg_fetch {
632 my ($self) = @_; 705 my ($self) = @_;
633 706
634 my $id; 707 my $tile;
635 708
636 do { 709 do {
637 $id = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
638 or return; 711 or return;
639 } while $self->{texture}[$id]; 712 } while $self->{texture}[$tile];
640 713
641 CFPlus::DB::exists tilecache => $id, sub { 714 DC::DB::get tilecache => $tile, sub {
642 my ($exists) = @_; 715 my ($data) = @_;
643 716
644 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
645 718
646 if ($exists) { 719 if (defined $data) {
647 $self->have_tile ($id); 720 $self->have_tile ($tile, $data);
648 $self->{texture}[$id]->upload; 721 $self->{texture}[$tile]->upload;
649 } 722 }
650 723
651 $self->bg_fetch; 724 $self->bg_fetch;
652 }; 725 };
653} 726}
… …
674 }; 747 };
675 748
676 if (my $rdata = $self->{map_cache_old}{$hash}) { 749 if (my $rdata = $self->{map_cache_old}{$hash}) {
677 $cb->($$rdata); 750 $cb->($$rdata);
678 } else { 751 } else {
679 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 752 DC::DB::get $self->{mapcache} => $hash, $cb;
680 } 753 }
681} 754}
682 755
683# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
684# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
… …
808 881
809sub face_find { 882sub face_find {
810 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
811 884
812 if ($face->{type} == 0) { # FT_FACE 885 if ($face->{type} == 0) { # FT_FACE
813 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
814 887
815 $face->{id} = $id; 888 $face->{id} = $id;
816 $self->{faceid}[$facenum] = $id;
817
818 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
819 890
820 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
821 892
822 } elsif ($face->{type} & 1) { # with metadata 893 } elsif ($face->{type} & 1) { # with metadata
823 CFPlus::DB::get res_meta => $face->{name}, $cb; 894 DC::DB::get res_meta => $face->{name}, $cb;
895
896 } else { # no metadata
897 DC::DB::get res_data => $face->{name}, $cb;
824 } 898 }
825} 899}
826 900
827sub face_update { 901sub face_update {
828 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
829 903
830 if ($face->{type} == 0) { # FT_FACE 904 if ($face->{type} == 0) {
905 # image, FT_FACE
831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
832 if $changed; 907 if $changed;
833 908
834 $self->have_tile ($face->{id}); 909 $self->have_tile ($face->{id}, delete $face->{data});
835 910
836 } elsif ($face->{type} & 1) { # split metadata 911 } elsif ($face->{type} & 1) {
912 # split metadata case, FT_MUSIC, FT_SOUND
837 if ($changed) { # new data 913 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json); 915 $face->{data} = $meta;
840 916
917 # rely on strict ordering here and also on later fetch
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 918 DC::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
843 } else { 920 }
921
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 922 $face->{data} = $self->{json_coder}->decode ($face->{data});
845 }
846
847 ::add_license ($face); 923 ::add_license ($face);
924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
925 if $changed;
848 926
849 if ($face->{type} == 3) { # FT_MUSIC 927 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum); 928 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND 929 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum); 930 &::audio_sound_push ($facenum);
863 } 931 }
864 932
933 } else {
934 # flat resource case, FT_RSRC
935 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
936 if $changed;
937 }
938
939 if (my $cbs = $self->{face_cb}{$facenum}) {
940 $_->($face, $changed) for @$cbs;
865 } 941 }
866} 942}
867 943
868sub smooth_update { 944sub smooth_update {
869 my ($self, $facenum, $face) = @_; 945 my ($self, $facenum, $face) = @_;
870 946
871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 947 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
872} 948}
873 949
874sub have_tile { 950sub have_tile {
875 my ($self, $tile) = @_; 951 my ($self, $tile, $data) = @_;
876 952
877 return unless $self->{map}; 953 return unless $self->{map};
878 954
879 my $tex = $self->{texture}[$tile] ||= 955 my $tex = $self->{texture}[$tile] ||=
880 new CFPlus::Texture 956 new DC::Texture
881 tile => $tile, minify => 1, mipmap => 1, delay => 1; 957 tile => $tile,
958 image => $data, delete_image => 1,
959 minify => 1, mipmap => 1;
882 960
883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
962 $_->($tex) for @$cbs;
963 }
884} 964}
885 965
886sub connect_face_update { 966# call in non-void context registers a temporary
967# hook with handle, otherwise its permanent
968sub on_face_change {
887 my ($self, $id, $cb) = @_; 969 my ($self, $num, $cb) = @_;
888 970
889 push @{$self->{face_cb}{$id}}, $cb; 971 push @{$self->{face_cb}{$num}}, $cb;
890 972
891 CFPlus::guard { 973 defined wantarray
974 ? DC::guard {
892 @{$self->{face_cb}{$id}} 975 @{$self->{face_cb}{$num}}
893 = grep $_ != $cb, 976 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}}; 977 @{$self->{face_cb}{$num}};
895 } 978 }
979 : ()
980}
981
982# call in non-void context registers a temporary
983# hook with handle, otherwise its permanent
984sub register_face_handler {
985 my ($self, $num, $cb) = @_;
986
987 return unless $num;
988
989 # invoke if available right now
990 $cb->($self->{face}[$num], 0)
991 unless exists $self->{face}[$num]{loading};
992
993 # future changes
994 $self->on_face_change ($num => $cb)
896} 995}
897 996
898sub sound_play { 997sub sound_play {
899 my ($self, $type, $face, $dx, $dy, $vol) = @_; 998 my ($self, $type, $face, $dx, $dy, $vol) = @_;
900 999
… …
915 1014
916sub sanitise_xml($) { 1015sub sanitise_xml($) {
917 local $_ = shift; 1016 local $_ = shift;
918 1017
919 # we now weed out all tags we do not support 1018 # we now weed out all tags we do not support
920 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1019 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1020 }{
1021 "&lt;"
1022 }gex;
1023
921 # now all entities 1024 # now all entities
922 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
923 1026
924 # handle some elements 1027 # handle some elements
925 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
926 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1029 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1030
1031 s/\s+$//;
927 1032
928 $_ 1033 $_
929} 1034}
930 1035
931our %NAME_TO_COLOR = ( 1036our %NAME_TO_COLOR = (
… …
978 1083
979 ## try to create single paragraphs of multiple lines sent by the server 1084 ## try to create single paragraphs of multiple lines sent by the server
980 # no longer neecssary with TRT servers 1085 # no longer neecssary with TRT servers
981 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1086 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
982 1087
1088 for (split /\n/, $text) {
983 ::message ({ 1089 ::message ({
984 fg => $fg, 1090 fg => $fg,
985 markup => $_, 1091 markup => $_,
986 type => $type, 1092 type => $type,
987 extra => [@extra], 1093 extra => [@extra],
988 color_flags => $color 1094 color_flags => $color, #d# ugly, kill
989 }) for split /\n/, $text; 1095 });
1096
1097 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1098 # actually, this is an ugly design. _we_ should control the channels,
1099 # not some random other widget, as the channels are clearly protocol-specific.
1100 # then we could also react to flags such as CLEAR without resorting to
1101 # hacks such as color_flags, above.
1102 }
990 1103
991 $self->{statusbox}->add ($text, 1104 $self->{statusbox}->add ($text,
992 group => $text, 1105 group => $text,
993 fg => $fg, 1106 fg => $fg,
994 timeout => $color >= 2 ? 180 : 10, 1107 timeout => $color >= 2 ? 180 : 10,
995 tooltip_font => $::FONT_FIXED, 1108 tooltip_font => $::FONT_FIXED,
996 ); 1109 ) if $type eq "info";
997 } 1110 }
998} 1111}
999 1112
1000sub spell_add { 1113sub spell_add {
1001 my ($self, $spell) = @_; 1114 my ($self, $spell) = @_;
… …
1005 $spell->{message} =~ s/\n+$//; 1118 $spell->{message} =~ s/\n+$//;
1006 $spell->{message} ||= "Server did not provide a description for this spell."; 1119 $spell->{message} ||= "Server did not provide a description for this spell.";
1007 1120
1008 $::SPELL_LIST->add_spell ($spell); 1121 $::SPELL_LIST->add_spell ($spell);
1009 1122
1010 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1123 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1011 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1124 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1012} 1125}
1013 1126
1014sub spell_delete { 1127sub spell_delete {
1015 my ($self, $spell) = @_; 1128 my ($self, $spell) = @_;
1016 1129
… …
1027sub addme_success { 1140sub addme_success {
1028 my ($self) = @_; 1141 my ($self) = @_;
1029 1142
1030 my %skill_help; 1143 my %skill_help;
1031 1144
1032 for my $node (CFPlus::Pod::find skill_description => "*") { 1145 for my $node (DC::Pod::find skill_description => "*") {
1033 my (undef, @par) = CFPlus::Pod::section_of $node; 1146 my (undef, @par) = DC::Pod::section_of $node;
1034 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1147 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1035 }; 1148 };
1036 1149
1037 for my $skill (values %{$self->{skill_info}}) { 1150 for my $skill (values %{$self->{skill_info}}) {
1038 $self->{map_widget}->add_command ("ready_skill $skill", 1151 $self->{map_widget}->add_command ("ready_skill $skill",
1039 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1152 (DC::asxml "Ready the skill '$skill'\n\n")
1040 . $skill_help{$skill}); 1153 . $skill_help{$skill});
1041 $self->{map_widget}->add_command ("use_skill $skill", 1154 $self->{map_widget}->add_command ("use_skill $skill",
1042 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1155 (DC::asxml "Immediately use the skill '$skill'\n\n")
1043 . $skill_help{$skill}); 1156 . $skill_help{$skill});
1044 } 1157 }
1045} 1158}
1046 1159
1047sub eof { 1160sub eof {
… …
1051 1164
1052 ::stop_game (); 1165 ::stop_game ();
1053} 1166}
1054 1167
1055sub update_floorbox { 1168sub update_floorbox {
1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1169 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1057 return unless $::CONN; 1170 return unless $::CONN;
1058 1171
1059 $::FLOORBOX->clear; 1172 $::FLOORBOX->clear;
1060 1173
1061 my @add; 1174 my @add;
1062 1175
1063 my $row; 1176 my $row;
1064 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1177 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1178 next if $_->{tag} & 0x80000000;
1065 if ($row < 6) { 1179 if ($row < 6) {
1066 local $_->{face_widget}; # hack to force recreation of widget 1180 local $_->{face_widget}; # hack to force recreation of widget
1067 local $_->{desc_widget}; # hack to force recreation of widget 1181 local $_->{desc_widget}; # hack to force recreation of widget
1068 CFPlus::Item::update_widgets $_; 1182 DC::Item::update_widgets $_;
1069 1183
1070 push @add, 1184 push @add,
1071 0, $row, $_->{face_widget}, 1185 0, $row, $_->{face_widget},
1072 1, $row, $_->{desc_widget}; 1186 1, $row, $_->{desc_widget};
1073 1187
1074 $row++; 1188 $row++;
1075 } else { 1189 } else {
1076 push @add, 1, $row, new CFPlus::UI::Button 1190 push @add, 1, $row, new DC::UI::Button
1077 text => "More...", 1191 text => "More...",
1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1192 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1079 ; 1193 ;
1080 last; 1194 last;
1081 } 1195 }
1082 } 1196 }
1083 if ($::CONN->{open_container}) { 1197 if ($::CONN->{open_container}) {
1084 push @add, 1, $row++, new CFPlus::UI::Button 1198 push @add, 1, $row++, new DC::UI::Button
1085 text => "Close container", 1199 text => "Close container",
1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1200 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1087 ; 1201 ;
1088 } 1202 }
1089 1203
1090 $::FLOORBOX->add_at (@add); 1204 $::FLOORBOX->add_at (@add);
1091 }); 1205 });
1092 1206
1093 $::WANT_REFRESH->start; 1207 $::WANT_REFRESH = 1;
1094} 1208}
1095 1209
1096sub set_opencont { 1210sub set_opencont {
1097 my ($conn, $tag, $name) = @_; 1211 my ($conn, $tag, $name) = @_;
1098 $conn->{open_container} = $tag; 1212 $conn->{open_container} = $tag;
1099 update_floorbox; 1213 update_floorbox;
1100 1214
1101 $::INVR_HB->clear (); 1215 $::INVR_HB->clear ();
1102 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1216 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1103 1217
1104 if ($tag != 0) { # Floor isn't closable, is it? 1218 if ($tag != 0) { # Floor isn't closable, is it?
1105 $::INVR_HB->add (new CFPlus::UI::Button 1219 $::INVR_HB->add (new DC::UI::Button
1106 text => "Close container", 1220 text => "Close container",
1107 tooltip => "Close the currently open container (if one is open)", 1221 tooltip => "Close the currently open container (if one is open)",
1108 on_activate => sub { 1222 on_activate => sub {
1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1223 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1110 if $tag != 0; 1224 if $tag != 0;
… …
1117} 1231}
1118 1232
1119sub update_containers { 1233sub update_containers {
1120 my ($self) = @_; 1234 my ($self) = @_;
1121 1235
1122 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1236 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1123 my $todo = delete $self->{update_container} 1237 my $todo = delete $self->{update_container}
1124 or return; 1238 or return;
1125 1239
1126 for my $tag (keys %$todo) { 1240 for my $tag (keys %$todo) {
1127 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1241 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1162} 1276}
1163 1277
1164sub item_update { 1278sub item_update {
1165 my ($self, $item) = @_; 1279 my ($self, $item) = @_;
1166 1280
1167 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1281 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1168 1282
1169 CFPlus::Item::update_widgets $item; 1283 DC::Item::update_widgets $item;
1170 1284
1171 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1285 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1172 set_opencont ($::CONN, 0, "Floor"); 1286 set_opencont ($::CONN, 0, "Floor");
1173 1287
1174 } elsif ($item->{flags} & F_OPEN) { 1288 } elsif ($item->{flags} & F_OPEN) {
1175 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1289 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1176 1290
1177 } else { 1291 } else {
1178 $self->{update_container}{$item->{container}}++; 1292 $self->{update_container}{$item->{container}}++;
1179 $self->update_containers; 1293 $self->update_containers;
1180 } 1294 }
… …
1191 1305
1192 my $weight = .001 * $self->{player}{weight}; 1306 my $weight = .001 * $self->{player}{weight};
1193 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1307 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1194 1308
1195 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1309 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1196 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1310 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1197 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1311 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1198} 1312}
1199 1313
1200sub update_server_info { 1314sub update_server_info {
1201 my ($self) = @_; 1315 my ($self) = @_;
… …
1209 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1323 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1210 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1324 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1211 . "editing support $yesno[!!$self->{editor_support}]\n" 1325 . "editing support $yesno[!!$self->{editor_support}]\n"
1212 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1326 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1213 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1327 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1328 . "client support $yesno[$self->{cfplus_ext} > 0]"
1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1329 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1216 . "map size $self->{mapw}×$self->{maph}\n" 1330 . "map size $self->{mapw}×$self->{maph}\n"
1217 ); 1331 );
1218 1332
1219} 1333}
… …
1239 0 1353 0
1240 }); 1354 });
1241 1355
1242 $self->update_server_info; 1356 $self->update_server_info;
1243 1357
1244 $self->send_command ("output-sync $::CFG->{output_sync}");
1245 $self->send_command ("output-count $::CFG->{output_count}");
1246 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1358 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1247 $self->send_command ("pickup $::CFG->{pickup}"); 1359 $self->send_command ("pickup $::CFG->{pickup}");
1248} 1360}
1249 1361
1250sub lookat { 1362sub lookat {
… …
1254 $self->send_ext_req (lookat => $x, $y, sub { 1366 $self->send_ext_req (lookat => $x, $y, sub {
1255 my (%msg) = @_; 1367 my (%msg) = @_;
1256 1368
1257 if (exists $msg{npc_dialog}) { 1369 if (exists $msg{npc_dialog}) {
1258 # start npc chat dialog 1370 # start npc chat dialog
1259 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1371 $self->{npc_dialog} = new DC::NPCDialog::
1260 token => $msg{npc_dialog}, 1372 token => $msg{npc_dialog},
1261 title => "$msg{npc_dialog}[0] (NPC)", 1373 title => "$msg{npc_dialog}[0] (NPC)",
1262 conn => $self, 1374 conn => $self,
1263 ; 1375 ;
1264 } 1376 }
… …
1277 $self->SUPER::destroy; 1389 $self->SUPER::destroy;
1278 1390
1279 %$self = (); 1391 %$self = ();
1280} 1392}
1281 1393
1282package CFPlus::NPCDialog; 1394package DC::NPCDialog;
1283 1395
1284our @ISA = 'CFPlus::UI::Toplevel'; 1396our @ISA = 'DC::UI::Toplevel';
1285 1397
1286sub new { 1398sub new {
1287 my $class = shift; 1399 my $class = shift;
1288 1400
1289 my $self = $class->SUPER::new ( 1401 my $self = $class->SUPER::new (
… …
1296 kw => { hi => 0, yes => 0, no => 0 }, 1408 kw => { hi => 0, yes => 0, no => 0 },
1297 has_close_button => 1, 1409 has_close_button => 1,
1298 @_, 1410 @_,
1299 ); 1411 );
1300 1412
1301 CFPlus::weaken (my $this = $self); 1413 DC::weaken (my $this = $self);
1302 1414
1303 $self->connect (delete => sub { $this->destroy; 1 }); 1415 $self->connect (delete => sub { $this->destroy; 1 });
1304 1416
1305 # better use a pane... 1417 # better use a pane...
1306 $self->add (my $hbox = new CFPlus::UI::HBox); 1418 $self->add (my $hbox = new DC::UI::HBox);
1307 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1419 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1308 1420
1309 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1421 $hbox->add (my $vbox = new DC::UI::VBox);
1310 1422
1311 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1423 $vbox->add (new DC::UI::Label text => "Message Entry:");
1312 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1424 $vbox->add ($self->{entry} = new DC::UI::Entry
1313 tooltip => "#npc_message_entry", 1425 tooltip => "#npc_message_entry",
1314 on_activate => sub { 1426 on_activate => sub {
1315 my ($entry, $text) = @_; 1427 my ($entry, $text) = @_;
1316 1428
1317 return unless $text =~ /\S/; 1429 return unless $text =~ /\S/;
… …
1321 1433
1322 0 1434 0
1323 }, 1435 },
1324 ); 1436 );
1325 1437
1326 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1438 $vbox->add ($self->{options} = new DC::UI::VBox);
1327 1439
1328 $self->{bye_button} = new CFPlus::UI::Button 1440 $self->{bye_button} = new DC::UI::Button
1329 text => "Bye (close)", 1441 text => "Bye (close)",
1330 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1442 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1331 on_activate => sub { $this->destroy; 1 }, 1443 on_activate => sub { $this->destroy; 1 },
1332 ; 1444 ;
1333 1445
… …
1352}; 1464};
1353 1465
1354sub update_options { 1466sub update_options {
1355 my ($self) = @_; 1467 my ($self) = @_;
1356 1468
1357 CFPlus::weaken $self; 1469 DC::weaken $self;
1358 1470
1359 $self->{options}->clear; 1471 $self->{options}->clear;
1360 $self->{options}->add ($self->{bye_button}); 1472 $self->{options}->add ($self->{bye_button});
1361 1473
1362 for my $kw (sort keys %{ $self->{kw} }) { 1474 for my $kw (sort keys %{ $self->{kw} }) {
1363 $self->{options}->add (new CFPlus::UI::Button 1475 $self->{options}->add (new DC::UI::Button
1364 text => $kw, 1476 text => $kw,
1365 on_activate => sub { 1477 on_activate => sub {
1366 $self->send ($kw); 1478 $self->send ($kw);
1367 0 1479 0
1368 }, 1480 },
… …
1371} 1483}
1372 1484
1373sub feed { 1485sub feed {
1374 my ($self, $type, @arg) = @_; 1486 my ($self, $type, @arg) = @_;
1375 1487
1376 CFPlus::weaken $self; 1488 DC::weaken $self;
1377 1489
1378 if ($type eq "update") { 1490 if ($type eq "update") {
1379 my (%info) = @arg; 1491 my (%info) = @arg;
1380 1492
1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1493 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1382 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1494 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1383 1495
1384 if (exists $info{msg}) { 1496 if (exists $info{msg}) {
1385 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1497 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1386 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1498 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1387 my @link; 1499 my @link;
1388 $text =~ s{ 1500 $text =~ s{
1389 ($match) 1501 ($match)
1390 }{ 1502 }{
1391 my $kw = $1; 1503 my $kw = $1;
1392 1504
1393 push @link, new CFPlus::UI::Label 1505 push @link, new DC::UI::Label
1394 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1506 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1395 can_hover => 1, 1507 can_hover => 1,
1396 can_events => 1, 1508 can_events => 1,
1397 padding_x => 0, 1509 padding_x => 0,
1398 padding_y => 0, 1510 padding_y => 0,
… …
1416} 1528}
1417 1529
1418sub send { 1530sub send {
1419 my ($self, $msg) = @_; 1531 my ($self, $msg) = @_;
1420 1532
1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1533 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1422 $self->{textview}->scroll_to_bottom; 1534 $self->{textview}->scroll_to_bottom;
1423 1535
1424 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1536 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1425} 1537}
1426 1538

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines