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.156 by root, Tue Aug 21 00:59:34 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 xwidget1 => 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 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71
72 #TODO: update all interested parties
73 });
74
75 ()
76 });
77
78 if (my $ts = $cap{tileset}) {
79 if (my ($default) = grep $_->[2] & 1, @$ts) {
80 $self->{tileset} = $default;
81 $self->{tilesize} = $default->[3];
82 $self->setup_req (tileset => $default->[0]);
83
84 my $w = int $self->{mapw} * 32 / $self->{tilesize};
85 my $h = int $self->{maph} * 32 / $self->{tilesize};
86
87 $self->setup_req (mapsize => "${w}x${h}");
88 }
89 }
90 });
91 56
92 $self->{json_coder} 57 $self->{json_coder}
93 ->convert_blessed 58 ->convert_blessed
94 ->filter_json_single_key_object (__w_ => sub { 59 ->filter_json_single_key_object ("\fw" => sub {
95 $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 }
96 }); 67 });
97
98 # widgetset new
99 $self->connect_ext (ws_n => sub {
100 my ($id) = @_;
101
102 $self->{widgetset}{$id} = {
103 w => {},
104 };
105 });
106
107 # widgetset destroy
108 $self->connect_ext (ws_d => sub {
109 my ($id) = @_;
110
111 my $ws = delete $self->{widgetset}{$id}
112 or return;
113
114 $_->destroy
115 for values %{$ws->{w}};
116 });
117
118 # widgetset create
119 $self->connect_ext (ws_c => sub {
120 my ($ws, $id, $class, $args) = @_;
121
122 for my $ev (grep /^on_/, keys %$args) {
123 my $rid = $args->{$ev};
124 $args->{$ev} = sub {
125 my $id = shift->{s_id};
126 $self->send_exti_msg (w_e => $id, $rid, @_);
127
128 1
129 };
130 }
131
132 $self->widget_associate (
133 $ws, $id => scalar eval {
134 local $SIG{__DIE__};
135 "CFPlus::UI::$class"->new (%$args)
136 }
137 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 });
139
140 # widgetset associate
141 $self->connect_ext (ws_a => sub {
142 my (%ass) = @_;
143
144 # everything that has a name, wether conceivably useful or not
145 my %wkw = (
146 root => $CFPlus::UI::ROOT,
147 tooltip => $CFPlus::UI::TOOLTIP,
148
149 mapwidget => $::MAPWIDGET,
150 buttonbar => $::BUTTONBAR,
151 metaserver => $::METASERVER,
152 buttonbar => $::BUTTONBAR,
153 login_button => $::LOGIN_BUTTON,
154 quit_dialog => $::QUIT_DIALOG,
155 host_entry => $::HOST_ENTRY,
156 metaserver => $::METASERVER,
157 server_info => $::SERVER_INFO,
158
159 setup_dialog => $::SETUP_DIALOG,
160 setup_notebook => $::SETUP_NOTEBOOK,
161 setup_server => $::SETUP_SERVER,
162 setup_keyboard => $::SETUP_KEYBOARD,
163
164 pl_notebook => $::PL_NOTEBOOK,
165 pl_window => $::PL_WINDOW,
166 inventory_page => $::INVENTORY_PAGE,
167 stats_page => $::STATS_PAGE,
168 skill_page => $::SKILL_PAGE,
169 spell_page => $::SPELL_PAGE,
170 spell_list => $::SPELL_LIST,
171
172 floorbox => $::FLOORBOX,
173 help_window => $::HELP_WINDOW,
174 message_window => $::MESSAGE_WINDOW,
175 statusbox => $::SDTATUSBOX,
176
177 inv => $::INV,
178 invr => $::INVR,
179 invr_hb => $::INVR_HB,
180
181 );
182
183 while (my ($id, $name) = each %ass) {
184 $self->widget_associate (undef, $id => $wkw{$name})
185 or warn "server failed to associate non-existent well-known widget $name\n";
186 }
187 });
188
189 # widget call
190 $self->connect_ext (w_c => sub {
191 my ($id, $rid, $method, @args) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 if ($rid) {
197 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
198 } else {
199 $w->$method (@args);
200 }
201 });
202
203 # widget set
204 $self->connect_ext (w_s => sub {
205 my ($id, $attr) = @_;
206
207 my $w = $self->{widget}{$id}
208 or return;
209
210 for (my $i = 0; $i < $#$attr; $i += 2) {
211 my ($member, $value) = @$attr[$i, $i+1];
212 if (defined $value) {
213 $w->{$member} = $value;
214 } else {
215 delete $w->{$member};
216 }
217 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
218 }
219 });
220
221 # widget get
222 $self->connect_ext (w_g => sub {
223 my ($id, $rid, $attr) = @_;
224
225 my $w = $self->{widget}{$id}
226 or return;
227
228 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
229 });
230
231 # message window
232 $self->connect_ext (channel_info => sub {
233 my ($info) = @_;
234 $self->{channels}->{$info->{id}} = $info;
235 $::MESSAGE_WINDOW->add_channel ($info);
236 });
237 68
238 # destroy widgets on logout 69 # destroy widgets on logout
239 $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 {
240 for my $ws (values %{delete $self->{widgetset} || {}}) { 71 for my $ws (values %{delete $self->{widgetset} || {}}) {
241 $_->destroy 72 $_->destroy
242 for values %{delete $ws->{w} || {}}; 73 for values %{delete $ws->{w} || {}};
243 } 74 }
75
76 delete $self->{items};
77 $::INV->clear;
78 $::INVR_HB->clear;
79 $::FLOORBOX->clear;
244 }); 80 });
245 81
246 $self->{map_widget}->add_command (@$_) 82 $self->{map_widget}->add_command (@$_)
247 for @cmd_help; 83 for @cmd_help;
248 84
249 { 85 {
250 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 86 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
251 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
252 $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}});
253 } 88 }
254 89
255 { 90 {
256 $self->{noface} = my $tex = new_from_file CFPlus::Texture 91 $self->{noface} = my $tex = $TEX_NOFACE;
257 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
258 $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}});
259 } 93 }
260 94
261 $self->{open_container} = 0; 95 $self->{open_container} = 0;
262 96
263 # per server 97 # per server
264 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 98 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
265 99
266 $self 100 $self
267}
268
269sub widget_associate {
270 my ($self, $ws, $id, $widget) = @_;
271
272 if ($widget) {
273 $widget->{s_id} = $id;
274 $self->{widget}{$id} = $widget;
275
276 if ($ws) {
277 $widget->{s_ws} = $ws;
278 $self->{widgetset}{$ws}{w}{$id} = $widget;
279 }
280
281 $widget->connect (on_destroy => sub {
282 my ($widget) = @_;
283
284 delete $self->{widget}{$widget->{s_id}};
285 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
286 if exists $widget->{s_ws};
287 });
288
289 1
290 } else {
291 $self->send_exti_msg (w_e => $id, undef);
292
293 0
294 }
295} 101}
296 102
297sub update_fx_want { 103sub update_fx_want {
298 my ($self) = @_; 104 my ($self) = @_;
299 105
302 5 => !!$::CFG->{audio_enable}, # FT_SOUND 108 5 => !!$::CFG->{audio_enable}, # FT_SOUND
303 6 => 1, # FT_RSRC 109 6 => 1, # FT_RSRC
304 }); 110 });
305} 111}
306 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
307sub logprint { 353sub logprint {
308 my ($self, @a) = @_; 354 my ($self, @a) = @_;
309 355
310 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 356 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
311} 357}
312 358
313sub _stat_numdiff { 359sub _stat_numdiff {
314 my ($self, $name, $old, $new) = @_; 360 my ($self, $name, $old, $new) = @_;
315 361
399 445
400 if ( 446 if (
401 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 447 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
402 ) { 448 ) {
403 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 449 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
404 $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);
405 } 451 }
406 452
407 $self->update_stats_window ($stats, $prev); 453 $self->update_stats_window ($stats, $prev);
408 454
409 $self->{prev_stats} = { %$stats }; 455 $self->{prev_stats} = { %$stats };
448 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 494 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
449 $::GAUGES->{food} ->set_value ($fo, $fo_m); 495 $::GAUGES->{food} ->set_value ($fo, $fo_m);
450 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 496 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
451 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 497 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
452 . " (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});
453 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 500 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
454 my $title = $stats->{+CS_STAT_TITLE}; 501 my $title = $stats->{+CS_STAT_TITLE};
455 $title =~ s/^Player: //; 502 $title =~ s/^Player: //;
456 $::STATWIDS->{title} ->set_text ("Title: " . $title); 503 $::STATWIDS->{title} ->set_text ("Title: " . $title);
457 504
475 for keys %RES_TBL; 522 for keys %RES_TBL;
476 523
477 my $sktbl = $::STATWIDS->{skill_tbl}; 524 my $sktbl = $::STATWIDS->{skill_tbl};
478 my @skills = keys %{ $self->{skill_info} }; 525 my @skills = keys %{ $self->{skill_info} };
479 526
480 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
481 $sktbl->clear; 535 $sktbl->clear;
482 536
483 my @add; 537 my $sw = $self->{skillwid}{""} ||= [
484
485 push @add,
486 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 538 0, 0, (new DC::UI::Label text => "Experience", align => 1),
487 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"),
488 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 541 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 542 4, 0, (new DC::UI::Label text => "Experience", align => 1),
490 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"),
491 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 545 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
492 ; 546 ];
547
548 my @add = @$sw;
493 549
494 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>";
495 551
496 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);
497 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);
498 554
499 my ($x, $y) = (0, 1); 555 my ($x, $y) = (0, 1);
500 for ( 556 for (@order) {
501 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
502 map [$_, $self->{skill_info}{$_}],
503 grep exists $stats->{$_},
504 @skills
505 ) {
506 my ($idx, $name) = @$_; 557 my ($idx, $name) = @$_;
507 558
508 my $spell_cb = sub { 559 my $spell_cb = sub {
509 my ($widget, $ev) = @_; 560 my ($widget, $ev) = @_;
510 561
511 if ($ev->{button} == 1) { 562 if ($ev->{button} == 1) {
512 $::CONN->user_send ("ready_skill $name"); 563 $::CONN->user_send ("ready_skill $name");
513 } elsif ($ev->{button} == 2) { 564 } elsif ($ev->{button} == 2) {
514 $::CONN->user_send ("use_skill $name"); 565 $::CONN->user_send ("use_skill $name");
515 } elsif ($ev->{button} == 3) { 566 } elsif ($ev->{button} == 3) {
516 my $shortname = CFPlus::shorten $name, 14; 567 my $shortname = DC::shorten $name, 14;
517 (new CFPlus::UI::Menu 568 (new DC::UI::Menu
518 items => [ 569 items => [
519 ["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"] }],
520 ["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"] }],
521 ], 572 ],
522 )->popup ($ev); 573 )->popup ($ev);
523 } else { 574 } else {
524 return 0; 575 return 0;
525 } 576 }
526 577
527 1 578 1
528 }; 579 };
529 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
530 push @add, 598 push @add,
531 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 599 $x * 4 + 0, $y, $sw->[0],
532 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 600 $x * 4 + 1, $y, $sw->[1],
533 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 601 $x * 4 + 2, $y, $sw->[2],
534 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],
535 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
536 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
537 ; 603 ;
538 604
539 $x++ and ($x, $y) = (0, $y + 1); 605 $x++ and ($x, $y) = (0, $y + 1);
540 } 606 }
541 607
542 $sktbl->add_at (@add); 608 $sktbl->add_at (@add);
543 } 609 }
544 610
545 for (grep exists $stats->{$_}, @skills) { 611 for (@order) {
546 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 612 my ($idx, $name) = @$_;
547 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 613 my $val = $stats->{$idx};
548 }
549}
550 614
551sub macro_send { 615 next if $prev->{$idx}[1] eq $val->[1];
552 my ($self, $macro) = @_;
553 616
554 for my $cmd (@{ $macro->{action} }) { 617 my $sw = $self->{skillwid}{$idx};
555 $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);
556 } 624 }
557} 625}
558 626
559sub user_send { 627sub user_send {
560 my ($self, $command) = @_; 628 my ($self, $command) = @_;
562 $self->{record}->($command) 630 $self->{record}->($command)
563 if $self->{record}; 631 if $self->{record};
564 632
565 $self->logprint ("send: ", $command); 633 $self->logprint ("send: ", $command);
566 $self->send_command ($command); 634 $self->send_command ($command);
567 ::status ($command);
568} 635}
569 636
570sub record { 637sub record {
571 my ($self, $cb) = @_; 638 my ($self, $cb) = @_;
572 639
574} 641}
575 642
576sub map_scroll { 643sub map_scroll {
577 my ($self, $dx, $dy) = @_; 644 my ($self, $dx, $dy) = @_;
578 645
579 $self->{map}->scroll ($dx, $dy); 646 $self->{map_widget}->scroll ($dx, $dy);
580} 647}
581 648
582sub feed_map1a { 649sub feed_map1a {
583 my ($self, $data) = @_; 650 my ($self, $data) = @_;
584 651
603 } 670 }
604 } 671 }
605 672
606 if ($delay) { 673 if ($delay) {
607 # delay the map drawing a tiny bit in the hope of getting the missing fetched 674 # delay the map drawing a tiny bit in the hope of getting the missing fetched
608 Event->timer (after => 0.03, cb => sub { 675 EV::once undef, 0, 0.03, sub {
609 $_[0]->w->cancel;
610 $self->{map_widget}->update; 676 $self->{map_widget}->update
677 if $self->{map_widget};
611 }); 678 };
612 } else { 679 } else {
613 $self->{map_widget}->update; 680 $self->{map_widget}->update;
614 } 681 }
615} 682}
616 683
621} 688}
622 689
623sub flush_map { 690sub flush_map {
624 my ($self) = @_; 691 my ($self) = @_;
625 692
626 my $map_info = delete $self->{map_info} 693 return unless $self->{map_info};
627 or return;
628 694
695 for my $map_info (values %{ $self->{map_cache} || {} }) {
629 my ($hash, $x, $y, $w, $h) = @$map_info; 696 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
630 697
631 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 698 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
632 $self->{map_cache_new}{$hash} = \$data; 699
700 if ($data ne $$rdata) {
701 $map_info->[1] = \$data;
702 my $cdata = Compress::LZF::compress $data;
633 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 703 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
704 }
705 }
634} 706}
635 707
636sub map_clear { 708sub map_clear {
637 my ($self) = @_; 709 my ($self) = @_;
638 710
639 $self->flush_map; 711 $self->flush_map;
712 delete $self->{map_info};
640 delete $self->{neigh_map}; 713 delete $self->{neigh_map};
641 714
642 $self->{map}->clear; 715 $self->{map}->clear;
643 delete $self->{map_widget}{magicmap}; 716 delete $self->{map_widget}{magicmap};
644} 717}
651 do { 724 do {
652 $tile = pop @{$self->{bg_fetch}} 725 $tile = pop @{$self->{bg_fetch}}
653 or return; 726 or return;
654 } while $self->{texture}[$tile]; 727 } while $self->{texture}[$tile];
655 728
656 CFPlus::DB::get tilecache => $tile, sub { 729 DC::DB::get tilecache => $tile, sub {
657 my ($data) = @_; 730 my ($data) = @_;
658 731
659 return unless $self->{map}; # stop when destroyed 732 return unless $self->{map}; # stop when destroyed
660 733
661 if (defined $data) { 734 if (defined $data) {
665 738
666 $self->bg_fetch; 739 $self->bg_fetch;
667 }; 740 };
668} 741}
669 742
670sub load_map($$$) { 743sub load_map($$$$$$) {
671 my ($self, $hash, $x, $y) = @_; 744 my ($self, $hash, $x, $y, $w, $h) = @_;
672 745
673 my $gen = $self->{map_change_gen}; 746 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
674 747
675 my $cb = sub { 748 my $cb = sub {
676 return unless $gen == $self->{map_change_gen}; 749 $map_info->[1] = \$_[0];
677 750
678 my ($data) = @_;
679
680 if (defined $data) {
681 $self->{map_cache_new}{$hash} = \$data;
682
683 my $data = Compress::LZF::decompress $data;
684
685 my $inprogress = @{ $self->{bg_fetch} || [] }; 751 my $inprogress = @{ $self->{bg_fetch} || [] };
686 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 752 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
687 $self->bg_fetch unless $inprogress; 753 $self->bg_fetch unless $inprogress;
688 }
689 }; 754 };
690 755
691 if (my $rdata = $self->{map_cache_old}{$hash}) { 756 if (my $map_info = $self->{map_cache_old}{$hash}) {
692 $cb->($$rdata); 757 $cb->(${ $map_info->[1] });
693 } else { 758 } else {
759 my $gen = $self->{map_change_gen};
760
694 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 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 };
695 } 766 }
696} 767}
697 768
698# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 769# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
699# (server resource,s latency, bandwidth), so this hack is warranted. 770# (server resources, latency, bandwidth), so this hack is warranted.
700# 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
701sub send_mapinfo { 772sub send_mapinfo {
702 my ($self, $data, $cb) = @_; 773 my ($self, $data, $cb) = @_;
703 774
704 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)$%) {
729} 800}
730 801
731# this method does a "flood fill" into every tile direction 802# this method does a "flood fill" into every tile direction
732# it assumes that tiles are arranged in a rectangular grid, 803# it assumes that tiles are arranged in a rectangular grid,
733# 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.
734# failure to comply are harmless and result in display errors 805# failure to comply is harmless and results in display errors
735# at worst. 806# at worst.
736sub flood_fill { 807sub flood_fill {
737 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 808 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
738 809
739 # the server does not allow map paths > 6 810 # the server does not allow map paths > 6
775 return if $mode ne "spatial"; 846 return if $mode ne "spatial";
776 847
777 $x += $self->{map}->ox; 848 $x += $self->{map}->ox;
778 $y += $self->{map}->oy; 849 $y += $self->{map}->oy;
779 850
780 $self->load_map ($hash, $x, $y) 851 $self->load_map ($hash, $x, $y, $w, $h)
781 unless $self->{neigh_map}{$hash}[5]++;#d# 852 unless $self->{neigh_map}{$hash}[5]++;#d#
782 853
783 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 854 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
784 855
785 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 856 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
793 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 864 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
794 865
795 $self->flush_map; 866 $self->flush_map;
796 867
797 ++$self->{map_change_gen}; 868 ++$self->{map_change_gen};
798 $self->{map_cache_old} = delete $self->{map_cache_new}; 869 $self->{map_cache_old} = delete $self->{map_cache};
799 870
800 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 871 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
801 872
802 my $mapmapw = $self->{mapmap}->{w}; 873 my $mapmapw = $self->{mapmap}->{w};
803 my $mapmaph = $self->{mapmap}->{h}; 874 my $mapmaph = $self->{mapmap}->{h};
815 $self->{map_info} = [$hash, $x, $y, $w, $h]; 886 $self->{map_info} = [$hash, $x, $y, $w, $h];
816 887
817 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 888 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
818 $::STATWIDS->{map}->set_text ("Map: " . $map); 889 $::STATWIDS->{map}->set_text ("Map: " . $map);
819 890
820 $self->load_map ($hash, $x, $y); 891 $self->load_map ($hash, $x, $y, $w, $h);
821 $self->flood_fill (0, 0, 0, "", $hash, $flags); 892 $self->flood_fill (0, 0, 0, "", $hash, $flags);
822} 893}
823 894
824sub face_find { 895sub face_find {
825 my ($self, $facenum, $face, $cb) = @_; 896 my ($self, $facenum, $face, $cb) = @_;
826 897
827 if ($face->{type} == 0) { # FT_FACE 898 if ($face->{type} == 0) { # FT_FACE
828 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 899 my $id = DC::DB::get_tile_id_sync $face->{name};
829 900
830 $face->{id} = $id; 901 $face->{id} = $id;
831 $self->{map}->set_tileid ($facenum => $id); 902 $self->{map}->set_tileid ($facenum => $id);
832 903
833 CFPlus::DB::get tilecache => $id, $cb; 904 DC::DB::get tilecache => $id, $cb;
834 905
835 } elsif ($face->{type} & 1) { # with metadata 906 } elsif ($face->{type} & 1) { # with metadata
836 CFPlus::DB::get res_meta => $face->{name}, $cb; 907 DC::DB::get res_meta => $face->{name}, $cb;
837 908
838 } else { # no metadata 909 } else { # no metadata
839 CFPlus::DB::get res_data => $face->{name}, $cb; 910 DC::DB::get res_data => $face->{name}, $cb;
840 } 911 }
841} 912}
842 913
843sub face_update { 914sub face_update {
844 my ($self, $facenum, $face, $changed) = @_; 915 my ($self, $facenum, $face, $changed) = @_;
845 916
846 if ($face->{type} == 0) { 917 if ($face->{type} == 0) {
847 # image, FT_FACE 918 # image, FT_FACE
848 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 919 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
849 if $changed; 920 if $changed;
850 921
851 $self->have_tile ($face->{id}, delete $face->{data}); 922 $self->have_tile ($face->{id}, delete $face->{data});
852 923
853 } elsif ($face->{type} & 1) { 924 } elsif ($face->{type} & 1) {
854 # split metadata case, FT_MUSIC, FT_SOUND 925 # split metadata case, FT_MUSIC, FT_SOUND
855 if ($changed) { # new data 926 if ($changed) { # new data
856 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 927 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
857 $face->{data} = $meta; 928 $face->{data} = $meta;
858 929
930 # rely on strict ordering here and also on later fetch
859 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 931 DC::DB::put res_data => $face->{name} => $data, sub { };
860 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 932 DC::DB::put res_meta => $face->{name} => $meta, sub { };
861 } 933 }
862 934
863 $face->{data} = $self->{json_coder}->decode ($face->{data}); 935 $face->{data} = $self->{json_coder}->decode ($face->{data});
864
865 ::add_license ($face); 936 ::add_license ($face);
937 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
938 if $changed;
866 939
867 if ($face->{type} == 3) { # FT_MUSIC 940 if ($face->{type} == 3) { # FT_MUSIC
868 ::message ({ markup => "downloaded song #$facenum" })
869 if $changed;
870
871 &::audio_music_push ($facenum); 941 &::audio_music_push ($facenum);
872 } elsif ($face->{type} == 5) { # FT_SOUND 942 } elsif ($face->{type} == 5) { # FT_SOUND
873 ::message ({ markup => "downloaded sound #$facenum" })
874 if $changed;
875
876 &::audio_sound_push ($facenum); 943 &::audio_sound_push ($facenum);
877 } 944 }
878 945
879 } else { 946 } else {
880 # flat resource case, FT_RSRC 947 # flat resource case, FT_RSRC
881 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 948 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
882 if $changed; 949 if $changed;
883 } 950 }
884 951
885 if (my $cbs = $self->{face_cb}{$facenum}) { 952 if (my $cbs = $self->{face_cb}{$facenum}) {
886 $_->($face, $changed) for @$cbs; 953 $_->($face, $changed) for @$cbs;
897 my ($self, $tile, $data) = @_; 964 my ($self, $tile, $data) = @_;
898 965
899 return unless $self->{map}; 966 return unless $self->{map};
900 967
901 my $tex = $self->{texture}[$tile] ||= 968 my $tex = $self->{texture}[$tile] ||=
902 new CFPlus::Texture 969 new DC::Texture
903 tile => $tile, 970 tile => $tile,
904 image => $data, delete_image => 1, 971 image => $data, delete_image => 1,
905 minify => 1, mipmap => 1; 972 minify => 1, mipmap => 1;
906 973
907 if (my $cbs = delete $self->{tile_cb}{$tile}) { 974 if (my $cbs = delete $self->{tile_cb}{$tile}) {
915 my ($self, $num, $cb) = @_; 982 my ($self, $num, $cb) = @_;
916 983
917 push @{$self->{face_cb}{$num}}, $cb; 984 push @{$self->{face_cb}{$num}}, $cb;
918 985
919 defined wantarray 986 defined wantarray
920 ? CFPlus::guard { 987 ? DC::guard {
921 @{$self->{face_cb}{$num}} 988 @{$self->{face_cb}{$num}}
922 = grep $_ != $cb, 989 = grep $_ != $cb,
923 @{$self->{face_cb}{$num}}; 990 @{$self->{face_cb}{$num}};
924 } 991 }
925 : () 992 : ()
928# call in non-void context registers a temporary 995# call in non-void context registers a temporary
929# hook with handle, otherwise its permanent 996# hook with handle, otherwise its permanent
930sub register_face_handler { 997sub register_face_handler {
931 my ($self, $num, $cb) = @_; 998 my ($self, $num, $cb) = @_;
932 999
1000 return unless $num;
1001
933 # invoke if available right now 1002 # invoke if available right now
934 $cb->($self->{face}[$num], 0) 1003 $cb->($self->{face}[$num], 0)
935 unless exists $self->{face}[$num]{loading}; 1004 unless exists $self->{face}[$num]{loading};
936 1005
937 # future changes 1006 # future changes
958 1027
959sub sanitise_xml($) { 1028sub sanitise_xml($) {
960 local $_ = shift; 1029 local $_ = shift;
961 1030
962 # we now weed out all tags we do not support 1031 # we now weed out all tags we do not support
963 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
964 # now all entities 1037 # now all entities
965 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;
966 1039
967 # handle some elements 1040 # handle some elements
968 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1041 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
969 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+$//;
970 1045
971 $_ 1046 $_
972} 1047}
973 1048
974our %NAME_TO_COLOR = ( 1049our %NAME_TO_COLOR = (
1021 1096
1022 ## 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
1023 # no longer neecssary with TRT servers 1098 # no longer neecssary with TRT servers
1024 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1099 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1025 1100
1101 for (split /\n/, $text) {
1026 ::message ({ 1102 ::message ({
1027 fg => $fg, 1103 fg => $fg,
1028 markup => $_, 1104 markup => $_,
1029 type => $type, 1105 type => $type,
1030 extra => [@extra], 1106 extra => [@extra],
1031 color_flags => $color 1107 color_flags => $color, #d# ugly, kill
1032 }) for split /\n/, $text; 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 }
1033 1116
1034 $self->{statusbox}->add ($text, 1117 $self->{statusbox}->add ($text,
1035 group => $text, 1118 group => $text,
1036 fg => $fg, 1119 fg => $fg,
1037 timeout => $color >= 2 ? 180 : 10, 1120 timeout => $color >= 2 ? 180 : 10,
1038 tooltip_font => $::FONT_FIXED, 1121 tooltip_font => $::FONT_FIXED,
1039 ); 1122 ) if $type eq "info";
1040 } 1123 }
1041} 1124}
1042 1125
1043sub spell_add { 1126sub spell_add {
1044 my ($self, $spell) = @_; 1127 my ($self, $spell) = @_;
1048 $spell->{message} =~ s/\n+$//; 1131 $spell->{message} =~ s/\n+$//;
1049 $spell->{message} ||= "Server did not provide a description for this spell."; 1132 $spell->{message} ||= "Server did not provide a description for this spell.";
1050 1133
1051 $::SPELL_LIST->add_spell ($spell); 1134 $::SPELL_LIST->add_spell ($spell);
1052 1135
1053 $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});
1054 $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});
1055} 1138}
1056 1139
1057sub spell_delete { 1140sub spell_delete {
1058 my ($self, $spell) = @_; 1141 my ($self, $spell) = @_;
1059 1142
1070sub addme_success { 1153sub addme_success {
1071 my ($self) = @_; 1154 my ($self) = @_;
1072 1155
1073 my %skill_help; 1156 my %skill_help;
1074 1157
1075 for my $node (CFPlus::Pod::find skill_description => "*") { 1158 for my $node (DC::Pod::find skill_description => "*") {
1076 my (undef, @par) = CFPlus::Pod::section_of $node; 1159 my (undef, @par) = DC::Pod::section_of $node;
1077 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1160 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1078 }; 1161 };
1079 1162
1080 for my $skill (values %{$self->{skill_info}}) { 1163 for my $skill (values %{$self->{skill_info}}) {
1081 $self->{map_widget}->add_command ("ready_skill $skill", 1164 $self->{map_widget}->add_command ("ready_skill $skill",
1082 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1165 (DC::asxml "Ready the skill '$skill'\n\n")
1083 . $skill_help{$skill}); 1166 . $skill_help{$skill});
1084 $self->{map_widget}->add_command ("use_skill $skill", 1167 $self->{map_widget}->add_command ("use_skill $skill",
1085 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1168 (DC::asxml "Immediately use the skill '$skill'\n\n")
1086 . $skill_help{$skill}); 1169 . $skill_help{$skill});
1087 } 1170 }
1088} 1171}
1089 1172
1090sub eof { 1173sub eof {
1094 1177
1095 ::stop_game (); 1178 ::stop_game ();
1096} 1179}
1097 1180
1098sub update_floorbox { 1181sub update_floorbox {
1099 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1182 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1100 return unless $::CONN; 1183 return unless $::CONN;
1101 1184
1102 $::FLOORBOX->clear; 1185 $::FLOORBOX->clear;
1103 1186
1104 my @add; 1187 my @add;
1105 1188
1106 my $row; 1189 my $row;
1107 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;
1108 if ($row < 6) { 1192 if ($row < 6) {
1109 local $_->{face_widget}; # hack to force recreation of widget 1193 local $_->{face_widget}; # hack to force recreation of widget
1110 local $_->{desc_widget}; # hack to force recreation of widget 1194 local $_->{desc_widget}; # hack to force recreation of widget
1111 CFPlus::Item::update_widgets $_; 1195 DC::Item::update_widgets $_;
1112 1196
1113 push @add, 1197 push @add,
1114 0, $row, $_->{face_widget}, 1198 0, $row, $_->{face_widget},
1115 1, $row, $_->{desc_widget}; 1199 1, $row, $_->{desc_widget};
1116 1200
1117 $row++; 1201 $row++;
1118 } else { 1202 } else {
1119 push @add, 1, $row, new CFPlus::UI::Button 1203 push @add, 1, $row, new DC::UI::Button
1120 text => "More...", 1204 text => "More...",
1121 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1205 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1122 ; 1206 ;
1123 last; 1207 last;
1124 } 1208 }
1125 } 1209 }
1126 if ($::CONN->{open_container}) { 1210 if ($::CONN->{open_container}) {
1127 push @add, 1, $row++, new CFPlus::UI::Button 1211 push @add, 1, $row++, new DC::UI::Button
1128 text => "Close container", 1212 text => "Close container",
1129 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1213 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1130 ; 1214 ;
1131 } 1215 }
1132 1216
1133 $::FLOORBOX->add_at (@add); 1217 $::FLOORBOX->add_at (@add);
1134 }); 1218 });
1135 1219
1136 $::WANT_REFRESH->start; 1220 $::WANT_REFRESH = 1;
1137} 1221}
1138 1222
1139sub set_opencont { 1223sub set_opencont {
1140 my ($conn, $tag, $name) = @_; 1224 my ($conn, $tag, $name) = @_;
1141 $conn->{open_container} = $tag; 1225 $conn->{open_container} = $tag;
1142 update_floorbox; 1226 update_floorbox;
1143 1227
1144 $::INVR_HB->clear (); 1228 $::INVR_HB->clear;
1145 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1229 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1146 1230
1147 if ($tag != 0) { # Floor isn't closable, is it? 1231 if ($tag != 0) { # Floor isn't closable, is it?
1148 $::INVR_HB->add (new CFPlus::UI::Button 1232 $::INVR_HB->add (new DC::UI::Button
1149 text => "Close container", 1233 text => "Close container",
1150 tooltip => "Close the currently open container (if one is open)", 1234 tooltip => "Close the currently open container (if one is open)",
1151 on_activate => sub { 1235 on_activate => sub {
1152 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1236 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1153 if $tag != 0; 1237 if $tag != 0;
1160} 1244}
1161 1245
1162sub update_containers { 1246sub update_containers {
1163 my ($self) = @_; 1247 my ($self) = @_;
1164 1248
1165 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1249 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1166 my $todo = delete $self->{update_container} 1250 my $todo = delete $self->{update_container}
1167 or return; 1251 or return;
1168 1252
1169 for my $tag (keys %$todo) { 1253 for my $tag (keys %$todo) {
1170 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1254 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1205} 1289}
1206 1290
1207sub item_update { 1291sub item_update {
1208 my ($self, $item) = @_; 1292 my ($self, $item) = @_;
1209 1293
1210 #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";
1211 1295
1212 CFPlus::Item::update_widgets $item; 1296 DC::Item::update_widgets $item;
1213 1297
1214 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1298 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1215 set_opencont ($::CONN, 0, "Floor"); 1299 set_opencont ($::CONN, 0, "Floor");
1216 1300
1217 } elsif ($item->{flags} & F_OPEN) { 1301 } elsif ($item->{flags} & F_OPEN) {
1218 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1302 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1219 1303
1220 } else { 1304 } else {
1221 $self->{update_container}{$item->{container}}++; 1305 $self->{update_container}{$item->{container}}++;
1222 $self->update_containers; 1306 $self->update_containers;
1223 } 1307 }
1234 1318
1235 my $weight = .001 * $self->{player}{weight}; 1319 my $weight = .001 * $self->{player}{weight};
1236 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1320 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1237 1321
1238 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1322 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1239 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1323 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1240 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1324 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1241} 1325}
1242 1326
1243sub update_server_info { 1327sub update_server_info {
1244 my ($self) = @_; 1328 my ($self) = @_;
1252 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1336 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1253 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1337 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1254 . "editing support $yesno[!!$self->{editor_support}]\n" 1338 . "editing support $yesno[!!$self->{editor_support}]\n"
1255 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1339 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1256 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1340 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1257 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1341 . "client support $yesno[$self->{cfplus_ext} > 0]"
1258 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1342 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1259 . "map size $self->{mapw}×$self->{maph}\n" 1343 . "map size $self->{mapw}×$self->{maph}\n"
1260 ); 1344 );
1261 1345
1262} 1346}
1282 0 1366 0
1283 }); 1367 });
1284 1368
1285 $self->update_server_info; 1369 $self->update_server_info;
1286 1370
1287 $self->send_command ("output-sync $::CFG->{output_sync}");
1288 $self->send_command ("output-count $::CFG->{output_count}");
1289 $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;
1290 $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#
1291} 1376}
1292 1377
1293sub lookat { 1378sub lookat {
1294 my ($self, $x, $y) = @_; 1379 my ($self, $x, $y) = @_;
1295 1380
1297 $self->send_ext_req (lookat => $x, $y, sub { 1382 $self->send_ext_req (lookat => $x, $y, sub {
1298 my (%msg) = @_; 1383 my (%msg) = @_;
1299 1384
1300 if (exists $msg{npc_dialog}) { 1385 if (exists $msg{npc_dialog}) {
1301 # start npc chat dialog 1386 # start npc chat dialog
1302 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1387 $self->{npc_dialog} = new DC::NPCDialog::
1303 token => $msg{npc_dialog}, 1388 token => $msg{npc_dialog},
1304 title => "$msg{npc_dialog}[0] (NPC)", 1389 title => "$msg{npc_dialog}[0] (NPC)",
1305 conn => $self, 1390 conn => $self,
1306 ; 1391 ;
1307 } 1392 }
1320 $self->SUPER::destroy; 1405 $self->SUPER::destroy;
1321 1406
1322 %$self = (); 1407 %$self = ();
1323} 1408}
1324 1409
1325package CFPlus::NPCDialog; 1410package DC::NPCDialog;
1326 1411
1327our @ISA = 'CFPlus::UI::Toplevel'; 1412our @ISA = 'DC::UI::Toplevel';
1328 1413
1329sub new { 1414sub new {
1330 my $class = shift; 1415 my $class = shift;
1331 1416
1332 my $self = $class->SUPER::new ( 1417 my $self = $class->SUPER::new (
1339 kw => { hi => 0, yes => 0, no => 0 }, 1424 kw => { hi => 0, yes => 0, no => 0 },
1340 has_close_button => 1, 1425 has_close_button => 1,
1341 @_, 1426 @_,
1342 ); 1427 );
1343 1428
1344 CFPlus::weaken (my $this = $self); 1429 DC::weaken (my $this = $self);
1345 1430
1346 $self->connect (delete => sub { $this->destroy; 1 }); 1431 $self->connect (delete => sub { $this->destroy; 1 });
1347 1432
1348 # better use a pane... 1433 # better use a pane...
1349 $self->add (my $hbox = new CFPlus::UI::HBox); 1434 $self->add (my $hbox = new DC::UI::HBox);
1350 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1435 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1351 1436
1352 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1437 $hbox->add (my $vbox = new DC::UI::VBox);
1353 1438
1354 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1439 $vbox->add (new DC::UI::Label text => "Message Entry:");
1355 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1440 $vbox->add ($self->{entry} = new DC::UI::Entry
1356 tooltip => "#npc_message_entry", 1441 tooltip => "#npc_message_entry",
1357 on_activate => sub { 1442 on_activate => sub {
1358 my ($entry, $text) = @_; 1443 my ($entry, $text) = @_;
1359 1444
1360 return unless $text =~ /\S/; 1445 return unless $text =~ /\S/;
1364 1449
1365 0 1450 0
1366 }, 1451 },
1367 ); 1452 );
1368 1453
1369 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1454 $vbox->add ($self->{options} = new DC::UI::VBox);
1370 1455
1371 $self->{bye_button} = new CFPlus::UI::Button 1456 $self->{bye_button} = new DC::UI::Button
1372 text => "Bye (close)", 1457 text => "Bye (close)",
1373 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.",
1374 on_activate => sub { $this->destroy; 1 }, 1459 on_activate => sub { $this->destroy; 1 },
1375 ; 1460 ;
1376 1461
1395}; 1480};
1396 1481
1397sub update_options { 1482sub update_options {
1398 my ($self) = @_; 1483 my ($self) = @_;
1399 1484
1400 CFPlus::weaken $self; 1485 DC::weaken $self;
1401 1486
1402 $self->{options}->clear; 1487 $self->{options}->clear;
1403 $self->{options}->add ($self->{bye_button}); 1488 $self->{options}->add ($self->{bye_button});
1404 1489
1405 for my $kw (sort keys %{ $self->{kw} }) { 1490 for my $kw (sort keys %{ $self->{kw} }) {
1406 $self->{options}->add (new CFPlus::UI::Button 1491 $self->{options}->add (new DC::UI::Button
1407 text => $kw, 1492 text => $kw,
1408 on_activate => sub { 1493 on_activate => sub {
1409 $self->send ($kw); 1494 $self->send ($kw);
1410 0 1495 0
1411 }, 1496 },
1414} 1499}
1415 1500
1416sub feed { 1501sub feed {
1417 my ($self, $type, @arg) = @_; 1502 my ($self, $type, @arg) = @_;
1418 1503
1419 CFPlus::weaken $self; 1504 DC::weaken $self;
1420 1505
1421 if ($type eq "update") { 1506 if ($type eq "update") {
1422 my (%info) = @arg; 1507 my (%info) = @arg;
1423 1508
1424 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1509 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1425 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1510 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1426 1511
1427 if (exists $info{msg}) { 1512 if (exists $info{msg}) {
1428 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1513 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1429 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} };
1430 my @link; 1515 my @link;
1431 $text =~ s{ 1516 $text =~ s{
1432 ($match) 1517 ($match)
1433 }{ 1518 }{
1434 my $kw = $1; 1519 my $kw = $1;
1435 1520
1436 push @link, new CFPlus::UI::Label 1521 push @link, new DC::UI::Label
1437 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1522 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1438 can_hover => 1, 1523 can_hover => 1,
1439 can_events => 1, 1524 can_events => 1,
1440 padding_x => 0, 1525 padding_x => 0,
1441 padding_y => 0, 1526 padding_y => 0,
1459} 1544}
1460 1545
1461sub send { 1546sub send {
1462 my ($self, $msg) = @_; 1547 my ($self, $msg) = @_;
1463 1548
1464 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1549 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1465 $self->{textview}->scroll_to_bottom; 1550 $self->{textview}->scroll_to_bottom;
1466 1551
1467 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1552 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1468} 1553}
1469 1554

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines