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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

… …
320sub set_visibility { 320sub set_visibility {
321 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
322 322
323 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
324 324
325 $visible ? $self->hide 325 $visible ? $self->show
326 : $self->show; 326 : $self->hide;
327} 327}
328 328
329sub toggle_visibility { 329sub toggle_visibility {
330 my ($self) = @_; 330 my ($self) = @_;
331 331
… …
1033 1033
1034############################################################################# 1034#############################################################################
1035 1035
1036package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1037 1037
1038our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1039 1039
1040sub new { 1040sub new {
1041 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1042 1042
1043 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1044 1044
1045 my $self; 1045 my $self;
1046 1046
1047 my $slider = new CFPlus::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1048 vertical => 1, 1057 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1059 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1062 },
1053 ; 1063 ;
1054 1064
1055 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1057 can_events => 1, 1068 can_events => 1,
1058 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1059 %arg, 1073 %arg,
1060 ); 1074 );
1061 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
1063 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1064 1085
1065 $self 1086 $self
1066} 1087}
1067 1088
… …
1074} 1095}
1075 1096
1076sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1078 1099
1079 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1080 1101
1081 $self->{slider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1082 1103
1083 1 1104 1
1084} 1105}
1085 1106
1086sub update_slider { 1107sub update_slider {
1087 my ($self) = @_; 1108 my ($self) = @_;
1088 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1090} 1129}
1091 1130
1092sub update { 1131sub update {
1093 my ($self) = @_; 1132 my ($self) = @_;
1094 1133
1095 $self->SUPER::update; 1134 $self->SUPER::update;
1096
1097 $self->update_slider; 1135 $self->update_slider;
1098} 1136}
1099 1137
1100sub invoke_size_allocate { 1138sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1102 1140
1103 $self->update_slider; 1141 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1106} 1143}
1107 1144
1108############################################################################# 1145#############################################################################
1109 1146
… …
1480 1517
1481sub new { 1518sub new {
1482 my $class = shift; 1519 my $class = shift;
1483 1520
1484 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1485 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1486 @_, 1525 @_,
1487 ) 1526 )
1488} 1527}
1489 1528
1490sub children { 1529sub children {
1491 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492} 1531}
1493 1532
1533# TODO: store row/col info in child widget and use standard add/del
1494sub add { 1534sub add {
1495 my ($self) = shift; 1535 my ($self) = shift;
1496 1536
1497 while (@_) { 1537 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1499 $child->set_parent ($self); 1539 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1501 } 1541 }
1502 1542
1503 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1505 $self->realloc; 1545 $self->realloc;
1506} 1546}
1507 1547
1508sub remove { 1548sub remove {
1509 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1510 1550
1511 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1512} 1556}
1513 1557
1514# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1515sub clear { 1559sub clear {
1516 my ($self) = @_; 1560 my ($self) = @_;
… …
1565 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1566 1610
1567 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1569 1613
1570 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1571 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1574 1618
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1620
1579 CFPlus::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1580 CFPlus::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1581 1630
1582 my $y; 1631 my $y;
1583 1632
1584 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
… …
1624 my ($self) = @_; 1673 my ($self) = @_;
1625 1674
1626 for (grep $_, @{$self->{children}}) { 1675 for (grep $_, @{$self->{children}}) {
1627 $_->draw for grep $_, @$_; 1676 $_->draw for grep $_, @$_;
1628 } 1677 }
1678}
1679
1680#############################################################################
1681
1682package CFPlus::UI::Fixed;
1683
1684use List::Util qw(min max);
1685
1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1629} 1760}
1630 1761
1631############################################################################# 1762#############################################################################
1632 1763
1633package CFPlus::UI::Box; 1764package CFPlus::UI::Box;
… …
3293 3424
3294sub new { 3425sub new {
3295 my $class = shift; 3426 my $class = shift;
3296 3427
3297 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3298 aspect => 1, 3431 aspect => 1,
3299 can_events => 0, 3432 can_events => 0,
3300 @_, 3433 @_,
3301 ); 3434 );
3302 3435
… …
3306 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308 hard => 1, 3441 hard => 1,
3309 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3310 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3311 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3312 $widget->update; 3448 $self->update;
3313 }, 3449 },
3314 ); 3450 );
3451
3452 $self->update_face;
3315 } 3453 }
3316 3454
3317 $self 3455 $self
3318} 3456}
3319 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3320sub size_request { 3471sub size_request {
3321 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
3322} 3487}
3323 3488
3324sub update { 3489sub update {
3325 my ($self) = @_; 3490 my ($self) = @_;
3326 3491
… …
3334 3499
3335 return unless $::CONN; 3500 return unless $::CONN;
3336 3501
3337 $self->SUPER::_draw; 3502 $self->SUPER::_draw;
3338 3503
3339 my $face;
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3343 3505 or return;
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347 3506
3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3349 3508
3350 if ($tex) { 3509 if ($tex) {
3351 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;

Diff Legend

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