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.131 by root, Tue Jul 24 04:54:48 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,#d# 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 (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81 50
82 $self->{json_coder} 51 $self->{json_coder}
83 ->convert_blessed 52 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
85 $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 }
86 }); 61 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189 62
190 # destroy widgets on logout 63 # destroy widgets on logout
191 $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 {
192 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
193 $_->destroy 66 $_->destroy
… …
197 70
198 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
199 for @cmd_help; 72 for @cmd_help;
200 73
201 { 74 {
202 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
203 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
204 $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}});
205 } 78 }
206 79
207 { 80 {
208 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
209 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
210 $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}});
211 } 84 }
212 85
213 $self->{open_container} = 0; 86 $self->{open_container} = 0;
214 87
… …
216 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
217 90
218 $self 91 $self
219} 92}
220 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
221sub logprint { 296sub logprint {
222 my ($self, @a) = @_; 297 my ($self, @a) = @_;
223 298
224 $self->{log_fh} ||= do { 299 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
225 my $path = "$Crossfire::VARDIR/log.$self->{host}";
226
227 open my $fh, ">>:utf8", $path
228 or die "Couldn't open logfile $path: $!";
229
230 $fh->autoflush (1);
231
232 $fh;
233 };
234
235 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
236
237 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
238 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
239
240 print {$self->{log_fh}} "$ts ", @a, "\n";
241} 300}
242 301
243sub _stat_numdiff { 302sub _stat_numdiff {
244 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
245 304
… …
329 388
330 if ( 389 if (
331 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
332 ) { 391 ) {
333 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
334 $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);
335 } 394 }
336 395
337 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
338 397
339 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
378 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
379 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
380 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
381 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
382 . " (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});
383 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
384 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
385 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
386 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
387 447
… …
405 for keys %RES_TBL; 465 for keys %RES_TBL;
406 466
407 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
408 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
409 469
410 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
411 $sktbl->clear; 478 $sktbl->clear;
412 479
413 my @add; 480 my $sw = $self->{skillwid}{""} ||= [
414
415 push @add,
416 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new DC::UI::Label text => "Experience", align => 1),
417 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),
418 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
419 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new DC::UI::Label text => "Experience", align => 1),
420 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),
421 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
422 ; 489 ];
490
491 my @add = @$sw;
423 492
424 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>";
425 494
426 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);
427 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);
428 497
429 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
430 for ( 499 for (@order) {
431 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
432 map [$_, $self->{skill_info}{$_}],
433 grep exists $stats->{$_},
434 @skills
435 ) {
436 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
437 501
438 my $spell_cb = sub { 502 my $spell_cb = sub {
439 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
440 504
441 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
442 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
443 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
444 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
445 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
446 my $shortname = CFPlus::shorten $name, 14; 510 my $shortname = DC::shorten $name, 14;
447 (new CFPlus::UI::Menu 511 (new DC::UI::Menu
448 items => [ 512 items => [
449 ["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"] }],
450 ["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"] }],
451 ], 515 ],
452 )->popup ($ev); 516 )->popup ($ev);
453 } else { 517 } else {
454 return 0; 518 return 0;
455 } 519 }
456 520
457 1 521 1
458 }; 522 };
459 523
524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp
526 (new DC::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528
529 # level
530 (new DC::UI::Label
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
537 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ];
540
460 push @add, 541 push @add,
461 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 542 $x * 4 + 0, $y, $sw->[0],
462 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 543 $x * 4 + 1, $y, $sw->[1],
463 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 544 $x * 4 + 2, $y, $sw->[2],
464 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 545 $x * 4 + 3, $y, $sw->[3],
465 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
466 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
467 ; 546 ;
468 547
469 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
470 } 549 }
471 550
472 $sktbl->add_at (@add); 551 $sktbl->add_at (@add);
473 } 552 }
474 553
475 for (grep exists $stats->{$_}, @skills) { 554 for (@order) {
476 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 555 my ($idx, $name) = @$_;
477 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 556 my $val = $stats->{$idx};
478 }
479}
480 557
481sub macro_send { 558 next if $prev->{$idx}[1] eq $val->[1];
482 my ($self, $macro) = @_;
483 559
484 for my $cmd (@{ $macro->{action} }) { 560 my $sw = $self->{skillwid}{$idx};
485 $self->send_command ($cmd); 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);
486 } 567 }
487} 568}
488 569
489sub user_send { 570sub user_send {
490 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
492 $self->{record}->($command) 573 $self->{record}->($command)
493 if $self->{record}; 574 if $self->{record};
494 575
495 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
496 $self->send_command ($command); 577 $self->send_command ($command);
497 ::status ($command);
498} 578}
499 579
500sub record { 580sub record {
501 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
502 582
… …
510} 590}
511 591
512sub feed_map1a { 592sub feed_map1a {
513 my ($self, $data) = @_; 593 my ($self, $data) = @_;
514 594
515 $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 {
516 $self->{map_widget}->update; 623 $self->{map_widget}->update;
624 }
517} 625}
518 626
519sub magicmap { 627sub magicmap {
520 my ($self, $w, $h, $x, $y, $data) = @_; 628 my ($self, $w, $h, $x, $y, $data) = @_;
521 629
… …
528 my $map_info = delete $self->{map_info} 636 my $map_info = delete $self->{map_info}
529 or return; 637 or return;
530 638
531 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
532 640
533 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;
534 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 643 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
535 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
536} 644}
537 645
538sub map_clear { 646sub map_clear {
539 my ($self) = @_; 647 my ($self) = @_;
540 648
… …
546} 654}
547 655
548sub bg_fetch { 656sub bg_fetch {
549 my ($self) = @_; 657 my ($self) = @_;
550 658
551 my $id; 659 my $tile;
552 660
553 do { 661 do {
554 $id = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
555 or return; 663 or return;
556 } while $self->{texture}[$id]; 664 } while $self->{texture}[$tile];
557 665
558 CFPlus::DB::get tilecache => $id, sub { 666 DC::DB::get tilecache => $tile, sub {
559 my ($data) = @_; 667 my ($data) = @_;
560 668
561 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
562 670
563 $self->set_texture ($id => $data)
564 if defined $data; 671 if (defined $data) {
672 $self->have_tile ($tile, $data);
673 $self->{texture}[$tile]->upload;
674 }
565 675
566 $self->bg_fetch; 676 $self->bg_fetch;
567 }; 677 };
568} 678}
569 679
570sub load_map($$$) { 680sub load_map($$$) {
571 my ($self, $hash, $x, $y) = @_; 681 my ($self, $hash, $x, $y) = @_;
572 682
573 my $gen = $self->{map_change_gen}; 683 my $gen = $self->{map_change_gen};
574 684
575 CFPlus::DB::get $self->{mapcache} => $hash, sub { 685 my $cb = sub {
576 return unless $gen == $self->{map_change_gen}; 686 return unless $gen == $self->{map_change_gen};
577 687
578 my ($data) = @_; 688 my ($data) = @_;
579 689
580 if (defined $data) { 690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
581 $data = Compress::LZF::decompress $data; 693 my $data = Compress::LZF::decompress $data;
582 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
583 694
584 my $inprogress = @{ $self->{bg_fetch} || [] }; 695 my $inprogress = @{ $self->{bg_fetch} || [] };
585 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
586 $self->bg_fetch unless $inprogress; 697 $self->bg_fetch unless $inprogress;
587 } 698 }
588 }; 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 }
589} 706}
590 707
591# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
592# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
593# 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
… …
686 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
687 804
688 $self->flush_map; 805 $self->flush_map;
689 806
690 ++$self->{map_change_gen}; 807 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new};
691 809
692 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
693 811
694 my $mapmapw = $self->{mapmap}->{w}; 812 my $mapmapw = $self->{mapmap}->{w};
695 my $mapmaph = $self->{mapmap}->{h}; 813 my $mapmaph = $self->{mapmap}->{h};
… …
715 833
716sub face_find { 834sub face_find {
717 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
718 836
719 if ($face->{type} == 0) { # FT_FACE 837 if ($face->{type} == 0) { # FT_FACE
720 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 838 my $id = DC::DB::get_tile_id_sync $face->{name};
721 839
722 $face->{id} = $id; 840 $face->{id} = $id;
723 $self->{faceid}[$facenum] = $id;
724
725 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
726 842
727 CFPlus::DB::get tilecache => $id, $cb; 843 DC::DB::get tilecache => $id, $cb;
728 844
729 } elsif ($face->{type} & 1) { # with metadata 845 } elsif ($face->{type} & 1) { # with metadata
730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 846 DC::DB::get res_meta => $face->{name}, $cb;
847
848 } else { # no metadata
849 DC::DB::get res_data => $face->{name}, $cb;
732 } 850 }
733} 851}
734 852
735sub face_update { 853sub face_update {
736 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
737 855
738 if ($face->{type} == 0) { # FT_FACE 856 if ($face->{type} == 0) {
857 # image, FT_FACE
739 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 858 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
740 if $changed; 859 if $changed;
741 860
742 $self->set_texture ($face->{id} => delete $face->{data}); 861 $self->have_tile ($face->{id}, delete $face->{data});
743 862
744 } elsif ($face->{type} & 1) { # split metadata 863 } elsif ($face->{type} & 1) {
745 my $cb = sub { }; 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;
746 878
747 if ($face->{type} == 3) { # FT_MUSIC 879 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub { 880 &::audio_music_push ($facenum);
749 $self->{music_meta}{$facenum} = $face; 881 } elsif ($face->{type} == 5) { # FT_SOUND
750 882 &::audio_sound_push ($facenum);
751 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed;
753
754 &::audio_music_set ($self->{songs});
755 }; 883 }
756 }
757 884
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else { 885 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 886 # flat resource case, FT_RSRC
772 $cb->(); 887 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
773 } 888 if $changed;
889 }
890
891 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs;
774 } 893 }
775} 894}
776 895
777sub smooth_update { 896sub smooth_update {
778 my ($self, $facenum, $face) = @_; 897 my ($self, $facenum, $face) = @_;
779 898
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 899 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781} 900}
782 901
783sub set_texture { 902sub have_tile {
784 my ($self, $id, $data) = @_; 903 my ($self, $tile, $data) = @_;
785 904
786 return unless $self->{map}; 905 return unless $self->{map};
787 906
788 $self->{texture}[$id] = my $tex = 907 my $tex = $self->{texture}[$tile] ||=
789 new_from_image CFPlus::Texture 908 new DC::Texture
909 tile => $tile,
910 image => $data, delete_image => 1,
790 $data, minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
791 912
792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
793 $self->{map_widget}->update; 914 $_->($tex) for @$cbs;
794 915 }
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796} 916}
797 917
798sub connect_face_update { 918# call in non-void context registers a temporary
919# hook with handle, otherwise its permanent
920sub on_face_change {
799 my ($self, $id, $cb) = @_; 921 my ($self, $num, $cb) = @_;
800 922
801 push @{$self->{face_cb}{$id}}, $cb; 923 push @{$self->{face_cb}{$num}}, $cb;
802 924
803 CFPlus::guard { 925 defined wantarray
926 ? DC::guard {
804 @{$self->{face_cb}{$id}} 927 @{$self->{face_cb}{$num}}
805 = grep $_ != $cb, 928 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}}; 929 @{$self->{face_cb}{$num}};
807 } 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)
808} 947}
809 948
810sub sound_play { 949sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 950 my ($self, $type, $face, $dx, $dy, $vol) = @_;
812 951
813 $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
814} 954}
815 955
816my $LAST_QUERY; # server is stupid, stupid, stupid 956my $LAST_QUERY; # server is stupid, stupid, stupid
817 957
818sub query { 958sub query {
… …
826 966
827sub sanitise_xml($) { 967sub sanitise_xml($) {
828 local $_ = shift; 968 local $_ = shift;
829 969
830 # we now weed out all tags we do not support 970 # we now weed out all tags we do not support
831 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
832 # now all entities 976 # now all entities
833 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;
834 978
835 # handle some elements 979 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
883 $self->{$type} = $text; 1027 $self->{$type} = $text;
884 } else { 1028 } else {
885 $self->logprint ("msg: ", $text); 1029 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 1030 return if $color < 0; # negative color == ignore if not understood
887 1031
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1032 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
889 1033
890 ## 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
891 # no longer neecssary with TRT servers 1035 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 1037
894 ::message ({ fg => $fg, markup => $_ })
895 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 }
896 1053
897 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
898 group => $text, 1055 group => $text,
899 fg => $fg, 1056 fg => $fg,
900 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
901 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
902 ); 1059 ) if $type eq "info";
903 } 1060 }
904} 1061}
905 1062
906sub spell_add { 1063sub spell_add {
907 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
… …
911 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
912 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
913 1070
914 $::SPELL_LIST->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
915 1072
916 $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});
917 $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});
918} 1075}
919 1076
920sub spell_delete { 1077sub spell_delete {
921 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
922 1079
… …
933sub addme_success { 1090sub addme_success {
934 my ($self) = @_; 1091 my ($self) = @_;
935 1092
936 my %skill_help; 1093 my %skill_help;
937 1094
938 for my $node (CFPlus::Pod::find skill_description => "*") { 1095 for my $node (DC::Pod::find skill_description => "*") {
939 my (undef, @par) = CFPlus::Pod::section_of $node; 1096 my (undef, @par) = DC::Pod::section_of $node;
940 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1097 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
941 }; 1098 };
942 1099
943 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
944 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
945 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1102 (DC::asxml "Ready the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1103 . $skill_help{$skill});
947 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
948 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1105 (DC::asxml "Immediately use the skill '$skill'\n\n")
949 . $skill_help{$skill}); 1106 . $skill_help{$skill});
950 } 1107 }
951} 1108}
952 1109
953sub eof { 1110sub eof {
… …
956 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
957 1114
958 ::stop_game (); 1115 ::stop_game ();
959} 1116}
960 1117
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993}
994
995sub update_floorbox { 1118sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 1120 return unless $::CONN;
998 1121
999 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1000 1123
1001 my @add; 1124 my @add;
… …
1003 my $row; 1126 my $row;
1004 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} }) {
1005 if ($row < 6) { 1128 if ($row < 6) {
1006 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
1007 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
1008 CFPlus::Item::update_widgets $_; 1131 DC::Item::update_widgets $_;
1009 1132
1010 push @add, 1133 push @add,
1011 0, $row, $_->{face_widget}, 1134 0, $row, $_->{face_widget},
1012 1, $row, $_->{desc_widget}; 1135 1, $row, $_->{desc_widget};
1013 1136
1014 $row++; 1137 $row++;
1015 } else { 1138 } else {
1016 push @add, 1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new DC::UI::Button
1017 text => "More...", 1140 text => "More...",
1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1019 ; 1142 ;
1020 last; 1143 last;
1021 } 1144 }
1022 } 1145 }
1023 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
1024 push @add, 1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new DC::UI::Button
1025 text => "Close container", 1148 text => "Close container",
1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1027 ; 1150 ;
1028 } 1151 }
1029 1152
1030 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1031 }); 1154 });
1032 1155
1033 $::WANT_REFRESH++; 1156 $::WANT_REFRESH = 1;
1034} 1157}
1035 1158
1036sub set_opencont { 1159sub set_opencont {
1037 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1038 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1039 update_floorbox; 1162 update_floorbox;
1040 1163
1041 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
1042 $::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);
1043 1166
1044 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1045 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new DC::UI::Button
1046 text => "Close container", 1169 text => "Close container",
1047 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1048 on_activate => sub { 1171 on_activate => sub {
1049 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050 if $tag != 0; 1173 if $tag != 0;
1051 #if $CONN->{open_container} != 0;
1052 0 1174 0
1053 }, 1175 },
1054 ); 1176 );
1055 } 1177 }
1056 1178
… …
1058} 1180}
1059 1181
1060sub update_containers { 1182sub update_containers {
1061 my ($self) = @_; 1183 my ($self) = @_;
1062 1184
1063 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1185 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1064 my $todo = delete $self->{update_container} 1186 my $todo = delete $self->{update_container}
1065 or return; 1187 or return;
1066 1188
1067 for my $tag (keys %$todo) { 1189 for my $tag (keys %$todo) {
1068 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1105sub item_update { 1227sub item_update {
1106 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
1107 1229
1108 #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";
1109 1231
1110 CFPlus::Item::update_widgets $item; 1232 DC::Item::update_widgets $item;
1111 1233
1112 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1113 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
1114 1236
1115 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
1116 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1117 1239
1118 } else { 1240 } else {
1119 $self->{update_container}{$item->{container}}++; 1241 $self->{update_container}{$item->{container}}++;
1120 $self->update_containers; 1242 $self->update_containers;
1121 } 1243 }
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1280 );
1159 1281
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1282}
1162 1283
1163sub logged_in { 1284sub logged_in {
1164 my ($self) = @_; 1285 my ($self) = @_;
1165 1286
… …
1181 0 1302 0
1182 }); 1303 });
1183 1304
1184 $self->update_server_info; 1305 $self->update_server_info;
1185 1306
1186 $self->send_command ("output-sync $::CFG->{output_sync}");
1187 $self->send_command ("output-count $::CFG->{output_count}");
1188 $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;
1189 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
1190}
1191
1192sub buildat {
1193 my ($self, $builditem, $x, $y) = @_;
1194
1195 if ($self->{cfplus_ext}) {
1196 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1197 }
1198} 1309}
1199 1310
1200sub lookat { 1311sub lookat {
1201 my ($self, $x, $y) = @_; 1312 my ($self, $x, $y) = @_;
1202 1313
… …
1204 $self->send_ext_req (lookat => $x, $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1205 my (%msg) = @_; 1316 my (%msg) = @_;
1206 1317
1207 if (exists $msg{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1208 # start npc chat dialog 1319 # start npc chat dialog
1209 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new DC::NPCDialog::
1210 token => $msg{npc_dialog}, 1321 token => $msg{npc_dialog},
1211 title => "$msg{npc_dialog}[0] (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1212 conn => $self, 1323 conn => $self,
1213 ; 1324 ;
1214 } 1325 }
… …
1227 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1228 1339
1229 %$self = (); 1340 %$self = ();
1230} 1341}
1231 1342
1232package CFPlus::NPCDialog; 1343package DC::NPCDialog;
1233 1344
1234our @ISA = 'CFPlus::UI::Toplevel'; 1345our @ISA = 'DC::UI::Toplevel';
1235 1346
1236sub new { 1347sub new {
1237 my $class = shift; 1348 my $class = shift;
1238 1349
1239 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
… …
1246 kw => { hi => 0, yes => 0, no => 0 }, 1357 kw => { hi => 0, yes => 0, no => 0 },
1247 has_close_button => 1, 1358 has_close_button => 1,
1248 @_, 1359 @_,
1249 ); 1360 );
1250 1361
1251 CFPlus::weaken (my $this = $self); 1362 DC::weaken (my $this = $self);
1252 1363
1253 $self->connect (delete => sub { $this->destroy; 1 }); 1364 $self->connect (delete => sub { $this->destroy; 1 });
1254 1365
1255 # better use a pane... 1366 # better use a pane...
1256 $self->add (my $hbox = new CFPlus::UI::HBox); 1367 $self->add (my $hbox = new DC::UI::HBox);
1257 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1368 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1258 1369
1259 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1370 $hbox->add (my $vbox = new DC::UI::VBox);
1260 1371
1261 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1372 $vbox->add (new DC::UI::Label text => "Message Entry:");
1262 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1373 $vbox->add ($self->{entry} = new DC::UI::Entry
1263 tooltip => "#npc_message_entry", 1374 tooltip => "#npc_message_entry",
1264 on_activate => sub { 1375 on_activate => sub {
1265 my ($entry, $text) = @_; 1376 my ($entry, $text) = @_;
1266 1377
1267 return unless $text =~ /\S/; 1378 return unless $text =~ /\S/;
… …
1271 1382
1272 0 1383 0
1273 }, 1384 },
1274 ); 1385 );
1275 1386
1276 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1387 $vbox->add ($self->{options} = new DC::UI::VBox);
1277 1388
1278 $self->{bye_button} = new CFPlus::UI::Button 1389 $self->{bye_button} = new DC::UI::Button
1279 text => "Bye (close)", 1390 text => "Bye (close)",
1280 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.",
1281 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1282 ; 1393 ;
1283 1394
… …
1302}; 1413};
1303 1414
1304sub update_options { 1415sub update_options {
1305 my ($self) = @_; 1416 my ($self) = @_;
1306 1417
1307 CFPlus::weaken $self; 1418 DC::weaken $self;
1308 1419
1309 $self->{options}->clear; 1420 $self->{options}->clear;
1310 $self->{options}->add ($self->{bye_button}); 1421 $self->{options}->add ($self->{bye_button});
1311 1422
1312 for my $kw (sort keys %{ $self->{kw} }) { 1423 for my $kw (sort keys %{ $self->{kw} }) {
1313 $self->{options}->add (new CFPlus::UI::Button 1424 $self->{options}->add (new DC::UI::Button
1314 text => $kw, 1425 text => $kw,
1315 on_activate => sub { 1426 on_activate => sub {
1316 $self->send ($kw); 1427 $self->send ($kw);
1317 0 1428 0
1318 }, 1429 },
… …
1321} 1432}
1322 1433
1323sub feed { 1434sub feed {
1324 my ($self, $type, @arg) = @_; 1435 my ($self, $type, @arg) = @_;
1325 1436
1326 CFPlus::weaken $self; 1437 DC::weaken $self;
1327 1438
1328 if ($type eq "update") { 1439 if ($type eq "update") {
1329 my (%info) = @arg; 1440 my (%info) = @arg;
1330 1441
1331 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1332 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1333 1444
1334 if (exists $info{msg}) { 1445 if (exists $info{msg}) {
1335 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1446 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1336 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1337 my @link; 1448 my @link;
1338 $text =~ s{ 1449 $text =~ s{
1339 ($match) 1450 ($match)
1340 }{ 1451 }{
1341 my $kw = $1; 1452 my $kw = $1;
1342 1453
1343 push @link, new CFPlus::UI::Label 1454 push @link, new DC::UI::Label
1344 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1345 can_hover => 1, 1456 can_hover => 1,
1346 can_events => 1, 1457 can_events => 1,
1347 padding_x => 0, 1458 padding_x => 0,
1348 padding_y => 0, 1459 padding_y => 0,
… …
1366} 1477}
1367 1478
1368sub send { 1479sub send {
1369 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1370 1481
1371 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1372 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1373 1484
1374 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1375} 1486}
1376 1487

Diff Legend

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