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.139 by root, Sun Jul 29 18:22:34 2007 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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