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

Diff Legend

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