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.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.410 by root, Sun Jul 22 16:37:19 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;
… …
943} 896}
944 897
945############################################################################# 898#############################################################################
946 899
947package CFPlus::UI::ViewPort; 900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
948 903
949our @ISA = CFPlus::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
950 905
951sub new { 906sub new {
952 my $class = shift; 907 my $class = shift;
… …
961sub size_request { 916sub size_request {
962 my ($self) = @_; 917 my ($self) = @_;
963 918
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 920
966 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
968 923
969 ($w, $h) 924 ($w, $h)
970} 925}
971 926
972sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
984} 939}
985 940
986sub set_offset { 941sub set_offset {
987 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
988 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
991 950
951 $self->emit (changed => $x, $y);
992 $self->update; 952 $self->update;
953 }
993} 954}
994 955
995# 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
996sub coord2local { 957sub coord2local {
997 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1013 974
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 977 ) {
1017 $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})
1018 } else { 979 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 981 }
1021} 982}
1022 983
… …
1043 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1044 1005
1045 my $self; 1006 my $self;
1046 1007
1047 my $hslider = new CFPlus::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1048 vertical => 0, 1011 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1012 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1013 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1014 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1016 },
1054 ; 1017 ;
1055 1018
1056 my $vslider = new CFPlus::UI::Slider 1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1057 vertical => 1, 1022 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1024 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1025 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1072 row_expand => [1, 0], 1037 row_expand => [1, 0],
1073 %arg, 1038 %arg,
1074 ); 1039 );
1075 1040
1076 $self->{vp} = new CFPlus::UI::ViewPort 1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1077 expand => 1, 1044 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1045 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1080 ; 1060 ;
1081 1061
1082 $self->SUPER::add (0, 0, $self->{vp}); 1062 $self->SUPER::add ($self->{vp});
1083 1063
1084 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1085 1065
1086 $self 1066 $self
1087} 1067}
1088
1089#TODO# update range on size_allocate depending on child
1090 1068
1091sub add { 1069sub add {
1092 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1093 1071
1094 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1095} 1073}
1096 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
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);
1120 };
1121}
1122
1097sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1099 1125
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $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};
1103 1128
1104 1 1129 1
1105} 1130}
1106 1131
1107sub update_slider { 1132sub invoke_button_down {
1108 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1109 1134
1110 my $child = ($self->{vp} or return)->child; 1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1111 1139
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
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 } 1140 0
1141}
1120 1142
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1143sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1144 my ($self, $ev, $x, $y) = @_;
1123 1145
1124 my $visible = $h1 > $h2; 1146 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1147 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1148 }
1127 : $self->{vslider}->hide; 1149
1128 } 1150 0
1129} 1151}
1130 1152
1131sub update { 1153sub invoke_mouse_motion {
1132 my ($self) = @_; 1154 my ($self, $ev, $x, $y) = @_;
1133 1155
1134 $self->SUPER::update; 1156 if ($self->{motion}) {
1135 $self->update_slider; 1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1136} 1162}
1137 1163
1138sub invoke_size_allocate { 1164sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1140 1166
… …
1296 1322
1297my @border = 1323my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 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);
1300 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1301sub new { 1331sub new {
1302 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1303 1333
1304 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1305 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
… …
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1504
1475 my $border = $self->border; 1505 my $border = $self->border;
1476 1506
1477 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $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);
1482 1526
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1485 1529
1486 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1507 1551
1508############################################################################# 1552#############################################################################
1509 1553
1510package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1511 1555
1512our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1513 1557
1514use List::Util qw(max sum); 1558use List::Util qw(max sum);
1515 1559
1516use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1517 1561
1518sub new { 1562sub new {
1519 my $class = shift; 1563 my $class = shift;
1520 1564
1521 $class->SUPER::new ( 1565 $class->SUPER::new (
1522 children => [],
1523 col_expand => [], 1566 col_expand => [],
1524 row_expand => [], 1567 row_expand => [],
1525 @_, 1568 @_,
1526 ) 1569 )
1527} 1570}
1528 1571
1529sub children {
1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531}
1532
1533# TODO: store row/col info in child widget and use standard add/del
1534sub 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 {
1535 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1536 1587
1537 while (@_) { 1588 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1539 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child;
1541 }
1542 1590
1543 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1544 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1545 $self->realloc;
1546}
1547 1593
1548sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1549 my ($self, $child) = @_; 1601 my ($self) = @_;
1550 1602
1551 for (@{ $self->{children} }) { 1603 my (@w, @h);
1552 for (@{ $_ || [] }) { 1604
1553 $_ = 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];
1554 } 1615 }
1555 } 1616 }
1556}
1557 1617
1558# TODO: move to container class maybe? send children a signal on removal? 1618 # second pass, rows
1559sub clear { 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1560 my ($self) = @_;
1561
1562 my @children = $self->children;
1563 delete $self->{children};
1564
1565 for (@children) {
1566 delete $_->{parent};
1567 $_->hide;
1568 }
1569
1570 $self->realloc;
1571}
1572
1573sub get_wh {
1574 my ($self) = @_;
1575
1576 my (@w, @h);
1577
1578 for my $y (0 .. $#{$self->{children}}) {
1579 my $row = $self->{children}[$y]
1580 or next;
1581
1582 for my $x (0 .. $#$row) {
1583 my $widget = $row->[$x]
1584 or next;
1585 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1586 1621
1587 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1588 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589 } 1626 }
1590 } 1627 }
1591 1628
1592 (\@w, \@h) 1629 (\@w, \@h)
1593} 1630}
… …
1609 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1610 1647
1611 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1612 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1613 1650
1614 # TODO: nicer code 1651 # now linearly scale the rows/columns to the allocated size
1615 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1616 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1617 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1618 1655
1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1626 1663
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628 1665
1629 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1630 1667
1631 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632 1670
1633 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1634 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1635 or next;
1636 1673
1637 my $x = 0; 1674 $widget->configure (
1638 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639 1677 );
1640 for my $c (0 .. $#$row) {
1641 my $col_w = $ws->[$c];
1642
1643 if (my $widget = $row->[$c]) {
1644 $widget->configure ($x, $y, $col_w, $row_h);
1645 }
1646
1647 $x += $col_w;
1648 }
1649
1650 $y += $row_h;
1651 } 1678 }
1652 1679
1653 1 1680 1
1654} 1681}
1655 1682
1656sub find_widget {
1657 my ($self, $x, $y) = @_;
1658
1659 $x -= $self->{x};
1660 $y -= $self->{y};
1661
1662 my $res;
1663
1664 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1665 $res = $_->find_widget ($x, $y)
1666 and return $res;
1667 }
1668
1669 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1670}
1671
1672sub _draw {
1673 my ($self) = @_;
1674
1675 for (grep $_, @{$self->{children}}) {
1676 $_->draw for grep $_, @$_;
1677 }
1678}
1679
1680############################################################################# 1683#############################################################################
1681 1684
1682package CFPlus::UI::Fixed; 1685package CFPlus::UI::Fixed;
1683 1686
1684use List::Util qw(min max); 1687use List::Util qw(min max);
1685 1688
1686our @ISA = CFPlus::UI::Container::; 1689our @ISA = CFPlus::UI::Container::;
1687 1690
1688sub add { 1691sub add_fixed {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690 1693
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child); 1695 $self->SUPER::add ($child);
1693} 1696}
… …
1748 for my $child ($self->visible_children) { 1751 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750 1753
1751 $x = _scale $pos, $x, $W; 1754 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H; 1755 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w}; 1756 $w = _scale $size, $w, $W;
1754 $h = _scale $size, $h, $child->{req_h}; 1757 $h = _scale $size, $h, $H;
1755 1758
1756 $child->configure ($x, $y, $w, $h); 1759 $child->configure ($x, $y, $w, $h);
1757 } 1760 }
1758 1761
1759 1 1762 1
… …
2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2026 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2027 }; 2030 };
2028 2031
2029 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
2030 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
2031 2040
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2033} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
2034 2051
2035############################################################################# 2052#############################################################################
2036 2053
2037package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
2038 2055
… …
2322 2339
2323use CFPlus::OpenGL; 2340use CFPlus::OpenGL;
2324 2341
2325my @tex = 2342my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
2328 2345
2329sub new { 2346sub new {
2330 my $class = shift; 2347 my $class = shift;
2331 2348
2332 $class->SUPER::new ( 2349 $class->SUPER::new (
2333 padding_x => 4, 2350 padding_x => 4,
2334 padding_y => 4, 2351 padding_y => 4,
2335 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
2336 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
2337 can_hover => 1, 2354 can_hover => 1,
2338 align => 0, 2355 align => 0,
2339 valign => 0, 2356 valign => 0,
2340 can_events => 1, 2357 can_events => 1,
2341 @_ 2358 @_
… …
2359 2376
2360 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
2363 2380
2381 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2383
2366 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
2367 2385
2368 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
2369} 2387}
… …
2822 2840
2823 $self->SUPER::invoke_button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2824 2842
2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2826 2844
2827 $self->invoke_mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y);
2846
2847 1
2828} 2848}
2829 2849
2830sub invoke_mouse_motion { 2850sub invoke_mouse_motion {
2831 my ($self, $ev, $x, $y) = @_; 2851 my ($self, $ev, $x, $y) = @_;
2832 2852
… …
2852 2872
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2873 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854 2874
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2875 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856 2876
2857 ! ! $delta 2877 1
2858} 2878}
2859 2879
2860sub update { 2880sub update {
2861 my ($self) = @_; 2881 my ($self) = @_;
2862 2882
… …
3434 ); 3454 );
3435 3455
3436 if ($self->{anim} && $self->{animspeed}) { 3456 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self); 3457 CFPlus::weaken (my $widget = $self);
3438 3458
3459 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3460 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3439 $self->{timer} = Event->timer ( 3461 $self->{timer} = Event->timer (
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441 hard => 1, 3462 parked => 1,
3442 interval => $self->{animspeed},
3443 cb => sub { 3463 cb => sub {
3444 return unless $::CONN; 3464 return unless $::CONN && $widget;
3445 3465
3446 ++$widget->{frame}; 3466 ++$widget->{frame};
3447 $self->update_face; 3467 $widget->update_face;
3448 $self->update; 3468 $widget->update;
3469
3470 $widget->update_timer;
3449 }, 3471 },
3450 ); 3472 );
3451 3473
3452 $self->update_face; 3474 $self->update_face;
3475 $self->update_timer;
3453 } 3476 }
3454 3477
3455 $self 3478 $self
3479}
3480
3481sub update_timer {
3482 my ($self) = @_;
3483
3484 return unless $self->{timer};
3485
3486 if ($self->{visible}) {
3487 $self->{timer}->at (
3488 $self->{anim_start}
3489 + $self->{animspeed}
3490 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3491 );
3492 $self->{timer}->start;
3493 } else {
3494 $self->{timer}->stop;
3495 }
3456} 3496}
3457 3497
3458sub update_face { 3498sub update_face {
3459 my ($self) = @_; 3499 my ($self) = @_;
3460 3500
… …
3462 3502
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3503 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) { 3504 if ($anim && @$anim) {
3465 delete $self->{wait_face}; 3505 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3506 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3507 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3467 } 3508 }
3468 } 3509 }
3469} 3510}
3470 3511
3471sub size_request { 3512sub size_request {
3472 my ($self) = @_; 3513 my ($self) = @_;
3473 3514
3474 if ($::CONN) { 3515 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3516 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) { 3517 if (my $tex = $::CONN->{texture}[$faceid]) {
3518 $self->{tex} = $tex;
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3519 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else { 3520 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3521 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc; 3522 $self->realloc;
3481 }); 3523 });
… …
3492 return unless $self->{visible}; 3534 return unless $self->{visible};
3493 3535
3494 $self->SUPER::update; 3536 $self->SUPER::update;
3495} 3537}
3496 3538
3539sub invoke_visibility_change {
3540 my ($self) = @_;
3541
3542 $self->update_timer;
3543
3544 0
3545}
3546
3497sub _draw { 3547sub _draw {
3498 my ($self) = @_; 3548 my ($self) = @_;
3499 3549
3500 return unless $::CONN;
3501
3502 $self->SUPER::_draw; 3550 $self->SUPER::_draw;
3503 3551
3504 my $faceid = $::CONN->{faceid}[$self->{face}] 3552 if (my $tex = $self->{tex}) {
3505 or return;
3506
3507 my $tex = $::CONN->{texture}[$faceid];
3508
3509 if ($tex) {
3510 glEnable GL_TEXTURE_2D; 3553 glEnable GL_TEXTURE_2D;
3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3512 glColor 0, 0, 0, 1; 3555 glColor 0, 0, 0, 1;
3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3556 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3514 glDisable GL_TEXTURE_2D; 3557 glDisable GL_TEXTURE_2D;
… …
3516} 3559}
3517 3560
3518sub destroy { 3561sub destroy {
3519 my ($self) = @_; 3562 my ($self) = @_;
3520 3563
3521 $self->{timer}->cancel 3564 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3565 if $self->{timer};
3523 3566
3524 $self->SUPER::destroy; 3567 $self->SUPER::destroy;
3525} 3568}
3526 3569
… …
3724sub add { 3767sub add {
3725 my ($self, $title, $widget, $tooltip) = @_; 3768 my ($self, $title, $widget, $tooltip) = @_;
3726 3769
3727 CFPlus::weaken $self; 3770 CFPlus::weaken $self;
3728 3771
3729 $self->{buttonbar}->add (new CFPlus::UI::Button 3772 unless (ref $title) {
3773 $title = new CFPlus::UI::Button
3730 markup => $title, 3774 markup => $title,
3731 tooltip => $tooltip, 3775 tooltip => $tooltip,
3776 ;
3777 }
3778
3732 on_activate => sub { $self->set_current_page ($widget) }, 3779 $title->connect (activate => sub { $self->set_current_page ($widget) });
3733 ); 3780 $self->{buttonbar}->add ($title);
3734 3781
3735 $self->{multiplexer}->add ($widget); 3782 $self->{multiplexer}->add ($widget);
3736} 3783}
3737 3784
3738sub get_current_page { 3785sub get_current_page {
… …
4070 while ($self->{refresh_hook}) { 4117 while ($self->{refresh_hook}) {
4071 $_->() 4118 $_->()
4072 for values %{delete $self->{refresh_hook}}; 4119 for values %{delete $self->{refresh_hook}};
4073 } 4120 }
4074 4121
4075 if ($self->{realloc}) { 4122 while ($self->{realloc}) {
4076 my %queue; 4123 my %queue;
4077 my @queue; 4124 my @queue;
4078 my $widget; 4125 my $widget;
4079 4126
4080 outer: 4127 outer:
… …
4127 } 4174 }
4128 } 4175 }
4129 4176
4130 delete $self->{realloc}{$widget+0}; 4177 delete $self->{realloc}{$widget+0};
4131 } 4178 }
4132 }
4133 4179
4134 while (my $size_alloc = delete $self->{size_alloc}) { 4180 while (my $size_alloc = delete $self->{size_alloc}) {
4135 my @queue = sort { $b->{visible} <=> $a->{visible} } 4181 my @queue = sort { $a->{visible} <=> $b->{visible} }
4136 values %$size_alloc; 4182 values %$size_alloc;
4137 4183
4138 while () { 4184 while () {
4139 my $widget = pop @queue || last; 4185 my $widget = pop @queue || last;
4140 4186
4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4187 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4142 4188
4143 $w = 0 if $w < 0;
4144 $h = 0 if $h < 0;
4145
4146 $w = max $widget->{min_w}, $w; 4189 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h; 4190 $h = max $widget->{min_h}, $h;
4148 4191
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4192# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4193# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151 4194
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4195 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4196 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154 4197
4155 $w = int $w + 0.5; 4198 $w = int $w + 0.5;
4156 $h = int $h + 0.5; 4199 $h = int $h + 0.5;
4157 4200
4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4201 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w}; 4202 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h}; 4203 $widget->{old_h} = $widget->{h};
4161 4204
4162 $widget->{w} = $w; 4205 $widget->{w} = $w;
4163 $widget->{h} = $h; 4206 $widget->{h} = $h;
4164 4207
4165 $widget->emit (size_allocate => $w, $h); 4208 $widget->emit (size_allocate => $w, $h);
4209 }
4166 } 4210 }
4167 } 4211 }
4168 } 4212 }
4169 4213
4170 while ($self->{post_alloc_hook}) { 4214 while ($self->{post_alloc_hook}) {
4171 $_->() 4215 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4216 for values %{delete $self->{post_alloc_hook}};
4173 } 4217 }
4174
4175 4218
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4219 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4220 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4221 glClear GL_COLOR_BUFFER_BIT;
4179 4222

Diff Legend

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