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.2 by root, Fri May 26 19:14:33 2006 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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