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.418 by elmex, Tue Jul 24 18:39:39 2007 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

… …
1027 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1028 1028
1029 my $self; 1029 my $self;
1030 1030
1031 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0, 1032 c_col => 0,
1033 row => 1, 1033 c_row => 1,
1034 vertical => 0, 1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1036 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1039 },
1040 ; 1040 ;
1041 1041
1042 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1, 1043 c_col => 1,
1044 row => 0, 1044 c_row => 0,
1045 vertical => 1, 1045 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1047 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1060 row_expand => [1, 0], 1060 row_expand => [1, 0],
1061 %arg, 1061 %arg,
1062 ); 1062 );
1063 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0, 1065 c_col => 0,
1066 row => 0, 1066 c_row => 0,
1067 expand => 1, 1067 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1598 1598
1599sub add { 1599sub add {
1600 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1601 1601
1602 for my $child (@widgets) { 1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1605 } 1605 }
1606 1606
1607 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1608} 1608}
1609 1609
… …
1613 my @widgets; 1613 my @widgets;
1614 1614
1615 while (@_) { 1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1617
1618 $child->{row} = $row; 1618 $child->{c_row} = $row;
1619 $child->{col} = $col; 1619 $child->{c_col} = $col;
1620 1620
1621 push @widgets, $child; 1621 push @widgets, $child;
1622 } 1622 }
1623 1623
1624 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1630 my (@w, @h); 1630 my (@w, @h);
1631 1631
1632 my @children = $self->children; 1632 my @children = $self->children;
1633 1633
1634 # first pass, columns 1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1637
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1639
1640 if ($w > $sw) { 1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1642 }
1643 } 1643 }
1644 1644
1645 # second pass, rows 1645 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1648
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1650
1651 if ($h > $sh) { 1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1694 1694
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1697
1698 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1700
1701 $widget->configure ( 1701 $widget->configure (
1702 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1704 );
… …
1923 1923
1924 delete $self->{ox}; 1924 delete $self->{ox};
1925 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1926} 1926}
1927 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1928sub set_text { 1934sub set_text {
1929 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1930 1936
1931 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2074 my $class = shift; 2080 my $class = shift;
2075 2081
2076 $class->SUPER::new ( 2082 $class->SUPER::new (
2077 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2079 active_bg => [0, 0, 1, .2], 2086 active_bg => [0, 0, 1, .2],
2080 active_fg => [1, 1, 1], 2087 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0], 2088 active_outline => [1, 1, 0],
2082 can_hover => 1, 2089 can_hover => 1,
2083 can_focus => 1, 2090 can_focus => 1,
… …
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2255 glEnd; 2262 glEnd;
2256 2263
2257 glLineWidth 3; 2264 glLineWidth 3;
2258 glColor @{$self->{active_outline}}; 2265 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP; 2266 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0; 2267 glVertex 0, 0;
2262 glVertex $self->{w}, 0; 2268 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w}, $self->{h}; 2269 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h}; 2270 glVertex 0, $self->{h} - 1;
2265 glEnd; 2271 glEnd;
2266 glLineWidth 1; 2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2282 glEnd;
2267 } 2283 }
2268} 2284}
2269 2285
2270############################################################################# 2286#############################################################################
2271 2287
… …
3488 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3489 3505
3490 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3491 3507
3492 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3493 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3494 glVertex 0 , 0;
3495 glVertex 0 , $h;
3496 glVertex $w, $h;
3497 glVertex $w, 0;
3498 glEnd;
3499 3510
3500 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3501 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3502 glVertex 0 , 0; 3513 glVertex 0 , 0;
3503 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3578 3589
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) { 3591 if ($anim && @$anim) {
3581 delete $self->{wait_face}; 3592 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3595 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure });
3597 }
3598 }
3584 } 3599 }
3585 } 3600 }
3586} 3601}
3587 3602
3588sub size_request { 3603sub size_request {
3589 my ($self) = @_; 3604 my ($self) = @_;
3590 3605
3591 if ($::CONN) { 3606 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) { 3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex; 3609 if ($tex->{name}) {
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure });
3613 }
3596 } else { 3614 } else {
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3598 $self->realloc; 3616 $self->reconfigure;
3599 }); 3617 });
3600 } 3618 }
3601 } 3619 }
3602 } 3620 }
3603 3621
… …
4188} 4206}
4189 4207
4190sub update { 4208sub update {
4191 my ($self) = @_; 4209 my ($self) = @_;
4192 4210
4193 $::WANT_REFRESH++; 4211 $::WANT_REFRESH->start;
4194} 4212}
4195 4213
4196sub add { 4214sub add {
4197 my ($self, @children) = @_; 4215 my ($self, @children) = @_;
4198 4216

Diff Legend

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