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.419 by root, Tue Jul 24 19:32:21 2007 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 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";
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2039 2045
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2051 };
2044 2052
2045# unless ($self->{list}) { 2053# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2055# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2057# CFPlus::OpenGL::glEndList;
2050# } 2058# }
2051# 2059#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2060# CFPlus::OpenGL::glCallList $self->{list};
2053 2061
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2062 $self->{layout}->draw;
2055} 2063}
2056 2064
2057#sub destroy { 2065#sub destroy {
2058# my ($self) = @_; 2066# my ($self) = @_;
2059# 2067#
… …
2074 my $class = shift; 2082 my $class = shift;
2075 2083
2076 $class->SUPER::new ( 2084 $class->SUPER::new (
2077 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2079 active_bg => [0, 0, 1, .2], 2088 active_bg => [0, 0, 1, .2],
2080 active_fg => [1, 1, 1], 2089 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0], 2090 active_outline => [1, 1, 0],
2082 can_hover => 1, 2091 can_hover => 1,
2083 can_focus => 1, 2092 can_focus => 1,
… …
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2255 glEnd; 2264 glEnd;
2256 2265
2257 glLineWidth 3; 2266 glLineWidth 3;
2258 glColor @{$self->{active_outline}}; 2267 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP; 2268 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0; 2269 glVertex 0, 0;
2262 glVertex $self->{w}, 0; 2270 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w}, $self->{h}; 2271 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h}; 2272 glVertex 0, $self->{h} - 1;
2265 glEnd; 2273 glEnd;
2266 glLineWidth 1; 2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2284 glEnd;
2267 } 2285 }
2268} 2286}
2269 2287
2270############################################################################# 2288#############################################################################
2271 2289
… …
2633 align => 0, 2651 align => 0,
2634 valign => 0, 2652 valign => 0,
2635 can_events => 1, 2653 can_events => 1,
2636 @_ 2654 @_
2637 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2638} 2662}
2639 2663
2640sub invoke_button_up { 2664sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2642 2666
… …
3288 3312
3289 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3290 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3291 3315
3292 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3293 3318
3294 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3295 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3296 3321
3297 for (@w) { 3322 for (@w) {
… …
3530 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3531 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3532 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3533 parked => 1, 3558 parked => 1,
3534 cb => sub { 3559 cb => sub {
3535 return unless $::CONN && $widget; 3560 return unless $::CONN;
3536 3561
3562 my $w = $widget
3563 or return;
3564
3537 ++$widget->{frame}; 3565 ++$w->{frame};
3538 $widget->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3539 $widget->update; 3569 $w->update;
3540
3541 $widget->update_timer; 3570 $w->update_timer;
3542 }, 3571 },
3543 ); 3572 );
3544 3573
3545 $self->update_face; 3574 $self->update_face;
3546 $self->update_timer; 3575 $self->update_timer;
… …
3567} 3596}
3568 3597
3569sub update_face { 3598sub update_face {
3570 my ($self) = @_; 3599 my ($self) = @_;
3571 3600
3572 return unless $::CONN; 3601 if ($::CONN) {
3573
3574 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3575 if ($anim && @$anim) { 3603 if ($anim && @$anim) {
3576 delete $self->{wait_face};
3577 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3605 delete $self->{face_change_cb};
3606
3578 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3612 }
3579 } 3613 }
3580 } 3614 }
3581} 3615}
3582 3616
3583sub size_request { 3617sub size_request {
3584 my ($self) = @_; 3618 my ($self) = @_;
3585 3619
3586 if ($::CONN) { 3620 if ($::CONN) {
3587 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3588 if (my $tex = $::CONN->{texture}[$faceid]) { 3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3589 $self->{tex} = $tex; 3623 if ($tex->{name}) {
3590 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3591 } else { 3625 } elsif (!$tex->{loading}) {
3592 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3626 $tex->upload (sub { $self->reconfigure });
3593 $self->realloc;
3594 }); 3627 }
3595 } 3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3596 } 3631 }
3597 } 3632 }
3598 3633
3599 ($self->{size_w} || 8, $self->{size_h} || 8) 3634 ($self->{size_w} || 8, $self->{size_h} || 8)
3600} 3635}
… …
4183} 4218}
4184 4219
4185sub update { 4220sub update {
4186 my ($self) = @_; 4221 my ($self) = @_;
4187 4222
4188 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
4189} 4224}
4190 4225
4191sub add { 4226sub add {
4192 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
4193 4228

Diff Legend

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