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.60 by root, Sun Jul 16 23:43:46 2006 UTC vs.
Revision 1.213 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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