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.153 by root, Mon Aug 13 14:24:17 2007 UTC vs.
Revision 1.194 by root, Mon May 5 20:22:03 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 ywidget => 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 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192 62
193 # destroy widgets on logout 63 # destroy widgets on logout
194 $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 {
195 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy 66 $_->destroy
… …
200 70
201 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
202 for @cmd_help; 72 for @cmd_help;
203 73
204 { 74 {
205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
206 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
207 $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}});
208 } 78 }
209 79
210 { 80 {
211 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
212 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
213 $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}});
214 } 84 }
215 85
216 $self->{open_container} = 0; 86 $self->{open_container} = 0;
217 87
… …
225 my ($self) = @_; 95 my ($self) = @_;
226 96
227 $self->send_exti_msg (fx_want => { 97 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
230 }); 101 });
231} 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#############################################################################
232 343
233sub logprint { 344sub logprint {
234 my ($self, @a) = @_; 345 my ($self, @a) = @_;
235 346
236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
237} 348}
238 349
239sub _stat_numdiff { 350sub _stat_numdiff {
240 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
241 352
… …
325 436
326 if ( 437 if (
327 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
328 ) { 439 ) {
329 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 440 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
330 $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);
331 } 442 }
332 443
333 $self->update_stats_window ($stats, $prev); 444 $self->update_stats_window ($stats, $prev);
334 445
335 $self->{prev_stats} = { %$stats }; 446 $self->{prev_stats} = { %$stats };
… …
374 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 485 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
375 $::GAUGES->{food} ->set_value ($fo, $fo_m); 486 $::GAUGES->{food} ->set_value ($fo, $fo_m);
376 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 487 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 488 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
378 . " (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});
379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 491 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
380 my $title = $stats->{+CS_STAT_TITLE}; 492 my $title = $stats->{+CS_STAT_TITLE};
381 $title =~ s/^Player: //; 493 $title =~ s/^Player: //;
382 $::STATWIDS->{title} ->set_text ("Title: " . $title); 494 $::STATWIDS->{title} ->set_text ("Title: " . $title);
383 495
… …
401 for keys %RES_TBL; 513 for keys %RES_TBL;
402 514
403 my $sktbl = $::STATWIDS->{skill_tbl}; 515 my $sktbl = $::STATWIDS->{skill_tbl};
404 my @skills = keys %{ $self->{skill_info} }; 516 my @skills = keys %{ $self->{skill_info} };
405 517
406 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
407 $sktbl->clear; 526 $sktbl->clear;
408 527
409 my @add; 528 my $sw = $self->{skillwid}{""} ||= [
410
411 push @add,
412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
413 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"),
414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
416 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"),
417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
418 ; 537 ];
538
539 my @add = @$sw;
419 540
420 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>";
421 542
422 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);
423 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);
424 545
425 my ($x, $y) = (0, 1); 546 my ($x, $y) = (0, 1);
426 for ( 547 for (@order) {
427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
428 map [$_, $self->{skill_info}{$_}],
429 grep exists $stats->{$_},
430 @skills
431 ) {
432 my ($idx, $name) = @$_; 548 my ($idx, $name) = @$_;
433 549
434 my $spell_cb = sub { 550 my $spell_cb = sub {
435 my ($widget, $ev) = @_; 551 my ($widget, $ev) = @_;
436 552
437 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
438 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
439 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
440 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
441 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
442 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
443 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
444 items => [ 560 items => [
445 ["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"] }],
446 ["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"] }],
447 ], 563 ],
448 )->popup ($ev); 564 )->popup ($ev);
449 } else { 565 } else {
450 return 0; 566 return 0;
451 } 567 }
452 568
453 1 569 1
454 }; 570 };
455 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
456 push @add, 589 push @add,
457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 590 $x * 4 + 0, $y, $sw->[0],
458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 591 $x * 4 + 1, $y, $sw->[1],
459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 592 $x * 4 + 2, $y, $sw->[2],
460 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],
461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ; 594 ;
464 595
465 $x++ and ($x, $y) = (0, $y + 1); 596 $x++ and ($x, $y) = (0, $y + 1);
466 } 597 }
467 598
468 $sktbl->add_at (@add); 599 $sktbl->add_at (@add);
469 } 600 }
470 601
471 for (grep exists $stats->{$_}, @skills) { 602 for (@order) {
472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 603 my ($idx, $name) = @$_;
473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 604 my $val = $stats->{$idx};
474 }
475}
476 605
477sub macro_send { 606 next if $prev->{$idx}[1] eq $val->[1];
478 my ($self, $macro) = @_;
479 607
480 for my $cmd (@{ $macro->{action} }) { 608 my $sw = $self->{skillwid}{$idx};
481 $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);
482 } 615 }
483} 616}
484 617
485sub user_send { 618sub user_send {
486 my ($self, $command) = @_; 619 my ($self, $command) = @_;
… …
488 $self->{record}->($command) 621 $self->{record}->($command)
489 if $self->{record}; 622 if $self->{record};
490 623
491 $self->logprint ("send: ", $command); 624 $self->logprint ("send: ", $command);
492 $self->send_command ($command); 625 $self->send_command ($command);
493 ::status ($command);
494} 626}
495 627
496sub record { 628sub record {
497 my ($self, $cb) = @_; 629 my ($self, $cb) = @_;
498 630
… …
520 $tex->upload; 652 $tex->upload;
521 } else { 653 } else {
522 $self->{delay}{$tile} = 1; 654 $self->{delay}{$tile} = 1;
523 655
524 # we assume the face is in-flight and will eventually come 656 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub { 657 push @{$self->{tile_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile}; 658 delete $self->{delay}{$tile};
527 $_[0]->upload; 659 $_[0]->upload;
528 }; 660 };
529 } 661 }
530 } 662 }
531 663
532 if ($delay) { 664 if ($delay) {
533 # 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
534 Event->timer (after => 0.03, cb => sub { 666 EV::once undef, 0, 0.03, sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update; 667 $self->{map_widget}->update
668 if $self->{map_widget};
537 }); 669 };
538 } else { 670 } else {
539 $self->{map_widget}->update; 671 $self->{map_widget}->update;
540 } 672 }
541} 673}
542 674
… …
554 686
555 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
556 688
557 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);
558 $self->{map_cache_new}{$hash} = \$data; 690 $self->{map_cache_new}{$hash} = \$data;
559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
560} 692}
561 693
562sub map_clear { 694sub map_clear {
563 my ($self) = @_; 695 my ($self) = @_;
564 696
… …
570} 702}
571 703
572sub bg_fetch { 704sub bg_fetch {
573 my ($self) = @_; 705 my ($self) = @_;
574 706
575 my $id; 707 my $tile;
576 708
577 do { 709 do {
578 $id = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
579 or return; 711 or return;
580 } while $self->{texture}[$id]; 712 } while $self->{texture}[$tile];
581 713
582 CFPlus::DB::exists tilecache => $id, sub { 714 DC::DB::get tilecache => $tile, sub {
583 my ($exists) = @_; 715 my ($data) = @_;
584 716
585 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
586 718
587 if ($exists) { 719 if (defined $data) {
588 $self->have_tile ($id); 720 $self->have_tile ($tile, $data);
589 $self->{texture}[$id]->upload; 721 $self->{texture}[$tile]->upload;
590 } 722 }
591 723
592 $self->bg_fetch; 724 $self->bg_fetch;
593 }; 725 };
594} 726}
… …
615 }; 747 };
616 748
617 if (my $rdata = $self->{map_cache_old}{$hash}) { 749 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata); 750 $cb->($$rdata);
619 } else { 751 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 752 DC::DB::get $self->{mapcache} => $hash, $cb;
621 } 753 }
622} 754}
623 755
624# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
625# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
… …
749 881
750sub face_find { 882sub face_find {
751 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
752 884
753 if ($face->{type} == 0) { # FT_FACE 885 if ($face->{type} == 0) { # FT_FACE
754 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
755 887
756 $face->{id} = $id; 888 $face->{id} = $id;
757 $self->{faceid}[$facenum] = $id;
758
759 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
760 890
761 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
762 892
763 } elsif ($face->{type} & 1) { # with metadata 893 } elsif ($face->{type} & 1) { # with metadata
764 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;
765 } 898 }
766} 899}
767 900
768sub face_update { 901sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
770 903
771 if ($face->{type} == 0) { # FT_FACE 904 if ($face->{type} == 0) {
905 # image, FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed; 907 if $changed;
774 908
775 $self->have_tile ($face->{id}); 909 $self->have_tile ($face->{id}, delete $face->{data});
776 910
777 } elsif ($face->{type} & 1) { # split metadata 911 } elsif ($face->{type} & 1) {
912 # split metadata case, FT_MUSIC, FT_SOUND
778 if ($changed) { # new data 913 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json); 915 $face->{data} = $meta;
781 916
917 # rely on strict ordering here and also on later fetch
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 918 DC::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
784 } else { 920 }
921
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 922 $face->{data} = $self->{json_coder}->decode ($face->{data});
786 }
787
788 ::add_license ($face); 923 ::add_license ($face);
924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
925 if $changed;
789 926
790 if ($face->{type} == 3) { # FT_MUSIC 927 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum); 928 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND 929 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum); 930 &::audio_sound_push ($facenum);
804 } 931 }
805 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;
806 } 941 }
807} 942}
808 943
809sub smooth_update { 944sub smooth_update {
810 my ($self, $facenum, $face) = @_; 945 my ($self, $facenum, $face) = @_;
811 946
812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 947 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
813} 948}
814 949
815sub have_tile { 950sub have_tile {
816 my ($self, $tile) = @_; 951 my ($self, $tile, $data) = @_;
817 952
818 return unless $self->{map}; 953 return unless $self->{map};
819 954
820 my $tex = $self->{texture}[$tile] ||= 955 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture 956 new DC::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1; 957 tile => $tile,
958 image => $data, delete_image => 1,
959 minify => 1, mipmap => 1;
823 960
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
962 $_->($tex) for @$cbs;
963 }
825} 964}
826 965
827sub connect_face_update { 966# call in non-void context registers a temporary
967# hook with handle, otherwise its permanent
968sub on_face_change {
828 my ($self, $id, $cb) = @_; 969 my ($self, $num, $cb) = @_;
829 970
830 push @{$self->{face_cb}{$id}}, $cb; 971 push @{$self->{face_cb}{$num}}, $cb;
831 972
832 CFPlus::guard { 973 defined wantarray
974 ? DC::guard {
833 @{$self->{face_cb}{$id}} 975 @{$self->{face_cb}{$num}}
834 = grep $_ != $cb, 976 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}}; 977 @{$self->{face_cb}{$num}};
836 } 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)
837} 995}
838 996
839sub sound_play { 997sub sound_play {
840 my ($self, $type, $face, $dx, $dy, $vol) = @_; 998 my ($self, $type, $face, $dx, $dy, $vol) = @_;
841 999
… …
856 1014
857sub sanitise_xml($) { 1015sub sanitise_xml($) {
858 local $_ = shift; 1016 local $_ = shift;
859 1017
860 # we now weed out all tags we do not support 1018 # we now weed out all tags we do not support
861 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
862 # now all entities 1024 # now all entities
863 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;
864 1026
865 # handle some elements 1027 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
913 $self->{$type} = $text; 1075 $self->{$type} = $text;
914 } else { 1076 } else {
915 $self->logprint ("msg: ", $text); 1077 $self->logprint ("msg: ", $text);
916 return if $color < 0; # negative color == ignore if not understood 1078 return if $color < 0; # negative color == ignore if not understood
917 1079
918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1080 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
919 1081
920 ## try to create single paragraphs of multiple lines sent by the server 1082 ## try to create single paragraphs of multiple lines sent by the server
921 # no longer neecssary with TRT servers 1083 # no longer neecssary with TRT servers
922 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1084 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
923 1085
924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
925 for split /\n/, $text; 1086 for (split /\n/, $text) {
1087 ::message ({
1088 fg => $fg,
1089 markup => $_,
1090 type => $type,
1091 extra => [@extra],
1092 color_flags => $color, #d# ugly, kill
1093 });
1094
1095 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1096 # actually, this is an ugly design. _we_ should control the channels,
1097 # not some random other widget, as the channels are clearly protocol-specific.
1098 # then we could also react to flags such as CLEAR without resorting to
1099 # hacks such as color_flags, above.
1100 }
926 1101
927 $self->{statusbox}->add ($text, 1102 $self->{statusbox}->add ($text,
928 group => $text, 1103 group => $text,
929 fg => $fg, 1104 fg => $fg,
930 timeout => $color >= 2 ? 180 : 10, 1105 timeout => $color >= 2 ? 180 : 10,
931 tooltip_font => $::FONT_FIXED, 1106 tooltip_font => $::FONT_FIXED,
932 ); 1107 ) if $type eq "info";
933 } 1108 }
934} 1109}
935 1110
936sub spell_add { 1111sub spell_add {
937 my ($self, $spell) = @_; 1112 my ($self, $spell) = @_;
… …
941 $spell->{message} =~ s/\n+$//; 1116 $spell->{message} =~ s/\n+$//;
942 $spell->{message} ||= "Server did not provide a description for this spell."; 1117 $spell->{message} ||= "Server did not provide a description for this spell.";
943 1118
944 $::SPELL_LIST->add_spell ($spell); 1119 $::SPELL_LIST->add_spell ($spell);
945 1120
946 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1121 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
947 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1122 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
948} 1123}
949 1124
950sub spell_delete { 1125sub spell_delete {
951 my ($self, $spell) = @_; 1126 my ($self, $spell) = @_;
952 1127
… …
963sub addme_success { 1138sub addme_success {
964 my ($self) = @_; 1139 my ($self) = @_;
965 1140
966 my %skill_help; 1141 my %skill_help;
967 1142
968 for my $node (CFPlus::Pod::find skill_description => "*") { 1143 for my $node (DC::Pod::find skill_description => "*") {
969 my (undef, @par) = CFPlus::Pod::section_of $node; 1144 my (undef, @par) = DC::Pod::section_of $node;
970 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1145 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
971 }; 1146 };
972 1147
973 for my $skill (values %{$self->{skill_info}}) { 1148 for my $skill (values %{$self->{skill_info}}) {
974 $self->{map_widget}->add_command ("ready_skill $skill", 1149 $self->{map_widget}->add_command ("ready_skill $skill",
975 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1150 (DC::asxml "Ready the skill '$skill'\n\n")
976 . $skill_help{$skill}); 1151 . $skill_help{$skill});
977 $self->{map_widget}->add_command ("use_skill $skill", 1152 $self->{map_widget}->add_command ("use_skill $skill",
978 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1153 (DC::asxml "Immediately use the skill '$skill'\n\n")
979 . $skill_help{$skill}); 1154 . $skill_help{$skill});
980 } 1155 }
981} 1156}
982 1157
983sub eof { 1158sub eof {
… …
987 1162
988 ::stop_game (); 1163 ::stop_game ();
989} 1164}
990 1165
991sub update_floorbox { 1166sub update_floorbox {
992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
993 return unless $::CONN; 1168 return unless $::CONN;
994 1169
995 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
996 1171
997 my @add; 1172 my @add;
998 1173
999 my $row; 1174 my $row;
1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1176 next if $_->{tag} & 0x80000000;
1001 if ($row < 6) { 1177 if ($row < 6) {
1002 local $_->{face_widget}; # hack to force recreation of widget 1178 local $_->{face_widget}; # hack to force recreation of widget
1003 local $_->{desc_widget}; # hack to force recreation of widget 1179 local $_->{desc_widget}; # hack to force recreation of widget
1004 CFPlus::Item::update_widgets $_; 1180 DC::Item::update_widgets $_;
1005 1181
1006 push @add, 1182 push @add,
1007 0, $row, $_->{face_widget}, 1183 0, $row, $_->{face_widget},
1008 1, $row, $_->{desc_widget}; 1184 1, $row, $_->{desc_widget};
1009 1185
1010 $row++; 1186 $row++;
1011 } else { 1187 } else {
1012 push @add, 1, $row, new CFPlus::UI::Button 1188 push @add, 1, $row, new DC::UI::Button
1013 text => "More...", 1189 text => "More...",
1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1190 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1015 ; 1191 ;
1016 last; 1192 last;
1017 } 1193 }
1018 } 1194 }
1019 if ($::CONN->{open_container}) { 1195 if ($::CONN->{open_container}) {
1020 push @add, 1, $row++, new CFPlus::UI::Button 1196 push @add, 1, $row++, new DC::UI::Button
1021 text => "Close container", 1197 text => "Close container",
1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1198 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1023 ; 1199 ;
1024 } 1200 }
1025 1201
1026 $::FLOORBOX->add_at (@add); 1202 $::FLOORBOX->add_at (@add);
1027 }); 1203 });
1028 1204
1029 $::WANT_REFRESH->start; 1205 $::WANT_REFRESH = 1;
1030} 1206}
1031 1207
1032sub set_opencont { 1208sub set_opencont {
1033 my ($conn, $tag, $name) = @_; 1209 my ($conn, $tag, $name) = @_;
1034 $conn->{open_container} = $tag; 1210 $conn->{open_container} = $tag;
1035 update_floorbox; 1211 update_floorbox;
1036 1212
1037 $::INV_RIGHT_HB->clear (); 1213 $::INVR_HB->clear ();
1038 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1214 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1039 1215
1040 if ($tag != 0) { # Floor isn't closable, is it? 1216 if ($tag != 0) { # Floor isn't closable, is it?
1041 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1217 $::INVR_HB->add (new DC::UI::Button
1042 text => "Close container", 1218 text => "Close container",
1043 tooltip => "Close the currently open container (if one is open)", 1219 tooltip => "Close the currently open container (if one is open)",
1044 on_activate => sub { 1220 on_activate => sub {
1045 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1221 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1046 if $tag != 0; 1222 if $tag != 0;
1047 #if $CONN->{open_container} != 0;
1048 0 1223 0
1049 }, 1224 },
1050 ); 1225 );
1051 } 1226 }
1052 1227
… …
1054} 1229}
1055 1230
1056sub update_containers { 1231sub update_containers {
1057 my ($self) = @_; 1232 my ($self) = @_;
1058 1233
1059 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1234 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1060 my $todo = delete $self->{update_container} 1235 my $todo = delete $self->{update_container}
1061 or return; 1236 or return;
1062 1237
1063 for my $tag (keys %$todo) { 1238 for my $tag (keys %$todo) {
1064 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1239 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1099} 1274}
1100 1275
1101sub item_update { 1276sub item_update {
1102 my ($self, $item) = @_; 1277 my ($self, $item) = @_;
1103 1278
1104 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1279 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1105 1280
1106 CFPlus::Item::update_widgets $item; 1281 DC::Item::update_widgets $item;
1107 1282
1108 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1283 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1109 set_opencont ($::CONN, 0, "Floor"); 1284 set_opencont ($::CONN, 0, "Floor");
1110 1285
1111 } elsif ($item->{flags} & F_OPEN) { 1286 } elsif ($item->{flags} & F_OPEN) {
1112 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1287 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1113 1288
1114 } else { 1289 } else {
1115 $self->{update_container}{$item->{container}}++; 1290 $self->{update_container}{$item->{container}}++;
1116 $self->update_containers; 1291 $self->update_containers;
1117 } 1292 }
… …
1128 1303
1129 my $weight = .001 * $self->{player}{weight}; 1304 my $weight = .001 * $self->{player}{weight};
1130 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1305 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1131 1306
1132 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1307 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1133 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1308 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1134 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1309 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1135} 1310}
1136 1311
1137sub update_server_info { 1312sub update_server_info {
1138 my ($self) = @_; 1313 my ($self) = @_;
… …
1146 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1321 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1147 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1322 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1148 . "editing support $yesno[!!$self->{editor_support}]\n" 1323 . "editing support $yesno[!!$self->{editor_support}]\n"
1149 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1324 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1150 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1325 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1326 . "client support $yesno[$self->{cfplus_ext} > 0]"
1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1327 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1153 . "map size $self->{mapw}×$self->{maph}\n" 1328 . "map size $self->{mapw}×$self->{maph}\n"
1154 ); 1329 );
1155 1330
1156} 1331}
… …
1176 0 1351 0
1177 }); 1352 });
1178 1353
1179 $self->update_server_info; 1354 $self->update_server_info;
1180 1355
1181 $self->send_command ("output-sync $::CFG->{output_sync}");
1182 $self->send_command ("output-count $::CFG->{output_count}");
1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1356 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1184 $self->send_command ("pickup $::CFG->{pickup}"); 1357 $self->send_command ("pickup $::CFG->{pickup}");
1185} 1358}
1186 1359
1187sub lookat { 1360sub lookat {
… …
1191 $self->send_ext_req (lookat => $x, $y, sub { 1364 $self->send_ext_req (lookat => $x, $y, sub {
1192 my (%msg) = @_; 1365 my (%msg) = @_;
1193 1366
1194 if (exists $msg{npc_dialog}) { 1367 if (exists $msg{npc_dialog}) {
1195 # start npc chat dialog 1368 # start npc chat dialog
1196 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1369 $self->{npc_dialog} = new DC::NPCDialog::
1197 token => $msg{npc_dialog}, 1370 token => $msg{npc_dialog},
1198 title => "$msg{npc_dialog}[0] (NPC)", 1371 title => "$msg{npc_dialog}[0] (NPC)",
1199 conn => $self, 1372 conn => $self,
1200 ; 1373 ;
1201 } 1374 }
… …
1214 $self->SUPER::destroy; 1387 $self->SUPER::destroy;
1215 1388
1216 %$self = (); 1389 %$self = ();
1217} 1390}
1218 1391
1219package CFPlus::NPCDialog; 1392package DC::NPCDialog;
1220 1393
1221our @ISA = 'CFPlus::UI::Toplevel'; 1394our @ISA = 'DC::UI::Toplevel';
1222 1395
1223sub new { 1396sub new {
1224 my $class = shift; 1397 my $class = shift;
1225 1398
1226 my $self = $class->SUPER::new ( 1399 my $self = $class->SUPER::new (
… …
1233 kw => { hi => 0, yes => 0, no => 0 }, 1406 kw => { hi => 0, yes => 0, no => 0 },
1234 has_close_button => 1, 1407 has_close_button => 1,
1235 @_, 1408 @_,
1236 ); 1409 );
1237 1410
1238 CFPlus::weaken (my $this = $self); 1411 DC::weaken (my $this = $self);
1239 1412
1240 $self->connect (delete => sub { $this->destroy; 1 }); 1413 $self->connect (delete => sub { $this->destroy; 1 });
1241 1414
1242 # better use a pane... 1415 # better use a pane...
1243 $self->add (my $hbox = new CFPlus::UI::HBox); 1416 $self->add (my $hbox = new DC::UI::HBox);
1244 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1417 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1245 1418
1246 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1419 $hbox->add (my $vbox = new DC::UI::VBox);
1247 1420
1248 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1421 $vbox->add (new DC::UI::Label text => "Message Entry:");
1249 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1422 $vbox->add ($self->{entry} = new DC::UI::Entry
1250 tooltip => "#npc_message_entry", 1423 tooltip => "#npc_message_entry",
1251 on_activate => sub { 1424 on_activate => sub {
1252 my ($entry, $text) = @_; 1425 my ($entry, $text) = @_;
1253 1426
1254 return unless $text =~ /\S/; 1427 return unless $text =~ /\S/;
… …
1258 1431
1259 0 1432 0
1260 }, 1433 },
1261 ); 1434 );
1262 1435
1263 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1436 $vbox->add ($self->{options} = new DC::UI::VBox);
1264 1437
1265 $self->{bye_button} = new CFPlus::UI::Button 1438 $self->{bye_button} = new DC::UI::Button
1266 text => "Bye (close)", 1439 text => "Bye (close)",
1267 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1440 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1268 on_activate => sub { $this->destroy; 1 }, 1441 on_activate => sub { $this->destroy; 1 },
1269 ; 1442 ;
1270 1443
… …
1289}; 1462};
1290 1463
1291sub update_options { 1464sub update_options {
1292 my ($self) = @_; 1465 my ($self) = @_;
1293 1466
1294 CFPlus::weaken $self; 1467 DC::weaken $self;
1295 1468
1296 $self->{options}->clear; 1469 $self->{options}->clear;
1297 $self->{options}->add ($self->{bye_button}); 1470 $self->{options}->add ($self->{bye_button});
1298 1471
1299 for my $kw (sort keys %{ $self->{kw} }) { 1472 for my $kw (sort keys %{ $self->{kw} }) {
1300 $self->{options}->add (new CFPlus::UI::Button 1473 $self->{options}->add (new DC::UI::Button
1301 text => $kw, 1474 text => $kw,
1302 on_activate => sub { 1475 on_activate => sub {
1303 $self->send ($kw); 1476 $self->send ($kw);
1304 0 1477 0
1305 }, 1478 },
… …
1308} 1481}
1309 1482
1310sub feed { 1483sub feed {
1311 my ($self, $type, @arg) = @_; 1484 my ($self, $type, @arg) = @_;
1312 1485
1313 CFPlus::weaken $self; 1486 DC::weaken $self;
1314 1487
1315 if ($type eq "update") { 1488 if ($type eq "update") {
1316 my (%info) = @arg; 1489 my (%info) = @arg;
1317 1490
1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1491 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1492 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1320 1493
1321 if (exists $info{msg}) { 1494 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1495 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1496 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link; 1497 my @link;
1325 $text =~ s{ 1498 $text =~ s{
1326 ($match) 1499 ($match)
1327 }{ 1500 }{
1328 my $kw = $1; 1501 my $kw = $1;
1329 1502
1330 push @link, new CFPlus::UI::Label 1503 push @link, new DC::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1504 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1, 1505 can_hover => 1,
1333 can_events => 1, 1506 can_events => 1,
1334 padding_x => 0, 1507 padding_x => 0,
1335 padding_y => 0, 1508 padding_y => 0,
… …
1353} 1526}
1354 1527
1355sub send { 1528sub send {
1356 my ($self, $msg) = @_; 1529 my ($self, $msg) = @_;
1357 1530
1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1531 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1359 $self->{textview}->scroll_to_bottom; 1532 $self->{textview}->scroll_to_bottom;
1360 1533
1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1534 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1362} 1535}
1363 1536

Diff Legend

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