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.153 by root, Mon Aug 13 14:24:17 2007 UTC vs.
Revision 1.213 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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