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.112 by root, Tue Jul 10 16:25:16 2007 UTC vs.
Revision 1.183 by root, Wed Dec 26 21:03:21 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, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1, 24 widget => 1,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52
53 $self->connect_ext (event_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
67 }
68 });
69 50
70 $self->{json_coder} 51 $self->{json_coder}
71 ->convert_blessed 52 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
73 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
74 }); 61 });
75 62
76 $self->connect_ext (ws_n => sub { 63 # destroy widgets on logout
77 my ($arg) = @_;
78
79 $self->{widgetset}{$arg{id}} = {
80 w => {},
81 };
82 });
83
84 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_;
86
87 my $ws = delete $self->{widgetset}{$arg{id}}
88 or return;
89
90 $_->destroy
91 for values %{$ws->{w}};
92 });
93
94 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_;
96
97 my $args = $arg->{args} || {};
98
99 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub {
101 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
103
104 1
105 };
106 }
107
108 if (my $widget = eval {
109 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new (
111 %$args,
112 s_ws => $arg->{ws},
113 s_id => $arg->{id},
114 )
115 }
116 ) {
117 $self->{widget}{$arg->{id}}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
119 = $widget;
120
121 $widget->connect (on_destroy => sub {
122 my ($widget) = @_;
123
124 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 });
127 } else {
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
130 }
131 });
132
133 $self->connect_ext (w_c => sub {
134 my ($arg) = @_;
135
136 my $w = $self->{widget}{$arg->{id}}
137 or return;
138 my $m = $arg->{name};
139
140 my $a = $arg->{args} || [];
141
142 if (exists $arg->{rid}) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
144 } else {
145 $w->$m (@$a);
146 }
147 });
148
149 $self->connect_ext (w_s => sub {
150 my ($arg) = @_;
151
152 my $w = $self->{widget}{$arg->{id}}
153 or return;
154
155 $w->{$arg->{name}} = $arg->{value};
156 });
157
158 $self->connect_ext (w_g => sub {
159 my ($arg) = @_;
160
161 my $w = $self->{widget}{$arg->{id}}
162 or return;
163
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
165 });
166
167 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 66 $_->destroy
170 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
171 } 68 }
… …
173 70
174 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
175 for @cmd_help; 72 for @cmd_help;
176 73
177 { 74 {
178 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
179 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
180 $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}});
181 } 78 }
182 79
183 { 80 {
184 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
185 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
186 $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}});
187 } 84 }
188 85
189 $self->{open_container} = 0; 86 $self->{open_container} = 0;
190 87
… …
192 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
193 90
194 $self 91 $self
195} 92}
196 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->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want;
109
110 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_;
112
113 $self->register_face_handler ($exp_table, sub {
114 my ($face) = @_;
115
116 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
117 $_->() for values %{ $self->{on_exp_update} || {} };
118 });
119
120 ()
121 });
122
123 if (my $ts = $cap{tileset}) {
124 if (my ($default) = grep $_->[2] & 1, @$ts) {
125 $self->{tileset} = $default;
126 $self->{tilesize} = $default->[3];
127 $self->setup_req (tileset => $default->[0]);
128
129 my $w = int $self->{mapw} * 32 / $self->{tilesize};
130 my $h = int $self->{maph} * 32 / $self->{tilesize};
131
132 $self->setup_req (mapsize => "${w}x${h}");
133 }
134 }
135}
136
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_;
146
147 $widget ||= new DC::UI::Bin;
148
149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget;
151
152 if ($ws) {
153 $widget->{s_ws} = $ws;
154 $self->{widgetset}{$ws}{w}{$id} = $widget;
155 }
156
157 $widget->connect (on_destroy => sub {
158 my ($widget) = @_;
159
160 delete $self->{widget}{$widget->{s_id}};
161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
162 if exists $widget->{s_ws};
163 });
164}
165
166# widgetset new
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
172 };
173}
174
175# widgetset destroy
176sub ext_ws_d {
177 my ($self, $id) = @_;
178
179 my $ws = delete $self->{widgetset}{$id}
180 or return;
181
182 $_->destroy
183 for values %{$ws->{w}};
184}
185
186# widgetset create
187sub ext_ws_c {
188 my ($self, $ws, $id, $class, $args) = @_;
189
190 $self->widget_associate (
191 $ws, $id => scalar eval {
192 local $SIG{__DIE__};
193 "DC::UI::$class"->new (%$args)
194 }
195 );
196}
197
198# widgetset associate
199sub ext_ws_a {
200 my ($self, %ass) = @_;
201
202 # everything that has a name, wether conceivably useful or not
203 my %wkw = (
204 root => $DC::UI::ROOT,
205 tooltip => $DC::UI::TOOLTIP,
206
207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR,
211 login_button => $::LOGIN_BUTTON,
212 quit_dialog => $::QUIT_DIALOG,
213 host_entry => $::HOST_ENTRY,
214 metaserver => $::METASERVER,
215 server_info => $::SERVER_INFO,
216
217 setup_dialog => $::SETUP_DIALOG,
218 setup_notebook => $::SETUP_NOTEBOOK,
219 setup_server => $::SETUP_SERVER,
220 setup_keyboard => $::SETUP_KEYBOARD,
221
222 pl_notebook => $::PL_NOTEBOOK,
223 pl_window => $::PL_WINDOW,
224 inventory_page => $::INVENTORY_PAGE,
225 stats_page => $::STATS_PAGE,
226 skill_page => $::SKILL_PAGE,
227 spell_page => $::SPELL_PAGE,
228 spell_list => $::SPELL_LIST,
229
230 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW,
233 statusbox => $::SDTATUSBOX,
234
235 inv => $::INV,
236 invr => $::INVR,
237 invr_hb => $::INVR_HB,
238 );
239
240 while (my ($id, $name) = each %ass) {
241 $self->widget_associate (undef, $id => $wkw{$name});
242 }
243}
244
245# widget call
246sub ext_w_c {
247 my ($self, $id, $rcb, $method, @args) = @_;
248
249 my $w = $self->{widget}{$id}
250 or return;
251
252 if ($rcb) {
253 $rcb->($w->$method (@args));
254 } else {
255 $w->$method (@args);
256 }
257}
258
259# widget set
260sub ext_w_s {
261 my ($self, $id, $attr) = @_;
262
263 my $w = $self->{widget}{$id}
264 or return;
265
266 for (my $i = 0; $i < $#$attr; $i += 2) {
267 my ($member, $value) = @$attr[$i, $i+1];
268 if (defined $value) {
269 $w->{$member} = $value;
270 } else {
271 delete $w->{$member};
272 }
273 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
274 }
275}
276
277# widget get
278sub ext_w_g {
279 my ($self, $id, $rid, @attr) = @_;
280
281 my $w = $self->{widget}{$id}
282 or return;
283
284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
285}
286
287# message window
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
295
197sub logprint { 296sub logprint {
198 my ($self, @a) = @_; 297 my ($self, @a) = @_;
199 298
200 $self->{log_fh} ||= do { 299 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
201 my $path = "$Crossfire::VARDIR/log.$self->{host}";
202
203 open my $fh, ">>:utf8", $path
204 or die "Couldn't open logfile $path: $!";
205
206 $fh->autoflush (1);
207
208 $fh;
209 };
210
211 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
212
213 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
214 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
215
216 print {$self->{log_fh}} "$ts ", @a, "\n";
217} 300}
218 301
219sub _stat_numdiff { 302sub _stat_numdiff {
220 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
221 304
… …
305 388
306 if ( 389 if (
307 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
308 ) { 391 ) {
309 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
310 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
311 } 394 }
312 395
313 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
314 397
315 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
354 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
355 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
356 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
357 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
358 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 441 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
442 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
359 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
360 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
361 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
362 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
363 447
… …
381 for keys %RES_TBL; 465 for keys %RES_TBL;
382 466
383 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
384 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
385 469
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 470 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
471 map [$_, $self->{skill_info}{$_}],
472 grep exists $stats->{$_},
473 @skills;
474
475 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
476 $self->{stat_order} = join ",", map $_->[0], @order;
477
387 $sktbl->clear; 478 $sktbl->clear;
388 479
480 my $sw = $self->{skillwid}{""} ||= [
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 481 0, 0, (new DC::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 482 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new DC::UI::Label text => "Progress", align => 0),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 484 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 4, 0, (new DC::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 486 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new DC::UI::Label text => "Progress", align => 0),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
489 ];
490
491 my @add = @$sw;
395 492
396 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
397 494
398 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
399 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
400 497
401 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
402 for ( 499 for (@order) {
403 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
404 map [$_, $self->{skill_info}{$_}],
405 grep exists $stats->{$_},
406 @skills
407 ) {
408 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
409 501
410 my $spell_cb = sub { 502 my $spell_cb = sub {
411 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
412 504
413 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
414 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
415 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
416 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
417 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
418 my $shortname = CFPlus::shorten $name, 14; 510 my $shortname = DC::shorten $name, 14;
419 (new CFPlus::UI::Menu 511 (new DC::UI::Menu
420 items => [ 512 items => [
421 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 513 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
422 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 514 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
423 ], 515 ],
424 )->popup ($ev); 516 )->popup ($ev);
425 } else { 517 } else {
426 return 0; 518 return 0;
427 } 519 }
428 520
429 1 521 1
430 }; 522 };
431 523
432 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new DC::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
434 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 528
529 # level
530 (new DC::UI::Label
435 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532
533 # progress
534 (new DC::UI::ExperienceProgress),
535
536 # label
436 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
437 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 538 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
541 push @add,
542 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1],
544 $x * 4 + 2, $y, $sw->[2],
545 $x * 4 + 3, $y, $sw->[3],
546 ;
438 547
439 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
440 } 549 }
441 }
442 550
443 for (grep exists $stats->{$_}, @skills) { 551 $sktbl->add_at (@add);
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
446 } 552 }
447}
448 553
449sub macro_send { 554 for (@order) {
450 my ($self, $macro) = @_; 555 my ($idx, $name) = @$_;
556 my $val = $stats->{$idx};
451 557
452 for my $cmd (@{ $macro->{action} }) { 558 next if $prev->{$idx}[1] eq $val->[1];
453 $self->send_command ($cmd); 559
560 my $sw = $self->{skillwid}{$idx};
561 $sw->[0]->set_text (::formsep ($val->[1]));
562 $sw->[1]->set_text ($val->[0] * 1);
563 $sw->[2]->set_value (@$val);
564
565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
566 $::GAUGES->{sklprg}->set_value (@$val);
454 } 567 }
455} 568}
456 569
457sub user_send { 570sub user_send {
458 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
460 $self->{record}->($command) 573 $self->{record}->($command)
461 if $self->{record}; 574 if $self->{record};
462 575
463 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
464 $self->send_command ($command); 577 $self->send_command ($command);
465 ::status ($command);
466} 578}
467 579
468sub record { 580sub record {
469 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
470 582
… …
478} 590}
479 591
480sub feed_map1a { 592sub feed_map1a {
481 my ($self, $data) = @_; 593 my ($self, $data) = @_;
482 594
483 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 595 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
596 my $delay;
597
598 for my $tile (@$missing) {
599 next if $self->{delay}{$tile};
600
601 $delay = 1;
602
603 if (my $tex = $::CONN->{texture}[$tile]) {
604 $tex->upload;
605 } else {
606 $self->{delay}{$tile} = 1;
607
608 # we assume the face is in-flight and will eventually come
609 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile};
611 $_[0]->upload;
612 };
613 }
614 }
615
616 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
618 EV::once undef, 0, 0.03, sub {
619 $self->{map_widget}->update
620 if $self->{map_widget};
621 };
622 } else {
484 $self->{map_widget}->update; 623 $self->{map_widget}->update;
624 }
485} 625}
486 626
487sub magicmap { 627sub magicmap {
488 my ($self, $w, $h, $x, $y, $data) = @_; 628 my ($self, $w, $h, $x, $y, $data) = @_;
489 629
… …
496 my $map_info = delete $self->{map_info} 636 my $map_info = delete $self->{map_info}
497 or return; 637 or return;
498 638
499 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
500 640
501 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data;
502 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 643 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
503 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
504} 644}
505 645
506sub map_clear { 646sub map_clear {
507 my ($self) = @_; 647 my ($self) = @_;
508 648
… …
514} 654}
515 655
516sub bg_fetch { 656sub bg_fetch {
517 my ($self) = @_; 657 my ($self) = @_;
518 658
519 my $id; 659 my $tile;
520 660
521 do { 661 do {
522 $id = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
523 or return; 663 or return;
524 } while $self->{texture}[$id]; 664 } while $self->{texture}[$tile];
525 665
526 CFPlus::DB::get tilecache => $id, sub { 666 DC::DB::get tilecache => $tile, sub {
527 my ($data) = @_; 667 my ($data) = @_;
528 668
529 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
530 670
531 $self->set_texture ($id => $data)
532 if defined $data; 671 if (defined $data) {
672 $self->have_tile ($tile, $data);
673 $self->{texture}[$tile]->upload;
674 }
533 675
534 $self->bg_fetch; 676 $self->bg_fetch;
535 }; 677 };
536} 678}
537 679
538sub load_map($$$) { 680sub load_map($$$) {
539 my ($self, $hash, $x, $y) = @_; 681 my ($self, $hash, $x, $y) = @_;
540 682
541 my $gen = $self->{map_change_gen}; 683 my $gen = $self->{map_change_gen};
542 684
543 CFPlus::DB::get $self->{mapcache} => $hash, sub { 685 my $cb = sub {
544 return unless $gen == $self->{map_change_gen}; 686 return unless $gen == $self->{map_change_gen};
545 687
546 my ($data) = @_; 688 my ($data) = @_;
547 689
548 if (defined $data) { 690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
549 $data = Compress::LZF::decompress $data; 693 my $data = Compress::LZF::decompress $data;
550 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
551 694
552 my $inprogress = @{ $self->{bg_fetch} || [] }; 695 my $inprogress = @{ $self->{bg_fetch} || [] };
553 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
554 $self->bg_fetch unless $inprogress; 697 $self->bg_fetch unless $inprogress;
555 } 698 }
556 }; 699 };
700
701 if (my $rdata = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata);
703 } else {
704 DC::DB::get $self->{mapcache} => $hash, $cb;
705 }
557} 706}
558 707
559# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
560# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
561# the right fix is to make real tiled maps with an overview file 710# the right fix is to make real tiled maps with an overview file
… …
654 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
655 804
656 $self->flush_map; 805 $self->flush_map;
657 806
658 ++$self->{map_change_gen}; 807 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new};
659 809
660 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
661 811
662 my $mapmapw = $self->{mapmap}->{w}; 812 my $mapmapw = $self->{mapmap}->{w};
663 my $mapmaph = $self->{mapmap}->{h}; 813 my $mapmaph = $self->{mapmap}->{h};
… …
682} 832}
683 833
684sub face_find { 834sub face_find {
685 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
686 836
687 my $hash = "$face->{chksum},$face->{name}"; 837 if ($face->{type} == 0) { # FT_FACE
688
689 my $id = CFPlus::DB::get_tile_id_sync $hash; 838 my $id = DC::DB::get_tile_id_sync $face->{name};
690 839
691 $face->{id} = $id; 840 $face->{id} = $id;
692 $self->{faceid}[$facenum] = $id;
693
694 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
695 842
696 CFPlus::DB::get tilecache => $id, $cb; 843 DC::DB::get tilecache => $id, $cb;
844
845 } elsif ($face->{type} & 1) { # with metadata
846 DC::DB::get res_meta => $face->{name}, $cb;
847
848 } else { # no metadata
849 DC::DB::get res_data => $face->{name}, $cb;
850 }
697} 851}
698 852
699sub face_update { 853sub face_update {
700 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
701 855
856 if ($face->{type} == 0) {
857 # image, FT_FACE
702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 858 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
703 if $changed; 859 if $changed;
704 860
705 $self->set_texture ($face->{id} => delete $face->{image}); 861 $self->have_tile ($face->{id}, delete $face->{data});
862
863 } elsif ($face->{type} & 1) {
864 # split metadata case, FT_MUSIC, FT_SOUND
865 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta;
868
869 # rely on strict ordering here and also on later fetch
870 DC::DB::put res_data => $face->{name} => $data, sub { };
871 DC::DB::put res_meta => $face->{name} => $meta, sub { };
872 }
873
874 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face);
876 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed;
878
879 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum);
883 }
884
885 } else {
886 # flat resource case, FT_RSRC
887 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed;
889 }
890
891 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs;
893 }
706} 894}
707 895
708sub smooth_update { 896sub smooth_update {
709 my ($self, $facenum, $face) = @_; 897 my ($self, $facenum, $face) = @_;
710 898
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 899 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
712} 900}
713 901
714sub set_texture { 902sub have_tile {
715 my ($self, $id, $data) = @_; 903 my ($self, $tile, $data) = @_;
716 904
717 $self->{texture}[$id] = my $tex = 905 return unless $self->{map};
718 new_from_image CFPlus::Texture 906
907 my $tex = $self->{texture}[$tile] ||=
908 new DC::Texture
909 tile => $tile,
910 image => $data, delete_image => 1,
719 $data, minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
720 912
721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
722 $self->{map_widget}->update; 914 $_->($tex) for @$cbs;
915 }
916}
917
918# call in non-void context registers a temporary
919# hook with handle, otherwise its permanent
920sub on_face_change {
921 my ($self, $num, $cb) = @_;
922
923 push @{$self->{face_cb}{$num}}, $cb;
924
925 defined wantarray
926 ? DC::guard {
927 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}};
930 }
931 : ()
932}
933
934# call in non-void context registers a temporary
935# hook with handle, otherwise its permanent
936sub register_face_handler {
937 my ($self, $num, $cb) = @_;
938
939 return unless $num;
940
941 # invoke if available right now
942 $cb->($self->{face}[$num], 0)
943 unless exists $self->{face}[$num]{loading};
944
945 # future changes
946 $self->on_face_change ($num => $cb)
723} 947}
724 948
725sub sound_play { 949sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 950 my ($self, $type, $face, $dx, $dy, $vol) = @_;
727 951
728 $self->{sound_play}->($x, $y, $soundnum, $type); 952 &::audio_sound_play ($face, $dx, $dy, $vol)
953 unless $type & 1; # odd types are silent for future expansion
729} 954}
730 955
731my $LAST_QUERY; # server is stupid, stupid, stupid 956my $LAST_QUERY; # server is stupid, stupid, stupid
732 957
733sub query { 958sub query {
… …
741 966
742sub sanitise_xml($) { 967sub sanitise_xml($) {
743 local $_ = shift; 968 local $_ = shift;
744 969
745 # we now weed out all tags we do not support 970 # we now weed out all tags we do not support
746 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 971 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
972 }{
973 "&lt;"
974 }gex;
975
747 # now all entities 976 # now all entities
748 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
749 978
750 # handle some elements 979 # handle some elements
751 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
798 $self->{$type} = $text; 1027 $self->{$type} = $text;
799 } else { 1028 } else {
800 $self->logprint ("msg: ", $text); 1029 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood 1030 return if $color < 0; # negative color == ignore if not understood
802 1031
803 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1032 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
804 1033
805 ## try to create single paragraphs of multiple lines sent by the server 1034 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers 1035 # no longer neecssary with TRT servers
807 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
808 1037
809 ::message ({ fg => $fg, markup => $_ })
810 for split /\n/, $text; 1038 for (split /\n/, $text) {
1039 ::message ({
1040 fg => $fg,
1041 markup => $_,
1042 type => $type,
1043 extra => [@extra],
1044 color_flags => $color, #d# ugly, kill
1045 });
1046
1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1048 # actually, this is an ugly design. _we_ should control the channels,
1049 # not some random other widget, as the channels are clearly protocol-specific.
1050 # then we could also react to flags such as CLEAR without resorting to
1051 # hacks such as color_flags, above.
1052 }
811 1053
812 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
813 group => $text, 1055 group => $text,
814 fg => $fg, 1056 fg => $fg,
815 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
816 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
817 ); 1059 ) if $type eq "info";
818 } 1060 }
819} 1061}
820 1062
821sub spell_add { 1063sub spell_add {
822 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
… …
826 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
827 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
828 1070
829 $::SPELL_LIST->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
830 1072
831 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1073 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
832 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
833} 1075}
834 1076
835sub spell_delete { 1077sub spell_delete {
836 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
837 1079
… …
848sub addme_success { 1090sub addme_success {
849 my ($self) = @_; 1091 my ($self) = @_;
850 1092
851 my %skill_help; 1093 my %skill_help;
852 1094
853 for my $node (CFPlus::Pod::find skill_description => "*") { 1095 for my $node (DC::Pod::find skill_description => "*") {
854 my (undef, @par) = CFPlus::Pod::section_of $node; 1096 my (undef, @par) = DC::Pod::section_of $node;
855 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1097 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
856 }; 1098 };
857 1099
858 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
859 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
860 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1102 (DC::asxml "Ready the skill '$skill'\n\n")
861 . $skill_help{$skill}); 1103 . $skill_help{$skill});
862 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
863 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1105 (DC::asxml "Immediately use the skill '$skill'\n\n")
864 . $skill_help{$skill}); 1106 . $skill_help{$skill});
865 } 1107 }
866} 1108}
867 1109
868sub eof { 1110sub eof {
… …
871 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
872 1114
873 ::stop_game (); 1115 ::stop_game ();
874} 1116}
875 1117
876sub image_info {
877 my ($self, $numfaces) = @_;
878
879 $self->{num_faces} = $numfaces;
880 $self->{face_prefetch} = [1 .. $numfaces];
881 $self->face_prefetch;
882}
883
884sub face_prefetch {
885 my ($self) = @_;
886
887 return unless $::CFG->{face_prefetch};
888
889 if ($self->{num_faces}) {
890 return if @{ $self->{send_queue} || [] };
891 my $todo = @{ $self->{face_prefetch} }
892 or return;
893
894 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
895
896 $self->send ("requestinfo image_sums $face $face");
897
898 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
899 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
900 } elsif (!exists $self->{num_faces}) {
901 $self->send ("requestinfo image_info");
902
903 $self->{num_faces} = 0;
904
905 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
906 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
907 }
908}
909
910sub update_floorbox { 1118sub update_floorbox {
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 1120 return unless $::CONN;
913 1121
914 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
915 1125
916 my $row; 1126 my $row;
917 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
918 if ($row < 6) { 1128 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1131 DC::Item::update_widgets $_;
922 1132
1133 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
925 1136
926 $row++; 1137 $row++;
927 } else { 1138 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new DC::UI::Button
929 text => "More...", 1140 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1142 ;
932 last; 1143 last;
933 } 1144 }
934 } 1145 }
935 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new DC::UI::Button
937 text => "Close container", 1148 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1150 ;
940 } 1151 }
1152
1153 $::FLOORBOX->add_at (@add);
941 }); 1154 });
942 1155
943 $::WANT_REFRESH++; 1156 $::WANT_REFRESH = 1;
944} 1157}
945 1158
946sub set_opencont { 1159sub set_opencont {
947 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
948 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
949 update_floorbox; 1162 update_floorbox;
950 1163
951 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
952 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
953 1166
954 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
955 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new DC::UI::Button
956 text => "Close container", 1169 text => "Close container",
957 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
958 on_activate => sub { 1171 on_activate => sub {
959 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
960 if $tag != 0; 1173 if $tag != 0;
961 #if $CONN->{open_container} != 0;
962 0 1174 0
963 }, 1175 },
964 ); 1176 );
965 } 1177 }
966 1178
… …
968} 1180}
969 1181
970sub update_containers { 1182sub update_containers {
971 my ($self) = @_; 1183 my ($self) = @_;
972 1184
973 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1185 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
974 my $todo = delete $self->{update_container} 1186 my $todo = delete $self->{update_container}
975 or return; 1187 or return;
976 1188
977 for my $tag (keys %$todo) { 1189 for my $tag (keys %$todo) {
978 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1015sub item_update { 1227sub item_update {
1016 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
1017 1229
1018 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1019 1231
1020 CFPlus::Item::update_widgets $item; 1232 DC::Item::update_widgets $item;
1021 1233
1022 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1023 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
1024 1236
1025 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
1026 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1027 1239
1028 } else { 1240 } else {
1029 $self->{update_container}{$item->{container}}++; 1241 $self->{update_container}{$item->{container}}++;
1030 $self->update_containers; 1242 $self->update_containers;
1031 } 1243 }
… …
1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1067 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
1068 ); 1280 );
1069 1281
1070 ::setup_build_button ($self->{editor_support}->{builder_ui});
1071} 1282}
1072 1283
1073sub logged_in { 1284sub logged_in {
1074 my ($self) = @_; 1285 my ($self) = @_;
1075 1286
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
1077 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1291 $self->update_server_info;
1079 1292
1080 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1296 $self->update_server_info;
1084 1297
1085 0 1298 0
1086 }); 1299 });
1087 } 1300 }
… …
1089 0 1302 0
1090 }); 1303 });
1091 1304
1092 $self->update_server_info; 1305 $self->update_server_info;
1093 1306
1094 $self->send_command ("output-sync $::CFG->{output_sync}");
1095 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1307 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1097 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
1098} 1309}
1099 1310
1100sub buildat {
1101 my ($self, $builditem, $x, $y) = @_;
1102
1103 if ($self->{cfplus_ext}) {
1104 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1105 }
1106}
1107
1108sub lookat { 1311sub lookat {
1109 my ($self, $x, $y) = @_; 1312 my ($self, $x, $y) = @_;
1110 1313
1111 if ($self->{cfplus_ext}) { 1314 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1316 my (%msg) = @_;
1114 1317
1115 if (exists $msg->{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1319 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new DC::NPCDialog::
1118 dx => $x, 1321 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1323 conn => $self,
1122 ; 1324 ;
1123 } 1325 }
1124 }); 1326 });
1125 } 1327 }
… …
1136 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1137 1339
1138 %$self = (); 1340 %$self = ();
1139} 1341}
1140 1342
1141package CFPlus::NPCDialog; 1343package DC::NPCDialog;
1142 1344
1143our @ISA = 'CFPlus::UI::Toplevel'; 1345our @ISA = 'DC::UI::Toplevel';
1144 1346
1145sub new { 1347sub new {
1146 my $class = shift; 1348 my $class = shift;
1147 1349
1148 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
… …
1155 kw => { hi => 0, yes => 0, no => 0 }, 1357 kw => { hi => 0, yes => 0, no => 0 },
1156 has_close_button => 1, 1358 has_close_button => 1,
1157 @_, 1359 @_,
1158 ); 1360 );
1159 1361
1160 CFPlus::weaken (my $this = $self); 1362 DC::weaken (my $this = $self);
1161 1363
1162 $self->connect (delete => sub { $this->destroy; 1 }); 1364 $self->connect (delete => sub { $this->destroy; 1 });
1163 1365
1164 # better use a pane... 1366 # better use a pane...
1165 $self->add (my $hbox = new CFPlus::UI::HBox); 1367 $self->add (my $hbox = new DC::UI::HBox);
1166 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1368 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1167 1369
1168 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1370 $hbox->add (my $vbox = new DC::UI::VBox);
1169 1371
1170 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1372 $vbox->add (new DC::UI::Label text => "Message Entry:");
1171 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1373 $vbox->add ($self->{entry} = new DC::UI::Entry
1172 tooltip => "#npc_message_entry", 1374 tooltip => "#npc_message_entry",
1173 on_activate => sub { 1375 on_activate => sub {
1174 my ($entry, $text) = @_; 1376 my ($entry, $text) = @_;
1175 1377
1176 return unless $text =~ /\S/; 1378 return unless $text =~ /\S/;
… …
1180 1382
1181 0 1383 0
1182 }, 1384 },
1183 ); 1385 );
1184 1386
1185 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1387 $vbox->add ($self->{options} = new DC::UI::VBox);
1186 1388
1187 $self->{bye_button} = new CFPlus::UI::Button 1389 $self->{bye_button} = new DC::UI::Button
1188 text => "Bye (close)", 1390 text => "Bye (close)",
1189 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1190 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1191 ; 1393 ;
1192 1394
1193 $self->update_options; 1395 $self->update_options;
1194 1396
1195 $self->{id} = $self->{conn}->send_ext_req ( 1397 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1398 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1399 $this->feed (@_) if $this;
1198 ); 1400 });
1401
1402 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1403
1200 $self->{entry}->grab_focus; 1404 $self->{entry}->grab_focus;
1201 1405
1202 $self->{textview}->add_paragraph ({ 1406 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1407 fg => [1, 1, 0, 1],
… …
1209}; 1413};
1210 1414
1211sub update_options { 1415sub update_options {
1212 my ($self) = @_; 1416 my ($self) = @_;
1213 1417
1214 CFPlus::weaken $self; 1418 DC::weaken $self;
1215 1419
1216 $self->{options}->clear; 1420 $self->{options}->clear;
1217 $self->{options}->add ($self->{bye_button}); 1421 $self->{options}->add ($self->{bye_button});
1218 1422
1219 for my $kw (sort keys %{ $self->{kw} }) { 1423 for my $kw (sort keys %{ $self->{kw} }) {
1220 $self->{options}->add (new CFPlus::UI::Button 1424 $self->{options}->add (new DC::UI::Button
1221 text => $kw, 1425 text => $kw,
1222 on_activate => sub { 1426 on_activate => sub {
1223 $self->send ($kw); 1427 $self->send ($kw);
1224 0 1428 0
1225 }, 1429 },
1226 ); 1430 );
1227 } 1431 }
1228} 1432}
1229 1433
1230sub feed { 1434sub feed {
1231 my ($self, $msg) = @_; 1435 my ($self, $type, @arg) = @_;
1232 1436
1233 CFPlus::weaken $self; 1437 DC::weaken $self;
1234 1438
1235 if ($msg->{msgtype} eq "reply") { 1439 if ($type eq "update") {
1440 my (%info) = @arg;
1441
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 1444
1445 if (exists $info{msg}) {
1446 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1448 my @link;
1449 $text =~ s{
1450 ($match)
1451 }{
1452 my $kw = $1;
1453
1454 push @link, new DC::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1,
1457 can_events => 1,
1458 padding_x => 0,
1459 padding_y => 0,
1460 on_button_up => sub {
1461 $self->send ($kw);
1462 };
1463
1464 "\x{fffc}"
1465 }giex;
1466
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1467 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1468 $self->{textview}->scroll_to_bottom;
1469 }
1470
1262 $self->update_options; 1471 $self->update_options;
1263 } else { 1472 } else {
1264 $self->destroy; 1473 $self->destroy;
1265 } 1474 }
1266 1475
… …
1268} 1477}
1269 1478
1270sub send { 1479sub send {
1271 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1272 1481
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1275 1484
1276 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1277} 1486}
1278 1487
1279sub destroy { 1488sub destroy {
1280 my ($self) = @_; 1489 my ($self) = @_;
1281 1490
1282 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1491 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1283 1492
1284 if ($self->{conn}) { 1493 if ($self->{conn}) {
1285 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1494 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1286 delete $self->{conn}{npc_dialog}; 1495 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1496 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1497 }
1289 1498
1290 $self->SUPER::destroy; 1499 $self->SUPER::destroy;

Diff Legend

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