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.145 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 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';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1;
22
23our $TEX_HIDDEN = new_from_resource DC::Texture
24 "hidden.png", minify => 1, mipmap => 1;
25
26sub MIN_TEXTURE_UNUSED() { 1 }#d#
18 27
19sub new { 28sub new {
20 my ($class, %arg) = @_; 29 my ($class, %arg) = @_;
21 30
22 my $self = $class->SUPER::new (%arg, 31 my $self = $class->SUPER::new (%arg,
23 setup_req => { 32 setup_req => {
24 extmap => 1, 33 extmap => 1,
25 excmd => 1, 34 excmd => 1,
26 xwidget => 1,#d# 35 widget => 2,
27 %{$arg{setup_req} || {}}, 36 %{$arg{setup_req} || {}},
28 }, 37 },
29 ); 38 );
30 39
31 $self->{map_widget}->clr_commands; 40 $self->{map_widget}->clr_commands;
32 41
33 my @cmd_help = map { 42 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 43 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 44 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 45
37 my $cmd = $1; 46 my $cmd = $1;
38 my @args = split /\|/, $2; 47 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 48 @args = (".*") unless @args;
40 49
41 my (undef, @par) = CFPlus::Pod::section_of $_; 50 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 51 my $text = DC::Pod::as_label @par;
43 52
44 $_ = $_ eq ".*" ? "" : " $_" 53 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 54 for @args;
46 55
47 map ["$cmd$_", $text], 56 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 57 sort { (length $a) <=> (length $b) }
49 @args 58 @args
50 } sort { $a->{par} <=> $b->{par} } 59 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 60 DC::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
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 61
82 $self->{json_coder} 62 $self->{json_coder}
83 ->convert_blessed 63 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 64 ->filter_json_single_key_object ("\fw" => sub {
85 $self->{widget}{$_[0]} 65 $self->{widget}{$_[0]}
66 })
67 ->filter_json_single_key_object ("\fc" => sub {
68 my ($id) = @_;
69 sub {
70 $self->send_exti_msg (w_e => $id, @_);
71 }
86 }); 72 });
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
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196 73
197 # destroy widgets on logout 74 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 75 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 76 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 77 $_->destroy
201 for values %{delete $ws->{w} || {}}; 78 for values %{delete $ws->{w} || {}};
202 } 79 }
80
81 delete $self->{items};
82 $::INV->clear;
83 $::INVR->clear;
84 $::INVR_HB->clear;
85 $::FLOORBOX->clear;
203 }); 86 });
204 87
205 $self->{map_widget}->add_command (@$_) 88 $self->{map_widget}->add_command (@$_)
206 for @cmd_help; 89 for @cmd_help;
207 90
208 { 91 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 92 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 93 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212 } 94 }
213 95
214 { 96 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 97 $self->{noface} = my $tex = $TEX_NOFACE;
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 98 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 } 99 }
100
101 {
102 $self->{hidden} = my $tex = $TEX_HIDDEN;
103 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
104 }
105
106# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
107# $self->{expire_w} = EV::timer 1, 1, sub {
108# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
109#
110# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
111# warn DC::SvREFCNT $self->{texture}[$_];
112# $self->{texture}[$_]->unload;
113# warn "expire texture $_\n";#d#
114# }
115#
116# ($self->{expire_count} += $count) < @{ $self->{texture} }
117# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
118# warn "count is $count\n";#d#
119# };
219 120
220 $self->{open_container} = 0; 121 $self->{open_container} = 0;
221 122
222 # per server 123 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 124 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 125
225 $self 126 $self
226} 127}
227 128
129sub update_fx_want {
130 my ($self) = @_;
131
132 $self->send_exti_msg (fx_want => {
133 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
134 5 => !!$::CFG->{audio_enable}, # FT_SOUND
135 6 => 1, # FT_RSRC
136 });
137}
138
139sub ext_capabilities {
140 my ($self, %cap) = @_;
141
142 $self->update_fx_want;
143
144 $self->send_exti_req (resource => "exp_table", sub {
145 my ($exp_table) = @_;
146
147 $self->register_face_handler ($exp_table, sub {
148 my ($face) = @_;
149
150 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
151 $_->() for values %{ $self->{on_exp_update} || {} };
152 });
153
154 ()
155 });
156
157 if (my $ts = $cap{tileset}) {
158 if (my ($default) = grep $_->[2] & 1, @$ts) {
159 $self->{tileset} = $default;
160 $self->{tilesize} = $default->[3];
161 $self->setup_req (tileset => $default->[0]);
162
163 my $w = int $self->{mapw} * 32 / $self->{tilesize};
164 my $h = int $self->{maph} * 32 / $self->{tilesize};
165
166 $self->setup_req (mapsize => "${w}x${h}");
167 }
168 }
169}
170
171sub ext_ambient_music {
172 my ($self, $songs) = @_;
173 &::audio_music_set_ambient ($songs);
174}
175
176#############################################################################
177
178sub widget_associate {
179 my ($self, $ws, $id, $widget) = @_;
180
181 $widget ||= new DC::UI::Bin;
182
183 $widget->{s_id} = $id;
184 $self->{widget}{$id} = $widget;
185
186 if ($ws) {
187 $widget->{s_ws} = $ws;
188 $self->{widgetset}{$ws}{w}{$id} = $widget;
189 }
190
191 $widget->connect (on_destroy => sub {
192 my ($widget) = @_;
193
194 delete $self->{widget}{$widget->{s_id}};
195 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
196 if exists $widget->{s_ws};
197 });
198}
199
200# widgetset new
201sub ext_ws_n {
202 my ($self, $id) = @_;
203
204 $self->{widgetset}{$id} = {
205 w => {},
206 };
207}
208
209# widgetset destroy
210sub ext_ws_d {
211 my ($self, $id) = @_;
212
213 my $ws = delete $self->{widgetset}{$id}
214 or return;
215
216 $_->destroy
217 for values %{$ws->{w}};
218}
219
220# widgetset create
221sub ext_ws_c {
222 my ($self, $ws, $id, $class, $args) = @_;
223
224 $self->widget_associate (
225 $ws, $id => scalar eval {
226 local $SIG{__DIE__};
227 "DC::UI::$class"->new (%$args)
228 }
229 );
230}
231
232# widgetset create template
233sub ext_ws_ct {
234 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
235
236 $done_cb ||= sub { };
237
238 my $parse_list; $parse_list = sub {
239 my ($list) = @_;
240 my @w;
241
242 while (@$list) {
243 my ($class, $args) = splice @$list, 0, 2;
244 my $name = delete $args->{s_id};
245 my $cl = delete $args->{s_cl};
246 my $cfg = delete $cfg->{$name};
247 my $id = delete $cfg->{id};
248 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
249 or next;
250
251 $self->widget_associate ($ws, $id, $w)
252 if $id;
253
254 $w->add ($parse_list->($cl))
255 if $cl;
256
257 push @w, $w;
258 }
259
260 @w
261 };
262
263 # either array reference, or face #
264 if ($type eq "inline") {
265 $done_cb->();
266 $parse_list->($template);
267 } elsif ($type eq "face") {
268 my $handler; $handler = $self->register_face_handler ($template, sub {
269 my ($face) = @_;
270
271 undef $handler;
272 $done_cb->();
273 $parse_list->($self->{json_coder}->decode ($face->{data}));
274 });
275 } else {
276 $done_cb->(0);
277 }
278}
279
280# widgetset associate
281sub ext_ws_a {
282 my ($self, %ass) = @_;
283
284 # everything that has a name, wether conceivably useful or not
285 my %wkw = (
286 root => $DC::UI::ROOT,
287 tooltip => $DC::UI::TOOLTIP,
288
289 mapwidget => $::MAPWIDGET,
290 buttonbar => $::BUTTONBAR,
291 metaserver => $::METASERVER,
292 buttonbar => $::BUTTONBAR,
293 login_button => $::LOGIN_BUTTON,
294 quit_dialog => $::QUIT_DIALOG,
295 host_entry => $::HOST_ENTRY,
296 metaserver => $::METASERVER,
297 server_info => $::SERVER_INFO,
298
299 setup_dialog => $::SETUP_DIALOG,
300 setup_notebook => $::SETUP_NOTEBOOK,
301 setup_server => $::SETUP_SERVER,
302 setup_keyboard => $::SETUP_KEYBOARD,
303
304 pl_notebook => $::PL_NOTEBOOK,
305 pl_window => $::PL_WINDOW,
306 inventory_page => $::INVENTORY_PAGE,
307 stats_page => $::STATS_PAGE,
308 skill_page => $::SKILL_PAGE,
309 spell_page => $::SPELL_PAGE,
310 spell_list => $::SPELL_LIST,
311
312 floorbox => $::FLOORBOX,
313 help_window => $::HELP_WINDOW,
314 message_window => $::MESSAGE_WINDOW,
315 message_dist => $::MESSAGE_DIST,
316 statusbox => $::SDTATUSBOX,
317
318 inv => $::INV,
319 invr => $::INVR,
320 invr_hb => $::INVR_HB,
321 );
322
323 while (my ($id, $name) = each %ass) {
324 $self->widget_associate (undef, $id => $wkw{$name});
325 }
326}
327
328# widget call
329sub ext_w_c {
330 my ($self, $id, $rcb, $method, @args) = @_;
331
332 my $w = $self->{widget}{$id}
333 or return;
334
335 if ($rcb) {
336 $rcb->($w->$method (@args));
337 } else {
338 $w->$method (@args);
339 }
340}
341
342# widget set
343sub ext_w_s {
344 my ($self, $id, $attr) = @_;
345
346 my $w = $self->{widget}{$id}
347 or return;
348
349 for (my $i = 0; $i < $#$attr; $i += 2) {
350 my ($member, $value) = @$attr[$i, $i+1];
351 if (defined $value) {
352 $w->{$member} = $value;
353 } else {
354 delete $w->{$member};
355 }
356 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
357 }
358}
359
360# widget get
361sub ext_w_g {
362 my ($self, $id, $rid, @attr) = @_;
363
364 my $w = $self->{widget}{$id}
365 or return;
366
367 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
368}
369
370# message window
371sub ext_channel_info {
372 my ($self, $info) = @_;
373 $self->{channels}->{$info->{id}} = $info;
374 $::MESSAGE_DIST->add_channel ($info);
375}
376
377#############################################################################
378
228sub logprint { 379sub logprint {
229 my ($self, @a) = @_; 380 my ($self, @a) = @_;
230 381
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 382 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232} 383}
233 384
234sub _stat_numdiff { 385sub _stat_numdiff {
235 my ($self, $name, $old, $new) = @_; 386 my ($self, $name, $old, $new) = @_;
236 387
… …
320 471
321 if ( 472 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 473 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 474 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 475 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
325 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 476 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326 } 477 }
327 478
328 $self->update_stats_window ($stats, $prev); 479 $self->update_stats_window ($stats, $prev);
329 480
330 $self->{prev_stats} = { %$stats }; 481 $self->{prev_stats} = { %$stats };
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 520 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 521 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 522 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 523 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 524 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
525 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 526 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 527 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 528 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 529 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 530
… …
396 for keys %RES_TBL; 548 for keys %RES_TBL;
397 549
398 my $sktbl = $::STATWIDS->{skill_tbl}; 550 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 551 my @skills = keys %{ $self->{skill_info} };
400 552
401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 553 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
554 map [$_, $self->{skill_info}{$_}],
555 grep exists $stats->{$_},
556 @skills;
557
558 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
559 $self->{stat_order} = join ",", map $_->[0], @order;
560
402 $sktbl->clear; 561 $sktbl->clear;
403 562
404 my @add; 563 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 564 0, 0, (new DC::UI::Label text => "Experience", align => 1),
408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 565 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
566 2, 0, (new DC::UI::Label text => "Progress"),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 567 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 568 4, 0, (new DC::UI::Label text => "Experience", align => 1),
411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 569 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
570 6, 0, (new DC::UI::Label text => "Progress"),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 571 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
413 ; 572 ];
414 573
574 my @add = @$sw;
575
415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 576 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
416 577
417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 578 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 579 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
419 580
420 my ($x, $y) = (0, 1); 581 my ($x, $y) = (0, 1);
421 for ( 582 for (@order) {
422 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
423 map [$_, $self->{skill_info}{$_}],
424 grep exists $stats->{$_},
425 @skills
426 ) {
427 my ($idx, $name) = @$_; 583 my ($idx, $name) = @$_;
428 584
429 my $spell_cb = sub { 585 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 586 my ($widget, $ev) = @_;
431 587
432 if ($ev->{button} == 1) { 588 if ($ev->{button} == 1) {
433 $::CONN->user_send ("ready_skill $name"); 589 $::CONN->user_send ("ready_skill $name");
434 } elsif ($ev->{button} == 2) { 590 } elsif ($ev->{button} == 2) {
435 $::CONN->user_send ("use_skill $name"); 591 $::CONN->user_send ("use_skill $name");
436 } elsif ($ev->{button} == 3) { 592 } elsif ($ev->{button} == 3) {
437 my $shortname = CFPlus::shorten $name, 14; 593 my $shortname = DC::shorten $name, 14;
438 (new CFPlus::UI::Menu 594 (new DC::UI::Menu
439 items => [ 595 items => [
440 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 596 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
441 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 597 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
442 ], 598 ],
443 )->popup ($ev); 599 )->popup ($ev);
444 } else { 600 } else {
445 return 0; 601 return 0;
446 } 602 }
447 603
448 1 604 1
449 }; 605 };
450 606
607 my $sw = $self->{skillwid}{$idx} ||= [
608 # exp
609 (new DC::UI::Label
610 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
611
612 # level
613 (new DC::UI::Label
614 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
615
616 # progress
617 (new DC::UI::ExperienceProgress),
618
619 # label
620 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
621 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
622 ];
623
451 push @add, 624 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 625 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 626 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 627 $x * 4 + 2, $y, $sw->[2],
455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 628 $x * 4 + 3, $y, $sw->[3],
456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ; 629 ;
459 630
460 $x++ and ($x, $y) = (0, $y + 1); 631 $x++ and ($x, $y) = (0, $y + 1);
461 } 632 }
462 633
463 $sktbl->add_at (@add); 634 $sktbl->add_at (@add);
464 } 635 }
465 636
466 for (grep exists $stats->{$_}, @skills) { 637 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 638 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 639 my $val = $stats->{$idx};
469 }
470}
471 640
472sub macro_send { 641 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 642
475 for my $cmd (@{ $macro->{action} }) { 643 my $sw = $self->{skillwid}{$idx};
476 $self->send_command ($cmd); 644 $sw->[0]->set_text (::formsep ($val->[1]));
645 $sw->[1]->set_text ($val->[0] * 1);
646 $sw->[2]->set_value (@$val);
647
648 $::GAUGES->{sklprg}->set_label ("$name %d%%");
649 $::GAUGES->{sklprg}->set_value (@$val);
477 } 650 }
478} 651}
479 652
480sub user_send { 653sub user_send {
481 my ($self, $command) = @_; 654 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 656 $self->{record}->($command)
484 if $self->{record}; 657 if $self->{record};
485 658
486 $self->logprint ("send: ", $command); 659 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 660 $self->send_command ($command);
488 ::status ($command);
489} 661}
490 662
491sub record { 663sub record {
492 my ($self, $cb) = @_; 664 my ($self, $cb) = @_;
493 665
… …
495} 667}
496 668
497sub map_scroll { 669sub map_scroll {
498 my ($self, $dx, $dy) = @_; 670 my ($self, $dx, $dy) = @_;
499 671
500 $self->{map}->scroll ($dx, $dy); 672 $self->{map_widget}->scroll ($dx, $dy);
501} 673}
502 674
503sub feed_map1a { 675sub feed_map1a {
504 my ($self, $data) = @_; 676 my ($self, $data) = @_;
505 677
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 678 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
679 my $delay;
680
681 for my $tile (@$missing) {
682 next if $self->{delay}{$tile};
683
684 $delay = 1;
685
686 if (my $tex = $self->{texture}[$tile]) {
687 $tex->upload;
688 } else {
689 $self->{delay}{$tile} = 1;
690
691 # we assume the face is in-flight and will eventually arrive
692 push @{$self->{tile_cb}{$tile}}, sub {
693 delete $self->{delay}{$tile};
694 $_[0]->upload;
695 };
696 }
697 }
698
699 if ($delay) {
700 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
701 EV::once undef, 0, 0.03, sub {
702 $self->{map_widget}->update
703 if $self->{map_widget};
704 };
705 } else {
507 $self->{map_widget}->update; 706 $self->{map_widget}->update;
707 }
508} 708}
509 709
510sub magicmap { 710sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 711 my ($self, $w, $h, $x, $y, $data) = @_;
512 712
… …
514} 714}
515 715
516sub flush_map { 716sub flush_map {
517 my ($self) = @_; 717 my ($self) = @_;
518 718
519 my $map_info = delete $self->{map_info} 719 return unless $self->{map_info};
520 or return;
521 720
721 for my $map_info (values %{ $self->{map_cache} || {} }) {
522 my ($hash, $x, $y, $w, $h) = @$map_info; 722 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
523 723
524 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 724 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
725
726 if ($data ne $$rdata) {
727 $map_info->[1] = \$data;
728 my $cdata = Compress::LZF::compress $data;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 729 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 730 }
731 }
527} 732}
528 733
529sub map_clear { 734sub map_clear {
530 my ($self) = @_; 735 my ($self) = @_;
531 736
532 $self->flush_map; 737 $self->flush_map;
738 delete $self->{map_info};
533 delete $self->{neigh_map}; 739 delete $self->{neigh_map};
534 740
535 $self->{map}->clear; 741 $self->{map}->clear;
536 delete $self->{map_widget}{magicmap}; 742 delete $self->{map_widget}{magicmap};
537} 743}
538 744
539sub bg_fetch { 745sub bg_fetch {
540 my ($self) = @_; 746 my ($self) = @_;
541 747
542 my $id; 748 my $tile;
543 749
544 do { 750 do {
545 $id = pop @{$self->{bg_fetch}} 751 $tile = pop @{$self->{bg_fetch}}
546 or return; 752 or return;
547 } while $self->{texture}[$id]; 753 } while $self->{texture}[$tile];
548 754
549 CFPlus::DB::get tilecache => $id, sub { 755 DC::DB::get tilecache => $tile, sub {
550 my ($data) = @_; 756 my ($data) = @_;
551 757
552 return unless $self->{map}; # stop when destroyed 758 return unless $self->{map}; # stop when destroyed
553 759
554 $self->set_texture ($id => $data)
555 if defined $data; 760 if (defined $data) {
761 $self->have_tile ($tile, $data);
762 $self->{texture}[$tile]->upload;
763 }
556 764
557 $self->bg_fetch; 765 $self->bg_fetch;
558 }; 766 };
559} 767}
560 768
561sub load_map($$$) { 769sub load_map($$$$$$) {
562 my ($self, $hash, $x, $y) = @_; 770 my ($self, $hash, $x, $y, $w, $h) = @_;
563 771
564 my $gen = $self->{map_change_gen}; 772 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
565 773
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 774 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 775 $map_info->[1] = \$_[0];
568 776
569 my ($data) = @_;
570
571 if (defined $data) {
572 $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 777 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 778 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
577 $self->bg_fetch unless $inprogress; 779 $self->bg_fetch unless $inprogress;
578 }
579 }; 780 };
781
782 if (my $map_info = $self->{map_cache_old}{$hash}) {
783 $cb->(${ $map_info->[1] });
784 } else {
785 my $gen = $self->{map_change_gen};
786
787 DC::DB::get $self->{mapcache} => $hash, sub {
788 return unless $gen == $self->{map_change_gen};
789 return unless defined $_[0];
790 $cb->(Compress::LZF::decompress $_[0]);
791 };
792 }
580} 793}
581 794
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 795# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 796# (server resources, latency, bandwidth), so this hack is warranted.
584# the right fix is to make real tiled maps with an overview file 797# the right fix is to make real tiled maps with an overview file
585sub send_mapinfo { 798sub send_mapinfo {
586 my ($self, $data, $cb) = @_; 799 my ($self, $data, $cb) = @_;
587 800
588 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 801 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
613} 826}
614 827
615# this method does a "flood fill" into every tile direction 828# this method does a "flood fill" into every tile direction
616# it assumes that tiles are arranged in a rectangular grid, 829# it assumes that tiles are arranged in a rectangular grid,
617# i.e. a map is the same as the left of the right map etc. 830# i.e. a map is the same as the left of the right map etc.
618# failure to comply are harmless and result in display errors 831# failure to comply is harmless and results in display errors
619# at worst. 832# at worst.
620sub flood_fill { 833sub flood_fill {
621 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 834 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
622 835
623 # the server does not allow map paths > 6 836 # the server does not allow map paths > 6
… …
659 return if $mode ne "spatial"; 872 return if $mode ne "spatial";
660 873
661 $x += $self->{map}->ox; 874 $x += $self->{map}->ox;
662 $y += $self->{map}->oy; 875 $y += $self->{map}->oy;
663 876
664 $self->load_map ($hash, $x, $y) 877 $self->load_map ($hash, $x, $y, $w, $h)
665 unless $self->{neigh_map}{$hash}[5]++;#d# 878 unless $self->{neigh_map}{$hash}[5]++;#d#
666 879
667 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 880 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
668 881
669 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 882 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 890 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 891
679 $self->flush_map; 892 $self->flush_map;
680 893
681 ++$self->{map_change_gen}; 894 ++$self->{map_change_gen};
895 $self->{map_cache_old} = delete $self->{map_cache};
682 896
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 897 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 898
685 my $mapmapw = $self->{mapmap}->{w}; 899 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 900 my $mapmaph = $self->{mapmap}->{h};
… …
698 $self->{map_info} = [$hash, $x, $y, $w, $h]; 912 $self->{map_info} = [$hash, $x, $y, $w, $h];
699 913
700 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 914 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
701 $::STATWIDS->{map}->set_text ("Map: " . $map); 915 $::STATWIDS->{map}->set_text ("Map: " . $map);
702 916
703 $self->load_map ($hash, $x, $y); 917 $self->load_map ($hash, $x, $y, $w, $h);
704 $self->flood_fill (0, 0, 0, "", $hash, $flags); 918 $self->flood_fill (0, 0, 0, "", $hash, $flags);
705} 919}
706 920
707sub face_find { 921sub face_find {
708 my ($self, $facenum, $face, $cb) = @_; 922 my ($self, $facenum, $face, $cb) = @_;
709 923
710 if ($face->{type} == 0) { # FT_FACE 924 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 925 my $id = DC::DB::get_tile_id_sync $face->{name};
712 926
713 $face->{id} = $id; 927 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 928 $self->{map}->set_tileid ($facenum => $id);
717 929
718 CFPlus::DB::get tilecache => $id, $cb; 930 DC::DB::get tilecache => $id, $cb;
719 931
720 } elsif ($face->{type} & 1) { # with metadata 932 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb; 933 DC::DB::get res_meta => $face->{name}, $cb;
934
935 } else { # no metadata
936 DC::DB::get res_data => $face->{name}, $cb;
723 } 937 }
724} 938}
725 939
726sub face_update { 940sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 941 my ($self, $facenum, $face, $changed) = @_;
728 942
729 if ($face->{type} == 0) { # FT_FACE 943 if ($face->{type} == 0) {
944 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 945 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 946 if $changed;
732 947
733 $self->set_texture ($face->{id} => delete $face->{data}); 948 $self->have_tile ($face->{id}, delete $face->{data});
734 949
735 } elsif ($face->{type} & 1) { # split metadata 950 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 951 # split metadata case, FT_MUSIC, FT_SOUND
952 if ($changed) { # new data
953 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
954 $face->{data} = $meta;
955
956 # rely on strict ordering here and also on later fetch
957 DC::DB::put res_data => $face->{name} => $data, sub { };
958 DC::DB::put res_meta => $face->{name} => $meta, sub { };
959 }
960
961 $face->{data} = $self->{json_coder}->decode ($face->{data});
962 ::add_license ($face);
963 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
964 if $changed;
737 965
738 if ($face->{type} == 3) { # FT_MUSIC 966 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum); 967 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 968 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum); 969 &::audio_sound_push ($facenum);
755 }; 970 }
756 }
757 971
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else { 972 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 973 # flat resource case, FT_RSRC
770 ::add_license ($face); 974 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
771 $cb->(); 975 if $changed;
772 } 976 }
977
978 if (my $cbs = $self->{face_cb}{$facenum}) {
979 $_->($face, $changed) for @$cbs;
773 } 980 }
774} 981}
775 982
776sub smooth_update { 983sub smooth_update {
777 my ($self, $facenum, $face) = @_; 984 my ($self, $facenum, $face) = @_;
778 985
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 986 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 987}
781 988
782sub set_texture { 989sub have_tile {
783 my ($self, $id, $data) = @_; 990 my ($self, $tile, $data) = @_;
784 991
785 return unless $self->{map}; 992 return unless $self->{map};
786 993
787 $self->{texture}[$id] = my $tex = 994 my $tex = $self->{texture}[$tile] ||=
788 new_from_image CFPlus::Texture 995 new DC::Texture
996 tile => $tile,
997 image => $data, delete_image => 1,
789 $data, minify => 1, mipmap => 1; 998 minify => 1, mipmap => 1;
790 999
791 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1000 if (my $cbs = delete $self->{tile_cb}{$tile}) {
792 $self->{map_widget}->update; 1001 $_->($tex) for @$cbs;
793 1002 }
794 $_->() for @{(delete $self->{face_cb}{$id}) || []};
795} 1003}
796 1004
797sub connect_face_update { 1005# call in non-void context registers a temporary
1006# hook with handle, otherwise its permanent
1007sub on_face_change {
798 my ($self, $id, $cb) = @_; 1008 my ($self, $num, $cb) = @_;
799 1009
800 push @{$self->{face_cb}{$id}}, $cb; 1010 push @{$self->{face_cb}{$num}}, $cb;
801 1011
802 CFPlus::guard { 1012 defined wantarray
1013 ? DC::guard {
803 @{$self->{face_cb}{$id}} 1014 @{$self->{face_cb}{$num}}
804 = grep $_ != $cb, 1015 = grep $_ != $cb,
805 @{$self->{face_cb}{$id}}; 1016 @{$self->{face_cb}{$num}};
806 } 1017 }
1018 : ()
1019}
1020
1021# call in non-void context registers a temporary
1022# hook with handle, otherwise its permanent
1023sub register_face_handler {
1024 my ($self, $num, $cb) = @_;
1025
1026 return unless $num;
1027
1028 # invoke if available right now
1029 $cb->($self->{face}[$num], 0)
1030 unless exists $self->{face}[$num]{loading};
1031
1032 # future changes
1033 $self->on_face_change ($num => $cb)
807} 1034}
808 1035
809sub sound_play { 1036sub sound_play {
810 my ($self, $type, $face, $dx, $dy, $vol) = @_; 1037 my ($self, $type, $face, $dx, $dy, $vol) = @_;
811 1038
… …
826 1053
827sub sanitise_xml($) { 1054sub sanitise_xml($) {
828 local $_ = shift; 1055 local $_ = shift;
829 1056
830 # we now weed out all tags we do not support 1057 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1058 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1059 }{
1060 "&lt;"
1061 }gex;
1062
832 # now all entities 1063 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1064 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834 1065
835 # handle some elements 1066 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1067 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1068 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1069
1070 s/\s+$//;
838 1071
839 $_ 1072 $_
840} 1073}
841 1074
842our %NAME_TO_COLOR = ( 1075our %NAME_TO_COLOR = (
… …
883 $self->{$type} = $text; 1116 $self->{$type} = $text;
884 } else { 1117 } else {
885 $self->logprint ("msg: ", $text); 1118 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 1119 return if $color < 0; # negative color == ignore if not understood
887 1120
888 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1121 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
889 1122
890 ## try to create single paragraphs of multiple lines sent by the server 1123 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers 1124 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1125 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 1126
894 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1127 ::message ({
895 for split /\n/, $text; 1128 fg => $fg,
1129 markup => $text,
1130 type => $type,
1131 extra => [@extra],
1132 color_flags => $color, #d# ugly, kill
1133 });
1134
1135# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1136# # actually, this is an ugly design. _we_ should control the channels,
1137# # not some random other widget, as the channels are clearly protocol-specific.
1138# # then we could also react to flags such as CLEAR without resorting to
1139# # hacks such as color_flags, above.
896 1140
897 $self->{statusbox}->add ($text, 1141 $self->{statusbox}->add ($text,
898 group => $text, 1142 group => $text,
899 fg => $fg, 1143 fg => $fg,
900 timeout => $color >= 2 ? 180 : 10, 1144 timeout => $color >= 2 ? 180 : 10,
901 tooltip_font => $::FONT_FIXED, 1145 tooltip_font => $::FONT_FIXED,
902 ); 1146 ) if $type eq "info";
903 } 1147 }
904} 1148}
905 1149
906sub spell_add { 1150sub spell_add {
907 my ($self, $spell) = @_; 1151 my ($self, $spell) = @_;
… …
911 $spell->{message} =~ s/\n+$//; 1155 $spell->{message} =~ s/\n+$//;
912 $spell->{message} ||= "Server did not provide a description for this spell."; 1156 $spell->{message} ||= "Server did not provide a description for this spell.";
913 1157
914 $::SPELL_LIST->add_spell ($spell); 1158 $::SPELL_LIST->add_spell ($spell);
915 1159
916 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1160 $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}); 1161 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
918} 1162}
919 1163
920sub spell_delete { 1164sub spell_delete {
921 my ($self, $spell) = @_; 1165 my ($self, $spell) = @_;
922 1166
… …
933sub addme_success { 1177sub addme_success {
934 my ($self) = @_; 1178 my ($self) = @_;
935 1179
936 my %skill_help; 1180 my %skill_help;
937 1181
938 for my $node (CFPlus::Pod::find skill_description => "*") { 1182 for my $node (DC::Pod::find skill_description => "*") {
939 my (undef, @par) = CFPlus::Pod::section_of $node; 1183 my (undef, @par) = DC::Pod::section_of $node;
940 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1184 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
941 }; 1185 };
942 1186
943 for my $skill (values %{$self->{skill_info}}) { 1187 for my $skill (values %{$self->{skill_info}}) {
944 $self->{map_widget}->add_command ("ready_skill $skill", 1188 $self->{map_widget}->add_command ("ready_skill $skill",
945 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1189 (DC::asxml "Ready the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1190 . $skill_help{$skill});
947 $self->{map_widget}->add_command ("use_skill $skill", 1191 $self->{map_widget}->add_command ("use_skill $skill",
948 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1192 (DC::asxml "Immediately use the skill '$skill'\n\n")
949 . $skill_help{$skill}); 1193 . $skill_help{$skill});
950 } 1194 }
951} 1195}
952 1196
953sub eof { 1197sub eof {
… …
957 1201
958 ::stop_game (); 1202 ::stop_game ();
959} 1203}
960 1204
961sub update_floorbox { 1205sub update_floorbox {
962 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1206 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
963 return unless $::CONN; 1207 return unless $::CONN;
964 1208
965 $::FLOORBOX->clear; 1209 $::FLOORBOX->clear;
966 1210
967 my @add; 1211 my @add;
968 1212
969 my $row; 1213 my $row;
970 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1214 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1215 next if $_->{tag} & 0x80000000;
971 if ($row < 6) { 1216 if ($row < 6) {
972 local $_->{face_widget}; # hack to force recreation of widget 1217 local $_->{face_widget}; # hack to force recreation of widget
973 local $_->{desc_widget}; # hack to force recreation of widget 1218 local $_->{desc_widget}; # hack to force recreation of widget
974 CFPlus::Item::update_widgets $_; 1219 DC::Item::update_widgets $_;
975 1220
976 push @add, 1221 push @add,
977 0, $row, $_->{face_widget}, 1222 0, $row, $_->{face_widget},
978 1, $row, $_->{desc_widget}; 1223 1, $row, $_->{desc_widget};
979 1224
980 $row++; 1225 $row++;
981 } else { 1226 } else {
982 push @add, 1, $row, new CFPlus::UI::Button 1227 push @add, 1, $row, new DC::UI::Button
983 text => "More...", 1228 text => "More...",
984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1229 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
985 ; 1230 ;
986 last; 1231 last;
987 } 1232 }
988 } 1233 }
989 if ($::CONN->{open_container}) { 1234 if ($::CONN->{open_container}) {
990 push @add, 1, $row++, new CFPlus::UI::Button 1235 push @add, 1, $row++, new DC::UI::Button
991 text => "Close container", 1236 text => "Close container",
992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1237 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
993 ; 1238 ;
994 } 1239 }
995 1240
996 $::FLOORBOX->add_at (@add); 1241 $::FLOORBOX->add_at (@add);
997 }); 1242 });
998 1243
999 $::WANT_REFRESH++; 1244 $::WANT_REFRESH = 1;
1000} 1245}
1001 1246
1002sub set_opencont { 1247sub set_opencont {
1003 my ($conn, $tag, $name) = @_; 1248 my ($conn, $tag, $name) = @_;
1004 $conn->{open_container} = $tag; 1249 $conn->{open_container} = $tag;
1005 update_floorbox; 1250 update_floorbox;
1006 1251
1007 $::INV_RIGHT_HB->clear (); 1252 $::INVR_HB->clear;
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1253 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1009 1254
1010 if ($tag != 0) { # Floor isn't closable, is it? 1255 if ($tag != 0) { # Floor isn't closable, is it?
1011 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1256 $::INVR_HB->add (new DC::UI::Button
1012 text => "Close container", 1257 text => "Close container",
1013 tooltip => "Close the currently open container (if one is open)", 1258 tooltip => "Close the currently open container (if one is open)",
1014 on_activate => sub { 1259 on_activate => sub {
1015 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1260 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1016 if $tag != 0; 1261 if $tag != 0;
1017 #if $CONN->{open_container} != 0;
1018 0 1262 0
1019 }, 1263 },
1020 ); 1264 );
1021 } 1265 }
1022 1266
… …
1024} 1268}
1025 1269
1026sub update_containers { 1270sub update_containers {
1027 my ($self) = @_; 1271 my ($self) = @_;
1028 1272
1029 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1273 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1030 my $todo = delete $self->{update_container} 1274 my $todo = delete $self->{update_container}
1031 or return; 1275 or return;
1032 1276
1033 for my $tag (keys %$todo) { 1277 for my $tag (keys %$todo) {
1034 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1278 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1069} 1313}
1070 1314
1071sub item_update { 1315sub item_update {
1072 my ($self, $item) = @_; 1316 my ($self, $item) = @_;
1073 1317
1074 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1318 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1075 1319
1076 CFPlus::Item::update_widgets $item; 1320 DC::Item::update_widgets $item;
1077 1321
1078 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1322 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1079 set_opencont ($::CONN, 0, "Floor"); 1323 set_opencont ($::CONN, 0, "Floor");
1080 1324
1081 } elsif ($item->{flags} & F_OPEN) { 1325 } elsif ($item->{flags} & F_OPEN) {
1082 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1326 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1083 1327
1084 } else { 1328 } else {
1085 $self->{update_container}{$item->{container}}++; 1329 $self->{update_container}{$item->{container}}++;
1086 $self->update_containers; 1330 $self->update_containers;
1087 } 1331 }
… …
1098 1342
1099 my $weight = .001 * $self->{player}{weight}; 1343 my $weight = .001 * $self->{player}{weight};
1100 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1344 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1101 1345
1102 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1346 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1103 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1347 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1104 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1348 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1105} 1349}
1106 1350
1107sub update_server_info { 1351sub update_server_info {
1108 my ($self) = @_; 1352 my ($self) = @_;
… …
1116 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1360 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1117 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1361 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1118 . "editing support $yesno[!!$self->{editor_support}]\n" 1362 . "editing support $yesno[!!$self->{editor_support}]\n"
1119 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1363 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1120 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1364 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1365 . "client support $yesno[$self->{cfplus_ext} > 0]"
1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1366 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1123 . "map size $self->{mapw}×$self->{maph}\n" 1367 . "map size $self->{mapw}×$self->{maph}\n"
1124 ); 1368 );
1125 1369
1126} 1370}
… …
1146 0 1390 0
1147 }); 1391 });
1148 1392
1149 $self->update_server_info; 1393 $self->update_server_info;
1150 1394
1151 $self->send_command ("output-sync $::CFG->{output_sync}");
1152 $self->send_command ("output-count $::CFG->{output_count}");
1153 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1395 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1154 $self->send_command ("pickup $::CFG->{pickup}"); 1396 $self->send_command ("pickup $::CFG->{pickup}");
1397
1398 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1399 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1155} 1400}
1156 1401
1157sub lookat { 1402sub lookat {
1158 my ($self, $x, $y) = @_; 1403 my ($self, $x, $y) = @_;
1159 1404
… …
1161 $self->send_ext_req (lookat => $x, $y, sub { 1406 $self->send_ext_req (lookat => $x, $y, sub {
1162 my (%msg) = @_; 1407 my (%msg) = @_;
1163 1408
1164 if (exists $msg{npc_dialog}) { 1409 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1410 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1411 $self->{npc_dialog} = new DC::NPCDialog::
1167 token => $msg{npc_dialog}, 1412 token => $msg{npc_dialog},
1168 title => "$msg{npc_dialog}[0] (NPC)", 1413 title => "$msg{npc_dialog}[0] (NPC)",
1169 conn => $self, 1414 conn => $self,
1170 ; 1415 ;
1171 } 1416 }
… …
1184 $self->SUPER::destroy; 1429 $self->SUPER::destroy;
1185 1430
1186 %$self = (); 1431 %$self = ();
1187} 1432}
1188 1433
1189package CFPlus::NPCDialog; 1434package DC::NPCDialog;
1190 1435
1191our @ISA = 'CFPlus::UI::Toplevel'; 1436our @ISA = 'DC::UI::Toplevel';
1192 1437
1193sub new { 1438sub new {
1194 my $class = shift; 1439 my $class = shift;
1195 1440
1196 my $self = $class->SUPER::new ( 1441 my $self = $class->SUPER::new (
… …
1203 kw => { hi => 0, yes => 0, no => 0 }, 1448 kw => { hi => 0, yes => 0, no => 0 },
1204 has_close_button => 1, 1449 has_close_button => 1,
1205 @_, 1450 @_,
1206 ); 1451 );
1207 1452
1208 CFPlus::weaken (my $this = $self); 1453 DC::weaken (my $this = $self);
1209 1454
1210 $self->connect (delete => sub { $this->destroy; 1 }); 1455 $self->connect (delete => sub { $this->destroy; 1 });
1211 1456
1212 # better use a pane... 1457 # better use a pane...
1213 $self->add (my $hbox = new CFPlus::UI::HBox); 1458 $self->add (my $hbox = new DC::UI::HBox);
1214 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1459 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1215 1460
1216 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1461 $hbox->add (my $vbox = new DC::UI::VBox);
1217 1462
1218 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1463 $vbox->add (new DC::UI::Label text => "Message Entry:");
1219 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1464 $vbox->add ($self->{entry} = new DC::UI::Entry
1220 tooltip => "#npc_message_entry", 1465 tooltip => "#npc_message_entry",
1221 on_activate => sub { 1466 on_activate => sub {
1222 my ($entry, $text) = @_; 1467 my ($entry, $text) = @_;
1223 1468
1224 return unless $text =~ /\S/; 1469 return unless $text =~ /\S/;
… …
1228 1473
1229 0 1474 0
1230 }, 1475 },
1231 ); 1476 );
1232 1477
1233 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1478 $vbox->add ($self->{options} = new DC::UI::VBox);
1234 1479
1235 $self->{bye_button} = new CFPlus::UI::Button 1480 $self->{bye_button} = new DC::UI::Button
1236 text => "Bye (close)", 1481 text => "Bye (close)",
1237 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1482 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1238 on_activate => sub { $this->destroy; 1 }, 1483 on_activate => sub { $this->destroy; 1 },
1239 ; 1484 ;
1240 1485
… …
1259}; 1504};
1260 1505
1261sub update_options { 1506sub update_options {
1262 my ($self) = @_; 1507 my ($self) = @_;
1263 1508
1264 CFPlus::weaken $self; 1509 DC::weaken $self;
1265 1510
1266 $self->{options}->clear; 1511 $self->{options}->clear;
1267 $self->{options}->add ($self->{bye_button}); 1512 $self->{options}->add ($self->{bye_button});
1268 1513
1269 for my $kw (sort keys %{ $self->{kw} }) { 1514 for my $kw (sort keys %{ $self->{kw} }) {
1270 $self->{options}->add (new CFPlus::UI::Button 1515 $self->{options}->add (new DC::UI::Button
1271 text => $kw, 1516 text => $kw,
1272 on_activate => sub { 1517 on_activate => sub {
1273 $self->send ($kw); 1518 $self->send ($kw);
1274 0 1519 0
1275 }, 1520 },
… …
1278} 1523}
1279 1524
1280sub feed { 1525sub feed {
1281 my ($self, $type, @arg) = @_; 1526 my ($self, $type, @arg) = @_;
1282 1527
1283 CFPlus::weaken $self; 1528 DC::weaken $self;
1284 1529
1285 if ($type eq "update") { 1530 if ($type eq "update") {
1286 my (%info) = @arg; 1531 my (%info) = @arg;
1287 1532
1288 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1533 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1289 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1534 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1290 1535
1291 if (exists $info{msg}) { 1536 if (exists $info{msg}) {
1292 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1537 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1293 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1538 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1294 my @link; 1539 my @link;
1295 $text =~ s{ 1540 $text =~ s{
1296 ($match) 1541 ($match)
1297 }{ 1542 }{
1298 my $kw = $1; 1543 my $kw = $1;
1299 1544
1300 push @link, new CFPlus::UI::Label 1545 push @link, new DC::UI::Label
1301 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1546 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1302 can_hover => 1, 1547 can_hover => 1,
1303 can_events => 1, 1548 can_events => 1,
1304 padding_x => 0, 1549 padding_x => 0,
1305 padding_y => 0, 1550 padding_y => 0,
… …
1323} 1568}
1324 1569
1325sub send { 1570sub send {
1326 my ($self, $msg) = @_; 1571 my ($self, $msg) = @_;
1327 1572
1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1573 $self->{textview}->add_paragraph ({
1574 markup =>
1575 "\n<span foreground='#ffff00'><b>"
1576 . (DC::asxml $msg)
1577 . "</b></span>"
1578 });
1329 $self->{textview}->scroll_to_bottom; 1579 $self->{textview}->scroll_to_bottom;
1330 1580
1331 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1581 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1332} 1582}
1333 1583

Diff Legend

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