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.100 by root, Tue Apr 10 11:12:53 2007 UTC vs.
Revision 1.196 by root, Thu May 8 21:30:23 2008 UTC

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

Diff Legend

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