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

Diff Legend

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