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

Diff Legend

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