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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.177 by root, Tue Apr 25 13:08:17 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) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 904 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 908
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 910 my $bg = $tex[0];
873 911
874 # TODO: repeat texture not scale 912 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 913 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 914 my $rep_y = $ch / $bg->{h};
877 915
878 glColor @{ $self->{bg} }; 916 glColor @{ $self->{bg} };
879 917
880 $bg->{s} = $rep_x; 918 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 919 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 920 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 921 $bg->draw_quad ($border, $border, $cw, $ch);
884 922
885 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 924 glDisable GL_BLEND;
925 }
887 926
888 $self->{title}->draw if $self->{title}; 927 $self->{title}->draw if $self->{title};
928
889 $self->child->draw; 929 $self->child->draw;
890} 930}
891 931
892############################################################################# 932#############################################################################
893 933
… …
915 $self->{children}[$y][$x] = $child; 955 $self->{children}[$y][$x] = $child;
916 956
917 $child->check_size; 957 $child->check_size;
918} 958}
919 959
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
920# TODO: move to container class maybe? send childs a signal on removal? 964# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 965sub clear {
922 my ($self) = @_; 966 my ($self) = @_;
923 967
924 my $children = delete $self->{children}; 968 my @children = $self->children;
969 delete $self->{children};
925 970
926 for (grep $_, map @$_, grep $_, @$children) { 971 for (@children) {
927 delete $_->{parent}; 972 delete $_->{parent};
928 $_->hide; 973 $_->hide;
929 } 974 }
930 975
931 $self->update; 976 $self->update;
… …
1192 s/</&lt;/g; 1237 s/</&lt;/g;
1193 1238
1194 $_[1] 1239 $_[1]
1195} 1240}
1196 1241
1242sub update {
1243 my ($self) = @_;
1244
1245 delete $self->{texture};
1246 $self->SUPER::update;
1247}
1248
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1197sub set_text { 1255sub set_text {
1198 my ($self, $text) = @_; 1256 my ($self, $text) = @_;
1199 1257
1258 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text";
1260
1200 $self->{layout}->set_text ($text); 1261 $self->{layout}->set_text ($text);
1201 1262
1202 delete $self->{texture}; 1263 delete $self->{texture};
1264 $self->update;
1203 $self->check_size; 1265 $self->check_size;
1204 $self->update;
1205} 1266}
1206 1267
1207sub set_markup { 1268sub set_markup {
1208 my ($self, $markup) = @_; 1269 my ($self, $markup) = @_;
1209 1270
1271 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup";
1273
1210 $self->{layout}->set_markup ($markup); 1274 $self->{layout}->set_markup ($markup);
1211 1275
1212 delete $self->{texture}; 1276 delete $self->{texture};
1277 $self->update;
1213 $self->check_size; 1278 $self->check_size;
1214 $self->update;
1215} 1279}
1216 1280
1217sub size_request { 1281sub size_request {
1218 my ($self) = @_; 1282 my ($self) = @_;
1219 1283
… …
1743} 1807}
1744 1808
1745sub set_max { 1809sub set_max {
1746 my ($self, $max) = @_; 1810 my ($self, $max) = @_;
1747 1811
1812 return if $self->{max_val} == $max;
1813
1748 $self->{max_val} = $max; 1814 $self->{max_val} = $max;
1815 $self->update;
1749} 1816}
1750 1817
1751sub set_value { 1818sub set_value {
1752 my ($self, $val, $max) = @_; 1819 my ($self, $val, $max) = @_;
1753 1820
1754 $self->set_max ($max) 1821 $self->set_max ($max)
1755 if defined $max; 1822 if defined $max;
1756 1823
1757 $max = $self->{max_val}; 1824 return if $self->{val} == $val;
1825
1758 $self->{val} = $val; 1826 $self->{val} = $val;
1759
1760 $self->update; 1827 $self->update;
1761} 1828}
1762 1829
1763sub _draw { 1830sub _draw {
1764 my ($self) = @_; 1831 my ($self) = @_;
… …
1847 1914
1848 $self->{value}->set_fontsize ($fsize); 1915 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 1916 $self->{max} ->set_fontsize ($fsize);
1850} 1917}
1851 1918
1919sub set_max {
1920 my ($self, $max) = @_;
1921
1922 $self->{gauge}->set_max ($max);
1923 $self->{max}->set_text ($max);
1924}
1925
1852sub set_value { 1926sub set_value {
1853 my ($self, $val, $max) = @_; 1927 my ($self, $val, $max) = @_;
1854 1928
1855 $self->set_max ($max) 1929 $self->set_max ($max)
1856 if defined $max; 1930 if defined $max;
1857 1931
1858 $self->{gauge}->set_value ($val, $max); 1932 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 1933 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 1934}
1868 1935
1869############################################################################# 1936#############################################################################
1870 1937
1871package CFClient::UI::Slider; 1938package CFClient::UI::Slider;
… …
2025 (new CFClient::UI::Empty expand => 1), 2092 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2093 (new CFClient::UI::Slider vertical => 1),
2027 ], 2094 ],
2028 ); 2095 );
2029 2096
2030 $self->{children}[1]->connect (changed => sub { 2097 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2098
2034 $self 2099 $self
2035} 2100}
2036 2101
2037sub set_fontsize { 2102sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2110 my ($self, $text) = @_;
2046 2111
2047 my $layout = $self->{layout}; 2112 my $layout = $self->{layout};
2048 2113
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2115 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2116 $layout->set_text ($text);
2052 2117
2053 ($layout->size)[1] 2118 ($layout->size)[1]
2054} 2119}
2055 2120
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2174
2110 delete $self->{texture}; 2175 delete $self->{texture};
2111 } 2176 }
2112 2177
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2114 glClearColor 0, 0, 0, 1; 2179 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2180 glClear GL_COLOR_BUFFER_BIT;
2116 2181
2117 glEnable GL_BLEND; 2182 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
… …
2151} 2216}
2152 2217
2153sub _draw { 2218sub _draw {
2154 my ($self) = @_; 2219 my ($self) = @_;
2155 2220
2156 if ($self->{texture}) { 2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2157 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1;
2159 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160 glDisable GL_TEXTURE_2D; 2227 glDisable GL_TEXTURE_2D;
2161 } 2228 glDisable GL_BLEND;
2162 2229
2163 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2164 2231
2165} 2232}
2166 2233

Diff Legend

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