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.60 by root, Sun Jul 16 23:43:46 2006 UTC vs.
Revision 1.185 by root, Thu Dec 27 19:12:19 2007 UTC

1package CFClient::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 CFClient; 8use DC;
9use CFClient::UI; 9use DC::DB;
10use DC::UI;
11use DC::Pod;
12use DC::Macro;
13use DC::Item;
10 14
11use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
12 16
13sub new { 17sub new {
14 my $class = shift; 18 my ($class, %arg) = @_;
15 19
16 my $self = $class->SUPER::new (@_); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 widget => 2,
25 %{$arg{setup_req} || {}},
26 },
27 );
17 28
18 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
19 30
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 33 or die "unparseable command help: $_->{kw}[0]";
28 34
29 my $cmd = $1; 35 my $cmd = $1;
30 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 37 @args = (".*") unless @args;
32 38
39 my (undef, @par) = DC::Pod::section_of $_;
40 my $text = DC::Pod::as_label @par;
41
33 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 43 for @args;
35 44
36 my $text = CFClient::pod_to_pango $head2->content; 45 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
40 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 DC::Pod::find command => "*";
50
51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
41 } 55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
61 });
42 62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
68 }
69 });
70
71 $self->{map_widget}->add_command (@$_)
43 \@cmd_help 72 for @cmd_help;
73
74 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 }
79
80 {
81 $self->{noface} = my $tex = new_from_file DC::Texture
82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 }
85
86 $self->{open_container} = 0;
87
88 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
90
91 $self
92}
93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
44 }; 171 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $parse_list->($template);
231 $done_cb->();
232 } elsif ($type eq "face") {
233 #...
234 $done_cb->(0);
235 } else {
236 $done_cb->(0);
237 }
238}
239
240# widgetset associate
241sub ext_ws_a {
242 my ($self, %ass) = @_;
243
244 # everything that has a name, wether conceivably useful or not
245 my %wkw = (
246 root => $DC::UI::ROOT,
247 tooltip => $DC::UI::TOOLTIP,
248
249 mapwidget => $::MAPWIDGET,
250 buttonbar => $::BUTTONBAR,
251 metaserver => $::METASERVER,
252 buttonbar => $::BUTTONBAR,
253 login_button => $::LOGIN_BUTTON,
254 quit_dialog => $::QUIT_DIALOG,
255 host_entry => $::HOST_ENTRY,
256 metaserver => $::METASERVER,
257 server_info => $::SERVER_INFO,
258
259 setup_dialog => $::SETUP_DIALOG,
260 setup_notebook => $::SETUP_NOTEBOOK,
261 setup_server => $::SETUP_SERVER,
262 setup_keyboard => $::SETUP_KEYBOARD,
263
264 pl_notebook => $::PL_NOTEBOOK,
265 pl_window => $::PL_WINDOW,
266 inventory_page => $::INVENTORY_PAGE,
267 stats_page => $::STATS_PAGE,
268 skill_page => $::SKILL_PAGE,
269 spell_page => $::SPELL_PAGE,
270 spell_list => $::SPELL_LIST,
271
272 floorbox => $::FLOORBOX,
273 help_window => $::HELP_WINDOW,
274 message_window => $::MESSAGE_WINDOW,
275 statusbox => $::SDTATUSBOX,
276
277 inv => $::INV,
278 invr => $::INVR,
279 invr_hb => $::INVR_HB,
280 );
281
282 while (my ($id, $name) = each %ass) {
283 $self->widget_associate (undef, $id => $wkw{$name});
284 }
285}
286
287# widget call
288sub ext_w_c {
289 my ($self, $id, $rcb, $method, @args) = @_;
290
291 my $w = $self->{widget}{$id}
292 or return;
293
294 if ($rcb) {
295 $rcb->($w->$method (@args));
296 } else {
297 $w->$method (@args);
298 }
299}
300
301# widget set
302sub ext_w_s {
303 my ($self, $id, $attr) = @_;
304
305 my $w = $self->{widget}{$id}
306 or return;
307
308 for (my $i = 0; $i < $#$attr; $i += 2) {
309 my ($member, $value) = @$attr[$i, $i+1];
310 if (defined $value) {
311 $w->{$member} = $value;
312 } else {
313 delete $w->{$member};
314 }
315 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
316 }
317}
318
319# widget get
320sub ext_w_g {
321 my ($self, $id, $rid, @attr) = @_;
322
323 my $w = $self->{widget}{$id}
324 or return;
325
326 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
327}
328
329# message window
330sub ext_channel_info {
331 my ($self, $info) = @_;
332 $self->{channels}->{$info->{id}} = $info;
333 $::MESSAGE_WINDOW->add_channel ($info);
334}
335
336#############################################################################
63 337
64sub logprint { 338sub logprint {
65 my ($self, @a) = @_; 339 my ($self, @a) = @_;
66 340
67 $self->{log_fh} ||= do { 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 342}
85 343
86sub _stat_numdiff { 344sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
88 346
… …
172 430
173 if ( 431 if (
174 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
175 ) { 433 ) {
176 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
177 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 435 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
178 } 436 }
179 437
180 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
181 439
182 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 479 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 480 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 481 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 482 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 483 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 484 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 485 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 486 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 487 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 488 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 489
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 490 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 499 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 500 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 501 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 502 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 503
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 504 $self->update_weight;
248 505
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 506 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 507 for keys %RES_TBL;
251 508
252 my $sktbl = $::STATWIDS->{skill_tbl}; 509 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 510 my @skills = keys %{ $self->{skill_info} };
254 511
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 512 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
513 map [$_, $self->{skill_info}{$_}],
514 grep exists $stats->{$_},
515 @skills;
516
517 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
518 $self->{stat_order} = join ",", map $_->[0], @order;
519
256 $sktbl->clear; 520 $sktbl->clear;
257 521
522 my $sw = $self->{skillwid}{""} ||= [
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
531 ];
264 532
533 my @add = @$sw;
534
535 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
536
537 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
538 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
539
265 my ($x, $y) = (1, 0); 540 my ($x, $y) = (0, 1);
266 for ( 541 for (@order) {
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_},
270 @skills
271 ) {
272 my ($idx, $name) = @$_; 542 my ($idx, $name) = @$_;
273 543
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 544 my $spell_cb = sub {
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 545 my ($widget, $ev) = @_;
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 546
547 if ($ev->{button} == 1) {
548 $::CONN->user_send ("ready_skill $name");
549 } elsif ($ev->{button} == 2) {
550 $::CONN->user_send ("use_skill $name");
551 } elsif ($ev->{button} == 3) {
552 my $shortname = DC::shorten $name, 14;
553 (new DC::UI::Menu
554 items => [
555 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
556 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
557 ],
558 )->popup ($ev);
559 } else {
560 return 0;
561 }
562
563 1
564 };
565
566 my $sw = $self->{skillwid}{$idx} ||= [
567 # exp
568 (new DC::UI::Label
569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
570
571 # level
572 (new DC::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 574
575 # progress
576 (new DC::UI::ExperienceProgress),
577
578 # label
579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
581 ];
582
583 push @add,
584 $x * 4 + 0, $y, $sw->[0],
585 $x * 4 + 1, $y, $sw->[1],
586 $x * 4 + 2, $y, $sw->[2],
587 $x * 4 + 3, $y, $sw->[3],
588 ;
279 589
280 $x++ and ($x, $y) = (0, $y + 1); 590 $x++ and ($x, $y) = (0, $y + 1);
281 } 591 }
282 }
283 592
284 for (grep exists $stats->{$_}, @skills) { 593 $sktbl->add_at (@add);
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 594 }
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 595
596 for (@order) {
597 my ($idx, $name) = @$_;
598 my $val = $stats->{$idx};
599
600 next if $prev->{$idx}[1] eq $val->[1];
601
602 my $sw = $self->{skillwid}{$idx};
603 $sw->[0]->set_text (::formsep ($val->[1]));
604 $sw->[1]->set_text ($val->[0] * 1);
605 $sw->[2]->set_value (@$val);
606
607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
608 $::GAUGES->{sklprg}->set_value (@$val);
287 } 609 }
288} 610}
289 611
290sub user_send { 612sub user_send {
291 my ($self, $command) = @_; 613 my ($self, $command) = @_;
292 614
615 $self->{record}->($command)
293 if ($self->{record}) { 616 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 617
297 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 619 $self->send_command ($command);
299 ::status ($command);
300} 620}
301 621
302sub start_record { 622sub record {
303 my ($self) = @_; 623 my ($self, $cb) = @_;
304 624
305 $self->{record} = []; 625 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 626}
312 627
313sub map_scroll { 628sub map_scroll {
314 my ($self, $dx, $dy) = @_; 629 my ($self, $dx, $dy) = @_;
315 630
… …
317} 632}
318 633
319sub feed_map1a { 634sub feed_map1a {
320 my ($self, $data) = @_; 635 my ($self, $data) = @_;
321 636
322 $self->{map}->map1a_update ($data); 637 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
638 my $delay;
639
640 for my $tile (@$missing) {
641 next if $self->{delay}{$tile};
642
643 $delay = 1;
644
645 if (my $tex = $::CONN->{texture}[$tile]) {
646 $tex->upload;
647 } else {
648 $self->{delay}{$tile} = 1;
649
650 # we assume the face is in-flight and will eventually come
651 push @{$self->{tile_cb}{$tile}}, sub {
652 delete $self->{delay}{$tile};
653 $_[0]->upload;
654 };
655 }
656 }
657
658 if ($delay) {
659 # delay the map drawing a tiny bit in the hope of getting the missing fetched
660 EV::once undef, 0, 0.03, sub {
661 $self->{map_widget}->update
662 if $self->{map_widget};
663 };
664 } else {
323 $self->{map_widget}->update; 665 $self->{map_widget}->update;
666 }
324} 667}
325 668
326sub magicmap { 669sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 670 my ($self, $w, $h, $x, $y, $data) = @_;
328 671
… …
335 my $map_info = delete $self->{map_info} 678 my $map_info = delete $self->{map_info}
336 or return; 679 or return;
337 680
338 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
339 682
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 683 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 684 $self->{map_cache_new}{$hash} = \$data;
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
343} 686}
344 687
345sub map_clear { 688sub map_clear {
346 my ($self) = @_; 689 my ($self) = @_;
347 690
… …
350 693
351 $self->{map}->clear; 694 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 695 delete $self->{map_widget}{magicmap};
353} 696}
354 697
698sub bg_fetch {
699 my ($self) = @_;
700
701 my $tile;
702
703 do {
704 $tile = pop @{$self->{bg_fetch}}
705 or return;
706 } while $self->{texture}[$tile];
707
708 DC::DB::get tilecache => $tile, sub {
709 my ($data) = @_;
710
711 return unless $self->{map}; # stop when destroyed
712
713 if (defined $data) {
714 $self->have_tile ($tile, $data);
715 $self->{texture}[$tile]->upload;
716 }
717
718 $self->bg_fetch;
719 };
720}
355 721
356sub load_map($$$) { 722sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 723 my ($self, $hash, $x, $y) = @_;
358 724
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 725 my $gen = $self->{map_change_gen};
726
727 my $cb = sub {
728 return unless $gen == $self->{map_change_gen};
729
730 my ($data) = @_;
731
732 if (defined $data) {
733 $self->{map_cache_new}{$hash} = \$data;
734
360 $data = Compress::LZF::decompress $data; 735 my $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 736
366 $self->set_texture ($id => $data); 737 my $inprogress = @{ $self->{bg_fetch} || [] };
738 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
739 $self->bg_fetch unless $inprogress;
367 } 740 }
741 };
742
743 if (my $rdata = $self->{map_cache_old}{$hash}) {
744 $cb->($$rdata);
745 } else {
746 DC::DB::get $self->{mapcache} => $hash, $cb;
368 } 747 }
369} 748}
370 749
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
… …
437 816
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 817 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 818 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 819
441 } else { 820 } else {
821 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 822 $self->send_mapinfo ("spatial $path$tile", sub {
823 return unless $gen == $self->{map_change_gen};
824
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 825 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 826
445 return if $mode ne "spatial"; 827 return if $mode ne "spatial";
446 828
447 $x += $self->{map}->ox; 829 $x += $self->{map}->ox;
… …
461 843
462sub map_change { 844sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 845 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 846
465 $self->flush_map; 847 $self->flush_map;
848
849 ++$self->{map_change_gen};
850 $self->{map_cache_old} = delete $self->{map_cache_new};
466 851
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 852 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 853
469 my $mapmapw = $self->{mapmap}->{w}; 854 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 855 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 872 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 873 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 874}
490 875
491sub face_find { 876sub face_find {
492 my ($self, $facenum, $face) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
493 878
494 my $hash = "$face->{chksum},$face->{name}"; 879 if ($face->{type} == 0) { # FT_FACE
880 my $id = DC::DB::get_tile_id_sync $face->{name};
495 881
496 my $id = $self->{facemap}->get ($hash);
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 882 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 884
524 my $face = $self->{tilecache}->get ($id); 885 DC::DB::get tilecache => $id, $cb;
525 886
526 if ($face) { 887 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 888 DC::DB::get res_meta => $face->{name}, $cb;
528 $face 889
529 } else { 890 } else { # no metadata
530 my $tex = $self->{noface}; 891 DC::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 892 }
534} 893}
535 894
536sub face_update { 895sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
538 897
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 898 if ($face->{type} == 0) {
899 # image, FT_FACE
900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
901 if $changed;
540 902
541 $self->set_texture ($face->{id} => delete $face->{image}); 903 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 904
544sub set_texture { 905 } elsif ($face->{type} & 1) {
906 # split metadata case, FT_MUSIC, FT_SOUND
907 if ($changed) { # new data
908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
909 $face->{data} = $meta;
910
911 # rely on strict ordering here and also on later fetch
912 DC::DB::put res_data => $face->{name} => $data, sub { };
913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
914 }
915
916 $face->{data} = $self->{json_coder}->decode ($face->{data});
917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
920
921 if ($face->{type} == 3) { # FT_MUSIC
922 &::audio_music_push ($facenum);
923 } elsif ($face->{type} == 5) { # FT_SOUND
924 &::audio_sound_push ($facenum);
925 }
926
927 } else {
928 # flat resource case, FT_RSRC
929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
930 if $changed;
931 }
932
933 if (my $cbs = $self->{face_cb}{$facenum}) {
934 $_->($face, $changed) for @$cbs;
935 }
936}
937
938sub smooth_update {
939 my ($self, $facenum, $face) = @_;
940
941 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
942}
943
944sub have_tile {
545 my ($self, $id, $data) = @_; 945 my ($self, $tile, $data) = @_;
546 946
547 $self->{texture}[$id] ||= do { 947 return unless $self->{map};
548 my $tex = 948
549 new_from_image CFClient::Texture 949 my $tex = $self->{texture}[$tile] ||=
950 new DC::Texture
951 tile => $tile,
952 image => $data, delete_image => 1,
550 $data, minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
551 954
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
553 $self->{map_widget}->update; 956 $_->($tex) for @$cbs;
554
555 $tex
556 }; 957 }
958}
959
960# call in non-void context registers a temporary
961# hook with handle, otherwise its permanent
962sub on_face_change {
963 my ($self, $num, $cb) = @_;
964
965 push @{$self->{face_cb}{$num}}, $cb;
966
967 defined wantarray
968 ? DC::guard {
969 @{$self->{face_cb}{$num}}
970 = grep $_ != $cb,
971 @{$self->{face_cb}{$num}};
972 }
973 : ()
974}
975
976# call in non-void context registers a temporary
977# hook with handle, otherwise its permanent
978sub register_face_handler {
979 my ($self, $num, $cb) = @_;
980
981 return unless $num;
982
983 # invoke if available right now
984 $cb->($self->{face}[$num], 0)
985 unless exists $self->{face}[$num]{loading};
986
987 # future changes
988 $self->on_face_change ($num => $cb)
557} 989}
558 990
559sub sound_play { 991sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 992 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 993
562 $self->{sound_play}->($x, $y, $soundnum, $type); 994 &::audio_sound_play ($face, $dx, $dy, $vol)
995 unless $type & 1; # odd types are silent for future expansion
563} 996}
564 997
565my $LAST_QUERY; # server is stupid, stupid, stupid 998my $LAST_QUERY; # server is stupid, stupid, stupid
566 999
567sub query { 1000sub query {
… …
571 $LAST_QUERY = $prompt; 1004 $LAST_QUERY = $prompt;
572 1005
573 $self->{query}-> ($self, $flags, $prompt); 1006 $self->{query}-> ($self, $flags, $prompt);
574} 1007}
575 1008
576sub drawinfo { 1009sub sanitise_xml($) {
577 my ($self, $color, $text) = @_; 1010 local $_ = shift;
578 1011
579 my @color = ( 1012 # we now weed out all tags we do not support
1013 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1014 }{
1015 "&lt;"
1016 }gex;
1017
1018 # now all entities
1019 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1020
1021 # handle some elements
1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1023 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1024
1025 $_
1026}
1027
1028our %NAME_TO_COLOR = (
1029 black => 0,
1030 white => 1,
1031 darkblue => 2,
1032 red => 3,
1033 orange => 4,
1034 lightblue => 5,
1035 darkorange => 6,
1036 green => 7,
1037 darkgreen => 8,
1038 grey => 9,
1039 brown => 10,
1040 yellow => 11,
1041 tan => 12,
1042);
1043
1044our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1045 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 1046 [1.00, 1.00, 1.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1047 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
583 [1.00, 0.00, 0.00], 1048 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1049 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1050 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1051 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1052 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1053 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1054 [0.80, 0.80, 0.80],
590 [0.55, 0.41, 0.13], 1055 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1056 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1057 [0.74, 0.65, 0.41],
593 ); 1058);
594 1059
1060sub msg {
1061 my ($self, $color, $type, $text, @extra) = @_;
1062
1063 $text = sanitise_xml $text;
1064
1065 if (my $cb = $self->{cb_msg}{$type}) {
1066 $_->($self, $color, $type, $text, @extra) for values %$cb;
1067 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1068 $type =~ s/-/_/g;
1069 $self->{$type} = $text;
1070 } else {
595 $self->logprint ("info: ", $text); 1071 $self->logprint ("msg: ", $text);
1072 return if $color < 0; # negative color == ignore if not understood
596 1073
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1074 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1075
599 # try to create single paragraphs of multiple lines sent by the server 1076 ## try to create single paragraphs of multiple lines sent by the server
1077 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 1079
602 $text = CFClient::UI::Label::escape $text; 1080 for (split /\n/, $text) {
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1081 ::message ({
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1082 fg => $fg,
1083 markup => $_,
1084 type => $type,
1085 extra => [@extra],
1086 color_flags => $color, #d# ugly, kill
1087 });
605 1088
606 $self->{logview}->add_paragraph ($color[$color], $_) 1089 $color &= ~NDI_CLEAR; # only clear once for multiline messages
607 for map "$time $_", split /\n/, $text; 1090 # actually, this is an ugly design. _we_ should control the channels,
608 $self->{logview}->scroll_to_bottom; 1091 # not some random other widget, as the channels are clearly protocol-specific.
1092 # then we could also react to flags such as CLEAR without resorting to
1093 # hacks such as color_flags, above.
1094 }
609 1095
610 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
611 group => $text, 1097 group => $text,
612 fg => $color[$color], 1098 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
615 ); 1101 ) if $type eq "info";
616} 1102 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1103}
623 1104
624sub spell_add { 1105sub spell_add {
625 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
626 1107
627 # try to create single paragraphs of multiple lines sent by the server 1108 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1109 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
631 1112
632 $::SPELL_PAGE->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
633 1114
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1115 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1116 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
636} 1117}
637 1118
638sub spell_delete { 1119sub spell_delete {
639 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
640 1121
641 $::SPELL_PAGE->remove_spell ($spell); 1122 $::SPELL_LIST->remove_spell ($spell);
1123}
1124
1125sub setup {
1126 my ($self, $setup) = @_;
1127
1128 $self->{map_widget}->set_tilesize ($self->{tilesize});
1129 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 1130}
643 1131
644sub addme_success { 1132sub addme_success {
645 my ($self) = @_; 1133 my ($self) = @_;
646 1134
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 1135 my %skill_help;
651 1136
652 for my $head2 ($pom->head1->[3]->head2) { 1137 for my $node (DC::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1138 my (undef, @par) = DC::Pod::section_of $node;
654 } 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
655
656 \%skill_help
657 }; 1140 };
658 1141
659 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 1145 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 1148 . $skill_help{$skill});
666 } 1149 }
667} 1150}
668 1151
669sub eof { 1152sub eof {
670 my ($self) = @_; 1153 my ($self) = @_;
… …
672 $self->{map_widget}->clr_commands; 1155 $self->{map_widget}->clr_commands;
673 1156
674 ::stop_game (); 1157 ::stop_game ();
675} 1158}
676 1159
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 1160sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1162 return unless $::CONN;
714 1163
715 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
716 1165
1166 my @add;
1167
717 my $row; 1168 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 1169 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 1170 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
723 1174
1175 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1176 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1177 1, $row, $_->{desc_widget};
726 1178
727 $row++; 1179 $row++;
728 } else { 1180 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
730 text => "More...", 1182 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1184 ;
733 last; 1185 last;
734 } 1186 }
735 } 1187 }
1188 if ($::CONN->{open_container}) {
1189 push @add, 1, $row++, new DC::UI::Button
1190 text => "Close container",
1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1192 ;
1193 }
1194
1195 $::FLOORBOX->add_at (@add);
736 }); 1196 });
737 1197
738 $::WANT_REFRESH++; 1198 $::WANT_REFRESH = 1;
739} 1199}
740 1200
741sub set_opencont { 1201sub set_opencont {
742 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
743 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1204 update_floorbox;
744 1205
745 $::INV_RIGHT_HB->clear (); 1206 $::INVR_HB->clear ();
746 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1207 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
747 1208
748 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
749 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
750 text => "Close container", 1211 text => "Close container",
751 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
752 on_activate => sub { 1213 on_activate => sub {
753 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
754 if $tag != 0; 1215 if $tag != 0;
755 #if $CONN->{open_container} != 0;
756 0 1216 0
757 }, 1217 },
758 ); 1218 );
759 } 1219 }
760 1220
… …
762} 1222}
763 1223
764sub update_containers { 1224sub update_containers {
765 my ($self) = @_; 1225 my ($self) = @_;
766 1226
767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
769 or return; 1229 or return;
770 1230
771 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
772 if ($tag == 0) { 1233 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0}) 1234 $::INVR->set_items ($self->{container}{0})
775 if $tag == $self->{open_container}; 1235 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) { 1236 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag}) 1237 $::INV->set_items ($self->{container}{$tag})
778 } else { 1238 } else {
… …
809sub item_update { 1269sub item_update {
810 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
811 1271
812 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1272 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
813 1273
814 CFClient::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
815 1275
816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
817 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
818 1278
819 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
821 1281
822 } else { 1282 } else {
823 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
824 $self->update_containers; 1284 $self->update_containers;
825 } 1285 }
826} 1286}
827 1287
828sub player_update { 1288sub player_update {
829 my ($self, $player) = @_; 1289 my ($self, $player) = @_;
1290
1291 $self->update_weight;
1292}
1293
1294sub update_weight {
1295 my ($self) = @_;
1296
1297 my $weight = .001 * $self->{player}{weight};
1298 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1299
830 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1300 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1301 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1302 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
831} 1303}
832 1304
833sub update_server_info { 1305sub update_server_info {
834 my ($self) = @_; 1306 my ($self) = @_;
835 1307
… …
838 $::SERVER_INFO->set_markup ( 1310 $::SERVER_INFO->set_markup (
839 "server <tt>$self->{host}:$self->{port}</tt>\n" 1311 "server <tt>$self->{host}:$self->{port}</tt>\n"
840 . "protocol version <tt>$self->{version}</tt>\n" 1312 . "protocol version <tt>$self->{version}</tt>\n"
841 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1313 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
842 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1314 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1315 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1316 . "editing support $yesno[!!$self->{editor_support}]\n"
1317 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1318 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
843 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1319 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
844 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1320 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
845 . "map size $self->{mapw}×$self->{maph}\n" 1321 . "map size $self->{mapw}×$self->{maph}\n"
846 ); 1322 );
1323
847} 1324}
848 1325
849sub logged_in { 1326sub logged_in {
850 my ($self) = @_; 1327 my ($self) = @_;
851 1328
852 $self->send_ext_req (cfplus_support => "1", sub { 1329 $self->send_ext_req (cfplus_support => version => 2, sub {
1330 my (%msg) = @_;
1331
853 $self->{cfplus_ext} = $_[0]; 1332 $self->{cfplus_ext} = $msg{version};
854 $self->update_server_info; 1333 $self->update_server_info;
1334
1335 if ($self->{cfplus_ext} >= 2) {
1336 $self->send_ext_req ("editor_support", sub {
1337 $self->{editor_support} = { @_ };
1338 $self->update_server_info;
1339
1340 0
1341 });
1342 }
1343
1344 0
855 }); 1345 });
856 1346
857 $self->update_server_info; 1347 $self->update_server_info;
858 1348
859 $self->send_command ("output-sync $::CFG->{output_sync}"); 1349 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
860 $self->send_command ("output-count $::CFG->{output_count}");
861 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
862} 1351}
863 1352
864sub lookat { 1353sub lookat {
865 my ($self, $x, $y) = @_; 1354 my ($self, $x, $y) = @_;
866 1355
867 if ($self->{cfplus_ext}) { 1356 if ($self->{cfplus_ext}) {
868 $self->send_ext_req (lookat => "$x $y", sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
869 my %res = split /\x00/, $_[0]; 1358 my (%msg) = @_;
870 1359
871 if (exists $res{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
872 # start npc chat dialog 1361 # start npc chat dialog
873 $self->{npc_dialog} = new CFClient::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
874 dx => $x, 1363 token => $msg{npc_dialog},
875 dy => $y,
876 title => "$res{npc_dialog} (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
877 conn => $self, 1365 conn => $self,
878 ; 1366 ;
879 } 1367 }
880 }); 1368 });
881 } 1369 }
… …
884} 1372}
885 1373
886sub destroy { 1374sub destroy {
887 my ($self) = @_; 1375 my ($self) = @_;
888 1376
889 $self->{npc_dialog}->destroy 1377 (delete $self->{npc_dialog})->destroy
890 if $self->{npc_dialog}; 1378 if $self->{npc_dialog};
891 1379
892 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
893}
894 1381
1382 %$self = ();
1383}
1384
895package CFClient::NPCDialog; 1385package DC::NPCDialog;
896 1386
897our @ISA = 'CFClient::UI::FancyFrame'; 1387our @ISA = 'DC::UI::Toplevel';
898 1388
899sub new { 1389sub new {
900 my $class = shift; 1390 my $class = shift;
901 1391
902 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
905 name => "npc_dialog", 1395 name => "npc_dialog",
906 force_w => $::WIDTH * 0.7, 1396 force_w => $::WIDTH * 0.7,
907 force_h => $::HEIGHT * 0.7, 1397 force_h => $::HEIGHT * 0.7,
908 title => "NPC Dialog", 1398 title => "NPC Dialog",
909 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1400 has_close_button => 1,
910 @_, 1401 @_,
911 ); 1402 );
912 1403
913 Scalar::Util::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1405
1406 $self->connect (delete => sub { $this->destroy; 1 });
914 1407
915 # better use a pane... 1408 # better use a pane...
916 $self->add (my $hbox = new CFClient::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
917 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
918 1411
919 $hbox->add (my $vbox = new CFClient::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
920 1413
921 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
922 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
923 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1416 tooltip => "#npc_message_entry",
924 . "Sometimes you have to tell an NPC something you cannot find out during "
925 . "a normal conversation (such as a password). In those cases you have to use "
926 . "this text entry. You can also enter responses manually instead of using the response "
927 . "buttons below.",
928 on_activate => sub { 1417 on_activate => sub {
929 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
930 1419
931 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
932 1421
… …
935 1424
936 0 1425 0
937 }, 1426 },
938 ); 1427 );
939 1428
940 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
941 1430
942 $self->{bye_button} = new CFClient::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
943 text => "Bye (close)", 1432 text => "Bye (close)",
944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1433 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
945 on_activate => sub { $this->destroy; 0 }, 1434 on_activate => sub { $this->destroy; 1 },
946 ; 1435 ;
947 1436
948 $self->update_options; 1437 $self->update_options;
949 1438
950 $self->{token} = $self->{conn}->ext_token; 1439 $self->{id} = "npc-channel-" . $self->{conn}->token;
951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1440 $self->{conn}->connect_ext ($self->{id} => sub {
952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1441 $this->feed (@_) if $this;
1442 });
1443
1444 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
953 1445
954 $self->{entry}->grab_focus; 1446 $self->{entry}->grab_focus;
955 1447
956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1448 $self->{textview}->add_paragraph ({
1449 fg => [1, 1, 0, 1],
1450 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1451 });
957 1452
958 $self->show; 1453 $self->show;
959 $self 1454 $self
960}; 1455};
961 1456
962sub update_options { 1457sub update_options {
963 my ($self) = @_; 1458 my ($self) = @_;
964 1459
965 Scalar::Util::weaken $self; 1460 DC::weaken $self;
966 1461
967 $self->{options}->clear; 1462 $self->{options}->clear;
968 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
969 1464
970 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
971 $self->{options}->add (new CFClient::UI::Button 1466 $self->{options}->add (new DC::UI::Button
972 text => $kw, 1467 text => $kw,
973 on_activate => sub { 1468 on_activate => sub {
974 $self->send ($kw); 1469 $self->send ($kw);
975 0 1470 0
976 }, 1471 },
977 ); 1472 );
978 } 1473 }
979} 1474}
980 1475
981sub feed { 1476sub feed {
982 my ($self, $data) = @_; 1477 my ($self, $type, @arg) = @_;
983 1478
984 Scalar::Util::weaken $self; 1479 DC::weaken $self;
985 1480
986 my ($type, $msg) = split / /, $data, 2;
987
988 if ($type eq "msg") { 1481 if ($type eq "update") {
989 my ($msg, @kw) = split /\x00/, $msg; 1482 my (%info) = @arg;
990 $self->{kw}{$_} = 1 for @kw;
991 1483
992 $msg = "\n" . CFClient::UI::Label::escape $msg; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
993 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
994 my @link;
995 $msg =~ s{
996 ($match)
997 }{
998 my $kw = $1;
999
1000 push @link, new CFClient::UI::Label
1001 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1002 can_hover => 1,
1003 can_events => 1,
1004 padding_x => 0,
1005 padding_y => 0,
1006 on_button_up => sub {
1007 $self->send ($kw);
1008 };
1009
1010 chr 0xfffc
1011 }giex;
1012 1486
1013 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1487 if (exists $info{msg}) {
1488 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1489 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1490 my @link;
1491 $text =~ s{
1492 ($match)
1493 }{
1494 my $kw = $1;
1495
1496 push @link, new DC::UI::Label
1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1498 can_hover => 1,
1499 can_events => 1,
1500 padding_x => 0,
1501 padding_y => 0,
1502 on_button_up => sub {
1503 $self->send ($kw);
1504 };
1505
1506 "\x{fffc}"
1507 }giex;
1508
1509 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1014 $self->{textview}->scroll_to_bottom; 1510 $self->{textview}->scroll_to_bottom;
1511 }
1512
1015 $self->update_options; 1513 $self->update_options;
1016 } else { 1514 } else {
1017 $self->destroy; 1515 $self->destroy;
1018 } 1516 }
1019 1517
… …
1021} 1519}
1022 1520
1023sub send { 1521sub send {
1024 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1025 1523
1026 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1027 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
1028 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1526
1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1029} 1528}
1030 1529
1031sub destroy { 1530sub destroy {
1032 my ($self) = @_; 1531 my ($self) = @_;
1033 1532
1034 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1533 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1035 1534
1535 if ($self->{conn}) {
1036 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1536 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1037 delete $self->{conn}{npc_dialog}; 1537 delete $self->{conn}{npc_dialog};
1038 $self->{conn}->disconnect_ext ($self->{token}); 1538 $self->{conn}->disconnect_ext ($self->{id});
1539 }
1039 1540
1040 $self->SUPER::destroy; 1541 $self->SUPER::destroy;
1041} 1542}
1042 1543
10431; 15441
1545

Diff Legend

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