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.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

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