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.388 by root, Fri Jul 20 18:30:03 2007 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
593 593
594# 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
595# functions seems pointless. 595# functions seems pointless.
596our ($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
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
612 local $@;
657 eval { $self->destroy }; 613 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 615
660 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
661} 617}
… …
669use strict; 625use strict;
670use CFPlus::OpenGL; 626use CFPlus::OpenGL;
671 627
672sub new { 628sub new {
673 my $class = shift; 629 my $class = shift;
674
675 # range [value, low, high, page]
676 630
677 $class->SUPER::new ( 631 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
680 @_ 634 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
693 647
694 glEnable GL_BLEND; 648 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 650 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 652 glDisable GL_BLEND;
706 } 653 }
707} 654}
708 655
709############################################################################# 656#############################################################################
… …
741 can_events => 0, 688 can_events => 0,
742 %arg, 689 %arg,
743 ); 690 );
744 691
745 $self->add (@$children) 692 $self->add (@$children)
746 if $children; 693 if $children && @$children;
747 694
748 $self 695 $self
749} 696}
750 697
751sub realloc { 698sub realloc {
… …
760 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
761 708
762 $_->set_parent ($self) 709 $_->set_parent ($self)
763 for @widgets; 710 for @widgets;
764 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
765 use sort 'stable'; 713 use sort 'stable';
766 714
767 $self->{children} = [ 715 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
770 ]; 718 ];
771 719
772 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
773} 725}
774 726
775sub children { 727sub children {
776 @{ $_[0]{children} } 728 @{ $_[0]{children} }
777} 729}
778 730
779sub remove { 731sub remove {
780 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
781 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
782 delete $child->{parent}; 737 delete $child->{parent};
783 $child->hide; 738 $child->hide;
784
785 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
786 741
787 $self->realloc; 742 $self->realloc;
788} 743}
789 744
790sub clear { 745sub clear {
791 my ($self) = @_; 746 my ($self) = @_;
792 747
793 my $children = delete $self->{children}; 748 my $children = $self->{children};
794 $self->{children} = []; 749 $self->{children} = [];
795 750
796 for (@$children) { 751 for (@$children) {
797 delete $_->{parent}; 752 delete $_->{parent};
798 $_->hide; 753 $_->hide;
… …
818} 773}
819 774
820sub _draw { 775sub _draw {
821 my ($self) = @_; 776 my ($self) = @_;
822 777
823 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
824} 779}
825 780
826############################################################################# 781#############################################################################
827 782
828package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
838} 793}
839 794
840sub add { 795sub add {
841 my ($self, $child) = @_; 796 my ($self, $child) = @_;
842 797
843 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
844 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
845} 800}
846 801
847sub remove { 802sub remove {
848 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
958sub size_request { 913sub size_request {
959 my ($self) = @_; 914 my ($self) = @_;
960 915
961 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
962 917
963 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
964 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
965 920
966 ($w, $h) 921 ($w, $h)
967} 922}
968 923
969sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
990 $self->{view_x} = $x; 945 $self->{view_x} = $x;
991 $self->{view_y} = $y; 946 $self->{view_y} = $y;
992 947
993 $self->emit (changed => $x, $y); 948 $self->emit (changed => $x, $y);
994 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
995 } 968 }
996} 969}
997 970
998# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local { 972sub coord2local {
… …
1046 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1047 1020
1048 my $self; 1021 my $self;
1049 1022
1050 my $hslider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1051 vertical => 0, 1026 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1027 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1028 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1029 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1031 },
1057 ; 1032 ;
1058 1033
1059 my $vslider = new CFPlus::UI::Slider 1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1060 vertical => 1, 1037 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1039 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1040 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1052 row_expand => [1, 0],
1076 %arg, 1053 %arg,
1077 ); 1054 );
1078 1055
1079 $self->{vp} = new CFPlus::UI::ViewPort 1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1080 expand => 1, 1059 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1060 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1061 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1062 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1063 my ($vp, $x, $y) = @_;
… …
1086 $vp->{parent}{hslider}->set_value ($x); 1065 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y); 1066 $vp->{parent}{vslider}->set_value ($y);
1088 1067
1089 0 1068 0
1090 }, 1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1091 ; 1075 ;
1092 1076
1093 $self->SUPER::add_at (0, 0, $self->{vp}); 1077 $self->SUPER::add ($self->{vp});
1094 1078
1095 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1096 1080
1097 $self 1081 $self
1098} 1082}
1099
1100#TODO# update range on size_allocate depending on child
1101 1083
1102sub add { 1084sub add {
1103 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1104 1086
1105 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1106} 1088}
1107 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1108sub update_slider { 1094sub update_slider {
1109 my ($self) = @_; 1095 my ($self) = @_;
1110 1096
1111 my $child = ($self->{vp} or return)->child; 1097 my $child = ($self->{vp} or return)->child;
1112 1098
1099 if ($self->{scroll_x}) {
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1102
1116 my $visible = $w1 > $w2; 1103 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1106 $visible ? $self->SUPER::add ($self->{hslider})
1119 : $self->{hslider}->hide; 1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1120 } 1109 }
1121 1110
1111 if ($self->{scroll_y}) {
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1114
1125 my $visible = $h1 > $h2; 1115 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1118 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->{vslider}->hide; 1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1129 } 1139 };
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137} 1140}
1138 1141
1139sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1141 1144
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1147
1148 1 1148 1
1149} 1149}
1150 1150
1151sub invoke_button_down { 1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1153 1153
1154 if ($ev->{button} == 2) { 1154 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1155 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1156 return 1;
1168 } 1157 }
1169 1158
1170 0 1159 0
1171} 1160}
… …
1222 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1223 1212
1224 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1236 } 1218 }
1237 1219
1238 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1239} 1221}
… …
1581 1563
1582############################################################################# 1564#############################################################################
1583 1565
1584package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1585 1567
1586our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1587 1569
1588use List::Util qw(max sum); 1570use List::Util qw(max sum);
1589 1571
1590use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1591 1573
1592sub new { 1574sub new {
1593 my $class = shift; 1575 my $class = shift;
1594 1576
1595 $class->SUPER::new ( 1577 $class->SUPER::new (
1596 children => [],
1597 col_expand => [], 1578 col_expand => [],
1598 row_expand => [], 1579 row_expand => [],
1599 @_, 1580 @_,
1600 ) 1581 )
1601} 1582}
1602 1583
1603sub children {
1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1605}
1606
1607# TODO: store row/col info in child widget and use standard add/del
1608sub add { 1584sub add {
1609 my $self = shift; 1585 my ($self, @widgets) = @_;
1610 1586
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1587 for my $child (@widgets) {
1612 $self->add_at (@_); 1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1613} 1593}
1614 1594
1615sub add_at { 1595sub add_at {
1616 my $self = shift; 1596 my $self = shift;
1617 1597
1598 my @widgets;
1599
1618 while (@_) { 1600 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1602
1621 $child->set_parent ($self); 1603 $child->{c_row} = $row;
1622 $self->{children}[$row][$col] = $child; 1604 $child->{c_col} = $col;
1623 }
1624 1605
1625 $self->{force_realloc} = 1; 1606 push @widgets, $child;
1626 $self->{force_size_alloc} = 1; 1607 }
1627 $self->realloc;
1628}
1629 1608
1630sub remove { 1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1631 my ($self, $child) = @_; 1613 my ($self) = @_;
1632 1614
1633 for (@{ $self->{children} }) { 1615 my (@w, @h);
1634 for (@{ $_ || [] }) { 1616
1635 $_ = undef if $_ == $child; 1617 my @children = $self->children;
1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1636 } 1627 }
1637 } 1628 }
1638}
1639 1629
1640# TODO: move to container class maybe? send children a signal on removal? 1630 # second pass, rows
1641sub clear { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1642 my ($self) = @_;
1643
1644 my @children = $self->children;
1645 delete $self->{children};
1646
1647 for (@children) {
1648 delete $_->{parent};
1649 $_->hide;
1650 }
1651
1652 $self->realloc;
1653}
1654
1655sub get_wh {
1656 my ($self) = @_;
1657
1658 my (@w, @h);
1659
1660 for my $y (0 .. $#{$self->{children}}) {
1661 my $row = $self->{children}[$y]
1662 or next;
1663
1664 for my $x (0 .. $#$row) {
1665 my $widget = $row->[$x]
1666 or next;
1667 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1668 1633
1669 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1670 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1671 } 1638 }
1672 } 1639 }
1673 1640
1674 (\@w, \@h) 1641 (\@w, \@h)
1675} 1642}
… …
1691 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1692 1659
1693 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1694 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1695 1662
1696 # TODO: nicer code 1663 # now linearly scale the rows/columns to the allocated size
1697 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1698 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1699 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1700 1667
1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1708 1675
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710 1677
1711 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1712 1679
1713 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1682
1715 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1716 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717 or next;
1718 1685
1719 my $x = 0; 1686 $widget->configure (
1720 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 1689 );
1722 for my $c (0 .. $#$row) {
1723 my $col_w = $ws->[$c];
1724
1725 if (my $widget = $row->[$c]) {
1726 $widget->configure ($x, $y, $col_w, $row_h);
1727 }
1728
1729 $x += $col_w;
1730 }
1731
1732 $y += $row_h;
1733 } 1690 }
1734 1691
1735 1 1692 1
1736} 1693}
1737 1694
1738sub find_widget {
1739 my ($self, $x, $y) = @_;
1740
1741 $x -= $self->{x};
1742 $y -= $self->{y};
1743
1744 my $res;
1745
1746 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1747 $res = $_->find_widget ($x, $y)
1748 and return $res;
1749 }
1750
1751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1752}
1753
1754sub _draw {
1755 my ($self) = @_;
1756
1757 for (grep $_, @{$self->{children}}) {
1758 $_->draw for grep $_, @$_;
1759 }
1760}
1761
1762############################################################################# 1695#############################################################################
1763 1696
1764package CFPlus::UI::Fixed; 1697package CFPlus::UI::Fixed;
1765 1698
1766use List::Util qw(min max); 1699use List::Util qw(min max);
1767 1700
1768our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1769 1702
1770sub add {
1771 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1772
1773 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1774 $self->SUPER::add ($child);
1775}
1776
1777sub _scale($$$) { 1703sub _scale($$$) {
1778 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1779 1705
1780 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1781 : $mode eq "rel" ? $val * $max
1782 : 0
1783} 1707}
1784 1708
1785sub size_request { 1709sub size_request {
1786 my ($self) = @_; 1710 my ($self) = @_;
1787 1711
1788 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1789 1713
1790 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1791 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1792 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1793 1719
1794 if ($pos eq "abs") {
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1799 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1800 } 1722 }
1801 } 1723 }
1802 1724
1803 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1804 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1805 1727
1806 # now layout remaining widgets 1728 # now layout remaining widgets
1807 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1733
1810 if ($pos ne "abs") {
1811 $x = _scale $pos, $x, $W;
1812 $y = _scale $pos, $x, $H;
1813 $w = _scale $size, $w, $child->{req_w};
1814 $h = _scale $size, $h, $child->{req_h};
1815
1816 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1817 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1818 } 1736 }
1819 } 1737 }
1820 1738
1821 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1822 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1826 1744
1827sub invoke_size_allocate { 1745sub invoke_size_allocate {
1828 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1829 1747
1830 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1831 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1832 1751
1833 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1834 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1835 $w = _scale $size, $w, $child->{req_w};
1836 $h = _scale $size, $h, $child->{req_h};
1837 1754
1838 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1839 } 1756 }
1840 1757
1841 1 1758 1
1842} 1759}
1843 1760
… …
1847 1764
1848our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1849 1766
1850sub size_request { 1767sub size_request {
1851 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1852 1771
1853 $self->{vertical} 1772 $self->{vertical}
1854 ? ( 1773 ? (
1855 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1856 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1857 ) 1776 )
1858 : ( 1777 : (
1859 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1860 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1861 ) 1780 )
1862} 1781}
1863 1782
1864sub invoke_size_allocate { 1783sub invoke_size_allocate {
1865 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1989 1908
1990 delete $self->{ox}; 1909 delete $self->{ox};
1991 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1992} 1911}
1993 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1994sub set_text { 1919sub set_text {
1995 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1996 1921
1997 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1998 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2104 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2105 2030
2106 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2107 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2108 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2109 }; 2036 };
2110 2037
2111 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
2112 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2113 2040# CFPlus::OpenGL::glNewList $self->{list};
2114 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
2115} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
2116 2057
2117############################################################################# 2058#############################################################################
2118 2059
2119package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
2120 2061
… …
2126 my $class = shift; 2067 my $class = shift;
2127 2068
2128 $class->SUPER::new ( 2069 $class->SUPER::new (
2129 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2130 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2131 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2132 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2133 can_hover => 1, 2076 can_hover => 1,
2134 can_focus => 1, 2077 can_focus => 1,
2135 valign => 0, 2078 valign => 0,
2136 can_events => 1, 2079 can_events => 1,
2137 ellipsise => 0, 2080 ellipsise => 0,
… …
2277 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2278 } 2221 }
2279 2222
2280 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glBegin GL_QUADS;
2283 glVertex 0 , 0;
2284 glVertex 0 , $self->{h};
2285 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2286 glVertex $self->{w}, 0;
2287 glEnd;
2288 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2289 2227
2290 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2291 2229
2292 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2294 2232
2295 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2296 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2297 utf8::encode $text; 2235 utf8::encode $text;
2298 2236
2299 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2300 } 2238 }
2301 2239
2240 glColor_premultiply @{$self->{active_fg}};
2302 glBegin GL_LINES; 2241 glBegin GL_LINES;
2303 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2305 glEnd; 2259 glEnd;
2306 } 2260 }
2307} 2261}
2308 2262
2309############################################################################# 2263#############################################################################
… …
2396 1 2350 1
2397} 2351}
2398 2352
2399############################################################################# 2353#############################################################################
2400 2354
2355package CFPlus::UI::ButtonBin;
2356
2357our @ISA = CFPlus::UI::Bin::;
2358
2359use CFPlus::OpenGL;
2360
2361my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png);
2364
2365sub new {
2366 my $class = shift;
2367
2368 $class->SUPER::new (
2369 can_hover => 1,
2370 align => 0,
2371 valign => 0,
2372 can_events => 1,
2373 @_
2374 )
2375}
2376
2377sub invoke_button_up {
2378 my ($self, $ev, $x, $y) = @_;
2379
2380 $self->emit ("activate")
2381 if $x >= 0 && $x < $self->{w}
2382 && $y >= 0 && $y < $self->{h};
2383
2384 1
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 glEnable GL_TEXTURE_2D;
2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2392 glColor 0, 0, 0, 1;
2393
2394 my $tex = $tex[$GRAB == $self];
2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2401package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2402 2405
2403our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2404 2407
2405use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2539sub new { 2542sub new {
2540 my $class = shift; 2543 my $class = shift;
2541 2544
2542 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2543 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2544 @_, 2548 @_,
2545 ); 2549 );
2546 2550
2547 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2548 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2573} 2577}
2574 2578
2575sub size_request { 2579sub size_request {
2576 my ($self) = @_; 2580 my ($self) = @_;
2577 2581
2578 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2579} 2583}
2580 2584
2581sub _draw { 2585sub _draw {
2582 my ($self) = @_; 2586 my ($self) = @_;
2583 2587
… …
2593 } 2597 }
2594 2598
2595 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2597 2601
2598 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2599 2603
2600 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2601} 2605}
2602 2606
2603############################################################################# 2607#############################################################################
… …
2622 align => 0, 2626 align => 0,
2623 valign => 0, 2627 valign => 0,
2624 can_events => 1, 2628 can_events => 1,
2625 @_ 2629 @_
2626 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2627} 2637}
2628 2638
2629sub invoke_button_up { 2639sub invoke_button_up {
2630 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2631 2641
… …
2771 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2772} 2782}
2773 2783
2774############################################################################# 2784#############################################################################
2775 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 %arg,
2806 );
2807
2808 $self->set_value ($arg{value} || -1);
2809
2810 $self
2811}
2812
2813sub set_value {
2814 my ($self, $value) = @_;
2815
2816 if ($self->{value} != $value) {
2817 $self->{value} = $value;
2818
2819 if ($value < 0) {
2820 $self->set_text ("-");
2821 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100);
2823 }
2824 $self->update;
2825 }
2826}
2827
2828sub _draw {
2829 my ($self) = @_;
2830
2831 glEnable GL_BLEND;
2832 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2833
2834 if ($self->{value} >= 0) {
2835 my $s = 3 + ($self->{w} - 6) * $self->{value};
2836
2837 glColor_premultiply @{$self->{bar}};
2838 glRect 2, 2, $s, $self->{h} - 2;
2839 glColor_premultiply @{$self->{bg}};
2840 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2841 }
2842
2843 glColor_premultiply @{$self->{outline}};
2844 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2845
2846 glDisable GL_BLEND;
2847
2848 {
2849 local $self->{bg}; # do not draw background
2850 $self->SUPER::_draw;
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFPlus::UI::ExperienceProgress;
2857
2858our @ISA = CFPlus::UI::Progress::;
2859
2860sub new {
2861 my ($class, %arg) = @_;
2862
2863 my $self = $class->SUPER::new (
2864 %arg
2865 );
2866
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN;
2869
2870 $self
2871}
2872
2873sub DESTROY {
2874 my ($self) = @_;
2875
2876 delete $::CONN->{on_exp_update}{$self+0}
2877 if $::CONN;
2878
2879 $self->SUPER::DESTROY;
2880}
2881
2882sub set_value {
2883 my ($self, $lvl, $exp) = @_;
2884
2885 my $v = -1;
2886
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl];
2890
2891 $v = ($exp - $l0) / ($l1 - $l0);
2892 }
2893
2894 $self->SUPER::set_value ($v);
2895}
2896
2897#############################################################################
2898
2776package CFPlus::UI::Gauge; 2899package CFPlus::UI::Gauge;
2777 2900
2778our @ISA = CFPlus::UI::VBox::; 2901our @ISA = CFPlus::UI::VBox::;
2779 2902
2780sub new { 2903sub new {
… …
2905 3028
2906 $self->SUPER::invoke_button_down ($ev, $x, $y); 3029 $self->SUPER::invoke_button_down ($ev, $x, $y);
2907 3030
2908 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3031 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2909 3032
2910 $self->invoke_mouse_motion ($ev, $x, $y) 3033 $self->invoke_mouse_motion ($ev, $x, $y);
3034
3035 1
2911} 3036}
2912 3037
2913sub invoke_mouse_motion { 3038sub invoke_mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 3039 my ($self, $ev, $x, $y) = @_;
2915 3040
… …
2935 3060
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3061 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937 3062
2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3063 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2939 3064
2940 ! ! $delta 3065 1
2941} 3066}
2942 3067
2943sub update { 3068sub update {
2944 my ($self) = @_; 3069 my ($self) = @_;
2945 3070
… …
3076} 3201}
3077 3202
3078sub size_request { 3203sub size_request {
3079 my ($self) = @_; 3204 my ($self) = @_;
3080 3205
3081 my ($empty, $slider) = @{ $self->{children} }; 3206 my ($empty, $slider) = $self->visible_children;
3082 3207
3083 local $self->{children} = [$empty, $slider]; 3208 local $self->{children} = [$empty, $slider];
3084 $self->SUPER::size_request 3209 $self->SUPER::size_request
3085} 3210}
3086 3211
… …
3275 3400
3276 if ($y0 < $y + $h && $y < $y1) { 3401 if ($y0 < $y + $h && $y < $y1) {
3277 my $layout = $self->get_layout ($para); 3402 my $layout = $self->get_layout ($para);
3278 3403
3279 $layout->render ($para->{indent}, $y - $y0); 3404 $layout->render ($para->{indent}, $y - $y0);
3405 $layout->draw;
3280 3406
3281 if (my @w = @{ $para->{widget} }) { 3407 if (my @w = @{ $para->{widget} }) {
3282 my @s = $layout->get_shapes; 3408 my @s = $layout->get_shapes;
3283 3409
3284 for (@w) { 3410 for (@w) {
… …
3475 glTranslate 0.375, 0.375; 3601 glTranslate 0.375, 0.375;
3476 3602
3477 my ($w, $h) = @$self{qw(w h)}; 3603 my ($w, $h) = @$self{qw(w h)};
3478 3604
3479 glColor 1, 0.8, 0.4; 3605 glColor 1, 0.8, 0.4;
3480 glBegin GL_QUADS; 3606 glRect 0, 0, $w, $h;
3481 glVertex 0 , 0;
3482 glVertex 0 , $h;
3483 glVertex $w, $h;
3484 glVertex $w, 0;
3485 glEnd;
3486 3607
3487 glColor 0, 0, 0; 3608 glColor 0, 0, 0;
3488 glBegin GL_LINE_LOOP; 3609 glRect_lineloop 0, 0, $w, $h;
3489 glVertex 0 , 0;
3490 glVertex 0 , $h;
3491 glVertex $w, $h;
3492 glVertex $w, 0;
3493 glEnd;
3494 3610
3495 glTranslate 2 - 0.375, 2 - 0.375; 3611 glTranslate 2 - 0.375, 2 - 0.375;
3496 3612
3497 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3498} 3614}
… …
3518 3634
3519 if ($self->{anim} && $self->{animspeed}) { 3635 if ($self->{anim} && $self->{animspeed}) {
3520 CFPlus::weaken (my $widget = $self); 3636 CFPlus::weaken (my $widget = $self);
3521 3637
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3638 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3639 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3524 $self->{timer} = Event->timer ( 3640 $self->{timer} = Event->timer (
3525 parked => 1, 3641 parked => 1,
3526 cb => sub { 3642 cb => sub {
3527 return unless $::CONN && $widget; 3643 return unless $::CONN;
3528 3644
3645 my $w = $widget
3646 or return;
3647
3529 ++$widget->{frame}; 3648 ++$w->{frame};
3530 $widget->update_face; 3649 $w->update_face;
3650
3651 # somehow, $widget can go away
3531 $widget->update; 3652 $w->update;
3532
3533 $widget->update_timer; 3653 $w->update_timer;
3534 }, 3654 },
3535 ); 3655 );
3536 3656
3537 $self->update_face; 3657 $self->update_face;
3538 $self->update_timer; 3658 $self->update_timer;
… …
3559} 3679}
3560 3680
3561sub update_face { 3681sub update_face {
3562 my ($self) = @_; 3682 my ($self) = @_;
3563 3683
3564 return unless $::CONN;
3565
3566 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3567 if ($anim && @$anim) {
3568 delete $self->{wait_face};
3569 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3570 }
3571 }
3572}
3573
3574sub size_request {
3575 my ($self) = @_;
3576
3577 if ($::CONN) { 3684 if ($::CONN) {
3578 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3685 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3579 if (my $tex = $::CONN->{texture}[$faceid]) { 3686 if ($anim && @$anim) {
3580 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3687 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3581 } else { 3688 delete $self->{face_change_cb};
3582 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3689
3583 $self->realloc; 3690 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3691 unless ($tex->{name} || $tex->{loading}) {
3692 $tex->upload (sub { $self->reconfigure });
3693 }
3584 }); 3694 }
3585 } 3695 }
3586 } 3696 }
3587 } 3697 }
3698}
3699
3700sub size_request {
3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3705 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3706 if ($tex->{name}) {
3707 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3708 } elsif (!$tex->{loading}) {
3709 $tex->upload (sub { $self->reconfigure });
3710 }
3711 }
3712
3713 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3714 }
3715 }
3588 3716
3589 ($self->{size_w} || 8, $self->{size_h} || 8) 3717 ($self->{size_w} || 8, $self->{size_h} || 8)
3590} 3718}
3591 3719
3592sub update { 3720sub update {
… …
3606} 3734}
3607 3735
3608sub _draw { 3736sub _draw {
3609 my ($self) = @_; 3737 my ($self) = @_;
3610 3738
3611 return unless $::CONN;
3612
3613 $self->SUPER::_draw; 3739 $self->SUPER::_draw;
3614 3740
3615 my $faceid = $::CONN->{faceid}[$self->{face}] 3741 if (my $tex = $self->{tex}) {
3616 or return;
3617
3618 my $tex = $::CONN->{texture}[$faceid];
3619
3620 if ($tex) {
3621 glEnable GL_TEXTURE_2D; 3742 glEnable GL_TEXTURE_2D;
3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3623 glColor 0, 0, 0, 1; 3744 glColor 0, 0, 0, 1;
3624 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3625 glDisable GL_TEXTURE_2D; 3746 glDisable GL_TEXTURE_2D;
… …
3677 children => [ 3798 children => [
3678 (new CFPlus::UI::Label markup => $left, expand => 1), 3799 (new CFPlus::UI::Label markup => $left, expand => 1),
3679 (new CFPlus::UI::Label markup => $right, align => +1), 3800 (new CFPlus::UI::Label markup => $right, align => +1),
3680 ], 3801 ],
3681 ; 3802 ;
3682 3803
3683 } else { 3804 } else {
3684 $widget = new CFPlus::UI::Label 3805 $widget = new CFPlus::UI::Label
3685 can_hover => 1, 3806 can_hover => 1,
3686 can_events => 1, 3807 can_events => 1,
3687 markup => $widget, 3808 markup => $widget,
… …
3823 buttonbar => (new CFPlus::UI::Buttonbar), 3944 buttonbar => (new CFPlus::UI::Buttonbar),
3824 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3945 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3825 # filter => # will be put between multiplexer and $self 3946 # filter => # will be put between multiplexer and $self
3826 @_, 3947 @_,
3827 ); 3948 );
3828 3949
3829 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3950 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3830 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3951 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3831 3952
3953 {
3954 Scalar::Util::weaken (my $wself = $self);
3955
3956 $self->{multiplexer}->connect (c_add => sub {
3957 my ($mplex, $widgets) = @_;
3958
3959 for my $child (@$widgets) {
3960 Scalar::Util::weaken $child;
3961 $child->{c_tab_} ||= do {
3962 my $tab =
3963 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3964 ? $child->{c_tab}
3965 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3966
3967 $tab->connect (activate => sub {
3968 $wself->set_current_page ($child);
3969 });
3970
3971 $tab
3972 };
3973
3974 $self->{buttonbar}->add ($child->{c_tab_});
3975 }
3976 });
3977
3978 $self->{multiplexer}->connect (c_remove => sub {
3979 my ($mplex, $widgets) = @_;
3980
3981 for my $child (@$widgets) {
3982 $wself->{buttonbar}->remove ($child->{c_tab_});
3983 }
3984 });
3985 }
3986
3832 $self 3987 $self
3833} 3988}
3834 3989
3835sub add { 3990sub add {
3991 my ($self, @widgets) = @_;
3992
3993 $self->{multiplexer}->add (@widgets)
3994}
3995
3996sub remove {
3997 my ($self, @widgets) = @_;
3998
3999 $self->{multiplexer}->remove (@widgets)
4000}
4001
4002sub pages {
4003 my ($self) = @_;
4004 $self->{multiplexer}->children
4005}
4006
4007sub add_tab {
3836 my ($self, $title, $widget, $tooltip) = @_; 4008 my ($self, $title, $widget, $tooltip) = @_;
3837 4009
3838 CFPlus::weaken $self; 4010 $title = [$title, $tooltip] unless ref $title;
4011 $widget->{c_tab} = $title;
3839 4012
3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3841 markup => $title,
3842 tooltip => $tooltip,
3843 on_activate => sub { $self->set_current_page ($widget) },
3844 );
3845
3846 $self->{multiplexer}->add ($widget); 4013 $self->add ($widget);
3847} 4014}
3848 4015
3849sub get_current_page { 4016sub get_current_page {
3850 my ($self) = @_; 4017 my ($self) = @_;
3851 4018
… …
4134} 4301}
4135 4302
4136sub update { 4303sub update {
4137 my ($self) = @_; 4304 my ($self) = @_;
4138 4305
4139 $::WANT_REFRESH++; 4306 $::WANT_REFRESH->start;
4140} 4307}
4141 4308
4142sub add { 4309sub add {
4143 my ($self, @children) = @_; 4310 my ($self, @children) = @_;
4144 4311
… …
4181 while ($self->{refresh_hook}) { 4348 while ($self->{refresh_hook}) {
4182 $_->() 4349 $_->()
4183 for values %{delete $self->{refresh_hook}}; 4350 for values %{delete $self->{refresh_hook}};
4184 } 4351 }
4185 4352
4186 if ($self->{realloc}) { 4353 while ($self->{realloc}) {
4187 my %queue; 4354 my %queue;
4188 my @queue; 4355 my @queue;
4189 my $widget; 4356 my $widget;
4190 4357
4191 outer: 4358 outer:
… …
4238 } 4405 }
4239 } 4406 }
4240 4407
4241 delete $self->{realloc}{$widget+0}; 4408 delete $self->{realloc}{$widget+0};
4242 } 4409 }
4243 }
4244 4410
4245 while (my $size_alloc = delete $self->{size_alloc}) { 4411 while (my $size_alloc = delete $self->{size_alloc}) {
4246 my @queue = sort { $b->{visible} <=> $a->{visible} } 4412 my @queue = sort { $a->{visible} <=> $b->{visible} }
4247 values %$size_alloc; 4413 values %$size_alloc;
4248 4414
4249 while () { 4415 while () {
4250 my $widget = pop @queue || last; 4416 my $widget = pop @queue || last;
4251 4417
4252 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4418 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4253 4419
4254 $w = 0 if $w < 0;
4255 $h = 0 if $h < 0;
4256
4257 $w = max $widget->{min_w}, $w; 4420 $w = max $widget->{min_w}, $w;
4258 $h = max $widget->{min_h}, $h; 4421 $h = max $widget->{min_h}, $h;
4259 4422
4260# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4423# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4261# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4424# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4262 4425
4263 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4426 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4264 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4427 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4265 4428
4266 $w = int $w + 0.5; 4429 $w = int $w + 0.5;
4267 $h = int $h + 0.5; 4430 $h = int $h + 0.5;
4268 4431
4269 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4432 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4270 $widget->{old_w} = $widget->{w}; 4433 $widget->{old_w} = $widget->{w};
4271 $widget->{old_h} = $widget->{h}; 4434 $widget->{old_h} = $widget->{h};
4272 4435
4273 $widget->{w} = $w; 4436 $widget->{w} = $w;
4274 $widget->{h} = $h; 4437 $widget->{h} = $h;
4275 4438
4276 $widget->emit (size_allocate => $w, $h); 4439 $widget->emit (size_allocate => $w, $h);
4440 }
4277 } 4441 }
4278 } 4442 }
4279 } 4443 }
4280 4444
4281 while ($self->{post_alloc_hook}) { 4445 while ($self->{post_alloc_hook}) {

Diff Legend

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