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

Diff Legend

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