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.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.205 by root, Wed Nov 26 23:08:34 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
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 58
82 $self->{json_coder} 59 $self->{json_coder}
83 ->convert_blessed 60 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 61 ->filter_json_single_key_object ("\fw" => sub {
85 $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 }
86 }); 69 });
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 70
197 # destroy widgets on logout 71 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 73 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 74 $_->destroy
201 for values %{delete $ws->{w} || {}}; 75 for values %{delete $ws->{w} || {}};
202 } 76 }
77
78 delete $self->{items};
79 $::INV->clear;
80 $::INVR->clear;
81 $::INVR_HB->clear;
82 $::FLOORBOX->clear;
203 }); 83 });
204 84
205 $self->{map_widget}->add_command (@$_) 85 $self->{map_widget}->add_command (@$_)
206 for @cmd_help; 86 for @cmd_help;
207 87
208 { 88 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 89 $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}}); 90 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212 } 91 }
213 92
214 { 93 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 94 $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}}); 95 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 } 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# };
219 112
220 $self->{open_container} = 0; 113 $self->{open_container} = 0;
221 114
222 # per server 115 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 116 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 117
225 $self 118 $self
226} 119}
227 120
121sub update_fx_want {
122 my ($self) = @_;
123
124 $self->send_exti_msg (fx_want => {
125 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
126 5 => !!$::CFG->{audio_enable}, # FT_SOUND
127 6 => 1, # FT_RSRC
128 });
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#############################################################################
370
228sub logprint { 371sub logprint {
229 my ($self, @a) = @_; 372 my ($self, @a) = @_;
230 373
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 374 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232} 375}
233 376
234sub _stat_numdiff { 377sub _stat_numdiff {
235 my ($self, $name, $old, $new) = @_; 378 my ($self, $name, $old, $new) = @_;
236 379
… …
320 463
321 if ( 464 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 465 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 466 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 467 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); 468 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326 } 469 }
327 470
328 $self->update_stats_window ($stats, $prev); 471 $self->update_stats_window ($stats, $prev);
329 472
330 $self->{prev_stats} = { %$stats }; 473 $self->{prev_stats} = { %$stats };
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 512 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 513 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 514 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 515 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (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});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 518 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 519 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 520 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 521 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 522
… …
396 for keys %RES_TBL; 540 for keys %RES_TBL;
397 541
398 my $sktbl = $::STATWIDS->{skill_tbl}; 542 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 543 my @skills = keys %{ $self->{skill_info} };
400 544
401 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
402 $sktbl->clear; 553 $sktbl->clear;
403 554
404 my @add; 555 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 556 0, 0, (new DC::UI::Label text => "Experience", align => 1),
408 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"),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 559 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 560 4, 0, (new DC::UI::Label text => "Experience", align => 1),
411 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"),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 563 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
413 ; 564 ];
565
566 my @add = @$sw;
414 567
415 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 spell\nRight click - further options</small>";
416 569
417 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);
418 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);
419 572
420 my ($x, $y) = (0, 1); 573 my ($x, $y) = (0, 1);
421 for ( 574 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) = @$_; 575 my ($idx, $name) = @$_;
428 576
429 my $spell_cb = sub { 577 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 578 my ($widget, $ev) = @_;
431 579
432 if ($ev->{button} == 1) { 580 if ($ev->{button} == 1) {
433 $::CONN->user_send ("ready_skill $name"); 581 $::CONN->user_send ("ready_skill $name");
434 } elsif ($ev->{button} == 2) { 582 } elsif ($ev->{button} == 2) {
435 $::CONN->user_send ("use_skill $name"); 583 $::CONN->user_send ("use_skill $name");
436 } elsif ($ev->{button} == 3) { 584 } elsif ($ev->{button} == 3) {
437 my $shortname = CFPlus::shorten $name, 14; 585 my $shortname = DC::shorten $name, 14;
438 (new CFPlus::UI::Menu 586 (new DC::UI::Menu
439 items => [ 587 items => [
440 ["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"] }],
441 ["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"] }],
442 ], 590 ],
443 )->popup ($ev); 591 )->popup ($ev);
444 } else { 592 } else {
445 return 0; 593 return 0;
446 } 594 }
447 595
448 1 596 1
449 }; 597 };
450 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
451 push @add, 616 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 617 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 618 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 619 $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), 620 $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 ; 621 ;
459 622
460 $x++ and ($x, $y) = (0, $y + 1); 623 $x++ and ($x, $y) = (0, $y + 1);
461 } 624 }
462 625
463 $sktbl->add_at (@add); 626 $sktbl->add_at (@add);
464 } 627 }
465 628
466 for (grep exists $stats->{$_}, @skills) { 629 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 630 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 631 my $val = $stats->{$idx};
469 }
470}
471 632
472sub macro_send { 633 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 634
475 for my $cmd (@{ $macro->{action} }) { 635 my $sw = $self->{skillwid}{$idx};
476 $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);
477 } 642 }
478} 643}
479 644
480sub user_send { 645sub user_send {
481 my ($self, $command) = @_; 646 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 648 $self->{record}->($command)
484 if $self->{record}; 649 if $self->{record};
485 650
486 $self->logprint ("send: ", $command); 651 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 652 $self->send_command ($command);
488 ::status ($command);
489} 653}
490 654
491sub record { 655sub record {
492 my ($self, $cb) = @_; 656 my ($self, $cb) = @_;
493 657
… …
495} 659}
496 660
497sub map_scroll { 661sub map_scroll {
498 my ($self, $dx, $dy) = @_; 662 my ($self, $dx, $dy) = @_;
499 663
500 $self->{map}->scroll ($dx, $dy); 664 $self->{map_widget}->scroll ($dx, $dy);
501} 665}
502 666
503sub feed_map1a { 667sub feed_map1a {
504 my ($self, $data) = @_; 668 my ($self, $data) = @_;
505 669
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 670 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
671 my $delay;
672
673 for my $tile (@$missing) {
674 next if $self->{delay}{$tile};
675
676 $delay = 1;
677
678 if (my $tex = $self->{texture}[$tile]) {
679 $tex->upload;
680 } else {
681 $self->{delay}{$tile} = 1;
682
683 # we assume the face is in-flight and will eventually arrive
684 push @{$self->{tile_cb}{$tile}}, sub {
685 delete $self->{delay}{$tile};
686 $_[0]->upload;
687 };
688 }
689 }
690
691 if ($delay) {
692 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
693 EV::once undef, 0, 0.03, sub {
694 $self->{map_widget}->update
695 if $self->{map_widget};
696 };
697 } else {
507 $self->{map_widget}->update; 698 $self->{map_widget}->update;
699 }
508} 700}
509 701
510sub magicmap { 702sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 703 my ($self, $w, $h, $x, $y, $data) = @_;
512 704
… …
514} 706}
515 707
516sub flush_map { 708sub flush_map {
517 my ($self) = @_; 709 my ($self) = @_;
518 710
519 my $map_info = delete $self->{map_info} 711 return unless $self->{map_info};
520 or return;
521 712
713 for my $map_info (values %{ $self->{map_cache} || {} }) {
522 my ($hash, $x, $y, $w, $h) = @$map_info; 714 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
523 715
524 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;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 721 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 722 }
723 }
527} 724}
528 725
529sub map_clear { 726sub map_clear {
530 my ($self) = @_; 727 my ($self) = @_;
531 728
532 $self->flush_map; 729 $self->flush_map;
730 delete $self->{map_info};
533 delete $self->{neigh_map}; 731 delete $self->{neigh_map};
534 732
535 $self->{map}->clear; 733 $self->{map}->clear;
536 delete $self->{map_widget}{magicmap}; 734 delete $self->{map_widget}{magicmap};
537} 735}
538 736
539sub bg_fetch { 737sub bg_fetch {
540 my ($self) = @_; 738 my ($self) = @_;
541 739
542 my $id; 740 my $tile;
543 741
544 do { 742 do {
545 $id = pop @{$self->{bg_fetch}} 743 $tile = pop @{$self->{bg_fetch}}
546 or return; 744 or return;
547 } while $self->{texture}[$id]; 745 } while $self->{texture}[$tile];
548 746
549 CFPlus::DB::exists tilecache => $id, sub { 747 DC::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 748 my ($data) = @_;
551 749
552 return unless $self->{map}; # stop when destroyed 750 return unless $self->{map}; # stop when destroyed
553 751
752 if (defined $data) {
554 $self->have_tile ($id) 753 $self->have_tile ($tile, $data);
555 if $exists; 754 $self->{texture}[$tile]->upload;
755 }
556 756
557 $self->bg_fetch; 757 $self->bg_fetch;
558 }; 758 };
559} 759}
560 760
561sub load_map($$$) { 761sub load_map($$$$$$) {
562 my ($self, $hash, $x, $y) = @_; 762 my ($self, $hash, $x, $y, $w, $h) = @_;
563 763
564 my $gen = $self->{map_change_gen}; 764 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
565 765
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 766 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 767 $map_info->[1] = \$_[0];
568 768
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} || [] }; 769 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 770 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
577 $self->bg_fetch unless $inprogress; 771 $self->bg_fetch unless $inprogress;
578 }
579 }; 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 }
580} 785}
581 786
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 787# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 788# (server resources, latency, bandwidth), so this hack is warranted.
584# 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
585sub send_mapinfo { 790sub send_mapinfo {
586 my ($self, $data, $cb) = @_; 791 my ($self, $data, $cb) = @_;
587 792
588 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)$%) {
… …
613} 818}
614 819
615# this method does a "flood fill" into every tile direction 820# this method does a "flood fill" into every tile direction
616# it assumes that tiles are arranged in a rectangular grid, 821# 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. 822# 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 823# failure to comply is harmless and results in display errors
619# at worst. 824# at worst.
620sub flood_fill { 825sub flood_fill {
621 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 826 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
622 827
623 # the server does not allow map paths > 6 828 # the server does not allow map paths > 6
… …
659 return if $mode ne "spatial"; 864 return if $mode ne "spatial";
660 865
661 $x += $self->{map}->ox; 866 $x += $self->{map}->ox;
662 $y += $self->{map}->oy; 867 $y += $self->{map}->oy;
663 868
664 $self->load_map ($hash, $x, $y) 869 $self->load_map ($hash, $x, $y, $w, $h)
665 unless $self->{neigh_map}{$hash}[5]++;#d# 870 unless $self->{neigh_map}{$hash}[5]++;#d#
666 871
667 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 872 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
668 873
669 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 874 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 882 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 883
679 $self->flush_map; 884 $self->flush_map;
680 885
681 ++$self->{map_change_gen}; 886 ++$self->{map_change_gen};
887 $self->{map_cache_old} = delete $self->{map_cache};
682 888
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 889 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 890
685 my $mapmapw = $self->{mapmap}->{w}; 891 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 892 my $mapmaph = $self->{mapmap}->{h};
… …
698 $self->{map_info} = [$hash, $x, $y, $w, $h]; 904 $self->{map_info} = [$hash, $x, $y, $w, $h];
699 905
700 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 906 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
701 $::STATWIDS->{map}->set_text ("Map: " . $map); 907 $::STATWIDS->{map}->set_text ("Map: " . $map);
702 908
703 $self->load_map ($hash, $x, $y); 909 $self->load_map ($hash, $x, $y, $w, $h);
704 $self->flood_fill (0, 0, 0, "", $hash, $flags); 910 $self->flood_fill (0, 0, 0, "", $hash, $flags);
705} 911}
706 912
707sub face_find { 913sub face_find {
708 my ($self, $facenum, $face, $cb) = @_; 914 my ($self, $facenum, $face, $cb) = @_;
709 915
710 if ($face->{type} == 0) { # FT_FACE 916 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 917 my $id = DC::DB::get_tile_id_sync $face->{name};
712 918
713 $face->{id} = $id; 919 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 920 $self->{map}->set_tileid ($facenum => $id);
717 921
718 CFPlus::DB::get tilecache => $id, $cb; 922 DC::DB::get tilecache => $id, $cb;
719 923
720 } elsif ($face->{type} & 1) { # with metadata 924 } 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; 925 DC::DB::get res_meta => $face->{name}, $cb;
926
927 } else { # no metadata
928 DC::DB::get res_data => $face->{name}, $cb;
723 } 929 }
724} 930}
725 931
726sub face_update { 932sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 933 my ($self, $facenum, $face, $changed) = @_;
728 934
729 if ($face->{type} == 0) { # FT_FACE 935 if ($face->{type} == 0) {
936 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 937 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 938 if $changed;
732 939
733 $self->have_tile ($face->{id}); 940 $self->have_tile ($face->{id}, delete $face->{data});
734 941
735 } elsif ($face->{type} & 1) { # split metadata 942 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 943 # split metadata case, FT_MUSIC, FT_SOUND
944 if ($changed) { # new data
945 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
946 $face->{data} = $meta;
947
948 # rely on strict ordering here and also on later fetch
949 DC::DB::put res_data => $face->{name} => $data, sub { };
950 DC::DB::put res_meta => $face->{name} => $meta, sub { };
951 }
952
953 $face->{data} = $self->{json_coder}->decode ($face->{data});
954 ::add_license ($face);
955 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
956 if $changed;
737 957
738 if ($face->{type} == 3) { # FT_MUSIC 958 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); 959 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 960 } 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); 961 &::audio_sound_push ($facenum);
755 }; 962 }
756 }
757 963
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 { 964 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 965 # flat resource case, FT_RSRC
770 ::add_license ($face); 966 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
771 $cb->(); 967 if $changed;
772 } 968 }
969
970 if (my $cbs = $self->{face_cb}{$facenum}) {
971 $_->($face, $changed) for @$cbs;
773 } 972 }
774} 973}
775 974
776sub smooth_update { 975sub smooth_update {
777 my ($self, $facenum, $face) = @_; 976 my ($self, $facenum, $face) = @_;
778 977
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 978 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 979}
781 980
782sub have_tile { 981sub have_tile {
783 my ($self, $tile) = @_; 982 my ($self, $tile, $data) = @_;
784 983
785 return unless $self->{map}; 984 return unless $self->{map};
786 985
787 $self->{texture}[$tile] ||= my $tex = 986 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 987 new DC::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 988 tile => $tile,
989 image => $data, delete_image => 1,
990 minify => 1, mipmap => 1;
790 991
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 992 if (my $cbs = delete $self->{tile_cb}{$tile}) {
993 $_->($tex) for @$cbs;
994 }
792} 995}
793 996
794sub connect_face_update { 997# call in non-void context registers a temporary
998# hook with handle, otherwise its permanent
999sub on_face_change {
795 my ($self, $id, $cb) = @_; 1000 my ($self, $num, $cb) = @_;
796 1001
797 push @{$self->{face_cb}{$id}}, $cb; 1002 push @{$self->{face_cb}{$num}}, $cb;
798 1003
799 CFPlus::guard { 1004 defined wantarray
1005 ? DC::guard {
800 @{$self->{face_cb}{$id}} 1006 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 1007 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 1008 @{$self->{face_cb}{$num}};
803 } 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)
804} 1026}
805 1027
806sub sound_play { 1028sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 1029 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 1030
… …
823 1045
824sub sanitise_xml($) { 1046sub sanitise_xml($) {
825 local $_ = shift; 1047 local $_ = shift;
826 1048
827 # we now weed out all tags we do not support 1049 # we now weed out all tags we do not support
828 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
829 # now all entities 1055 # now all entities
830 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;
831 1057
832 # handle some elements 1058 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1059 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 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+$//;
835 1063
836 $_ 1064 $_
837} 1065}
838 1066
839our %NAME_TO_COLOR = ( 1067our %NAME_TO_COLOR = (
… …
880 $self->{$type} = $text; 1108 $self->{$type} = $text;
881 } else { 1109 } else {
882 $self->logprint ("msg: ", $text); 1110 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1111 return if $color < 0; # negative color == ignore if not understood
884 1112
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1113 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1114
887 ## 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
888 # no longer neecssary with TRT servers 1116 # no longer neecssary with TRT servers
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1117 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
890 1118
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1119 ::message ({
892 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.
893 1132
894 $self->{statusbox}->add ($text, 1133 $self->{statusbox}->add ($text,
895 group => $text, 1134 group => $text,
896 fg => $fg, 1135 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1136 timeout => $color >= 2 ? 180 : 10,
898 tooltip_font => $::FONT_FIXED, 1137 tooltip_font => $::FONT_FIXED,
899 ); 1138 ) if $type eq "info";
900 } 1139 }
901} 1140}
902 1141
903sub spell_add { 1142sub spell_add {
904 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
… …
908 $spell->{message} =~ s/\n+$//; 1147 $spell->{message} =~ s/\n+$//;
909 $spell->{message} ||= "Server did not provide a description for this spell."; 1148 $spell->{message} ||= "Server did not provide a description for this spell.";
910 1149
911 $::SPELL_LIST->add_spell ($spell); 1150 $::SPELL_LIST->add_spell ($spell);
912 1151
913 $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});
914 $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});
915} 1154}
916 1155
917sub spell_delete { 1156sub spell_delete {
918 my ($self, $spell) = @_; 1157 my ($self, $spell) = @_;
919 1158
… …
930sub addme_success { 1169sub addme_success {
931 my ($self) = @_; 1170 my ($self) = @_;
932 1171
933 my %skill_help; 1172 my %skill_help;
934 1173
935 for my $node (CFPlus::Pod::find skill_description => "*") { 1174 for my $node (DC::Pod::find skill_description => "*") {
936 my (undef, @par) = CFPlus::Pod::section_of $node; 1175 my (undef, @par) = DC::Pod::section_of $node;
937 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1176 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
938 }; 1177 };
939 1178
940 for my $skill (values %{$self->{skill_info}}) { 1179 for my $skill (values %{$self->{skill_info}}) {
941 $self->{map_widget}->add_command ("ready_skill $skill", 1180 $self->{map_widget}->add_command ("ready_skill $skill",
942 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1181 (DC::asxml "Ready the skill '$skill'\n\n")
943 . $skill_help{$skill}); 1182 . $skill_help{$skill});
944 $self->{map_widget}->add_command ("use_skill $skill", 1183 $self->{map_widget}->add_command ("use_skill $skill",
945 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1184 (DC::asxml "Immediately use the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1185 . $skill_help{$skill});
947 } 1186 }
948} 1187}
949 1188
950sub eof { 1189sub eof {
… …
954 1193
955 ::stop_game (); 1194 ::stop_game ();
956} 1195}
957 1196
958sub update_floorbox { 1197sub update_floorbox {
959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1198 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
960 return unless $::CONN; 1199 return unless $::CONN;
961 1200
962 $::FLOORBOX->clear; 1201 $::FLOORBOX->clear;
963 1202
964 my @add; 1203 my @add;
965 1204
966 my $row; 1205 my $row;
967 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;
968 if ($row < 6) { 1208 if ($row < 6) {
969 local $_->{face_widget}; # hack to force recreation of widget 1209 local $_->{face_widget}; # hack to force recreation of widget
970 local $_->{desc_widget}; # hack to force recreation of widget 1210 local $_->{desc_widget}; # hack to force recreation of widget
971 CFPlus::Item::update_widgets $_; 1211 DC::Item::update_widgets $_;
972 1212
973 push @add, 1213 push @add,
974 0, $row, $_->{face_widget}, 1214 0, $row, $_->{face_widget},
975 1, $row, $_->{desc_widget}; 1215 1, $row, $_->{desc_widget};
976 1216
977 $row++; 1217 $row++;
978 } else { 1218 } else {
979 push @add, 1, $row, new CFPlus::UI::Button 1219 push @add, 1, $row, new DC::UI::Button
980 text => "More...", 1220 text => "More...",
981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1221 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
982 ; 1222 ;
983 last; 1223 last;
984 } 1224 }
985 } 1225 }
986 if ($::CONN->{open_container}) { 1226 if ($::CONN->{open_container}) {
987 push @add, 1, $row++, new CFPlus::UI::Button 1227 push @add, 1, $row++, new DC::UI::Button
988 text => "Close container", 1228 text => "Close container",
989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1229 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
990 ; 1230 ;
991 } 1231 }
992 1232
993 $::FLOORBOX->add_at (@add); 1233 $::FLOORBOX->add_at (@add);
994 }); 1234 });
995 1235
996 $::WANT_REFRESH++; 1236 $::WANT_REFRESH = 1;
997} 1237}
998 1238
999sub set_opencont { 1239sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1240 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1241 $conn->{open_container} = $tag;
1002 update_floorbox; 1242 update_floorbox;
1003 1243
1004 $::INV_RIGHT_HB->clear (); 1244 $::INVR_HB->clear;
1005 $::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);
1006 1246
1007 if ($tag != 0) { # Floor isn't closable, is it? 1247 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1248 $::INVR_HB->add (new DC::UI::Button
1009 text => "Close container", 1249 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1250 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1251 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1252 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1253 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1254 0
1016 }, 1255 },
1017 ); 1256 );
1018 } 1257 }
1019 1258
… …
1021} 1260}
1022 1261
1023sub update_containers { 1262sub update_containers {
1024 my ($self) = @_; 1263 my ($self) = @_;
1025 1264
1026 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1265 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1027 my $todo = delete $self->{update_container} 1266 my $todo = delete $self->{update_container}
1028 or return; 1267 or return;
1029 1268
1030 for my $tag (keys %$todo) { 1269 for my $tag (keys %$todo) {
1031 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1270 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1066} 1305}
1067 1306
1068sub item_update { 1307sub item_update {
1069 my ($self, $item) = @_; 1308 my ($self, $item) = @_;
1070 1309
1071 #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";
1072 1311
1073 CFPlus::Item::update_widgets $item; 1312 DC::Item::update_widgets $item;
1074 1313
1075 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1314 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1076 set_opencont ($::CONN, 0, "Floor"); 1315 set_opencont ($::CONN, 0, "Floor");
1077 1316
1078 } elsif ($item->{flags} & F_OPEN) { 1317 } elsif ($item->{flags} & F_OPEN) {
1079 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1318 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1080 1319
1081 } else { 1320 } else {
1082 $self->{update_container}{$item->{container}}++; 1321 $self->{update_container}{$item->{container}}++;
1083 $self->update_containers; 1322 $self->update_containers;
1084 } 1323 }
… …
1095 1334
1096 my $weight = .001 * $self->{player}{weight}; 1335 my $weight = .001 * $self->{player}{weight};
1097 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1336 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1098 1337
1099 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1338 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1100 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1339 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1101 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1340 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1102} 1341}
1103 1342
1104sub update_server_info { 1343sub update_server_info {
1105 my ($self) = @_; 1344 my ($self) = @_;
… …
1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1352 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1353 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1115 . "editing support $yesno[!!$self->{editor_support}]\n" 1354 . "editing support $yesno[!!$self->{editor_support}]\n"
1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1355 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1356 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1357 . "client support $yesno[$self->{cfplus_ext} > 0]"
1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1358 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1120 . "map size $self->{mapw}×$self->{maph}\n" 1359 . "map size $self->{mapw}×$self->{maph}\n"
1121 ); 1360 );
1122 1361
1123} 1362}
… …
1143 0 1382 0
1144 }); 1383 });
1145 1384
1146 $self->update_server_info; 1385 $self->update_server_info;
1147 1386
1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $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;
1151 $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#
1152} 1392}
1153 1393
1154sub lookat { 1394sub lookat {
1155 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1156 1396
… …
1158 $self->send_ext_req (lookat => $x, $y, sub { 1398 $self->send_ext_req (lookat => $x, $y, sub {
1159 my (%msg) = @_; 1399 my (%msg) = @_;
1160 1400
1161 if (exists $msg{npc_dialog}) { 1401 if (exists $msg{npc_dialog}) {
1162 # start npc chat dialog 1402 # start npc chat dialog
1163 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1403 $self->{npc_dialog} = new DC::NPCDialog::
1164 token => $msg{npc_dialog}, 1404 token => $msg{npc_dialog},
1165 title => "$msg{npc_dialog}[0] (NPC)", 1405 title => "$msg{npc_dialog}[0] (NPC)",
1166 conn => $self, 1406 conn => $self,
1167 ; 1407 ;
1168 } 1408 }
… …
1181 $self->SUPER::destroy; 1421 $self->SUPER::destroy;
1182 1422
1183 %$self = (); 1423 %$self = ();
1184} 1424}
1185 1425
1186package CFPlus::NPCDialog; 1426package DC::NPCDialog;
1187 1427
1188our @ISA = 'CFPlus::UI::Toplevel'; 1428our @ISA = 'DC::UI::Toplevel';
1189 1429
1190sub new { 1430sub new {
1191 my $class = shift; 1431 my $class = shift;
1192 1432
1193 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
… …
1200 kw => { hi => 0, yes => 0, no => 0 }, 1440 kw => { hi => 0, yes => 0, no => 0 },
1201 has_close_button => 1, 1441 has_close_button => 1,
1202 @_, 1442 @_,
1203 ); 1443 );
1204 1444
1205 CFPlus::weaken (my $this = $self); 1445 DC::weaken (my $this = $self);
1206 1446
1207 $self->connect (delete => sub { $this->destroy; 1 }); 1447 $self->connect (delete => sub { $this->destroy; 1 });
1208 1448
1209 # better use a pane... 1449 # better use a pane...
1210 $self->add (my $hbox = new CFPlus::UI::HBox); 1450 $self->add (my $hbox = new DC::UI::HBox);
1211 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1451 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1212 1452
1213 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1453 $hbox->add (my $vbox = new DC::UI::VBox);
1214 1454
1215 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1455 $vbox->add (new DC::UI::Label text => "Message Entry:");
1216 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1456 $vbox->add ($self->{entry} = new DC::UI::Entry
1217 tooltip => "#npc_message_entry", 1457 tooltip => "#npc_message_entry",
1218 on_activate => sub { 1458 on_activate => sub {
1219 my ($entry, $text) = @_; 1459 my ($entry, $text) = @_;
1220 1460
1221 return unless $text =~ /\S/; 1461 return unless $text =~ /\S/;
… …
1225 1465
1226 0 1466 0
1227 }, 1467 },
1228 ); 1468 );
1229 1469
1230 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1470 $vbox->add ($self->{options} = new DC::UI::VBox);
1231 1471
1232 $self->{bye_button} = new CFPlus::UI::Button 1472 $self->{bye_button} = new DC::UI::Button
1233 text => "Bye (close)", 1473 text => "Bye (close)",
1234 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.",
1235 on_activate => sub { $this->destroy; 1 }, 1475 on_activate => sub { $this->destroy; 1 },
1236 ; 1476 ;
1237 1477
… …
1256}; 1496};
1257 1497
1258sub update_options { 1498sub update_options {
1259 my ($self) = @_; 1499 my ($self) = @_;
1260 1500
1261 CFPlus::weaken $self; 1501 DC::weaken $self;
1262 1502
1263 $self->{options}->clear; 1503 $self->{options}->clear;
1264 $self->{options}->add ($self->{bye_button}); 1504 $self->{options}->add ($self->{bye_button});
1265 1505
1266 for my $kw (sort keys %{ $self->{kw} }) { 1506 for my $kw (sort keys %{ $self->{kw} }) {
1267 $self->{options}->add (new CFPlus::UI::Button 1507 $self->{options}->add (new DC::UI::Button
1268 text => $kw, 1508 text => $kw,
1269 on_activate => sub { 1509 on_activate => sub {
1270 $self->send ($kw); 1510 $self->send ($kw);
1271 0 1511 0
1272 }, 1512 },
… …
1275} 1515}
1276 1516
1277sub feed { 1517sub feed {
1278 my ($self, $type, @arg) = @_; 1518 my ($self, $type, @arg) = @_;
1279 1519
1280 CFPlus::weaken $self; 1520 DC::weaken $self;
1281 1521
1282 if ($type eq "update") { 1522 if ($type eq "update") {
1283 my (%info) = @arg; 1523 my (%info) = @arg;
1284 1524
1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1525 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1526 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287 1527
1288 if (exists $info{msg}) { 1528 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1529 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1290 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} };
1291 my @link; 1531 my @link;
1292 $text =~ s{ 1532 $text =~ s{
1293 ($match) 1533 ($match)
1294 }{ 1534 }{
1295 my $kw = $1; 1535 my $kw = $1;
1296 1536
1297 push @link, new CFPlus::UI::Label 1537 push @link, new DC::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1538 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1, 1539 can_hover => 1,
1300 can_events => 1, 1540 can_events => 1,
1301 padding_x => 0, 1541 padding_x => 0,
1302 padding_y => 0, 1542 padding_y => 0,
… …
1320} 1560}
1321 1561
1322sub send { 1562sub send {
1323 my ($self, $msg) = @_; 1563 my ($self, $msg) = @_;
1324 1564
1325 $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 });
1326 $self->{textview}->scroll_to_bottom; 1571 $self->{textview}->scroll_to_bottom;
1327 1572
1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1573 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1329} 1574}
1330 1575

Diff Legend

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