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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 15:35:54 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;
… …
125 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
126 134
127 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
128} 136}
129 137
130# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
131sub translate { 139sub translate {
132 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
133 141
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135} 143}
… …
263 271
264 # range [value, low, high, page] 272 # range [value, low, high, page]
265 273
266 $class->SUPER::new ( 274 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 275 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 276 active_bg => [1, 1, 1, 0.5],
269 @_ 277 @_
270 ) 278 )
271} 279}
272 280
273sub _draw { 281sub _draw {
… …
629 637
630 my $bg = $tex[0]; 638 my $bg = $tex[0];
631 639
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636 642
637 my $rep_x = $cw / $bg->{w}; 643 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 644 my $rep_y = $ch / $bg->{h};
639 645
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
… …
735 741
736 my $x = 0; 742 my $x = 0;
737 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
738 744
739 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
744 747
748 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
746 751
747 $x += $col_w; 752 $x += $col_w;
748 } 753 }
749 754
750 $y += $row_h; 755 $y += $row_h;
… …
796} 801}
797 802
798sub size_allocate { 803sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
800 805
801 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
802
803 return unless $self->{w};
804 807
805 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
806 809
807 my $children = $self->{children}; 810 my $children = $self->{children};
808 811
… …
856} 859}
857 860
858sub size_allocate { 861sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
860 863
861 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
862
863 return unless $self->{h};
864 865
865 my $children = $self->{children}; 866 my $children = $self->{children};
866 867
867 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
868 869
… …
933 934
934 $self->{text} = $text; 935 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 936 $self->{layout}->set_markup ($text);
936 937
937 delete $self->{texture}; 938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
938 $self->update; 940 $self->update;
939} 941}
940 942
941sub get_text { 943sub get_text {
942 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
975sub _draw { 977sub _draw {
976 my ($self) = @_; 978 my ($self) = @_;
977 979
978 my $tex = $self->{texture} ||= do { 980 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 981 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
981 new_from_layout CFClient::Texture $self->{layout} 983 new_from_layout CFClient::Texture $self->{layout}
982 }; 984 };
983 985
984 glEnable GL_BLEND; 986 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
991 my $x = 993 my $x =
992 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
995 997
996 $tex->draw_quad ($x, $self->{padding}); 998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
997 1000
998 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1000} 1003}
1001 1004
… …
1012 my $class = shift; 1015 my $class = shift;
1013 1016
1014 $class->SUPER::new ( 1017 $class->SUPER::new (
1015 fg => [1, 1, 1], 1018 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1019 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1020 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1021 active_fg => [0, 0, 0],
1019 @_ 1022 @_
1020 ) 1023 )
1021} 1024}
1022 1025
… …
1025 1028
1026 $self->{last_activity} = $::NOW; 1029 $self->{last_activity} = $::NOW;
1027 1030
1028 $self->{text} = $text; 1031 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w}); 1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1030 1034
1031 $text =~ s/./*/g if $self->{hidden}; 1035 $text =~ s/./*/g if $self->{hidden};
1032 1036
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034 1038
… …
1155 } 1159 }
1156} 1160}
1157 1161
1158############################################################################# 1162#############################################################################
1159 1163
1164package CFClient::UI::Button;
1165
1166our @ISA = CFClient::UI::Label::;
1167
1168use SDL;
1169use SDL::OpenGL;
1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
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_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
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 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207
1208 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg};
1210 }
1211
1212 glBindTexture GL_TEXTURE_2D, $tex->{name};
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1214
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1216
1217 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219
1220 $self->SUPER::_draw;
1221}
1222
1223#############################################################################
1224
1225package CFClient::UI::CheckBox;
1226
1227our @ISA = CFClient::UI::DrawBG::;
1228
1229use SDL;
1230use SDL::OpenGL;
1231
1232my @tex =
1233 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1234 qw(b1_button_active.png);
1235
1236sub new {
1237 my $class = shift;
1238
1239 $class->SUPER::new (
1240 padding => 4,
1241 fg => [1, 1, 1],
1242 active_fg => [1, 1, 0],
1243 state => 0,
1244 @_
1245 )
1246}
1247
1248sub button_down {
1249 my ($self, $ev, $x, $y) = @_;
1250
1251 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1252 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1253 $self->{state} = !$self->{state};
1254 $self->emit ("changed");
1255 }
1256}
1257
1258sub _draw {
1259 my ($self) = @_;
1260
1261 local $self->{fg} = $self->{fg};
1262 my $tex = $tex[0];
1263
1264 glEnable GL_BLEND;
1265 glEnable GL_TEXTURE_2D;
1266 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1267
1268 if ($GRAB == $self) {
1269 $self->{fg} = $self->{active_fg};
1270 }
1271
1272 glBindTexture GL_TEXTURE_2D, $tex->{name};
1273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1274
1275 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1276
1277 glDisable GL_TEXTURE_2D;
1278 glDisable GL_BLEND;
1279
1280 $self->SUPER::_draw;
1281}
1282
1283#############################################################################
1284
1160package CFClient::UI::Slider; 1285package CFClient::UI::Slider;
1161 1286
1162use strict; 1287use strict;
1163 1288
1164use SDL::OpenGL; 1289use SDL::OpenGL;
… …
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1367 $value = int +($value - $lo) * $w / ($hi - $lo);
1243 1368
1244 $w -= $page; 1369 $w -= $page;
1245 $page &= ~1; 1370 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1371 glTranslate $page * 0.5, 0, 0;
1372 $page ||= 2;
1247 1373
1248 glColor @$fg; 1374 glColor @$fg;
1249 glBegin GL_LINES; 1375 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h; 1376 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h; 1377 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1429 my $mod = $ev->key_mod; 1555 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym; 1556 my $sym = $ev->key_sym;
1431 1557
1432 if ($sym == SDLK_KP5) { 1558 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire"); 1559 $::CONN->send ("command stay fire");
1560 } elsif ($sym == SDLK_a) {
1561 $::CONN->send ("command apply");
1434 } elsif (exists $DIR{$sym}) { 1562 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) { 1563 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++; 1564 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]"); 1565 $::CONN->send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) { 1566 } elsif ($mod & KMOD_CTRL) {

Diff Legend

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