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.397 by root, Sat Jul 21 14:01:35 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
367} 376}
368 377
369sub size_request { 378sub size_request {
370 require Carp; 379 require Carp;
371 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
593 602
594# using global variables seems a bit hacky, but passing through all drawing 603# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 604# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 605our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 606
598sub draw { 607#sub draw {
599 my ($self) = @_; 608#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 609
645sub _draw { 610sub _draw {
646 my ($self) = @_; 611 my ($self) = @_;
647 612
648 warn "no draw defined for $self\n"; 613 warn "no draw defined for $self\n";
649} 614}
650 615
651my $cntx;#d#
652sub DESTROY { 616sub DESTROY {
653 my ($self) = @_; 617 my ($self) = @_;
654 618
655 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
656 620
621 local $@;
657 eval { $self->destroy }; 622 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 624
660 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
661} 626}
… …
669use strict; 634use strict;
670use CFPlus::OpenGL; 635use CFPlus::OpenGL;
671 636
672sub new { 637sub new {
673 my $class = shift; 638 my $class = shift;
674
675 # range [value, low, high, page]
676 639
677 $class->SUPER::new ( 640 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
680 @_ 643 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
693 656
694 glEnable GL_BLEND; 657 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 659 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 661 glDisable GL_BLEND;
706 } 662 }
707} 663}
708 664
709############################################################################# 665#############################################################################
… …
769 sort { $a->{z} <=> $b->{z} } 725 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
771 ]; 727 ];
772 728
773 $self->realloc; 729 $self->realloc;
730
731 $self->emit (c_add => \@widgets);
732
733 map $_+0, @widgets
774} 734}
775 735
776sub children { 736sub children {
777 @{ $_[0]{children} } 737 @{ $_[0]{children} }
778} 738}
779 739
780sub remove { 740sub remove {
781 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
782 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
783 delete $child->{parent}; 746 delete $child->{parent};
784 $child->hide; 747 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
787 750
788 $self->realloc; 751 $self->realloc;
789} 752}
790 753
791sub clear { 754sub clear {
… …
819} 782}
820 783
821sub _draw { 784sub _draw {
822 my ($self) = @_; 785 my ($self) = @_;
823 786
824 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
825} 788}
826 789
827############################################################################# 790#############################################################################
828 791
829package CFPlus::UI::Bin; 792package CFPlus::UI::Bin;
… …
839} 802}
840 803
841sub add { 804sub add {
842 my ($self, $child) = @_; 805 my ($self, $child) = @_;
843 806
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 807 $self->clear;
845 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
846} 809}
847 810
848sub remove { 811sub remove {
849 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
… …
867 830
868 1 831 1
869} 832}
870 833
871############################################################################# 834#############################################################################
872
873# back-buffered drawing area 835# back-buffered drawing area
874 836
875package CFPlus::UI::Window; 837package CFPlus::UI::Window;
876 838
877our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
991 $self->{view_x} = $x; 953 $self->{view_x} = $x;
992 $self->{view_y} = $y; 954 $self->{view_y} = $y;
993 955
994 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
995 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
996 } 976 }
997} 977}
998 978
999# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 980sub coord2local {
… …
1047 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1048 1028
1049 my $self; 1029 my $self;
1050 1030
1051 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1032 c_col => 0,
1053 row => 1, 1033 c_row => 1,
1054 vertical => 0, 1034 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1036 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1039 },
1060 ; 1040 ;
1061 1041
1062 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1043 c_col => 1,
1064 row => 0, 1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1065 c_col => 0,
1086 row => 0, 1066 c_row => 0,
1087 expand => 1, 1067 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1070 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1095 1075
1096 0 1076 0
1097 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1098 ; 1083 ;
1099 1084
1100 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1101 1086
1102 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1126 } 1117 }
1127 1118
1119 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1122
1131 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1136 } 1129 }
1137} 1130}
1138
1139 1131
1140sub start_dragging { 1132sub start_dragging {
1141 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
1142 1134
1143 $self->grab_focus; 1135 $self->grab_focus;
… …
1156} 1148}
1157 1149
1158sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1160 1152
1161 $self->{vslider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 $self->{hslider}->emit (mouse_wheel => $ev); 1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1163 1155
1164 1 1156 1
1165} 1157}
1166 1158
1167sub invoke_button_down { 1159sub invoke_button_down {
1168 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1169 1161
1162 if ($ev->{button} == 2) {
1170 $self->start_dragging ($ev); 1163 $self->start_dragging ($ev);
1171 1164 return 1;
1172 1 1165 }
1166
1167 0
1173} 1168}
1174 1169
1175sub invoke_button_up { 1170sub invoke_button_up {
1176 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1177 1172
… …
1224 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1225 1220
1226 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1227 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1228 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1229
1230 glBegin GL_QUADS;
1231 glVertex 0 , 0;
1232 glVertex 0 , $h;
1233 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1234 glVertex $w, 0;
1235 glEnd;
1236
1237 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1238 } 1226 }
1239 1227
1240 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1241} 1229}
… …
1603 1591
1604sub add { 1592sub add {
1605 my ($self, @widgets) = @_; 1593 my ($self, @widgets) = @_;
1606 1594
1607 for my $child (@widgets) { 1595 for my $child (@widgets) {
1608 $child->{rowspan} ||= 1; 1596 $child->{c_rowspan} ||= 1;
1609 $child->{colspan} ||= 1; 1597 $child->{c_colspan} ||= 1;
1610 } 1598 }
1611 1599
1612 $self->SUPER::add (@widgets); 1600 $self->SUPER::add (@widgets);
1613} 1601}
1614 1602
… …
1618 my @widgets; 1606 my @widgets;
1619 1607
1620 while (@_) { 1608 while (@_) {
1621 my ($col, $row, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1622 1610
1623 $child->{row} = $row; 1611 $child->{c_row} = $row;
1624 $child->{col} = $col; 1612 $child->{c_col} = $col;
1625 1613
1626 push @widgets, $child; 1614 push @widgets, $child;
1627 } 1615 }
1628 1616
1629 $self->add (@widgets); 1617 $self->add (@widgets);
… …
1635 my (@w, @h); 1623 my (@w, @h);
1636 1624
1637 my @children = $self->children; 1625 my @children = $self->children;
1638 1626
1639 # first pass, columns 1627 # first pass, columns
1640 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1641 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1642 1630
1643 my $sw = sum @w[$c .. $c + $cs - 1]; 1631 my $sw = sum @w[$c .. $c + $cs - 1];
1644 1632
1645 if ($w > $sw) { 1633 if ($w > $sw) {
1646 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1647 } 1635 }
1648 } 1636 }
1649 1637
1650 # second pass, rows 1638 # second pass, rows
1651 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1653 1641
1654 my $sh = sum @h[$r .. $r + $rs - 1]; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1655 1643
1656 if ($h > $sh) { 1644 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1699 1687
1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1702 1690
1703 for my $widget ($self->children) { 1691 for my $widget ($self->children) {
1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1705 1693
1706 $widget->configure ( 1694 $widget->configure (
1707 $x[$c], $y[$r], 1695 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1709 ); 1697 );
… …
1718 1706
1719use List::Util qw(min max); 1707use List::Util qw(min max);
1720 1708
1721our @ISA = CFPlus::UI::Container::; 1709our @ISA = CFPlus::UI::Container::;
1722 1710
1723sub add {
1724 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1725
1726 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1727 $self->SUPER::add ($child);
1728}
1729
1730sub _scale($$$) { 1711sub _scale($$$) {
1731 my ($mode, $val, $max) = @_; 1712 my ($rel, $val, $max) = @_;
1732 1713
1733 $mode eq "abs" ? $val 1714 $rel ? $val * $max : $val
1734 : $mode eq "rel" ? $val * $max
1735 : 0
1736} 1715}
1737 1716
1738sub size_request { 1717sub size_request {
1739 my ($self) = @_; 1718 my ($self) = @_;
1740 1719
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742 1721
1743 # determine overall size by querying abs widgets 1722 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) { 1723 for my $child ($self->visible_children) {
1745 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1746 1727
1747 if ($pos eq "abs") {
1748 $w = _scale $size, $w, $child->{req_w};
1749 $h = _scale $size, $h, $child->{req_h};
1750
1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1753 } 1730 }
1754 } 1731 }
1755 1732
1756 my $W = $x2 - $x1; 1733 my $W = $x2 - $x1;
1757 my $H = $y2 - $y1; 1734 my $H = $y2 - $y1;
1758 1735
1759 # now layout remaining widgets 1736 # now layout remaining widgets
1760 for my $child ($self->visible_children) { 1737 for my $child ($self->visible_children) {
1761 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1738 if ($child->{c_rel}) {
1739 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1740 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1762 1741
1763 if ($pos ne "abs") {
1764 $x = _scale $pos, $x, $W;
1765 $y = _scale $pos, $x, $H;
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; 1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1744 }
1772 } 1745 }
1773 1746
1774 my $W = $x2 - $x1; 1747 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1748 my $H = $y2 - $y1;
… …
1779 1752
1780sub invoke_size_allocate { 1753sub invoke_size_allocate {
1781 my ($self, $W, $H) = @_; 1754 my ($self, $W, $H) = @_;
1782 1755
1783 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1784 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1785 1759
1786 $x = _scale $pos, $x, $W; 1760 $x += $child->{c_halign} * $child->{req_w};
1787 $y = _scale $pos, $x, $H; 1761 $y += $child->{c_valign} * $child->{req_h};
1788 $w = _scale $size, $w, $child->{req_w};
1789 $h = _scale $size, $h, $child->{req_h};
1790 1762
1791 $child->configure ($x, $y, $w, $h); 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1792 } 1764 }
1793 1765
1794 1 1766 1
1795} 1767}
1796 1768
… …
1800 1772
1801our @ISA = CFPlus::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1802 1774
1803sub size_request { 1775sub size_request {
1804 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1805 1779
1806 $self->{vertical} 1780 $self->{vertical}
1807 ? ( 1781 ? (
1808 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1809 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1810 ) 1784 )
1811 : ( 1785 : (
1812 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1813 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1814 ) 1788 )
1815} 1789}
1816 1790
1817sub invoke_size_allocate { 1791sub invoke_size_allocate {
1818 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
… …
1942 1916
1943 delete $self->{ox}; 1917 delete $self->{ox};
1944 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1945} 1919}
1946 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1947sub set_text { 1927sub set_text {
1948 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1949 1929
1950 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1951 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
1974 1954
1975sub size_request { 1955sub size_request {
1976 my ($self) = @_; 1956 my ($self) = @_;
1977 1957
1978 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1979 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1980 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1981 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1984 1966
1985 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2057 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2058 2040
2059 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2060 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2061 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062 }; 2046 };
2063 2047
2064 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2048# unless ($self->{list}) {
2065 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2066 2050# CFPlus::OpenGL::glNewList $self->{list};
2067 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052# CFPlus::OpenGL::glEndList;
2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
2056
2057 $self->{layout}->draw;
2068} 2058}
2059
2060#sub destroy {
2061# my ($self) = @_;
2062#
2063# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2064#
2065# $self->SUPER::destroy;
2066#}
2069 2067
2070############################################################################# 2068#############################################################################
2071 2069
2072package CFPlus::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
2073 2071
… …
2079 my $class = shift; 2077 my $class = shift;
2080 2078
2081 $class->SUPER::new ( 2079 $class->SUPER::new (
2082 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2083 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
2084 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
2085 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
2086 can_hover => 1, 2086 can_hover => 1,
2087 can_focus => 1, 2087 can_focus => 1,
2088 valign => 0, 2088 valign => 0,
2089 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0, 2090 ellipsise => 0,
… …
2230 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2231 } 2231 }
2232 2232
2233 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235 glBegin GL_QUADS;
2236 glVertex 0 , 0;
2237 glVertex 0 , $self->{h};
2238 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2239 glVertex $self->{w}, 0;
2240 glEnd;
2241 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2242 2237
2243 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2244 2239
2245 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2247 2242
2248 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2249 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2250 utf8::encode $text; 2245 utf8::encode $text;
2251 2246
2252 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2253 } 2248 }
2254 2249
2250 glColor_premultiply @{$self->{active_fg}};
2255 glBegin GL_LINES; 2251 glBegin GL_LINES;
2256 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2257 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2254 glEnd;
2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2258 glEnd; 2268 glEnd;
2259 } 2269 }
2260} 2270}
2261 2271
2262############################################################################# 2272#############################################################################
… …
2349 1 2359 1
2350} 2360}
2351 2361
2352############################################################################# 2362#############################################################################
2353 2363
2364package CFPlus::UI::ButtonBin;
2365
2366our @ISA = CFPlus::UI::Bin::;
2367
2368use CFPlus::OpenGL;
2369
2370my @tex =
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2372 qw(b1_button_inactive.png b1_button_active.png);
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2354package CFPlus::UI::Button; 2413package CFPlus::UI::Button;
2355 2414
2356our @ISA = CFPlus::UI::Label::; 2415our @ISA = CFPlus::UI::Label::;
2357 2416
2358use CFPlus::OpenGL; 2417use CFPlus::OpenGL;
… …
2462sub _draw { 2521sub _draw {
2463 my ($self) = @_; 2522 my ($self) = @_;
2464 2523
2465 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2466 2525
2467 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2468 2527
2469 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2470 2529
2471 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2472 2531
… …
2492sub new { 2551sub new {
2493 my $class = shift; 2552 my $class = shift;
2494 2553
2495 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2496 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2497 @_, 2557 @_,
2498 ); 2558 );
2499 2559
2500 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2501 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2526} 2586}
2527 2587
2528sub size_request { 2588sub size_request {
2529 my ($self) = @_; 2589 my ($self) = @_;
2530 2590
2531 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2532} 2592}
2533 2593
2534sub _draw { 2594sub _draw {
2535 my ($self) = @_; 2595 my ($self) = @_;
2536 2596
… …
2546 } 2606 }
2547 2607
2548 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 2610
2551 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2552 2612
2553 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2554} 2614}
2555 2615
2556############################################################################# 2616#############################################################################
… …
2575 align => 0, 2635 align => 0,
2576 valign => 0, 2636 valign => 0,
2577 can_events => 1, 2637 can_events => 1,
2578 @_ 2638 @_
2579 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2580} 2646}
2581 2647
2582sub invoke_button_up { 2648sub invoke_button_up {
2583 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2584 2650
… …
2724 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2725} 2791}
2726 2792
2727############################################################################# 2793#############################################################################
2728 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2729package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2730 2934
2731our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2732 2936
2733sub new { 2937sub new {
… …
2858 3062
2859 $self->SUPER::invoke_button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2860 3064
2861 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2862 3066
2863 $self->invoke_mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
3068
3069 1
2864} 3070}
2865 3071
2866sub invoke_mouse_motion { 3072sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2868 3074
… …
2888 3094
2889 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2890 3096
2891 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2892 3098
2893 ! ! $delta 3099 1
2894} 3100}
2895 3101
2896sub update { 3102sub update {
2897 my ($self) = @_; 3103 my ($self) = @_;
2898 3104
… …
3029} 3235}
3030 3236
3031sub size_request { 3237sub size_request {
3032 my ($self) = @_; 3238 my ($self) = @_;
3033 3239
3034 my ($empty, $slider) = @{ $self->{children} }; 3240 my ($empty, $slider) = $self->visible_children;
3035 3241
3036 local $self->{children} = [$empty, $slider]; 3242 local $self->{children} = [$empty, $slider];
3037 $self->SUPER::size_request 3243 $self->SUPER::size_request
3038} 3244}
3039 3245
… …
3228 3434
3229 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3230 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3231 3437
3232 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3233 3440
3234 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3235 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3236 3443
3237 for (@w) { 3444 for (@w) {
… …
3359} 3566}
3360 3567
3361sub set_tooltip_from { 3568sub set_tooltip_from {
3362 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3363 3570
3364 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3365 if $widget->{tooltip} =~ /^#(.*)$/;
3366
3367 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3368 3576
3369 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3370 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3371 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3372 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3373 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3374 } 3582 }
3375 3583
3376 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3377 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3378 3586
3379 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3380 markup => $tooltip, 3588 markup => $tip,
3381 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3382 fontsize => 0.8, 3590 fontsize => 0.8,
3383 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3384 ellipsise => 0, 3592 ellipsise => 0,
3385 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3423} 3631}
3424 3632
3425sub _draw { 3633sub _draw {
3426 my ($self) = @_; 3634 my ($self) = @_;
3427 3635
3428 glTranslate 0.375, 0.375;
3429
3430 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3431 3637
3432 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3433 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3434 glVertex 0 , 0;
3435 glVertex 0 , $h;
3436 glVertex $w, $h;
3437 glVertex $w, 0;
3438 glEnd;
3439 3640
3440 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3441 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3442 glVertex 0 , 0;
3443 glVertex 0 , $h;
3444 glVertex $w, $h;
3445 glVertex $w, 0;
3446 glEnd;
3447 3643
3448 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3449 3645
3450 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3451} 3647}
3452 3648
3453############################################################################# 3649#############################################################################
… …
3471 3667
3472 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
3473 CFPlus::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
3474 3670
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3477 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3478 parked => 1, 3674 parked => 1,
3479 cb => sub { 3675 cb => sub {
3480 return unless $::CONN && $widget; 3676 return unless $::CONN;
3481 3677
3678 my $w = $widget
3679 or return;
3680
3482 ++$widget->{frame}; 3681 ++$w->{frame};
3483 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3484 $widget->update; 3685 $w->update;
3485
3486 $widget->update_timer; 3686 $w->update_timer;
3487 }, 3687 },
3488 ); 3688 );
3489 3689
3490 $self->update_face; 3690 $self->update_face;
3491 $self->update_timer; 3691 $self->update_timer;
… …
3512} 3712}
3513 3713
3514sub update_face { 3714sub update_face {
3515 my ($self) = @_; 3715 my ($self) = @_;
3516 3716
3517 return unless $::CONN;
3518
3519 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if ($anim && @$anim) {
3521 delete $self->{wait_face};
3522 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3523 }
3524 }
3525}
3526
3527sub size_request {
3528 my ($self) = @_;
3529
3530 if ($::CONN) { 3717 if ($::CONN) {
3531 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if (my $tex = $::CONN->{texture}[$faceid]) { 3719 if ($anim && @$anim) {
3533 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3534 } else { 3721 delete $self->{face_change_cb};
3535 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3722
3536 $self->realloc; 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3537 }); 3727 }
3538 } 3728 }
3539 } 3729 }
3540 } 3730 }
3731}
3732
3733sub size_request {
3734 my ($self) = @_;
3735
3736 if ($::CONN) {
3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3739 if ($tex->{name}) {
3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3741 } elsif (!$tex->{loading}) {
3742 $tex->upload (sub { $self->reconfigure });
3743 }
3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3747 }
3748 }
3541 3749
3542 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3543} 3751}
3544 3752
3545sub update { 3753sub update {
… …
3559} 3767}
3560 3768
3561sub _draw { 3769sub _draw {
3562 my ($self) = @_; 3770 my ($self) = @_;
3563 3771
3564 return unless $::CONN;
3565
3566 $self->SUPER::_draw; 3772 $self->SUPER::_draw;
3567 3773
3568 my $faceid = $::CONN->{faceid}[$self->{face}] 3774 if (my $tex = $self->{tex}) {
3569 or return;
3570
3571 my $tex = $::CONN->{texture}[$faceid];
3572
3573 if ($tex) {
3574 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
3575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3576 glColor 0, 0, 0, 1; 3777 glColor 0, 0, 0, 1;
3577 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3578 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
… …
3630 children => [ 3831 children => [
3631 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3632 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3633 ], 3834 ],
3634 ; 3835 ;
3635 3836
3636 } else { 3837 } else {
3637 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3638 can_hover => 1, 3839 can_hover => 1,
3639 can_events => 1, 3840 can_events => 1,
3640 markup => $widget, 3841 markup => $widget,
… …
3765 3966
3766############################################################################# 3967#############################################################################
3767 3968
3768package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3769 3970
3971use CFPlus::OpenGL;
3972
3770our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3771 3974
3772sub new { 3975sub new {
3773 my $class = shift; 3976 my $class = shift;
3774 3977
3775 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3776 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3777 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3778 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3779 @_, 3983 @_,
3780 ); 3984 );
3781 3985
3782 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3783 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3784 3988
3989 {
3990 Scalar::Util::weaken (my $wself = $self);
3991
3992 $self->{multiplexer}->connect (c_add => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 Scalar::Util::weaken $child;
3997 $child->{c_tab_} ||= do {
3998 my $tab =
3999 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4000 ? $child->{c_tab}
4001 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4002
4003 $tab->connect (activate => sub {
4004 $wself->set_current_page ($child);
4005 });
4006
4007 $tab
4008 };
4009
4010 $self->{buttonbar}->add ($child->{c_tab_});
4011 }
4012 });
4013
4014 $self->{multiplexer}->connect (c_remove => sub {
4015 my ($mplex, $widgets) = @_;
4016
4017 for my $child (@$widgets) {
4018 $wself->{buttonbar}->remove ($child->{c_tab_});
4019 }
4020 });
4021 }
4022
3785 $self 4023 $self
3786} 4024}
3787 4025
3788sub add { 4026sub add {
4027 my ($self, @widgets) = @_;
4028
4029 $self->{multiplexer}->add (@widgets)
4030}
4031
4032sub remove {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->remove (@widgets)
4036}
4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
4043sub add_tab {
3789 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3790 4045
3791 CFPlus::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3792 4048
3793 $self->{buttonbar}->add (new CFPlus::UI::Button
3794 markup => $title,
3795 tooltip => $tooltip,
3796 on_activate => sub { $self->set_current_page ($widget) },
3797 );
3798
3799 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
3800} 4050}
3801 4051
3802sub get_current_page { 4052sub get_current_page {
3803 my ($self) = @_; 4053 my ($self) = @_;
3804 4054
… …
3808sub set_current_page { 4058sub set_current_page {
3809 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3810 4060
3811 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3812 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3813} 4083}
3814 4084
3815############################################################################# 4085#############################################################################
3816 4086
3817package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4087} 4357}
4088 4358
4089sub update { 4359sub update {
4090 my ($self) = @_; 4360 my ($self) = @_;
4091 4361
4092 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4093} 4363}
4094 4364
4095sub add { 4365sub add {
4096 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4097 4367
… …
4134 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
4135 $_->() 4405 $_->()
4136 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
4137 } 4407 }
4138 4408
4139 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
4140 my %queue; 4410 my %queue;
4141 my @queue; 4411 my @queue;
4142 my $widget; 4412 my $widget;
4143 4413
4144 outer: 4414 outer:
… …
4191 } 4461 }
4192 } 4462 }
4193 4463
4194 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
4195 } 4465 }
4196 }
4197 4466
4198 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
4199 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
4200 values %$size_alloc; 4469 values %$size_alloc;
4201 4470
4202 while () { 4471 while () {
4203 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
4204 4473
4205 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4206 4475
4207 $w = 0 if $w < 0;
4208 $h = 0 if $h < 0;
4209
4210 $w = max $widget->{min_w}, $w; 4476 $w = max $widget->{min_w}, $w;
4211 $h = max $widget->{min_h}, $h; 4477 $h = max $widget->{min_h}, $h;
4212 4478
4213# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4479# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4214# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4480# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4215 4481
4216 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4482 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4217 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4483 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4218 4484
4219 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
4220 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
4221 4487
4222 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4488 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4223 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
4224 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
4225 4491
4226 $widget->{w} = $w; 4492 $widget->{w} = $w;
4227 $widget->{h} = $h; 4493 $widget->{h} = $h;
4228 4494
4229 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
4230 } 4497 }
4231 } 4498 }
4232 } 4499 }
4233 4500
4234 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {

Diff Legend

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