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.78 by elmex, Mon Aug 14 14:35:31 2006 UTC vs.
Revision 1.184 by root, Thu Dec 27 18:35:56 2007 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 DC::DB;
9use CFPlus::UI; 10use DC::UI;
10use CFPlus::Pod; 11use DC::Pod;
12use DC::Macro;
13use DC::Item;
11 14
12use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
13 16
14sub new { 17sub new {
15 my $class = shift; 18 my ($class, %arg) = @_;
16 19
17 my $self = $class->SUPER::new (@_); 20 my $self = $class->SUPER::new (%arg,
21 setup_req => {
22 extmap => 1,
23 excmd => 1,
24 widget => 2,
25 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my @cmd_help = map { 31 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
24 34
25 my $cmd = $1; 35 my $cmd = $1;
26 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
27 @args = (".*") unless @args; 37 @args = (".*") unless @args;
28 38
29 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
31 41
32 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
33 for @args; 43 for @args;
34 44
35 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
37 @args 47 @args
38 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
40 50
51 $self->{json_coder}
52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
61 });
62
63 # destroy widgets on logout
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy
67 for values %{delete $ws->{w} || {}};
68 }
69 });
70
41 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 72 for @cmd_help;
43 73
74 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 }
79
80 {
44 $self->{noface} = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 }
46 85
47 $self->{open_container} = 0; 86 $self->{open_container} = 0;
48 87
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache";
51 $self->{facemap} = CFPlus::db_table "facemap";
52
53 # per server 88 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55 90
56 $self 91 $self
57} 92}
93
94sub update_fx_want {
95 my ($self) = @_;
96
97 $self->send_exti_msg (fx_want => {
98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
101 });
102}
103
104sub ext_capabilities {
105 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121
122 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3];
126 $self->setup_req (tileset => $default->[0]);
127
128 my $w = int $self->{mapw} * 32 / $self->{tilesize};
129 my $h = int $self->{maph} * 32 / $self->{tilesize};
130
131 $self->setup_req (mapsize => "${w}x${h}");
132 }
133 }
134}
135
136sub ext_ambient_music {
137 my ($self, $songs) = @_;
138 &::audio_music_set_ambient ($songs);
139}
140
141#############################################################################
142
143sub widget_associate {
144 my ($self, $ws, $id, $widget) = @_;
145
146 $widget ||= new DC::UI::Bin;
147
148 $widget->{s_id} = $id;
149 $self->{widget}{$id} = $widget;
150
151 if ($ws) {
152 $widget->{s_ws} = $ws;
153 $self->{widgetset}{$ws}{w}{$id} = $widget;
154 }
155
156 $widget->connect (on_destroy => sub {
157 my ($widget) = @_;
158
159 delete $self->{widget}{$widget->{s_id}};
160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
161 if exists $widget->{s_ws};
162 });
163}
164
165# widgetset new
166sub ext_ws_n {
167 my ($self, $id) = @_;
168
169 $self->{widgetset}{$id} = {
170 w => {},
171 };
172}
173
174# widgetset destroy
175sub ext_ws_d {
176 my ($self, $id) = @_;
177
178 my $ws = delete $self->{widgetset}{$id}
179 or return;
180
181 $_->destroy
182 for values %{$ws->{w}};
183}
184
185# widgetset create
186sub ext_ws_c {
187 my ($self, $ws, $id, $class, $args) = @_;
188
189 $self->widget_associate (
190 $ws, $id => scalar eval {
191 local $SIG{__DIE__};
192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $template, $cfg) = @_;
200
201 $template = eval <<EOF;
202[
203 Toplevel => {
204 s_id => "toplevel",
205 title => "Character Creation",
206 x => "center",
207 y => "center",
208 z => 5,
209 s_cl => [VBox => {s_cl => [
210 Label => {
211 text => "Character Creation",
212 fontsize => 1,
213 align => 0,
214 },
215 Label => {
216 markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
217 fontsize => 0.8,
218 align => 0,
219 },
220 Notebook => {
221 s_cl => [
222 Label => {
223 text => "hulla-hoop"
224 },
225 Entry => {
226 s_id => "entry",
227 },
228 ],
229 },
230 Button => {
231 s_id => "finish",
232 title => "Finish",
233 },
234 ]}],
235 },
236]
237EOF
238 die if $@;
239
240 my $parse_list; $parse_list = sub {
241 my ($list) = @_;
242 my @w;
243
244 while (@$list) {
245 my ($class, $args) = splice @$list, 0, 2;
246 my $name = delete $args->{s_id};
247 my $cl = delete $args->{s_cl};
248 my $cfg = delete $cfg->{$name};
249 my $id = delete $cfg->{id};
250 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
251 or next;
252
253 $self->widget_associate ($ws, $id, $w)
254 if $id;
255
256 $w->add ($parse_list->($cl))
257 if $cl;
258
259 push @w, $w;
260 }
261
262 @w
263 };
264
265 $parse_list->($template);
266
267}
268
269# widgetset associate
270sub ext_ws_a {
271 my ($self, %ass) = @_;
272
273 # everything that has a name, wether conceivably useful or not
274 my %wkw = (
275 root => $DC::UI::ROOT,
276 tooltip => $DC::UI::TOOLTIP,
277
278 mapwidget => $::MAPWIDGET,
279 buttonbar => $::BUTTONBAR,
280 metaserver => $::METASERVER,
281 buttonbar => $::BUTTONBAR,
282 login_button => $::LOGIN_BUTTON,
283 quit_dialog => $::QUIT_DIALOG,
284 host_entry => $::HOST_ENTRY,
285 metaserver => $::METASERVER,
286 server_info => $::SERVER_INFO,
287
288 setup_dialog => $::SETUP_DIALOG,
289 setup_notebook => $::SETUP_NOTEBOOK,
290 setup_server => $::SETUP_SERVER,
291 setup_keyboard => $::SETUP_KEYBOARD,
292
293 pl_notebook => $::PL_NOTEBOOK,
294 pl_window => $::PL_WINDOW,
295 inventory_page => $::INVENTORY_PAGE,
296 stats_page => $::STATS_PAGE,
297 skill_page => $::SKILL_PAGE,
298 spell_page => $::SPELL_PAGE,
299 spell_list => $::SPELL_LIST,
300
301 floorbox => $::FLOORBOX,
302 help_window => $::HELP_WINDOW,
303 message_window => $::MESSAGE_WINDOW,
304 statusbox => $::SDTATUSBOX,
305
306 inv => $::INV,
307 invr => $::INVR,
308 invr_hb => $::INVR_HB,
309 );
310
311 while (my ($id, $name) = each %ass) {
312 $self->widget_associate (undef, $id => $wkw{$name});
313 }
314}
315
316# widget call
317sub ext_w_c {
318 my ($self, $id, $rcb, $method, @args) = @_;
319
320 my $w = $self->{widget}{$id}
321 or return;
322
323 if ($rcb) {
324 $rcb->($w->$method (@args));
325 } else {
326 $w->$method (@args);
327 }
328}
329
330# widget set
331sub ext_w_s {
332 my ($self, $id, $attr) = @_;
333
334 my $w = $self->{widget}{$id}
335 or return;
336
337 for (my $i = 0; $i < $#$attr; $i += 2) {
338 my ($member, $value) = @$attr[$i, $i+1];
339 if (defined $value) {
340 $w->{$member} = $value;
341 } else {
342 delete $w->{$member};
343 }
344 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
345 }
346}
347
348# widget get
349sub ext_w_g {
350 my ($self, $id, $rid, @attr) = @_;
351
352 my $w = $self->{widget}{$id}
353 or return;
354
355 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
356}
357
358# message window
359sub ext_channel_info {
360 my ($self, $info) = @_;
361 $self->{channels}->{$info->{id}} = $info;
362 $::MESSAGE_WINDOW->add_channel ($info);
363}
364
365#############################################################################
58 366
59sub logprint { 367sub logprint {
60 my ($self, @a) = @_; 368 my ($self, @a) = @_;
61 369
62 return; 370 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
63 $self->{log_fh} ||= do {
64 my $path = "$Crossfire::VARDIR/log.$self->{host}";
65
66 open my $fh, ">>:utf8", $path
67 or die "Couldn't open logfile $path: $!";
68
69 $fh->autoflush (1);
70
71 $fh;
72 };
73
74 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
75
76 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
77 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
78
79 print {$self->{log_fh}} "$ts ", @a, "\n";
80} 371}
81 372
82sub _stat_numdiff { 373sub _stat_numdiff {
83 my ($self, $name, $old, $new) = @_; 374 my ($self, $name, $old, $new) = @_;
84 375
… …
168 459
169 if ( 460 if (
170 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 461 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
171 ) { 462 ) {
172 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 463 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
173 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 464 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
174 } 465 }
175 466
176 $self->update_stats_window ($stats, $prev); 467 $self->update_stats_window ($stats, $prev);
177 468
178 $self->{prev_stats} = { %$stats }; 469 $self->{prev_stats} = { %$stats };
… …
217 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 508 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
218 $::GAUGES->{food} ->set_value ($fo, $fo_m); 509 $::GAUGES->{food} ->set_value ($fo, $fo_m);
219 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 510 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
220 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 511 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
221 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 512 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
222 my $rng = $stats->{+CS_STAT_RANGE}; 513 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
223 $rng =~ s/^Range: //; # thank you so much dear server 514 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
224 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
225 my $title = $stats->{+CS_STAT_TITLE}; 515 my $title = $stats->{+CS_STAT_TITLE};
226 $title =~ s/^Player: //; 516 $title =~ s/^Player: //;
227 $::STATWIDS->{title} ->set_text ("Title: " . $title); 517 $::STATWIDS->{title} ->set_text ("Title: " . $title);
228 518
229 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 519 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
246 for keys %RES_TBL; 536 for keys %RES_TBL;
247 537
248 my $sktbl = $::STATWIDS->{skill_tbl}; 538 my $sktbl = $::STATWIDS->{skill_tbl};
249 my @skills = keys %{ $self->{skill_info} }; 539 my @skills = keys %{ $self->{skill_info} };
250 540
251 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 541 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
542 map [$_, $self->{skill_info}{$_}],
543 grep exists $stats->{$_},
544 @skills;
545
546 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
547 $self->{stat_order} = join ",", map $_->[0], @order;
548
252 $sktbl->clear; 549 $sktbl->clear;
253 550
551 my $sw = $self->{skillwid}{""} ||= [
254 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 552 0, 0, (new DC::UI::Label text => "Experience", align => 1),
255 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 553 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
554 2, 0, (new DC::UI::Label text => "Progress", align => 0),
256 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 555 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
257 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 556 4, 0, (new DC::UI::Label text => "Experience", align => 1),
258 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 557 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
558 6, 0, (new DC::UI::Label text => "Progress", align => 0),
259 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 559 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
560 ];
561
562 my @add = @$sw;
260 563
261 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 564 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
262 565
263 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 566 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 567 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 568
266 my ($x, $y) = (0, 1); 569 my ($x, $y) = (0, 1);
267 for ( 570 for (@order) {
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_},
271 @skills
272 ) {
273 my ($idx, $name) = @$_; 571 my ($idx, $name) = @$_;
274 572
275 my $spell_cb = sub { 573 my $spell_cb = sub {
276 my ($widget, $ev) = @_; 574 my ($widget, $ev) = @_;
277 575
278 if ($ev->{button} == 1) { 576 if ($ev->{button} == 1) {
279 $::CONN->user_send ("ready_skill $name"); 577 $::CONN->user_send ("ready_skill $name");
280 } elsif ($ev->{button} == 2) { 578 } elsif ($ev->{button} == 2) {
281 $::CONN->user_send ("use_skill $name"); 579 $::CONN->user_send ("use_skill $name");
282 } elsif ($ev->{button} == 3) { 580 } elsif ($ev->{button} == 3) {
581 my $shortname = DC::shorten $name, 14;
283 (new CFPlus::UI::Menu 582 (new DC::UI::Menu
284 items => [ 583 items => [
285 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 584 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
286 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 585 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
287 ], 586 ],
288 )->popup ($ev); 587 )->popup ($ev);
289 } else { 588 } else {
290 return 0; 589 return 0;
291 } 590 }
292 591
293 1 592 1
294 }; 593 };
295 594
296 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 595 my $sw = $self->{skillwid}{$idx} ||= [
596 # exp
597 (new DC::UI::Label
297 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 598 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
298 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 599
600 # level
601 (new DC::UI::Label
299 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 602 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
603
604 # progress
605 (new DC::UI::ExperienceProgress),
606
607 # label
300 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 608 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
301 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 609 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
610 ];
611
612 push @add,
613 $x * 4 + 0, $y, $sw->[0],
614 $x * 4 + 1, $y, $sw->[1],
615 $x * 4 + 2, $y, $sw->[2],
616 $x * 4 + 3, $y, $sw->[3],
617 ;
302 618
303 $x++ and ($x, $y) = (0, $y + 1); 619 $x++ and ($x, $y) = (0, $y + 1);
304 } 620 }
305 }
306 621
307 for (grep exists $stats->{$_}, @skills) { 622 $sktbl->add_at (@add);
308 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 623 }
309 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 624
625 for (@order) {
626 my ($idx, $name) = @$_;
627 my $val = $stats->{$idx};
628
629 next if $prev->{$idx}[1] eq $val->[1];
630
631 my $sw = $self->{skillwid}{$idx};
632 $sw->[0]->set_text (::formsep ($val->[1]));
633 $sw->[1]->set_text ($val->[0] * 1);
634 $sw->[2]->set_value (@$val);
635
636 $::GAUGES->{sklprg}->set_label ("$name %d%%");
637 $::GAUGES->{sklprg}->set_value (@$val);
310 } 638 }
311} 639}
312 640
313sub user_send { 641sub user_send {
314 my ($self, $command) = @_; 642 my ($self, $command) = @_;
315 643
644 $self->{record}->($command)
316 if ($self->{record}) { 645 if $self->{record};
317 push @{$self->{record}}, $command;
318 }
319 646
320 $self->logprint ("send: ", $command); 647 $self->logprint ("send: ", $command);
321 $self->send_command ($command); 648 $self->send_command ($command);
322 ::status ($command);
323} 649}
324 650
325sub start_record { 651sub record {
326 my ($self) = @_; 652 my ($self, $cb) = @_;
327 653
328 $self->{record} = []; 654 $self->{record} = $cb;
329}
330
331sub stop_record {
332 my ($self) = @_;
333 return delete $self->{record};
334} 655}
335 656
336sub map_scroll { 657sub map_scroll {
337 my ($self, $dx, $dy) = @_; 658 my ($self, $dx, $dy) = @_;
338 659
… …
340} 661}
341 662
342sub feed_map1a { 663sub feed_map1a {
343 my ($self, $data) = @_; 664 my ($self, $data) = @_;
344 665
345 $self->{map}->map1a_update ($data); 666 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
667 my $delay;
668
669 for my $tile (@$missing) {
670 next if $self->{delay}{$tile};
671
672 $delay = 1;
673
674 if (my $tex = $::CONN->{texture}[$tile]) {
675 $tex->upload;
676 } else {
677 $self->{delay}{$tile} = 1;
678
679 # we assume the face is in-flight and will eventually come
680 push @{$self->{tile_cb}{$tile}}, sub {
681 delete $self->{delay}{$tile};
682 $_[0]->upload;
683 };
684 }
685 }
686
687 if ($delay) {
688 # delay the map drawing a tiny bit in the hope of getting the missing fetched
689 EV::once undef, 0, 0.03, sub {
690 $self->{map_widget}->update
691 if $self->{map_widget};
692 };
693 } else {
346 $self->{map_widget}->update; 694 $self->{map_widget}->update;
695 }
347} 696}
348 697
349sub magicmap { 698sub magicmap {
350 my ($self, $w, $h, $x, $y, $data) = @_; 699 my ($self, $w, $h, $x, $y, $data) = @_;
351 700
… …
358 my $map_info = delete $self->{map_info} 707 my $map_info = delete $self->{map_info}
359 or return; 708 or return;
360 709
361 my ($hash, $x, $y, $w, $h) = @$map_info; 710 my ($hash, $x, $y, $w, $h) = @$map_info;
362 711
363 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 712 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
364 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 713 $self->{map_cache_new}{$hash} = \$data;
365 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 714 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
366} 715}
367 716
368sub map_clear { 717sub map_clear {
369 my ($self) = @_; 718 my ($self) = @_;
370 719
… …
373 722
374 $self->{map}->clear; 723 $self->{map}->clear;
375 delete $self->{map_widget}{magicmap}; 724 delete $self->{map_widget}{magicmap};
376} 725}
377 726
727sub bg_fetch {
728 my ($self) = @_;
729
730 my $tile;
731
732 do {
733 $tile = pop @{$self->{bg_fetch}}
734 or return;
735 } while $self->{texture}[$tile];
736
737 DC::DB::get tilecache => $tile, sub {
738 my ($data) = @_;
739
740 return unless $self->{map}; # stop when destroyed
741
742 if (defined $data) {
743 $self->have_tile ($tile, $data);
744 $self->{texture}[$tile]->upload;
745 }
746
747 $self->bg_fetch;
748 };
749}
378 750
379sub load_map($$$) { 751sub load_map($$$) {
380 my ($self, $hash, $x, $y) = @_; 752 my ($self, $hash, $x, $y) = @_;
381 753
382 if (defined (my $data = $self->{mapcache}->get ($hash))) { 754 my $gen = $self->{map_change_gen};
755
756 my $cb = sub {
757 return unless $gen == $self->{map_change_gen};
758
759 my ($data) = @_;
760
761 if (defined $data) {
762 $self->{map_cache_new}{$hash} = \$data;
763
383 $data = Compress::LZF::decompress $data; 764 my $data = Compress::LZF::decompress $data;
384 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
385 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
386 my $data = $self->{tilecache}->get ($id)
387 or next;
388 765
389 $self->set_texture ($id => $data); 766 my $inprogress = @{ $self->{bg_fetch} || [] };
767 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
768 $self->bg_fetch unless $inprogress;
390 } 769 }
770 };
771
772 if (my $rdata = $self->{map_cache_old}{$hash}) {
773 $cb->($$rdata);
774 } else {
775 DC::DB::get $self->{mapcache} => $hash, $cb;
391 } 776 }
392} 777}
393 778
394# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 779# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
395# (server resource,s latency, bandwidth), so this hack is warranted. 780# (server resource,s latency, bandwidth), so this hack is warranted.
… …
460 845
461 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 846 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
462 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 847 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
463 848
464 } else { 849 } else {
850 my $gen = $self->{map_change_gen};
465 $self->send_mapinfo ("spatial $path$tile", sub { 851 $self->send_mapinfo ("spatial $path$tile", sub {
852 return unless $gen == $self->{map_change_gen};
853
466 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 854 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
467 855
468 return if $mode ne "spatial"; 856 return if $mode ne "spatial";
469 857
470 $x += $self->{map}->ox; 858 $x += $self->{map}->ox;
… …
484 872
485sub map_change { 873sub map_change {
486 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 874 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
487 875
488 $self->flush_map; 876 $self->flush_map;
877
878 ++$self->{map_change_gen};
879 $self->{map_cache_old} = delete $self->{map_cache_new};
489 880
490 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 881 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
491 882
492 my $mapmapw = $self->{mapmap}->{w}; 883 my $mapmapw = $self->{mapmap}->{w};
493 my $mapmaph = $self->{mapmap}->{h}; 884 my $mapmaph = $self->{mapmap}->{h};
… …
510 $self->load_map ($hash, $x, $y); 901 $self->load_map ($hash, $x, $y);
511 $self->flood_fill (0, 0, 0, "", $hash, $flags); 902 $self->flood_fill (0, 0, 0, "", $hash, $flags);
512} 903}
513 904
514sub face_find { 905sub face_find {
515 my ($self, $facenum, $face) = @_; 906 my ($self, $facenum, $face, $cb) = @_;
516 907
517 my $hash = "$face->{chksum},$face->{name}"; 908 if ($face->{type} == 0) { # FT_FACE
909 my $id = DC::DB::get_tile_id_sync $face->{name};
518 910
519 my $id = $self->{facemap}->get ($hash);
520
521 unless ($id) {
522 # create new id for face
523 # I love transactions
524 for (1..100) {
525 my $txn = $CFPlus::DB_ENV->txn_begin;
526 my $status = $self->{facemap}->db_get (id => $id);
527 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
528 $id = ($id || 64) + 1;
529 if ($self->{facemap}->put (id => $id) == 0
530 && $self->{facemap}->put ($hash => $id) == 0) {
531 $txn->txn_commit;
532
533 goto gotid;
534 }
535 }
536 $txn->txn_abort;
537 }
538
539 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
540 }
541
542gotid:
543 $face->{id} = $id; 911 $face->{id} = $id;
544 $self->{map}->set_face ($facenum => $id); 912 $self->{map}->set_tileid ($facenum => $id);
545 $self->{faceid}[$facenum] = $id;#d#
546 913
547 my $face = $self->{tilecache}->get ($id); 914 DC::DB::get tilecache => $id, $cb;
548 915
549 if ($face) { 916 } elsif ($face->{type} & 1) { # with metadata
550 #$self->face_prefetch; 917 DC::DB::get res_meta => $face->{name}, $cb;
551 $face 918
552 } else { 919 } else { # no metadata
553 my $tex = $self->{noface}; 920 DC::DB::get res_data => $face->{name}, $cb;
554 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
555 undef
556 }; 921 }
557} 922}
558 923
559sub face_update { 924sub face_update {
560 my ($self, $facenum, $face, $changed) = @_; 925 my ($self, $facenum, $face, $changed) = @_;
561 926
562 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 927 if ($face->{type} == 0) {
928 # image, FT_FACE
929 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
930 if $changed;
563 931
564 $self->set_texture ($face->{id} => delete $face->{image}); 932 $self->have_tile ($face->{id}, delete $face->{data});
565}
566 933
567sub set_texture { 934 } elsif ($face->{type} & 1) {
935 # split metadata case, FT_MUSIC, FT_SOUND
936 if ($changed) { # new data
937 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
938 $face->{data} = $meta;
939
940 # rely on strict ordering here and also on later fetch
941 DC::DB::put res_data => $face->{name} => $data, sub { };
942 DC::DB::put res_meta => $face->{name} => $meta, sub { };
943 }
944
945 $face->{data} = $self->{json_coder}->decode ($face->{data});
946 ::add_license ($face);
947 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
948 if $changed;
949
950 if ($face->{type} == 3) { # FT_MUSIC
951 &::audio_music_push ($facenum);
952 } elsif ($face->{type} == 5) { # FT_SOUND
953 &::audio_sound_push ($facenum);
954 }
955
956 } else {
957 # flat resource case, FT_RSRC
958 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
959 if $changed;
960 }
961
962 if (my $cbs = $self->{face_cb}{$facenum}) {
963 $_->($face, $changed) for @$cbs;
964 }
965}
966
967sub smooth_update {
968 my ($self, $facenum, $face) = @_;
969
970 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
971}
972
973sub have_tile {
568 my ($self, $id, $data) = @_; 974 my ($self, $tile, $data) = @_;
569 975
570 $self->{texture}[$id] ||= do { 976 return unless $self->{map};
571 my $tex = 977
572 new_from_image CFPlus::Texture 978 my $tex = $self->{texture}[$tile] ||=
979 new DC::Texture
980 tile => $tile,
981 image => $data, delete_image => 1,
573 $data, minify => 1, mipmap => 1; 982 minify => 1, mipmap => 1;
574 983
575 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 984 if (my $cbs = delete $self->{tile_cb}{$tile}) {
576 $self->{map_widget}->update; 985 $_->($tex) for @$cbs;
577
578 $tex
579 }; 986 }
987}
988
989# call in non-void context registers a temporary
990# hook with handle, otherwise its permanent
991sub on_face_change {
992 my ($self, $num, $cb) = @_;
993
994 push @{$self->{face_cb}{$num}}, $cb;
995
996 defined wantarray
997 ? DC::guard {
998 @{$self->{face_cb}{$num}}
999 = grep $_ != $cb,
1000 @{$self->{face_cb}{$num}};
1001 }
1002 : ()
1003}
1004
1005# call in non-void context registers a temporary
1006# hook with handle, otherwise its permanent
1007sub register_face_handler {
1008 my ($self, $num, $cb) = @_;
1009
1010 return unless $num;
1011
1012 # invoke if available right now
1013 $cb->($self->{face}[$num], 0)
1014 unless exists $self->{face}[$num]{loading};
1015
1016 # future changes
1017 $self->on_face_change ($num => $cb)
580} 1018}
581 1019
582sub sound_play { 1020sub sound_play {
583 my ($self, $x, $y, $soundnum, $type) = @_; 1021 my ($self, $type, $face, $dx, $dy, $vol) = @_;
584 1022
585 $self->{sound_play}->($x, $y, $soundnum, $type); 1023 &::audio_sound_play ($face, $dx, $dy, $vol)
1024 unless $type & 1; # odd types are silent for future expansion
586} 1025}
587 1026
588my $LAST_QUERY; # server is stupid, stupid, stupid 1027my $LAST_QUERY; # server is stupid, stupid, stupid
589 1028
590sub query { 1029sub query {
… …
594 $LAST_QUERY = $prompt; 1033 $LAST_QUERY = $prompt;
595 1034
596 $self->{query}-> ($self, $flags, $prompt); 1035 $self->{query}-> ($self, $flags, $prompt);
597} 1036}
598 1037
599sub drawinfo { 1038sub sanitise_xml($) {
600 my ($self, $color, $text) = @_; 1039 local $_ = shift;
601 1040
602 my @color = ( 1041 # we now weed out all tags we do not support
1042 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1043 }{
1044 "&lt;"
1045 }gex;
1046
1047 # now all entities
1048 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1049
1050 # handle some elements
1051 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1052 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1053
1054 $_
1055}
1056
1057our %NAME_TO_COLOR = (
1058 black => 0,
1059 white => 1,
1060 darkblue => 2,
1061 red => 3,
1062 orange => 4,
1063 lightblue => 5,
1064 darkorange => 6,
1065 green => 7,
1066 darkgreen => 8,
1067 grey => 9,
1068 brown => 10,
1069 yellow => 11,
1070 tan => 12,
1071);
1072
1073our @CF_COLOR = (
603 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1074 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
604 [1.00, 1.00, 1.00], 1075 [1.00, 1.00, 1.00],
605 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1076 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
606 [1.00, 0.00, 0.00], 1077 [1.00, 0.00, 0.00],
607 [1.00, 0.54, 0.00], 1078 [1.00, 0.54, 0.00],
608 [0.11, 0.56, 1.00], 1079 [0.11, 0.56, 1.00],
609 [0.93, 0.46, 0.00], 1080 [0.93, 0.46, 0.00],
610 [0.18, 0.54, 0.34], 1081 [0.18, 0.54, 0.34],
611 [0.56, 0.73, 0.56], 1082 [0.56, 0.73, 0.56],
612 [0.80, 0.80, 0.80], 1083 [0.80, 0.80, 0.80],
613 [0.75, 0.61, 0.20], 1084 [0.75, 0.61, 0.20],
614 [0.99, 0.77, 0.26], 1085 [0.99, 0.77, 0.26],
615 [0.74, 0.65, 0.41], 1086 [0.74, 0.65, 0.41],
616 ); 1087);
617 1088
1089sub msg {
1090 my ($self, $color, $type, $text, @extra) = @_;
1091
1092 $text = sanitise_xml $text;
1093
1094 if (my $cb = $self->{cb_msg}{$type}) {
1095 $_->($self, $color, $type, $text, @extra) for values %$cb;
1096 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1097 $type =~ s/-/_/g;
1098 $self->{$type} = $text;
1099 } else {
618 $self->logprint ("info: ", $text); 1100 $self->logprint ("msg: ", $text);
1101 return if $color < 0; # negative color == ignore if not understood
619 1102
620 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1103 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
621 1104
622 # try to create single paragraphs of multiple lines sent by the server 1105 ## try to create single paragraphs of multiple lines sent by the server
1106 # no longer neecssary with TRT servers
623 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1107 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
624 1108
625 $text = CFPlus::asxml $text; 1109 for (split /\n/, $text) {
626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1110 ::message ({
627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1111 fg => $fg,
1112 markup => $_,
1113 type => $type,
1114 extra => [@extra],
1115 color_flags => $color, #d# ugly, kill
1116 });
628 1117
629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 1118 $color &= ~NDI_CLEAR; # only clear once for multiline messages
630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 1119 # actually, this is an ugly design. _we_ should control the channels,
631 $self->{logview}->scroll_to_bottom; 1120 # not some random other widget, as the channels are clearly protocol-specific.
1121 # then we could also react to flags such as CLEAR without resorting to
1122 # hacks such as color_flags, above.
1123 }
632 1124
633 $self->{statusbox}->add ($text, 1125 $self->{statusbox}->add ($text,
634 group => $text, 1126 group => $text,
635 fg => $color[$color], 1127 fg => $fg,
636 timeout => $color >= 2 ? 180 : 10, 1128 timeout => $color >= 2 ? 180 : 10,
637 tooltip_font => $::FONT_FIXED, 1129 tooltip_font => $::FONT_FIXED,
638 ); 1130 ) if $type eq "info";
639} 1131 }
640
641sub drawextinfo {
642 my ($self, $color, $type, $subtype, $message) = @_;
643
644 $self->drawinfo ($color, $message);
645} 1132}
646 1133
647sub spell_add { 1134sub spell_add {
648 my ($self, $spell) = @_; 1135 my ($self, $spell) = @_;
649 1136
650 # try to create single paragraphs out of the multiple lines sent by the server 1137 # try to create single paragraphs out of the multiple lines sent by the server
651 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1138 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
652 $spell->{message} =~ s/\n+$//; 1139 $spell->{message} =~ s/\n+$//;
653 $spell->{message} ||= "Server did not provide a description for this spell."; 1140 $spell->{message} ||= "Server did not provide a description for this spell.";
654 1141
655 $::SPELL_PAGE->add_spell ($spell); 1142 $::SPELL_LIST->add_spell ($spell);
656 1143
657 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1144 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
658 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1145 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
659} 1146}
660 1147
661sub spell_delete { 1148sub spell_delete {
662 my ($self, $spell) = @_; 1149 my ($self, $spell) = @_;
663 1150
664 $::SPELL_PAGE->remove_spell ($spell); 1151 $::SPELL_LIST->remove_spell ($spell);
1152}
1153
1154sub setup {
1155 my ($self, $setup) = @_;
1156
1157 $self->{map_widget}->set_tilesize ($self->{tilesize});
1158 $::MAP->resize ($self->{mapw}, $self->{maph});
665} 1159}
666 1160
667sub addme_success { 1161sub addme_success {
668 my ($self) = @_; 1162 my ($self) = @_;
669 1163
670 my %skill_help; 1164 my %skill_help;
671 1165
672 for my $node (CFPlus::Pod::find skill_description => "*") { 1166 for my $node (DC::Pod::find skill_description => "*") {
673 my (undef, @par) = CFPlus::Pod::section_of $node; 1167 my (undef, @par) = DC::Pod::section_of $node;
674 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
675 }; 1169 };
676 1170
677 for my $skill (values %{$self->{skill_info}}) { 1171 for my $skill (values %{$self->{skill_info}}) {
678 $self->{map_widget}->add_command ("ready_skill $skill", 1172 $self->{map_widget}->add_command ("ready_skill $skill",
679 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1173 (DC::asxml "Ready the skill '$skill'\n\n")
680 . $skill_help{$skill}); 1174 . $skill_help{$skill});
681 $self->{map_widget}->add_command ("use_skill $skill", 1175 $self->{map_widget}->add_command ("use_skill $skill",
682 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1176 (DC::asxml "Immediately use the skill '$skill'\n\n")
683 . $skill_help{$skill}); 1177 . $skill_help{$skill});
684 } 1178 }
685} 1179}
686 1180
687sub eof { 1181sub eof {
… …
690 $self->{map_widget}->clr_commands; 1184 $self->{map_widget}->clr_commands;
691 1185
692 ::stop_game (); 1186 ::stop_game ();
693} 1187}
694 1188
695sub image_info {
696 my ($self, $numfaces) = @_;
697
698 $self->{num_faces} = $numfaces;
699 $self->{face_prefetch} = [1 .. $numfaces];
700 $self->face_prefetch;
701}
702
703sub face_prefetch {
704 my ($self) = @_;
705
706 return unless $::CFG->{face_prefetch};
707
708 if ($self->{num_faces}) {
709 return if @{ $self->{send_queue} || [] };
710 my $todo = @{ $self->{face_prefetch} }
711 or return;
712
713 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
714
715 $self->send ("requestinfo image_sums $face $face");
716
717 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
718 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
719 } elsif (!exists $self->{num_faces}) {
720 $self->send ("requestinfo image_info");
721
722 $self->{num_faces} = 0;
723
724 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
725 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
726 }
727}
728
729sub update_floorbox { 1189sub update_floorbox {
730 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1190 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
731 return unless $::CONN; 1191 return unless $::CONN;
732 1192
733 $::FLOORBOX->clear; 1193 $::FLOORBOX->clear;
1194
1195 my @add;
734 1196
735 my $row; 1197 my $row;
736 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1198 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
737 if ($row < 6) { 1199 if ($row < 6) {
738 local $_->{face_widget}; # hack to force recreation of widget 1200 local $_->{face_widget}; # hack to force recreation of widget
739 local $_->{desc_widget}; # hack to force recreation of widget 1201 local $_->{desc_widget}; # hack to force recreation of widget
740 CFPlus::Item::update_widgets $_; 1202 DC::Item::update_widgets $_;
741 1203
1204 push @add,
742 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1205 0, $row, $_->{face_widget},
743 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1206 1, $row, $_->{desc_widget};
744 1207
745 $row++; 1208 $row++;
746 } else { 1209 } else {
747 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1210 push @add, 1, $row, new DC::UI::Button
748 text => "More...", 1211 text => "More...",
749 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1212 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
750 ); 1213 ;
751 last; 1214 last;
752 } 1215 }
753 } 1216 }
754 if ($::CONN->{open_container}) { 1217 if ($::CONN->{open_container}) {
755 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1218 push @add, 1, $row++, new DC::UI::Button
756 text => "Close container", 1219 text => "Close container",
757 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1220 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
758 ); 1221 ;
759 } 1222 }
1223
1224 $::FLOORBOX->add_at (@add);
760 }); 1225 });
761 1226
762 $::WANT_REFRESH++; 1227 $::WANT_REFRESH = 1;
763} 1228}
764 1229
765sub set_opencont { 1230sub set_opencont {
766 my ($conn, $tag, $name) = @_; 1231 my ($conn, $tag, $name) = @_;
767 $conn->{open_container} = $tag; 1232 $conn->{open_container} = $tag;
768 update_floorbox; 1233 update_floorbox;
769 1234
770 $::INV_RIGHT_HB->clear (); 1235 $::INVR_HB->clear ();
771 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1236 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
772 1237
773 if ($tag != 0) { # Floor isn't closable, is it? 1238 if ($tag != 0) { # Floor isn't closable, is it?
774 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1239 $::INVR_HB->add (new DC::UI::Button
775 text => "Close container", 1240 text => "Close container",
776 tooltip => "Close the currently open container (if one is open)", 1241 tooltip => "Close the currently open container (if one is open)",
777 on_activate => sub { 1242 on_activate => sub {
778 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1243 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
779 if $tag != 0; 1244 if $tag != 0;
780 #if $CONN->{open_container} != 0;
781 0 1245 0
782 }, 1246 },
783 ); 1247 );
784 } 1248 }
785 1249
… …
787} 1251}
788 1252
789sub update_containers { 1253sub update_containers {
790 my ($self) = @_; 1254 my ($self) = @_;
791 1255
792 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1256 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
793 my $todo = delete $self->{update_container} 1257 my $todo = delete $self->{update_container}
794 or return; 1258 or return;
795 1259
796 for my $tag (keys %$todo) { 1260 for my $tag (keys %$todo) {
797 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1261 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
834sub item_update { 1298sub item_update {
835 my ($self, $item) = @_; 1299 my ($self, $item) = @_;
836 1300
837 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1301 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
838 1302
839 CFPlus::Item::update_widgets $item; 1303 DC::Item::update_widgets $item;
840 1304
841 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
842 set_opencont ($::CONN, 0, "Floor"); 1306 set_opencont ($::CONN, 0, "Floor");
843 1307
844 } elsif ($item->{flags} & F_OPEN) { 1308 } elsif ($item->{flags} & F_OPEN) {
845 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
846 1310
847 } else { 1311 } else {
848 $self->{update_container}{$item->{container}}++; 1312 $self->{update_container}{$item->{container}}++;
849 $self->update_containers; 1313 $self->update_containers;
850 } 1314 }
… …
875 $::SERVER_INFO->set_markup ( 1339 $::SERVER_INFO->set_markup (
876 "server <tt>$self->{host}:$self->{port}</tt>\n" 1340 "server <tt>$self->{host}:$self->{port}</tt>\n"
877 . "protocol version <tt>$self->{version}</tt>\n" 1341 . "protocol version <tt>$self->{version}</tt>\n"
878 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1342 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
879 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1343 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1344 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1345 . "editing support $yesno[!!$self->{editor_support}]\n"
1346 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1347 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
880 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1348 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
881 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1349 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
882 . "map size $self->{mapw}×$self->{maph}\n" 1350 . "map size $self->{mapw}×$self->{maph}\n"
883 ); 1351 );
1352
884} 1353}
885 1354
886sub logged_in { 1355sub logged_in {
887 my ($self) = @_; 1356 my ($self) = @_;
888 1357
889 $self->send_ext_req (cfplus_support => version => 1, sub { 1358 $self->send_ext_req (cfplus_support => version => 2, sub {
1359 my (%msg) = @_;
1360
890 $self->{cfplus_ext} = $_[0]{version}; 1361 $self->{cfplus_ext} = $msg{version};
891 $self->update_server_info; 1362 $self->update_server_info;
1363
1364 if ($self->{cfplus_ext} >= 2) {
1365 $self->send_ext_req ("editor_support", sub {
1366 $self->{editor_support} = { @_ };
1367 $self->update_server_info;
1368
1369 0
1370 });
1371 }
892 1372
893 0 1373 0
894 }); 1374 });
895 1375
896 $self->update_server_info; 1376 $self->update_server_info;
897 1377
898 $self->send_command ("output-sync $::CFG->{output_sync}"); 1378 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
899 $self->send_command ("output-count $::CFG->{output_count}");
900 $self->send_command ("pickup $::CFG->{pickup}"); 1379 $self->send_command ("pickup $::CFG->{pickup}");
901} 1380}
902 1381
903sub lookat { 1382sub lookat {
904 my ($self, $x, $y) = @_; 1383 my ($self, $x, $y) = @_;
905 1384
906 if ($self->{cfplus_ext}) { 1385 if ($self->{cfplus_ext}) {
907 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1386 $self->send_ext_req (lookat => $x, $y, sub {
908 my ($msg) = @_; 1387 my (%msg) = @_;
909 1388
910 if (exists $msg->{npc_dialog}) { 1389 if (exists $msg{npc_dialog}) {
911 # start npc chat dialog 1390 # start npc chat dialog
912 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1391 $self->{npc_dialog} = new DC::NPCDialog::
913 dx => $x, 1392 token => $msg{npc_dialog},
914 dy => $y,
915 title => "$msg->{npc_dialog} (NPC)", 1393 title => "$msg{npc_dialog}[0] (NPC)",
916 conn => $self, 1394 conn => $self,
917 ; 1395 ;
918 } 1396 }
919 }); 1397 });
920 } 1398 }
… …
923} 1401}
924 1402
925sub destroy { 1403sub destroy {
926 my ($self) = @_; 1404 my ($self) = @_;
927 1405
928 $self->{npc_dialog}->destroy 1406 (delete $self->{npc_dialog})->destroy
929 if $self->{npc_dialog}; 1407 if $self->{npc_dialog};
930 1408
931 $self->SUPER::destroy; 1409 $self->SUPER::destroy;
932}
933 1410
1411 %$self = ();
1412}
1413
934package CFPlus::NPCDialog; 1414package DC::NPCDialog;
935 1415
936our @ISA = 'CFPlus::UI::Toplevel'; 1416our @ISA = 'DC::UI::Toplevel';
937 1417
938sub new { 1418sub new {
939 my $class = shift; 1419 my $class = shift;
940 1420
941 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
… …
948 kw => { hi => 0, yes => 0, no => 0 }, 1428 kw => { hi => 0, yes => 0, no => 0 },
949 has_close_button => 1, 1429 has_close_button => 1,
950 @_, 1430 @_,
951 ); 1431 );
952 1432
953 Scalar::Util::weaken (my $this = $self); 1433 DC::weaken (my $this = $self);
954 1434
955 $self->connect (delete => sub { $this->destroy; 1 }); 1435 $self->connect (delete => sub { $this->destroy; 1 });
956 1436
957 # better use a pane... 1437 # better use a pane...
958 $self->add (my $hbox = new CFPlus::UI::HBox); 1438 $self->add (my $hbox = new DC::UI::HBox);
959 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1439 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
960 1440
961 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1441 $hbox->add (my $vbox = new DC::UI::VBox);
962 1442
963 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1443 $vbox->add (new DC::UI::Label text => "Message Entry:");
964 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1444 $vbox->add ($self->{entry} = new DC::UI::Entry
965 tooltip => "#npc_message_entry", 1445 tooltip => "#npc_message_entry",
966 on_activate => sub { 1446 on_activate => sub {
967 my ($entry, $text) = @_; 1447 my ($entry, $text) = @_;
968 1448
969 return unless $text =~ /\S/; 1449 return unless $text =~ /\S/;
… …
973 1453
974 0 1454 0
975 }, 1455 },
976 ); 1456 );
977 1457
978 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1458 $vbox->add ($self->{options} = new DC::UI::VBox);
979 1459
980 $self->{bye_button} = new CFPlus::UI::Button 1460 $self->{bye_button} = new DC::UI::Button
981 text => "Bye (close)", 1461 text => "Bye (close)",
982 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1462 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
983 on_activate => sub { $this->destroy; 1 }, 1463 on_activate => sub { $this->destroy; 1 },
984 ; 1464 ;
985 1465
986 $self->update_options; 1466 $self->update_options;
987 1467
988 $self->{id} = $self->{conn}->send_ext_req ( 1468 $self->{id} = "npc-channel-" . $self->{conn}->token;
989 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1469 $self->{conn}->connect_ext ($self->{id} => sub {
990 sub { $this && $this->feed (@_) } 1470 $this->feed (@_) if $this;
991 ); 1471 });
1472
1473 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
992 1474
993 $self->{entry}->grab_focus; 1475 $self->{entry}->grab_focus;
994 1476
995 $self->{textview}->add_paragraph ({ 1477 $self->{textview}->add_paragraph ({
996 fg => [1, 1, 0, 1], 1478 fg => [1, 1, 0, 1],
… …
1002}; 1484};
1003 1485
1004sub update_options { 1486sub update_options {
1005 my ($self) = @_; 1487 my ($self) = @_;
1006 1488
1007 Scalar::Util::weaken $self; 1489 DC::weaken $self;
1008 1490
1009 $self->{options}->clear; 1491 $self->{options}->clear;
1010 $self->{options}->add ($self->{bye_button}); 1492 $self->{options}->add ($self->{bye_button});
1011 1493
1012 for my $kw (sort keys %{ $self->{kw} }) { 1494 for my $kw (sort keys %{ $self->{kw} }) {
1013 $self->{options}->add (new CFPlus::UI::Button 1495 $self->{options}->add (new DC::UI::Button
1014 text => $kw, 1496 text => $kw,
1015 on_activate => sub { 1497 on_activate => sub {
1016 $self->send ($kw); 1498 $self->send ($kw);
1017 0 1499 0
1018 }, 1500 },
1019 ); 1501 );
1020 } 1502 }
1021} 1503}
1022 1504
1023sub feed { 1505sub feed {
1024 my ($self, $msg) = @_; 1506 my ($self, $type, @arg) = @_;
1025 1507
1026 Scalar::Util::weaken $self; 1508 DC::weaken $self;
1027 1509
1028 if ($msg->{msgtype} eq "reply") { 1510 if ($type eq "update") {
1511 my (%info) = @arg;
1512
1029 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1513 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1030 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1514 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1031
1032 my $text = "\n" . CFPlus::asxml $msg->{msg};
1033 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1034 my @link;
1035 $text =~ s{
1036 ($match)
1037 }{
1038 my $kw = $1;
1039
1040 push @link, new CFPlus::UI::Label
1041 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1042 can_hover => 1,
1043 can_events => 1,
1044 padding_x => 0,
1045 padding_y => 0,
1046 on_button_up => sub {
1047 $self->send ($kw);
1048 };
1049
1050 "\x{fffc}"
1051 }giex;
1052 1515
1516 if (exists $info{msg}) {
1517 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1518 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1519 my @link;
1520 $text =~ s{
1521 ($match)
1522 }{
1523 my $kw = $1;
1524
1525 push @link, new DC::UI::Label
1526 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1527 can_hover => 1,
1528 can_events => 1,
1529 padding_x => 0,
1530 padding_y => 0,
1531 on_button_up => sub {
1532 $self->send ($kw);
1533 };
1534
1535 "\x{fffc}"
1536 }giex;
1537
1053 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1538 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1054 $self->{textview}->scroll_to_bottom; 1539 $self->{textview}->scroll_to_bottom;
1540 }
1541
1055 $self->update_options; 1542 $self->update_options;
1056 } else { 1543 } else {
1057 $self->destroy; 1544 $self->destroy;
1058 } 1545 }
1059 1546
… …
1061} 1548}
1062 1549
1063sub send { 1550sub send {
1064 my ($self, $msg) = @_; 1551 my ($self, $msg) = @_;
1065 1552
1066 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1553 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1067 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1068 1555
1069 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1556 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1070} 1557}
1071 1558
1072sub destroy { 1559sub destroy {
1073 my ($self) = @_; 1560 my ($self) = @_;
1074 1561
1075 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1562 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1076 1563
1077 if ($self->{conn}) { 1564 if ($self->{conn}) {
1078 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1565 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1079 delete $self->{conn}{npc_dialog}; 1566 delete $self->{conn}{npc_dialog};
1080 $self->{conn}->disconnect_ext ($self->{id}); 1567 $self->{conn}->disconnect_ext ($self->{id});
1081 } 1568 }
1082 1569
1083 $self->SUPER::destroy; 1570 $self->SUPER::destroy;
1084} 1571}
1085 1572
10861 15731
1574

Diff Legend

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