ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC vs.
Revision 1.208 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

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