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

Diff Legend

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