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

Diff Legend

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