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.136 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.185 by root, Thu Dec 27 19:12:19 2007 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;
… …
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->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81 50
82 $self->{json_coder} 51 $self->{json_coder}
83 ->convert_blessed 52 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
85 $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 }
86 }); 61 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196 62
197 # destroy widgets on logout 63 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 66 $_->destroy
… …
204 70
205 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
206 for @cmd_help; 72 for @cmd_help;
207 73
208 { 74 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $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}});
212 } 78 }
213 79
214 { 80 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $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}});
218 } 84 }
219 85
220 $self->{open_container} = 0; 86 $self->{open_container} = 0;
221 87
… …
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 90
225 $self 91 $self
226} 92}
227 93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
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 $parse_list->($template);
231 $done_cb->();
232 } elsif ($type eq "face") {
233 #...
234 $done_cb->(0);
235 } else {
236 $done_cb->(0);
237 }
238}
239
240# widgetset associate
241sub ext_ws_a {
242 my ($self, %ass) = @_;
243
244 # everything that has a name, wether conceivably useful or not
245 my %wkw = (
246 root => $DC::UI::ROOT,
247 tooltip => $DC::UI::TOOLTIP,
248
249 mapwidget => $::MAPWIDGET,
250 buttonbar => $::BUTTONBAR,
251 metaserver => $::METASERVER,
252 buttonbar => $::BUTTONBAR,
253 login_button => $::LOGIN_BUTTON,
254 quit_dialog => $::QUIT_DIALOG,
255 host_entry => $::HOST_ENTRY,
256 metaserver => $::METASERVER,
257 server_info => $::SERVER_INFO,
258
259 setup_dialog => $::SETUP_DIALOG,
260 setup_notebook => $::SETUP_NOTEBOOK,
261 setup_server => $::SETUP_SERVER,
262 setup_keyboard => $::SETUP_KEYBOARD,
263
264 pl_notebook => $::PL_NOTEBOOK,
265 pl_window => $::PL_WINDOW,
266 inventory_page => $::INVENTORY_PAGE,
267 stats_page => $::STATS_PAGE,
268 skill_page => $::SKILL_PAGE,
269 spell_page => $::SPELL_PAGE,
270 spell_list => $::SPELL_LIST,
271
272 floorbox => $::FLOORBOX,
273 help_window => $::HELP_WINDOW,
274 message_window => $::MESSAGE_WINDOW,
275 statusbox => $::SDTATUSBOX,
276
277 inv => $::INV,
278 invr => $::INVR,
279 invr_hb => $::INVR_HB,
280 );
281
282 while (my ($id, $name) = each %ass) {
283 $self->widget_associate (undef, $id => $wkw{$name});
284 }
285}
286
287# widget call
288sub ext_w_c {
289 my ($self, $id, $rcb, $method, @args) = @_;
290
291 my $w = $self->{widget}{$id}
292 or return;
293
294 if ($rcb) {
295 $rcb->($w->$method (@args));
296 } else {
297 $w->$method (@args);
298 }
299}
300
301# widget set
302sub ext_w_s {
303 my ($self, $id, $attr) = @_;
304
305 my $w = $self->{widget}{$id}
306 or return;
307
308 for (my $i = 0; $i < $#$attr; $i += 2) {
309 my ($member, $value) = @$attr[$i, $i+1];
310 if (defined $value) {
311 $w->{$member} = $value;
312 } else {
313 delete $w->{$member};
314 }
315 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
316 }
317}
318
319# widget get
320sub ext_w_g {
321 my ($self, $id, $rid, @attr) = @_;
322
323 my $w = $self->{widget}{$id}
324 or return;
325
326 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
327}
328
329# message window
330sub ext_channel_info {
331 my ($self, $info) = @_;
332 $self->{channels}->{$info->{id}} = $info;
333 $::MESSAGE_WINDOW->add_channel ($info);
334}
335
336#############################################################################
337
228sub logprint { 338sub logprint {
229 my ($self, @a) = @_; 339 my ($self, @a) = @_;
230 340
231 $self->{log_fh} ||= do { 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232 my $path = "$Crossfire::VARDIR/log.$self->{host}";
233
234 open my $fh, ">>:utf8", $path
235 or die "Couldn't open logfile $path: $!";
236
237 $fh->autoflush (1);
238
239 $fh;
240 };
241
242 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
243
244 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
245 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
246
247 print {$self->{log_fh}} "$ts ", @a, "\n";
248} 342}
249 343
250sub _stat_numdiff { 344sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
252 346
… …
336 430
337 if ( 431 if (
338 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
339 ) { 433 ) {
340 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
341 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 435 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
342 } 436 }
343 437
344 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
345 439
346 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
385 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 479 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
386 $::GAUGES->{food} ->set_value ($fo, $fo_m); 480 $::GAUGES->{food} ->set_value ($fo, $fo_m);
387 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 481 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 482 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 483 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
484 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 485 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
391 my $title = $stats->{+CS_STAT_TITLE}; 486 my $title = $stats->{+CS_STAT_TITLE};
392 $title =~ s/^Player: //; 487 $title =~ s/^Player: //;
393 $::STATWIDS->{title} ->set_text ("Title: " . $title); 488 $::STATWIDS->{title} ->set_text ("Title: " . $title);
394 489
… …
412 for keys %RES_TBL; 507 for keys %RES_TBL;
413 508
414 my $sktbl = $::STATWIDS->{skill_tbl}; 509 my $sktbl = $::STATWIDS->{skill_tbl};
415 my @skills = keys %{ $self->{skill_info} }; 510 my @skills = keys %{ $self->{skill_info} };
416 511
417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 512 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
513 map [$_, $self->{skill_info}{$_}],
514 grep exists $stats->{$_},
515 @skills;
516
517 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
518 $self->{stat_order} = join ",", map $_->[0], @order;
519
418 $sktbl->clear; 520 $sktbl->clear;
419 521
420 my @add; 522 my $sw = $self->{skillwid}{""} ||= [
421
422 push @add,
423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
429 ; 531 ];
532
533 my @add = @$sw;
430 534
431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 535 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
432 536
433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 537 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 538 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
435 539
436 my ($x, $y) = (0, 1); 540 my ($x, $y) = (0, 1);
437 for ( 541 for (@order) {
438 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
439 map [$_, $self->{skill_info}{$_}],
440 grep exists $stats->{$_},
441 @skills
442 ) {
443 my ($idx, $name) = @$_; 542 my ($idx, $name) = @$_;
444 543
445 my $spell_cb = sub { 544 my $spell_cb = sub {
446 my ($widget, $ev) = @_; 545 my ($widget, $ev) = @_;
447 546
448 if ($ev->{button} == 1) { 547 if ($ev->{button} == 1) {
449 $::CONN->user_send ("ready_skill $name"); 548 $::CONN->user_send ("ready_skill $name");
450 } elsif ($ev->{button} == 2) { 549 } elsif ($ev->{button} == 2) {
451 $::CONN->user_send ("use_skill $name"); 550 $::CONN->user_send ("use_skill $name");
452 } elsif ($ev->{button} == 3) { 551 } elsif ($ev->{button} == 3) {
453 my $shortname = CFPlus::shorten $name, 14; 552 my $shortname = DC::shorten $name, 14;
454 (new CFPlus::UI::Menu 553 (new DC::UI::Menu
455 items => [ 554 items => [
456 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 555 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
457 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 556 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
458 ], 557 ],
459 )->popup ($ev); 558 )->popup ($ev);
460 } else { 559 } else {
461 return 0; 560 return 0;
462 } 561 }
463 562
464 1 563 1
465 }; 564 };
466 565
566 my $sw = $self->{skillwid}{$idx} ||= [
567 # exp
568 (new DC::UI::Label
569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
570
571 # level
572 (new DC::UI::Label
573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
574
575 # progress
576 (new DC::UI::ExperienceProgress),
577
578 # label
579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
581 ];
582
467 push @add, 583 push @add,
468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 584 $x * 4 + 0, $y, $sw->[0],
469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 585 $x * 4 + 1, $y, $sw->[1],
470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 586 $x * 4 + 2, $y, $sw->[2],
471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 587 $x * 4 + 3, $y, $sw->[3],
472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ; 588 ;
475 589
476 $x++ and ($x, $y) = (0, $y + 1); 590 $x++ and ($x, $y) = (0, $y + 1);
477 } 591 }
478 592
479 $sktbl->add_at (@add); 593 $sktbl->add_at (@add);
480 } 594 }
481 595
482 for (grep exists $stats->{$_}, @skills) { 596 for (@order) {
483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 597 my ($idx, $name) = @$_;
484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 598 my $val = $stats->{$idx};
485 }
486}
487 599
488sub macro_send { 600 next if $prev->{$idx}[1] eq $val->[1];
489 my ($self, $macro) = @_;
490 601
491 for my $cmd (@{ $macro->{action} }) { 602 my $sw = $self->{skillwid}{$idx};
492 $self->send_command ($cmd); 603 $sw->[0]->set_text (::formsep ($val->[1]));
604 $sw->[1]->set_text ($val->[0] * 1);
605 $sw->[2]->set_value (@$val);
606
607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
608 $::GAUGES->{sklprg}->set_value (@$val);
493 } 609 }
494} 610}
495 611
496sub user_send { 612sub user_send {
497 my ($self, $command) = @_; 613 my ($self, $command) = @_;
… …
499 $self->{record}->($command) 615 $self->{record}->($command)
500 if $self->{record}; 616 if $self->{record};
501 617
502 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
503 $self->send_command ($command); 619 $self->send_command ($command);
504 ::status ($command);
505} 620}
506 621
507sub record { 622sub record {
508 my ($self, $cb) = @_; 623 my ($self, $cb) = @_;
509 624
… …
517} 632}
518 633
519sub feed_map1a { 634sub feed_map1a {
520 my ($self, $data) = @_; 635 my ($self, $data) = @_;
521 636
522 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 637 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
638 my $delay;
639
640 for my $tile (@$missing) {
641 next if $self->{delay}{$tile};
642
643 $delay = 1;
644
645 if (my $tex = $::CONN->{texture}[$tile]) {
646 $tex->upload;
647 } else {
648 $self->{delay}{$tile} = 1;
649
650 # we assume the face is in-flight and will eventually come
651 push @{$self->{tile_cb}{$tile}}, sub {
652 delete $self->{delay}{$tile};
653 $_[0]->upload;
654 };
655 }
656 }
657
658 if ($delay) {
659 # delay the map drawing a tiny bit in the hope of getting the missing fetched
660 EV::once undef, 0, 0.03, sub {
661 $self->{map_widget}->update
662 if $self->{map_widget};
663 };
664 } else {
523 $self->{map_widget}->update; 665 $self->{map_widget}->update;
666 }
524} 667}
525 668
526sub magicmap { 669sub magicmap {
527 my ($self, $w, $h, $x, $y, $data) = @_; 670 my ($self, $w, $h, $x, $y, $data) = @_;
528 671
… …
535 my $map_info = delete $self->{map_info} 678 my $map_info = delete $self->{map_info}
536 or return; 679 or return;
537 680
538 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
539 682
540 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 683 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
684 $self->{map_cache_new}{$hash} = \$data;
541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
543} 686}
544 687
545sub map_clear { 688sub map_clear {
546 my ($self) = @_; 689 my ($self) = @_;
547 690
… …
553} 696}
554 697
555sub bg_fetch { 698sub bg_fetch {
556 my ($self) = @_; 699 my ($self) = @_;
557 700
558 my $id; 701 my $tile;
559 702
560 do { 703 do {
561 $id = pop @{$self->{bg_fetch}} 704 $tile = pop @{$self->{bg_fetch}}
562 or return; 705 or return;
563 } while $self->{texture}[$id]; 706 } while $self->{texture}[$tile];
564 707
565 CFPlus::DB::get tilecache => $id, sub { 708 DC::DB::get tilecache => $tile, sub {
566 my ($data) = @_; 709 my ($data) = @_;
567 710
568 return unless $self->{map}; # stop when destroyed 711 return unless $self->{map}; # stop when destroyed
569 712
570 $self->set_texture ($id => $data)
571 if defined $data; 713 if (defined $data) {
714 $self->have_tile ($tile, $data);
715 $self->{texture}[$tile]->upload;
716 }
572 717
573 $self->bg_fetch; 718 $self->bg_fetch;
574 }; 719 };
575} 720}
576 721
577sub load_map($$$) { 722sub load_map($$$) {
578 my ($self, $hash, $x, $y) = @_; 723 my ($self, $hash, $x, $y) = @_;
579 724
580 my $gen = $self->{map_change_gen}; 725 my $gen = $self->{map_change_gen};
581 726
582 CFPlus::DB::get $self->{mapcache} => $hash, sub { 727 my $cb = sub {
583 return unless $gen == $self->{map_change_gen}; 728 return unless $gen == $self->{map_change_gen};
584 729
585 my ($data) = @_; 730 my ($data) = @_;
586 731
587 if (defined $data) { 732 if (defined $data) {
733 $self->{map_cache_new}{$hash} = \$data;
734
588 $data = Compress::LZF::decompress $data; 735 my $data = Compress::LZF::decompress $data;
589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590 736
591 my $inprogress = @{ $self->{bg_fetch} || [] }; 737 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 738 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593 $self->bg_fetch unless $inprogress; 739 $self->bg_fetch unless $inprogress;
594 } 740 }
595 }; 741 };
742
743 if (my $rdata = $self->{map_cache_old}{$hash}) {
744 $cb->($$rdata);
745 } else {
746 DC::DB::get $self->{mapcache} => $hash, $cb;
747 }
596} 748}
597 749
598# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
600# the right fix is to make real tiled maps with an overview file 752# the right fix is to make real tiled maps with an overview file
… …
693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 845 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694 846
695 $self->flush_map; 847 $self->flush_map;
696 848
697 ++$self->{map_change_gen}; 849 ++$self->{map_change_gen};
850 $self->{map_cache_old} = delete $self->{map_cache_new};
698 851
699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 852 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700 853
701 my $mapmapw = $self->{mapmap}->{w}; 854 my $mapmapw = $self->{mapmap}->{w};
702 my $mapmaph = $self->{mapmap}->{h}; 855 my $mapmaph = $self->{mapmap}->{h};
… …
722 875
723sub face_find { 876sub face_find {
724 my ($self, $facenum, $face, $cb) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
725 878
726 if ($face->{type} == 0) { # FT_FACE 879 if ($face->{type} == 0) { # FT_FACE
727 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 880 my $id = DC::DB::get_tile_id_sync $face->{name};
728 881
729 $face->{id} = $id; 882 $face->{id} = $id;
730 $self->{faceid}[$facenum] = $id;
731
732 $self->{map}->set_tileid ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
733 884
734 CFPlus::DB::get tilecache => $id, $cb; 885 DC::DB::get tilecache => $id, $cb;
735 886
736 } elsif ($face->{type} & 1) { # with metadata 887 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 888 DC::DB::get res_meta => $face->{name}, $cb;
889
890 } else { # no metadata
891 DC::DB::get res_data => $face->{name}, $cb;
739 } 892 }
740} 893}
741 894
742sub face_update { 895sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
744 897
745 if ($face->{type} == 0) { # FT_FACE 898 if ($face->{type} == 0) {
899 # image, FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 901 if $changed;
748 902
749 $self->set_texture ($face->{id} => delete $face->{data}); 903 $self->have_tile ($face->{id}, delete $face->{data});
750 904
751 } elsif ($face->{type} & 1) { # split metadata 905 } elsif ($face->{type} & 1) {
752 my $cb = sub { }; 906 # split metadata case, FT_MUSIC, FT_SOUND
907 if ($changed) { # new data
908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
909 $face->{data} = $meta;
910
911 # rely on strict ordering here and also on later fetch
912 DC::DB::put res_data => $face->{name} => $data, sub { };
913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
914 }
915
916 $face->{data} = $self->{json_coder}->decode ($face->{data});
917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
753 920
754 if ($face->{type} == 3) { # FT_MUSIC 921 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub { 922 &::audio_music_push ($facenum);
756 $self->{music_meta}{$facenum} = $face; 923 } elsif ($face->{type} == 5) { # FT_SOUND
757 924 &::audio_sound_push ($facenum);
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 }; 925 }
763 }
764 926
765 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else { 927 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 928 # flat resource case, FT_RSRC
779 $cb->(); 929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
780 } 930 if $changed;
931 }
932
933 if (my $cbs = $self->{face_cb}{$facenum}) {
934 $_->($face, $changed) for @$cbs;
781 } 935 }
782} 936}
783 937
784sub smooth_update { 938sub smooth_update {
785 my ($self, $facenum, $face) = @_; 939 my ($self, $facenum, $face) = @_;
786 940
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 941 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 942}
789 943
790sub set_texture { 944sub have_tile {
791 my ($self, $id, $data) = @_; 945 my ($self, $tile, $data) = @_;
792 946
793 return unless $self->{map}; 947 return unless $self->{map};
794 948
795 $self->{texture}[$id] = my $tex = 949 my $tex = $self->{texture}[$tile] ||=
796 new_from_image CFPlus::Texture 950 new DC::Texture
951 tile => $tile,
952 image => $data, delete_image => 1,
797 $data, minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
798 954
799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
800 $self->{map_widget}->update; 956 $_->($tex) for @$cbs;
801 957 }
802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803} 958}
804 959
805sub connect_face_update { 960# call in non-void context registers a temporary
961# hook with handle, otherwise its permanent
962sub on_face_change {
806 my ($self, $id, $cb) = @_; 963 my ($self, $num, $cb) = @_;
807 964
808 push @{$self->{face_cb}{$id}}, $cb; 965 push @{$self->{face_cb}{$num}}, $cb;
809 966
810 CFPlus::guard { 967 defined wantarray
968 ? DC::guard {
811 @{$self->{face_cb}{$id}} 969 @{$self->{face_cb}{$num}}
812 = grep $_ != $cb, 970 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}}; 971 @{$self->{face_cb}{$num}};
814 } 972 }
973 : ()
974}
975
976# call in non-void context registers a temporary
977# hook with handle, otherwise its permanent
978sub register_face_handler {
979 my ($self, $num, $cb) = @_;
980
981 return unless $num;
982
983 # invoke if available right now
984 $cb->($self->{face}[$num], 0)
985 unless exists $self->{face}[$num]{loading};
986
987 # future changes
988 $self->on_face_change ($num => $cb)
815} 989}
816 990
817sub sound_play { 991sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 992 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 993
820 $self->{sound_play}->($x, $y, $soundnum, $type); 994 &::audio_sound_play ($face, $dx, $dy, $vol)
995 unless $type & 1; # odd types are silent for future expansion
821} 996}
822 997
823my $LAST_QUERY; # server is stupid, stupid, stupid 998my $LAST_QUERY; # server is stupid, stupid, stupid
824 999
825sub query { 1000sub query {
… …
833 1008
834sub sanitise_xml($) { 1009sub sanitise_xml($) {
835 local $_ = shift; 1010 local $_ = shift;
836 1011
837 # we now weed out all tags we do not support 1012 # we now weed out all tags we do not support
838 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1013 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1014 }{
1015 "&lt;"
1016 }gex;
1017
839 # now all entities 1018 # now all entities
840 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1019 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
841 1020
842 # handle some elements 1021 # handle some elements
843 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
890 $self->{$type} = $text; 1069 $self->{$type} = $text;
891 } else { 1070 } else {
892 $self->logprint ("msg: ", $text); 1071 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 1072 return if $color < 0; # negative color == ignore if not understood
894 1073
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1074 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
896 1075
897 ## try to create single paragraphs of multiple lines sent by the server 1076 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 1077 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 1079
901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
902 for split /\n/, $text; 1080 for (split /\n/, $text) {
1081 ::message ({
1082 fg => $fg,
1083 markup => $_,
1084 type => $type,
1085 extra => [@extra],
1086 color_flags => $color, #d# ugly, kill
1087 });
1088
1089 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1090 # actually, this is an ugly design. _we_ should control the channels,
1091 # not some random other widget, as the channels are clearly protocol-specific.
1092 # then we could also react to flags such as CLEAR without resorting to
1093 # hacks such as color_flags, above.
1094 }
903 1095
904 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
905 group => $text, 1097 group => $text,
906 fg => $fg, 1098 fg => $fg,
907 timeout => $color >= 2 ? 180 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
908 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
909 ); 1101 ) if $type eq "info";
910 } 1102 }
911} 1103}
912 1104
913sub spell_add { 1105sub spell_add {
914 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
… …
918 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
919 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
920 1112
921 $::SPELL_LIST->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
922 1114
923 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1115 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
924 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1116 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
925} 1117}
926 1118
927sub spell_delete { 1119sub spell_delete {
928 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
929 1121
… …
940sub addme_success { 1132sub addme_success {
941 my ($self) = @_; 1133 my ($self) = @_;
942 1134
943 my %skill_help; 1135 my %skill_help;
944 1136
945 for my $node (CFPlus::Pod::find skill_description => "*") { 1137 for my $node (DC::Pod::find skill_description => "*") {
946 my (undef, @par) = CFPlus::Pod::section_of $node; 1138 my (undef, @par) = DC::Pod::section_of $node;
947 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
948 }; 1140 };
949 1141
950 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
951 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
952 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
953 . $skill_help{$skill}); 1145 . $skill_help{$skill});
954 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
955 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
956 . $skill_help{$skill}); 1148 . $skill_help{$skill});
957 } 1149 }
958} 1150}
959 1151
960sub eof { 1152sub eof {
… …
963 $self->{map_widget}->clr_commands; 1155 $self->{map_widget}->clr_commands;
964 1156
965 ::stop_game (); 1157 ::stop_game ();
966} 1158}
967 1159
968sub image_info {
969 my ($self, $numfaces) = @_;
970
971 $self->{num_faces} = $numfaces;
972 $self->{face_prefetch} = [1 .. $numfaces];
973 $self->face_prefetch;
974}
975
976sub face_prefetch {
977 my ($self) = @_;
978
979 return unless $::CFG->{face_prefetch};
980
981 if ($self->{num_faces}) {
982 return if @{ $self->{send_queue} || [] };
983 my $todo = @{ $self->{face_prefetch} }
984 or return;
985
986 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
987
988 $self->send ("requestinfo image_sums $face $face");
989
990 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 } elsif (!exists $self->{num_faces}) {
993 $self->send ("requestinfo image_info");
994
995 $self->{num_faces} = 0;
996
997 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
998 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
999 }
1000}
1001
1002sub update_floorbox { 1160sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 1162 return unless $::CONN;
1005 1163
1006 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
1007 1165
1008 my @add; 1166 my @add;
… …
1010 my $row; 1168 my $row;
1011 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1169 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1012 if ($row < 6) { 1170 if ($row < 6) {
1013 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
1014 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
1015 CFPlus::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
1016 1174
1017 push @add, 1175 push @add,
1018 0, $row, $_->{face_widget}, 1176 0, $row, $_->{face_widget},
1019 1, $row, $_->{desc_widget}; 1177 1, $row, $_->{desc_widget};
1020 1178
1021 $row++; 1179 $row++;
1022 } else { 1180 } else {
1023 push @add, 1, $row, new CFPlus::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
1024 text => "More...", 1182 text => "More...",
1025 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1026 ; 1184 ;
1027 last; 1185 last;
1028 } 1186 }
1029 } 1187 }
1030 if ($::CONN->{open_container}) { 1188 if ($::CONN->{open_container}) {
1031 push @add, 1, $row++, new CFPlus::UI::Button 1189 push @add, 1, $row++, new DC::UI::Button
1032 text => "Close container", 1190 text => "Close container",
1033 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1034 ; 1192 ;
1035 } 1193 }
1036 1194
1037 $::FLOORBOX->add_at (@add); 1195 $::FLOORBOX->add_at (@add);
1038 }); 1196 });
1039 1197
1040 $::WANT_REFRESH++; 1198 $::WANT_REFRESH = 1;
1041} 1199}
1042 1200
1043sub set_opencont { 1201sub set_opencont {
1044 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
1045 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1046 update_floorbox; 1204 update_floorbox;
1047 1205
1048 $::INV_RIGHT_HB->clear (); 1206 $::INVR_HB->clear ();
1049 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1207 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1050 1208
1051 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
1053 text => "Close container", 1211 text => "Close container",
1054 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
1055 on_activate => sub { 1213 on_activate => sub {
1056 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1057 if $tag != 0; 1215 if $tag != 0;
1058 #if $CONN->{open_container} != 0;
1059 0 1216 0
1060 }, 1217 },
1061 ); 1218 );
1062 } 1219 }
1063 1220
… …
1065} 1222}
1066 1223
1067sub update_containers { 1224sub update_containers {
1068 my ($self) = @_; 1225 my ($self) = @_;
1069 1226
1070 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1071 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
1072 or return; 1229 or return;
1073 1230
1074 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1075 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1112sub item_update { 1269sub item_update {
1113 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
1114 1271
1115 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1272 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1116 1273
1117 CFPlus::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
1118 1275
1119 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1120 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
1121 1278
1122 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
1123 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1124 1281
1125 } else { 1282 } else {
1126 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
1127 $self->update_containers; 1284 $self->update_containers;
1128 } 1285 }
… …
1187 0 1344 0
1188 }); 1345 });
1189 1346
1190 $self->update_server_info; 1347 $self->update_server_info;
1191 1348
1192 $self->send_command ("output-sync $::CFG->{output_sync}");
1193 $self->send_command ("output-count $::CFG->{output_count}");
1194 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1349 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1195 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
1196} 1351}
1197 1352
1198sub lookat { 1353sub lookat {
… …
1202 $self->send_ext_req (lookat => $x, $y, sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
1203 my (%msg) = @_; 1358 my (%msg) = @_;
1204 1359
1205 if (exists $msg{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1361 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
1208 token => $msg{npc_dialog}, 1363 token => $msg{npc_dialog},
1209 title => "$msg{npc_dialog}[0] (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
1210 conn => $self, 1365 conn => $self,
1211 ; 1366 ;
1212 } 1367 }
… …
1225 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1226 1381
1227 %$self = (); 1382 %$self = ();
1228} 1383}
1229 1384
1230package CFPlus::NPCDialog; 1385package DC::NPCDialog;
1231 1386
1232our @ISA = 'CFPlus::UI::Toplevel'; 1387our @ISA = 'DC::UI::Toplevel';
1233 1388
1234sub new { 1389sub new {
1235 my $class = shift; 1390 my $class = shift;
1236 1391
1237 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
1244 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1245 has_close_button => 1, 1400 has_close_button => 1,
1246 @_, 1401 @_,
1247 ); 1402 );
1248 1403
1249 CFPlus::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1250 1405
1251 $self->connect (delete => sub { $this->destroy; 1 }); 1406 $self->connect (delete => sub { $this->destroy; 1 });
1252 1407
1253 # better use a pane... 1408 # better use a pane...
1254 $self->add (my $hbox = new CFPlus::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
1255 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1256 1411
1257 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
1258 1413
1259 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
1260 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
1261 tooltip => "#npc_message_entry", 1416 tooltip => "#npc_message_entry",
1262 on_activate => sub { 1417 on_activate => sub {
1263 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
1264 1419
1265 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
… …
1269 1424
1270 0 1425 0
1271 }, 1426 },
1272 ); 1427 );
1273 1428
1274 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
1275 1430
1276 $self->{bye_button} = new CFPlus::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
1277 text => "Bye (close)", 1432 text => "Bye (close)",
1278 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1433 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1279 on_activate => sub { $this->destroy; 1 }, 1434 on_activate => sub { $this->destroy; 1 },
1280 ; 1435 ;
1281 1436
… …
1300}; 1455};
1301 1456
1302sub update_options { 1457sub update_options {
1303 my ($self) = @_; 1458 my ($self) = @_;
1304 1459
1305 CFPlus::weaken $self; 1460 DC::weaken $self;
1306 1461
1307 $self->{options}->clear; 1462 $self->{options}->clear;
1308 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
1309 1464
1310 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
1311 $self->{options}->add (new CFPlus::UI::Button 1466 $self->{options}->add (new DC::UI::Button
1312 text => $kw, 1467 text => $kw,
1313 on_activate => sub { 1468 on_activate => sub {
1314 $self->send ($kw); 1469 $self->send ($kw);
1315 0 1470 0
1316 }, 1471 },
… …
1319} 1474}
1320 1475
1321sub feed { 1476sub feed {
1322 my ($self, $type, @arg) = @_; 1477 my ($self, $type, @arg) = @_;
1323 1478
1324 CFPlus::weaken $self; 1479 DC::weaken $self;
1325 1480
1326 if ($type eq "update") { 1481 if ($type eq "update") {
1327 my (%info) = @arg; 1482 my (%info) = @arg;
1328 1483
1329 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1330 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1331 1486
1332 if (exists $info{msg}) { 1487 if (exists $info{msg}) {
1333 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1488 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1334 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1489 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1335 my @link; 1490 my @link;
1336 $text =~ s{ 1491 $text =~ s{
1337 ($match) 1492 ($match)
1338 }{ 1493 }{
1339 my $kw = $1; 1494 my $kw = $1;
1340 1495
1341 push @link, new CFPlus::UI::Label 1496 push @link, new DC::UI::Label
1342 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1343 can_hover => 1, 1498 can_hover => 1,
1344 can_events => 1, 1499 can_events => 1,
1345 padding_x => 0, 1500 padding_x => 0,
1346 padding_y => 0, 1501 padding_y => 0,
… …
1364} 1519}
1365 1520
1366sub send { 1521sub send {
1367 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1368 1523
1369 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1370 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1371 1526
1372 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1373} 1528}
1374 1529

Diff Legend

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