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.109 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.202 by root, Tue Sep 9 10:27:26 2008 UTC

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

Diff Legend

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