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.56 by root, Tue Jul 11 13:27:31 2006 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 2007 UTC

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

Diff Legend

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