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.168 by root, Thu Aug 30 07:08:17 2007 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 CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52 50
53 $self->{json_coder} 51 $self->{json_coder}
54 ->convert_blessed 52 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 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 }
57 }); 61 });
58 62
59 # destroy widgets on logout 63 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
66 70
67 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
68 for @cmd_help; 72 for @cmd_help;
69 73
70 { 74 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 78 }
75 79
76 { 80 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 84 }
81 85
82 $self->{open_container} = 0; 86 $self->{open_container} = 0;
83 87
… …
98} 102}
99 103
100sub ext_capabilities { 104sub ext_capabilities {
101 my ($self, %cap) = @_; 105 my ($self, %cap) = @_;
102 106
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want; 107 $self->update_fx_want;
105 108
106 $self->send_exti_req (resource => "exp_table", sub { 109 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_; 110 my ($exp_table) = @_;
108 111
… …
138############################################################################# 141#############################################################################
139 142
140sub widget_associate { 143sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 144 my ($self, $ws, $id, $widget) = @_;
142 145
143 if ($widget) { 146 $widget ||= new DC::UI::Bin;
147
144 $widget->{s_id} = $id; 148 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 149 $self->{widget}{$id} = $widget;
146 150
147 if ($ws) { 151 if ($ws) {
148 $widget->{s_ws} = $ws; 152 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 153 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 154 }
151 155
152 $widget->connect (on_destroy => sub { 156 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 157 my ($widget) = @_;
154 158
155 delete $self->{widget}{$widget->{s_id}}; 159 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 161 if exists $widget->{s_ws};
158 }); 162 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 163}
167 164
168# widgetset new 165# widgetset new
169sub ext_ws_n { 166sub ext_ws_n {
170 my ($self, $id) = @_; 167 my ($self, $id) = @_;
… …
187 184
188# widgetset create 185# widgetset create
189sub ext_ws_c { 186sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
191 188
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate ( 189 $self->widget_associate (
203 $ws, $id => scalar eval { 190 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 191 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 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 },
206 } 234 ]}],
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 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
208} 267}
209 268
210# widgetset associate 269# widgetset associate
211sub ext_ws_a { 270sub ext_ws_a {
212 my ($self, %ass) = @_; 271 my ($self, %ass) = @_;
213 272
214 # everything that has a name, wether conceivably useful or not 273 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 274 my %wkw = (
216 root => $CFPlus::UI::ROOT, 275 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 276 tooltip => $DC::UI::TOOLTIP,
218 277
219 mapwidget => $::MAPWIDGET, 278 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 279 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 280 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 281 buttonbar => $::BUTTONBAR,
… …
248 invr => $::INVR, 307 invr => $::INVR,
249 invr_hb => $::INVR_HB, 308 invr_hb => $::INVR_HB,
250 ); 309 );
251 310
252 while (my ($id, $name) = each %ass) { 311 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 312 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 313 }
256} 314}
257 315
258# widget call 316# widget call
259sub ext_w_c { 317sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 318 my ($self, $id, $rcb, $method, @args) = @_;
261 319
262 my $w = $self->{widget}{$id} 320 my $w = $self->{widget}{$id}
263 or return; 321 or return;
264 322
265 if ($rid) { 323 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 324 $rcb->($w->$method (@args));
267 } else { 325 } else {
268 $w->$method (@args); 326 $w->$method (@args);
269 } 327 }
270} 328}
271 329
… …
287 } 345 }
288} 346}
289 347
290# widget get 348# widget get
291sub ext_w_g { 349sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 350 my ($self, $id, $rid, @attr) = @_;
293 351
294 my $w = $self->{widget}{$id} 352 my $w = $self->{widget}{$id}
295 or return; 353 or return;
296 354
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 355 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 356}
299 357
300# message window 358# message window
301sub ext_channel_info { 359sub ext_channel_info {
302 my ($self, $info) = @_; 360 my ($self, $info) = @_;
… …
307############################################################################# 365#############################################################################
308 366
309sub logprint { 367sub logprint {
310 my ($self, @a) = @_; 368 my ($self, @a) = @_;
311 369
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 370 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 371}
314 372
315sub _stat_numdiff { 373sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 374 my ($self, $name, $old, $new) = @_;
317 375
… …
489 $self->{stat_order} = join ",", map $_->[0], @order; 547 $self->{stat_order} = join ",", map $_->[0], @order;
490 548
491 $sktbl->clear; 549 $sktbl->clear;
492 550
493 my $sw = $self->{skillwid}{""} ||= [ 551 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 552 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 553 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 554 2, 0, (new DC::UI::Label text => "Progress", align => 0),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 555 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 556 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 557 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 558 6, 0, (new DC::UI::Label text => "Progress", align => 0),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 559 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
502 ]; 560 ];
503 561
504 my @add = @$sw; 562 my @add = @$sw;
505 563
506 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>";
… …
518 if ($ev->{button} == 1) { 576 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 577 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 578 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 579 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 580 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 581 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 582 (new DC::UI::Menu
525 items => [ 583 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 584 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 585 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 586 ],
529 )->popup ($ev); 587 )->popup ($ev);
530 } else { 588 } else {
531 return 0; 589 return 0;
532 } 590 }
… …
534 1 592 1
535 }; 593 };
536 594
537 my $sw = $self->{skillwid}{$idx} ||= [ 595 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 596 # exp
539 (new CFPlus::UI::Label 597 (new DC::UI::Label
540 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),
541 599
542 # level 600 # level
543 (new CFPlus::UI::Label 601 (new DC::UI::Label
544 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),
545 603
546 # progress 604 # progress
547 (new CFPlus::UI::ExperienceProgress), 605 (new DC::UI::ExperienceProgress),
548 606
549 # label 607 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 608 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
551 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),
552 ]; 610 ];
553 611
554 push @add, 612 push @add,
555 $x * 4 + 0, $y, $sw->[0], 613 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 614 $x * 4 + 1, $y, $sw->[1],
… …
626 } 684 }
627 } 685 }
628 686
629 if ($delay) { 687 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched 688 # delay the map drawing a tiny bit in the hope of getting the missing fetched
631 Event->timer (after => 0.03, cb => sub { 689 EV::once undef, 0, 0.03, sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update 690 $self->{map_widget}->update
634 if $self->{map_widget}; 691 if $self->{map_widget};
635 }); 692 };
636 } else { 693 } else {
637 $self->{map_widget}->update; 694 $self->{map_widget}->update;
638 } 695 }
639} 696}
640 697
… …
652 709
653 my ($hash, $x, $y, $w, $h) = @$map_info; 710 my ($hash, $x, $y, $w, $h) = @$map_info;
654 711
655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 712 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data; 713 $self->{map_cache_new}{$hash} = \$data;
657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 714 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
658} 715}
659 716
660sub map_clear { 717sub map_clear {
661 my ($self) = @_; 718 my ($self) = @_;
662 719
… …
675 do { 732 do {
676 $tile = pop @{$self->{bg_fetch}} 733 $tile = pop @{$self->{bg_fetch}}
677 or return; 734 or return;
678 } while $self->{texture}[$tile]; 735 } while $self->{texture}[$tile];
679 736
680 CFPlus::DB::get tilecache => $tile, sub { 737 DC::DB::get tilecache => $tile, sub {
681 my ($data) = @_; 738 my ($data) = @_;
682 739
683 return unless $self->{map}; # stop when destroyed 740 return unless $self->{map}; # stop when destroyed
684 741
685 if (defined $data) { 742 if (defined $data) {
… …
713 }; 770 };
714 771
715 if (my $rdata = $self->{map_cache_old}{$hash}) { 772 if (my $rdata = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata); 773 $cb->($$rdata);
717 } else { 774 } else {
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 775 DC::DB::get $self->{mapcache} => $hash, $cb;
719 } 776 }
720} 777}
721 778
722# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 779# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
723# (server resource,s latency, bandwidth), so this hack is warranted. 780# (server resource,s latency, bandwidth), so this hack is warranted.
… …
847 904
848sub face_find { 905sub face_find {
849 my ($self, $facenum, $face, $cb) = @_; 906 my ($self, $facenum, $face, $cb) = @_;
850 907
851 if ($face->{type} == 0) { # FT_FACE 908 if ($face->{type} == 0) { # FT_FACE
852 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 909 my $id = DC::DB::get_tile_id_sync $face->{name};
853 910
854 $face->{id} = $id; 911 $face->{id} = $id;
855 $self->{map}->set_tileid ($facenum => $id); 912 $self->{map}->set_tileid ($facenum => $id);
856 913
857 CFPlus::DB::get tilecache => $id, $cb; 914 DC::DB::get tilecache => $id, $cb;
858 915
859 } elsif ($face->{type} & 1) { # with metadata 916 } elsif ($face->{type} & 1) { # with metadata
860 CFPlus::DB::get res_meta => $face->{name}, $cb; 917 DC::DB::get res_meta => $face->{name}, $cb;
861 918
862 } else { # no metadata 919 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb; 920 DC::DB::get res_data => $face->{name}, $cb;
864 } 921 }
865} 922}
866 923
867sub face_update { 924sub face_update {
868 my ($self, $facenum, $face, $changed) = @_; 925 my ($self, $facenum, $face, $changed) = @_;
869 926
870 if ($face->{type} == 0) { 927 if ($face->{type} == 0) {
871 # image, FT_FACE 928 # image, FT_FACE
872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 929 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
873 if $changed; 930 if $changed;
874 931
875 $self->have_tile ($face->{id}, delete $face->{data}); 932 $self->have_tile ($face->{id}, delete $face->{data});
876 933
877 } elsif ($face->{type} & 1) { 934 } elsif ($face->{type} & 1) {
… …
879 if ($changed) { # new data 936 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 937 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta; 938 $face->{data} = $meta;
882 939
883 # rely on strict ordering here and also on later fetch 940 # rely on strict ordering here and also on later fetch
884 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 941 DC::DB::put res_data => $face->{name} => $data, sub { };
885 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 942 DC::DB::put res_meta => $face->{name} => $meta, sub { };
886 } 943 }
887 944
888 $face->{data} = $self->{json_coder}->decode ($face->{data}); 945 $face->{data} = $self->{json_coder}->decode ($face->{data});
889 ::add_license ($face); 946 ::add_license ($face);
890 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 947 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
891 if $changed; 948 if $changed;
892 949
893 if ($face->{type} == 3) { # FT_MUSIC 950 if ($face->{type} == 3) { # FT_MUSIC
894 &::audio_music_push ($facenum); 951 &::audio_music_push ($facenum);
895 } elsif ($face->{type} == 5) { # FT_SOUND 952 } elsif ($face->{type} == 5) { # FT_SOUND
896 &::audio_sound_push ($facenum); 953 &::audio_sound_push ($facenum);
897 } 954 }
898 955
899 } else { 956 } else {
900 # flat resource case, FT_RSRC 957 # flat resource case, FT_RSRC
901 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 958 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
902 if $changed; 959 if $changed;
903 } 960 }
904 961
905 if (my $cbs = $self->{face_cb}{$facenum}) { 962 if (my $cbs = $self->{face_cb}{$facenum}) {
906 $_->($face, $changed) for @$cbs; 963 $_->($face, $changed) for @$cbs;
… …
917 my ($self, $tile, $data) = @_; 974 my ($self, $tile, $data) = @_;
918 975
919 return unless $self->{map}; 976 return unless $self->{map};
920 977
921 my $tex = $self->{texture}[$tile] ||= 978 my $tex = $self->{texture}[$tile] ||=
922 new CFPlus::Texture 979 new DC::Texture
923 tile => $tile, 980 tile => $tile,
924 image => $data, delete_image => 1, 981 image => $data, delete_image => 1,
925 minify => 1, mipmap => 1; 982 minify => 1, mipmap => 1;
926 983
927 if (my $cbs = delete $self->{tile_cb}{$tile}) { 984 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
935 my ($self, $num, $cb) = @_; 992 my ($self, $num, $cb) = @_;
936 993
937 push @{$self->{face_cb}{$num}}, $cb; 994 push @{$self->{face_cb}{$num}}, $cb;
938 995
939 defined wantarray 996 defined wantarray
940 ? CFPlus::guard { 997 ? DC::guard {
941 @{$self->{face_cb}{$num}} 998 @{$self->{face_cb}{$num}}
942 = grep $_ != $cb, 999 = grep $_ != $cb,
943 @{$self->{face_cb}{$num}}; 1000 @{$self->{face_cb}{$num}};
944 } 1001 }
945 : () 1002 : ()
… …
980 1037
981sub sanitise_xml($) { 1038sub sanitise_xml($) {
982 local $_ = shift; 1039 local $_ = shift;
983 1040
984 # we now weed out all tags we do not support 1041 # we now weed out all tags we do not support
985 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1042 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1043 }{
1044 "&lt;"
1045 }gex;
1046
986 # now all entities 1047 # now all entities
987 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1048 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
988 1049
989 # handle some elements 1050 # handle some elements
990 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1051 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1043 1104
1044 ## 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
1045 # no longer neecssary with TRT servers 1106 # no longer neecssary with TRT servers
1046 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1107 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1047 1108
1109 for (split /\n/, $text) {
1048 ::message ({ 1110 ::message ({
1049 fg => $fg, 1111 fg => $fg,
1050 markup => $_, 1112 markup => $_,
1051 type => $type, 1113 type => $type,
1052 extra => [@extra], 1114 extra => [@extra],
1053 color_flags => $color 1115 color_flags => $color, #d# ugly, kill
1054 }) for split /\n/, $text; 1116 });
1117
1118 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1119 # actually, this is an ugly design. _we_ should control the channels,
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 }
1055 1124
1056 $self->{statusbox}->add ($text, 1125 $self->{statusbox}->add ($text,
1057 group => $text, 1126 group => $text,
1058 fg => $fg, 1127 fg => $fg,
1059 timeout => $color >= 2 ? 180 : 10, 1128 timeout => $color >= 2 ? 180 : 10,
1060 tooltip_font => $::FONT_FIXED, 1129 tooltip_font => $::FONT_FIXED,
1061 ); 1130 ) if $type eq "info";
1062 } 1131 }
1063} 1132}
1064 1133
1065sub spell_add { 1134sub spell_add {
1066 my ($self, $spell) = @_; 1135 my ($self, $spell) = @_;
… …
1070 $spell->{message} =~ s/\n+$//; 1139 $spell->{message} =~ s/\n+$//;
1071 $spell->{message} ||= "Server did not provide a description for this spell."; 1140 $spell->{message} ||= "Server did not provide a description for this spell.";
1072 1141
1073 $::SPELL_LIST->add_spell ($spell); 1142 $::SPELL_LIST->add_spell ($spell);
1074 1143
1075 $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});
1076 $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});
1077} 1146}
1078 1147
1079sub spell_delete { 1148sub spell_delete {
1080 my ($self, $spell) = @_; 1149 my ($self, $spell) = @_;
1081 1150
… …
1092sub addme_success { 1161sub addme_success {
1093 my ($self) = @_; 1162 my ($self) = @_;
1094 1163
1095 my %skill_help; 1164 my %skill_help;
1096 1165
1097 for my $node (CFPlus::Pod::find skill_description => "*") { 1166 for my $node (DC::Pod::find skill_description => "*") {
1098 my (undef, @par) = CFPlus::Pod::section_of $node; 1167 my (undef, @par) = DC::Pod::section_of $node;
1099 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1100 }; 1169 };
1101 1170
1102 for my $skill (values %{$self->{skill_info}}) { 1171 for my $skill (values %{$self->{skill_info}}) {
1103 $self->{map_widget}->add_command ("ready_skill $skill", 1172 $self->{map_widget}->add_command ("ready_skill $skill",
1104 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1173 (DC::asxml "Ready the skill '$skill'\n\n")
1105 . $skill_help{$skill}); 1174 . $skill_help{$skill});
1106 $self->{map_widget}->add_command ("use_skill $skill", 1175 $self->{map_widget}->add_command ("use_skill $skill",
1107 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1176 (DC::asxml "Immediately use the skill '$skill'\n\n")
1108 . $skill_help{$skill}); 1177 . $skill_help{$skill});
1109 } 1178 }
1110} 1179}
1111 1180
1112sub eof { 1181sub eof {
… …
1116 1185
1117 ::stop_game (); 1186 ::stop_game ();
1118} 1187}
1119 1188
1120sub update_floorbox { 1189sub update_floorbox {
1121 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1190 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1122 return unless $::CONN; 1191 return unless $::CONN;
1123 1192
1124 $::FLOORBOX->clear; 1193 $::FLOORBOX->clear;
1125 1194
1126 my @add; 1195 my @add;
… …
1128 my $row; 1197 my $row;
1129 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} }) {
1130 if ($row < 6) { 1199 if ($row < 6) {
1131 local $_->{face_widget}; # hack to force recreation of widget 1200 local $_->{face_widget}; # hack to force recreation of widget
1132 local $_->{desc_widget}; # hack to force recreation of widget 1201 local $_->{desc_widget}; # hack to force recreation of widget
1133 CFPlus::Item::update_widgets $_; 1202 DC::Item::update_widgets $_;
1134 1203
1135 push @add, 1204 push @add,
1136 0, $row, $_->{face_widget}, 1205 0, $row, $_->{face_widget},
1137 1, $row, $_->{desc_widget}; 1206 1, $row, $_->{desc_widget};
1138 1207
1139 $row++; 1208 $row++;
1140 } else { 1209 } else {
1141 push @add, 1, $row, new CFPlus::UI::Button 1210 push @add, 1, $row, new DC::UI::Button
1142 text => "More...", 1211 text => "More...",
1143 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1212 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1144 ; 1213 ;
1145 last; 1214 last;
1146 } 1215 }
1147 } 1216 }
1148 if ($::CONN->{open_container}) { 1217 if ($::CONN->{open_container}) {
1149 push @add, 1, $row++, new CFPlus::UI::Button 1218 push @add, 1, $row++, new DC::UI::Button
1150 text => "Close container", 1219 text => "Close container",
1151 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1220 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1152 ; 1221 ;
1153 } 1222 }
1154 1223
1155 $::FLOORBOX->add_at (@add); 1224 $::FLOORBOX->add_at (@add);
1156 }); 1225 });
1157 1226
1158 $::WANT_REFRESH->start; 1227 $::WANT_REFRESH = 1;
1159} 1228}
1160 1229
1161sub set_opencont { 1230sub set_opencont {
1162 my ($conn, $tag, $name) = @_; 1231 my ($conn, $tag, $name) = @_;
1163 $conn->{open_container} = $tag; 1232 $conn->{open_container} = $tag;
1164 update_floorbox; 1233 update_floorbox;
1165 1234
1166 $::INVR_HB->clear (); 1235 $::INVR_HB->clear ();
1167 $::INVR_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);
1168 1237
1169 if ($tag != 0) { # Floor isn't closable, is it? 1238 if ($tag != 0) { # Floor isn't closable, is it?
1170 $::INVR_HB->add (new CFPlus::UI::Button 1239 $::INVR_HB->add (new DC::UI::Button
1171 text => "Close container", 1240 text => "Close container",
1172 tooltip => "Close the currently open container (if one is open)", 1241 tooltip => "Close the currently open container (if one is open)",
1173 on_activate => sub { 1242 on_activate => sub {
1174 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1243 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1175 if $tag != 0; 1244 if $tag != 0;
… …
1182} 1251}
1183 1252
1184sub update_containers { 1253sub update_containers {
1185 my ($self) = @_; 1254 my ($self) = @_;
1186 1255
1187 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1256 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1188 my $todo = delete $self->{update_container} 1257 my $todo = delete $self->{update_container}
1189 or return; 1258 or return;
1190 1259
1191 for my $tag (keys %$todo) { 1260 for my $tag (keys %$todo) {
1192 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1261 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1229sub item_update { 1298sub item_update {
1230 my ($self, $item) = @_; 1299 my ($self, $item) = @_;
1231 1300
1232 #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";
1233 1302
1234 CFPlus::Item::update_widgets $item; 1303 DC::Item::update_widgets $item;
1235 1304
1236 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1237 set_opencont ($::CONN, 0, "Floor"); 1306 set_opencont ($::CONN, 0, "Floor");
1238 1307
1239 } elsif ($item->{flags} & F_OPEN) { 1308 } elsif ($item->{flags} & F_OPEN) {
1240 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1241 1310
1242 } else { 1311 } else {
1243 $self->{update_container}{$item->{container}}++; 1312 $self->{update_container}{$item->{container}}++;
1244 $self->update_containers; 1313 $self->update_containers;
1245 } 1314 }
… …
1304 0 1373 0
1305 }); 1374 });
1306 1375
1307 $self->update_server_info; 1376 $self->update_server_info;
1308 1377
1309 $self->send_command ("output-sync $::CFG->{output_sync}");
1310 $self->send_command ("output-count $::CFG->{output_count}");
1311 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1378 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1312 $self->send_command ("pickup $::CFG->{pickup}"); 1379 $self->send_command ("pickup $::CFG->{pickup}");
1313} 1380}
1314 1381
1315sub lookat { 1382sub lookat {
… …
1319 $self->send_ext_req (lookat => $x, $y, sub { 1386 $self->send_ext_req (lookat => $x, $y, sub {
1320 my (%msg) = @_; 1387 my (%msg) = @_;
1321 1388
1322 if (exists $msg{npc_dialog}) { 1389 if (exists $msg{npc_dialog}) {
1323 # start npc chat dialog 1390 # start npc chat dialog
1324 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1391 $self->{npc_dialog} = new DC::NPCDialog::
1325 token => $msg{npc_dialog}, 1392 token => $msg{npc_dialog},
1326 title => "$msg{npc_dialog}[0] (NPC)", 1393 title => "$msg{npc_dialog}[0] (NPC)",
1327 conn => $self, 1394 conn => $self,
1328 ; 1395 ;
1329 } 1396 }
… …
1342 $self->SUPER::destroy; 1409 $self->SUPER::destroy;
1343 1410
1344 %$self = (); 1411 %$self = ();
1345} 1412}
1346 1413
1347package CFPlus::NPCDialog; 1414package DC::NPCDialog;
1348 1415
1349our @ISA = 'CFPlus::UI::Toplevel'; 1416our @ISA = 'DC::UI::Toplevel';
1350 1417
1351sub new { 1418sub new {
1352 my $class = shift; 1419 my $class = shift;
1353 1420
1354 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
… …
1361 kw => { hi => 0, yes => 0, no => 0 }, 1428 kw => { hi => 0, yes => 0, no => 0 },
1362 has_close_button => 1, 1429 has_close_button => 1,
1363 @_, 1430 @_,
1364 ); 1431 );
1365 1432
1366 CFPlus::weaken (my $this = $self); 1433 DC::weaken (my $this = $self);
1367 1434
1368 $self->connect (delete => sub { $this->destroy; 1 }); 1435 $self->connect (delete => sub { $this->destroy; 1 });
1369 1436
1370 # better use a pane... 1437 # better use a pane...
1371 $self->add (my $hbox = new CFPlus::UI::HBox); 1438 $self->add (my $hbox = new DC::UI::HBox);
1372 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1439 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1373 1440
1374 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1441 $hbox->add (my $vbox = new DC::UI::VBox);
1375 1442
1376 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1443 $vbox->add (new DC::UI::Label text => "Message Entry:");
1377 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1444 $vbox->add ($self->{entry} = new DC::UI::Entry
1378 tooltip => "#npc_message_entry", 1445 tooltip => "#npc_message_entry",
1379 on_activate => sub { 1446 on_activate => sub {
1380 my ($entry, $text) = @_; 1447 my ($entry, $text) = @_;
1381 1448
1382 return unless $text =~ /\S/; 1449 return unless $text =~ /\S/;
… …
1386 1453
1387 0 1454 0
1388 }, 1455 },
1389 ); 1456 );
1390 1457
1391 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1458 $vbox->add ($self->{options} = new DC::UI::VBox);
1392 1459
1393 $self->{bye_button} = new CFPlus::UI::Button 1460 $self->{bye_button} = new DC::UI::Button
1394 text => "Bye (close)", 1461 text => "Bye (close)",
1395 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.",
1396 on_activate => sub { $this->destroy; 1 }, 1463 on_activate => sub { $this->destroy; 1 },
1397 ; 1464 ;
1398 1465
… …
1417}; 1484};
1418 1485
1419sub update_options { 1486sub update_options {
1420 my ($self) = @_; 1487 my ($self) = @_;
1421 1488
1422 CFPlus::weaken $self; 1489 DC::weaken $self;
1423 1490
1424 $self->{options}->clear; 1491 $self->{options}->clear;
1425 $self->{options}->add ($self->{bye_button}); 1492 $self->{options}->add ($self->{bye_button});
1426 1493
1427 for my $kw (sort keys %{ $self->{kw} }) { 1494 for my $kw (sort keys %{ $self->{kw} }) {
1428 $self->{options}->add (new CFPlus::UI::Button 1495 $self->{options}->add (new DC::UI::Button
1429 text => $kw, 1496 text => $kw,
1430 on_activate => sub { 1497 on_activate => sub {
1431 $self->send ($kw); 1498 $self->send ($kw);
1432 0 1499 0
1433 }, 1500 },
… …
1436} 1503}
1437 1504
1438sub feed { 1505sub feed {
1439 my ($self, $type, @arg) = @_; 1506 my ($self, $type, @arg) = @_;
1440 1507
1441 CFPlus::weaken $self; 1508 DC::weaken $self;
1442 1509
1443 if ($type eq "update") { 1510 if ($type eq "update") {
1444 my (%info) = @arg; 1511 my (%info) = @arg;
1445 1512
1446 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1513 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1447 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1514 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1448 1515
1449 if (exists $info{msg}) { 1516 if (exists $info{msg}) {
1450 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1517 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1451 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1518 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1452 my @link; 1519 my @link;
1453 $text =~ s{ 1520 $text =~ s{
1454 ($match) 1521 ($match)
1455 }{ 1522 }{
1456 my $kw = $1; 1523 my $kw = $1;
1457 1524
1458 push @link, new CFPlus::UI::Label 1525 push @link, new DC::UI::Label
1459 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1526 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1460 can_hover => 1, 1527 can_hover => 1,
1461 can_events => 1, 1528 can_events => 1,
1462 padding_x => 0, 1529 padding_x => 0,
1463 padding_y => 0, 1530 padding_y => 0,
… …
1481} 1548}
1482 1549
1483sub send { 1550sub send {
1484 my ($self, $msg) = @_; 1551 my ($self, $msg) = @_;
1485 1552
1486 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1553 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1487 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1488 1555
1489 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1556 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1490} 1557}
1491 1558

Diff Legend

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