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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC

… …
79use SDL::OpenGL; 79use SDL::OpenGL;
80 80
81sub new { 81sub new {
82 my $class = shift; 82 my $class = shift;
83 83
84 bless { 84 my $self = bless {
85 x => 0, 85 x => 0,
86 y => 0, 86 y => 0,
87 z => 0, 87 z => 0,
88 w => -1, 88 w => -1,
89 h => -1, 89 h => -1,
90 @_ 90 @_
91 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
92} 100}
93 101
94sub move { 102sub move {
95 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 104 $self->{x} = $x;
… …
200 my ($self) = @_; 208 my ($self) = @_;
201 209
202 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
203} 211}
204 212
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 213sub find_widget {
217 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
218 215
219 return $self 216 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 217 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 219
223 () 220 ()
224} 221}
225 222
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 223sub set_parent {
229 my ($self, $par) = @_; 224 my ($self, $par) = @_;
230 225
231 $self->{parent} = $par; 226 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
276 271
277 # range [value, low, high, page] 272 # range [value, low, high, page]
278 273
279 $class->SUPER::new ( 274 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 275 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 276 active_bg => [1, 1, 1, 0.5],
282 @_ 277 @_
283 ) 278 )
284} 279}
285 280
286sub _draw { 281sub _draw {
… …
537 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538 533
539sub size_request { 534sub size_request {
540 my ($self) = @_; 535 my ($self) = @_;
541 536
542 my ($w, $h) = 537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543 $self->{user_w} && $self->{user_h} 538
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request); 539 my ($w, $h) = $self->SUPER::size_request;
546 540
547 $h += $tex[1]->{h}; 541 $h += $tex[1]->{h};
548 $h += $tex[4]->{h}; 542 $h += $tex[4]->{h};
549 $w += $tex[2]->{w}; 543 $w += $tex[2]->{w};
550 $w += $tex[3]->{w}; 544 $w += $tex[3]->{w};
… …
668 662
669use List::Util qw(max sum); 663use List::Util qw(max sum);
670 664
671use SDL::OpenGL; 665use SDL::OpenGL;
672 666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
675
673sub add { 676sub add {
674 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
675 678
676 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
677 $chld->set_parent ($self); 680 $chld->set_parent ($self);
… …
706 my ($self) = @_; 709 my ($self) = @_;
707 710
708 my ($ws, $hs) = $self->get_wh; 711 my ($ws, $hs) = $self->get_wh;
709 712
710 ( 713 (
711 (List::Util::sum @$ws), 714 (sum @$ws),
712 (List::Util::sum @$hs), 715 (sum @$hs),
713 ) 716 )
714} 717}
715 718
716sub size_allocate { 719sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 720 my ($self, $x, $y, $w, $h) = @_;
718 721
719 $self->_size_allocate ($x, $y, $w, $h) or return; 722 $self->_size_allocate ($x, $y, $w, $h) or return;
720 723
721 my ($ws, $hs) = $self->get_wh; 724 my ($ws, $hs) = $self->get_wh;
722 725
723 my $req_w = List::Util::sum @$ws; 726 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
725 733
726 # linearly scale sizes 734 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 737
730 my $y; 738 my $y;
731 739
732 for my $r (0 .. $#{$self->{children}}) { 740 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 741 my $row = $self->{children}[$r]
… …
810 818
811 my $req_h = List::Util::sum @h; 819 my $req_h = List::Util::sum @h;
812 820
813 if ($req_h > $h) { 821 if ($req_h > $h) {
814 # ah well, not enough space 822 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 823 $_ *= $h / $req_h for @h;
816 } else { 824 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 825 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 826 $exp ||= 1;
819 827
820 for (0 .. $#$children) { 828 for (0 .. $#$children) {
… …
868 876
869 my $req_h = List::Util::sum @h; 877 my $req_h = List::Util::sum @h;
870 878
871 if ($req_h > $h) { 879 if ($req_h > $h) {
872 # ah well, not enough space 880 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 881 $_ *= $h / $req_h for @h;
874 } else { 882 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 883 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 884 $exp ||= 1;
877 885
878 for (0 .. $#$children) { 886 for (0 .. $#$children) {
… …
975sub _draw { 983sub _draw {
976 my ($self) = @_; 984 my ($self) = @_;
977 985
978 my $tex = $self->{texture} ||= do { 986 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 987 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});
980 new_from_layout CFClient::Texture $self->{layout} 989 new_from_layout CFClient::Texture $self->{layout}
981 }; 990 };
982 991
983 glEnable GL_BLEND; 992 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1011 my $class = shift; 1020 my $class = shift;
1012 1021
1013 $class->SUPER::new ( 1022 $class->SUPER::new (
1014 fg => [1, 1, 1], 1023 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1024 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1025 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1026 active_fg => [0, 0, 0],
1018 @_ 1027 @_
1019 ) 1028 )
1020} 1029}
1021 1030
… …
1154 } 1163 }
1155} 1164}
1156 1165
1157############################################################################# 1166#############################################################################
1158 1167
1168package CFClient::UI::Button;
1169
1170our @ISA = CFClient::UI::Label::;
1171
1172use SDL;
1173use SDL::OpenGL;
1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0],
1185 @_
1186 )
1187}
1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
1196}
1197
1198sub _draw {
1199 my ($self) = @_;
1200
1201 local $self->{fg} = $self->{fg};
1202
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 }
1222
1223 glBegin GL_QUADS;
1224 glVertex 2 , 2;
1225 glVertex 2 , $self->{h} - 2;
1226 glVertex $self->{w} - 2, $self->{h} - 2;
1227 glVertex $self->{w} - 2, 2;
1228 glEnd;
1229 glDisable GL_BLEND;
1230
1231 $self->SUPER::_draw;
1232}
1233
1234#############################################################################
1235
1159package CFClient::UI::Slider; 1236package CFClient::UI::Slider;
1160 1237
1161use strict; 1238use strict;
1162 1239
1163use SDL::OpenGL; 1240use SDL::OpenGL;
… …
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1318 $value = int +($value - $lo) * $w / ($hi - $lo);
1242 1319
1243 $w -= $page; 1320 $w -= $page;
1244 $page &= ~1; 1321 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1322 glTranslate $page * 0.5, 0, 0;
1323 $page ||= 2;
1246 1324
1247 glColor @$fg; 1325 glColor @$fg;
1248 glBegin GL_LINES; 1326 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h; 1327 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h; 1328 glVertex $w - 1, 0; glVertex $w - 1, $h;

Diff Legend

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