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

Diff Legend

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