… | |
… | |
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 | for my $widget (values %WIDGET) { |
161 | for my $widget (values %WIDGET) { |
146 | if ($widget->{toplevel}) { |
162 | if ($widget->{is_toplevel}) { |
147 | $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}; |
148 | $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}; |
149 | $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}; |
150 | $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}; |
151 | $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}; |
152 | $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}; |
153 | $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}; |
154 | $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}; |
155 | } |
171 | } |
156 | |
|
|
157 | $widget->reconfigure; |
|
|
158 | } |
172 | } |
|
|
173 | |
|
|
174 | reconfigure_widgets; |
159 | } |
175 | } |
160 | |
176 | |
161 | ############################################################################# |
177 | ############################################################################# |
162 | |
178 | |
163 | package CFClient::UI::Base; |
179 | package CFClient::UI::Base; |
… | |
… | |
195 | %$self = (); |
211 | %$self = (); |
196 | } |
212 | } |
197 | |
213 | |
198 | sub show { |
214 | sub show { |
199 | my ($self) = @_; |
215 | my ($self) = @_; |
200 | |
|
|
201 | return if $self->{parent}; |
216 | return if $self->{parent}; |
202 | |
217 | |
203 | $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 | ); |
204 | } |
232 | } |
205 | |
233 | |
206 | sub hide { |
234 | sub hide { |
207 | my ($self) = @_; |
235 | my ($self) = @_; |
208 | |
236 | |
… | |
… | |
416 | Scalar::Util::weaken ($self->{parent} = $parent); |
444 | Scalar::Util::weaken ($self->{parent} = $parent); |
417 | |
445 | |
418 | # TODO: req_w _does_change after ->reconfigure |
446 | # TODO: req_w _does_change after ->reconfigure |
419 | $self->check_size |
447 | $self->check_size |
420 | unless exists $self->{req_w}; |
448 | unless exists $self->{req_w}; |
|
|
449 | |
|
|
450 | $self->show; |
421 | } |
451 | } |
422 | |
452 | |
423 | sub check_size { |
453 | sub check_size { |
424 | my ($self, $forced) = @_; |
454 | my ($self, $forced) = @_; |
425 | |
455 | |
… | |
… | |
688 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
718 | $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { |
689 | glClearColor 0, 0, 0, 0; |
719 | glClearColor 0, 0, 0, 0; |
690 | glClear GL_COLOR_BUFFER_BIT; |
720 | glClear GL_COLOR_BUFFER_BIT; |
691 | |
721 | |
692 | $self->_render; |
722 | $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 | }; |
723 | }; |
701 | } |
724 | } |
702 | |
725 | |
703 | sub _draw { |
726 | sub _draw { |
704 | my ($self) = @_; |
727 | my ($self) = @_; |
… | |
… | |
708 | my $tex = $self->{texture} |
731 | my $tex = $self->{texture} |
709 | or return; |
732 | or return; |
710 | |
733 | |
711 | glEnable GL_TEXTURE_2D; |
734 | glEnable GL_TEXTURE_2D; |
712 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
735 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
713 | glColor 0, 0, 0, 1; |
736 | glColor 1, 1, 1, 1; |
714 | |
737 | |
715 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
738 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
716 | |
739 | |
717 | glDisable GL_TEXTURE_2D; |
740 | glDisable GL_TEXTURE_2D; |
718 | } |
741 | } |
… | |
… | |
725 | |
748 | |
726 | sub size_request { |
749 | sub size_request { |
727 | my ($self) = @_; |
750 | my ($self) = @_; |
728 | |
751 | |
729 | @$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)}; |
730 | $self->child->configure (0, 0, @$self{qw(child_w child_h)}); |
|
|
731 | |
753 | |
732 | @$self{qw(child_w child_h)} |
754 | @$self{qw(child_w child_h)} |
733 | } |
755 | } |
734 | |
756 | |
735 | sub size_allocate { |
757 | sub size_allocate { |
736 | my ($self, $w, $h) = @_; |
758 | my ($self, $w, $h) = @_; |
737 | |
759 | |
|
|
760 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
|
|
761 | # $w = $self->{w}; |
|
|
762 | $self->child->configure (0, 0, $cw, $ch); |
738 | $self->update; |
763 | $self->update; |
739 | } |
764 | } |
740 | |
765 | |
741 | sub set_offset { |
766 | sub set_offset { |
742 | my ($self, $x, $y) = @_; |
767 | my ($self, $x, $y) = @_; |
… | |
… | |
796 | |
821 | |
797 | my $slider = new CFClient::UI::Slider |
822 | my $slider = new CFClient::UI::Slider |
798 | vertical => 1, |
823 | vertical => 1, |
799 | range => [0, 0, 1, 0.01], # HACK fix |
824 | range => [0, 0, 1, 0.01], # HACK fix |
800 | connect_changed => sub { |
825 | connect_changed => sub { |
801 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
826 | $self->{vp}->set_offset (0, $_[1]); |
802 | }, |
827 | }, |
803 | ; |
828 | ; |
804 | |
829 | |
805 | $self = $class->SUPER::new ( |
830 | $self = $class->SUPER::new ( |
806 | vp => (new CFClient::UI::ViewPort), |
831 | vp => (new CFClient::UI::ViewPort expand => 1), |
807 | slider => $slider, |
832 | slider => $slider, |
808 | @_, |
833 | @_, |
809 | ); |
834 | ); |
810 | |
835 | |
811 | $self->{vp}->add ($self->{scrolled}); |
836 | $self->{vp}->add ($self->{scrolled}); |
812 | $self->add ($self->{vp}); |
837 | $self->add ($self->{vp}); |
813 | $self->add ($self->{slider}); |
838 | $self->add ($self->{slider}); |
814 | |
839 | |
815 | $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]); |
816 | } |
850 | } |
817 | |
851 | |
818 | #TODO# update range on size_allocate depending on child |
852 | #TODO# update range on size_allocate depending on child |
819 | # update viewport offset on scroll |
853 | # update viewport offset on scroll |
820 | |
854 | |
… | |
… | |
874 | my $class = shift; |
908 | my $class = shift; |
875 | |
909 | |
876 | # TODO: user_x, user_y, overwrite moveto? |
910 | # TODO: user_x, user_y, overwrite moveto? |
877 | |
911 | |
878 | my $self = $class->SUPER::new ( |
912 | my $self = $class->SUPER::new ( |
879 | bg => [1, 1, 1, 1], |
913 | bg => [1, 1, 1, 1], |
880 | border_bg => [1, 1, 1, 1], |
914 | border_bg => [1, 1, 1, 1], |
881 | border => 0.6, |
915 | border => 0.6, |
882 | toplevel => 1, |
916 | is_toplevel => 1, |
883 | can_events => 1, |
917 | can_events => 1, |
884 | @_ |
918 | @_ |
885 | ); |
919 | ); |
886 | |
920 | |
887 | $self->{title} &&= new CFClient::UI::Label |
921 | $self->{title} &&= new CFClient::UI::Label |
888 | align => 0, |
922 | align => 0, |
… | |
… | |
1297 | #bg => none |
1331 | #bg => none |
1298 | #active_bg => none |
1332 | #active_bg => none |
1299 | #font => default_font |
1333 | #font => default_font |
1300 | #text => initial text |
1334 | #text => initial text |
1301 | #markup => initial narkup |
1335 | #markup => initial narkup |
|
|
1336 | #max_w => maximum pixel width |
|
|
1337 | ellipsise => 3, # end |
1302 | layout => (new CFClient::Layout), |
1338 | layout => (new CFClient::Layout), |
1303 | fontsize => 1, |
1339 | fontsize => 1, |
1304 | align => -1, |
1340 | align => -1, |
1305 | valign => -1, |
1341 | valign => -1, |
1306 | padding => 2, |
1342 | padding => 2, |
… | |
… | |
1371 | sub size_request { |
1407 | sub size_request { |
1372 | my ($self) = @_; |
1408 | my ($self) = @_; |
1373 | |
1409 | |
1374 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1410 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1375 | $self->{layout}->set_width ($self->{max_w} || -1); |
1411 | $self->{layout}->set_width ($self->{max_w} || -1); |
|
|
1412 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1413 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1376 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1414 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1377 | |
1415 | |
1378 | my ($w, $h) = $self->{layout}->size; |
1416 | my ($w, $h) = $self->{layout}->size; |
1379 | |
1417 | |
1380 | if (exists $self->{template}) { |
1418 | if (exists $self->{template}) { |
… | |
… | |
1416 | |
1454 | |
1417 | my $tex = $self->{texture} ||= do { |
1455 | my $tex = $self->{texture} ||= do { |
1418 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1456 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1419 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1457 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1420 | $self->{layout}->set_width ($self->{w}); |
1458 | $self->{layout}->set_width ($self->{w}); |
|
|
1459 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
|
|
1460 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1421 | $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); |
1461 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1422 | |
1462 | |
1423 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1463 | my $tex = new_from_layout CFClient::Texture $self->{layout}; |
1424 | |
1464 | |
1425 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1465 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding} |
1426 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1466 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
… | |
… | |
1464 | active_fg => [0, 0, 0], |
1504 | active_fg => [0, 0, 0], |
1465 | can_hover => 1, |
1505 | can_hover => 1, |
1466 | can_focus => 1, |
1506 | can_focus => 1, |
1467 | valign => 0, |
1507 | valign => 0, |
1468 | can_events => 1, |
1508 | can_events => 1, |
|
|
1509 | #text => ... |
1469 | @_ |
1510 | @_ |
1470 | ) |
1511 | ) |
1471 | } |
1512 | } |
1472 | |
1513 | |
1473 | sub _set_text { |
1514 | sub _set_text { |
… | |
… | |
2043 | my $self = $class->SUPER::new ( |
2084 | my $self = $class->SUPER::new ( |
2044 | fg => [1, 1, 1], |
2085 | fg => [1, 1, 1], |
2045 | active_fg => [0, 0, 0], |
2086 | active_fg => [0, 0, 0], |
2046 | bg => [0, 0, 0, 0.2], |
2087 | bg => [0, 0, 0, 0.2], |
2047 | active_bg => [1, 1, 1, 0.5], |
2088 | active_bg => [1, 1, 1, 0.5], |
2048 | range => [0, 0, 100, 10], |
2089 | range => [0, 0, 100, 10, 0], |
2049 | req_w => $::WIDTH / 80, |
2090 | req_w => $::WIDTH / 80, |
2050 | req_h => $::WIDTH / 80, |
2091 | req_h => $::WIDTH / 80, |
2051 | vertical => 0, |
2092 | vertical => 0, |
2052 | can_hover => 1, |
2093 | can_hover => 1, |
2053 | inner_pad => .05, |
2094 | inner_pad => 0.02, |
2054 | @_ |
2095 | @_ |
2055 | ); |
2096 | ); |
2056 | |
2097 | |
2057 | $self->set_value ($self->{range}[0]); |
2098 | $self->set_value ($self->{range}[0]); |
2058 | $self->update; |
2099 | $self->update; |
2059 | |
2100 | |
2060 | $self |
2101 | $self |
2061 | } |
2102 | } |
2062 | |
2103 | |
|
|
2104 | sub set_range { |
|
|
2105 | my ($self, $range) = @_; |
|
|
2106 | |
|
|
2107 | $self->{range} = $range; |
|
|
2108 | |
|
|
2109 | $self->update; |
|
|
2110 | } |
|
|
2111 | |
2063 | sub set_value { |
2112 | sub set_value { |
2064 | my ($self, $value) = @_; |
2113 | my ($self, $value) = @_; |
2065 | |
2114 | |
2066 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2115 | my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; |
2067 | |
2116 | |
2068 | $hi = $lo + 1 if $hi <= $lo; |
2117 | $hi = $lo + 1 if $hi <= $lo; |
2069 | |
2118 | |
|
|
2119 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2120 | |
2070 | $value = $lo if $value < $lo; |
2121 | $value = $lo if $value < $lo; |
2071 | $value = $hi if $value > $hi; |
2122 | $value = $hi - $page if $value > $hi - $page; |
2072 | |
2123 | |
2073 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2124 | $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit |
2074 | if $unit; |
2125 | if $unit; |
2075 | |
|
|
2076 | $page = $hi - $lo if $page > $hi - $lo; |
|
|
2077 | |
2126 | |
2078 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2127 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2079 | |
2128 | |
2080 | if ($value != $old_value) { |
2129 | if ($value != $old_value) { |
2081 | $self->emit (changed => $value); |
2130 | $self->emit (changed => $value); |
… | |
… | |
2094 | |
2143 | |
2095 | sub button_down { |
2144 | sub button_down { |
2096 | my ($self, $ev, $x, $y) = @_; |
2145 | my ($self, $ev, $x, $y) = @_; |
2097 | |
2146 | |
2098 | $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 | |
2099 | $self->mouse_motion ($ev, $x, $y); |
2151 | $self->mouse_motion ($ev, $x, $y); |
2100 | } |
2152 | } |
2101 | |
2153 | |
2102 | sub mouse_motion { |
2154 | sub mouse_motion { |
2103 | my ($self, $ev, $x, $y) = @_; |
2155 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
2105 | if ($GRAB == $self) { |
2157 | if ($GRAB == $self) { |
2106 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2158 | my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); |
2107 | |
2159 | |
2108 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2160 | my (undef, $lo, $hi, $page) = @{$self->{range}}; |
2109 | |
2161 | |
2110 | $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; |
2162 | $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); |
2111 | |
2163 | |
2112 | $self->set_value ($x * ($hi - $lo) + $lo); |
2164 | $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); |
2113 | } |
2165 | } |
2114 | } |
2166 | } |
2115 | |
2167 | |
2116 | sub update { |
2168 | sub update { |
2117 | my ($self) = @_; |
2169 | my ($self) = @_; |
2118 | |
2170 | |
2119 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2171 | $CFClient::UI::ROOT->on_post_alloc ($self => sub { |
2120 | $self->set_value ($self->{range}[0]); |
2172 | $self->set_value ($self->{range}[0]); |
2121 | |
2173 | |
2122 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
2174 | my ($value, $lo, $hi, $page) = @{$self->{range}}; |
|
|
2175 | my $range = ($hi - $page - $lo) || 1e-100; |
2123 | |
2176 | |
2124 | my $inner_w = 1 - 2 * $self->{inner_pad}; |
2177 | my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; |
2125 | |
2178 | |
2126 | $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; |
2127 | |
2181 | |
2128 | $page = $self->{scale} * $page || 10 / ($self->{w} || 1); |
2182 | $value = ($value - $lo) / $range; |
2129 | $value = $self->{scale} * ($value - $lo); |
2183 | $value = $value * $self->{scale} + $self->{offset}; |
2130 | |
2184 | |
2131 | $value = $self->{inner_pad} + ($value - $page * 0.5); |
|
|
2132 | |
|
|
2133 | $value = 0 if $value < 0; |
|
|
2134 | $page = 1 - $value if $value + $page > 1; |
|
|
2135 | |
|
|
2136 | $self->{knob_x} = $value; |
2185 | $self->{knob_x} = $value - $knob_w * 0.5; |
2137 | $self->{knob_w} = $page; |
2186 | $self->{knob_w} = $knob_w; |
2138 | }); |
2187 | }); |
2139 | |
2188 | |
2140 | $self->SUPER::update; |
2189 | $self->SUPER::update; |
2141 | } |
2190 | } |
2142 | |
2191 | |
… | |
… | |
2148 | glScale $self->{w}, $self->{h}; |
2197 | glScale $self->{w}, $self->{h}; |
2149 | |
2198 | |
2150 | if ($self->{vertical}) { |
2199 | if ($self->{vertical}) { |
2151 | # draw a vertical slider like a rotated horizontal slider |
2200 | # draw a vertical slider like a rotated horizontal slider |
2152 | |
2201 | |
|
|
2202 | glTranslate 1, 0, 0; |
2153 | glRotate 90, 0, 0, 1; |
2203 | glRotate 90, 0, 0, 1; |
2154 | glTranslate 0, 1, 0; |
|
|
2155 | } |
2204 | } |
2156 | |
2205 | |
2157 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2206 | my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; |
2158 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2207 | my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; |
2159 | |
2208 | |
… | |
… | |
2166 | # draw handle |
2215 | # draw handle |
2167 | $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); |
2168 | |
2217 | |
2169 | glDisable GL_TEXTURE_2D; |
2218 | glDisable GL_TEXTURE_2D; |
2170 | } |
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 (@_) } |
2171 | |
2261 | |
2172 | ############################################################################# |
2262 | ############################################################################# |
2173 | |
2263 | |
2174 | package CFClient::UI::TextView; |
2264 | package CFClient::UI::TextView; |
2175 | |
2265 | |
… | |
… | |
2205 | |
2295 | |
2206 | $self->{fontsize} = $fontsize; |
2296 | $self->{fontsize} = $fontsize; |
2207 | $self->reflow; |
2297 | $self->reflow; |
2208 | } |
2298 | } |
2209 | |
2299 | |
2210 | sub text_height { |
|
|
2211 | my ($self, $text) = @_; |
|
|
2212 | |
|
|
2213 | my $layout = $self->{layout}; |
|
|
2214 | |
|
|
2215 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2216 | $layout->set_width ($self->{children}[0]{w}); |
|
|
2217 | $layout->set_markup ($text); |
|
|
2218 | |
|
|
2219 | ($layout->size)[1] |
|
|
2220 | } |
|
|
2221 | |
|
|
2222 | sub reflow { |
|
|
2223 | my ($self) = @_; |
|
|
2224 | |
|
|
2225 | $self->{need_reflow}++; |
|
|
2226 | $self->update; |
|
|
2227 | } |
|
|
2228 | |
|
|
2229 | sub size_allocate { |
2300 | sub size_allocate { |
2230 | my ($self, $w, $h) = @_; |
2301 | my ($self, $w, $h) = @_; |
2231 | |
2302 | |
2232 | $self->SUPER::size_allocate ($w, $h); |
2303 | $self->SUPER::size_allocate ($w, $h); |
2233 | |
2304 | |
… | |
… | |
2236 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2307 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2237 | |
2308 | |
2238 | $self->reflow; |
2309 | $self->reflow; |
2239 | } |
2310 | } |
2240 | |
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 | |
2241 | sub add_paragraph { |
2346 | sub add_paragraph { |
2242 | my ($self, $color, $text) = @_; |
2347 | my ($self, $color, $text, $indent) = @_; |
2243 | |
2348 | |
2244 | #TODO: intelligently "reformat" paragraph |
2349 | for my $line (split /\n/, $text) { |
2245 | |
2350 | my ($w, $h) = $self->text_size ($line); |
2246 | my $height = $self->text_height ($text); |
|
|
2247 | |
|
|
2248 | $self->{height} += $height; |
2351 | $self->{height} += $h; |
|
|
2352 | push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; |
|
|
2353 | } |
2249 | |
2354 | |
2250 | push @{$self->{par}}, [$height, $color, $text]; |
|
|
2251 | |
|
|
2252 | $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]); |
2253 | $self->{children}[1]->update; |
|
|
2254 | } |
2356 | } |
2255 | |
2357 | |
2256 | sub update { |
2358 | sub update { |
2257 | my ($self) = @_; |
2359 | my ($self) = @_; |
2258 | |
2360 | |
… | |
… | |
2261 | return unless $self->{h} > 0; |
2363 | return unless $self->{h} > 0; |
2262 | |
2364 | |
2263 | delete $self->{texture}; |
2365 | delete $self->{texture}; |
2264 | |
2366 | |
2265 | $ROOT->on_post_alloc ($self, sub { |
2367 | $ROOT->on_post_alloc ($self, sub { |
|
|
2368 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
|
|
2369 | |
2266 | if (delete $self->{need_reflow}) { |
2370 | if (delete $self->{need_reflow}) { |
2267 | my $height = 0; |
2371 | my $height = 0; |
2268 | |
2372 | |
2269 | $height += $_->[0] = $self->text_height ($_->[2]) |
2373 | my $layout = $self->{layout}; |
|
|
2374 | |
|
|
2375 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
|
|
2376 | |
2270 | 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 | } |
2271 | |
2388 | |
2272 | $self->{height} = $height; |
2389 | $self->{height} = $height; |
2273 | |
2390 | |
2274 | $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; |
2391 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2275 | |
2392 | |
2276 | delete $self->{texture}; |
2393 | delete $self->{texture}; |
2277 | } |
2394 | } |
2278 | |
2395 | |
2279 | $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 { |
2280 | glClearColor 0, 0, 0, 0; |
2397 | glClearColor 0.5, 0.5, 0.5, 0; |
2281 | glClear GL_COLOR_BUFFER_BIT; |
2398 | glClear GL_COLOR_BUFFER_BIT; |
2282 | |
2399 | |
2283 | glEnable GL_TEXTURE_2D; |
|
|
2284 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
2285 | |
|
|
2286 | my $top = int $self->{children}[1]{range}[0]; |
2400 | my $top = int $self->{children}[1]{range}[0]; |
2287 | |
2401 | |
2288 | my $y0 = $top; |
2402 | my $y0 = $top; |
2289 | my $y1 = $top + $self->{h}; |
2403 | my $y1 = $top + $H; |
2290 | |
2404 | |
2291 | my $y = 0; |
2405 | my $y = 0; |
2292 | |
2406 | |
2293 | my $layout = $self->{layout}; |
2407 | my $layout = $self->{layout}; |
2294 | |
2408 | |
2295 | $layout->set_font ($self->{font}) if $self->{font}; |
2409 | $layout->set_font ($self->{font}) if $self->{font}; |
2296 | |
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 | |
2297 | for my $par (@{$self->{par}}) { |
2415 | for my $par (@{$self->{par}}) { |
2298 | my $h = $par->[0]; |
2416 | my $h = $par->[1]; |
2299 | |
2417 | |
2300 | if ($y0 < $y + $h && $y < $y1) { |
2418 | if ($y0 < $y + $h && $y < $y1) { |
2301 | $layout->set_foreground (@{ $par->[1] }); |
2419 | $layout->set_foreground (@{ $par->[2] }); |
|
|
2420 | $layout->set_width ($W - $par->[3]); |
2302 | $layout->set_markup ($par->[2]); |
2421 | $layout->set_markup ($par->[4]); |
2303 | |
2422 | |
2304 | my ($W, $H) = $layout->size; |
2423 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2305 | 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; |
2306 | } |
2427 | } |
2307 | |
2428 | |
2308 | $y += $h; |
2429 | $y += $h; |
2309 | } |
2430 | } |
2310 | |
2431 | |
2311 | glDisable GL_TEXTURE_2D; |
2432 | glDisable GL_BLEND; |
2312 | }; |
2433 | }; |
2313 | }); |
2434 | }); |
2314 | } |
2435 | } |
2315 | |
2436 | |
2316 | sub _draw { |
2437 | sub _draw { |
2317 | my ($self) = @_; |
2438 | my ($self) = @_; |
2318 | |
2439 | |
2319 | glEnable GL_TEXTURE_2D; |
2440 | glEnable GL_TEXTURE_2D; |
2320 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2441 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2321 | glColor 1, 1, 1, 1; |
2442 | glColor 1, 1, 1, 1; |
2322 | $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2443 | $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2323 | glDisable GL_TEXTURE_2D; |
2444 | glDisable GL_TEXTURE_2D; |
2324 | |
2445 | |
2325 | $self->{children}[1]->draw; |
2446 | $self->{children}[1]->draw; |
2326 | |
2447 | |
2327 | } |
2448 | } |
… | |
… | |
2426 | |
2547 | |
2427 | sub set_tooltip_from { |
2548 | sub set_tooltip_from { |
2428 | my ($self, $widget) = @_; |
2549 | my ($self, $widget) = @_; |
2429 | |
2550 | |
2430 | $self->add (new CFClient::UI::Label |
2551 | $self->add (new CFClient::UI::Label |
2431 | markup => $widget->{tooltip}, |
2552 | markup => $widget->{tooltip}, |
2432 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2553 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2433 | fontsize => 0.8, |
2554 | fontsize => 0.8, |
2434 | fg => [0, 0, 0, 1], |
2555 | fg => [0, 0, 0, 1], |
|
|
2556 | ellipsise => 0, |
2435 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2557 | font => ($widget->{tooltip_font} || $::FONT_PROP), |
2436 | ); |
2558 | ); |
2437 | } |
2559 | } |
2438 | |
2560 | |
2439 | sub size_request { |
2561 | sub size_request { |
2440 | my ($self) = @_; |
2562 | my ($self) = @_; |
… | |
… | |
2486 | use CFClient::OpenGL; |
2608 | use CFClient::OpenGL; |
2487 | |
2609 | |
2488 | sub new { |
2610 | sub new { |
2489 | my $class = shift; |
2611 | my $class = shift; |
2490 | |
2612 | |
2491 | $class->SUPER::new ( |
2613 | my $self = $class->SUPER::new ( |
2492 | aspect => 1, |
2614 | aspect => 1, |
2493 | @_, |
2615 | @_, |
2494 | ) |
2616 | ); |
|
|
2617 | |
|
|
2618 | if ($self->{anim} && $self->{animspeed}) { |
|
|
2619 | Scalar::Util::weaken (my $widget = $self); |
|
|
2620 | |
|
|
2621 | $self->{timer} = Event->timer ( |
|
|
2622 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
2623 | hard => 1, |
|
|
2624 | interval => $self->{animspeed}, |
|
|
2625 | cb => sub { |
|
|
2626 | ++$widget->{frame}; |
|
|
2627 | $widget->update; |
|
|
2628 | }, |
|
|
2629 | ); |
|
|
2630 | } |
|
|
2631 | |
|
|
2632 | $self |
2495 | } |
2633 | } |
2496 | |
2634 | |
2497 | sub size_request { |
2635 | sub size_request { |
2498 | (32, 8) |
2636 | (32, 8) |
2499 | } |
2637 | } |
2500 | |
2638 | |
|
|
2639 | sub update { |
|
|
2640 | my ($self) = @_; |
|
|
2641 | |
|
|
2642 | return unless $self->{visible}; |
|
|
2643 | |
|
|
2644 | $self->SUPER::update; |
|
|
2645 | } |
|
|
2646 | |
2501 | sub _draw { |
2647 | sub _draw { |
2502 | my ($self) = @_; |
2648 | my ($self) = @_; |
2503 | |
2649 | |
2504 | return unless $::CONN;#d# manage and cache textures differently |
2650 | return unless $::CONN; |
|
|
2651 | |
|
|
2652 | my $face; |
|
|
2653 | |
|
|
2654 | if ($self->{frame}) { |
|
|
2655 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
2656 | |
|
|
2657 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
2658 | if $anim && @$anim; |
|
|
2659 | } |
|
|
2660 | |
2505 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; |
2661 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2506 | |
2662 | |
2507 | # TODO animation |
|
|
2508 | if ($tex) { |
2663 | if ($tex) { |
2509 | glEnable GL_TEXTURE_2D; |
2664 | glEnable GL_TEXTURE_2D; |
2510 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2665 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2511 | glColor 1, 1, 1, 1; |
2666 | glColor 1, 1, 1, 1; |
2512 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2667 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2513 | glDisable GL_TEXTURE_2D; |
2668 | glDisable GL_TEXTURE_2D; |
2514 | } |
2669 | } |
2515 | } |
2670 | } |
2516 | |
2671 | |
|
|
2672 | sub DESTROY { |
|
|
2673 | my ($self) = @_; |
|
|
2674 | |
|
|
2675 | $self->{timer}->cancel |
|
|
2676 | if $self->{timer}; |
|
|
2677 | |
|
|
2678 | $self->SUPER::DESTROY; |
|
|
2679 | } |
|
|
2680 | |
2517 | ############################################################################# |
2681 | ############################################################################# |
2518 | |
2682 | |
2519 | package CFClient::UI::InventoryItem; |
2683 | package CFClient::UI::InventoryItem; |
2520 | |
2684 | |
2521 | our @ISA = CFClient::UI::HBox::; |
2685 | our @ISA = CFClient::UI::HBox::; |
… | |
… | |
2524 | my ($item) = @_; |
2688 | my ($item) = @_; |
2525 | |
2689 | |
2526 | my $desc = |
2690 | my $desc = |
2527 | $item->{nrof} < 2 |
2691 | $item->{nrof} < 2 |
2528 | ? $item->{name} |
2692 | ? $item->{name} |
2529 | : "$item->{nrof} $item->{name_pl}"; |
2693 | : "$item->{nrof} × $item->{name_pl}"; |
2530 | |
2694 | |
2531 | $item->{flags} & Crossfire::Protocol::F_OPEN |
2695 | $item->{flags} & Crossfire::Protocol::F_OPEN |
2532 | and $desc .= " (open)"; |
2696 | and $desc .= " (open)"; |
2533 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
2697 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
2534 | and $desc .= " (applied)"; |
2698 | and $desc .= " (applied)"; |
… | |
… | |
2554 | my $item = delete $args{item}; |
2718 | my $item = delete $args{item}; |
2555 | |
2719 | |
2556 | my $desc = _item_to_desc ($item); |
2720 | my $desc = _item_to_desc ($item); |
2557 | |
2721 | |
2558 | my $self = $class->SUPER::new ( |
2722 | my $self = $class->SUPER::new ( |
2559 | can_hover => 1, |
2723 | can_hover => 1, |
2560 | can_events => 1, |
2724 | can_events => 1, |
2561 | tooltip => ((CFClient::UI::Label::escape $desc) |
2725 | tooltip => ((CFClient::UI::Label::escape $desc) |
2562 | . "\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>"), |
2563 | connect_button_down => sub { |
2727 | connect_button_down => sub { |
2564 | my ($self, $ev, $x, $y) = @_; |
2728 | my ($self, $ev, $x, $y) = @_; |
2565 | |
2729 | |
2566 | # 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 :( |
2567 | if ($ev->{button} == 1) { |
2731 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
2568 | my $targ = $::CONN->{player}{tag}; |
2732 | my $targ = $::CONN->{player}{tag}; |
2569 | |
2733 | |
2570 | if ($item->{container} == $::CONN->{player}{tag}) { |
2734 | if ($item->{container} == $::CONN->{player}{tag}) { |
2571 | $targ = $main::OPENCONT; |
2735 | $targ = $main::OPENCONT; |
2572 | } |
2736 | } |
2573 | |
2737 | |
2574 | $::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}"); |
2575 | } elsif ($ev->{button} == 2) { |
2741 | } elsif ($ev->{button} == 2) { |
2576 | $::CONN->send ("apply $item->{tag}"); |
2742 | $::CONN->send ("apply $item->{tag}"); |
2577 | } elsif ($ev->{button} == 3) { |
2743 | } elsif ($ev->{button} == 3) { |
2578 | my @menu_items = ( |
2744 | my @menu_items = ( |
2579 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2745 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
2580 | ["mark", sub { $::CONN->send ("mark $item->{tag}") }], |
2746 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
2581 | ["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}) }], |
2582 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2755 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
2583 | [ |
2756 | ) |
2584 | $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", |
|
|
2585 | sub { $::CONN->send ("lock $item->{tag}") }, |
|
|
2586 | ], |
2757 | ), |
2587 | ); |
2758 | ); |
2588 | |
2759 | |
2589 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2760 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
2590 | } |
2761 | } |
2591 | |
2762 | |
… | |
… | |
2627 | |
2798 | |
2628 | sub new { |
2799 | sub new { |
2629 | my $class = shift; |
2800 | my $class = shift; |
2630 | |
2801 | |
2631 | my $self = $class->SUPER::new ( |
2802 | my $self = $class->SUPER::new ( |
2632 | scrolled => (new CFClient::UI::VBox), |
2803 | scrolled => (new CFClient::UI::Table), |
2633 | @_, |
2804 | @_, |
2634 | ); |
2805 | ); |
2635 | |
2806 | |
2636 | $self |
2807 | $self |
2637 | } |
2808 | } |
… | |
… | |
2648 | } @$items; |
2819 | } @$items; |
2649 | |
2820 | |
2650 | $self->{real_items} = \@items; |
2821 | $self->{real_items} = \@items; |
2651 | |
2822 | |
2652 | for my $item (@items) { |
2823 | for my $item (@items) { |
|
|
2824 | $item->{item} = $item; |
2653 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2825 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
2654 | $item->update_item (); |
2826 | $item->update_item (); |
2655 | } |
2827 | } |
2656 | |
2828 | |
|
|
2829 | my $i = 0; |
|
|
2830 | for (@items) { |
2657 | $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 | } |
2658 | |
2835 | |
2659 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2836 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2660 | } |
2837 | } |
2661 | |
2838 | |
2662 | sub size_request { |
2839 | sub size_request { |
… | |
… | |
2774 | # TODO: doesn't handle markup well (read as: at all) |
2951 | # TODO: doesn't handle markup well (read as: at all) |
2775 | my $short = $item->{count} > 1 |
2952 | my $short = $item->{count} > 1 |
2776 | ? "<b>$item->{count} ×</b> $item->{text}" |
2953 | ? "<b>$item->{count} ×</b> $item->{text}" |
2777 | : $item->{text}; |
2954 | : $item->{text}; |
2778 | |
2955 | |
2779 | my $fontsize = $item->{fontsize} || $self->{fontsize}; |
|
|
2780 | |
|
|
2781 | for ($short) { |
2956 | for ($short) { |
2782 | s/^\s+//; |
2957 | s/^\s+//; |
2783 | s/\s+/ /g; |
2958 | s/\s+/ /g; |
2784 | my $len = int 40 / $fontsize; |
|
|
2785 | substr $_, $len, length, "…" if $len < length; |
|
|
2786 | } |
2959 | } |
2787 | |
2960 | |
2788 | new CFClient::UI::Label |
2961 | new CFClient::UI::Label |
2789 | markup => $short, |
2962 | markup => $short, |
2790 | tooltip => $item->{tooltip}, |
2963 | tooltip => $item->{tooltip}, |
2791 | tooltip_font => $::FONT_PROP, |
2964 | tooltip_font => $::FONT_PROP, |
2792 | tooltip_width => 0.67, |
2965 | tooltip_width => 0.67, |
2793 | fontsize => $fontsize, |
2966 | fontsize => $item->{fontsize} || $self->{fontsize}, |
|
|
2967 | max_w => $::WIDTH * 0.44, |
2794 | fg => $item->{fg}, |
2968 | fg => $item->{fg}, |
2795 | can_events => 1, |
2969 | can_events => 1, |
2796 | can_hover => 1 |
2970 | can_hover => 1 |
2797 | }; |
2971 | }; |
2798 | } |
2972 | } |
… | |
… | |
2835 | } |
3009 | } |
2836 | |
3010 | |
2837 | $self->reorder; |
3011 | $self->reorder; |
2838 | } |
3012 | } |
2839 | |
3013 | |
|
|
3014 | sub reconfigure { |
|
|
3015 | my ($self) = @_; |
|
|
3016 | |
|
|
3017 | delete $_->{label} |
|
|
3018 | for values %{ $self->{item} || {} }; |
|
|
3019 | |
|
|
3020 | $self->reorder; |
|
|
3021 | $self->SUPER::reconfigure; |
|
|
3022 | } |
|
|
3023 | |
2840 | ############################################################################# |
3024 | ############################################################################# |
2841 | |
3025 | |
2842 | package CFClient::UI::Root; |
3026 | package CFClient::UI::Root; |
2843 | |
3027 | |
2844 | our @ISA = CFClient::UI::Container::; |
3028 | our @ISA = CFClient::UI::Container::; |
… | |
… | |
2874 | } |
3058 | } |
2875 | |
3059 | |
2876 | sub size_allocate { |
3060 | sub size_allocate { |
2877 | my ($self, $w, $h) = @_; |
3061 | my ($self, $w, $h) = @_; |
2878 | |
3062 | |
2879 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
2880 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
2881 | |
|
|
2882 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
2883 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
2884 | |
|
|
2885 | for my $child ($self->children) { |
3063 | for my $child ($self->children) { |
2886 | 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)}; |
2887 | |
3065 | |
2888 | $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 |
2889 | if exists $child->{req_x}; |
3067 | if exists $child->{req_x}; |
… | |
… | |
2918 | } |
3096 | } |
2919 | |
3097 | |
2920 | sub add { |
3098 | sub add { |
2921 | my ($self, @children) = @_; |
3099 | my ($self, @children) = @_; |
2922 | |
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 | |
2923 | for my $child (@children) { |
3107 | for my $child (@children) { |
2924 | $child->{toplevel} = 1; |
3108 | $child->{is_toplevel} = 1; |
2925 | |
3109 | |
2926 | # integerise window positions |
3110 | # integerise window positions |
2927 | $child->{x} = int $child->{x}; |
3111 | $child->{x} = int $child->{x}; |
2928 | $child->{y} = int $child->{y}; |
3112 | $child->{y} = int $child->{y}; |
2929 | } |
3113 | } |
2930 | |
3114 | |
2931 | $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 | } |
2932 | } |
3128 | } |
2933 | |
3129 | |
2934 | sub on_refresh { |
3130 | sub on_refresh { |
2935 | my ($self, $id, $cb) = @_; |
3131 | my ($self, $id, $cb) = @_; |
2936 | |
3132 | |
… | |
… | |
3005 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3201 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
3006 | glClear GL_COLOR_BUFFER_BIT; |
3202 | glClear GL_COLOR_BUFFER_BIT; |
3007 | |
3203 | |
3008 | glMatrixMode GL_PROJECTION; |
3204 | glMatrixMode GL_PROJECTION; |
3009 | glLoadIdentity; |
3205 | glLoadIdentity; |
3010 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; |
3206 | glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; |
3011 | glMatrixMode GL_MODELVIEW; |
3207 | glMatrixMode GL_MODELVIEW; |
3012 | glLoadIdentity; |
3208 | glLoadIdentity; |
3013 | |
3209 | |
3014 | $self->_draw; |
3210 | $self->_draw; |
3015 | } |
3211 | } |
… | |
… | |
3017 | ############################################################################# |
3213 | ############################################################################# |
3018 | |
3214 | |
3019 | package CFClient::UI; |
3215 | package CFClient::UI; |
3020 | |
3216 | |
3021 | $ROOT = new CFClient::UI::Root; |
3217 | $ROOT = new CFClient::UI::Root; |
3022 | $TOOLTIP = new CFClient::UI::Tooltip; |
3218 | $TOOLTIP = new CFClient::UI::Tooltip z => 900; |
3023 | |
3219 | |
3024 | 1 |
3220 | 1 |
3025 | |
3221 | |