… | |
… | |
136 | $rem += $_ - $i; |
136 | $rem += $_ - $i; |
137 | $_ = $i; |
137 | $_ = $i; |
138 | } |
138 | } |
139 | } |
139 | } |
140 | |
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; |
|
|
147 | } |
|
|
148 | |
|
|
149 | sub reconfigure_widgets { |
|
|
150 | # make a copy, otherwise C<for> complains about freed values. |
|
|
151 | my @widgets = values %WIDGET; |
|
|
152 | |
|
|
153 | $_->reconfigure |
|
|
154 | for @widgets; |
|
|
155 | } |
|
|
156 | |
141 | # call when resolution changes etc. |
157 | # call when resolution changes etc. |
142 | sub rescale_widgets { |
158 | sub rescale_widgets { |
143 | my ($sx, $sy) = @_; |
159 | my ($sx, $sy) = @_; |
144 | |
160 | |
145 | # make a copy, otherwise for complains about freed values. |
|
|
146 | my @widgets = values %WIDGET; |
161 | for my $widget (values %WIDGET) { |
147 | |
|
|
148 | for my $widget (@widgets) { |
|
|
149 | if ($widget->{toplevel}) { |
162 | if ($widget->{is_toplevel}) { |
150 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
163 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
151 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
164 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
152 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
165 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
153 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
166 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
154 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
167 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
155 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
168 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
156 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
169 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
157 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
170 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
158 | } |
171 | } |
159 | |
|
|
160 | $widget->reconfigure; |
|
|
161 | } |
172 | } |
|
|
173 | |
|
|
174 | reconfigure_widgets; |
162 | } |
175 | } |
163 | |
176 | |
164 | ############################################################################# |
177 | ############################################################################# |
165 | |
178 | |
166 | package CFClient::UI::Base; |
179 | package CFClient::UI::Base; |
… | |
… | |
198 | %$self = (); |
211 | %$self = (); |
199 | } |
212 | } |
200 | |
213 | |
201 | sub show { |
214 | sub show { |
202 | my ($self) = @_; |
215 | my ($self) = @_; |
203 | |
|
|
204 | return if $self->{parent}; |
216 | return if $self->{parent}; |
205 | |
217 | |
206 | $CFClient::UI::ROOT->add ($self); |
218 | $CFClient::UI::ROOT->add ($self); |
|
|
219 | } |
|
|
220 | |
|
|
221 | sub show_centered { |
|
|
222 | my ($self) = @_; |
|
|
223 | return if $self->{parent}; |
|
|
224 | |
|
|
225 | $self->show; |
|
|
226 | |
|
|
227 | $CFClient::UI::ROOT->on_post_alloc ( |
|
|
228 | "centered $self" => sub { |
|
|
229 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
|
|
230 | }, |
|
|
231 | ); |
207 | } |
232 | } |
208 | |
233 | |
209 | sub hide { |
234 | sub hide { |
210 | my ($self) = @_; |
235 | my ($self) = @_; |
211 | |
236 | |
… | |
… | |
419 | Scalar::Util::weaken ($self->{parent} = $parent); |
444 | Scalar::Util::weaken ($self->{parent} = $parent); |
420 | |
445 | |
421 | # TODO: req_w _does_change after ->reconfigure |
446 | # TODO: req_w _does_change after ->reconfigure |
422 | $self->check_size |
447 | $self->check_size |
423 | unless exists $self->{req_w}; |
448 | unless exists $self->{req_w}; |
|
|
449 | |
|
|
450 | $self->show; |
424 | } |
451 | } |
425 | |
452 | |
426 | sub check_size { |
453 | sub check_size { |
427 | my ($self, $forced) = @_; |
454 | my ($self, $forced) = @_; |
428 | |
455 | |
… | |
… | |
721 | |
748 | |
722 | sub size_request { |
749 | sub size_request { |
723 | my ($self) = @_; |
750 | my ($self) = @_; |
724 | |
751 | |
725 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
752 | @$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 | |
753 | |
728 | @$self{qw(child_w child_h)} |
754 | @$self{qw(child_w child_h)} |
729 | } |
755 | } |
730 | |
756 | |
731 | sub size_allocate { |
757 | sub size_allocate { |
732 | my ($self, $w, $h) = @_; |
758 | my ($self, $w, $h) = @_; |
733 | |
759 | |
|
|
760 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
|
|
761 | # $w = $self->{w}; |
|
|
762 | $self->child->configure (0, 0, $cw, $ch); |
734 | $self->update; |
763 | $self->update; |
735 | } |
764 | } |
736 | |
765 | |
737 | sub set_offset { |
766 | sub set_offset { |
738 | my ($self, $x, $y) = @_; |
767 | my ($self, $x, $y) = @_; |
… | |
… | |
792 | |
821 | |
793 | my $slider = new CFClient::UI::Slider |
822 | my $slider = new CFClient::UI::Slider |
794 | vertical => 1, |
823 | vertical => 1, |
795 | range => [0, 0, 1, 0.01], # HACK fix |
824 | range => [0, 0, 1, 0.01], # HACK fix |
796 | connect_changed => sub { |
825 | connect_changed => sub { |
797 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
826 | $self->{vp}->set_offset (0, $_[1]); |
798 | }, |
827 | }, |
799 | ; |
828 | ; |
800 | |
829 | |
801 | $self = $class->SUPER::new ( |
830 | $self = $class->SUPER::new ( |
802 | vp => (new CFClient::UI::ViewPort expand => 1), |
831 | vp => (new CFClient::UI::ViewPort expand => 1), |
… | |
… | |
807 | $self->{vp}->add ($self->{scrolled}); |
836 | $self->{vp}->add ($self->{scrolled}); |
808 | $self->add ($self->{vp}); |
837 | $self->add ($self->{vp}); |
809 | $self->add ($self->{slider}); |
838 | $self->add ($self->{slider}); |
810 | |
839 | |
811 | $self |
840 | $self |
|
|
841 | } |
|
|
842 | |
|
|
843 | sub size_allocate { |
|
|
844 | my ($self, $w, $h) = @_; |
|
|
845 | |
|
|
846 | $self->SUPER::size_allocate ($w, $h); |
|
|
847 | |
|
|
848 | my $child = $self->{vp}->child; |
|
|
849 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
812 | } |
850 | } |
813 | |
851 | |
814 | #TODO# update range on size_allocate depending on child |
852 | #TODO# update range on size_allocate depending on child |
815 | # update viewport offset on scroll |
853 | # update viewport offset on scroll |
816 | |
854 | |
… | |
… | |
870 | my $class = shift; |
908 | my $class = shift; |
871 | |
909 | |
872 | # TODO: user_x, user_y, overwrite moveto? |
910 | # TODO: user_x, user_y, overwrite moveto? |
873 | |
911 | |
874 | my $self = $class->SUPER::new ( |
912 | my $self = $class->SUPER::new ( |
875 | bg => [1, 1, 1, 1], |
913 | bg => [1, 1, 1, 1], |
876 | border_bg => [1, 1, 1, 1], |
914 | border_bg => [1, 1, 1, 1], |
877 | border => 0.6, |
915 | border => 0.6, |
878 | toplevel => 1, |
916 | is_toplevel => 1, |
879 | can_events => 1, |
917 | can_events => 1, |
880 | @_ |
918 | @_ |
881 | ); |
919 | ); |
882 | |
920 | |
883 | $self->{title} &&= new CFClient::UI::Label |
921 | $self->{title} &&= new CFClient::UI::Label |
884 | align => 0, |
922 | align => 0, |
… | |
… | |
1466 | active_fg => [0, 0, 0], |
1504 | active_fg => [0, 0, 0], |
1467 | can_hover => 1, |
1505 | can_hover => 1, |
1468 | can_focus => 1, |
1506 | can_focus => 1, |
1469 | valign => 0, |
1507 | valign => 0, |
1470 | can_events => 1, |
1508 | can_events => 1, |
|
|
1509 | #text => ... |
1471 | @_ |
1510 | @_ |
1472 | ) |
1511 | ) |
1473 | } |
1512 | } |
1474 | |
1513 | |
1475 | sub _set_text { |
1514 | sub _set_text { |
… | |
… | |
2045 | my $self = $class->SUPER::new ( |
2084 | my $self = $class->SUPER::new ( |
2046 | fg => [1, 1, 1], |
2085 | fg => [1, 1, 1], |
2047 | active_fg => [0, 0, 0], |
2086 | active_fg => [0, 0, 0], |
2048 | bg => [0, 0, 0, 0.2], |
2087 | bg => [0, 0, 0, 0.2], |
2049 | active_bg => [1, 1, 1, 0.5], |
2088 | active_bg => [1, 1, 1, 0.5], |
2050 | range => [0, 0, 100, 10], |
2089 | range => [0, 0, 100, 10, 0], |
2051 | req_w => $::WIDTH / 80, |
2090 | req_w => $::WIDTH / 80, |
2052 | req_h => $::WIDTH / 80, |
2091 | req_h => $::WIDTH / 80, |
2053 | vertical => 0, |
2092 | vertical => 0, |
2054 | can_hover => 1, |
2093 | can_hover => 1, |
2055 | inner_pad => 0.02, |
2094 | inner_pad => 0.02, |
… | |
… | |
2060 | $self->update; |
2099 | $self->update; |
2061 | |
2100 | |
2062 | $self |
2101 | $self |
2063 | } |
2102 | } |
2064 | |
2103 | |
|
|
2104 | sub set_range { |
|
|
2105 | my ($self, $range) = @_; |
|
|
2106 | |
|
|
2107 | $self->{range} = $range; |
|
|
2108 | |
|
|
2109 | $self->update; |
|
|
2110 | } |
|
|
2111 | |
2065 | sub set_value { |
2112 | sub set_value { |
2066 | my ($self, $value) = @_; |
2113 | my ($self, $value) = @_; |
2067 | |
2114 | |
2068 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2115 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2069 | |
2116 | |
2070 | $hi = $lo + 1 if $hi <= $lo; |
2117 | $hi = $lo + 1 if $hi <= $lo; |
2071 | |
2118 | |
|
|
2119 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2120 | |
2072 | $value = $lo if $value < $lo; |
2121 | $value = $lo if $value < $lo; |
2073 | $value = $hi if $value > $hi; |
2122 | $value = $hi - $page if $value > $hi - $page; |
2074 | |
2123 | |
2075 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2124 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2076 | if $unit; |
2125 | if $unit; |
2077 | |
|
|
2078 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2079 | |
2126 | |
2080 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2127 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2081 | |
2128 | |
2082 | if ($value != $old_value) { |
2129 | if ($value != $old_value) { |
2083 | $self->emit (changed => $value); |
2130 | $self->emit (changed => $value); |
… | |
… | |
2096 | |
2143 | |
2097 | sub button_down { |
2144 | sub button_down { |
2098 | my ($self, $ev, $x, $y) = @_; |
2145 | my ($self, $ev, $x, $y) = @_; |
2099 | |
2146 | |
2100 | $self->SUPER::button_down ($ev, $x, $y); |
2147 | $self->SUPER::button_down ($ev, $x, $y); |
|
|
2148 | |
|
|
2149 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
|
|
2150 | |
2101 | $self->mouse_motion ($ev, $x, $y); |
2151 | $self->mouse_motion ($ev, $x, $y); |
2102 | } |
2152 | } |
2103 | |
2153 | |
2104 | sub mouse_motion { |
2154 | sub mouse_motion { |
2105 | my ($self, $ev, $x, $y) = @_; |
2155 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2107 | if ($GRAB == $self) { |
2157 | if ($GRAB == $self) { |
2108 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2158 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2109 | |
2159 | |
2110 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2160 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2111 | |
2161 | |
2112 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2162 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2113 | |
2163 | |
2114 | $self->set_value ($x * ($hi - $lo) + $lo); |
2164 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2115 | } |
2165 | } |
2116 | } |
2166 | } |
2117 | |
2167 | |
2118 | sub update { |
2168 | sub update { |
2119 | my ($self) = @_; |
2169 | my ($self) = @_; |
2120 | |
2170 | |
2121 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2171 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2122 | $self->set_value ($self->{range}[0]); |
2172 | $self->set_value ($self->{range}[0]); |
2123 | |
2173 | |
2124 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2174 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2175 | my $range = ($hi - $page - $lo) || 1e-100; |
2125 | |
2176 | |
2126 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2177 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2127 | |
2178 | |
2128 | $self->{scale} = ($inner_w / ($hi - $lo)) || 1; |
2179 | $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; |
|
|
2180 | $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; |
2129 | |
2181 | |
2130 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2182 | $value = ($value - $lo) / $range; |
2131 | $value = $self->{scale} * ($value - $lo); |
2183 | $value = $value * $self->{scale} + $self->{offset}; |
2132 | |
2184 | |
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; |
2185 | $self->{knob_x} = $value - $knob_w * 0.5; |
2139 | $self->{knob_w} = $page; |
2186 | $self->{knob_w} = $knob_w; |
2140 | }); |
2187 | }); |
2141 | |
2188 | |
2142 | $self->SUPER::update; |
2189 | $self->SUPER::update; |
2143 | } |
2190 | } |
2144 | |
2191 | |
… | |
… | |
2168 | # draw handle |
2215 | # draw handle |
2169 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2216 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2170 | |
2217 | |
2171 | glDisable GL_TEXTURE_2D; |
2218 | glDisable GL_TEXTURE_2D; |
2172 | } |
2219 | } |
|
|
2220 | |
|
|
2221 | ############################################################################# |
|
|
2222 | |
|
|
2223 | package CFClient::UI::ValSlider; |
|
|
2224 | |
|
|
2225 | our @ISA = CFClient::UI::HBox::; |
|
|
2226 | |
|
|
2227 | sub new { |
|
|
2228 | my ($class, %arg) = @_; |
|
|
2229 | |
|
|
2230 | my $range = delete $arg{range}; |
|
|
2231 | |
|
|
2232 | my $self = $class->SUPER::new ( |
|
|
2233 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2234 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2235 | to_value => sub { shift }, |
|
|
2236 | from_value => sub { shift }, |
|
|
2237 | %arg, |
|
|
2238 | ); |
|
|
2239 | |
|
|
2240 | $self->{slider}->connect (changed => sub { |
|
|
2241 | my ($self, $value) = @_; |
|
|
2242 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2243 | $self->{parent}->emit (changed => $value); |
|
|
2244 | }); |
|
|
2245 | |
|
|
2246 | # $self->{entry}->connect (changed => sub { |
|
|
2247 | # my ($self, $value) = @_; |
|
|
2248 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2249 | # $self->{parent}->emit (changed => $value); |
|
|
2250 | # }); |
|
|
2251 | |
|
|
2252 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2253 | |
|
|
2254 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2255 | |
|
|
2256 | $self |
|
|
2257 | } |
|
|
2258 | |
|
|
2259 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2260 | sub set_value { shift->{slider}->set_value (@_) } |
2173 | |
2261 | |
2174 | ############################################################################# |
2262 | ############################################################################# |
2175 | |
2263 | |
2176 | package CFClient::UI::TextView; |
2264 | package CFClient::UI::TextView; |
2177 | |
2265 | |
… | |
… | |
2207 | |
2295 | |
2208 | $self->{fontsize} = $fontsize; |
2296 | $self->{fontsize} = $fontsize; |
2209 | $self->reflow; |
2297 | $self->reflow; |
2210 | } |
2298 | } |
2211 | |
2299 | |
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 { |
2300 | sub size_allocate { |
2232 | my ($self, $w, $h) = @_; |
2301 | my ($self, $w, $h) = @_; |
2233 | |
2302 | |
2234 | $self->SUPER::size_allocate ($w, $h); |
2303 | $self->SUPER::size_allocate ($w, $h); |
2235 | |
2304 | |
… | |
… | |
2238 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2307 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2239 | |
2308 | |
2240 | $self->reflow; |
2309 | $self->reflow; |
2241 | } |
2310 | } |
2242 | |
2311 | |
|
|
2312 | sub text_size { |
|
|
2313 | my ($self, $text, $indent) = @_; |
|
|
2314 | |
|
|
2315 | my $layout = $self->{layout}; |
|
|
2316 | |
|
|
2317 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2318 | $layout->set_width ($self->{children}[0]{w} - $indent); |
|
|
2319 | $layout->set_markup ($text); |
|
|
2320 | |
|
|
2321 | $layout->size |
|
|
2322 | } |
|
|
2323 | |
|
|
2324 | sub reflow { |
|
|
2325 | my ($self) = @_; |
|
|
2326 | |
|
|
2327 | $self->{need_reflow}++; |
|
|
2328 | $self->update; |
|
|
2329 | } |
|
|
2330 | |
|
|
2331 | sub set_offset { |
|
|
2332 | my ($self, $offset) = @_; |
|
|
2333 | |
|
|
2334 | # todo: base offset on lines or so, not on pixels |
|
|
2335 | $self->{children}[1]->set_value ($offset); |
|
|
2336 | } |
|
|
2337 | |
|
|
2338 | sub clear { |
|
|
2339 | my ($self) = @_; |
|
|
2340 | |
|
|
2341 | $self->{par} = []; |
|
|
2342 | $self->{height} = 0; |
|
|
2343 | $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); |
|
|
2344 | } |
|
|
2345 | |
2243 | sub add_paragraph { |
2346 | sub add_paragraph { |
2244 | my ($self, $color, $text) = @_; |
2347 | my ($self, $color, $text, $indent) = @_; |
2245 | |
2348 | |
2246 | #TODO: intelligently "reformat" paragraph |
2349 | for my $line (split /\n/, $text) { |
2247 | |
2350 | my ($w, $h) = $self->text_size ($line); |
2248 | my $height = $self->text_height ($text); |
|
|
2249 | |
|
|
2250 | $self->{height} += $height; |
2351 | $self->{height} += $h; |
|
|
2352 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
|
|
2353 | } |
2251 | |
2354 | |
2252 | push @{$self->{par}}, [$height, $color, $text]; |
|
|
2253 | |
|
|
2254 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2355 | $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); |
2255 | $self->{children}[1]->update; |
|
|
2256 | } |
2356 | } |
2257 | |
2357 | |
2258 | sub update { |
2358 | sub update { |
2259 | my ($self) = @_; |
2359 | my ($self) = @_; |
2260 | |
2360 | |
… | |
… | |
2263 | return unless $self->{h} > 0; |
2363 | return unless $self->{h} > 0; |
2264 | |
2364 | |
2265 | delete $self->{texture}; |
2365 | delete $self->{texture}; |
2266 | |
2366 | |
2267 | $ROOT->on_post_alloc ($self, sub { |
2367 | $ROOT->on_post_alloc ($self, sub { |
|
|
2368 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2369 | |
2268 | if (delete $self->{need_reflow}) { |
2370 | if (delete $self->{need_reflow}) { |
2269 | my $height = 0; |
2371 | my $height = 0; |
2270 | |
2372 | |
2271 | $height += $_->[0] = $self->text_height ($_->[2]) |
2373 | my $layout = $self->{layout}; |
|
|
2374 | |
|
|
2375 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2376 | |
2272 | for @{$self->{par}}; |
2377 | for (@{$self->{par}}) { |
|
|
2378 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
|
|
2379 | $layout->set_width ($W - $_->[3]); |
|
|
2380 | $layout->set_markup ($_->[4]); |
|
|
2381 | my ($w, $h) = $layout->size; |
|
|
2382 | $_->[0] = $w + $_->[3]; |
|
|
2383 | $_->[1] = $h; |
|
|
2384 | } |
|
|
2385 | |
|
|
2386 | $height += $_->[1]; |
|
|
2387 | } |
2273 | |
2388 | |
2274 | $self->{height} = $height; |
2389 | $self->{height} = $height; |
2275 | |
2390 | |
2276 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2391 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2277 | |
2392 | |
2278 | delete $self->{texture}; |
2393 | delete $self->{texture}; |
2279 | } |
2394 | } |
2280 | |
2395 | |
2281 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2396 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2282 | glClearColor 0.5, 0.5, 0.5, 0; |
2397 | glClearColor 0.5, 0.5, 0.5, 0; |
2283 | glClear GL_COLOR_BUFFER_BIT; |
2398 | glClear GL_COLOR_BUFFER_BIT; |
2284 | |
2399 | |
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]; |
2400 | my $top = int $self->{children}[1]{range}[0]; |
2289 | |
2401 | |
2290 | my $y0 = $top; |
2402 | my $y0 = $top; |
2291 | my $y1 = $top + $self->{h}; |
2403 | my $y1 = $top + $H; |
2292 | |
2404 | |
2293 | my $y = 0; |
2405 | my $y = 0; |
2294 | |
2406 | |
2295 | my $layout = $self->{layout}; |
2407 | my $layout = $self->{layout}; |
2296 | |
2408 | |
2297 | $layout->set_font ($self->{font}) if $self->{font}; |
2409 | $layout->set_font ($self->{font}) if $self->{font}; |
2298 | |
2410 | |
|
|
2411 | glEnable GL_BLEND; |
|
|
2412 | #TODO# not correct in windows where rgba is forced off |
|
|
2413 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2414 | |
2299 | for my $par (@{$self->{par}}) { |
2415 | for my $par (@{$self->{par}}) { |
2300 | my $h = $par->[0]; |
2416 | my $h = $par->[1]; |
2301 | |
2417 | |
2302 | if ($y0 < $y + $h && $y < $y1) { |
2418 | if ($y0 < $y + $h && $y < $y1) { |
2303 | $layout->set_foreground (@{ $par->[1] }); |
2419 | $layout->set_foreground (@{ $par->[2] }); |
|
|
2420 | $layout->set_width ($W - $par->[3]); |
2304 | $layout->set_markup ($par->[2]); |
2421 | $layout->set_markup ($par->[4]); |
2305 | |
2422 | |
2306 | my ($W, $H) = $layout->size; |
2423 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2307 | CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); |
2424 | |
|
|
2425 | glRasterPos $par->[3], $y - $y0; |
|
|
2426 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2308 | } |
2427 | } |
2309 | |
2428 | |
2310 | $y += $h; |
2429 | $y += $h; |
2311 | } |
2430 | } |
2312 | |
2431 | |
2313 | glDisable GL_TEXTURE_2D; |
2432 | glDisable GL_BLEND; |
2314 | }; |
2433 | }; |
2315 | }); |
2434 | }); |
2316 | } |
2435 | } |
2317 | |
2436 | |
2318 | sub _draw { |
2437 | sub _draw { |
… | |
… | |
2515 | |
2634 | |
2516 | sub size_request { |
2635 | sub size_request { |
2517 | (32, 8) |
2636 | (32, 8) |
2518 | } |
2637 | } |
2519 | |
2638 | |
|
|
2639 | sub update { |
|
|
2640 | my ($self) = @_; |
|
|
2641 | |
|
|
2642 | return unless $self->{visible}; |
|
|
2643 | |
|
|
2644 | $self->SUPER::update; |
|
|
2645 | } |
|
|
2646 | |
2520 | sub _draw { |
2647 | sub _draw { |
2521 | my ($self) = @_; |
2648 | my ($self) = @_; |
2522 | |
2649 | |
2523 | return unless $::CONN;#d# manage and cache textures differently |
2650 | return unless $::CONN; |
2524 | |
2651 | |
2525 | my $face; |
2652 | my $face; |
2526 | |
2653 | |
2527 | if ($self->{frame}) { |
2654 | if ($self->{frame}) { |
2528 | my $anim = $::CONN->{anim}[$self->{anim}]; |
2655 | my $anim = $::CONN->{anim}[$self->{anim}]; |
… | |
… | |
2594 | |
2721 | |
2595 | my $self = $class->SUPER::new ( |
2722 | my $self = $class->SUPER::new ( |
2596 | can_hover => 1, |
2723 | can_hover => 1, |
2597 | can_events => 1, |
2724 | can_events => 1, |
2598 | tooltip => ((CFClient::UI::Label::escape $desc) |
2725 | tooltip => ((CFClient::UI::Label::escape $desc) |
2599 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
2726 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
2600 | connect_button_down => sub { |
2727 | connect_button_down => sub { |
2601 | my ($self, $ev, $x, $y) = @_; |
2728 | my ($self, $ev, $x, $y) = @_; |
2602 | |
2729 | |
2603 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2730 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2604 | if ($ev->{button} == 1) { |
2731 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
2605 | my $targ = $::CONN->{player}{tag}; |
2732 | my $targ = $::CONN->{player}{tag}; |
2606 | |
2733 | |
2607 | if ($item->{container} == $::CONN->{player}{tag}) { |
2734 | if ($item->{container} == $::CONN->{player}{tag}) { |
2608 | $targ = $main::OPENCONT; |
2735 | $targ = $main::OPENCONT; |
2609 | } |
2736 | } |
2610 | |
2737 | |
2611 | $::CONN->send ("move $targ $item->{tag} 0"); |
2738 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2739 | } elsif ($ev->{button} == 1) { |
|
|
2740 | $::CONN->send ("examine $item->{tag}"); |
2612 | } elsif ($ev->{button} == 2) { |
2741 | } elsif ($ev->{button} == 2) { |
2613 | $::CONN->send ("apply $item->{tag}"); |
2742 | $::CONN->send ("apply $item->{tag}"); |
2614 | } elsif ($ev->{button} == 3) { |
2743 | } elsif ($ev->{button} == 3) { |
2615 | my @menu_items = ( |
2744 | my @menu_items = ( |
2616 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2745 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2617 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
2746 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
2618 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
2747 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2748 | ( |
|
|
2749 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2750 | ? ( |
|
|
2751 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2752 | ) |
|
|
2753 | : ( |
|
|
2754 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
2619 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2755 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2620 | [ |
2756 | ) |
2621 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
2622 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
2623 | ], |
2757 | ), |
2624 | ); |
2758 | ); |
2625 | |
2759 | |
2626 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2760 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2627 | } |
2761 | } |
2628 | |
2762 | |
… | |
… | |
2664 | |
2798 | |
2665 | sub new { |
2799 | sub new { |
2666 | my $class = shift; |
2800 | my $class = shift; |
2667 | |
2801 | |
2668 | my $self = $class->SUPER::new ( |
2802 | my $self = $class->SUPER::new ( |
2669 | scrolled => (new CFClient::UI::VBox), |
2803 | scrolled => (new CFClient::UI::Table), |
2670 | @_, |
2804 | @_, |
2671 | ); |
2805 | ); |
2672 | |
2806 | |
2673 | $self |
2807 | $self |
2674 | } |
2808 | } |
… | |
… | |
2685 | } @$items; |
2819 | } @$items; |
2686 | |
2820 | |
2687 | $self->{real_items} = \@items; |
2821 | $self->{real_items} = \@items; |
2688 | |
2822 | |
2689 | for my $item (@items) { |
2823 | for my $item (@items) { |
|
|
2824 | $item->{item} = $item; |
2690 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2825 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2691 | $item->update_item (); |
2826 | $item->update_item (); |
2692 | } |
2827 | } |
2693 | |
2828 | |
|
|
2829 | my $i = 0; |
|
|
2830 | for (@items) { |
2694 | $self->{scrolled}->add (@items); |
2831 | $self->{scrolled}->add (0, $i, $_); |
|
|
2832 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2833 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2834 | } |
2695 | |
2835 | |
2696 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2836 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2697 | } |
2837 | } |
2698 | |
2838 | |
2699 | sub size_request { |
2839 | sub size_request { |
… | |
… | |
2918 | } |
3058 | } |
2919 | |
3059 | |
2920 | sub size_allocate { |
3060 | sub size_allocate { |
2921 | my ($self, $w, $h) = @_; |
3061 | my ($self, $w, $h) = @_; |
2922 | |
3062 | |
2923 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
2924 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
2925 | |
|
|
2926 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
2927 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
2928 | |
|
|
2929 | for my $child ($self->children) { |
3063 | for my $child ($self->children) { |
2930 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3064 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2931 | |
3065 | |
2932 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3066 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
2933 | if exists $child->{req_x}; |
3067 | if exists $child->{req_x}; |
… | |
… | |
2962 | } |
3096 | } |
2963 | |
3097 | |
2964 | sub add { |
3098 | sub add { |
2965 | my ($self, @children) = @_; |
3099 | my ($self, @children) = @_; |
2966 | |
3100 | |
|
|
3101 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3102 | push @widgets, $w->children; |
|
|
3103 | $w->{root} = $self; |
|
|
3104 | $w->{visible} = 1; |
|
|
3105 | } |
|
|
3106 | |
2967 | for my $child (@children) { |
3107 | for my $child (@children) { |
2968 | $child->{toplevel} = 1; |
3108 | $child->{is_toplevel} = 1; |
2969 | |
3109 | |
2970 | # integerise window positions |
3110 | # integerise window positions |
2971 | $child->{x} = int $child->{x}; |
3111 | $child->{x} = int $child->{x}; |
2972 | $child->{y} = int $child->{y}; |
3112 | $child->{y} = int $child->{y}; |
2973 | } |
3113 | } |
2974 | |
3114 | |
2975 | $self->SUPER::add (@children); |
3115 | $self->SUPER::add (@children); |
|
|
3116 | } |
|
|
3117 | |
|
|
3118 | sub remove { |
|
|
3119 | my ($self, @children) = @_; |
|
|
3120 | |
|
|
3121 | $self->SUPER::remove (@children); |
|
|
3122 | |
|
|
3123 | while (@children) { |
|
|
3124 | my $w = pop @children; |
|
|
3125 | push @children, $w->children; |
|
|
3126 | delete $w->{visible}; |
|
|
3127 | } |
2976 | } |
3128 | } |
2977 | |
3129 | |
2978 | sub on_refresh { |
3130 | sub on_refresh { |
2979 | my ($self, $id, $cb) = @_; |
3131 | my ($self, $id, $cb) = @_; |
2980 | |
3132 | |
… | |
… | |
3049 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3201 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3050 | glClear GL_COLOR_BUFFER_BIT; |
3202 | glClear GL_COLOR_BUFFER_BIT; |
3051 | |
3203 | |
3052 | glMatrixMode GL_PROJECTION; |
3204 | glMatrixMode GL_PROJECTION; |
3053 | glLoadIdentity; |
3205 | glLoadIdentity; |
3054 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3206 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
3055 | glMatrixMode GL_MODELVIEW; |
3207 | glMatrixMode GL_MODELVIEW; |
3056 | glLoadIdentity; |
3208 | glLoadIdentity; |
3057 | |
3209 | |
3058 | $self->_draw; |
3210 | $self->_draw; |
3059 | } |
3211 | } |