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.79 by root, Wed Apr 12 00:26:50 2006 UTC vs.
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC

… …
133 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
134 134
135 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
136} 136}
137 137
138# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
139sub translate { 139sub translate {
140 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
141 141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
143} 143}
… …
637 637
638 my $bg = $tex[0]; 638 my $bg = $tex[0];
639 639
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644 642
645 my $rep_x = $cw / $bg->{w}; 643 my $rep_x = $cw / $bg->{w};
646 my $rep_y = $ch / $bg->{h}; 644 my $rep_y = $ch / $bg->{h};
647 645
648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
… …
743 741
744 my $x = 0; 742 my $x = 0;
745 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
746 744
747 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
748 my $widget = $row->[$c]
749 or next;
750
751 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
752 747
748 if (my $widget = $row->[$c]) {
753 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
754 751
755 $x += $col_w; 752 $x += $col_w;
756 } 753 }
757 754
758 $y += $row_h; 755 $y += $row_h;
… …
804} 801}
805 802
806sub size_allocate { 803sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
808 805
809 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h);
810
811 return unless $self->{w};
812 807
813 ($h, $w) = ($w, $h); 808 ($h, $w) = ($w, $h);
814 809
815 my $children = $self->{children}; 810 my $children = $self->{children};
816 811
… …
864} 859}
865 860
866sub size_allocate { 861sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
868 863
869 $self->_size_allocate ($x, $y, $w, $h) or return; 864 $self->_size_allocate ($x, $y, $w, $h);
870
871 return unless $self->{h};
872 865
873 my $children = $self->{children}; 866 my $children = $self->{children};
874 867
875 my @h = map +($_->size_request)[1], @$children; 868 my @h = map +($_->size_request)[1], @$children;
876 869
… …
941 934
942 $self->{text} = $text; 935 $self->{text} = $text;
943 $self->{layout}->set_markup ($text); 936 $self->{layout}->set_markup ($text);
944 937
945 delete $self->{texture}; 938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
946 $self->update; 940 $self->update;
947} 941}
948 942
949sub get_text { 943sub get_text {
950 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
983sub _draw { 977sub _draw {
984 my ($self) = @_; 978 my ($self) = @_;
985 979
986 my $tex = $self->{texture} ||= do { 980 my $tex = $self->{texture} ||= do {
987 $self->{layout}->set_width ($self->{w}); 981 $self->{layout}->set_width ($self->{w});
988 $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});
989 new_from_layout CFClient::Texture $self->{layout} 983 new_from_layout CFClient::Texture $self->{layout}
990 }; 984 };
991 985
992 glEnable GL_BLEND; 986 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
999 my $x = 993 my $x =
1000 $self->{align} < 0 ? $self->{padding} 994 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5; 996 : ($self->{w} - $tex->{w}) * 0.5;
1003 997
1004 $tex->draw_quad ($x, $self->{padding}); 998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
1005 1000
1006 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1008} 1003}
1009 1004
… …
1033 1028
1034 $self->{last_activity} = $::NOW; 1029 $self->{last_activity} = $::NOW;
1035 1030
1036 $self->{text} = $text; 1031 $self->{text} = $text;
1037 $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});
1038 1034
1039 $text =~ s/./*/g if $self->{hidden}; 1035 $text =~ s/./*/g if $self->{hidden};
1040 1036
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042 1038
… …
1170our @ISA = CFClient::UI::Label::; 1166our @ISA = CFClient::UI::Label::;
1171 1167
1172use SDL; 1168use SDL;
1173use SDL::OpenGL; 1169use SDL::OpenGL;
1174 1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new { 1175sub new {
1176 my $class = shift; 1176 my $class = shift;
1177 1177
1178 $class->SUPER::new ( 1178 $class->SUPER::new (
1179 padding => 4, 1179 padding => 4,
1180 fg => [1, 1, 1], 1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1181 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0], 1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184 border_fg => [1, 1, 0], 1184# border_fg => [1, 1, 0],
1185 @_ 1185 @_
1186 ) 1186 )
1187} 1187}
1188 1188
1189sub button_up { 1189sub button_up {
… …
1197 1197
1198sub _draw { 1198sub _draw {
1199 my ($self) = @_; 1199 my ($self) = @_;
1200 1200
1201 local $self->{fg} = $self->{fg}; 1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1202 1203
1203 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1207
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) { 1208 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg}; 1209 $self->{fg} = $self->{active_fg};
1219 } else { 1210 }
1220 glColor @{$self->{bg}}; 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 @_
1221 } 1245 )
1246}
1222 1247
1223 glBegin GL_QUADS; 1248sub button_down {
1224 glVertex 2 , 2; 1249 my ($self, $ev, $x, $y) = @_;
1225 glVertex 2 , $self->{h} - 2; 1250
1226 glVertex $self->{w} - 2, $self->{h} - 2; 1251 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1227 glVertex $self->{w} - 2, 2; 1252 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1228 glEnd; 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;
1229 glDisable GL_BLEND; 1278 glDisable GL_BLEND;
1230 1279
1231 $self->SUPER::_draw; 1280 $self->SUPER::_draw;
1232} 1281}
1233 1282
… …
1318 $value = int +($value - $lo) * $w / ($hi - $lo); 1367 $value = int +($value - $lo) * $w / ($hi - $lo);
1319 1368
1320 $w -= $page; 1369 $w -= $page;
1321 $page &= ~1; 1370 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0; 1371 glTranslate $page * 0.5, 0, 0;
1372 $page ||= 2;
1323 1373
1324 glColor @$fg; 1374 glColor @$fg;
1325 glBegin GL_LINES; 1375 glBegin GL_LINES;
1326 glVertex 0, 0; glVertex 0, $h; 1376 glVertex 0, 0; glVertex 0, $h;
1327 glVertex $w - 1, 0; glVertex $w - 1, $h; 1377 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1505 my $mod = $ev->key_mod; 1555 my $mod = $ev->key_mod;
1506 my $sym = $ev->key_sym; 1556 my $sym = $ev->key_sym;
1507 1557
1508 if ($sym == SDLK_KP5) { 1558 if ($sym == SDLK_KP5) {
1509 $::CONN->send ("command stay fire"); 1559 $::CONN->send ("command stay fire");
1560 } elsif ($sym == SDLK_a) {
1561 $::CONN->send ("command apply");
1510 } elsif (exists $DIR{$sym}) { 1562 } elsif (exists $DIR{$sym}) {
1511 if ($mod & KMOD_SHIFT) { 1563 if ($mod & KMOD_SHIFT) {
1512 $self->{shft}++; 1564 $self->{shft}++;
1513 $::CONN->send ("command fire $DIR{$sym}[0]"); 1565 $::CONN->send ("command fire $DIR{$sym}[0]");
1514 } elsif ($mod & KMOD_CTRL) { 1566 } elsif ($mod & KMOD_CTRL) {

Diff Legend

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