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.203 by elmex, Sun Sep 21 12:34:14 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_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 56
82 $self->{json_coder} 57 $self->{json_coder}
83 ->convert_blessed 58 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 59 ->filter_json_single_key_object ("\fw" => sub {
85 $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 }
86 }); 67 });
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 68
197 # destroy widgets on logout 69 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 71 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 72 $_->destroy
201 for values %{delete $ws->{w} || {}}; 73 for values %{delete $ws->{w} || {}};
202 } 74 }
75
76 delete $self->{items};
77 $::INV->clear;
78 $::INVR->clear;
79 $::INVR_HB->clear;
80 $::FLOORBOX->clear;
203 }); 81 });
204 82
205 $self->{map_widget}->add_command (@$_) 83 $self->{map_widget}->add_command (@$_)
206 for @cmd_help; 84 for @cmd_help;
207 85
208 { 86 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 87 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $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}});
212 } 89 }
213 90
214 { 91 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 92 $self->{noface} = my $tex = $TEX_NOFACE;
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $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}});
218 } 94 }
219 95
220 $self->{open_container} = 0; 96 $self->{open_container} = 0;
221 97
… …
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 99 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 100
225 $self 101 $self
226} 102}
227 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
228sub logprint { 354sub logprint {
229 my ($self, @a) = @_; 355 my ($self, @a) = @_;
230 356
231 $self->{log_fh} ||= do { 357 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} 358}
249 359
250sub _stat_numdiff { 360sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 361 my ($self, $name, $old, $new) = @_;
252 362
… …
336 446
337 if ( 447 if (
338 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 448 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
339 ) { 449 ) {
340 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 450 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); 451 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
342 } 452 }
343 453
344 $self->update_stats_window ($stats, $prev); 454 $self->update_stats_window ($stats, $prev);
345 455
346 $self->{prev_stats} = { %$stats }; 456 $self->{prev_stats} = { %$stats };
… …
385 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 495 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
386 $::GAUGES->{food} ->set_value ($fo, $fo_m); 496 $::GAUGES->{food} ->set_value ($fo, $fo_m);
387 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 497 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 498 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
389 . " (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});
390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 501 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
391 my $title = $stats->{+CS_STAT_TITLE}; 502 my $title = $stats->{+CS_STAT_TITLE};
392 $title =~ s/^Player: //; 503 $title =~ s/^Player: //;
393 $::STATWIDS->{title} ->set_text ("Title: " . $title); 504 $::STATWIDS->{title} ->set_text ("Title: " . $title);
394 505
… …
412 for keys %RES_TBL; 523 for keys %RES_TBL;
413 524
414 my $sktbl = $::STATWIDS->{skill_tbl}; 525 my $sktbl = $::STATWIDS->{skill_tbl};
415 my @skills = keys %{ $self->{skill_info} }; 526 my @skills = keys %{ $self->{skill_info} };
416 527
417 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
418 $sktbl->clear; 536 $sktbl->clear;
419 537
420 my @add; 538 my $sw = $self->{skillwid}{""} ||= [
421
422 push @add,
423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 539 0, 0, (new DC::UI::Label text => "Experience", align => 1),
424 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"),
425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 542 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 543 4, 0, (new DC::UI::Label text => "Experience", align => 1),
427 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"),
428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 546 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
429 ; 547 ];
548
549 my @add = @$sw;
430 550
431 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>";
432 552
433 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);
434 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);
435 555
436 my ($x, $y) = (0, 1); 556 my ($x, $y) = (0, 1);
437 for ( 557 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) = @$_; 558 my ($idx, $name) = @$_;
444 559
445 my $spell_cb = sub { 560 my $spell_cb = sub {
446 my ($widget, $ev) = @_; 561 my ($widget, $ev) = @_;
447 562
448 if ($ev->{button} == 1) { 563 if ($ev->{button} == 1) {
449 $::CONN->user_send ("ready_skill $name"); 564 $::CONN->user_send ("ready_skill $name");
450 } elsif ($ev->{button} == 2) { 565 } elsif ($ev->{button} == 2) {
451 $::CONN->user_send ("use_skill $name"); 566 $::CONN->user_send ("use_skill $name");
452 } elsif ($ev->{button} == 3) { 567 } elsif ($ev->{button} == 3) {
453 my $shortname = CFPlus::shorten $name, 14; 568 my $shortname = DC::shorten $name, 14;
454 (new CFPlus::UI::Menu 569 (new DC::UI::Menu
455 items => [ 570 items => [
456 ["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"] }],
457 ["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"] }],
458 ], 573 ],
459 )->popup ($ev); 574 )->popup ($ev);
460 } else { 575 } else {
461 return 0; 576 return 0;
462 } 577 }
463 578
464 1 579 1
465 }; 580 };
466 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
467 push @add, 599 push @add,
468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 600 $x * 4 + 0, $y, $sw->[0],
469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 601 $x * 4 + 1, $y, $sw->[1],
470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 602 $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), 603 $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 ; 604 ;
475 605
476 $x++ and ($x, $y) = (0, $y + 1); 606 $x++ and ($x, $y) = (0, $y + 1);
477 } 607 }
478 608
479 $sktbl->add_at (@add); 609 $sktbl->add_at (@add);
480 } 610 }
481 611
482 for (grep exists $stats->{$_}, @skills) { 612 for (@order) {
483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 613 my ($idx, $name) = @$_;
484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 614 my $val = $stats->{$idx};
485 }
486}
487 615
488sub macro_send { 616 next if $prev->{$idx}[1] eq $val->[1];
489 my ($self, $macro) = @_;
490 617
491 for my $cmd (@{ $macro->{action} }) { 618 my $sw = $self->{skillwid}{$idx};
492 $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);
493 } 625 }
494} 626}
495 627
496sub user_send { 628sub user_send {
497 my ($self, $command) = @_; 629 my ($self, $command) = @_;
… …
499 $self->{record}->($command) 631 $self->{record}->($command)
500 if $self->{record}; 632 if $self->{record};
501 633
502 $self->logprint ("send: ", $command); 634 $self->logprint ("send: ", $command);
503 $self->send_command ($command); 635 $self->send_command ($command);
504 ::status ($command);
505} 636}
506 637
507sub record { 638sub record {
508 my ($self, $cb) = @_; 639 my ($self, $cb) = @_;
509 640
… …
511} 642}
512 643
513sub map_scroll { 644sub map_scroll {
514 my ($self, $dx, $dy) = @_; 645 my ($self, $dx, $dy) = @_;
515 646
516 $self->{map}->scroll ($dx, $dy); 647 $self->{map_widget}->scroll ($dx, $dy);
517} 648}
518 649
519sub feed_map1a { 650sub feed_map1a {
520 my ($self, $data) = @_; 651 my ($self, $data) = @_;
521 652
522 $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 {
523 $self->{map_widget}->update; 681 $self->{map_widget}->update;
682 }
524} 683}
525 684
526sub magicmap { 685sub magicmap {
527 my ($self, $w, $h, $x, $y, $data) = @_; 686 my ($self, $w, $h, $x, $y, $data) = @_;
528 687
… …
530} 689}
531 690
532sub flush_map { 691sub flush_map {
533 my ($self) = @_; 692 my ($self) = @_;
534 693
535 my $map_info = delete $self->{map_info} 694 return unless $self->{map_info};
536 or return;
537 695
696 for my $map_info (values %{ $self->{map_cache} || {} }) {
538 my ($hash, $x, $y, $w, $h) = @$map_info; 697 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
539 698
540 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;
541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 704 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 705 }
706 }
543} 707}
544 708
545sub map_clear { 709sub map_clear {
546 my ($self) = @_; 710 my ($self) = @_;
547 711
548 $self->flush_map; 712 $self->flush_map;
713 delete $self->{map_info};
549 delete $self->{neigh_map}; 714 delete $self->{neigh_map};
550 715
551 $self->{map}->clear; 716 $self->{map}->clear;
552 delete $self->{map_widget}{magicmap}; 717 delete $self->{map_widget}{magicmap};
553} 718}
554 719
555sub bg_fetch { 720sub bg_fetch {
556 my ($self) = @_; 721 my ($self) = @_;
557 722
558 my $id; 723 my $tile;
559 724
560 do { 725 do {
561 $id = pop @{$self->{bg_fetch}} 726 $tile = pop @{$self->{bg_fetch}}
562 or return; 727 or return;
563 } while $self->{texture}[$id]; 728 } while $self->{texture}[$tile];
564 729
565 CFPlus::DB::get tilecache => $id, sub { 730 DC::DB::get tilecache => $tile, sub {
566 my ($data) = @_; 731 my ($data) = @_;
567 732
568 return unless $self->{map}; # stop when destroyed 733 return unless $self->{map}; # stop when destroyed
569 734
570 $self->set_texture ($id => $data)
571 if defined $data; 735 if (defined $data) {
736 $self->have_tile ($tile, $data);
737 $self->{texture}[$tile]->upload;
738 }
572 739
573 $self->bg_fetch; 740 $self->bg_fetch;
574 }; 741 };
575} 742}
576 743
577sub load_map($$$) { 744sub load_map($$$$$$) {
578 my ($self, $hash, $x, $y) = @_; 745 my ($self, $hash, $x, $y, $w, $h) = @_;
579 746
580 my $gen = $self->{map_change_gen}; 747 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
581 748
582 CFPlus::DB::get $self->{mapcache} => $hash, sub { 749 my $cb = sub {
583 return unless $gen == $self->{map_change_gen}; 750 $map_info->[1] = \$_[0];
584 751
585 my ($data) = @_;
586
587 if (defined $data) {
588 $data = Compress::LZF::decompress $data;
589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590
591 my $inprogress = @{ $self->{bg_fetch} || [] }; 752 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 753 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
593 $self->bg_fetch unless $inprogress; 754 $self->bg_fetch unless $inprogress;
594 }
595 }; 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 }
596} 768}
597 769
598# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 770# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599# (server resource,s latency, bandwidth), so this hack is warranted. 771# (server resources, latency, bandwidth), so this hack is warranted.
600# 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
601sub send_mapinfo { 773sub send_mapinfo {
602 my ($self, $data, $cb) = @_; 774 my ($self, $data, $cb) = @_;
603 775
604 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)$%) {
… …
629} 801}
630 802
631# this method does a "flood fill" into every tile direction 803# this method does a "flood fill" into every tile direction
632# it assumes that tiles are arranged in a rectangular grid, 804# it assumes that tiles are arranged in a rectangular grid,
633# 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.
634# failure to comply are harmless and result in display errors 806# failure to comply is harmless and results in display errors
635# at worst. 807# at worst.
636sub flood_fill { 808sub flood_fill {
637 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 809 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
638 810
639 # the server does not allow map paths > 6 811 # the server does not allow map paths > 6
… …
675 return if $mode ne "spatial"; 847 return if $mode ne "spatial";
676 848
677 $x += $self->{map}->ox; 849 $x += $self->{map}->ox;
678 $y += $self->{map}->oy; 850 $y += $self->{map}->oy;
679 851
680 $self->load_map ($hash, $x, $y) 852 $self->load_map ($hash, $x, $y, $w, $h)
681 unless $self->{neigh_map}{$hash}[5]++;#d# 853 unless $self->{neigh_map}{$hash}[5]++;#d#
682 854
683 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 855 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
684 856
685 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 857 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 865 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694 866
695 $self->flush_map; 867 $self->flush_map;
696 868
697 ++$self->{map_change_gen}; 869 ++$self->{map_change_gen};
870 $self->{map_cache_old} = delete $self->{map_cache};
698 871
699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 872 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700 873
701 my $mapmapw = $self->{mapmap}->{w}; 874 my $mapmapw = $self->{mapmap}->{w};
702 my $mapmaph = $self->{mapmap}->{h}; 875 my $mapmaph = $self->{mapmap}->{h};
… …
714 $self->{map_info} = [$hash, $x, $y, $w, $h]; 887 $self->{map_info} = [$hash, $x, $y, $w, $h];
715 888
716 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 889 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
717 $::STATWIDS->{map}->set_text ("Map: " . $map); 890 $::STATWIDS->{map}->set_text ("Map: " . $map);
718 891
719 $self->load_map ($hash, $x, $y); 892 $self->load_map ($hash, $x, $y, $w, $h);
720 $self->flood_fill (0, 0, 0, "", $hash, $flags); 893 $self->flood_fill (0, 0, 0, "", $hash, $flags);
721} 894}
722 895
723sub face_find { 896sub face_find {
724 my ($self, $facenum, $face, $cb) = @_; 897 my ($self, $facenum, $face, $cb) = @_;
725 898
726 if ($face->{type} == 0) { # FT_FACE 899 if ($face->{type} == 0) { # FT_FACE
727 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 900 my $id = DC::DB::get_tile_id_sync $face->{name};
728 901
729 $face->{id} = $id; 902 $face->{id} = $id;
730 $self->{faceid}[$facenum] = $id;
731
732 $self->{map}->set_tileid ($facenum => $id); 903 $self->{map}->set_tileid ($facenum => $id);
733 904
734 CFPlus::DB::get tilecache => $id, $cb; 905 DC::DB::get tilecache => $id, $cb;
735 906
736 } elsif ($face->{type} & 1) { # with metadata 907 } 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; 908 DC::DB::get res_meta => $face->{name}, $cb;
909
910 } else { # no metadata
911 DC::DB::get res_data => $face->{name}, $cb;
739 } 912 }
740} 913}
741 914
742sub face_update { 915sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 916 my ($self, $facenum, $face, $changed) = @_;
744 917
745 if ($face->{type} == 0) { # FT_FACE 918 if ($face->{type} == 0) {
919 # image, FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 920 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 921 if $changed;
748 922
749 $self->set_texture ($face->{id} => delete $face->{data}); 923 $self->have_tile ($face->{id}, delete $face->{data});
750 924
751 } elsif ($face->{type} & 1) { # split metadata 925 } elsif ($face->{type} & 1) {
752 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;
753 940
754 if ($face->{type} == 3) { # FT_MUSIC 941 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub { 942 &::audio_music_push ($facenum);
756 $self->{music_meta}{$facenum} = $face; 943 } elsif ($face->{type} == 5) { # FT_SOUND
757 944 &::audio_sound_push ($facenum);
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 }; 945 }
763 }
764 946
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 { 947 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 948 # flat resource case, FT_RSRC
779 $cb->(); 949 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
780 } 950 if $changed;
951 }
952
953 if (my $cbs = $self->{face_cb}{$facenum}) {
954 $_->($face, $changed) for @$cbs;
781 } 955 }
782} 956}
783 957
784sub smooth_update { 958sub smooth_update {
785 my ($self, $facenum, $face) = @_; 959 my ($self, $facenum, $face) = @_;
786 960
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 961 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 962}
789 963
790sub set_texture { 964sub have_tile {
791 my ($self, $id, $data) = @_; 965 my ($self, $tile, $data) = @_;
792 966
793 return unless $self->{map}; 967 return unless $self->{map};
794 968
795 $self->{texture}[$id] = my $tex = 969 my $tex = $self->{texture}[$tile] ||=
796 new_from_image CFPlus::Texture 970 new DC::Texture
971 tile => $tile,
972 image => $data, delete_image => 1,
797 $data, minify => 1, mipmap => 1; 973 minify => 1, mipmap => 1;
798 974
799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 975 if (my $cbs = delete $self->{tile_cb}{$tile}) {
800 $self->{map_widget}->update; 976 $_->($tex) for @$cbs;
801 977 }
802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803} 978}
804 979
805sub connect_face_update { 980# call in non-void context registers a temporary
981# hook with handle, otherwise its permanent
982sub on_face_change {
806 my ($self, $id, $cb) = @_; 983 my ($self, $num, $cb) = @_;
807 984
808 push @{$self->{face_cb}{$id}}, $cb; 985 push @{$self->{face_cb}{$num}}, $cb;
809 986
810 CFPlus::guard { 987 defined wantarray
988 ? DC::guard {
811 @{$self->{face_cb}{$id}} 989 @{$self->{face_cb}{$num}}
812 = grep $_ != $cb, 990 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}}; 991 @{$self->{face_cb}{$num}};
814 } 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)
815} 1009}
816 1010
817sub sound_play { 1011sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 1012 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 1013
820 $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
821} 1016}
822 1017
823my $LAST_QUERY; # server is stupid, stupid, stupid 1018my $LAST_QUERY; # server is stupid, stupid, stupid
824 1019
825sub query { 1020sub query {
… …
833 1028
834sub sanitise_xml($) { 1029sub sanitise_xml($) {
835 local $_ = shift; 1030 local $_ = shift;
836 1031
837 # we now weed out all tags we do not support 1032 # we now weed out all tags we do not support
838 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
839 # now all entities 1038 # now all entities
840 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;
841 1040
842 # handle some elements 1041 # handle some elements
843 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1042 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
844 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+$//;
845 1046
846 $_ 1047 $_
847} 1048}
848 1049
849our %NAME_TO_COLOR = ( 1050our %NAME_TO_COLOR = (
… …
890 $self->{$type} = $text; 1091 $self->{$type} = $text;
891 } else { 1092 } else {
892 $self->logprint ("msg: ", $text); 1093 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 1094 return if $color < 0; # negative color == ignore if not understood
894 1095
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1096 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
896 1097
897 ## 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
898 # no longer neecssary with TRT servers 1099 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1100 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 1101
901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1102 ::message ({
902 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.
903 1115
904 $self->{statusbox}->add ($text, 1116 $self->{statusbox}->add ($text,
905 group => $text, 1117 group => $text,
906 fg => $fg, 1118 fg => $fg,
907 timeout => $color >= 2 ? 180 : 10, 1119 timeout => $color >= 2 ? 180 : 10,
908 tooltip_font => $::FONT_FIXED, 1120 tooltip_font => $::FONT_FIXED,
909 ); 1121 ) if $type eq "info";
910 } 1122 }
911} 1123}
912 1124
913sub spell_add { 1125sub spell_add {
914 my ($self, $spell) = @_; 1126 my ($self, $spell) = @_;
… …
918 $spell->{message} =~ s/\n+$//; 1130 $spell->{message} =~ s/\n+$//;
919 $spell->{message} ||= "Server did not provide a description for this spell."; 1131 $spell->{message} ||= "Server did not provide a description for this spell.";
920 1132
921 $::SPELL_LIST->add_spell ($spell); 1133 $::SPELL_LIST->add_spell ($spell);
922 1134
923 $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});
924 $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});
925} 1137}
926 1138
927sub spell_delete { 1139sub spell_delete {
928 my ($self, $spell) = @_; 1140 my ($self, $spell) = @_;
929 1141
… …
940sub addme_success { 1152sub addme_success {
941 my ($self) = @_; 1153 my ($self) = @_;
942 1154
943 my %skill_help; 1155 my %skill_help;
944 1156
945 for my $node (CFPlus::Pod::find skill_description => "*") { 1157 for my $node (DC::Pod::find skill_description => "*") {
946 my (undef, @par) = CFPlus::Pod::section_of $node; 1158 my (undef, @par) = DC::Pod::section_of $node;
947 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1159 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
948 }; 1160 };
949 1161
950 for my $skill (values %{$self->{skill_info}}) { 1162 for my $skill (values %{$self->{skill_info}}) {
951 $self->{map_widget}->add_command ("ready_skill $skill", 1163 $self->{map_widget}->add_command ("ready_skill $skill",
952 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1164 (DC::asxml "Ready the skill '$skill'\n\n")
953 . $skill_help{$skill}); 1165 . $skill_help{$skill});
954 $self->{map_widget}->add_command ("use_skill $skill", 1166 $self->{map_widget}->add_command ("use_skill $skill",
955 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1167 (DC::asxml "Immediately use the skill '$skill'\n\n")
956 . $skill_help{$skill}); 1168 . $skill_help{$skill});
957 } 1169 }
958} 1170}
959 1171
960sub eof { 1172sub eof {
… …
963 $self->{map_widget}->clr_commands; 1175 $self->{map_widget}->clr_commands;
964 1176
965 ::stop_game (); 1177 ::stop_game ();
966} 1178}
967 1179
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 { 1180sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1181 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 1182 return unless $::CONN;
1005 1183
1006 $::FLOORBOX->clear; 1184 $::FLOORBOX->clear;
1007 1185
1008 my @add; 1186 my @add;
1009 1187
1010 my $row; 1188 my $row;
1011 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;
1012 if ($row < 6) { 1191 if ($row < 6) {
1013 local $_->{face_widget}; # hack to force recreation of widget 1192 local $_->{face_widget}; # hack to force recreation of widget
1014 local $_->{desc_widget}; # hack to force recreation of widget 1193 local $_->{desc_widget}; # hack to force recreation of widget
1015 CFPlus::Item::update_widgets $_; 1194 DC::Item::update_widgets $_;
1016 1195
1017 push @add, 1196 push @add,
1018 0, $row, $_->{face_widget}, 1197 0, $row, $_->{face_widget},
1019 1, $row, $_->{desc_widget}; 1198 1, $row, $_->{desc_widget};
1020 1199
1021 $row++; 1200 $row++;
1022 } else { 1201 } else {
1023 push @add, 1, $row, new CFPlus::UI::Button 1202 push @add, 1, $row, new DC::UI::Button
1024 text => "More...", 1203 text => "More...",
1025 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1204 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1026 ; 1205 ;
1027 last; 1206 last;
1028 } 1207 }
1029 } 1208 }
1030 if ($::CONN->{open_container}) { 1209 if ($::CONN->{open_container}) {
1031 push @add, 1, $row++, new CFPlus::UI::Button 1210 push @add, 1, $row++, new DC::UI::Button
1032 text => "Close container", 1211 text => "Close container",
1033 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1212 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1034 ; 1213 ;
1035 } 1214 }
1036 1215
1037 $::FLOORBOX->add_at (@add); 1216 $::FLOORBOX->add_at (@add);
1038 }); 1217 });
1039 1218
1040 $::WANT_REFRESH++; 1219 $::WANT_REFRESH = 1;
1041} 1220}
1042 1221
1043sub set_opencont { 1222sub set_opencont {
1044 my ($conn, $tag, $name) = @_; 1223 my ($conn, $tag, $name) = @_;
1045 $conn->{open_container} = $tag; 1224 $conn->{open_container} = $tag;
1046 update_floorbox; 1225 update_floorbox;
1047 1226
1048 $::INV_RIGHT_HB->clear (); 1227 $::INVR_HB->clear;
1049 $::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);
1050 1229
1051 if ($tag != 0) { # Floor isn't closable, is it? 1230 if ($tag != 0) { # Floor isn't closable, is it?
1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1231 $::INVR_HB->add (new DC::UI::Button
1053 text => "Close container", 1232 text => "Close container",
1054 tooltip => "Close the currently open container (if one is open)", 1233 tooltip => "Close the currently open container (if one is open)",
1055 on_activate => sub { 1234 on_activate => sub {
1056 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1235 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1057 if $tag != 0; 1236 if $tag != 0;
1058 #if $CONN->{open_container} != 0;
1059 0 1237 0
1060 }, 1238 },
1061 ); 1239 );
1062 } 1240 }
1063 1241
… …
1065} 1243}
1066 1244
1067sub update_containers { 1245sub update_containers {
1068 my ($self) = @_; 1246 my ($self) = @_;
1069 1247
1070 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1248 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1071 my $todo = delete $self->{update_container} 1249 my $todo = delete $self->{update_container}
1072 or return; 1250 or return;
1073 1251
1074 for my $tag (keys %$todo) { 1252 for my $tag (keys %$todo) {
1075 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1253 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1110} 1288}
1111 1289
1112sub item_update { 1290sub item_update {
1113 my ($self, $item) = @_; 1291 my ($self, $item) = @_;
1114 1292
1115 #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";
1116 1294
1117 CFPlus::Item::update_widgets $item; 1295 DC::Item::update_widgets $item;
1118 1296
1119 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1297 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1120 set_opencont ($::CONN, 0, "Floor"); 1298 set_opencont ($::CONN, 0, "Floor");
1121 1299
1122 } elsif ($item->{flags} & F_OPEN) { 1300 } elsif ($item->{flags} & F_OPEN) {
1123 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1301 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1124 1302
1125 } else { 1303 } else {
1126 $self->{update_container}{$item->{container}}++; 1304 $self->{update_container}{$item->{container}}++;
1127 $self->update_containers; 1305 $self->update_containers;
1128 } 1306 }
… …
1139 1317
1140 my $weight = .001 * $self->{player}{weight}; 1318 my $weight = .001 * $self->{player}{weight};
1141 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1319 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1142 1320
1143 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1321 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1144 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1322 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1145 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1323 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1146} 1324}
1147 1325
1148sub update_server_info { 1326sub update_server_info {
1149 my ($self) = @_; 1327 my ($self) = @_;
… …
1157 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1335 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1158 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1336 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1159 . "editing support $yesno[!!$self->{editor_support}]\n" 1337 . "editing support $yesno[!!$self->{editor_support}]\n"
1160 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1338 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1161 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1339 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1340 . "client support $yesno[$self->{cfplus_ext} > 0]"
1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1341 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1164 . "map size $self->{mapw}×$self->{maph}\n" 1342 . "map size $self->{mapw}×$self->{maph}\n"
1165 ); 1343 );
1166 1344
1167} 1345}
… …
1187 0 1365 0
1188 }); 1366 });
1189 1367
1190 $self->update_server_info; 1368 $self->update_server_info;
1191 1369
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; 1370 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1195 $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#
1196} 1375}
1197 1376
1198sub lookat { 1377sub lookat {
1199 my ($self, $x, $y) = @_; 1378 my ($self, $x, $y) = @_;
1200 1379
… …
1202 $self->send_ext_req (lookat => $x, $y, sub { 1381 $self->send_ext_req (lookat => $x, $y, sub {
1203 my (%msg) = @_; 1382 my (%msg) = @_;
1204 1383
1205 if (exists $msg{npc_dialog}) { 1384 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1385 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1386 $self->{npc_dialog} = new DC::NPCDialog::
1208 token => $msg{npc_dialog}, 1387 token => $msg{npc_dialog},
1209 title => "$msg{npc_dialog}[0] (NPC)", 1388 title => "$msg{npc_dialog}[0] (NPC)",
1210 conn => $self, 1389 conn => $self,
1211 ; 1390 ;
1212 } 1391 }
… …
1225 $self->SUPER::destroy; 1404 $self->SUPER::destroy;
1226 1405
1227 %$self = (); 1406 %$self = ();
1228} 1407}
1229 1408
1230package CFPlus::NPCDialog; 1409package DC::NPCDialog;
1231 1410
1232our @ISA = 'CFPlus::UI::Toplevel'; 1411our @ISA = 'DC::UI::Toplevel';
1233 1412
1234sub new { 1413sub new {
1235 my $class = shift; 1414 my $class = shift;
1236 1415
1237 my $self = $class->SUPER::new ( 1416 my $self = $class->SUPER::new (
… …
1244 kw => { hi => 0, yes => 0, no => 0 }, 1423 kw => { hi => 0, yes => 0, no => 0 },
1245 has_close_button => 1, 1424 has_close_button => 1,
1246 @_, 1425 @_,
1247 ); 1426 );
1248 1427
1249 CFPlus::weaken (my $this = $self); 1428 DC::weaken (my $this = $self);
1250 1429
1251 $self->connect (delete => sub { $this->destroy; 1 }); 1430 $self->connect (delete => sub { $this->destroy; 1 });
1252 1431
1253 # better use a pane... 1432 # better use a pane...
1254 $self->add (my $hbox = new CFPlus::UI::HBox); 1433 $self->add (my $hbox = new DC::UI::HBox);
1255 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1434 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1256 1435
1257 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1436 $hbox->add (my $vbox = new DC::UI::VBox);
1258 1437
1259 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1438 $vbox->add (new DC::UI::Label text => "Message Entry:");
1260 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1439 $vbox->add ($self->{entry} = new DC::UI::Entry
1261 tooltip => "#npc_message_entry", 1440 tooltip => "#npc_message_entry",
1262 on_activate => sub { 1441 on_activate => sub {
1263 my ($entry, $text) = @_; 1442 my ($entry, $text) = @_;
1264 1443
1265 return unless $text =~ /\S/; 1444 return unless $text =~ /\S/;
… …
1269 1448
1270 0 1449 0
1271 }, 1450 },
1272 ); 1451 );
1273 1452
1274 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1453 $vbox->add ($self->{options} = new DC::UI::VBox);
1275 1454
1276 $self->{bye_button} = new CFPlus::UI::Button 1455 $self->{bye_button} = new DC::UI::Button
1277 text => "Bye (close)", 1456 text => "Bye (close)",
1278 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.",
1279 on_activate => sub { $this->destroy; 1 }, 1458 on_activate => sub { $this->destroy; 1 },
1280 ; 1459 ;
1281 1460
… …
1300}; 1479};
1301 1480
1302sub update_options { 1481sub update_options {
1303 my ($self) = @_; 1482 my ($self) = @_;
1304 1483
1305 CFPlus::weaken $self; 1484 DC::weaken $self;
1306 1485
1307 $self->{options}->clear; 1486 $self->{options}->clear;
1308 $self->{options}->add ($self->{bye_button}); 1487 $self->{options}->add ($self->{bye_button});
1309 1488
1310 for my $kw (sort keys %{ $self->{kw} }) { 1489 for my $kw (sort keys %{ $self->{kw} }) {
1311 $self->{options}->add (new CFPlus::UI::Button 1490 $self->{options}->add (new DC::UI::Button
1312 text => $kw, 1491 text => $kw,
1313 on_activate => sub { 1492 on_activate => sub {
1314 $self->send ($kw); 1493 $self->send ($kw);
1315 0 1494 0
1316 }, 1495 },
… …
1319} 1498}
1320 1499
1321sub feed { 1500sub feed {
1322 my ($self, $type, @arg) = @_; 1501 my ($self, $type, @arg) = @_;
1323 1502
1324 CFPlus::weaken $self; 1503 DC::weaken $self;
1325 1504
1326 if ($type eq "update") { 1505 if ($type eq "update") {
1327 my (%info) = @arg; 1506 my (%info) = @arg;
1328 1507
1329 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1508 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1330 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1509 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1331 1510
1332 if (exists $info{msg}) { 1511 if (exists $info{msg}) {
1333 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1512 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} }; 1513 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1335 my @link; 1514 my @link;
1336 $text =~ s{ 1515 $text =~ s{
1337 ($match) 1516 ($match)
1338 }{ 1517 }{
1339 my $kw = $1; 1518 my $kw = $1;
1340 1519
1341 push @link, new CFPlus::UI::Label 1520 push @link, new DC::UI::Label
1342 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1521 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1343 can_hover => 1, 1522 can_hover => 1,
1344 can_events => 1, 1523 can_events => 1,
1345 padding_x => 0, 1524 padding_x => 0,
1346 padding_y => 0, 1525 padding_y => 0,
… …
1364} 1543}
1365 1544
1366sub send { 1545sub send {
1367 my ($self, $msg) = @_; 1546 my ($self, $msg) = @_;
1368 1547
1369 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1548 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1370 $self->{textview}->scroll_to_bottom; 1549 $self->{textview}->scroll_to_bottom;
1371 1550
1372 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1551 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1373} 1552}
1374 1553

Diff Legend

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