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.109 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.188 by elmex, Sun Jan 6 16:28:49 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %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 xwidget => 1, 24 widget => 2,
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 50
53 $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 {
54 my ($cap) = @_; 57 my ($id) = @_;
55 58 sub {
56 if (my $ts = $cap->{tileset}) { 59 $self->send_exti_msg (w_e => $id, @_);
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 } 60 }
67 }
68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 }; 61 });
76 });
77 62
78 $self->connect_ext (ws_d => sub { 63 # destroy widgets on logout
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 "CFPlus::UI::$arg->{class}"->new (
104 %$args,
105 s_ws => $arg->{ws},
106 s_id => $arg->{id},
107 )
108 }
109 ) {
110 $self->{widget}{$arg->{id}}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
112 = $widget;
113
114 $widget->connect (on_destroy => sub {
115 my ($widget) = @_;
116
117 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 });
120 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
123 }
124 });
125
126 $self->connect_ext (w_c => sub {
127 my ($arg) = @_;
128
129 my $w = $self->{widget}{$arg->{id}}
130 or return;
131 my $m = $arg->{name};
132
133 my @a = map {
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138
139 if (exists $arg->{rid}) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
141 } else {
142 $w->$m (@a);
143 }
144 });
145
146 $self->connect_ext (w_s => sub {
147 my ($arg) = @_;
148
149 my $w = $self->{widget}{$arg->{id}}
150 or return;
151
152 $w->{$arg->{name}} = $arg->{value};
153 });
154
155 $self->connect_ext (w_g => sub {
156 my ($arg) = @_;
157
158 my $w = $self->{widget}{$arg->{id}}
159 or return;
160
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
162 });
163
164 $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 {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 66 $_->destroy
167 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
168 } 68 }
… …
170 70
171 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
172 for @cmd_help; 72 for @cmd_help;
173 73
174 { 74 {
175 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
176 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
177 $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}});
178 } 78 }
179 79
180 { 80 {
181 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
182 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
183 $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}});
184 } 84 }
185 85
186 $self->{open_container} = 0; 86 $self->{open_container} = 0;
187 87
… …
189 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
190 90
191 $self 91 $self
192} 92}
193 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 message_dist => $::MESSAGE_DIST,
281 statusbox => $::SDTATUSBOX,
282
283 inv => $::INV,
284 invr => $::INVR,
285 invr_hb => $::INVR_HB,
286 );
287
288 while (my ($id, $name) = each %ass) {
289 $self->widget_associate (undef, $id => $wkw{$name});
290 }
291}
292
293# widget call
294sub ext_w_c {
295 my ($self, $id, $rcb, $method, @args) = @_;
296
297 my $w = $self->{widget}{$id}
298 or return;
299
300 if ($rcb) {
301 $rcb->($w->$method (@args));
302 } else {
303 $w->$method (@args);
304 }
305}
306
307# widget set
308sub ext_w_s {
309 my ($self, $id, $attr) = @_;
310
311 my $w = $self->{widget}{$id}
312 or return;
313
314 for (my $i = 0; $i < $#$attr; $i += 2) {
315 my ($member, $value) = @$attr[$i, $i+1];
316 if (defined $value) {
317 $w->{$member} = $value;
318 } else {
319 delete $w->{$member};
320 }
321 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
322 }
323}
324
325# widget get
326sub ext_w_g {
327 my ($self, $id, $rid, @attr) = @_;
328
329 my $w = $self->{widget}{$id}
330 or return;
331
332 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
333}
334
335# message window
336sub ext_channel_info {
337 my ($self, $info) = @_;
338 $self->{channels}->{$info->{id}} = $info;
339 $::MESSAGE_DIST->add_channel ($info);
340}
341
342#############################################################################
343
194sub logprint { 344sub logprint {
195 my ($self, @a) = @_; 345 my ($self, @a) = @_;
196 346
197 $self->{log_fh} ||= do { 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
198 my $path = "$Crossfire::VARDIR/log.$self->{host}";
199
200 open my $fh, ">>:utf8", $path
201 or die "Couldn't open logfile $path: $!";
202
203 $fh->autoflush (1);
204
205 $fh;
206 };
207
208 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
209
210 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
211 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
212
213 print {$self->{log_fh}} "$ts ", @a, "\n";
214} 348}
215 349
216sub _stat_numdiff { 350sub _stat_numdiff {
217 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
218 352
… …
302 436
303 if ( 437 if (
304 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
305 ) { 439 ) {
306 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 440 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
307 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
308 } 442 }
309 443
310 $self->update_stats_window ($stats, $prev); 444 $self->update_stats_window ($stats, $prev);
311 445
312 $self->{prev_stats} = { %$stats }; 446 $self->{prev_stats} = { %$stats };
… …
351 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 485 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
352 $::GAUGES->{food} ->set_value ($fo, $fo_m); 486 $::GAUGES->{food} ->set_value ($fo, $fo_m);
353 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 487 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
354 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 488 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
355 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 489 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
490 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
356 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 491 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
357 my $title = $stats->{+CS_STAT_TITLE}; 492 my $title = $stats->{+CS_STAT_TITLE};
358 $title =~ s/^Player: //; 493 $title =~ s/^Player: //;
359 $::STATWIDS->{title} ->set_text ("Title: " . $title); 494 $::STATWIDS->{title} ->set_text ("Title: " . $title);
360 495
… …
378 for keys %RES_TBL; 513 for keys %RES_TBL;
379 514
380 my $sktbl = $::STATWIDS->{skill_tbl}; 515 my $sktbl = $::STATWIDS->{skill_tbl};
381 my @skills = keys %{ $self->{skill_info} }; 516 my @skills = keys %{ $self->{skill_info} };
382 517
383 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 518 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
519 map [$_, $self->{skill_info}{$_}],
520 grep exists $stats->{$_},
521 @skills;
522
523 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
524 $self->{stat_order} = join ",", map $_->[0], @order;
525
384 $sktbl->clear; 526 $sktbl->clear;
385 527
528 my $sw = $self->{skillwid}{""} ||= [
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 531 2, 0, (new DC::UI::Label text => "Progress"),
532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 535 6, 0, (new DC::UI::Label text => "Progress"),
536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
537 ];
538
539 my @add = @$sw;
392 540
393 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
394 542
395 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 543 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
396 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 544 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397 545
398 my ($x, $y) = (0, 1); 546 my ($x, $y) = (0, 1);
399 for ( 547 for (@order) {
400 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
401 map [$_, $self->{skill_info}{$_}],
402 grep exists $stats->{$_},
403 @skills
404 ) {
405 my ($idx, $name) = @$_; 548 my ($idx, $name) = @$_;
406 549
407 my $spell_cb = sub { 550 my $spell_cb = sub {
408 my ($widget, $ev) = @_; 551 my ($widget, $ev) = @_;
409 552
410 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
411 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
412 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
413 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
414 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
415 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
416 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
417 items => [ 560 items => [
418 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 561 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
419 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 562 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
420 ], 563 ],
421 )->popup ($ev); 564 )->popup ($ev);
422 } else { 565 } else {
423 return 0; 566 return 0;
424 } 567 }
425 568
426 1 569 1
427 }; 570 };
428 571
429 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 572 my $sw = $self->{skillwid}{$idx} ||= [
573 # exp
574 (new DC::UI::Label
430 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 575 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
431 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 576
577 # level
578 (new DC::UI::Label
432 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 579 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
580
581 # progress
582 (new DC::UI::ExperienceProgress),
583
584 # label
433 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
434 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
587 ];
588
589 push @add,
590 $x * 4 + 0, $y, $sw->[0],
591 $x * 4 + 1, $y, $sw->[1],
592 $x * 4 + 2, $y, $sw->[2],
593 $x * 4 + 3, $y, $sw->[3],
594 ;
435 595
436 $x++ and ($x, $y) = (0, $y + 1); 596 $x++ and ($x, $y) = (0, $y + 1);
437 } 597 }
438 }
439 598
440 for (grep exists $stats->{$_}, @skills) { 599 $sktbl->add_at (@add);
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
443 } 600 }
444}
445 601
446sub macro_send { 602 for (@order) {
447 my ($self, $macro) = @_; 603 my ($idx, $name) = @$_;
604 my $val = $stats->{$idx};
448 605
449 for my $cmd (@{ $macro->{action} }) { 606 next if $prev->{$idx}[1] eq $val->[1];
450 $self->send_command ($cmd); 607
608 my $sw = $self->{skillwid}{$idx};
609 $sw->[0]->set_text (::formsep ($val->[1]));
610 $sw->[1]->set_text ($val->[0] * 1);
611 $sw->[2]->set_value (@$val);
612
613 $::GAUGES->{sklprg}->set_label ("$name %d%%");
614 $::GAUGES->{sklprg}->set_value (@$val);
451 } 615 }
452} 616}
453 617
454sub user_send { 618sub user_send {
455 my ($self, $command) = @_; 619 my ($self, $command) = @_;
… …
457 $self->{record}->($command) 621 $self->{record}->($command)
458 if $self->{record}; 622 if $self->{record};
459 623
460 $self->logprint ("send: ", $command); 624 $self->logprint ("send: ", $command);
461 $self->send_command ($command); 625 $self->send_command ($command);
462 ::status ($command);
463} 626}
464 627
465sub record { 628sub record {
466 my ($self, $cb) = @_; 629 my ($self, $cb) = @_;
467 630
… …
475} 638}
476 639
477sub feed_map1a { 640sub feed_map1a {
478 my ($self, $data) = @_; 641 my ($self, $data) = @_;
479 642
480 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 643 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
644 my $delay;
645
646 for my $tile (@$missing) {
647 next if $self->{delay}{$tile};
648
649 $delay = 1;
650
651 if (my $tex = $::CONN->{texture}[$tile]) {
652 $tex->upload;
653 } else {
654 $self->{delay}{$tile} = 1;
655
656 # we assume the face is in-flight and will eventually come
657 push @{$self->{tile_cb}{$tile}}, sub {
658 delete $self->{delay}{$tile};
659 $_[0]->upload;
660 };
661 }
662 }
663
664 if ($delay) {
665 # delay the map drawing a tiny bit in the hope of getting the missing fetched
666 EV::once undef, 0, 0.03, sub {
667 $self->{map_widget}->update
668 if $self->{map_widget};
669 };
670 } else {
481 $self->{map_widget}->update; 671 $self->{map_widget}->update;
672 }
482} 673}
483 674
484sub magicmap { 675sub magicmap {
485 my ($self, $w, $h, $x, $y, $data) = @_; 676 my ($self, $w, $h, $x, $y, $data) = @_;
486 677
… …
493 my $map_info = delete $self->{map_info} 684 my $map_info = delete $self->{map_info}
494 or return; 685 or return;
495 686
496 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
497 688
498 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
690 $self->{map_cache_new}{$hash} = \$data;
499 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
500 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
501} 692}
502 693
503sub map_clear { 694sub map_clear {
504 my ($self) = @_; 695 my ($self) = @_;
505 696
… …
511} 702}
512 703
513sub bg_fetch { 704sub bg_fetch {
514 my ($self) = @_; 705 my ($self) = @_;
515 706
516 my $id; 707 my $tile;
517 708
518 do { 709 do {
519 $id = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
520 or return; 711 or return;
521 } while $self->{texture}[$id]; 712 } while $self->{texture}[$tile];
522 713
523 CFPlus::DB::get tilecache => $id, sub { 714 DC::DB::get tilecache => $tile, sub {
524 my ($data) = @_; 715 my ($data) = @_;
525 716
526 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
527 718
528 $self->set_texture ($id => $data)
529 if defined $data; 719 if (defined $data) {
720 $self->have_tile ($tile, $data);
721 $self->{texture}[$tile]->upload;
722 }
530 723
531 $self->bg_fetch; 724 $self->bg_fetch;
532 }; 725 };
533} 726}
534 727
535sub load_map($$$) { 728sub load_map($$$) {
536 my ($self, $hash, $x, $y) = @_; 729 my ($self, $hash, $x, $y) = @_;
537 730
538 my $gen = $self->{map_change_gen}; 731 my $gen = $self->{map_change_gen};
539 732
540 CFPlus::DB::get $self->{mapcache} => $hash, sub { 733 my $cb = sub {
541 return unless $gen == $self->{map_change_gen}; 734 return unless $gen == $self->{map_change_gen};
542 735
543 my ($data) = @_; 736 my ($data) = @_;
544 737
545 if (defined $data) { 738 if (defined $data) {
739 $self->{map_cache_new}{$hash} = \$data;
740
546 $data = Compress::LZF::decompress $data; 741 my $data = Compress::LZF::decompress $data;
547 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
548 742
549 my $inprogress = @{ $self->{bg_fetch} || [] }; 743 my $inprogress = @{ $self->{bg_fetch} || [] };
550 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 744 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
551 $self->bg_fetch unless $inprogress; 745 $self->bg_fetch unless $inprogress;
552 } 746 }
553 }; 747 };
748
749 if (my $rdata = $self->{map_cache_old}{$hash}) {
750 $cb->($$rdata);
751 } else {
752 DC::DB::get $self->{mapcache} => $hash, $cb;
753 }
554} 754}
555 755
556# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
557# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
558# the right fix is to make real tiled maps with an overview file 758# the right fix is to make real tiled maps with an overview file
… …
651 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 851 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
652 852
653 $self->flush_map; 853 $self->flush_map;
654 854
655 ++$self->{map_change_gen}; 855 ++$self->{map_change_gen};
856 $self->{map_cache_old} = delete $self->{map_cache_new};
656 857
657 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 858 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
658 859
659 my $mapmapw = $self->{mapmap}->{w}; 860 my $mapmapw = $self->{mapmap}->{w};
660 my $mapmaph = $self->{mapmap}->{h}; 861 my $mapmaph = $self->{mapmap}->{h};
… …
679} 880}
680 881
681sub face_find { 882sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
683 884
684 my $hash = "$face->{chksum},$face->{name}"; 885 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
687 887
688 $face->{id} = $id; 888 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id;
690
691 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
692 890
693 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
892
893 } elsif ($face->{type} & 1) { # with metadata
894 DC::DB::get res_meta => $face->{name}, $cb;
895
896 } else { # no metadata
897 DC::DB::get res_data => $face->{name}, $cb;
898 }
694} 899}
695 900
696sub face_update { 901sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
698 903
904 if ($face->{type} == 0) {
905 # image, FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 907 if $changed;
701 908
702 $self->set_texture ($face->{id} => delete $face->{image}); 909 $self->have_tile ($face->{id}, delete $face->{data});
910
911 } elsif ($face->{type} & 1) {
912 # split metadata case, FT_MUSIC, FT_SOUND
913 if ($changed) { # new data
914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
915 $face->{data} = $meta;
916
917 # rely on strict ordering here and also on later fetch
918 DC::DB::put res_data => $face->{name} => $data, sub { };
919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
920 }
921
922 $face->{data} = $self->{json_coder}->decode ($face->{data});
923 ::add_license ($face);
924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
925 if $changed;
926
927 if ($face->{type} == 3) { # FT_MUSIC
928 &::audio_music_push ($facenum);
929 } elsif ($face->{type} == 5) { # FT_SOUND
930 &::audio_sound_push ($facenum);
931 }
932
933 } else {
934 # flat resource case, FT_RSRC
935 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
936 if $changed;
937 }
938
939 if (my $cbs = $self->{face_cb}{$facenum}) {
940 $_->($face, $changed) for @$cbs;
941 }
703} 942}
704 943
705sub smooth_update { 944sub smooth_update {
706 my ($self, $facenum, $face) = @_; 945 my ($self, $facenum, $face) = @_;
707 946
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 947 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 948}
710 949
711sub set_texture { 950sub have_tile {
712 my ($self, $id, $data) = @_; 951 my ($self, $tile, $data) = @_;
713 952
714 $self->{texture}[$id] = my $tex = 953 return unless $self->{map};
715 new_from_image CFPlus::Texture 954
955 my $tex = $self->{texture}[$tile] ||=
956 new DC::Texture
957 tile => $tile,
958 image => $data, delete_image => 1,
716 $data, minify => 1, mipmap => 1; 959 minify => 1, mipmap => 1;
717 960
718 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
719 $self->{map_widget}->update; 962 $_->($tex) for @$cbs;
963 }
964}
965
966# call in non-void context registers a temporary
967# hook with handle, otherwise its permanent
968sub on_face_change {
969 my ($self, $num, $cb) = @_;
970
971 push @{$self->{face_cb}{$num}}, $cb;
972
973 defined wantarray
974 ? DC::guard {
975 @{$self->{face_cb}{$num}}
976 = grep $_ != $cb,
977 @{$self->{face_cb}{$num}};
978 }
979 : ()
980}
981
982# call in non-void context registers a temporary
983# hook with handle, otherwise its permanent
984sub register_face_handler {
985 my ($self, $num, $cb) = @_;
986
987 return unless $num;
988
989 # invoke if available right now
990 $cb->($self->{face}[$num], 0)
991 unless exists $self->{face}[$num]{loading};
992
993 # future changes
994 $self->on_face_change ($num => $cb)
720} 995}
721 996
722sub sound_play { 997sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 998 my ($self, $type, $face, $dx, $dy, $vol) = @_;
724 999
725 $self->{sound_play}->($x, $y, $soundnum, $type); 1000 &::audio_sound_play ($face, $dx, $dy, $vol)
1001 unless $type & 1; # odd types are silent for future expansion
726} 1002}
727 1003
728my $LAST_QUERY; # server is stupid, stupid, stupid 1004my $LAST_QUERY; # server is stupid, stupid, stupid
729 1005
730sub query { 1006sub query {
… …
738 1014
739sub sanitise_xml($) { 1015sub sanitise_xml($) {
740 local $_ = shift; 1016 local $_ = shift;
741 1017
742 # we now weed out all tags we do not support 1018 # we now weed out all tags we do not support
743 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1019 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1020 }{
1021 "&lt;"
1022 }gex;
1023
744 # now all entities 1024 # now all entities
745 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
746 1026
747 # handle some elements 1027 # handle some elements
748 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
795 $self->{$type} = $text; 1075 $self->{$type} = $text;
796 } else { 1076 } else {
797 $self->logprint ("msg: ", $text); 1077 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 1078 return if $color < 0; # negative color == ignore if not understood
799 1079
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1080 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
801 1081
802 ## try to create single paragraphs of multiple lines sent by the server 1082 ## try to create single paragraphs of multiple lines sent by the server
803 # no longer neecssary with TRT servers 1083 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1084 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 1085
806 ::message ({ fg => $fg, markup => $_ })
807 for split /\n/, $text; 1086 for (split /\n/, $text) {
1087 ::message ({
1088 fg => $fg,
1089 markup => $_,
1090 type => $type,
1091 extra => [@extra],
1092 color_flags => $color, #d# ugly, kill
1093 });
1094
1095 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1096 # actually, this is an ugly design. _we_ should control the channels,
1097 # not some random other widget, as the channels are clearly protocol-specific.
1098 # then we could also react to flags such as CLEAR without resorting to
1099 # hacks such as color_flags, above.
1100 }
808 1101
809 $self->{statusbox}->add ($text, 1102 $self->{statusbox}->add ($text,
810 group => $text, 1103 group => $text,
811 fg => $fg, 1104 fg => $fg,
812 timeout => $color >= 2 ? 180 : 10, 1105 timeout => $color >= 2 ? 180 : 10,
813 tooltip_font => $::FONT_FIXED, 1106 tooltip_font => $::FONT_FIXED,
814 ); 1107 ) if $type eq "info";
815 } 1108 }
816} 1109}
817 1110
818sub spell_add { 1111sub spell_add {
819 my ($self, $spell) = @_; 1112 my ($self, $spell) = @_;
… …
823 $spell->{message} =~ s/\n+$//; 1116 $spell->{message} =~ s/\n+$//;
824 $spell->{message} ||= "Server did not provide a description for this spell."; 1117 $spell->{message} ||= "Server did not provide a description for this spell.";
825 1118
826 $::SPELL_LIST->add_spell ($spell); 1119 $::SPELL_LIST->add_spell ($spell);
827 1120
828 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1121 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
829 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1122 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
830} 1123}
831 1124
832sub spell_delete { 1125sub spell_delete {
833 my ($self, $spell) = @_; 1126 my ($self, $spell) = @_;
834 1127
… …
845sub addme_success { 1138sub addme_success {
846 my ($self) = @_; 1139 my ($self) = @_;
847 1140
848 my %skill_help; 1141 my %skill_help;
849 1142
850 for my $node (CFPlus::Pod::find skill_description => "*") { 1143 for my $node (DC::Pod::find skill_description => "*") {
851 my (undef, @par) = CFPlus::Pod::section_of $node; 1144 my (undef, @par) = DC::Pod::section_of $node;
852 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1145 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
853 }; 1146 };
854 1147
855 for my $skill (values %{$self->{skill_info}}) { 1148 for my $skill (values %{$self->{skill_info}}) {
856 $self->{map_widget}->add_command ("ready_skill $skill", 1149 $self->{map_widget}->add_command ("ready_skill $skill",
857 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1150 (DC::asxml "Ready the skill '$skill'\n\n")
858 . $skill_help{$skill}); 1151 . $skill_help{$skill});
859 $self->{map_widget}->add_command ("use_skill $skill", 1152 $self->{map_widget}->add_command ("use_skill $skill",
860 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1153 (DC::asxml "Immediately use the skill '$skill'\n\n")
861 . $skill_help{$skill}); 1154 . $skill_help{$skill});
862 } 1155 }
863} 1156}
864 1157
865sub eof { 1158sub eof {
… …
868 $self->{map_widget}->clr_commands; 1161 $self->{map_widget}->clr_commands;
869 1162
870 ::stop_game (); 1163 ::stop_game ();
871} 1164}
872 1165
873sub image_info {
874 my ($self, $numfaces) = @_;
875
876 $self->{num_faces} = $numfaces;
877 $self->{face_prefetch} = [1 .. $numfaces];
878 $self->face_prefetch;
879}
880
881sub face_prefetch {
882 my ($self) = @_;
883
884 return unless $::CFG->{face_prefetch};
885
886 if ($self->{num_faces}) {
887 return if @{ $self->{send_queue} || [] };
888 my $todo = @{ $self->{face_prefetch} }
889 or return;
890
891 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
892
893 $self->send ("requestinfo image_sums $face $face");
894
895 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
896 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
897 } elsif (!exists $self->{num_faces}) {
898 $self->send ("requestinfo image_info");
899
900 $self->{num_faces} = 0;
901
902 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
903 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
904 }
905}
906
907sub update_floorbox { 1166sub update_floorbox {
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 1168 return unless $::CONN;
910 1169
911 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
1171
1172 my @add;
912 1173
913 my $row; 1174 my $row;
914 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
915 if ($row < 6) { 1176 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 1177 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 1178 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 1179 DC::Item::update_widgets $_;
919 1180
1181 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1182 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1183 1, $row, $_->{desc_widget};
922 1184
923 $row++; 1185 $row++;
924 } else { 1186 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1187 push @add, 1, $row, new DC::UI::Button
926 text => "More...", 1188 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1189 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 1190 ;
929 last; 1191 last;
930 } 1192 }
931 } 1193 }
932 if ($::CONN->{open_container}) { 1194 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1195 push @add, 1, $row++, new DC::UI::Button
934 text => "Close container", 1196 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1197 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 1198 ;
937 } 1199 }
1200
1201 $::FLOORBOX->add_at (@add);
938 }); 1202 });
939 1203
940 $::WANT_REFRESH++; 1204 $::WANT_REFRESH = 1;
941} 1205}
942 1206
943sub set_opencont { 1207sub set_opencont {
944 my ($conn, $tag, $name) = @_; 1208 my ($conn, $tag, $name) = @_;
945 $conn->{open_container} = $tag; 1209 $conn->{open_container} = $tag;
946 update_floorbox; 1210 update_floorbox;
947 1211
948 $::INV_RIGHT_HB->clear (); 1212 $::INVR_HB->clear ();
949 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1213 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
950 1214
951 if ($tag != 0) { # Floor isn't closable, is it? 1215 if ($tag != 0) { # Floor isn't closable, is it?
952 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1216 $::INVR_HB->add (new DC::UI::Button
953 text => "Close container", 1217 text => "Close container",
954 tooltip => "Close the currently open container (if one is open)", 1218 tooltip => "Close the currently open container (if one is open)",
955 on_activate => sub { 1219 on_activate => sub {
956 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1220 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
957 if $tag != 0; 1221 if $tag != 0;
958 #if $CONN->{open_container} != 0;
959 0 1222 0
960 }, 1223 },
961 ); 1224 );
962 } 1225 }
963 1226
… …
965} 1228}
966 1229
967sub update_containers { 1230sub update_containers {
968 my ($self) = @_; 1231 my ($self) = @_;
969 1232
970 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1233 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
971 my $todo = delete $self->{update_container} 1234 my $todo = delete $self->{update_container}
972 or return; 1235 or return;
973 1236
974 for my $tag (keys %$todo) { 1237 for my $tag (keys %$todo) {
975 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1238 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1012sub item_update { 1275sub item_update {
1013 my ($self, $item) = @_; 1276 my ($self, $item) = @_;
1014 1277
1015 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1278 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1016 1279
1017 CFPlus::Item::update_widgets $item; 1280 DC::Item::update_widgets $item;
1018 1281
1019 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1282 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1020 set_opencont ($::CONN, 0, "Floor"); 1283 set_opencont ($::CONN, 0, "Floor");
1021 1284
1022 } elsif ($item->{flags} & F_OPEN) { 1285 } elsif ($item->{flags} & F_OPEN) {
1023 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1286 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1024 1287
1025 } else { 1288 } else {
1026 $self->{update_container}{$item->{container}}++; 1289 $self->{update_container}{$item->{container}}++;
1027 $self->update_containers; 1290 $self->update_containers;
1028 } 1291 }
… …
1039 1302
1040 my $weight = .001 * $self->{player}{weight}; 1303 my $weight = .001 * $self->{player}{weight};
1041 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1304 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1042 1305
1043 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1306 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1044 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1307 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1045 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1308 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1046} 1309}
1047 1310
1048sub update_server_info { 1311sub update_server_info {
1049 my ($self) = @_; 1312 my ($self) = @_;
… …
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1325 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1326 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1327 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1328 );
1066 1329
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1330}
1069 1331
1070sub logged_in { 1332sub logged_in {
1071 my ($self) = @_; 1333 my ($self) = @_;
1072 1334
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1335 $self->send_ext_req (cfplus_support => version => 2, sub {
1336 my (%msg) = @_;
1337
1074 $self->{cfplus_ext} = $_[0]{version}; 1338 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1339 $self->update_server_info;
1076 1340
1077 if ($self->{cfplus_ext} >= 2) { 1341 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1342 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1343 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1344 $self->update_server_info;
1081 1345
1082 0 1346 0
1083 }); 1347 });
1084 } 1348 }
… …
1086 0 1350 0
1087 }); 1351 });
1088 1352
1089 $self->update_server_info; 1353 $self->update_server_info;
1090 1354
1091 $self->send_command ("output-sync $::CFG->{output_sync}");
1092 $self->send_command ("output-count $::CFG->{output_count}");
1093 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1355 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1356 $self->send_command ("pickup $::CFG->{pickup}");
1095} 1357}
1096 1358
1097sub buildat {
1098 my ($self, $builditem, $x, $y) = @_;
1099
1100 if ($self->{cfplus_ext}) {
1101 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1102 }
1103}
1104
1105sub lookat { 1359sub lookat {
1106 my ($self, $x, $y) = @_; 1360 my ($self, $x, $y) = @_;
1107 1361
1108 if ($self->{cfplus_ext}) { 1362 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1363 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1364 my (%msg) = @_;
1111 1365
1112 if (exists $msg->{npc_dialog}) { 1366 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1367 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1368 $self->{npc_dialog} = new DC::NPCDialog::
1115 dx => $x, 1369 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1370 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1371 conn => $self,
1119 ; 1372 ;
1120 } 1373 }
1121 }); 1374 });
1122 } 1375 }
… …
1129 1382
1130 (delete $self->{npc_dialog})->destroy 1383 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1384 if $self->{npc_dialog};
1132 1385
1133 $self->SUPER::destroy; 1386 $self->SUPER::destroy;
1134}
1135 1387
1388 %$self = ();
1389}
1390
1136package CFPlus::NPCDialog; 1391package DC::NPCDialog;
1137 1392
1138our @ISA = 'CFPlus::UI::Toplevel'; 1393our @ISA = 'DC::UI::Toplevel';
1139 1394
1140sub new { 1395sub new {
1141 my $class = shift; 1396 my $class = shift;
1142 1397
1143 my $self = $class->SUPER::new ( 1398 my $self = $class->SUPER::new (
… …
1150 kw => { hi => 0, yes => 0, no => 0 }, 1405 kw => { hi => 0, yes => 0, no => 0 },
1151 has_close_button => 1, 1406 has_close_button => 1,
1152 @_, 1407 @_,
1153 ); 1408 );
1154 1409
1155 CFPlus::weaken (my $this = $self); 1410 DC::weaken (my $this = $self);
1156 1411
1157 $self->connect (delete => sub { $this->destroy; 1 }); 1412 $self->connect (delete => sub { $this->destroy; 1 });
1158 1413
1159 # better use a pane... 1414 # better use a pane...
1160 $self->add (my $hbox = new CFPlus::UI::HBox); 1415 $self->add (my $hbox = new DC::UI::HBox);
1161 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1416 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1162 1417
1163 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1418 $hbox->add (my $vbox = new DC::UI::VBox);
1164 1419
1165 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1420 $vbox->add (new DC::UI::Label text => "Message Entry:");
1166 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1421 $vbox->add ($self->{entry} = new DC::UI::Entry
1167 tooltip => "#npc_message_entry", 1422 tooltip => "#npc_message_entry",
1168 on_activate => sub { 1423 on_activate => sub {
1169 my ($entry, $text) = @_; 1424 my ($entry, $text) = @_;
1170 1425
1171 return unless $text =~ /\S/; 1426 return unless $text =~ /\S/;
… …
1175 1430
1176 0 1431 0
1177 }, 1432 },
1178 ); 1433 );
1179 1434
1180 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1435 $vbox->add ($self->{options} = new DC::UI::VBox);
1181 1436
1182 $self->{bye_button} = new CFPlus::UI::Button 1437 $self->{bye_button} = new DC::UI::Button
1183 text => "Bye (close)", 1438 text => "Bye (close)",
1184 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1439 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1185 on_activate => sub { $this->destroy; 1 }, 1440 on_activate => sub { $this->destroy; 1 },
1186 ; 1441 ;
1187 1442
1188 $self->update_options; 1443 $self->update_options;
1189 1444
1190 $self->{id} = $self->{conn}->send_ext_req ( 1445 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1446 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1447 $this->feed (@_) if $this;
1193 ); 1448 });
1449
1450 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1451
1195 $self->{entry}->grab_focus; 1452 $self->{entry}->grab_focus;
1196 1453
1197 $self->{textview}->add_paragraph ({ 1454 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1455 fg => [1, 1, 0, 1],
… …
1204}; 1461};
1205 1462
1206sub update_options { 1463sub update_options {
1207 my ($self) = @_; 1464 my ($self) = @_;
1208 1465
1209 CFPlus::weaken $self; 1466 DC::weaken $self;
1210 1467
1211 $self->{options}->clear; 1468 $self->{options}->clear;
1212 $self->{options}->add ($self->{bye_button}); 1469 $self->{options}->add ($self->{bye_button});
1213 1470
1214 for my $kw (sort keys %{ $self->{kw} }) { 1471 for my $kw (sort keys %{ $self->{kw} }) {
1215 $self->{options}->add (new CFPlus::UI::Button 1472 $self->{options}->add (new DC::UI::Button
1216 text => $kw, 1473 text => $kw,
1217 on_activate => sub { 1474 on_activate => sub {
1218 $self->send ($kw); 1475 $self->send ($kw);
1219 0 1476 0
1220 }, 1477 },
1221 ); 1478 );
1222 } 1479 }
1223} 1480}
1224 1481
1225sub feed { 1482sub feed {
1226 my ($self, $msg) = @_; 1483 my ($self, $type, @arg) = @_;
1227 1484
1228 CFPlus::weaken $self; 1485 DC::weaken $self;
1229 1486
1230 if ($msg->{msgtype} eq "reply") { 1487 if ($type eq "update") {
1488 my (%info) = @arg;
1489
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1490 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1491 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1233
1234 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1235 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1236 my @link;
1237 $text =~ s{
1238 ($match)
1239 }{
1240 my $kw = $1;
1241
1242 push @link, new CFPlus::UI::Label
1243 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1244 can_hover => 1,
1245 can_events => 1,
1246 padding_x => 0,
1247 padding_y => 0,
1248 on_button_up => sub {
1249 $self->send ($kw);
1250 };
1251
1252 "\x{fffc}"
1253 }giex;
1254 1492
1493 if (exists $info{msg}) {
1494 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1495 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1496 my @link;
1497 $text =~ s{
1498 ($match)
1499 }{
1500 my $kw = $1;
1501
1502 push @link, new DC::UI::Label
1503 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1504 can_hover => 1,
1505 can_events => 1,
1506 padding_x => 0,
1507 padding_y => 0,
1508 on_button_up => sub {
1509 $self->send ($kw);
1510 };
1511
1512 "\x{fffc}"
1513 }giex;
1514
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1515 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1516 $self->{textview}->scroll_to_bottom;
1517 }
1518
1257 $self->update_options; 1519 $self->update_options;
1258 } else { 1520 } else {
1259 $self->destroy; 1521 $self->destroy;
1260 } 1522 }
1261 1523
… …
1263} 1525}
1264 1526
1265sub send { 1527sub send {
1266 my ($self, $msg) = @_; 1528 my ($self, $msg) = @_;
1267 1529
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1530 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1531 $self->{textview}->scroll_to_bottom;
1270 1532
1271 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1533 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1272} 1534}
1273 1535
1274sub destroy { 1536sub destroy {
1275 my ($self) = @_; 1537 my ($self) = @_;
1276 1538
1277 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1539 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1278 1540
1279 if ($self->{conn}) { 1541 if ($self->{conn}) {
1280 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1542 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1281 delete $self->{conn}{npc_dialog}; 1543 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1544 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1545 }
1284 1546
1285 $self->SUPER::destroy; 1547 $self->SUPER::destroy;

Diff Legend

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