ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
234 } 242 }
235} 243}
236 244
237sub size_allocate { 245sub size_allocate {
238 # nothing to be done 246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
239} 260}
240 261
241sub set_max_size { 262sub set_max_size {
242 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
243 264
… …
520 ]; 541 ];
521 542
522 $child->check_size; 543 $child->check_size;
523} 544}
524 545
546sub children {
547 @{ $_[0]{children} }
548}
549
525sub remove { 550sub remove {
526 my ($self, $child) = @_; 551 my ($self, $child) = @_;
527 552
528 delete $child->{parent}; 553 delete $child->{parent};
529 $child->hide; 554 $child->hide;
… …
626} 651}
627 652
628sub update { 653sub update {
629 my ($self) = @_; 654 my ($self) = @_;
630 655
631 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 657 $self->SUPER::update;
634} 658}
635 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
636sub render_chld { 667sub render_child {
637 my ($self) = @_; 668 my ($self) = @_;
638 669
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
641 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
643 }; 681 };
644}
645
646sub size_allocate {
647 my ($self, $w, $h) = @_;
648
649 $self->child->configure (0, 0, $w, $h);
650
651 $self->render_chld;
652} 682}
653 683
654sub _draw { 684sub _draw {
655 my ($self) = @_; 685 my ($self) = @_;
656 686
… …
658 688
659 my $tex = $self->{texture} 689 my $tex = $self->{texture}
660 or return; 690 or return;
661 691
662 glEnable GL_BLEND; 692 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
666 697
667 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
668 699
669 glDisable GL_BLEND; 700 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
757 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
758 789
759 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
762 border => 0.8, 793 border => 0.6,
763 can_events => 1, 794 can_events => 1,
764 @_ 795 @_
765 ); 796 );
766 797
767 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 799 align => 0,
769 valign => 1, 800 valign => 1,
770 text => $self->{title}, 801 text => $self->{title},
771 fontsize => 1; 802 fontsize => $self->{border};
772 803
773 $self 804 $self
774} 805}
775 806
776sub border { 807sub border {
… …
801} 832}
802 833
803sub button_down { 834sub button_down {
804 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
805 836
837 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 838 my $border = $self->border;
807 839
808 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
813 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
814 $self->{motion} = sub { 851 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
816 853
817 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
818 856
819 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 860 $self->check_size;
822 }; 861 };
823 862
824 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
829 866
830 $self->{motion} = sub { 867 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
915 $self->{children}[$y][$x] = $child; 952 $self->{children}[$y][$x] = $child;
916 953
917 $child->check_size; 954 $child->check_size;
918} 955}
919 956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
920# TODO: move to container class maybe? send childs a signal on removal? 961# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 962sub clear {
922 my ($self) = @_; 963 my ($self) = @_;
923 964
924 my $children = delete $self->{children}; 965 my @children = $self->children;
966 delete $self->{children};
925 967
926 for (grep $_, map @$_, grep $_, @$children) { 968 for (@children) {
927 delete $_->{parent}; 969 delete $_->{parent};
928 $_->hide; 970 $_->hide;
929 } 971 }
930 972
931 $self->update; 973 $self->update;
… …
1192 s/</&lt;/g; 1234 s/</&lt;/g;
1193 1235
1194 $_[1] 1236 $_[1]
1195} 1237}
1196 1238
1239sub update {
1240 my ($self) = @_;
1241
1242 delete $self->{texture};
1243 $self->SUPER::update;
1244}
1245
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1197sub set_text { 1252sub set_text {
1198 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
1199 1254
1255 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text";
1257
1200 $self->{layout}->set_text ($text); 1258 $self->{layout}->set_text ($text);
1201 1259
1202 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1203 $self->check_size; 1262 $self->check_size;
1204 $self->update;
1205} 1263}
1206 1264
1207sub set_markup { 1265sub set_markup {
1208 my ($self, $markup) = @_; 1266 my ($self, $markup) = @_;
1209 1267
1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1210 $self->{layout}->set_markup ($markup); 1271 $self->{layout}->set_markup ($markup);
1211 1272
1212 delete $self->{texture}; 1273 delete $self->{texture};
1274 $self->update;
1213 $self->check_size; 1275 $self->check_size;
1214 $self->update;
1215} 1276}
1216 1277
1217sub size_request { 1278sub size_request {
1218 my ($self) = @_; 1279 my ($self) = @_;
1219 1280
… …
1743} 1804}
1744 1805
1745sub set_max { 1806sub set_max {
1746 my ($self, $max) = @_; 1807 my ($self, $max) = @_;
1747 1808
1809 return if $self->{max_val} == $max;
1810
1748 $self->{max_val} = $max; 1811 $self->{max_val} = $max;
1812 $self->update;
1749} 1813}
1750 1814
1751sub set_value { 1815sub set_value {
1752 my ($self, $val, $max) = @_; 1816 my ($self, $val, $max) = @_;
1753 1817
1754 $self->set_max ($max) 1818 $self->set_max ($max)
1755 if defined $max; 1819 if defined $max;
1756 1820
1757 $max = $self->{max_val}; 1821 return if $self->{val} == $val;
1822
1758 $self->{val} = $val; 1823 $self->{val} = $val;
1759
1760 $self->update; 1824 $self->update;
1761} 1825}
1762 1826
1763sub _draw { 1827sub _draw {
1764 my ($self) = @_; 1828 my ($self) = @_;
… …
1827 1891
1828sub new { 1892sub new {
1829 my ($class, %arg) = @_; 1893 my ($class, %arg) = @_;
1830 1894
1831 my $self = $class->SUPER::new ( 1895 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 1896 tooltip => $arg{type},
1833 can_hover => 1, 1897 can_hover => 1,
1898 can_events => 1,
1834 %arg, 1899 %arg,
1835 ); 1900 );
1836 1901
1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1846 1911
1847 $self->{value}->set_fontsize ($fsize); 1912 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 1913 $self->{max} ->set_fontsize ($fsize);
1849} 1914}
1850 1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1851sub set_value { 1923sub set_value {
1852 my ($self, $val, $max) = @_; 1924 my ($self, $val, $max) = @_;
1853 1925
1854 $self->set_max ($max) 1926 $self->set_max ($max)
1855 if defined $max; 1927 if defined $max;
1856 1928
1857 $self->{gauge}->set_value ($val, $max); 1929 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 1930 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 1931}
1867 1932
1868############################################################################# 1933#############################################################################
1869 1934
1870package CFClient::UI::Slider; 1935package CFClient::UI::Slider;
… …
2024 (new CFClient::UI::Empty expand => 1), 2089 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2090 (new CFClient::UI::Slider vertical => 1),
2026 ], 2091 ],
2027 ); 2092 );
2028 2093
2029 $self->{children}[1]->connect (changed => sub { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2095
2033 $self 2096 $self
2034} 2097}
2035 2098
2036sub set_fontsize { 2099sub set_fontsize {
… …
2044 my ($self, $text) = @_; 2107 my ($self, $text) = @_;
2045 2108
2046 my $layout = $self->{layout}; 2109 my $layout = $self->{layout};
2047 2110
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w}); 2112 $layout->set_width ($self->{children}[0]{w});
2050 $layout->set_text ($text); 2113 $layout->set_text ($text);
2051 2114
2052 ($layout->size)[1] 2115 ($layout->size)[1]
2053} 2116}
2054 2117
… …
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2108 2171
2109 delete $self->{texture}; 2172 delete $self->{texture};
2110 } 2173 }
2111 2174
2112 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2113 glClearColor 0, 0, 0, 1; 2176 glClearColor 0, 0, 0, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2177 glClear GL_COLOR_BUFFER_BIT;
2115 2178
2116 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D; 2181 glEnable GL_TEXTURE_2D;
… …
2150} 2213}
2151 2214
2152sub _draw { 2215sub _draw {
2153 my ($self) = @_; 2216 my ($self) = @_;
2154 2217
2155 if ($self->{texture}) { 2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
2158 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159 glDisable GL_TEXTURE_2D; 2224 glDisable GL_TEXTURE_2D;
2160 } 2225 glDisable GL_BLEND;
2161 2226
2162 $self->{children}[1]->draw; 2227 $self->{children}[1]->draw;
2163 2228
2164} 2229}
2165 2230

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines