… | |
… | |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | excmd => 1, |
25 | excmd => 1, |
26 | ywidget => 1, |
26 | ywidget => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
49 | @args |
49 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
52 | |
52 | |
53 | $self->connect_ext (event_music => sub { |
53 | $self->connect_ext (music => sub { |
54 | my ($ev) = @_; |
54 | my ($ev) = @_; |
55 | |
55 | |
56 | return unless $::CFG->{bgm_enable}; |
|
|
57 | |
|
|
58 | my $faces = $ev->{faces}; |
|
|
59 | my @songs; |
|
|
60 | |
|
|
61 | # request music from server if appropriate |
|
|
62 | if (my $faces = $ev->{faces}) { |
|
|
63 | for (@$faces) { |
|
|
64 | my ($face, $pri, $chksum) = @$_; |
|
|
65 | utf8::downgrade $chksum; |
|
|
66 | |
|
|
67 | $chksum = unpack "H*", $chksum; |
|
|
68 | $self->{music_map}{$face} = $chksum; |
|
|
69 | |
|
|
70 | # check if already cached |
|
|
71 | CFPlus::DB::get resmap => $chksum, sub { |
|
|
72 | my ($meta) = @_; |
|
|
73 | |
|
|
74 | if (defined $meta) { |
|
|
75 | $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); |
|
|
76 | } else { |
|
|
77 | ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
78 | $self->ask_face ($face, -100 - $pri, undef, sub { |
|
|
79 | my $len = length $_[1]; |
|
|
80 | my ($meta, $data) = unpack "(w/a*)*", $_[1]; |
|
|
81 | |
|
|
82 | CFPlus::DB::write_file $chksum, $data, sub { }; |
|
|
83 | CFPlus::DB::put resmap => $chksum => $meta, sub { }; |
|
|
84 | |
|
|
85 | $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); |
|
|
86 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
87 | |
|
|
88 | &::audio_music_set ($self->{songs}); |
|
|
89 | }); |
|
|
90 | } |
|
|
91 | } |
|
|
92 | } |
|
|
93 | } |
|
|
94 | |
|
|
95 | if (my $play = $ev->{play}) { |
|
|
96 | &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); |
56 | &::audio_music_set ($self->{songs} = $ev->{play}) |
97 | use Data::Dumper; |
57 | if $ev->{play}; |
98 | warn Dumper $self->{songs};#d# |
|
|
99 | } |
|
|
100 | }); |
58 | }); |
101 | |
59 | |
102 | $self->connect_ext (event_capabilities => sub { |
60 | $self->connect_ext (capabilities => sub { |
103 | my ($cap) = @_; |
61 | my (%cap) = @_; |
104 | |
62 | |
|
|
63 | $self->send_exti_msg (fx_want => { |
|
|
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
66 | }); |
|
|
67 | |
105 | if (my $ts = $cap->{tileset}) { |
68 | if (my $ts = $cap{tileset}) { |
106 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
107 | $self->{tileset} = $default; |
70 | $self->{tileset} = $default; |
108 | $self->{tilesize} = $default->[3]; |
71 | $self->{tilesize} = $default->[3]; |
109 | $self->setup_req (tileset => $default->[0]); |
72 | $self->setup_req (tileset => $default->[0]); |
110 | |
73 | |
… | |
… | |
116 | } |
79 | } |
117 | }); |
80 | }); |
118 | |
81 | |
119 | $self->{json_coder} |
82 | $self->{json_coder} |
120 | ->convert_blessed |
83 | ->convert_blessed |
121 | ->filter_json_single_key_object (__widget_ref__ => sub { |
84 | ->filter_json_single_key_object (__w_ => sub { |
122 | $self->{widget}{$_[0]} |
85 | $self->{widget}{$_[0]} |
123 | }); |
86 | }); |
124 | |
87 | |
|
|
88 | # widgetset new |
125 | $self->connect_ext (ws_n => sub { |
89 | $self->connect_ext (ws_n => sub { |
126 | my ($arg) = @_; |
90 | my ($id) = @_; |
127 | |
91 | |
128 | $self->{widgetset}{$arg{id}} = { |
92 | $self->{widgetset}{$id} = { |
129 | w => {}, |
93 | w => {}, |
130 | }; |
94 | }; |
131 | }); |
95 | }); |
132 | |
96 | |
|
|
97 | # widgetset destroy |
133 | $self->connect_ext (ws_d => sub { |
98 | $self->connect_ext (ws_d => sub { |
134 | my ($arg) = @_; |
99 | my ($id) = @_; |
135 | |
100 | |
136 | my $ws = delete $self->{widgetset}{$arg{id}} |
101 | my $ws = delete $self->{widgetset}{$id} |
137 | or return; |
102 | or return; |
138 | |
103 | |
139 | $_->destroy |
104 | $_->destroy |
140 | for values %{$ws->{w}}; |
105 | for values %{$ws->{w}}; |
141 | }); |
106 | }); |
142 | |
107 | |
|
|
108 | # widgetset create |
143 | $self->connect_ext (ws_c => sub { |
109 | $self->connect_ext (ws_c => sub { |
144 | my ($arg) = @_; |
110 | my ($ws, $id, $class, $args) = @_; |
145 | |
|
|
146 | my $args = $arg->{args} || {}; |
|
|
147 | |
111 | |
148 | for my $ev (grep /^on_/, keys %$args) { |
112 | for my $ev (grep /^on_/, keys %$args) { |
149 | $args->{$ev} = sub { |
113 | $args->{$ev} = sub { |
150 | my $id = shift->{s_id}; |
114 | my $id = shift->{s_id}; |
151 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
115 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
152 | |
116 | |
153 | 1 |
117 | 1 |
154 | }; |
118 | }; |
155 | } |
119 | } |
156 | |
120 | |
157 | if (my $widget = eval { |
121 | if (my $widget = eval { |
158 | local $SIG{__DIE__}; |
122 | local $SIG{__DIE__}; |
159 | "CFPlus::UI::$arg->{class}"->new ( |
123 | "CFPlus::UI::$class"->new ( |
160 | %$args, |
124 | %$args, |
161 | s_ws => $arg->{ws}, |
125 | s_ws => $ws, |
162 | s_id => $arg->{id}, |
126 | s_id => $id, |
163 | ) |
127 | ) |
164 | } |
128 | } |
165 | ) { |
129 | ) { |
166 | $self->{widget}{$arg->{id}} |
130 | $self->{widget}{$id} |
167 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
131 | = $self->{widgetset}{$ws}{w}{$id} |
168 | = $widget; |
132 | = $widget; |
169 | |
133 | |
170 | $widget->connect (on_destroy => sub { |
134 | $widget->connect (on_destroy => sub { |
171 | my ($widget) = @_; |
135 | my ($widget) = @_; |
172 | |
136 | |
173 | delete $self->{widget}{$widget->{s_id}}; |
137 | delete $self->{widget}{$widget->{s_id}}; |
174 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
138 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
175 | }); |
139 | }); |
176 | } else { |
140 | } else { |
177 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
141 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
178 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
142 | $self->send_exti_msg (w_e => $id, "destroy"); |
179 | } |
143 | } |
180 | }); |
144 | }); |
181 | |
145 | |
|
|
146 | # widget call |
182 | $self->connect_ext (w_c => sub { |
147 | $self->connect_ext (w_c => sub { |
183 | my ($arg) = @_; |
148 | my ($id, $rid, $method, $args) = @_; |
184 | |
149 | |
185 | my $w = $self->{widget}{$arg->{id}} |
150 | my $w = $self->{widget}{$id} |
186 | or return; |
151 | or return; |
187 | my $m = $arg->{name}; |
|
|
188 | |
152 | |
189 | my $a = $arg->{args} || []; |
153 | $args ||= []; |
190 | |
154 | |
191 | if (exists $arg->{rid}) { |
155 | if ($rid) { |
192 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
156 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
193 | } else { |
157 | } else { |
194 | $w->$m (@$a); |
158 | $w->$method (@$args); |
195 | } |
159 | } |
196 | }); |
160 | }); |
197 | |
161 | |
|
|
162 | # widget set |
198 | $self->connect_ext (w_s => sub { |
163 | $self->connect_ext (w_s => sub { |
199 | my ($arg) = @_; |
164 | my ($id, $attr) = @_; |
200 | |
165 | |
201 | my $w = $self->{widget}{$arg->{id}} |
166 | my $w = $self->{widget}{$id} |
202 | or return; |
167 | or return; |
203 | |
168 | |
204 | $w->{$arg->{name}} = $arg->{value}; |
169 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
170 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
171 | if (defined $value) { |
|
|
172 | $w->{$member} = $value; |
|
|
173 | } else { |
|
|
174 | delete $w->{$member}; |
|
|
175 | } |
|
|
176 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
177 | } |
205 | }); |
178 | }); |
206 | |
179 | |
|
|
180 | # widget get |
207 | $self->connect_ext (w_g => sub { |
181 | $self->connect_ext (w_g => sub { |
208 | my ($arg) = @_; |
182 | my ($id, $rid, $attr) = @_; |
209 | |
183 | |
210 | my $w = $self->{widget}{$arg->{id}} |
184 | my $w = $self->{widget}{$id} |
211 | or return; |
185 | or return; |
212 | |
186 | |
213 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
214 | }); |
188 | }); |
215 | |
189 | |
|
|
190 | # destroy widgets on logout |
216 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
191 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
217 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
192 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
218 | $_->destroy |
193 | $_->destroy |
219 | for values %{delete $ws->{w} || {}}; |
194 | for values %{delete $ws->{w} || {}}; |
220 | } |
195 | } |
… | |
… | |
433 | my @skills = keys %{ $self->{skill_info} }; |
408 | my @skills = keys %{ $self->{skill_info} }; |
434 | |
409 | |
435 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
410 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
436 | $sktbl->clear; |
411 | $sktbl->clear; |
437 | |
412 | |
|
|
413 | my @add; |
|
|
414 | |
|
|
415 | push @add, |
438 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
416 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
439 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
417 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
440 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
418 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
441 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
419 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
442 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
420 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
443 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
421 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
422 | ; |
444 | |
423 | |
445 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
424 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
446 | |
425 | |
447 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
426 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
448 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
427 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
… | |
… | |
476 | } |
455 | } |
477 | |
456 | |
478 | 1 |
457 | 1 |
479 | }; |
458 | }; |
480 | |
459 | |
|
|
460 | push @add, |
481 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
461 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
482 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
462 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
483 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
463 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
484 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
464 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
485 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
465 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
486 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
466 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
467 | ; |
487 | |
468 | |
488 | $x++ and ($x, $y) = (0, $y + 1); |
469 | $x++ and ($x, $y) = (0, $y + 1); |
489 | } |
470 | } |
|
|
471 | |
|
|
472 | $sktbl->add_at (@add); |
490 | } |
473 | } |
491 | |
474 | |
492 | for (grep exists $stats->{$_}, @skills) { |
475 | for (grep exists $stats->{$_}, @skills) { |
493 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
476 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
494 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
477 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
… | |
… | |
731 | } |
714 | } |
732 | |
715 | |
733 | sub face_find { |
716 | sub face_find { |
734 | my ($self, $facenum, $face, $cb) = @_; |
717 | my ($self, $facenum, $face, $cb) = @_; |
735 | |
718 | |
736 | my $hash = "$face->{chksum},$face->{name}"; |
719 | if ($face->{type} == 0) { # FT_FACE |
737 | |
|
|
738 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
720 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
739 | |
721 | |
740 | $face->{id} = $id; |
722 | $face->{id} = $id; |
741 | $self->{faceid}[$facenum] = $id; |
723 | $self->{faceid}[$facenum] = $id; |
742 | |
724 | |
743 | $self->{map}->set_tileid ($facenum => $id); |
725 | $self->{map}->set_tileid ($facenum => $id); |
744 | |
726 | |
745 | CFPlus::DB::get tilecache => $id, $cb; |
727 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
728 | |
|
|
729 | } elsif ($face->{type} & 1) { # with metadata |
|
|
730 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
731 | CFPlus::DB::get "res-metadata" => $face->{name}, $cb; |
|
|
732 | } |
746 | } |
733 | } |
747 | |
734 | |
748 | sub face_update { |
735 | sub face_update { |
749 | my ($self, $facenum, $face, $changed) = @_; |
736 | my ($self, $facenum, $face, $changed) = @_; |
750 | |
737 | |
|
|
738 | if ($face->{type} == 0) { # FT_FACE |
751 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
739 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
752 | if $changed; |
740 | if $changed; |
753 | |
741 | |
754 | $self->set_texture ($face->{id} => delete $face->{image}); |
742 | $self->set_texture ($face->{id} => delete $face->{data}); |
|
|
743 | |
|
|
744 | } elsif ($face->{type} & 1) { # split metadata |
|
|
745 | my $cb = sub { }; |
|
|
746 | |
|
|
747 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
748 | $cb = sub { |
|
|
749 | $self->{music_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_music_set ($self->{songs}); |
|
|
755 | }; |
|
|
756 | } |
|
|
757 | |
|
|
758 | if ($changed) { # new data |
|
|
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
760 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
761 | |
|
|
762 | CFPlus::DB::write_file $path, $data, sub { |
|
|
763 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
|
|
764 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
765 | $face->{path} = $path; |
|
|
766 | |
|
|
767 | $cb->(); |
|
|
768 | }; |
|
|
769 | }; |
|
|
770 | } else { |
|
|
771 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
772 | $cb->(); |
|
|
773 | } |
|
|
774 | } |
755 | } |
775 | } |
756 | |
776 | |
757 | sub smooth_update { |
777 | sub smooth_update { |
758 | my ($self, $facenum, $face) = @_; |
778 | my ($self, $facenum, $face) = @_; |
759 | |
779 | |
760 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
780 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
761 | } |
781 | } |
762 | |
782 | |
763 | sub set_texture { |
783 | sub set_texture { |
764 | my ($self, $id, $data) = @_; |
784 | my ($self, $id, $data) = @_; |
|
|
785 | |
|
|
786 | return unless $self->{map}; |
765 | |
787 | |
766 | $self->{texture}[$id] = my $tex = |
788 | $self->{texture}[$id] = my $tex = |
767 | new_from_image CFPlus::Texture |
789 | new_from_image CFPlus::Texture |
768 | $data, minify => 1, mipmap => 1; |
790 | $data, minify => 1, mipmap => 1; |
769 | |
791 | |
770 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
792 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
771 | $self->{map_widget}->update; |
793 | $self->{map_widget}->update; |
|
|
794 | |
|
|
795 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
796 | } |
|
|
797 | |
|
|
798 | sub connect_face_update { |
|
|
799 | my ($self, $id, $cb) = @_; |
|
|
800 | |
|
|
801 | push @{$self->{face_cb}{$id}}, $cb; |
|
|
802 | |
|
|
803 | CFPlus::guard { |
|
|
804 | @{$self->{face_cb}{$id}} |
|
|
805 | = grep $_ != $cb, |
|
|
806 | @{$self->{face_cb}{$id}}; |
|
|
807 | } |
772 | } |
808 | } |
773 | |
809 | |
774 | sub sound_play { |
810 | sub sound_play { |
775 | my ($self, $x, $y, $soundnum, $type) = @_; |
811 | my ($self, $x, $y, $soundnum, $type) = @_; |
776 | |
812 | |
… | |
… | |
960 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
996 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
961 | return unless $::CONN; |
997 | return unless $::CONN; |
962 | |
998 | |
963 | $::FLOORBOX->clear; |
999 | $::FLOORBOX->clear; |
964 | |
1000 | |
|
|
1001 | my @add; |
|
|
1002 | |
965 | my $row; |
1003 | my $row; |
966 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1004 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
967 | if ($row < 6) { |
1005 | if ($row < 6) { |
968 | local $_->{face_widget}; # hack to force recreation of widget |
1006 | local $_->{face_widget}; # hack to force recreation of widget |
969 | local $_->{desc_widget}; # hack to force recreation of widget |
1007 | local $_->{desc_widget}; # hack to force recreation of widget |
970 | CFPlus::Item::update_widgets $_; |
1008 | CFPlus::Item::update_widgets $_; |
971 | |
1009 | |
|
|
1010 | push @add, |
972 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1011 | 0, $row, $_->{face_widget}, |
973 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1012 | 1, $row, $_->{desc_widget}; |
974 | |
1013 | |
975 | $row++; |
1014 | $row++; |
976 | } else { |
1015 | } else { |
977 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1016 | push @add, 1, $row, new CFPlus::UI::Button |
978 | text => "More...", |
1017 | text => "More...", |
979 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1018 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
980 | ); |
1019 | ; |
981 | last; |
1020 | last; |
982 | } |
1021 | } |
983 | } |
1022 | } |
984 | if ($::CONN->{open_container}) { |
1023 | if ($::CONN->{open_container}) { |
985 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1024 | push @add, 1, $row++, new CFPlus::UI::Button |
986 | text => "Close container", |
1025 | text => "Close container", |
987 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1026 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
988 | ); |
1027 | ; |
989 | } |
1028 | } |
|
|
1029 | |
|
|
1030 | $::FLOORBOX->add_at (@add); |
990 | }); |
1031 | }); |
991 | |
1032 | |
992 | $::WANT_REFRESH++; |
1033 | $::WANT_REFRESH++; |
993 | } |
1034 | } |
994 | |
1035 | |
… | |
… | |
1120 | } |
1161 | } |
1121 | |
1162 | |
1122 | sub logged_in { |
1163 | sub logged_in { |
1123 | my ($self) = @_; |
1164 | my ($self) = @_; |
1124 | |
1165 | |
1125 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1166 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1167 | my (%msg) = @_; |
|
|
1168 | |
1126 | $self->{cfplus_ext} = $_[0]{version}; |
1169 | $self->{cfplus_ext} = $msg{version}; |
1127 | $self->update_server_info; |
1170 | $self->update_server_info; |
1128 | |
1171 | |
1129 | if ($self->{cfplus_ext} >= 2) { |
1172 | if ($self->{cfplus_ext} >= 2) { |
1130 | $self->send_ext_req ("editor_support", sub { |
1173 | $self->send_ext_req ("editor_support", sub { |
1131 | $self->{editor_support} = $_[0]; |
1174 | $self->{editor_support} = { @_ }; |
1132 | $self->update_server_info; |
1175 | $self->update_server_info; |
1133 | |
1176 | |
1134 | 0 |
1177 | 0 |
1135 | }); |
1178 | }); |
1136 | } |
1179 | } |
… | |
… | |
1156 | |
1199 | |
1157 | sub lookat { |
1200 | sub lookat { |
1158 | my ($self, $x, $y) = @_; |
1201 | my ($self, $x, $y) = @_; |
1159 | |
1202 | |
1160 | if ($self->{cfplus_ext}) { |
1203 | if ($self->{cfplus_ext}) { |
1161 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1204 | $self->send_ext_req (lookat => $x, $y, sub { |
1162 | my ($msg) = @_; |
1205 | my (%msg) = @_; |
1163 | |
1206 | |
1164 | if (exists $msg->{npc_dialog}) { |
1207 | if (exists $msg{npc_dialog}) { |
1165 | # start npc chat dialog |
1208 | # start npc chat dialog |
1166 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1209 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1167 | dx => $x, |
1210 | token => $msg{npc_dialog}, |
1168 | dy => $y, |
|
|
1169 | title => "$msg->{npc_dialog} (NPC)", |
1211 | title => "$msg{npc_dialog}[0] (NPC)", |
1170 | conn => $self, |
1212 | conn => $self, |
1171 | ; |
1213 | ; |
1172 | } |
1214 | } |
1173 | }); |
1215 | }); |
1174 | } |
1216 | } |
… | |
… | |
1239 | on_activate => sub { $this->destroy; 1 }, |
1281 | on_activate => sub { $this->destroy; 1 }, |
1240 | ; |
1282 | ; |
1241 | |
1283 | |
1242 | $self->update_options; |
1284 | $self->update_options; |
1243 | |
1285 | |
1244 | $self->{id} = $self->{conn}->send_ext_req ( |
1286 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1245 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1287 | $self->{conn}->connect_ext ($self->{id} => sub { |
1246 | sub { $this && $this->feed (@_) } |
1288 | $this->feed (@_) if $this; |
1247 | ); |
1289 | }); |
|
|
1290 | |
|
|
1291 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1248 | |
1292 | |
1249 | $self->{entry}->grab_focus; |
1293 | $self->{entry}->grab_focus; |
1250 | |
1294 | |
1251 | $self->{textview}->add_paragraph ({ |
1295 | $self->{textview}->add_paragraph ({ |
1252 | fg => [1, 1, 0, 1], |
1296 | fg => [1, 1, 0, 1], |
… | |
… | |
1275 | ); |
1319 | ); |
1276 | } |
1320 | } |
1277 | } |
1321 | } |
1278 | |
1322 | |
1279 | sub feed { |
1323 | sub feed { |
1280 | my ($self, $msg) = @_; |
1324 | my ($self, $type, @arg) = @_; |
1281 | |
1325 | |
1282 | CFPlus::weaken $self; |
1326 | CFPlus::weaken $self; |
1283 | |
1327 | |
1284 | if ($msg->{msgtype} eq "reply") { |
1328 | if ($type eq "update") { |
|
|
1329 | my (%info) = @arg; |
|
|
1330 | |
1285 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1331 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1286 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1332 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1287 | |
|
|
1288 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
|
|
1289 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1290 | my @link; |
|
|
1291 | $text =~ s{ |
|
|
1292 | ($match) |
|
|
1293 | }{ |
|
|
1294 | my $kw = $1; |
|
|
1295 | |
|
|
1296 | push @link, new CFPlus::UI::Label |
|
|
1297 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1298 | can_hover => 1, |
|
|
1299 | can_events => 1, |
|
|
1300 | padding_x => 0, |
|
|
1301 | padding_y => 0, |
|
|
1302 | on_button_up => sub { |
|
|
1303 | $self->send ($kw); |
|
|
1304 | }; |
|
|
1305 | |
|
|
1306 | "\x{fffc}" |
|
|
1307 | }giex; |
|
|
1308 | |
1333 | |
|
|
1334 | if (exists $info{msg}) { |
|
|
1335 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1336 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1337 | my @link; |
|
|
1338 | $text =~ s{ |
|
|
1339 | ($match) |
|
|
1340 | }{ |
|
|
1341 | my $kw = $1; |
|
|
1342 | |
|
|
1343 | push @link, new CFPlus::UI::Label |
|
|
1344 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1345 | can_hover => 1, |
|
|
1346 | can_events => 1, |
|
|
1347 | padding_x => 0, |
|
|
1348 | padding_y => 0, |
|
|
1349 | on_button_up => sub { |
|
|
1350 | $self->send ($kw); |
|
|
1351 | }; |
|
|
1352 | |
|
|
1353 | "\x{fffc}" |
|
|
1354 | }giex; |
|
|
1355 | |
1309 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1356 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1310 | $self->{textview}->scroll_to_bottom; |
1357 | $self->{textview}->scroll_to_bottom; |
|
|
1358 | } |
|
|
1359 | |
1311 | $self->update_options; |
1360 | $self->update_options; |
1312 | } else { |
1361 | } else { |
1313 | $self->destroy; |
1362 | $self->destroy; |
1314 | } |
1363 | } |
1315 | |
1364 | |
… | |
… | |
1320 | my ($self, $msg) = @_; |
1369 | my ($self, $msg) = @_; |
1321 | |
1370 | |
1322 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1371 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1323 | $self->{textview}->scroll_to_bottom; |
1372 | $self->{textview}->scroll_to_bottom; |
1324 | |
1373 | |
1325 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1374 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1326 | } |
1375 | } |
1327 | |
1376 | |
1328 | sub destroy { |
1377 | sub destroy { |
1329 | my ($self) = @_; |
1378 | my ($self) = @_; |
1330 | |
1379 | |
1331 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1380 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1332 | |
1381 | |
1333 | if ($self->{conn}) { |
1382 | if ($self->{conn}) { |
1334 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1383 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1335 | delete $self->{conn}{npc_dialog}; |
1384 | delete $self->{conn}{npc_dialog}; |
1336 | $self->{conn}->disconnect_ext ($self->{id}); |
1385 | $self->{conn}->disconnect_ext ($self->{id}); |
1337 | } |
1386 | } |
1338 | |
1387 | |
1339 | $self->SUPER::destroy; |
1388 | $self->SUPER::destroy; |