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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.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
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81 61
82 $self->{json_coder} 62 $self->{json_coder}
83 ->convert_blessed 63 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 64 ->filter_json_single_key_object ("\fw" => sub {
85 $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 }
86 }); 72 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196 73
197 # destroy widgets on logout 74 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 76 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 77 $_->destroy
201 for values %{delete $ws->{w} || {}}; 78 for values %{delete $ws->{w} || {}};
202 } 79 }
80
81 delete $self->{items};
82 $::INV->clear;
83 $::INVR->clear;
84 $::INVR_HB->clear;
85 $::FLOORBOX->clear;
203 }); 86 });
204 87
205 $self->{map_widget}->add_command (@$_) 88 $self->{map_widget}->add_command (@$_)
206 for @cmd_help; 89 for @cmd_help;
207 90
208 { 91 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 92 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 93 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212 } 94 }
213 95
214 { 96 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 97 $self->{noface} = my $tex = $TEX_NOFACE;
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 98 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 } 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# };
219 120
220 $self->{open_container} = 0; 121 $self->{open_container} = 0;
221 122
222 # per server 123 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 124 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 125
225 $self 126 $self
226} 127}
227 128
129sub update_fx_want {
130 my ($self) = @_;
131
132 $self->send_exti_msg (fx_want => {
133 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
134 5 => !!$::CFG->{audio_enable}, # FT_SOUND
135 6 => 1, # FT_RSRC
136 });
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#############################################################################
380
228sub logprint { 381sub logprint {
229 my ($self, @a) = @_; 382 my ($self, @a) = @_;
230 383
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 384 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232} 385}
233 386
234sub _stat_numdiff { 387sub _stat_numdiff {
235 my ($self, $name, $old, $new) = @_; 388 my ($self, $name, $old, $new) = @_;
236 389
… …
320 473
321 if ( 474 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 475 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 476 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 477 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
325 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 478 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326 } 479 }
327 480
328 $self->update_stats_window ($stats, $prev); 481 $self->update_stats_window ($stats, $prev);
329 482
330 $self->{prev_stats} = { %$stats }; 483 $self->{prev_stats} = { %$stats };
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 522 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 523 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 524 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 525 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (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});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 528 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 529 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 530 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 531 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 532
… …
396 for keys %RES_TBL; 550 for keys %RES_TBL;
397 551
398 my $sktbl = $::STATWIDS->{skill_tbl}; 552 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 553 my @skills = keys %{ $self->{skill_info} };
400 554
401 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
402 $sktbl->clear; 563 $sktbl->clear;
403 564
404 my @add; 565 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 566 0, 0, (new DC::UI::Label text => "Experience", align => 1),
408 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"),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 569 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 570 4, 0, (new DC::UI::Label text => "Experience", align => 1),
411 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"),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 573 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
413 ; 574 ];
414 575
576 my @add = @$sw;
577
415 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>";
416 579
417 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);
418 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);
419 582
420 my ($x, $y) = (0, 1); 583 my ($x, $y) = (0, 1);
421 for ( 584 for (@order) {
422 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
423 map [$_, $self->{skill_info}{$_}],
424 grep exists $stats->{$_},
425 @skills
426 ) {
427 my ($idx, $name) = @$_; 585 my ($idx, $name) = @$_;
428 586
429 my $spell_cb = sub { 587 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 588 my ($widget, $ev) = @_;
431 589
432 if ($ev->{button} == 1) { 590 if ($ev->{button} == 1) {
433 $::CONN->user_send ("ready_skill $name"); 591 $::CONN->user_send ("ready_skill $name");
434 } elsif ($ev->{button} == 2) { 592 } elsif ($ev->{button} == 2) {
435 $::CONN->user_send ("use_skill $name"); 593 $::CONN->user_send ("use_skill $name");
436 } elsif ($ev->{button} == 3) { 594 } elsif ($ev->{button} == 3) {
437 my $shortname = CFPlus::shorten $name, 14; 595 my $shortname = DC::shorten $name, 14;
438 (new CFPlus::UI::Menu 596 (new DC::UI::Menu
439 items => [ 597 items => [
440 ["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"] }],
441 ["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"] }],
442 ], 600 ],
443 )->popup ($ev); 601 )->popup ($ev);
444 } else { 602 } else {
445 return 0; 603 return 0;
446 } 604 }
447 605
448 1 606 1
449 }; 607 };
450 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
451 push @add, 626 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 627 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 628 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 629 $x * 4 + 2, $y, $sw->[2],
455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 630 $x * 4 + 3, $y, $sw->[3],
456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ; 631 ;
459 632
460 $x++ and ($x, $y) = (0, $y + 1); 633 $x++ and ($x, $y) = (0, $y + 1);
461 } 634 }
462 635
463 $sktbl->add_at (@add); 636 $sktbl->add_at (@add);
464 } 637 }
465 638
466 for (grep exists $stats->{$_}, @skills) { 639 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 640 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 641 my $val = $stats->{$idx};
469 }
470}
471 642
472sub macro_send { 643 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 644
475 for my $cmd (@{ $macro->{action} }) { 645 my $sw = $self->{skillwid}{$idx};
476 $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);
477 } 652 }
478} 653}
479 654
480sub user_send { 655sub user_send {
481 my ($self, $command) = @_; 656 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 658 $self->{record}->($command)
484 if $self->{record}; 659 if $self->{record};
485 660
486 $self->logprint ("send: ", $command); 661 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 662 $self->send_command ($command);
488 ::status ($command);
489} 663}
490 664
491sub record { 665sub record {
492 my ($self, $cb) = @_; 666 my ($self, $cb) = @_;
493 667
… …
495} 669}
496 670
497sub map_scroll { 671sub map_scroll {
498 my ($self, $dx, $dy) = @_; 672 my ($self, $dx, $dy) = @_;
499 673
500 $self->{map}->scroll ($dx, $dy); 674 $self->{map_widget}->scroll ($dx, $dy);
501} 675}
502 676
503sub feed_map1a { 677sub feed_map1a {
504 my ($self, $data) = @_; 678 my ($self, $data) = @_;
505 679
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 680 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
681 my $delay;
682
683 for my $tile (@$missing) {
684 next if $self->{delay}{$tile};
685
686 $delay = 1;
687
688 if (my $tex = $self->{texture}[$tile]) {
689 $tex->upload;
690 } else {
691 $self->{delay}{$tile} = 1;
692
693 # we assume the face is in-flight and will eventually arrive
694 push @{$self->{tile_cb}{$tile}}, sub {
695 delete $self->{delay}{$tile};
696 $_[0]->upload;
697 };
698 }
699 }
700
701 if ($delay) {
702 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
703 EV::once undef, 0, 0.03, sub {
704 $self->{map_widget}->update
705 if $self->{map_widget};
706 };
707 } else {
507 $self->{map_widget}->update; 708 $self->{map_widget}->update;
709 }
508} 710}
509 711
510sub magicmap { 712sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 713 my ($self, $w, $h, $x, $y, $data) = @_;
512 714
… …
514} 716}
515 717
516sub flush_map { 718sub flush_map {
517 my ($self) = @_; 719 my ($self) = @_;
518 720
519 my $map_info = delete $self->{map_info} 721 return unless $self->{map_info};
520 or return;
521 722
723 for my $map_info (values %{ $self->{map_cache} || {} }) {
522 my ($hash, $x, $y, $w, $h) = @$map_info; 724 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
523 725
524 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 726 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
727
728 if ($data ne $$rdata) {
729 $map_info->[1] = \$data;
730 my $cdata = Compress::LZF::compress $data;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 731 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 732 }
733 }
527} 734}
528 735
529sub map_clear { 736sub map_clear {
530 my ($self) = @_; 737 my ($self) = @_;
531 738
532 $self->flush_map; 739 $self->flush_map;
740 delete $self->{map_info};
533 delete $self->{neigh_map}; 741 delete $self->{neigh_map};
534 742
535 $self->{map}->clear; 743 $self->{map}->clear;
536 delete $self->{map_widget}{magicmap}; 744 delete $self->{map_widget}{magicmap};
537} 745}
538 746
539sub bg_fetch { 747sub bg_fetch {
540 my ($self) = @_; 748 my ($self) = @_;
541 749
542 my $id; 750 my $tile;
543 751
544 do { 752 do {
545 $id = pop @{$self->{bg_fetch}} 753 $tile = pop @{$self->{bg_fetch}}
546 or return; 754 or return;
547 } while $self->{texture}[$id]; 755 } while $self->{texture}[$tile];
548 756
549 CFPlus::DB::exists tilecache => $id, sub { 757 DC::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 758 my ($data) = @_;
551 759
552 return unless $self->{map}; # stop when destroyed 760 return unless $self->{map}; # stop when destroyed
553 761
762 if (defined $data) {
554 $self->have_tile ($id) 763 $self->have_tile ($tile, $data);
555 if $exists; 764 $self->{texture}[$tile]->upload;
765 }
556 766
557 $self->bg_fetch; 767 $self->bg_fetch;
558 }; 768 };
559} 769}
560 770
561sub load_map($$$) { 771sub load_map($$$$$$) {
562 my ($self, $hash, $x, $y) = @_; 772 my ($self, $hash, $x, $y, $w, $h) = @_;
563 773
564 my $gen = $self->{map_change_gen}; 774 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
565 775
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 776 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 777 $map_info->[1] = \$_[0];
568 778
569 my ($data) = @_;
570
571 if (defined $data) {
572 $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 779 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 780 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
577 $self->bg_fetch unless $inprogress; 781 $self->bg_fetch unless $inprogress;
578 }
579 }; 782 };
783
784 if (my $map_info = $self->{map_cache_old}{$hash}) {
785 $cb->(${ $map_info->[1] });
786 } else {
787 my $gen = $self->{map_change_gen};
788
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 };
794 }
580} 795}
581 796
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 797# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 798# (server resources, latency, bandwidth), so this hack is warranted.
584# 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
585sub send_mapinfo { 800sub send_mapinfo {
586 my ($self, $data, $cb) = @_; 801 my ($self, $data, $cb) = @_;
587 802
588 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)$%) {
… …
613} 828}
614 829
615# this method does a "flood fill" into every tile direction 830# this method does a "flood fill" into every tile direction
616# it assumes that tiles are arranged in a rectangular grid, 831# it assumes that tiles are arranged in a rectangular grid,
617# i.e. a map is the same as the left of the right map etc. 832# i.e. a map is the same as the left of the right map etc.
618# failure to comply are harmless and result in display errors 833# failure to comply is harmless and results in display errors
619# at worst. 834# at worst.
620sub flood_fill { 835sub flood_fill {
621 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 836 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
622 837
623 # the server does not allow map paths > 6 838 # the server does not allow map paths > 6
… …
659 return if $mode ne "spatial"; 874 return if $mode ne "spatial";
660 875
661 $x += $self->{map}->ox; 876 $x += $self->{map}->ox;
662 $y += $self->{map}->oy; 877 $y += $self->{map}->oy;
663 878
664 $self->load_map ($hash, $x, $y) 879 $self->load_map ($hash, $x, $y, $w, $h)
665 unless $self->{neigh_map}{$hash}[5]++;#d# 880 unless $self->{neigh_map}{$hash}[5]++;#d#
666 881
667 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 882 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
668 883
669 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 884 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 892 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 893
679 $self->flush_map; 894 $self->flush_map;
680 895
681 ++$self->{map_change_gen}; 896 ++$self->{map_change_gen};
897 $self->{map_cache_old} = delete $self->{map_cache};
682 898
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 899 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 900
685 my $mapmapw = $self->{mapmap}->{w}; 901 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 902 my $mapmaph = $self->{mapmap}->{h};
… …
698 $self->{map_info} = [$hash, $x, $y, $w, $h]; 914 $self->{map_info} = [$hash, $x, $y, $w, $h];
699 915
700 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 916 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
701 $::STATWIDS->{map}->set_text ("Map: " . $map); 917 $::STATWIDS->{map}->set_text ("Map: " . $map);
702 918
703 $self->load_map ($hash, $x, $y); 919 $self->load_map ($hash, $x, $y, $w, $h);
704 $self->flood_fill (0, 0, 0, "", $hash, $flags); 920 $self->flood_fill (0, 0, 0, "", $hash, $flags);
705} 921}
706 922
707sub face_find { 923sub face_find {
708 my ($self, $facenum, $face, $cb) = @_; 924 my ($self, $facenum, $face, $cb) = @_;
709 925
710 if ($face->{type} == 0) { # FT_FACE 926 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 927 my $id = DC::DB::get_tile_id_sync $face->{name};
712 928
713 $face->{id} = $id; 929 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 930 $self->{map}->set_tileid ($facenum => $id);
717 931
718 CFPlus::DB::get tilecache => $id, $cb; 932 DC::DB::get tilecache => $id, $cb;
719 933
720 } elsif ($face->{type} & 1) { # with metadata 934 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb; 935 DC::DB::get res_meta => $face->{name}, $cb;
936
937 } else { # no metadata
938 DC::DB::get res_data => $face->{name}, $cb;
723 } 939 }
724} 940}
725 941
726sub face_update { 942sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 943 my ($self, $facenum, $face, $changed) = @_;
728 944
729 if ($face->{type} == 0) { # FT_FACE 945 if ($face->{type} == 0) {
946 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 947 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 948 if $changed;
732 949
733 $self->have_tile ($face->{id}); 950 $self->have_tile ($face->{id}, delete $face->{data});
734 951
735 } elsif ($face->{type} & 1) { # split metadata 952 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 953 # split metadata case, FT_MUSIC, FT_SOUND
954 if ($changed) { # new data
955 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
956 $face->{data} = $meta;
957
958 # rely on strict ordering here and also on later fetch
959 DC::DB::put res_data => $face->{name} => $data, sub { };
960 DC::DB::put res_meta => $face->{name} => $meta, sub { };
961 }
962
963 $face->{data} = $self->{json_coder}->decode ($face->{data});
964 ::add_license ($face);
965 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
966 if $changed;
737 967
738 if ($face->{type} == 3) { # FT_MUSIC 968 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum); 969 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 970 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum); 971 &::audio_sound_push ($facenum);
755 }; 972 }
756 }
757 973
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else { 974 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 975 # flat resource case, FT_RSRC
770 ::add_license ($face); 976 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
771 $cb->(); 977 if $changed;
772 } 978 }
979
980 if (my $cbs = $self->{face_cb}{$facenum}) {
981 $_->($face, $changed) for @$cbs;
773 } 982 }
774} 983}
775 984
776sub smooth_update { 985sub smooth_update {
777 my ($self, $facenum, $face) = @_; 986 my ($self, $facenum, $face) = @_;
778 987
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 988 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 989}
781 990
782sub have_tile { 991sub have_tile {
783 my ($self, $tile) = @_; 992 my ($self, $tile, $data) = @_;
784 993
785 return unless $self->{map}; 994 return unless $self->{map};
786 995
787 $self->{texture}[$tile] ||= my $tex = 996 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 997 new DC::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 998 tile => $tile,
999 image => $data, delete_image => 1,
1000 minify => 1, mipmap => 1;
790 1001
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 1002 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1003 $_->($tex) for @$cbs;
1004 }
792} 1005}
793 1006
794sub connect_face_update { 1007# call in non-void context registers a temporary
1008# hook with handle, otherwise its permanent
1009sub on_face_change {
795 my ($self, $id, $cb) = @_; 1010 my ($self, $num, $cb) = @_;
796 1011
797 push @{$self->{face_cb}{$id}}, $cb; 1012 push @{$self->{face_cb}{$num}}, $cb;
798 1013
799 CFPlus::guard { 1014 defined wantarray
1015 ? DC::guard {
800 @{$self->{face_cb}{$id}} 1016 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 1017 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 1018 @{$self->{face_cb}{$num}};
803 } 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)
804} 1036}
805 1037
806sub sound_play { 1038sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 1039 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 1040
… …
823 1055
824sub sanitise_xml($) { 1056sub sanitise_xml($) {
825 local $_ = shift; 1057 local $_ = shift;
826 1058
827 # we now weed out all tags we do not support 1059 # we now weed out all tags we do not support
828 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
829 # now all entities 1065 # now all entities
830 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;
831 1067
832 # handle some elements 1068 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1069 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 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+$//;
835 1073
836 $_ 1074 $_
837} 1075}
838 1076
839our %NAME_TO_COLOR = ( 1077our %NAME_TO_COLOR = (
… …
880 $self->{$type} = $text; 1118 $self->{$type} = $text;
881 } else { 1119 } else {
882 $self->logprint ("msg: ", $text); 1120 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1121 return if $color < 0; # negative color == ignore if not understood
884 1122
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1123 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1124
887 ## 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
888 # no longer neecssary with TRT servers 1126 # no longer neecssary with TRT servers
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1127 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
890 1128
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1129 ::message ({
892 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.
893 1142
894 $self->{statusbox}->add ($text, 1143 $self->{statusbox}->add ($text,
895 group => $text, 1144 group => $text,
896 fg => $fg, 1145 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1146 timeout => $color >= 2 ? 180 : 10,
898 tooltip_font => $::FONT_FIXED, 1147 tooltip_font => $::FONT_FIXED,
899 ); 1148 ) if $type eq "info";
900 } 1149 }
901} 1150}
902 1151
903sub spell_add { 1152sub spell_add {
904 my ($self, $spell) = @_; 1153 my ($self, $spell) = @_;
… …
908 $spell->{message} =~ s/\n+$//; 1157 $spell->{message} =~ s/\n+$//;
909 $spell->{message} ||= "Server did not provide a description for this spell."; 1158 $spell->{message} ||= "Server did not provide a description for this spell.";
910 1159
911 $::SPELL_LIST->add_spell ($spell); 1160 $::SPELL_LIST->add_spell ($spell);
912 1161
913 $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});
914 $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});
915} 1164}
916 1165
917sub spell_delete { 1166sub spell_delete {
918 my ($self, $spell) = @_; 1167 my ($self, $spell) = @_;
919 1168
… …
930sub addme_success { 1179sub addme_success {
931 my ($self) = @_; 1180 my ($self) = @_;
932 1181
933 my %skill_help; 1182 my %skill_help;
934 1183
935 for my $node (CFPlus::Pod::find skill_description => "*") { 1184 for my $node (DC::Pod::find skill_description => "*") {
936 my (undef, @par) = CFPlus::Pod::section_of $node; 1185 my (undef, @par) = DC::Pod::section_of $node;
937 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1186 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
938 }; 1187 };
939 1188
940 for my $skill (values %{$self->{skill_info}}) { 1189 for my $skill (values %{$self->{skill_info}}) {
941 $self->{map_widget}->add_command ("ready_skill $skill", 1190 $self->{map_widget}->add_command ("ready_skill $skill",
942 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1191 (DC::asxml "Ready the skill '$skill'\n\n")
943 . $skill_help{$skill}); 1192 . $skill_help{$skill});
944 $self->{map_widget}->add_command ("use_skill $skill", 1193 $self->{map_widget}->add_command ("use_skill $skill",
945 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1194 (DC::asxml "Immediately use the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1195 . $skill_help{$skill});
947 } 1196 }
948} 1197}
949 1198
950sub eof { 1199sub eof {
… …
954 1203
955 ::stop_game (); 1204 ::stop_game ();
956} 1205}
957 1206
958sub update_floorbox { 1207sub update_floorbox {
959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1208 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
960 return unless $::CONN; 1209 return unless $::CONN;
961 1210
962 $::FLOORBOX->clear; 1211 $::FLOORBOX->clear;
963 1212
964 my @add; 1213 my @add;
965 1214
966 my $row; 1215 my $row;
967 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;
968 if ($row < 6) { 1218 if ($row < 6) {
969 local $_->{face_widget}; # hack to force recreation of widget 1219 local $_->{face_widget}; # hack to force recreation of widget
970 local $_->{desc_widget}; # hack to force recreation of widget 1220 local $_->{desc_widget}; # hack to force recreation of widget
971 CFPlus::Item::update_widgets $_; 1221 DC::Item::update_widgets $_;
972 1222
973 push @add, 1223 push @add,
974 0, $row, $_->{face_widget}, 1224 0, $row, $_->{face_widget},
975 1, $row, $_->{desc_widget}; 1225 1, $row, $_->{desc_widget};
976 1226
977 $row++; 1227 $row++;
978 } else { 1228 } else {
979 push @add, 1, $row, new CFPlus::UI::Button 1229 push @add, 1, $row, new DC::UI::Button
980 text => "More...", 1230 text => "More...",
981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1231 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
982 ; 1232 ;
983 last; 1233 last;
984 } 1234 }
985 } 1235 }
986 if ($::CONN->{open_container}) { 1236 if ($::CONN->{open_container}) {
987 push @add, 1, $row++, new CFPlus::UI::Button 1237 push @add, 1, $row++, new DC::UI::Button
988 text => "Close container", 1238 text => "Close container",
989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1239 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
990 ; 1240 ;
991 } 1241 }
992 1242
993 $::FLOORBOX->add_at (@add); 1243 $::FLOORBOX->add_at (@add);
994 }); 1244 });
995 1245
996 $::WANT_REFRESH++; 1246 $::WANT_REFRESH = 1;
997} 1247}
998 1248
999sub set_opencont { 1249sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1250 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1251 $conn->{open_container} = $tag;
1002 update_floorbox; 1252 update_floorbox;
1003 1253
1004 $::INV_RIGHT_HB->clear (); 1254 $::INVR_HB->clear;
1005 $::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);
1006 1256
1007 if ($tag != 0) { # Floor isn't closable, is it? 1257 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1258 $::INVR_HB->add (new DC::UI::Button
1009 text => "Close container", 1259 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1260 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1261 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1262 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1263 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1264 0
1016 }, 1265 },
1017 ); 1266 );
1018 } 1267 }
1019 1268
… …
1021} 1270}
1022 1271
1023sub update_containers { 1272sub update_containers {
1024 my ($self) = @_; 1273 my ($self) = @_;
1025 1274
1026 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1275 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1027 my $todo = delete $self->{update_container} 1276 my $todo = delete $self->{update_container}
1028 or return; 1277 or return;
1029 1278
1030 for my $tag (keys %$todo) { 1279 for my $tag (keys %$todo) {
1031 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1280 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1066} 1315}
1067 1316
1068sub item_update { 1317sub item_update {
1069 my ($self, $item) = @_; 1318 my ($self, $item) = @_;
1070 1319
1071 #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";
1072 1321
1073 CFPlus::Item::update_widgets $item; 1322 DC::Item::update_widgets $item;
1074 1323
1075 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1324 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1076 set_opencont ($::CONN, 0, "Floor"); 1325 set_opencont ($::CONN, 0, "Floor");
1077 1326
1078 } elsif ($item->{flags} & F_OPEN) { 1327 } elsif ($item->{flags} & F_OPEN) {
1079 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1328 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1080 1329
1081 } else { 1330 } else {
1082 $self->{update_container}{$item->{container}}++; 1331 $self->{update_container}{$item->{container}}++;
1083 $self->update_containers; 1332 $self->update_containers;
1084 } 1333 }
… …
1095 1344
1096 my $weight = .001 * $self->{player}{weight}; 1345 my $weight = .001 * $self->{player}{weight};
1097 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1346 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1098 1347
1099 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1348 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1100 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1349 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1101 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1350 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1102} 1351}
1103 1352
1104sub update_server_info { 1353sub update_server_info {
1105 my ($self) = @_; 1354 my ($self) = @_;
… …
1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1362 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1363 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1115 . "editing support $yesno[!!$self->{editor_support}]\n" 1364 . "editing support $yesno[!!$self->{editor_support}]\n"
1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1365 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1366 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1367 . "client support $yesno[$self->{cfplus_ext} > 0]"
1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1368 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1120 . "map size $self->{mapw}×$self->{maph}\n" 1369 . "map size $self->{mapw}×$self->{maph}\n"
1121 ); 1370 );
1122 1371
1123} 1372}
… …
1143 0 1392 0
1144 }); 1393 });
1145 1394
1146 $self->update_server_info; 1395 $self->update_server_info;
1147 1396
1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1397 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1151 $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#
1152} 1402}
1153 1403
1154sub lookat { 1404sub lookat {
1155 my ($self, $x, $y) = @_; 1405 my ($self, $x, $y) = @_;
1156 1406
… …
1158 $self->send_ext_req (lookat => $x, $y, sub { 1408 $self->send_ext_req (lookat => $x, $y, sub {
1159 my (%msg) = @_; 1409 my (%msg) = @_;
1160 1410
1161 if (exists $msg{npc_dialog}) { 1411 if (exists $msg{npc_dialog}) {
1162 # start npc chat dialog 1412 # start npc chat dialog
1163 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1413 $self->{npc_dialog} = new DC::NPCDialog::
1164 token => $msg{npc_dialog}, 1414 token => $msg{npc_dialog},
1165 title => "$msg{npc_dialog}[0] (NPC)", 1415 title => "$msg{npc_dialog}[0] (NPC)",
1166 conn => $self, 1416 conn => $self,
1167 ; 1417 ;
1168 } 1418 }
… …
1181 $self->SUPER::destroy; 1431 $self->SUPER::destroy;
1182 1432
1183 %$self = (); 1433 %$self = ();
1184} 1434}
1185 1435
1186package CFPlus::NPCDialog; 1436package DC::NPCDialog;
1187 1437
1188our @ISA = 'CFPlus::UI::Toplevel'; 1438our @ISA = 'DC::UI::Toplevel';
1189 1439
1190sub new { 1440sub new {
1191 my $class = shift; 1441 my $class = shift;
1192 1442
1193 my $self = $class->SUPER::new ( 1443 my $self = $class->SUPER::new (
… …
1200 kw => { hi => 0, yes => 0, no => 0 }, 1450 kw => { hi => 0, yes => 0, no => 0 },
1201 has_close_button => 1, 1451 has_close_button => 1,
1202 @_, 1452 @_,
1203 ); 1453 );
1204 1454
1205 CFPlus::weaken (my $this = $self); 1455 DC::weaken (my $this = $self);
1206 1456
1207 $self->connect (delete => sub { $this->destroy; 1 }); 1457 $self->connect (delete => sub { $this->destroy; 1 });
1208 1458
1209 # better use a pane... 1459 # better use a pane...
1210 $self->add (my $hbox = new CFPlus::UI::HBox); 1460 $self->add (my $hbox = new DC::UI::HBox);
1211 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1461 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1212 1462
1213 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1463 $hbox->add (my $vbox = new DC::UI::VBox);
1214 1464
1215 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1465 $vbox->add (new DC::UI::Label text => "Message Entry:");
1216 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1466 $vbox->add ($self->{entry} = new DC::UI::Entry
1217 tooltip => "#npc_message_entry", 1467 tooltip => "#npc_message_entry",
1218 on_activate => sub { 1468 on_activate => sub {
1219 my ($entry, $text) = @_; 1469 my ($entry, $text) = @_;
1220 1470
1221 return unless $text =~ /\S/; 1471 return unless $text =~ /\S/;
… …
1225 1475
1226 0 1476 0
1227 }, 1477 },
1228 ); 1478 );
1229 1479
1230 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1480 $vbox->add ($self->{options} = new DC::UI::VBox);
1231 1481
1232 $self->{bye_button} = new CFPlus::UI::Button 1482 $self->{bye_button} = new DC::UI::Button
1233 text => "Bye (close)", 1483 text => "Bye (close)",
1234 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.",
1235 on_activate => sub { $this->destroy; 1 }, 1485 on_activate => sub { $this->destroy; 1 },
1236 ; 1486 ;
1237 1487
… …
1256}; 1506};
1257 1507
1258sub update_options { 1508sub update_options {
1259 my ($self) = @_; 1509 my ($self) = @_;
1260 1510
1261 CFPlus::weaken $self; 1511 DC::weaken $self;
1262 1512
1263 $self->{options}->clear; 1513 $self->{options}->clear;
1264 $self->{options}->add ($self->{bye_button}); 1514 $self->{options}->add ($self->{bye_button});
1265 1515
1266 for my $kw (sort keys %{ $self->{kw} }) { 1516 for my $kw (sort keys %{ $self->{kw} }) {
1267 $self->{options}->add (new CFPlus::UI::Button 1517 $self->{options}->add (new DC::UI::Button
1268 text => $kw, 1518 text => $kw,
1269 on_activate => sub { 1519 on_activate => sub {
1270 $self->send ($kw); 1520 $self->send ($kw);
1271 0 1521 0
1272 }, 1522 },
… …
1275} 1525}
1276 1526
1277sub feed { 1527sub feed {
1278 my ($self, $type, @arg) = @_; 1528 my ($self, $type, @arg) = @_;
1279 1529
1280 CFPlus::weaken $self; 1530 DC::weaken $self;
1281 1531
1282 if ($type eq "update") { 1532 if ($type eq "update") {
1283 my (%info) = @arg; 1533 my (%info) = @arg;
1284 1534
1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1535 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1536 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287 1537
1288 if (exists $info{msg}) { 1538 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1539 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1540 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link; 1541 my @link;
1292 $text =~ s{ 1542 $text =~ s{
1293 ($match) 1543 ($match)
1294 }{ 1544 }{
1295 my $kw = $1; 1545 my $kw = $1;
1296 1546
1297 push @link, new CFPlus::UI::Label 1547 push @link, new DC::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1548 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1, 1549 can_hover => 1,
1300 can_events => 1, 1550 can_events => 1,
1301 padding_x => 0, 1551 padding_x => 0,
1302 padding_y => 0, 1552 padding_y => 0,
… …
1320} 1570}
1321 1571
1322sub send { 1572sub send {
1323 my ($self, $msg) = @_; 1573 my ($self, $msg) = @_;
1324 1574
1325 $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 });
1326 $self->{textview}->scroll_to_bottom; 1581 $self->{textview}->scroll_to_bottom;
1327 1582
1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1583 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1329} 1584}
1330 1585

Diff Legend

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