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

Diff Legend

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