… | |
… | |
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 | |
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) = @_; |
144 | |
152 | |
|
|
153 | # make a copy, otherwise for complains about freed values. |
145 | for my $widget (values %WIDGET) { |
154 | my @widgets = values %WIDGET; |
|
|
155 | |
|
|
156 | for my $widget (@widgets) { |
146 | if ($widget->{toplevel}) { |
157 | if ($widget->{toplevel}) { |
147 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
148 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
159 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
149 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
160 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
150 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
161 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
… | |
… | |
195 | %$self = (); |
206 | %$self = (); |
196 | } |
207 | } |
197 | |
208 | |
198 | sub show { |
209 | sub show { |
199 | my ($self) = @_; |
210 | my ($self) = @_; |
200 | |
|
|
201 | return if $self->{parent}; |
211 | return if $self->{parent}; |
202 | |
212 | |
203 | $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 | ); |
204 | } |
227 | } |
205 | |
228 | |
206 | sub hide { |
229 | sub hide { |
207 | my ($self) = @_; |
230 | my ($self) = @_; |
208 | |
231 | |
… | |
… | |
416 | Scalar::Util::weaken ($self->{parent} = $parent); |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
417 | |
440 | |
418 | # TODO: req_w _does_change after ->reconfigure |
441 | # TODO: req_w _does_change after ->reconfigure |
419 | $self->check_size |
442 | $self->check_size |
420 | unless exists $self->{req_w}; |
443 | unless exists $self->{req_w}; |
|
|
444 | |
|
|
445 | $self->show; |
421 | } |
446 | } |
422 | |
447 | |
423 | sub check_size { |
448 | sub check_size { |
424 | my ($self, $forced) = @_; |
449 | my ($self, $forced) = @_; |
425 | |
450 | |
… | |
… | |
688 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
713 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
689 | glClearColor 0, 0, 0, 0; |
714 | glClearColor 0, 0, 0, 0; |
690 | glClear GL_COLOR_BUFFER_BIT; |
715 | glClear GL_COLOR_BUFFER_BIT; |
691 | |
716 | |
692 | $self->_render; |
717 | $self->_render; |
693 | # glColorMask 1, 1, 1, 0; |
|
|
694 | # glEnable GL_BLEND; |
|
|
695 | # glBlendFunc GL_SRC_ALPHA, GL_ZERO; |
|
|
696 | # glRasterPos 0, 0; |
|
|
697 | # glCopyPixels 0, 0, $self->{w}, $self->{h}; |
|
|
698 | # glDisable GL_BLEND; |
|
|
699 | # glColorMask 1, 1, 1, 1; |
|
|
700 | }; |
718 | }; |
701 | } |
719 | } |
702 | |
720 | |
703 | sub _draw { |
721 | sub _draw { |
704 | my ($self) = @_; |
722 | my ($self) = @_; |
… | |
… | |
708 | my $tex = $self->{texture} |
726 | my $tex = $self->{texture} |
709 | or return; |
727 | or return; |
710 | |
728 | |
711 | glEnable GL_TEXTURE_2D; |
729 | glEnable GL_TEXTURE_2D; |
712 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
730 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
713 | glColor 0, 0, 0, 1; |
731 | glColor 1, 1, 1, 1; |
714 | |
732 | |
715 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
733 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
716 | |
734 | |
717 | glDisable GL_TEXTURE_2D; |
735 | glDisable GL_TEXTURE_2D; |
718 | } |
736 | } |
… | |
… | |
725 | |
743 | |
726 | sub size_request { |
744 | sub size_request { |
727 | my ($self) = @_; |
745 | my ($self) = @_; |
728 | |
746 | |
729 | @$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)}; |
730 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
731 | |
748 | |
732 | @$self{qw(child_w child_h)} |
749 | @$self{qw(child_w child_h)} |
733 | } |
750 | } |
734 | |
751 | |
735 | sub size_allocate { |
752 | sub size_allocate { |
736 | my ($self, $w, $h) = @_; |
753 | my ($self, $w, $h) = @_; |
737 | |
754 | |
|
|
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
|
|
756 | # $w = $self->{w}; |
|
|
757 | $self->child->configure (0, 0, $cw, $ch); |
738 | $self->update; |
758 | $self->update; |
739 | } |
759 | } |
740 | |
760 | |
741 | sub set_offset { |
761 | sub set_offset { |
742 | my ($self, $x, $y) = @_; |
762 | my ($self, $x, $y) = @_; |
… | |
… | |
801 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
821 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
802 | }, |
822 | }, |
803 | ; |
823 | ; |
804 | |
824 | |
805 | $self = $class->SUPER::new ( |
825 | $self = $class->SUPER::new ( |
806 | vp => (new CFClient::UI::ViewPort), |
826 | vp => (new CFClient::UI::ViewPort expand => 1), |
807 | slider => $slider, |
827 | slider => $slider, |
808 | @_, |
828 | @_, |
809 | ); |
829 | ); |
810 | |
830 | |
811 | $self->{vp}->add ($self->{scrolled}); |
831 | $self->{vp}->add ($self->{scrolled}); |
… | |
… | |
1297 | #bg => none |
1317 | #bg => none |
1298 | #active_bg => none |
1318 | #active_bg => none |
1299 | #font => default_font |
1319 | #font => default_font |
1300 | #text => initial text |
1320 | #text => initial text |
1301 | #markup => initial narkup |
1321 | #markup => initial narkup |
|
|
1322 | #max_w => maximum pixel width |
|
|
1323 | ellipsise => 3, # end |
1302 | layout => (new CFClient::Layout), |
1324 | layout => (new CFClient::Layout), |
1303 | fontsize => 1, |
1325 | fontsize => 1, |
1304 | align => -1, |
1326 | align => -1, |
1305 | valign => -1, |
1327 | valign => -1, |
1306 | padding => 2, |
1328 | padding => 2, |
… | |
… | |
1371 | sub size_request { |
1393 | sub size_request { |
1372 | my ($self) = @_; |
1394 | my ($self) = @_; |
1373 | |
1395 | |
1374 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1396 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1375 | $self->{layout}->set_width ($self->{max_w} || -1); |
1397 | $self->{layout}->set_width ($self->{max_w} || -1); |
|
|
1398 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1399 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1376 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1400 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1377 | |
1401 | |
1378 | my ($w, $h) = $self->{layout}->size; |
1402 | my ($w, $h) = $self->{layout}->size; |
1379 | |
1403 | |
1380 | if (exists $self->{template}) { |
1404 | if (exists $self->{template}) { |
… | |
… | |
1416 | |
1440 | |
1417 | my $tex = $self->{texture} ||= do { |
1441 | my $tex = $self->{texture} ||= do { |
1418 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1442 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1419 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1443 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1420 | $self->{layout}->set_width ($self->{w}); |
1444 | $self->{layout}->set_width ($self->{w}); |
|
|
1445 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1446 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1421 | $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); |
1447 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1422 | |
1448 | |
1423 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1449 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1424 | |
1450 | |
1425 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1451 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1426 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1452 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
… | |
… | |
1464 | active_fg => [0, 0, 0], |
1490 | active_fg => [0, 0, 0], |
1465 | can_hover => 1, |
1491 | can_hover => 1, |
1466 | can_focus => 1, |
1492 | can_focus => 1, |
1467 | valign => 0, |
1493 | valign => 0, |
1468 | can_events => 1, |
1494 | can_events => 1, |
|
|
1495 | #text => ... |
1469 | @_ |
1496 | @_ |
1470 | ) |
1497 | ) |
1471 | } |
1498 | } |
1472 | |
1499 | |
1473 | sub _set_text { |
1500 | sub _set_text { |
… | |
… | |
2048 | range => [0, 0, 100, 10], |
2075 | range => [0, 0, 100, 10], |
2049 | req_w => $::WIDTH / 80, |
2076 | req_w => $::WIDTH / 80, |
2050 | req_h => $::WIDTH / 80, |
2077 | req_h => $::WIDTH / 80, |
2051 | vertical => 0, |
2078 | vertical => 0, |
2052 | can_hover => 1, |
2079 | can_hover => 1, |
2053 | inner_pad => .05, |
2080 | inner_pad => 0.02, |
2054 | @_ |
2081 | @_ |
2055 | ); |
2082 | ); |
2056 | |
2083 | |
2057 | $self->set_value ($self->{range}[0]); |
2084 | $self->set_value ($self->{range}[0]); |
2058 | $self->update; |
2085 | $self->update; |
2059 | |
2086 | |
2060 | $self |
2087 | $self |
|
|
2088 | } |
|
|
2089 | |
|
|
2090 | sub set_range { |
|
|
2091 | my ($self, $range) = @_; |
|
|
2092 | |
|
|
2093 | $self->{range} = $range; |
|
|
2094 | |
|
|
2095 | $self->update; |
2061 | } |
2096 | } |
2062 | |
2097 | |
2063 | sub set_value { |
2098 | sub set_value { |
2064 | my ($self, $value) = @_; |
2099 | my ($self, $value) = @_; |
2065 | |
2100 | |
… | |
… | |
2148 | glScale $self->{w}, $self->{h}; |
2183 | glScale $self->{w}, $self->{h}; |
2149 | |
2184 | |
2150 | if ($self->{vertical}) { |
2185 | if ($self->{vertical}) { |
2151 | # draw a vertical slider like a rotated horizontal slider |
2186 | # draw a vertical slider like a rotated horizontal slider |
2152 | |
2187 | |
|
|
2188 | glTranslate 1, 0, 0; |
2153 | glRotate 90, 0, 0, 1; |
2189 | glRotate 90, 0, 0, 1; |
2154 | glTranslate 0, 1, 0; |
|
|
2155 | } |
2190 | } |
2156 | |
2191 | |
2157 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2192 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2158 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2193 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2159 | |
2194 | |
… | |
… | |
2166 | # draw handle |
2201 | # draw handle |
2167 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2202 | $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); |
2168 | |
2203 | |
2169 | glDisable GL_TEXTURE_2D; |
2204 | glDisable GL_TEXTURE_2D; |
2170 | } |
2205 | } |
|
|
2206 | |
|
|
2207 | ############################################################################# |
|
|
2208 | |
|
|
2209 | package CFClient::UI::ValSlider; |
|
|
2210 | |
|
|
2211 | our @ISA = CFClient::UI::HBox::; |
|
|
2212 | |
|
|
2213 | sub new { |
|
|
2214 | my ($class, %arg) = @_; |
|
|
2215 | |
|
|
2216 | my $range = delete $arg{range}; |
|
|
2217 | |
|
|
2218 | my $self = $class->SUPER::new ( |
|
|
2219 | slider => (new CFClient::UI::Slider expand => 1, range => $range), |
|
|
2220 | entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), |
|
|
2221 | to_value => sub { shift }, |
|
|
2222 | from_value => sub { shift }, |
|
|
2223 | %arg, |
|
|
2224 | ); |
|
|
2225 | |
|
|
2226 | $self->{slider}->connect (changed => sub { |
|
|
2227 | my ($self, $value) = @_; |
|
|
2228 | $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); |
|
|
2229 | $self->{parent}->emit (changed => $value); |
|
|
2230 | }); |
|
|
2231 | |
|
|
2232 | # $self->{entry}->connect (changed => sub { |
|
|
2233 | # my ($self, $value) = @_; |
|
|
2234 | # $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); |
|
|
2235 | # $self->{parent}->emit (changed => $value); |
|
|
2236 | # }); |
|
|
2237 | |
|
|
2238 | $self->add ($self->{slider}, $self->{entry}); |
|
|
2239 | |
|
|
2240 | $self->{slider}->emit (changed => $self->{slider}{range}[0]); |
|
|
2241 | |
|
|
2242 | $self |
|
|
2243 | } |
|
|
2244 | |
|
|
2245 | sub set_range { shift->{slider}->set_range (@_) } |
|
|
2246 | sub set_value { shift->{slider}->set_value (@_) } |
2171 | |
2247 | |
2172 | ############################################################################# |
2248 | ############################################################################# |
2173 | |
2249 | |
2174 | package CFClient::UI::TextView; |
2250 | package CFClient::UI::TextView; |
2175 | |
2251 | |
… | |
… | |
2205 | |
2281 | |
2206 | $self->{fontsize} = $fontsize; |
2282 | $self->{fontsize} = $fontsize; |
2207 | $self->reflow; |
2283 | $self->reflow; |
2208 | } |
2284 | } |
2209 | |
2285 | |
|
|
2286 | sub size_allocate { |
|
|
2287 | my ($self, $w, $h) = @_; |
|
|
2288 | |
|
|
2289 | $self->SUPER::size_allocate ($w, $h); |
|
|
2290 | |
|
|
2291 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
|
|
2292 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2293 | $self->{layout}->set_width ($self->{children}[0]{w}); |
|
|
2294 | |
|
|
2295 | $self->reflow; |
|
|
2296 | } |
|
|
2297 | |
2210 | sub text_height { |
2298 | sub text_height { |
2211 | my ($self, $text) = @_; |
2299 | my ($self, $text, $indent) = @_; |
2212 | |
2300 | |
2213 | my $layout = $self->{layout}; |
2301 | my $layout = $self->{layout}; |
2214 | |
2302 | |
2215 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2303 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2216 | $layout->set_width ($self->{children}[0]{w}); |
2304 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2217 | $layout->set_markup ($text); |
2305 | $layout->set_markup ($text); |
2218 | |
2306 | |
2219 | ($layout->size)[1] |
2307 | ($layout->size)[1] |
2220 | } |
2308 | } |
2221 | |
2309 | |
… | |
… | |
2224 | |
2312 | |
2225 | $self->{need_reflow}++; |
2313 | $self->{need_reflow}++; |
2226 | $self->update; |
2314 | $self->update; |
2227 | } |
2315 | } |
2228 | |
2316 | |
2229 | sub size_allocate { |
2317 | sub clear { |
2230 | my ($self, $w, $h) = @_; |
2318 | my ($self) = @_; |
2231 | |
2319 | |
2232 | $self->SUPER::size_allocate ($w, $h); |
2320 | $self->{par} = []; |
2233 | |
2321 | $self->{height} = 0; |
2234 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
|
|
2235 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2236 | $self->{layout}->set_width ($self->{children}[0]{w}); |
|
|
2237 | |
2322 | |
2238 | $self->reflow; |
2323 | $self->reflow; |
2239 | } |
2324 | } |
2240 | |
2325 | |
2241 | sub add_paragraph { |
2326 | sub add_paragraph { |
2242 | my ($self, $color, $text) = @_; |
2327 | my ($self, $color, $text, $indent) = @_; |
2243 | |
2328 | |
2244 | #TODO: intelligently "reformat" paragraph |
2329 | for my $line (split /\n/, $text) { |
2245 | |
|
|
2246 | my $height = $self->text_height ($text); |
2330 | my $height = $self->text_height ($line); |
2247 | |
|
|
2248 | $self->{height} += $height; |
2331 | $self->{height} += $height; |
2249 | |
|
|
2250 | push @{$self->{par}}, [$height, $color, $text]; |
2332 | push @{$self->{par}}, [$height, $color, $indent, $line]; |
|
|
2333 | } |
2251 | |
2334 | |
2252 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2335 | $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; |
2253 | $self->{children}[1]->update; |
2336 | $self->{children}[1]->update; |
2254 | } |
2337 | } |
2255 | |
2338 | |
… | |
… | |
2264 | |
2347 | |
2265 | $ROOT->on_post_alloc ($self, sub { |
2348 | $ROOT->on_post_alloc ($self, sub { |
2266 | if (delete $self->{need_reflow}) { |
2349 | if (delete $self->{need_reflow}) { |
2267 | my $height = 0; |
2350 | my $height = 0; |
2268 | |
2351 | |
2269 | $height += $_->[0] = $self->text_height ($_->[2]) |
2352 | $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) |
2270 | for @{$self->{par}}; |
2353 | for @{$self->{par}}; |
2271 | |
2354 | |
2272 | $self->{height} = $height; |
2355 | $self->{height} = $height; |
2273 | |
2356 | |
2274 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2357 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
|
|
2358 | $self->{children}[1]->update; |
2275 | |
2359 | |
2276 | delete $self->{texture}; |
2360 | delete $self->{texture}; |
2277 | } |
2361 | } |
2278 | |
2362 | |
2279 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2363 | $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { |
2280 | glClearColor 0, 0, 0, 0; |
2364 | glClearColor 0.5, 0.5, 0.5, 0; |
2281 | glClear GL_COLOR_BUFFER_BIT; |
2365 | glClear GL_COLOR_BUFFER_BIT; |
2282 | |
|
|
2283 | glEnable GL_TEXTURE_2D; |
|
|
2284 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
2285 | |
2366 | |
2286 | my $top = int $self->{children}[1]{range}[0]; |
2367 | my $top = int $self->{children}[1]{range}[0]; |
2287 | |
2368 | |
2288 | my $y0 = $top; |
2369 | my $y0 = $top; |
2289 | my $y1 = $top + $self->{h}; |
2370 | my $y1 = $top + $self->{h}; |
… | |
… | |
2292 | |
2373 | |
2293 | my $layout = $self->{layout}; |
2374 | my $layout = $self->{layout}; |
2294 | |
2375 | |
2295 | $layout->set_font ($self->{font}) if $self->{font}; |
2376 | $layout->set_font ($self->{font}) if $self->{font}; |
2296 | |
2377 | |
|
|
2378 | glEnable GL_BLEND; |
|
|
2379 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2380 | |
2297 | for my $par (@{$self->{par}}) { |
2381 | for my $par (@{$self->{par}}) { |
2298 | my $h = $par->[0]; |
2382 | my $h = $par->[0]; |
2299 | |
2383 | |
2300 | if ($y0 < $y + $h && $y < $y1) { |
2384 | if ($y0 < $y + $h && $y < $y1) { |
2301 | $layout->set_foreground (@{ $par->[1] }); |
2385 | $layout->set_foreground (@{ $par->[1] }); |
|
|
2386 | $layout->set_width ($self->{w} - $par->[2]); |
2302 | $layout->set_markup ($par->[2]); |
2387 | $layout->set_markup ($par->[3]); |
2303 | |
2388 | |
2304 | my ($W, $H) = $layout->size; |
2389 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2305 | CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); |
2390 | |
|
|
2391 | glRasterPos $par->[2], $y - $y0; |
|
|
2392 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
2306 | } |
2393 | } |
2307 | |
2394 | |
2308 | $y += $h; |
2395 | $y += $h; |
2309 | } |
2396 | } |
2310 | |
2397 | |
2311 | glDisable GL_TEXTURE_2D; |
2398 | glDisable GL_BLEND; |
2312 | }; |
2399 | }; |
2313 | }); |
2400 | }); |
2314 | } |
2401 | } |
2315 | |
2402 | |
2316 | sub _draw { |
2403 | sub _draw { |
2317 | my ($self) = @_; |
2404 | my ($self) = @_; |
2318 | |
2405 | |
2319 | glEnable GL_TEXTURE_2D; |
2406 | glEnable GL_TEXTURE_2D; |
2320 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2407 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2321 | glColor 1, 1, 1, 1; |
2408 | glColor 1, 1, 1, 1; |
2322 | $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2409 | $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2323 | glDisable GL_TEXTURE_2D; |
2410 | glDisable GL_TEXTURE_2D; |
2324 | |
2411 | |
2325 | $self->{children}[1]->draw; |
2412 | $self->{children}[1]->draw; |
2326 | |
2413 | |
2327 | } |
2414 | } |
… | |
… | |
2426 | |
2513 | |
2427 | sub set_tooltip_from { |
2514 | sub set_tooltip_from { |
2428 | my ($self, $widget) = @_; |
2515 | my ($self, $widget) = @_; |
2429 | |
2516 | |
2430 | $self->add (new CFClient::UI::Label |
2517 | $self->add (new CFClient::UI::Label |
2431 | markup => $widget->{tooltip}, |
2518 | markup => $widget->{tooltip}, |
2432 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2519 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2433 | fontsize => 0.8, |
2520 | fontsize => 0.8, |
2434 | fg => [0, 0, 0, 1], |
2521 | fg => [0, 0, 0, 1], |
|
|
2522 | ellipsise => 0, |
2435 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2523 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2436 | ); |
2524 | ); |
2437 | } |
2525 | } |
2438 | |
2526 | |
2439 | sub size_request { |
2527 | sub size_request { |
2440 | my ($self) = @_; |
2528 | my ($self) = @_; |
… | |
… | |
2486 | use CFClient::OpenGL; |
2574 | use CFClient::OpenGL; |
2487 | |
2575 | |
2488 | sub new { |
2576 | sub new { |
2489 | my $class = shift; |
2577 | my $class = shift; |
2490 | |
2578 | |
2491 | $class->SUPER::new ( |
2579 | my $self = $class->SUPER::new ( |
2492 | aspect => 1, |
2580 | aspect => 1, |
2493 | @_, |
2581 | @_, |
2494 | ) |
2582 | ); |
|
|
2583 | |
|
|
2584 | if ($self->{anim} && $self->{animspeed}) { |
|
|
2585 | Scalar::Util::weaken (my $widget = $self); |
|
|
2586 | |
|
|
2587 | $self->{timer} = Event->timer ( |
|
|
2588 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
2589 | hard => 1, |
|
|
2590 | interval => $self->{animspeed}, |
|
|
2591 | cb => sub { |
|
|
2592 | ++$widget->{frame}; |
|
|
2593 | $widget->update; |
|
|
2594 | }, |
|
|
2595 | ); |
|
|
2596 | } |
|
|
2597 | |
|
|
2598 | $self |
2495 | } |
2599 | } |
2496 | |
2600 | |
2497 | sub size_request { |
2601 | sub size_request { |
2498 | (32, 8) |
2602 | (32, 8) |
2499 | } |
2603 | } |
2500 | |
2604 | |
|
|
2605 | sub update { |
|
|
2606 | my ($self) = @_; |
|
|
2607 | |
|
|
2608 | return unless $self->{visible}; |
|
|
2609 | |
|
|
2610 | $self->SUPER::update; |
|
|
2611 | } |
|
|
2612 | |
2501 | sub _draw { |
2613 | sub _draw { |
2502 | my ($self) = @_; |
2614 | my ($self) = @_; |
2503 | |
2615 | |
2504 | return unless $::CONN;#d# manage and cache textures differently |
2616 | return unless $::CONN;#d# manage and cache textures differently |
|
|
2617 | |
|
|
2618 | my $face; |
|
|
2619 | |
|
|
2620 | if ($self->{frame}) { |
|
|
2621 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
2622 | |
|
|
2623 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
2624 | if $anim && @$anim; |
|
|
2625 | } |
|
|
2626 | |
2505 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; |
2627 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2506 | |
2628 | |
2507 | # TODO animation |
|
|
2508 | if ($tex) { |
2629 | if ($tex) { |
2509 | glEnable GL_TEXTURE_2D; |
2630 | glEnable GL_TEXTURE_2D; |
2510 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2631 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2511 | glColor 1, 1, 1, 1; |
2632 | glColor 1, 1, 1, 1; |
2512 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2633 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2513 | glDisable GL_TEXTURE_2D; |
2634 | glDisable GL_TEXTURE_2D; |
2514 | } |
2635 | } |
2515 | } |
2636 | } |
2516 | |
2637 | |
|
|
2638 | sub DESTROY { |
|
|
2639 | my ($self) = @_; |
|
|
2640 | |
|
|
2641 | $self->{timer}->cancel |
|
|
2642 | if $self->{timer}; |
|
|
2643 | |
|
|
2644 | $self->SUPER::DESTROY; |
|
|
2645 | } |
|
|
2646 | |
2517 | ############################################################################# |
2647 | ############################################################################# |
2518 | |
2648 | |
2519 | package CFClient::UI::InventoryItem; |
2649 | package CFClient::UI::InventoryItem; |
2520 | |
2650 | |
2521 | our @ISA = CFClient::UI::HBox::; |
2651 | our @ISA = CFClient::UI::HBox::; |
… | |
… | |
2524 | my ($item) = @_; |
2654 | my ($item) = @_; |
2525 | |
2655 | |
2526 | my $desc = |
2656 | my $desc = |
2527 | $item->{nrof} < 2 |
2657 | $item->{nrof} < 2 |
2528 | ? $item->{name} |
2658 | ? $item->{name} |
2529 | : "$item->{nrof} $item->{name_pl}"; |
2659 | : "$item->{nrof} × $item->{name_pl}"; |
2530 | |
2660 | |
2531 | $item->{flags} & Crossfire::Protocol::F_OPEN |
2661 | $item->{flags} & Crossfire::Protocol::F_OPEN |
2532 | and $desc .= " (open)"; |
2662 | and $desc .= " (open)"; |
2533 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
2663 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
2534 | and $desc .= " (applied)"; |
2664 | and $desc .= " (applied)"; |
… | |
… | |
2554 | my $item = delete $args{item}; |
2684 | my $item = delete $args{item}; |
2555 | |
2685 | |
2556 | my $desc = _item_to_desc ($item); |
2686 | my $desc = _item_to_desc ($item); |
2557 | |
2687 | |
2558 | my $self = $class->SUPER::new ( |
2688 | my $self = $class->SUPER::new ( |
2559 | can_hover => 1, |
2689 | can_hover => 1, |
2560 | can_events => 1, |
2690 | can_events => 1, |
2561 | tooltip => ((CFClient::UI::Label::escape $desc) |
2691 | tooltip => ((CFClient::UI::Label::escape $desc) |
2562 | . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), |
2692 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
2563 | connect_button_down => sub { |
2693 | connect_button_down => sub { |
2564 | my ($self, $ev, $x, $y) = @_; |
2694 | my ($self, $ev, $x, $y) = @_; |
2565 | |
2695 | |
2566 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2696 | # todo: maybe put examine on 1? but should just be a tooltip :( |
2567 | if ($ev->{button} == 1) { |
2697 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
2568 | my $targ = $::CONN->{player}{tag}; |
2698 | my $targ = $::CONN->{player}{tag}; |
2569 | |
2699 | |
2570 | if ($item->{container} == $::CONN->{player}{tag}) { |
2700 | if ($item->{container} == $::CONN->{player}{tag}) { |
2571 | $targ = $main::OPENCONT; |
2701 | $targ = $main::OPENCONT; |
2572 | } |
2702 | } |
2573 | |
2703 | |
2574 | $::CONN->send ("move $targ $item->{tag} 0"); |
2704 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2705 | } elsif ($ev->{button} == 1) { |
|
|
2706 | $::CONN->send ("examine $item->{tag}"); |
2575 | } elsif ($ev->{button} == 2) { |
2707 | } elsif ($ev->{button} == 2) { |
2576 | $::CONN->send ("apply $item->{tag}"); |
2708 | $::CONN->send ("apply $item->{tag}"); |
2577 | } elsif ($ev->{button} == 3) { |
2709 | } elsif ($ev->{button} == 3) { |
2578 | my @menu_items = ( |
2710 | my @menu_items = ( |
2579 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2711 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2580 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
2712 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
2581 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
2713 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2714 | ( |
|
|
2715 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2716 | ? ( |
|
|
2717 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2718 | ) |
|
|
2719 | : ( |
|
|
2720 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
2582 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2721 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2583 | [ |
2722 | ) |
2584 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
2585 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
2586 | ], |
2723 | ), |
2587 | ); |
2724 | ); |
2588 | |
2725 | |
2589 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2726 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2590 | } |
2727 | } |
2591 | |
2728 | |
… | |
… | |
2627 | |
2764 | |
2628 | sub new { |
2765 | sub new { |
2629 | my $class = shift; |
2766 | my $class = shift; |
2630 | |
2767 | |
2631 | my $self = $class->SUPER::new ( |
2768 | my $self = $class->SUPER::new ( |
2632 | scrolled => (new CFClient::UI::VBox), |
2769 | scrolled => (new CFClient::UI::Table), |
2633 | @_, |
2770 | @_, |
2634 | ); |
2771 | ); |
2635 | |
2772 | |
2636 | $self |
2773 | $self |
2637 | } |
2774 | } |
… | |
… | |
2648 | } @$items; |
2785 | } @$items; |
2649 | |
2786 | |
2650 | $self->{real_items} = \@items; |
2787 | $self->{real_items} = \@items; |
2651 | |
2788 | |
2652 | for my $item (@items) { |
2789 | for my $item (@items) { |
|
|
2790 | $item->{item} = $item; |
2653 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2791 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2654 | $item->update_item (); |
2792 | $item->update_item (); |
2655 | } |
2793 | } |
2656 | |
2794 | |
|
|
2795 | my $i = 0; |
|
|
2796 | for (@items) { |
2657 | $self->{scrolled}->add (@items); |
2797 | $self->{scrolled}->add (0, $i, $_); |
|
|
2798 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2799 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2800 | } |
2658 | |
2801 | |
2659 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2802 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2660 | } |
2803 | } |
2661 | |
2804 | |
2662 | sub size_request { |
2805 | sub size_request { |
… | |
… | |
2774 | # TODO: doesn't handle markup well (read as: at all) |
2917 | # TODO: doesn't handle markup well (read as: at all) |
2775 | my $short = $item->{count} > 1 |
2918 | my $short = $item->{count} > 1 |
2776 | ? "<b>$item->{count} ×</b> $item->{text}" |
2919 | ? "<b>$item->{count} ×</b> $item->{text}" |
2777 | : $item->{text}; |
2920 | : $item->{text}; |
2778 | |
2921 | |
2779 | my $fontsize = $item->{fontsize} || $self->{fontsize}; |
|
|
2780 | |
|
|
2781 | for ($short) { |
2922 | for ($short) { |
2782 | s/^\s+//; |
2923 | s/^\s+//; |
2783 | s/\s+/ /g; |
2924 | s/\s+/ /g; |
2784 | my $len = int 40 / $fontsize; |
|
|
2785 | substr $_, $len, length, "…" if $len < length; |
|
|
2786 | } |
2925 | } |
2787 | |
2926 | |
2788 | new CFClient::UI::Label |
2927 | new CFClient::UI::Label |
2789 | markup => $short, |
2928 | markup => $short, |
2790 | tooltip => $item->{tooltip}, |
2929 | tooltip => $item->{tooltip}, |
2791 | tooltip_font => $::FONT_PROP, |
2930 | tooltip_font => $::FONT_PROP, |
2792 | tooltip_width => 0.67, |
2931 | tooltip_width => 0.67, |
2793 | fontsize => $fontsize, |
2932 | fontsize => $item->{fontsize} || $self->{fontsize}, |
|
|
2933 | max_w => $::WIDTH * 0.44, |
2794 | fg => $item->{fg}, |
2934 | fg => $item->{fg}, |
2795 | can_events => 1, |
2935 | can_events => 1, |
2796 | can_hover => 1 |
2936 | can_hover => 1 |
2797 | }; |
2937 | }; |
2798 | } |
2938 | } |
… | |
… | |
2835 | } |
2975 | } |
2836 | |
2976 | |
2837 | $self->reorder; |
2977 | $self->reorder; |
2838 | } |
2978 | } |
2839 | |
2979 | |
|
|
2980 | sub reconfigure { |
|
|
2981 | my ($self) = @_; |
|
|
2982 | |
|
|
2983 | delete $_->{label} |
|
|
2984 | for values %{ $self->{item} || {} }; |
|
|
2985 | |
|
|
2986 | $self->reorder; |
|
|
2987 | $self->SUPER::reconfigure; |
|
|
2988 | } |
|
|
2989 | |
2840 | ############################################################################# |
2990 | ############################################################################# |
2841 | |
2991 | |
2842 | package CFClient::UI::Root; |
2992 | package CFClient::UI::Root; |
2843 | |
2993 | |
2844 | our @ISA = CFClient::UI::Container::; |
2994 | our @ISA = CFClient::UI::Container::; |
… | |
… | |
2927 | $child->{x} = int $child->{x}; |
3077 | $child->{x} = int $child->{x}; |
2928 | $child->{y} = int $child->{y}; |
3078 | $child->{y} = int $child->{y}; |
2929 | } |
3079 | } |
2930 | |
3080 | |
2931 | $self->SUPER::add (@children); |
3081 | $self->SUPER::add (@children); |
|
|
3082 | |
|
|
3083 | while (@children) { |
|
|
3084 | my $w = pop @children; |
|
|
3085 | push @children, $w->children; |
|
|
3086 | $w->{visible} = 1; |
|
|
3087 | } |
|
|
3088 | } |
|
|
3089 | |
|
|
3090 | sub remove { |
|
|
3091 | my ($self, @children) = @_; |
|
|
3092 | |
|
|
3093 | $self->SUPER::remove (@children); |
|
|
3094 | |
|
|
3095 | while (@children) { |
|
|
3096 | my $w = pop @children; |
|
|
3097 | push @children, $w->children; |
|
|
3098 | delete $w->{visible}; |
|
|
3099 | } |
2932 | } |
3100 | } |
2933 | |
3101 | |
2934 | sub on_refresh { |
3102 | sub on_refresh { |
2935 | my ($self, $id, $cb) = @_; |
3103 | my ($self, $id, $cb) = @_; |
2936 | |
3104 | |
… | |
… | |
3005 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3173 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3006 | glClear GL_COLOR_BUFFER_BIT; |
3174 | glClear GL_COLOR_BUFFER_BIT; |
3007 | |
3175 | |
3008 | glMatrixMode GL_PROJECTION; |
3176 | glMatrixMode GL_PROJECTION; |
3009 | glLoadIdentity; |
3177 | glLoadIdentity; |
3010 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3178 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
3011 | glMatrixMode GL_MODELVIEW; |
3179 | glMatrixMode GL_MODELVIEW; |
3012 | glLoadIdentity; |
3180 | glLoadIdentity; |
3013 | |
3181 | |
3014 | $self->_draw; |
3182 | $self->_draw; |
3015 | } |
3183 | } |
… | |
… | |
3017 | ############################################################################# |
3185 | ############################################################################# |
3018 | |
3186 | |
3019 | package CFClient::UI; |
3187 | package CFClient::UI; |
3020 | |
3188 | |
3021 | $ROOT = new CFClient::UI::Root; |
3189 | $ROOT = new CFClient::UI::Root; |
3022 | $TOOLTIP = new CFClient::UI::Tooltip; |
3190 | $TOOLTIP = new CFClient::UI::Tooltip z => 900; |
3023 | |
3191 | |
3024 | 1 |
3192 | 1 |
3025 | |
3193 | |