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

Diff Legend

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