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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
598 593
599# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 595# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 597
603sub draw { 598#sub draw {
604 my ($self) = @_; 599#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 600
650sub _draw { 601sub _draw {
651 my ($self) = @_; 602 my ($self) = @_;
652 603
653 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
654} 605}
655 606
656my $cntx;#d#
657sub DESTROY { 607sub DESTROY {
658 my ($self) = @_; 608 my ($self) = @_;
659 609
660 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
661 611
… …
746 can_events => 0, 696 can_events => 0,
747 %arg, 697 %arg,
748 ); 698 );
749 699
750 $self->add (@$children) 700 $self->add (@$children)
751 if $children; 701 if $children && @$children;
752 702
753 $self 703 $self
754} 704}
755 705
756sub realloc { 706sub realloc {
… …
765 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
766 716
767 $_->set_parent ($self) 717 $_->set_parent ($self)
768 for @widgets; 718 for @widgets;
769 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 721 use sort 'stable';
771 722
772 $self->{children} = [ 723 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
775 ]; 726 ];
776 727
777 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
778} 731}
779 732
780sub children { 733sub children {
781 @{ $_[0]{children} } 734 @{ $_[0]{children} }
782} 735}
… …
793} 746}
794 747
795sub clear { 748sub clear {
796 my ($self) = @_; 749 my ($self) = @_;
797 750
798 my $children = delete $self->{children}; 751 my $children = $self->{children};
799 $self->{children} = []; 752 $self->{children} = [];
800 753
801 for (@$children) { 754 for (@$children) {
802 delete $_->{parent}; 755 delete $_->{parent};
803 $_->hide; 756 $_->hide;
… …
963sub size_request { 916sub size_request {
964 my ($self) = @_; 917 my ($self) = @_;
965 918
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 920
968 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
970 923
971 ($w, $h) 924 ($w, $h)
972} 925}
973 926
974sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
986} 939}
987 940
988sub set_offset { 941sub set_offset {
989 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
990 943
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 946
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
948 $self->{view_x} = $x;
949 $self->{view_y} = $y;
950
951 $self->emit (changed => $x, $y);
995 $self->update; 952 $self->update;
953 }
996} 954}
997 955
998# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local { 957sub coord2local {
1000 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1016 974
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 977 ) {
1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021 } else { 979 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 } 981 }
1024} 982}
1025 983
… …
1046 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1047 1005
1048 my $self; 1006 my $self;
1049 1007
1050 my $hslider = new CFPlus::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1051 vertical => 0, 1011 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1012 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1013 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1014 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1016 },
1057 ; 1017 ;
1058 1018
1059 my $vslider = new CFPlus::UI::Slider 1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1060 vertical => 1, 1022 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1024 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1025 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1037 row_expand => [1, 0],
1076 %arg, 1038 %arg,
1077 ); 1039 );
1078 1040
1079 $self->{vp} = new CFPlus::UI::ViewPort 1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1080 expand => 1, 1044 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1045 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1046 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1047 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1048 my ($vp, $x, $y) = @_;
1049
1085 $vp->{parent}{hslider}->set_value ($x); 1050 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1051 $vp->{parent}{vslider}->set_value ($y);
1087 1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1088 0 1058 0
1089 }, 1059 },
1090 ; 1060 ;
1091 1061
1092 $self->SUPER::add (0, 0, $self->{vp}); 1062 $self->SUPER::add ($self->{vp});
1093 1063
1094 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1095 1065
1096 $self 1066 $self
1097} 1067}
1098
1099#TODO# update range on size_allocate depending on child
1100 1068
1101sub add { 1069sub add {
1102 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1103 1071
1104 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
… …
1107sub update_slider { 1075sub update_slider {
1108 my ($self) = @_; 1076 my ($self) = @_;
1109 1077
1110 my $child = ($self->{vp} or return)->child; 1078 my $child = ($self->{vp} or return)->child;
1111 1079
1080 if ($self->{scroll_x}) {
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114 1083
1115 my $visible = $w1 > $w2; 1084 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1087 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1119 } 1090 }
1120 1091
1092 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123 1095
1124 my $visible = $h1 > $h2; 1096 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1099 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->{vslider}->hide; 1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1128 } 1120 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1121}
1137 1122
1138sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1140 1125
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1144 1128
1145 1 1129 1
1146} 1130}
1147 1131
1148sub invoke_button_down { 1132sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1150 1134
1151 if ($ev->{button} == 2) { 1135 if ($ev->{button} == 2) {
1152 $self->grab_focus; 1136 $self->start_dragging ($ev);
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1; 1137 return 1;
1165 } 1138 }
1166 1139
1167 0 1140 0
1168} 1141}
… …
1349 1322
1350my @border = 1323my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1354sub new { 1331sub new {
1355 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1356 1333
1357 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1358 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1504
1528 my $border = $self->border; 1505 my $border = $self->border;
1529 1506
1530 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1535 1526
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1538 1529
1539 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1560 1551
1561############################################################################# 1552#############################################################################
1562 1553
1563package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1564 1555
1565our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1566 1557
1567use List::Util qw(max sum); 1558use List::Util qw(max sum);
1568 1559
1569use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1570 1561
1571sub new { 1562sub new {
1572 my $class = shift; 1563 my $class = shift;
1573 1564
1574 $class->SUPER::new ( 1565 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1566 col_expand => [],
1577 row_expand => [], 1567 row_expand => [],
1578 @_, 1568 @_,
1579 ) 1569 )
1580} 1570}
1581 1571
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub add { 1572sub add {
1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1588 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1589 1587
1590 while (@_) { 1588 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1590
1596 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1597 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1598 $self->realloc;
1599}
1600 1593
1601sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1602 my ($self, $child) = @_; 1601 my ($self) = @_;
1603 1602
1604 for (@{ $self->{children} }) { 1603 my (@w, @h);
1605 for (@{ $_ || [] }) { 1604
1606 $_ = undef if $_ == $child; 1605 my @children = $self->children;
1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1607 } 1615 }
1608 } 1616 }
1609}
1610 1617
1611# TODO: move to container class maybe? send children a signal on removal? 1618 # second pass, rows
1612sub clear { 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1639 1621
1640 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1626 }
1643 } 1627 }
1644 1628
1645 (\@w, \@h) 1629 (\@w, \@h)
1646} 1630}
… …
1662 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1663 1647
1664 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1666 1650
1667 # TODO: nicer code 1651 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1671 1655
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1679 1663
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1665
1682 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1683 1667
1684 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1670
1686 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1687 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1688 or next;
1689 1673
1690 my $x = 0; 1674 $widget->configure (
1691 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1677 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1678 }
1705 1679
1706 1 1680 1
1707} 1681}
1708 1682
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731}
1732
1733############################################################################# 1683#############################################################################
1734 1684
1735package CFPlus::UI::Fixed; 1685package CFPlus::UI::Fixed;
1736 1686
1737use List::Util qw(min max); 1687use List::Util qw(min max);
1738 1688
1739our @ISA = CFPlus::UI::Container::; 1689our @ISA = CFPlus::UI::Container::;
1740 1690
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) { 1691sub _scale($$$) {
1749 my ($mode, $val, $max) = @_; 1692 my ($rel, $val, $max) = @_;
1750 1693
1751 $mode eq "abs" ? $val 1694 $rel ? $val * $max : $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754} 1695}
1755 1696
1756sub size_request { 1697sub size_request {
1757 my ($self) = @_; 1698 my ($self) = @_;
1758 1699
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760 1701
1761 # determine overall size by querying abs widgets 1702 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) { 1703 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1764 1707
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1710 }
1772 } 1711 }
1773 1712
1774 my $W = $x2 - $x1; 1713 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1714 my $H = $y2 - $y1;
1776 1715
1777 # now layout remaining widgets 1716 # now layout remaining widgets
1778 for my $child ($self->visible_children) { 1717 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1780 1721
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1789 } 1724 }
1790 } 1725 }
1791 1726
1792 my $W = $x2 - $x1; 1727 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1; 1728 my $H = $y2 - $y1;
… …
1797 1732
1798sub invoke_size_allocate { 1733sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_; 1734 my ($self, $W, $H) = @_;
1800 1735
1801 for my $child ($self->visible_children) { 1736 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1739
1804 $x = _scale $pos, $x, $W; 1740 $x += $child->{c_halign} * $child->{req_w};
1805 $y = _scale $pos, $x, $H; 1741 $y += $child->{c_valign} * $child->{req_h};
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808 1742
1809 $child->configure ($x, $y, $w, $h); 1743 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1810 } 1744 }
1811 1745
1812 1 1746 1
1813} 1747}
1814 1748
… …
2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2079 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
2080 }; 2014 };
2081 2015
2082 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
2083 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
2084 2024
2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2086} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
2087 2035
2088############################################################################# 2036#############################################################################
2089 2037
2090package CFPlus::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
2091 2039
… …
2375 2323
2376use CFPlus::OpenGL; 2324use CFPlus::OpenGL;
2377 2325
2378my @tex = 2326my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
2381 2329
2382sub new { 2330sub new {
2383 my $class = shift; 2331 my $class = shift;
2384 2332
2385 $class->SUPER::new ( 2333 $class->SUPER::new (
2386 padding_x => 4, 2334 padding_x => 4,
2387 padding_y => 4, 2335 padding_y => 4,
2388 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
2389 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
2390 can_hover => 1, 2338 can_hover => 1,
2391 align => 0, 2339 align => 0,
2392 valign => 0, 2340 valign => 0,
2393 can_events => 1, 2341 can_events => 1,
2394 @_ 2342 @_
… …
2412 2360
2413 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
2416 2364
2365 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2367
2419 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
2420 2369
2421 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
2422} 2371}
… …
2875 2824
2876 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2877 2826
2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2879 2828
2880 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2881} 2832}
2882 2833
2883sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2884 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2885 2836
… …
2905 2856
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907 2858
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909 2860
2910 ! ! $delta 2861 1
2911} 2862}
2912 2863
2913sub update { 2864sub update {
2914 my ($self) = @_; 2865 my ($self) = @_;
2915 2866
… …
3487 ); 3438 );
3488 3439
3489 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3491 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3492 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3494 hard => 1, 3446 parked => 1,
3495 interval => $self->{animspeed},
3496 cb => sub { 3447 cb => sub {
3497 return unless $::CONN; 3448 return unless $::CONN && $widget;
3498 3449
3499 ++$widget->{frame}; 3450 ++$widget->{frame};
3500 $self->update_face; 3451 $widget->update_face;
3501 $self->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
3502 }, 3455 },
3503 ); 3456 );
3504 3457
3505 $self->update_face; 3458 $self->update_face;
3459 $self->update_timer;
3506 } 3460 }
3507 3461
3508 $self 3462 $self
3463}
3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3509} 3480}
3510 3481
3511sub update_face { 3482sub update_face {
3512 my ($self) = @_; 3483 my ($self) = @_;
3513 3484
… …
3515 3486
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) { 3488 if ($anim && @$anim) {
3518 delete $self->{wait_face}; 3489 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3520 } 3492 }
3521 } 3493 }
3522} 3494}
3523 3495
3524sub size_request { 3496sub size_request {
3525 my ($self) = @_; 3497 my ($self) = @_;
3526 3498
3527 if ($::CONN) { 3499 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) { 3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else { 3504 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc; 3506 $self->realloc;
3534 }); 3507 });
… …
3545 return unless $self->{visible}; 3518 return unless $self->{visible};
3546 3519
3547 $self->SUPER::update; 3520 $self->SUPER::update;
3548} 3521}
3549 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3550sub _draw { 3531sub _draw {
3551 my ($self) = @_; 3532 my ($self) = @_;
3552 3533
3553 return unless $::CONN;
3554
3555 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3556 3535
3557 my $faceid = $::CONN->{faceid}[$self->{face}] 3536 if (my $tex = $self->{tex}) {
3558 or return;
3559
3560 my $tex = $::CONN->{texture}[$faceid];
3561
3562 if ($tex) {
3563 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3565 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3567 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3569} 3543}
3570 3544
3571sub destroy { 3545sub destroy {
3572 my ($self) = @_; 3546 my ($self) = @_;
3573 3547
3574 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3549 if $self->{timer};
3576 3550
3577 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3578} 3552}
3579 3553
… …
3777sub add { 3751sub add {
3778 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3779 3753
3780 CFPlus::weaken $self; 3754 CFPlus::weaken $self;
3781 3755
3782 $self->{buttonbar}->add (new CFPlus::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3783 markup => $title, 3758 markup => $title,
3784 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3785 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3786 ); 3764 $self->{buttonbar}->add ($title);
3787 3765
3788 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3789} 3767}
3790 3768
3791sub get_current_page { 3769sub get_current_page {
… …
4123 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
4124 $_->() 4102 $_->()
4125 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
4126 } 4104 }
4127 4105
4128 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
4129 my %queue; 4107 my %queue;
4130 my @queue; 4108 my @queue;
4131 my $widget; 4109 my $widget;
4132 4110
4133 outer: 4111 outer:
… …
4180 } 4158 }
4181 } 4159 }
4182 4160
4183 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
4184 } 4162 }
4185 }
4186 4163
4187 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
4188 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
4189 values %$size_alloc; 4166 values %$size_alloc;
4190 4167
4191 while () { 4168 while () {
4192 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
4193 4170
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4195 4172
4196 $w = 0 if $w < 0;
4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
4201 4175
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204 4178
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207 4181
4208 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
4209 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
4210 4184
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
4214 4188
4215 $widget->{w} = $w; 4189 $widget->{w} = $w;
4216 $widget->{h} = $h; 4190 $widget->{h} = $h;
4217 4191
4218 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
4219 } 4194 }
4220 } 4195 }
4221 } 4196 }
4222 4197
4223 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
4224 $_->() 4199 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
4226 } 4201 }
4227
4228 4202
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
4232 4206

Diff Legend

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