… | |
… | |
7 | |
7 | |
8 | use CFClient; |
8 | use CFClient; |
9 | |
9 | |
10 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
10 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
11 | |
11 | |
12 | our $TOPLEVEL; |
12 | our $ROOT; |
13 | our $BUTTON_STATE; |
13 | our $BUTTON_STATE; |
14 | |
14 | |
15 | # class methods for events |
15 | # class methods for events |
16 | sub feed_sdl_key_down_event { |
16 | sub feed_sdl_key_down_event { |
17 | $FOCUS->key_down ($_[0]) if $FOCUS; |
17 | $FOCUS->key_down ($_[0]) if $FOCUS; |
… | |
… | |
24 | sub feed_sdl_button_down_event { |
24 | sub feed_sdl_button_down_event { |
25 | my ($ev) = @_; |
25 | my ($ev) = @_; |
26 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
26 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
27 | |
27 | |
28 | if (!$BUTTON_STATE) { |
28 | if (!$BUTTON_STATE) { |
29 | my $widget = $TOPLEVEL->find_widget ($x, $y); |
29 | my $widget = $ROOT->find_widget ($x, $y); |
30 | |
30 | |
31 | $GRAB = $widget; |
31 | $GRAB = $widget; |
32 | $GRAB->update if $GRAB; |
32 | $GRAB->update if $GRAB; |
33 | } |
33 | } |
34 | |
34 | |
35 | $BUTTON_STATE |= 1 << ($ev->button - 1); |
35 | $BUTTON_STATE |= 1 << ($ev->button - 1); |
36 | |
36 | |
37 | $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; |
37 | $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; |
38 | } |
38 | } |
39 | |
39 | |
40 | sub feed_sdl_button_up_event { |
40 | sub feed_sdl_button_up_event { |
41 | my ($ev) = @_; |
41 | my ($ev) = @_; |
42 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
42 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
43 | |
43 | |
44 | my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); |
44 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
45 | |
45 | |
46 | $BUTTON_STATE &= ~(1 << ($ev->button - 1)); |
46 | $BUTTON_STATE &= ~(1 << ($ev->button - 1)); |
47 | |
47 | |
48 | $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; |
48 | $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; |
49 | |
49 | |
50 | if (!$BUTTON_STATE) { |
50 | if (!$BUTTON_STATE) { |
51 | my $grab = $GRAB; undef $GRAB; |
51 | my $grab = $GRAB; undef $GRAB; |
52 | $grab->update if $grab; |
52 | $grab->update if $grab; |
53 | $GRAB->update if $GRAB; |
53 | $GRAB->update if $GRAB; |
… | |
… | |
56 | |
56 | |
57 | sub feed_sdl_motion_event { |
57 | sub feed_sdl_motion_event { |
58 | my ($ev) = @_; |
58 | my ($ev) = @_; |
59 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
59 | my ($x, $y) = ($ev->motion_x, $ev->motion_y); |
60 | |
60 | |
61 | my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); |
61 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
62 | |
62 | |
63 | if ($widget != $HOVER) { |
63 | if ($widget != $HOVER) { |
64 | my $hover = $HOVER; $HOVER = $widget; |
64 | my $hover = $HOVER; $HOVER = $widget; |
65 | |
65 | |
66 | $hover->update if $hover && $hover->{can_hover}; |
66 | $hover->update if $hover && $hover->{can_hover}; |
67 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
67 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
68 | } |
68 | } |
69 | |
69 | |
70 | $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; |
70 | $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; |
|
|
71 | } |
|
|
72 | |
|
|
73 | # convert position array to integers |
|
|
74 | sub harmonize { |
|
|
75 | my ($vals) = @_; |
|
|
76 | |
|
|
77 | my $rem = 0; |
|
|
78 | |
|
|
79 | for (@$vals) { |
|
|
80 | my $i = int $_ + $rem; |
|
|
81 | $rem += $_ - $i; |
|
|
82 | $_ = $i; |
|
|
83 | } |
71 | } |
84 | } |
72 | |
85 | |
73 | ############################################################################# |
86 | ############################################################################# |
74 | |
87 | |
75 | package CFClient::UI::Base; |
88 | package CFClient::UI::Base; |
… | |
… | |
99 | $self |
112 | $self |
100 | } |
113 | } |
101 | |
114 | |
102 | sub move { |
115 | sub move { |
103 | my ($self, $x, $y, $z) = @_; |
116 | my ($self, $x, $y, $z) = @_; |
104 | $self->{x} = $x; |
117 | $self->{x} = int $x; |
105 | $self->{y} = $y; |
118 | $self->{y} = int $y; |
106 | $self->{z} = $z if defined $z; |
119 | $self->{z} = $z if defined $z; |
107 | } |
120 | } |
108 | |
121 | |
109 | sub needs_redraw { |
122 | sub needs_redraw { |
110 | 0 |
123 | 0 |
… | |
… | |
133 | my ($self, $x, $y, $w, $h) = @_; |
146 | my ($self, $x, $y, $w, $h) = @_; |
134 | |
147 | |
135 | $self->_size_allocate ($x, $y, $w, $h); |
148 | $self->_size_allocate ($x, $y, $w, $h); |
136 | } |
149 | } |
137 | |
150 | |
|
|
151 | # return top left coordinates |
|
|
152 | sub _topleft { |
|
|
153 | my ($self, $x, $y) = @_; |
|
|
154 | |
|
|
155 | $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); |
|
|
156 | } |
|
|
157 | |
138 | # translate global coordinates to local coordinate system |
158 | # translate global coordinates to local coordinate system |
139 | sub translate { |
159 | sub coord2local { |
140 | my ($self, $x, $y) = @_; |
160 | my ($self, $x, $y) = @_; |
141 | |
161 | |
142 | $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); |
162 | my ($X, $Y) = $self->_topleft; |
|
|
163 | ($x - $X, $y - $Y) |
|
|
164 | } |
|
|
165 | |
|
|
166 | # translate local coordinates to global coordinate system |
|
|
167 | sub coord2global { |
|
|
168 | my ($self, $x, $y) = @_; |
|
|
169 | |
|
|
170 | my ($X, $Y) = $self->_topleft; |
|
|
171 | ($x + $X, $y + $Y) |
143 | } |
172 | } |
144 | |
173 | |
145 | sub focus_in { |
174 | sub focus_in { |
146 | my ($self) = @_; |
175 | my ($self) = @_; |
147 | |
176 | |
… | |
… | |
220 | |
249 | |
221 | () |
250 | () |
222 | } |
251 | } |
223 | |
252 | |
224 | sub set_parent { |
253 | sub set_parent { |
225 | my ($self, $par) = @_; |
254 | my ($self, $parent) = @_; |
226 | |
255 | |
227 | $self->{parent} = $par; |
|
|
228 | Scalar::Util::weaken $self->{parent}; |
256 | Scalar::Util::weaken ($self->{parent} = $parent); |
229 | } |
|
|
230 | |
|
|
231 | sub get_parent { |
|
|
232 | $_[0]->{parent} |
|
|
233 | } |
257 | } |
234 | |
258 | |
235 | sub update { |
259 | sub update { |
236 | my ($self) = @_; |
260 | my ($self) = @_; |
237 | |
261 | |
… | |
… | |
326 | |
350 | |
327 | $self |
351 | $self |
328 | } |
352 | } |
329 | |
353 | |
330 | sub add { |
354 | sub add { |
331 | my ($self, $chld) = @_; |
355 | my ($self, $child) = @_; |
332 | |
356 | |
333 | $chld->set_parent ($self); |
357 | $child->set_parent ($self); |
|
|
358 | |
|
|
359 | use sort 'stable'; |
334 | |
360 | |
335 | $self->{children} = [ |
361 | $self->{children} = [ |
336 | sort { $a->{z} <=> $b->{z} } |
362 | sort { $a->{z} <=> $b->{z} } |
337 | @{$self->{children}}, $chld |
363 | @{$self->{children}}, $child |
338 | ]; |
364 | ]; |
339 | |
365 | |
340 | $self->{w} = $self->{h} = -1; |
366 | $self->{w} = $self->{h} = -1; |
341 | $self->update; |
367 | $self->update; |
342 | } |
368 | } |
… | |
… | |
539 | # TODO: user_x, user_y, overwrite moveto? |
565 | # TODO: user_x, user_y, overwrite moveto? |
540 | |
566 | |
541 | $class->SUPER::new ( |
567 | $class->SUPER::new ( |
542 | bg => [1, 1, 1, 1], |
568 | bg => [1, 1, 1, 1], |
543 | border_bg => [1, 1, 1, 1], |
569 | border_bg => [1, 1, 1, 1], |
544 | border => $::FONTSIZE * 0.8, |
570 | border => int $::FONTSIZE * 0.8, |
545 | @_ |
571 | @_ |
546 | ) |
572 | ) |
547 | } |
573 | } |
548 | |
574 | |
549 | sub size_request { |
575 | sub size_request { |
… | |
… | |
672 | @_ |
698 | @_ |
673 | ) |
699 | ) |
674 | } |
700 | } |
675 | |
701 | |
676 | sub add { |
702 | sub add { |
677 | my ($self, $x, $y, $chld) = @_; |
703 | my ($self, $x, $y, $child) = @_; |
678 | |
704 | |
|
|
705 | $child->set_parent ($self); |
679 | $self->{children}[$y][$x] = $chld; |
706 | $self->{children}[$y][$x] = $child; |
680 | $chld->set_parent ($self); |
|
|
681 | |
707 | |
682 | $self->{w} = $self->{h} = -1; |
708 | $self->{w} = $self->{h} = -1; |
|
|
709 | $self->update; |
|
|
710 | } |
|
|
711 | |
|
|
712 | # TODO: move to container class maybe? send childs a signal on removal? |
|
|
713 | sub clear { |
|
|
714 | my ($self) = @_; |
|
|
715 | |
|
|
716 | delete $self->{children}; |
683 | $self->update; |
717 | $self->update; |
684 | } |
718 | } |
685 | |
719 | |
686 | sub get_wh { |
720 | sub get_wh { |
687 | my ($self) = @_; |
721 | my ($self) = @_; |
… | |
… | |
733 | |
767 | |
734 | # linearly scale sizes |
768 | # linearly scale sizes |
735 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
769 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
736 | $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; |
770 | $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; |
737 | |
771 | |
738 | $_ = int $_ for @$ws; #TODO: avoid rounding problems |
772 | CFClient::UI::harmonize $ws; |
739 | $_ = int $_ for @$hs; #TODO: avoid rounding problems |
773 | CFClient::UI::harmonize $hs; |
740 | |
774 | |
741 | my $y; |
775 | my $y; |
742 | |
776 | |
743 | for my $r (0 .. $#{$self->{children}}) { |
777 | for my $r (0 .. $#{$self->{children}}) { |
744 | my $row = $self->{children}[$r] |
778 | my $row = $self->{children}[$r] |
… | |
… | |
832 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
866 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
833 | $h[$_] = $alloc_h; |
867 | $h[$_] = $alloc_h; |
834 | } |
868 | } |
835 | } |
869 | } |
836 | |
870 | |
|
|
871 | CFClient::UI::harmonize \@h; |
|
|
872 | |
837 | my $y = 0; |
873 | my $y = 0; |
838 | for (0 .. $#$children) { |
874 | for (0 .. $#$children) { |
839 | my $child = $children->[$_]; |
875 | my $child = $children->[$_]; |
840 | my $h = int $h[$_]; |
876 | my $h = $h[$_]; |
841 | $child->size_allocate ($y, 0, $h, $w); |
877 | $child->size_allocate ($y, 0, $h, $w); |
842 | |
878 | |
843 | $y += $h; |
879 | $y += $h; |
844 | } |
880 | } |
845 | } |
881 | } |
… | |
… | |
886 | |
922 | |
887 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
923 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
888 | } |
924 | } |
889 | } |
925 | } |
890 | |
926 | |
|
|
927 | CFClient::UI::harmonize \@h; |
|
|
928 | |
891 | my $y = 0; |
929 | my $y = 0; |
892 | for (0 .. $#$children) { |
930 | for (0 .. $#$children) { |
893 | my $child = $children->[$_]; |
931 | my $child = $children->[$_]; |
894 | my $h = int $h[$_]; |
932 | my $h = $h[$_]; |
895 | $child->size_allocate (0, $y, $w, $h); |
933 | $child->size_allocate (0, $y, $w, $h); |
896 | |
934 | |
897 | $y += $h; |
935 | $y += $h; |
898 | } |
936 | } |
899 | } |
937 | } |
… | |
… | |
912 | my $self = $class->SUPER::new ( |
950 | my $self = $class->SUPER::new ( |
913 | fg => [1, 1, 1], |
951 | fg => [1, 1, 1], |
914 | fontsize => $::FONTSIZE, |
952 | fontsize => $::FONTSIZE, |
915 | text => "", |
953 | text => "", |
916 | align => -1, |
954 | align => -1, |
|
|
955 | valign => -1, |
917 | padding => 2, |
956 | padding => 2, |
918 | layout => new CFClient::Layout, |
957 | layout => new CFClient::Layout, |
919 | %arg |
958 | %arg |
920 | ); |
959 | ); |
921 | |
960 | |
… | |
… | |
998 | my $x = |
1037 | my $x = |
999 | $self->{align} < 0 ? $self->{padding} |
1038 | $self->{align} < 0 ? $self->{padding} |
1000 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1039 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} |
1001 | : ($self->{w} - $tex->{w}) * 0.5; |
1040 | : ($self->{w} - $tex->{w}) * 0.5; |
1002 | |
1041 | |
1003 | $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); |
1042 | my $y = |
|
|
1043 | $self->{valign} < 0 ? $self->{padding} |
|
|
1044 | : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} |
|
|
1045 | : ($self->{h} - $tex->{h}) * 0.5; |
|
|
1046 | |
|
|
1047 | $tex->draw_quad (int $x, int $y); |
1004 | |
1048 | |
1005 | glDisable GL_TEXTURE_2D; |
1049 | glDisable GL_TEXTURE_2D; |
1006 | glDisable GL_BLEND; |
1050 | glDisable GL_BLEND; |
1007 | } |
1051 | } |
1008 | |
1052 | |
… | |
… | |
1023 | bg => [0, 0, 0, 0.2], |
1067 | bg => [0, 0, 0, 0.2], |
1024 | active_bg => [1, 1, 1, 0.5], |
1068 | active_bg => [1, 1, 1, 0.5], |
1025 | active_fg => [0, 0, 0], |
1069 | active_fg => [0, 0, 0], |
1026 | can_hover => 1, |
1070 | can_hover => 1, |
1027 | can_focus => 1, |
1071 | can_focus => 1, |
|
|
1072 | valign => 0, |
1028 | @_ |
1073 | @_ |
1029 | ) |
1074 | ) |
1030 | } |
1075 | } |
1031 | |
1076 | |
1032 | sub _set_text { |
1077 | sub _set_text { |
… | |
… | |
1558 | |
1603 | |
1559 | return unless $self->{h} > 0; |
1604 | return unless $self->{h} > 0; |
1560 | |
1605 | |
1561 | delete $self->{texture}; |
1606 | delete $self->{texture}; |
1562 | |
1607 | |
1563 | $TOPLEVEL->on_refresh ($self, sub { |
1608 | $ROOT->on_refresh ($self, sub { |
1564 | if (delete $self->{need_reflow}) { |
1609 | if (delete $self->{need_reflow}) { |
1565 | my $height = 0; |
1610 | my $height = 0; |
1566 | |
1611 | |
1567 | $height += $_->[0] = $self->text_height ($_->[2]) |
1612 | $height += $_->[0] = $self->text_height ($_->[2]) |
1568 | for @{$self->{par}}; |
1613 | for @{$self->{par}}; |
… | |
… | |
1713 | |
1758 | |
1714 | if ($::MAP) { |
1759 | if ($::MAP) { |
1715 | my $sw = int $::WIDTH / 32; |
1760 | my $sw = int $::WIDTH / 32; |
1716 | my $sh = int $::HEIGHT / 32; |
1761 | my $sh = int $::HEIGHT / 32; |
1717 | |
1762 | |
1718 | my $sx = $::CFG->{map_shift_x}; |
1763 | my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; |
1719 | my $sy = $::CFG->{map_shift_y}; |
1764 | my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; |
1720 | |
1765 | |
1721 | glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0; |
1766 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
1722 | |
1767 | |
1723 | my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1); |
1768 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
1724 | |
1769 | |
1725 | if ($::CFG->{fow_enable}) { |
1770 | if ($::CFG->{fow_enable}) { |
1726 | if ($::CFG->{fow_smooth}) { # smooth fog of war |
1771 | if ($::CFG->{fow_smooth}) { # smooth fog of war |
1727 | glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; |
1772 | glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; |
1728 | glConvolutionFilter2D |
1773 | glConvolutionFilter2D |
… | |
… | |
1736 | 0.1, 0.1, 0.1, |
1781 | 0.1, 0.1, 0.1, |
1737 | ; |
1782 | ; |
1738 | glEnable GL_CONVOLUTION_2D; |
1783 | glEnable GL_CONVOLUTION_2D; |
1739 | } |
1784 | } |
1740 | |
1785 | |
1741 | my $tex = new CFClient::Texture |
1786 | $self->{fow_texture} = new CFClient::Texture |
1742 | w => $w, |
1787 | w => $w, |
1743 | h => $h, |
1788 | h => $h, |
1744 | data => $data, |
1789 | data => $data, |
1745 | internalformat => GL_ALPHA, |
1790 | internalformat => GL_ALPHA, |
1746 | format => GL_ALPHA; |
1791 | format => GL_ALPHA; |
… | |
… | |
1751 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1796 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1752 | glEnable GL_TEXTURE_2D; |
1797 | glEnable GL_TEXTURE_2D; |
1753 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1798 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1754 | |
1799 | |
1755 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
1800 | glColor +($::CFG->{fow_intensity}) x 3, 1; |
1756 | $tex->draw_quad (0, 0, $w * 32, $h * 32); |
1801 | $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); |
1757 | |
1802 | |
1758 | glDisable GL_TEXTURE_2D; |
1803 | glDisable GL_TEXTURE_2D; |
1759 | glDisable GL_BLEND; |
1804 | glDisable GL_BLEND; |
1760 | } |
1805 | } |
1761 | |
1806 | |
1762 | # HACK BEGIN |
1807 | # HACK BEGIN |
1763 | { |
1808 | { |
|
|
1809 | glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove |
1764 | my ($w, $h) = (250, 250); |
1810 | my ($w, $h) = (250, 250); |
1765 | |
1811 | |
1766 | glEnable GL_BLEND; |
1812 | glEnable GL_BLEND; |
1767 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1813 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1768 | glEnable GL_TEXTURE_2D; |
1814 | glEnable GL_TEXTURE_2D; |
1769 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1815 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1770 | |
1816 | |
|
|
1817 | $self->{mapmap_texture} = |
1771 | CFClient::Texture->new ( |
1818 | new CFClient::Texture |
1772 | w => $w, |
1819 | w => $w, |
1773 | h => $h, |
1820 | h => $h, |
1774 | data => $::MAP->mapmap ($w, $h), |
1821 | data => $::MAP->mapmap ($w, $h), |
1775 | type => GL_UNSIGNED_INT_8_8_8_8_REV |
1822 | type => GL_UNSIGNED_INT_8_8_8_8_REV; |
1776 | )->draw_quad (100, 100); |
1823 | |
|
|
1824 | $self->{mapmap_texture}->draw_quad (100, 100); |
1777 | |
1825 | |
1778 | glDisable GL_TEXTURE_2D; |
1826 | glDisable GL_TEXTURE_2D; |
1779 | glDisable GL_BLEND; |
1827 | glDisable GL_BLEND; |
1780 | } |
1828 | } |
1781 | # HACK END |
1829 | # HACK END |
… | |
… | |
1927 | sub toggle_flopper { |
1975 | sub toggle_flopper { |
1928 | my ($self) = @_; |
1976 | my ($self) = @_; |
1929 | |
1977 | |
1930 | # TODO: use animation |
1978 | # TODO: use animation |
1931 | if ($self->{state} = !$self->{state}) { |
1979 | if ($self->{state} = !$self->{state}) { |
1932 | $CFClient::UI::TOPLEVEL->add ($self->{other}); |
1980 | $CFClient::UI::ROOT->add ($self->{other}); |
1933 | $self->{other}->move ( |
1981 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
1934 | ($::WIDTH - $self->{other}{w}) * 0.5, |
1982 | $self->emit ("open"); |
1935 | ($::HEIGHT - $self->{other}{h}) * 0.5, |
|
|
1936 | ); |
|
|
1937 | } else { |
1983 | } else { |
1938 | $CFClient::UI::TOPLEVEL->remove ($self->{other}); |
1984 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
1985 | $self->emit ("close"); |
1939 | } |
1986 | } |
1940 | } |
|
|
1941 | |
1987 | |
1942 | ############################################################################# |
1988 | $self->emit (changed => $self->{state}); |
|
|
1989 | } |
1943 | |
1990 | |
|
|
1991 | ############################################################################# |
|
|
1992 | |
1944 | package CFClient::UI::Toplevel; |
1993 | package CFClient::UI::Root; |
1945 | |
1994 | |
1946 | our @ISA = CFClient::UI::Container::; |
1995 | our @ISA = CFClient::UI::Container::; |
1947 | |
1996 | |
1948 | use SDL::OpenGL; |
1997 | use SDL::OpenGL; |
1949 | |
1998 | |
… | |
… | |
1958 | |
2007 | |
1959 | $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) |
2008 | $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) |
1960 | for @{$self->{children}}; |
2009 | for @{$self->{children}}; |
1961 | } |
2010 | } |
1962 | |
2011 | |
1963 | sub translate { |
2012 | sub _topleft { |
1964 | my ($self, $x, $y) = @_; |
2013 | my ($self, $x, $y) = @_; |
1965 | |
2014 | |
1966 | ($x, $y) |
2015 | ($x, $y) |
1967 | } |
2016 | } |
1968 | |
2017 | |
… | |
… | |
1976 | sub add { |
2025 | sub add { |
1977 | my ($self, $widget) = @_; |
2026 | my ($self, $widget) = @_; |
1978 | |
2027 | |
1979 | $self->SUPER::add ($widget); |
2028 | $self->SUPER::add ($widget); |
1980 | |
2029 | |
1981 | $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); |
2030 | $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request); |
1982 | } |
2031 | } |
1983 | |
2032 | |
1984 | sub on_refresh { |
2033 | sub on_refresh { |
1985 | my ($self, $id, $cb) = @_; |
2034 | my ($self, $id, $cb) = @_; |
1986 | |
2035 | |
… | |
… | |
2009 | |
2058 | |
2010 | ############################################################################# |
2059 | ############################################################################# |
2011 | |
2060 | |
2012 | package CFClient::UI; |
2061 | package CFClient::UI; |
2013 | |
2062 | |
2014 | $TOPLEVEL = new CFClient::UI::Toplevel; |
2063 | $ROOT = new CFClient::UI::Root; |
2015 | |
2064 | |
2016 | 1 |
2065 | 1 |
2017 | |
2066 | |