| … | |
… | |
| 134 | for (@$vals) { |
134 | for (@$vals) { |
| 135 | my $i = int $_ + $rem; |
135 | my $i = int $_ + $rem; |
| 136 | $rem += $_ - $i; |
136 | $rem += $_ - $i; |
| 137 | $_ = $i; |
137 | $_ = $i; |
| 138 | } |
138 | } |
|
|
139 | } |
|
|
140 | |
|
|
141 | sub full_refresh { |
|
|
142 | # make a copy, otherwise for complains about freed values. |
|
|
143 | my @widgets = values %WIDGET; |
|
|
144 | |
|
|
145 | $_->update |
|
|
146 | for @widgets; |
| 139 | } |
147 | } |
| 140 | |
148 | |
| 141 | # call when resolution changes etc. |
149 | # call when resolution changes etc. |
| 142 | sub rescale_widgets { |
150 | sub rescale_widgets { |
| 143 | my ($sx, $sy) = @_; |
151 | my ($sx, $sy) = @_; |
| … | |
… | |
| 198 | %$self = (); |
206 | %$self = (); |
| 199 | } |
207 | } |
| 200 | |
208 | |
| 201 | sub show { |
209 | sub show { |
| 202 | my ($self) = @_; |
210 | my ($self) = @_; |
| 203 | |
|
|
| 204 | return if $self->{parent}; |
211 | return if $self->{parent}; |
| 205 | |
212 | |
| 206 | $CFClient::UI::ROOT->add ($self); |
213 | $CFClient::UI::ROOT->add ($self); |
|
|
214 | } |
|
|
215 | |
|
|
216 | sub show_centered { |
|
|
217 | my ($self) = @_; |
|
|
218 | return if $self->{parent}; |
|
|
219 | |
|
|
220 | $self->show; |
|
|
221 | |
|
|
222 | $CFClient::UI::ROOT->on_post_alloc ( |
|
|
223 | "centered $self" => sub { |
|
|
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
|
|
225 | }, |
|
|
226 | ); |
| 207 | } |
227 | } |
| 208 | |
228 | |
| 209 | sub hide { |
229 | sub hide { |
| 210 | my ($self) = @_; |
230 | my ($self) = @_; |
| 211 | |
231 | |
| … | |
… | |
| 419 | Scalar::Util::weaken ($self->{parent} = $parent); |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
| 420 | |
440 | |
| 421 | # TODO: req_w _does_change after ->reconfigure |
441 | # TODO: req_w _does_change after ->reconfigure |
| 422 | $self->check_size |
442 | $self->check_size |
| 423 | unless exists $self->{req_w}; |
443 | unless exists $self->{req_w}; |
|
|
444 | |
|
|
445 | $self->show; |
| 424 | } |
446 | } |
| 425 | |
447 | |
| 426 | sub check_size { |
448 | sub check_size { |
| 427 | my ($self, $forced) = @_; |
449 | my ($self, $forced) = @_; |
| 428 | |
450 | |
| … | |
… | |
| 721 | |
743 | |
| 722 | sub size_request { |
744 | sub size_request { |
| 723 | my ($self) = @_; |
745 | my ($self) = @_; |
| 724 | |
746 | |
| 725 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
| 726 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
| 727 | |
748 | |
| 728 | @$self{qw(child_w child_h)} |
749 | @$self{qw(child_w child_h)} |
| 729 | } |
750 | } |
| 730 | |
751 | |
| 731 | sub size_allocate { |
752 | sub size_allocate { |
| 732 | my ($self, $w, $h) = @_; |
753 | my ($self, $w, $h) = @_; |
| 733 | |
754 | |
|
|
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
|
|
756 | # $w = $self->{w}; |
|
|
757 | $self->child->configure (0, 0, $cw, $ch); |
| 734 | $self->update; |
758 | $self->update; |
| 735 | } |
759 | } |
| 736 | |
760 | |
| 737 | sub set_offset { |
761 | sub set_offset { |
| 738 | my ($self, $x, $y) = @_; |
762 | my ($self, $x, $y) = @_; |
| … | |
… | |
| 792 | |
816 | |
| 793 | my $slider = new CFClient::UI::Slider |
817 | my $slider = new CFClient::UI::Slider |
| 794 | vertical => 1, |
818 | vertical => 1, |
| 795 | range => [0, 0, 1, 0.01], # HACK fix |
819 | range => [0, 0, 1, 0.01], # HACK fix |
| 796 | connect_changed => sub { |
820 | connect_changed => sub { |
| 797 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
821 | $self->{vp}->set_offset (0, $_[1]); |
| 798 | }, |
822 | }, |
| 799 | ; |
823 | ; |
| 800 | |
824 | |
| 801 | $self = $class->SUPER::new ( |
825 | $self = $class->SUPER::new ( |
| 802 | vp => (new CFClient::UI::ViewPort), |
826 | vp => (new CFClient::UI::ViewPort expand => 1), |
| 803 | slider => $slider, |
827 | slider => $slider, |
| 804 | @_, |
828 | @_, |
| 805 | ); |
829 | ); |
| 806 | |
830 | |
| 807 | $self->{vp}->add ($self->{scrolled}); |
831 | $self->{vp}->add ($self->{scrolled}); |
| 808 | $self->add ($self->{vp}); |
832 | $self->add ($self->{vp}); |
| 809 | $self->add ($self->{slider}); |
833 | $self->add ($self->{slider}); |
| 810 | |
834 | |
| 811 | $self |
835 | $self |
|
|
836 | } |
|
|
837 | |
|
|
838 | sub size_allocate { |
|
|
839 | my ($self, $w, $h) = @_; |
|
|
840 | |
|
|
841 | $self->SUPER::size_allocate ($w, $h); |
|
|
842 | |
|
|
843 | my $child = $self->{vp}->child; |
|
|
844 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
| 812 | } |
845 | } |
| 813 | |
846 | |
| 814 | #TODO# update range on size_allocate depending on child |
847 | #TODO# update range on size_allocate depending on child |
| 815 | # update viewport offset on scroll |
848 | # update viewport offset on scroll |
| 816 | |
849 | |
| … | |
… | |
| 1466 | active_fg => [0, 0, 0], |
1499 | active_fg => [0, 0, 0], |
| 1467 | can_hover => 1, |
1500 | can_hover => 1, |
| 1468 | can_focus => 1, |
1501 | can_focus => 1, |
| 1469 | valign => 0, |
1502 | valign => 0, |
| 1470 | can_events => 1, |
1503 | can_events => 1, |
|
|
1504 | #text => ... |
| 1471 | @_ |
1505 | @_ |
| 1472 | ) |
1506 | ) |
| 1473 | } |
1507 | } |
| 1474 | |
1508 | |
| 1475 | sub _set_text { |
1509 | sub _set_text { |
| … | |
… | |
| 2045 | my $self = $class->SUPER::new ( |
2079 | my $self = $class->SUPER::new ( |
| 2046 | fg => [1, 1, 1], |
2080 | fg => [1, 1, 1], |
| 2047 | active_fg => [0, 0, 0], |
2081 | active_fg => [0, 0, 0], |
| 2048 | bg => [0, 0, 0, 0.2], |
2082 | bg => [0, 0, 0, 0.2], |
| 2049 | active_bg => [1, 1, 1, 0.5], |
2083 | active_bg => [1, 1, 1, 0.5], |
| 2050 | range => [0, 0, 100, 10], |
2084 | range => [0, 0, 100, 10, 0], |
| 2051 | req_w => $::WIDTH / 80, |
2085 | req_w => $::WIDTH / 80, |
| 2052 | req_h => $::WIDTH / 80, |
2086 | req_h => $::WIDTH / 80, |
| 2053 | vertical => 0, |
2087 | vertical => 0, |
| 2054 | can_hover => 1, |
2088 | can_hover => 1, |
| 2055 | inner_pad => .05, |
2089 | inner_pad => 0.02, |
| 2056 | @_ |
2090 | @_ |
| 2057 | ); |
2091 | ); |
| 2058 | |
2092 | |
| 2059 | $self->set_value ($self->{range}[0]); |
2093 | $self->set_value ($self->{range}[0]); |
| 2060 | $self->update; |
2094 | $self->update; |
| 2061 | |
2095 | |
| 2062 | $self |
2096 | $self |
| 2063 | } |
2097 | } |
| 2064 | |
2098 | |
|
|
2099 | sub set_range { |
|
|
2100 | my ($self, $range) = @_; |
|
|
2101 | |
|
|
2102 | $self->{range} = $range; |
|
|
2103 | |
|
|
2104 | $self->update; |
|
|
2105 | } |
|
|
2106 | |
| 2065 | sub set_value { |
2107 | sub set_value { |
| 2066 | my ($self, $value) = @_; |
2108 | my ($self, $value) = @_; |
| 2067 | |
2109 | |
| 2068 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2110 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
| 2069 | |
2111 | |
| 2070 | $hi = $lo + 1 if $hi <= $lo; |
2112 | $hi = $lo + 1 if $hi <= $lo; |
| 2071 | |
2113 | |
|
|
2114 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2115 | |
| 2072 | $value = $lo if $value < $lo; |
2116 | $value = $lo if $value < $lo; |
| 2073 | $value = $hi if $value > $hi; |
2117 | $value = $hi - $page if $value > $hi - $page; |
| 2074 | |
2118 | |
| 2075 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2119 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
| 2076 | if $unit; |
2120 | if $unit; |
| 2077 | |
|
|
| 2078 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
| 2079 | |
2121 | |
| 2080 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2122 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
| 2081 | |
2123 | |
| 2082 | if ($value != $old_value) { |
2124 | if ($value != $old_value) { |
| 2083 | $self->emit (changed => $value); |
2125 | $self->emit (changed => $value); |
| … | |
… | |
| 2096 | |
2138 | |
| 2097 | sub button_down { |
2139 | sub button_down { |
| 2098 | my ($self, $ev, $x, $y) = @_; |
2140 | my ($self, $ev, $x, $y) = @_; |
| 2099 | |
2141 | |
| 2100 | $self->SUPER::button_down ($ev, $x, $y); |
2142 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2143 | |
|
|
2144 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2145 | |
| 2101 | $self->mouse_motion ($ev, $x, $y); |
2146 | $self->mouse_motion ($ev, $x, $y); |
| 2102 | } |
2147 | } |
| 2103 | |
2148 | |
| 2104 | sub mouse_motion { |
2149 | sub mouse_motion { |
| 2105 | my ($self, $ev, $x, $y) = @_; |
2150 | my ($self, $ev, $x, $y) = @_; |
| … | |
… | |
| 2107 | if ($GRAB == $self) { |
2152 | if ($GRAB == $self) { |
| 2108 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2153 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
| 2109 | |
2154 | |
| 2110 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2155 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
| 2111 | |
2156 | |
| 2112 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2157 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
| 2113 | |
2158 | |
| 2114 | $self->set_value ($x * ($hi - $lo) + $lo); |
2159 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
| 2115 | } |
2160 | } |
| 2116 | } |
2161 | } |
| 2117 | |
2162 | |
| 2118 | sub update { |
2163 | sub update { |
| 2119 | my ($self) = @_; |
2164 | my ($self) = @_; |
| 2120 | |
2165 | |
| 2121 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2166 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
| 2122 | $self->set_value ($self->{range}[0]); |
2167 | $self->set_value ($self->{range}[0]); |
| 2123 | |
2168 | |
| 2124 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2169 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2170 | my $range = ($hi - $page - $lo) || 1e-100; |
| 2125 | |
2171 | |
| 2126 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2172 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
| 2127 | |
2173 | |
| 2128 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2174 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2175 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
| 2129 | |
2176 | |
| 2130 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2177 | $value = ($value - $lo) / $range; |
| 2131 | $value = $self->{scale} * ($value - $lo); |
2178 | $value = $value * $self->{scale} + $self->{offset}; |
| 2132 | |
2179 | |
| 2133 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
| 2134 | |
|
|
| 2135 | $value = 0 if $value < 0; |
|
|
| 2136 | $page = 1 - $value if $value + $page > 1; |
|
|
| 2137 | |
|
|
| 2138 | $self->{knob_x} = $value; |
2180 | $self->{knob_x} = $value - $knob_w * 0.5; |
| 2139 | $self->{knob_w} = $page; |
2181 | $self->{knob_w} = $knob_w; |
| 2140 | }); |
2182 | }); |
| 2141 | |
2183 | |
| 2142 | $self->SUPER::update; |
2184 | $self->SUPER::update; |
| 2143 | } |
2185 | } |
| 2144 | |
2186 | |
| … | |
… | |
| 2168 | # draw handle |
2210 | # draw handle |
| 2169 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2211 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
| 2170 | |
2212 | |
| 2171 | glDisable GL_TEXTURE_2D; |
2213 | glDisable GL_TEXTURE_2D; |
| 2172 | } |
2214 | } |
|
|
2215 | |
|
|
2216 | ############################################################################# |
|
|
2217 | |
|
|
2218 | package CFClient::UI::ValSlider; |
|
|
2219 | |
|
|
2220 | our @ISA = CFClient::UI::HBox::; |
|
|
2221 | |
|
|
2222 | sub new { |
|
|
2223 | my ($class, %arg) = @_; |
|
|
2224 | |
|
|
2225 | my $range = delete $arg{range}; |
|
|
2226 | |
|
|
2227 | my $self = $class->SUPER::new ( |
|
|
2228 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2229 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2230 | to_value => sub { shift }, |
|
|
2231 | from_value => sub { shift }, |
|
|
2232 | %arg, |
|
|
2233 | ); |
|
|
2234 | |
|
|
2235 | $self->{slider}->connect (changed => sub { |
|
|
2236 | my ($self, $value) = @_; |
|
|
2237 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2238 | $self->{parent}->emit (changed => $value); |
|
|
2239 | }); |
|
|
2240 | |
|
|
2241 | # $self->{entry}->connect (changed => sub { |
|
|
2242 | # my ($self, $value) = @_; |
|
|
2243 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2244 | # $self->{parent}->emit (changed => $value); |
|
|
2245 | # }); |
|
|
2246 | |
|
|
2247 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2248 | |
|
|
2249 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2250 | |
|
|
2251 | $self |
|
|
2252 | } |
|
|
2253 | |
|
|
2254 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2255 | sub set_value { shift->{slider}->set_value (@_) } |
| 2173 | |
2256 | |
| 2174 | ############################################################################# |
2257 | ############################################################################# |
| 2175 | |
2258 | |
| 2176 | package CFClient::UI::TextView; |
2259 | package CFClient::UI::TextView; |
| 2177 | |
2260 | |
| … | |
… | |
| 2207 | |
2290 | |
| 2208 | $self->{fontsize} = $fontsize; |
2291 | $self->{fontsize} = $fontsize; |
| 2209 | $self->reflow; |
2292 | $self->reflow; |
| 2210 | } |
2293 | } |
| 2211 | |
2294 | |
| 2212 | sub text_height { |
|
|
| 2213 | my ($self, $text) = @_; |
|
|
| 2214 | |
|
|
| 2215 | my $layout = $self->{layout}; |
|
|
| 2216 | |
|
|
| 2217 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
| 2218 | $layout->set_width ($self->{children}[0]{w}); |
|
|
| 2219 | $layout->set_markup ($text); |
|
|
| 2220 | |
|
|
| 2221 | ($layout->size)[1] |
|
|
| 2222 | } |
|
|
| 2223 | |
|
|
| 2224 | sub reflow { |
|
|
| 2225 | my ($self) = @_; |
|
|
| 2226 | |
|
|
| 2227 | $self->{need_reflow}++; |
|
|
| 2228 | $self->update; |
|
|
| 2229 | } |
|
|
| 2230 | |
|
|
| 2231 | sub size_allocate { |
2295 | sub size_allocate { |
| 2232 | my ($self, $w, $h) = @_; |
2296 | my ($self, $w, $h) = @_; |
| 2233 | |
2297 | |
| 2234 | $self->SUPER::size_allocate ($w, $h); |
2298 | $self->SUPER::size_allocate ($w, $h); |
| 2235 | |
2299 | |
| … | |
… | |
| 2238 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2302 | $self->{layout}->set_width ($self->{children}[0]{w}); |
| 2239 | |
2303 | |
| 2240 | $self->reflow; |
2304 | $self->reflow; |
| 2241 | } |
2305 | } |
| 2242 | |
2306 | |
|
|
2307 | sub text_size { |
|
|
2308 | my ($self, $text, $indent) = @_; |
|
|
2309 | |
|
|
2310 | my $layout = $self->{layout}; |
|
|
2311 | |
|
|
2312 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2313 | $layout->set_width ($self->{children}[0]{w} - $indent); |
|
|
2314 | $layout->set_markup ($text); |
|
|
2315 | |
|
|
2316 | $layout->size |
|
|
2317 | } |
|
|
2318 | |
|
|
2319 | sub reflow { |
|
|
2320 | my ($self) = @_; |
|
|
2321 | |
|
|
2322 | $self->{need_reflow}++; |
|
|
2323 | $self->update; |
|
|
2324 | } |
|
|
2325 | |
|
|
2326 | sub set_offset { |
|
|
2327 | my ($self, $offset) = @_; |
|
|
2328 | |
|
|
2329 | # todo: base offset on lines or so, not on pixels |
|
|
2330 | $self->{children}[1]->set_value ($offset); |
|
|
2331 | } |
|
|
2332 | |
|
|
2333 | sub clear { |
|
|
2334 | my ($self) = @_; |
|
|
2335 | |
|
|
2336 | $self->{par} = []; |
|
|
2337 | $self->{height} = 0; |
|
|
2338 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2339 | } |
|
|
2340 | |
| 2243 | sub add_paragraph { |
2341 | sub add_paragraph { |
| 2244 | my ($self, $color, $text) = @_; |
2342 | my ($self, $color, $text, $indent) = @_; |
| 2245 | |
2343 | |
| 2246 | #TODO: intelligently "reformat" paragraph |
2344 | for my $line (split /\n/, $text) { |
| 2247 | |
2345 | my ($w, $h) = $self->text_size ($line); |
| 2248 | my $height = $self->text_height ($text); |
|
|
| 2249 | |
|
|
| 2250 | $self->{height} += $height; |
2346 | $self->{height} += $h; |
|
|
2347 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
|
|
2348 | } |
| 2251 | |
2349 | |
| 2252 | push @{$self->{par}}, [$height, $color, $text]; |
|
|
| 2253 | |
|
|
| 2254 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2350 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
| 2255 | $self->{children}[1]->update; |
|
|
| 2256 | } |
2351 | } |
| 2257 | |
2352 | |
| 2258 | sub update { |
2353 | sub update { |
| 2259 | my ($self) = @_; |
2354 | my ($self) = @_; |
| 2260 | |
2355 | |
| … | |
… | |
| 2263 | return unless $self->{h} > 0; |
2358 | return unless $self->{h} > 0; |
| 2264 | |
2359 | |
| 2265 | delete $self->{texture}; |
2360 | delete $self->{texture}; |
| 2266 | |
2361 | |
| 2267 | $ROOT->on_post_alloc ($self, sub { |
2362 | $ROOT->on_post_alloc ($self, sub { |
|
|
2363 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2364 | |
| 2268 | if (delete $self->{need_reflow}) { |
2365 | if (delete $self->{need_reflow}) { |
| 2269 | my $height = 0; |
2366 | my $height = 0; |
| 2270 | |
2367 | |
| 2271 | $height += $_->[0] = $self->text_height ($_->[2]) |
2368 | my $layout = $self->{layout}; |
|
|
2369 | |
|
|
2370 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2371 | |
| 2272 | for @{$self->{par}}; |
2372 | for (@{$self->{par}}) { |
|
|
2373 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2374 | $layout->set_width ($W - $_->[3]); |
|
|
2375 | $layout->set_markup ($_->[4]); |
|
|
2376 | my ($w, $h) = $layout->size; |
|
|
2377 | $_->[0] = $w + $_->[3]; |
|
|
2378 | $_->[1] = $h; |
|
|
2379 | } |
|
|
2380 | |
|
|
2381 | $height += $_->[1]; |
|
|
2382 | } |
| 2273 | |
2383 | |
| 2274 | $self->{height} = $height; |
2384 | $self->{height} = $height; |
| 2275 | |
2385 | |
| 2276 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2386 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
| 2277 | |
2387 | |
| 2278 | delete $self->{texture}; |
2388 | delete $self->{texture}; |
| 2279 | } |
2389 | } |
| 2280 | |
2390 | |
| 2281 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2391 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
| 2282 | glClearColor 0.5, 0.5, 0.5, 0; |
2392 | glClearColor 0.5, 0.5, 0.5, 0; |
| 2283 | glClear GL_COLOR_BUFFER_BIT; |
2393 | glClear GL_COLOR_BUFFER_BIT; |
| 2284 | |
2394 | |
| 2285 | glEnable GL_TEXTURE_2D; |
|
|
| 2286 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
| 2287 | |
|
|
| 2288 | my $top = int $self->{children}[1]{range}[0]; |
2395 | my $top = int $self->{children}[1]{range}[0]; |
| 2289 | |
2396 | |
| 2290 | my $y0 = $top; |
2397 | my $y0 = $top; |
| 2291 | my $y1 = $top + $self->{h}; |
2398 | my $y1 = $top + $H; |
| 2292 | |
2399 | |
| 2293 | my $y = 0; |
2400 | my $y = 0; |
| 2294 | |
2401 | |
| 2295 | my $layout = $self->{layout}; |
2402 | my $layout = $self->{layout}; |
| 2296 | |
2403 | |
| 2297 | $layout->set_font ($self->{font}) if $self->{font}; |
2404 | $layout->set_font ($self->{font}) if $self->{font}; |
| 2298 | |
2405 | |
|
|
2406 | glEnable GL_BLEND; |
|
|
2407 | #TODO# not correct in windows where rgba is forced off |
|
|
2408 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2409 | |
| 2299 | for my $par (@{$self->{par}}) { |
2410 | for my $par (@{$self->{par}}) { |
| 2300 | my $h = $par->[0]; |
2411 | my $h = $par->[1]; |
| 2301 | |
2412 | |
| 2302 | if ($y0 < $y + $h && $y < $y1) { |
2413 | if ($y0 < $y + $h && $y < $y1) { |
| 2303 | $layout->set_foreground (@{ $par->[1] }); |
2414 | $layout->set_foreground (@{ $par->[2] }); |
|
|
2415 | $layout->set_width ($W - $par->[3]); |
| 2304 | $layout->set_markup ($par->[2]); |
2416 | $layout->set_markup ($par->[4]); |
| 2305 | |
2417 | |
| 2306 | my ($W, $H) = $layout->size; |
2418 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
| 2307 | CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); |
2419 | |
|
|
2420 | glRasterPos $par->[3], $y - $y0; |
|
|
2421 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
| 2308 | } |
2422 | } |
| 2309 | |
2423 | |
| 2310 | $y += $h; |
2424 | $y += $h; |
| 2311 | } |
2425 | } |
| 2312 | |
2426 | |
| 2313 | glDisable GL_TEXTURE_2D; |
2427 | glDisable GL_BLEND; |
| 2314 | }; |
2428 | }; |
| 2315 | }); |
2429 | }); |
| 2316 | } |
2430 | } |
| 2317 | |
2431 | |
| 2318 | sub _draw { |
2432 | sub _draw { |
| … | |
… | |
| 2489 | use CFClient::OpenGL; |
2603 | use CFClient::OpenGL; |
| 2490 | |
2604 | |
| 2491 | sub new { |
2605 | sub new { |
| 2492 | my $class = shift; |
2606 | my $class = shift; |
| 2493 | |
2607 | |
| 2494 | $class->SUPER::new ( |
2608 | my $self = $class->SUPER::new ( |
| 2495 | aspect => 1, |
2609 | aspect => 1, |
| 2496 | @_, |
2610 | @_, |
| 2497 | ) |
2611 | ); |
|
|
2612 | |
|
|
2613 | if ($self->{anim} && $self->{animspeed}) { |
|
|
2614 | Scalar::Util::weaken (my $widget = $self); |
|
|
2615 | |
|
|
2616 | $self->{timer} = Event->timer ( |
|
|
2617 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
2618 | hard => 1, |
|
|
2619 | interval => $self->{animspeed}, |
|
|
2620 | cb => sub { |
|
|
2621 | ++$widget->{frame}; |
|
|
2622 | $widget->update; |
|
|
2623 | }, |
|
|
2624 | ); |
|
|
2625 | } |
|
|
2626 | |
|
|
2627 | $self |
| 2498 | } |
2628 | } |
| 2499 | |
2629 | |
| 2500 | sub size_request { |
2630 | sub size_request { |
| 2501 | (32, 8) |
2631 | (32, 8) |
| 2502 | } |
2632 | } |
| 2503 | |
2633 | |
|
|
2634 | sub update { |
|
|
2635 | my ($self) = @_; |
|
|
2636 | |
|
|
2637 | return unless $self->{visible}; |
|
|
2638 | |
|
|
2639 | $self->SUPER::update; |
|
|
2640 | } |
|
|
2641 | |
| 2504 | sub _draw { |
2642 | sub _draw { |
| 2505 | my ($self) = @_; |
2643 | my ($self) = @_; |
| 2506 | |
2644 | |
| 2507 | return unless $::CONN;#d# manage and cache textures differently |
2645 | return unless $::CONN; |
|
|
2646 | |
|
|
2647 | my $face; |
|
|
2648 | |
|
|
2649 | if ($self->{frame}) { |
|
|
2650 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
2651 | |
|
|
2652 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
2653 | if $anim && @$anim; |
|
|
2654 | } |
|
|
2655 | |
| 2508 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; |
2656 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
| 2509 | |
2657 | |
| 2510 | # TODO animation |
|
|
| 2511 | if ($tex) { |
2658 | if ($tex) { |
| 2512 | glEnable GL_TEXTURE_2D; |
2659 | glEnable GL_TEXTURE_2D; |
| 2513 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2660 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
| 2514 | glColor 1, 1, 1, 1; |
2661 | glColor 1, 1, 1, 1; |
| 2515 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2662 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
| 2516 | glDisable GL_TEXTURE_2D; |
2663 | glDisable GL_TEXTURE_2D; |
| 2517 | } |
2664 | } |
| 2518 | } |
2665 | } |
| 2519 | |
2666 | |
|
|
2667 | sub DESTROY { |
|
|
2668 | my ($self) = @_; |
|
|
2669 | |
|
|
2670 | $self->{timer}->cancel |
|
|
2671 | if $self->{timer}; |
|
|
2672 | |
|
|
2673 | $self->SUPER::DESTROY; |
|
|
2674 | } |
|
|
2675 | |
| 2520 | ############################################################################# |
2676 | ############################################################################# |
| 2521 | |
2677 | |
| 2522 | package CFClient::UI::InventoryItem; |
2678 | package CFClient::UI::InventoryItem; |
| 2523 | |
2679 | |
| 2524 | our @ISA = CFClient::UI::HBox::; |
2680 | our @ISA = CFClient::UI::HBox::; |
| … | |
… | |
| 2527 | my ($item) = @_; |
2683 | my ($item) = @_; |
| 2528 | |
2684 | |
| 2529 | my $desc = |
2685 | my $desc = |
| 2530 | $item->{nrof} < 2 |
2686 | $item->{nrof} < 2 |
| 2531 | ? $item->{name} |
2687 | ? $item->{name} |
| 2532 | : "$item->{nrof} $item->{name_pl}"; |
2688 | : "$item->{nrof} × $item->{name_pl}"; |
| 2533 | |
2689 | |
| 2534 | $item->{flags} & Crossfire::Protocol::F_OPEN |
2690 | $item->{flags} & Crossfire::Protocol::F_OPEN |
| 2535 | and $desc .= " (open)"; |
2691 | and $desc .= " (open)"; |
| 2536 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
2692 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
| 2537 | and $desc .= " (applied)"; |
2693 | and $desc .= " (applied)"; |
| … | |
… | |
| 2557 | my $item = delete $args{item}; |
2713 | my $item = delete $args{item}; |
| 2558 | |
2714 | |
| 2559 | my $desc = _item_to_desc ($item); |
2715 | my $desc = _item_to_desc ($item); |
| 2560 | |
2716 | |
| 2561 | my $self = $class->SUPER::new ( |
2717 | my $self = $class->SUPER::new ( |
| 2562 | can_hover => 1, |
2718 | can_hover => 1, |
| 2563 | can_events => 1, |
2719 | can_events => 1, |
| 2564 | tooltip => ((CFClient::UI::Label::escape $desc) |
2720 | tooltip => ((CFClient::UI::Label::escape $desc) |
| 2565 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
2721 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
| 2566 | connect_button_down => sub { |
2722 | connect_button_down => sub { |
| 2567 | my ($self, $ev, $x, $y) = @_; |
2723 | my ($self, $ev, $x, $y) = @_; |
| 2568 | |
2724 | |
| 2569 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2725 | # todo: maybe put examine on 1? but should just be a tooltip :( |
| 2570 | if ($ev->{button} == 1) { |
2726 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
| 2571 | my $targ = $::CONN->{player}{tag}; |
2727 | my $targ = $::CONN->{player}{tag}; |
| 2572 | |
2728 | |
| 2573 | if ($item->{container} == $::CONN->{player}{tag}) { |
2729 | if ($item->{container} == $::CONN->{player}{tag}) { |
| 2574 | $targ = $main::OPENCONT; |
2730 | $targ = $main::OPENCONT; |
| 2575 | } |
2731 | } |
| 2576 | |
2732 | |
| 2577 | $::CONN->send ("move $targ $item->{tag} 0"); |
2733 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2734 | } elsif ($ev->{button} == 1) { |
|
|
2735 | $::CONN->send ("examine $item->{tag}"); |
| 2578 | } elsif ($ev->{button} == 2) { |
2736 | } elsif ($ev->{button} == 2) { |
| 2579 | $::CONN->send ("apply $item->{tag}"); |
2737 | $::CONN->send ("apply $item->{tag}"); |
| 2580 | } elsif ($ev->{button} == 3) { |
2738 | } elsif ($ev->{button} == 3) { |
| 2581 | my @menu_items = ( |
2739 | my @menu_items = ( |
| 2582 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2740 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
| 2583 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
2741 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
| 2584 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
2742 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2743 | ( |
|
|
2744 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2745 | ? ( |
|
|
2746 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2747 | ) |
|
|
2748 | : ( |
|
|
2749 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
| 2585 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2750 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
| 2586 | [ |
2751 | ) |
| 2587 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
| 2588 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
| 2589 | ], |
2752 | ), |
| 2590 | ); |
2753 | ); |
| 2591 | |
2754 | |
| 2592 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2755 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
| 2593 | } |
2756 | } |
| 2594 | |
2757 | |
| … | |
… | |
| 2630 | |
2793 | |
| 2631 | sub new { |
2794 | sub new { |
| 2632 | my $class = shift; |
2795 | my $class = shift; |
| 2633 | |
2796 | |
| 2634 | my $self = $class->SUPER::new ( |
2797 | my $self = $class->SUPER::new ( |
| 2635 | scrolled => (new CFClient::UI::VBox), |
2798 | scrolled => (new CFClient::UI::Table), |
| 2636 | @_, |
2799 | @_, |
| 2637 | ); |
2800 | ); |
| 2638 | |
2801 | |
| 2639 | $self |
2802 | $self |
| 2640 | } |
2803 | } |
| … | |
… | |
| 2651 | } @$items; |
2814 | } @$items; |
| 2652 | |
2815 | |
| 2653 | $self->{real_items} = \@items; |
2816 | $self->{real_items} = \@items; |
| 2654 | |
2817 | |
| 2655 | for my $item (@items) { |
2818 | for my $item (@items) { |
|
|
2819 | $item->{item} = $item; |
| 2656 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2820 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
| 2657 | $item->update_item (); |
2821 | $item->update_item (); |
| 2658 | } |
2822 | } |
| 2659 | |
2823 | |
|
|
2824 | my $i = 0; |
|
|
2825 | for (@items) { |
| 2660 | $self->{scrolled}->add (@items); |
2826 | $self->{scrolled}->add (0, $i, $_); |
|
|
2827 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2828 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2829 | } |
| 2661 | |
2830 | |
| 2662 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2831 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
| 2663 | } |
2832 | } |
| 2664 | |
2833 | |
| 2665 | sub size_request { |
2834 | sub size_request { |
| … | |
… | |
| 2928 | } |
3097 | } |
| 2929 | |
3098 | |
| 2930 | sub add { |
3099 | sub add { |
| 2931 | my ($self, @children) = @_; |
3100 | my ($self, @children) = @_; |
| 2932 | |
3101 | |
|
|
3102 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3103 | push @widgets, $w->children; |
|
|
3104 | $w->{root} = $self; |
|
|
3105 | $w->{visible} = 1; |
|
|
3106 | } |
|
|
3107 | |
| 2933 | for my $child (@children) { |
3108 | for my $child (@children) { |
| 2934 | $child->{toplevel} = 1; |
3109 | $child->{toplevel} = 1; |
| 2935 | |
3110 | |
| 2936 | # integerise window positions |
3111 | # integerise window positions |
| 2937 | $child->{x} = int $child->{x}; |
3112 | $child->{x} = int $child->{x}; |
| 2938 | $child->{y} = int $child->{y}; |
3113 | $child->{y} = int $child->{y}; |
| 2939 | } |
3114 | } |
| 2940 | |
3115 | |
| 2941 | $self->SUPER::add (@children); |
3116 | $self->SUPER::add (@children); |
|
|
3117 | } |
|
|
3118 | |
|
|
3119 | sub remove { |
|
|
3120 | my ($self, @children) = @_; |
|
|
3121 | |
|
|
3122 | $self->SUPER::remove (@children); |
|
|
3123 | |
|
|
3124 | while (@children) { |
|
|
3125 | my $w = pop @children; |
|
|
3126 | push @children, $w->children; |
|
|
3127 | delete $w->{visible}; |
|
|
3128 | } |
| 2942 | } |
3129 | } |
| 2943 | |
3130 | |
| 2944 | sub on_refresh { |
3131 | sub on_refresh { |
| 2945 | my ($self, $id, $cb) = @_; |
3132 | my ($self, $id, $cb) = @_; |
| 2946 | |
3133 | |
| … | |
… | |
| 3015 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3202 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
| 3016 | glClear GL_COLOR_BUFFER_BIT; |
3203 | glClear GL_COLOR_BUFFER_BIT; |
| 3017 | |
3204 | |
| 3018 | glMatrixMode GL_PROJECTION; |
3205 | glMatrixMode GL_PROJECTION; |
| 3019 | glLoadIdentity; |
3206 | glLoadIdentity; |
| 3020 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3207 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
| 3021 | glMatrixMode GL_MODELVIEW; |
3208 | glMatrixMode GL_MODELVIEW; |
| 3022 | glLoadIdentity; |
3209 | glLoadIdentity; |
| 3023 | |
3210 | |
| 3024 | $self->_draw; |
3211 | $self->_draw; |
| 3025 | } |
3212 | } |
