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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 36 $TOOLTIP->show;
39 } 37 }
40 38
41 return; 39 return;
42 } 40 }
43 } 41 }
44 } 42 }
45 43
46 $TOOLTIP->hide; 44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 46 delete $TOOLTIP->{owner};
48}); 47});
49 48
50sub get_layout { 49sub get_layout {
51 my $layout; 50 my $layout;
… …
110 } 109 }
111 110
112 if ($GRAB) { 111 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 113 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
117 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
118 } else { 121 } else {
119 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
120 } 123 }
121 } 124 }
… …
265 $self->hide; 268 $self->hide;
266 $self->emit ("destroy"); 269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
268} 271}
269 272
273sub TO_JSON {
274 { "\fw" => $_[0]{s_id} }
275}
276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
273 return if $self->{parent}; 280 return if $self->{parent};
274 281
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
351 358
352 $self->{force_w} = $w; 359 $self->{force_w} = $w;
353 $self->{force_h} = $h; 360 $self->{force_h} = $h;
354 361
355 $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)
356} 376}
357 377
358sub size_request { 378sub size_request {
359 require Carp; 379 require Carp;
360 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
540 560
541 # parent 561 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 562 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 563}
544 564
545sub find_widget { 565#sub find_widget {
546 my ($self, $x, $y) = @_; 566# in .xs
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556 567
557sub set_parent { 568sub set_parent {
558 my ($self, $parent) = @_; 569 my ($self, $parent) = @_;
559 570
560 CFPlus::weaken ($self->{parent} = $parent); 571 CFPlus::weaken ($self->{parent} = $parent);
… …
591 602
592# 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
593# functions seems pointless. 604# functions seems pointless.
594our ($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
595 606
596sub draw { 607#sub draw {
597 my ($self) = @_; 608#CFPlus.xs
598
599 return unless $self->{h} && $self->{w};
600
601 # update screen rectangle
602 local $draw_x = $draw_x + $self->{x};
603 local $draw_y = $draw_y + $self->{y};
604
605 # skip widgets that are entirely outside the drawing area
606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609 glPushMatrix;
610 glTranslate $self->{x}, $self->{y}, 0;
611
612 if ($self == $HOVER && $self->{can_hover}) {
613 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614 glEnable GL_BLEND;
615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glBegin GL_QUADS;
617 glVertex 0 , 0;
618 glVertex $self->{w}, 0;
619 glVertex $self->{w}, $self->{h};
620 glVertex 0 , $self->{h};
621 glEnd;
622 glDisable GL_BLEND;
623 }
624
625 if ($ENV{CFPLUS_DEBUG} & 1) {
626 glPushMatrix;
627 glColor 1, 1, 0, 1;
628 glTranslate 0.375, 0.375;
629 glBegin GL_LINE_LOOP;
630 glVertex 0 , 0;
631 glVertex $self->{w} - 1, 0;
632 glVertex $self->{w} - 1, $self->{h} - 1;
633 glVertex 0 , $self->{h} - 1;
634 glEnd;
635 glPopMatrix;
636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637 }
638
639 $self->_draw;
640 glPopMatrix;
641}
642 609
643sub _draw { 610sub _draw {
644 my ($self) = @_; 611 my ($self) = @_;
645 612
646 warn "no draw defined for $self\n"; 613 warn "no draw defined for $self\n";
647} 614}
648 615
649my $cntx;#d#
650sub DESTROY { 616sub DESTROY {
651 my ($self) = @_; 617 my ($self) = @_;
652 618
653 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
654 620
621 local $@;
655 eval { $self->destroy }; 622 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657 624
658 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
659} 626}
… …
667use strict; 634use strict;
668use CFPlus::OpenGL; 635use CFPlus::OpenGL;
669 636
670sub new { 637sub new {
671 my $class = shift; 638 my $class = shift;
672
673 # range [value, low, high, page]
674 639
675 $class->SUPER::new ( 640 $class->SUPER::new (
676 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
677 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
678 @_ 643 @_
… …
690 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
691 656
692 glEnable GL_BLEND; 657 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glColor_premultiply @$color; 659 glColor_premultiply @$color;
695
696 glBegin GL_QUADS;
697 glVertex 0 , 0;
698 glVertex 0 , $h;
699 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
700 glVertex $w, 0;
701 glEnd;
702
703 glDisable GL_BLEND; 661 glDisable GL_BLEND;
704 } 662 }
705} 663}
706 664
707############################################################################# 665#############################################################################
… …
739 can_events => 0, 697 can_events => 0,
740 %arg, 698 %arg,
741 ); 699 );
742 700
743 $self->add (@$children) 701 $self->add (@$children)
744 if $children; 702 if $children && @$children;
745 703
746 $self 704 $self
747} 705}
748 706
749sub realloc { 707sub realloc {
… …
758 my ($self, @widgets) = @_; 716 my ($self, @widgets) = @_;
759 717
760 $_->set_parent ($self) 718 $_->set_parent ($self)
761 for @widgets; 719 for @widgets;
762 720
721 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 722 use sort 'stable';
764 723
765 $self->{children} = [ 724 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 725 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
768 ]; 727 ];
769 728
770 $self->realloc; 729 $self->realloc;
730
731 $self->emit (c_add => \@widgets);
732
733 map $_+0, @widgets
771} 734}
772 735
773sub children { 736sub children {
774 @{ $_[0]{children} } 737 @{ $_[0]{children} }
775} 738}
776 739
777sub remove { 740sub remove {
778 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
779 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
780 delete $child->{parent}; 746 delete $child->{parent};
781 $child->hide; 747 $child->hide;
782
783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
784 750
785 $self->realloc; 751 $self->realloc;
786} 752}
787 753
788sub clear { 754sub clear {
789 my ($self) = @_; 755 my ($self) = @_;
790 756
791 my $children = delete $self->{children}; 757 my $children = $self->{children};
792 $self->{children} = []; 758 $self->{children} = [];
793 759
794 for (@$children) { 760 for (@$children) {
795 delete $_->{parent}; 761 delete $_->{parent};
796 $_->hide; 762 $_->hide;
… …
816} 782}
817 783
818sub _draw { 784sub _draw {
819 my ($self) = @_; 785 my ($self) = @_;
820 786
821 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
822} 788}
823 789
824############################################################################# 790#############################################################################
825 791
826package CFPlus::UI::Bin; 792package CFPlus::UI::Bin;
… …
836} 802}
837 803
838sub add { 804sub add {
839 my ($self, $child) = @_; 805 my ($self, $child) = @_;
840 806
841 $self->SUPER::remove ($_) for @{ $self->{children} }; 807 $self->clear;
842 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
843} 809}
844 810
845sub remove { 811sub remove {
846 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
… …
864 830
865 1 831 1
866} 832}
867 833
868############################################################################# 834#############################################################################
869
870# back-buffered drawing area 835# back-buffered drawing area
871 836
872package CFPlus::UI::Window; 837package CFPlus::UI::Window;
873 838
874our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
936} 901}
937 902
938############################################################################# 903#############################################################################
939 904
940package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
941 908
942our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
943 910
944sub new { 911sub new {
945 my $class = shift; 912 my $class = shift;
… …
954sub size_request { 921sub size_request {
955 my ($self) = @_; 922 my ($self) = @_;
956 923
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 925
959 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
961 928
962 ($w, $h) 929 ($w, $h)
963} 930}
964 931
965sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
977} 944}
978 945
979sub set_offset { 946sub set_offset {
980 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
981 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
982 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
984 955
956 $self->emit (changed => $x, $y);
985 $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);
976 }
986} 977}
987 978
988# 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
989sub coord2local { 980sub coord2local {
990 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1006 997
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 1000 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else { 1002 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 1004 }
1014} 1005}
1015 1006
… …
1026 1017
1027############################################################################# 1018#############################################################################
1028 1019
1029package CFPlus::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1030 1021
1031our @ISA = CFPlus::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1032 1023
1033sub new { 1024sub new {
1034 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1035 1026
1036 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1037 1028
1038 my $self; 1029 my $self;
1039 1030
1040 my $slider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1041 vertical => 1, 1045 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1047 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1050 },
1046 ; 1051 ;
1047 1052
1048 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1050 can_events => 1, 1056 can_events => 1,
1051 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1052 %arg, 1061 %arg,
1053 ); 1062 );
1054 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1056 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1057 1088
1058 $self 1089 $self
1059} 1090}
1060
1061#TODO# update range on size_allocate depending on child
1062 1091
1063sub add { 1092sub add {
1064 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1065 1094
1066 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1067} 1096}
1068 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1069sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1071 1152
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1155
1076 1 1156 1
1077} 1157}
1078 1158
1079sub update_slider { 1159sub invoke_button_down {
1080 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1081 1161
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1083} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1084 1166
1085sub update { 1167 0
1086 my ($self) = @_; 1168}
1087 1169
1088 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1089 1172
1090 $self->update_slider; 1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1091} 1189}
1092 1190
1093sub invoke_size_allocate { 1191sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1095 1193
1096 $self->update_slider; 1194 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1196}
1100 1197
1101############################################################################# 1198#############################################################################
1102 1199
… …
1122 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1123 1220
1124 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1125 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1127
1128 glBegin GL_QUADS;
1129 glVertex 0 , 0;
1130 glVertex 0 , $h;
1131 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1132 glVertex $w, 0;
1133 glEnd;
1134
1135 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1136 } 1226 }
1137 1227
1138 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1139} 1229}
… …
1252 1342
1253my @border = 1343my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1344 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1345 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1346
1347my @icon =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1349 qw(x1_move.png x1_resize.png);
1350
1257sub new { 1351sub new {
1258 my ($class, %arg) = @_; 1352 my ($class, %arg) = @_;
1259 1353
1260 my $self = $class->SUPER::new ( 1354 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1355 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1524
1431 my $border = $self->border; 1525 my $border = $self->border;
1432 1526
1433 glColor @{ $self->{border_bg} }; 1527 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1528 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1529 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1530 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1531 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1532
1533 # move
1534 my $w2 = ($w - $border) * .5;
1535 my $h2 = ($h - $border) * .5;
1536 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1537 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1538 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1539
1540 # resize
1541 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1542 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1543 unless $self->{has_close_button};
1544 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1545 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1546
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1547 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1548 glColor @{ $self->{bg} };
1441 1549
1442 # TODO: repeat texture not scale 1550 # TODO: repeat texture not scale
… …
1463 1571
1464############################################################################# 1572#############################################################################
1465 1573
1466package CFPlus::UI::Table; 1574package CFPlus::UI::Table;
1467 1575
1468our @ISA = CFPlus::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
1469 1577
1470use List::Util qw(max sum); 1578use List::Util qw(max sum);
1471 1579
1472use CFPlus::OpenGL; 1580use CFPlus::OpenGL;
1473 1581
1474sub new { 1582sub new {
1475 my $class = shift; 1583 my $class = shift;
1476 1584
1477 $class->SUPER::new ( 1585 $class->SUPER::new (
1478 col_expand => [], 1586 col_expand => [],
1587 row_expand => [],
1479 @_, 1588 @_,
1480 ) 1589 )
1481} 1590}
1482 1591
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1592sub add {
1593 my ($self, @widgets) = @_;
1594
1595 for my $child (@widgets) {
1596 $child->{c_rowspan} ||= 1;
1597 $child->{c_colspan} ||= 1;
1598 }
1599
1600 $self->SUPER::add (@widgets);
1601}
1602
1603sub add_at {
1488 my ($self) = shift; 1604 my $self = shift;
1605
1606 my @widgets;
1489 1607
1490 while (@_) { 1608 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1610
1496 $self->{force_realloc} = 1; 1611 $child->{c_row} = $row;
1497 $self->{force_size_alloc} = 1; 1612 $child->{c_col} = $col;
1498 $self->realloc;
1499}
1500 1613
1501sub remove { 1614 push @widgets, $child;
1615 }
1616
1617 $self->add (@widgets);
1618}
1619
1620sub get_wh {
1502 my ($self, $child) = @_; 1621 my ($self) = @_;
1503 1622
1504 # TODO: not yet implemented 1623 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1624
1511 my @children = $self->children; 1625 my @children = $self->children;
1512 delete $self->{children}; 1626
1627 # first pass, columns
1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1630
1631 my $sw = sum @w[$c .. $c + $cs - 1];
1632
1633 if ($w > $sw) {
1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1635 }
1513 1636 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1637
1519 $self->realloc; 1638 # second pass, rows
1520} 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1521
1522sub get_wh {
1523 my ($self) = @_;
1524
1525 my (@w, @h);
1526
1527 for my $y (0 .. $#{$self->{children}}) {
1528 my $row = $self->{children}[$y]
1529 or next;
1530
1531 for my $x (0 .. $#$row) {
1532 my $widget = $row->[$x]
1533 or next;
1534 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1535 1641
1536 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1646 }
1539 } 1647 }
1540 1648
1541 (\@w, \@h) 1649 (\@w, \@h)
1542} 1650}
… …
1558 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1559 1667
1560 my $req_w = (sum @$ws) || 1; 1668 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1669 my $req_h = (sum @$hs) || 1;
1562 1670
1563 # TODO: nicer code && do row_expand 1671 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1567 1675
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1677
1572 CFPlus::UI::harmonize $ws; 1678 CFPlus::UI::harmonize $ws;
1679
1680 my @row_expand = @{$self->{row_expand}};
1681 @row_expand = (1) x @$ws unless @row_expand;
1682 my $row_expand = (sum @row_expand) || 1;
1683
1684 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1685
1573 CFPlus::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1574 1687
1575 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1690
1577 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1579 or next;
1580 1693
1581 my $x = 0; 1694 $widget->configure (
1582 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1697 );
1584 for my $c (0 .. $#$row) { 1698 }
1585 my $col_w = $ws->[$c];
1586 1699
1587 if (my $widget = $row->[$c]) { 1700 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1701}
1589 }
1590 1702
1591 $x += $col_w; 1703#############################################################################
1704
1705package CFPlus::UI::Fixed;
1706
1707use List::Util qw(min max);
1708
1709our @ISA = CFPlus::UI::Container::;
1710
1711sub _scale($$$) {
1712 my ($rel, $val, $max) = @_;
1713
1714 $rel ? $val * $max : $val
1715}
1716
1717sub size_request {
1718 my ($self) = @_;
1719
1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1721
1722 # determine overall size by querying abs widgets
1723 for my $child ($self->visible_children) {
1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1727
1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592 } 1730 }
1731 }
1593 1732
1594 $y += $row_h; 1733 my $W = $x2 - $x1;
1734 my $H = $y2 - $y1;
1735
1736 # now layout remaining widgets
1737 for my $child ($self->visible_children) {
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;
1741
1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1744 }
1745 }
1746
1747 my $W = $x2 - $x1;
1748 my $H = $y2 - $y1;
1749
1750 ($W, $H)
1751}
1752
1753sub invoke_size_allocate {
1754 my ($self, $W, $H) = @_;
1755
1756 for my $child ($self->visible_children) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x += $child->{c_halign} * $child->{req_w};
1761 $y += $child->{c_valign} * $child->{req_h};
1762
1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595 } 1764 }
1596 1765
1597 1 1766 1
1598} 1767}
1599 1768
1600sub find_widget {
1601 my ($self, $x, $y) = @_;
1602
1603 $x -= $self->{x};
1604 $y -= $self->{y};
1605
1606 my $res;
1607
1608 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609 $res = $_->find_widget ($x, $y)
1610 and return $res;
1611 }
1612
1613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614}
1615
1616sub _draw {
1617 my ($self) = @_;
1618
1619 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_;
1621 }
1622}
1623
1624############################################################################# 1769#############################################################################
1625 1770
1626package CFPlus::UI::Box; 1771package CFPlus::UI::Box;
1627 1772
1628our @ISA = CFPlus::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1629 1774
1630sub size_request { 1775sub size_request {
1631 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1632 1779
1633 $self->{vertical} 1780 $self->{vertical}
1634 ? ( 1781 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1637 ) 1784 )
1638 : ( 1785 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1641 ) 1788 )
1642} 1789}
1643 1790
1644sub invoke_size_allocate { 1791sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
… …
1769 1916
1770 delete $self->{ox}; 1917 delete $self->{ox};
1771 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1772} 1919}
1773 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1774sub set_text { 1927sub set_text {
1775 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1776 1929
1777 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1778 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
1801 1954
1802sub size_request { 1955sub size_request {
1803 my ($self) = @_; 1956 my ($self) = @_;
1804 1957
1805 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1806 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1807 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1808 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1811 1966
1812 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
1884 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
1885 2040
1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1889 }; 2046 };
1890 2047
1891 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2048# unless ($self->{list}) {
1892 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
1893 2050# CFPlus::OpenGL::glNewList $self->{list};
1894 $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;
1895} 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#}
1896 2067
1897############################################################################# 2068#############################################################################
1898 2069
1899package CFPlus::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1900 2071
… …
1906 my $class = shift; 2077 my $class = shift;
1907 2078
1908 $class->SUPER::new ( 2079 $class->SUPER::new (
1909 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1910 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
1911 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
1912 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
1913 can_hover => 1, 2086 can_hover => 1,
1914 can_focus => 1, 2087 can_focus => 1,
1915 valign => 0, 2088 valign => 0,
1916 can_events => 1, 2089 can_events => 1,
1917 ellipsise => 0, 2090 ellipsise => 0,
… …
1966 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1969 2142
1970 my $text = $self->get_text; 2143 my $text = $self->get_text;
2144
2145 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2146
1972 if ($uni == 8) { 2147 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
… …
2055 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2056 } 2231 }
2057 2232
2058 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glBegin GL_QUADS;
2061 glVertex 0 , 0;
2062 glVertex 0 , $self->{h};
2063 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2064 glVertex $self->{w}, 0;
2065 glEnd;
2066 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2067 2237
2068 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2069 2239
2070 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2072 2242
2073 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2074 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2075 utf8::encode $text; 2245 utf8::encode $text;
2076 2246
2077 @$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);
2078 } 2248 }
2079 2249
2250 glColor_premultiply @{$self->{active_fg}};
2080 glBegin GL_LINES; 2251 glBegin GL_LINES;
2081 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};
2082 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;
2083 glEnd; 2268 glEnd;
2084 } 2269 }
2085} 2270}
2086 2271
2087############################################################################# 2272#############################################################################
… …
2174 1 2359 1
2175} 2360}
2176 2361
2177############################################################################# 2362#############################################################################
2178 2363
2179package CFPlus::UI::Button; 2364package CFPlus::UI::ButtonBin;
2180 2365
2181our @ISA = CFPlus::UI::Label::; 2366our @ISA = CFPlus::UI::Bin::;
2182 2367
2183use CFPlus::OpenGL; 2368use CFPlus::OpenGL;
2184 2369
2185my @tex = 2370my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2372 qw(b1_button_inactive.png b1_button_active.png);
2188 2373
2189sub new { 2374sub new {
2190 my $class = shift; 2375 my $class = shift;
2191 2376
2192 $class->SUPER::new ( 2377 $class->SUPER::new (
2193 padding_x => 4,
2194 padding_y => 4,
2195 fg => [1, 1, 1],
2196 active_fg => [0, 0, 1],
2197 can_hover => 1, 2378 can_hover => 1,
2198 align => 0, 2379 align => 0,
2199 valign => 0, 2380 valign => 0,
2200 can_events => 1, 2381 can_events => 1,
2201 @_ 2382 @_
… …
2213} 2394}
2214 2395
2215sub _draw { 2396sub _draw {
2216 my ($self) = @_; 2397 my ($self) = @_;
2217 2398
2218 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2219
2220 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
2223 2402
2403 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 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
2413package CFPlus::UI::Button;
2414
2415our @ISA = CFPlus::UI::Label::;
2416
2417use CFPlus::OpenGL;
2418
2419my @tex =
2420 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2421 qw(b1_button_inactive.png b1_button_active.png);
2422
2423sub new {
2424 my $class = shift;
2425
2426 $class->SUPER::new (
2427 padding_x => 4,
2428 padding_y => 4,
2429 fg => [1.0, 1.0, 1.0],
2430 active_fg => [0.8, 0.8, 0.8],
2431 can_hover => 1,
2432 align => 0,
2433 valign => 0,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2453
2454 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 0, 0, 0, 1;
2457
2458 my $tex = $tex[$GRAB == $self];
2459 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2460
2226 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2227 2462
2228 $self->SUPER::_draw; 2463 $self->SUPER::_draw;
2229} 2464}
… …
2286sub _draw { 2521sub _draw {
2287 my ($self) = @_; 2522 my ($self) = @_;
2288 2523
2289 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2290 2525
2291 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2292 2527
2293 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2294 2529
2295 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;
2296 2531
… …
2316sub new { 2551sub new {
2317 my $class = shift; 2552 my $class = shift;
2318 2553
2319 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2320 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2321 @_, 2557 @_,
2322 ); 2558 );
2323 2559
2324 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2350} 2586}
2351 2587
2352sub size_request { 2588sub size_request {
2353 my ($self) = @_; 2589 my ($self) = @_;
2354 2590
2355 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2356} 2592}
2357 2593
2358sub _draw { 2594sub _draw {
2359 my ($self) = @_; 2595 my ($self) = @_;
2360 2596
… …
2370 } 2606 }
2371 2607
2372 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2374 2610
2375 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2376 2612
2377 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2378} 2614}
2379 2615
2380############################################################################# 2616#############################################################################
… …
2399 align => 0, 2635 align => 0,
2400 valign => 0, 2636 valign => 0,
2401 can_events => 1, 2637 can_events => 1,
2402 @_ 2638 @_
2403 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2404} 2646}
2405 2647
2406sub invoke_button_up { 2648sub invoke_button_up {
2407 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2408 2650
… …
2548 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2549} 2791}
2550 2792
2551############################################################################# 2793#############################################################################
2552 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
2553package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2554 2934
2555our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2556 2936
2557sub new { 2937sub new {
… …
2682 3062
2683 $self->SUPER::invoke_button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2684 3064
2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686 3066
2687 $self->invoke_mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
3068
3069 1
2688} 3070}
2689 3071
2690sub invoke_mouse_motion { 3072sub invoke_mouse_motion {
2691 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2692 3074
… …
2708sub invoke_mouse_wheel { 3090sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 3091 my ($self, $ev) = @_;
2710 3092
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3093 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 3094
3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3096
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 3098
2715 ! ! $delta 3099 1
2716} 3100}
2717 3101
2718sub update { 3102sub update {
2719 my ($self) = @_; 3103 my ($self) = @_;
2720 3104
… …
2828 #font => default_font 3212 #font => default_font
2829 @_, 3213 @_,
2830 3214
2831 layout => (new CFPlus::Layout), 3215 layout => (new CFPlus::Layout),
2832 par => [], 3216 par => [],
3217 max_par => 0,
2833 height => 0, 3218 height => 0,
2834 children => [ 3219 children => [
2835 (new CFPlus::UI::Empty expand => 1), 3220 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 3221 (new CFPlus::UI::Slider vertical => 1),
2837 ], 3222 ],
… …
2850} 3235}
2851 3236
2852sub size_request { 3237sub size_request {
2853 my ($self) = @_; 3238 my ($self) = @_;
2854 3239
2855 my ($empty, $slider) = @{ $self->{children} }; 3240 my ($empty, $slider) = $self->visible_children;
2856 3241
2857 local $self->{children} = [$empty, $slider]; 3242 local $self->{children} = [$empty, $slider];
2858 $self->SUPER::size_request 3243 $self->SUPER::size_request
2859} 3244}
2860 3245
… …
2962 3347
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3348 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para; 3349 push @{$self->{par}}, $para;
2965 } 3350 }
2966 3351
3352 if (my $max = $self->{max_par}) {
3353 shift @{$self->{par}} while @{$self->{par}} > $max;
3354 }
3355
2967 $self->{need_reflow}++; 3356 $self->{need_reflow}++;
2968 $self->update; 3357 $self->update;
2969} 3358}
2970 3359
2971sub scroll_to_bottom { 3360sub scroll_to_bottom {
… …
3045 3434
3046 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3047 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3048 3437
3049 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3050 3440
3051 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3052 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3053 3443
3054 for (@w) { 3444 for (@w) {
… …
3176} 3566}
3177 3567
3178sub set_tooltip_from { 3568sub set_tooltip_from {
3179 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3180 3570
3181 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3182 if $widget->{tooltip} =~ /^#(.*)$/;
3183
3184 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 =~ /^#(.*)$/;
3185 3576
3186 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3187 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3188 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3189 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3190 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3191 } 3582 }
3192 3583
3193 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3194 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3195 3586
3196 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3197 markup => $tooltip, 3588 markup => $tip,
3198 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3199 fontsize => 0.8, 3590 fontsize => 0.8,
3200 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3201 ellipsise => 0, 3592 ellipsise => 0,
3202 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3240} 3631}
3241 3632
3242sub _draw { 3633sub _draw {
3243 my ($self) = @_; 3634 my ($self) = @_;
3244 3635
3245 glTranslate 0.375, 0.375;
3246
3247 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3248 3637
3249 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3250 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3251 glVertex 0 , 0;
3252 glVertex 0 , $h;
3253 glVertex $w, $h;
3254 glVertex $w, 0;
3255 glEnd;
3256 3640
3257 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3258 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3259 glVertex 0 , 0;
3260 glVertex 0 , $h;
3261 glVertex $w, $h;
3262 glVertex $w, 0;
3263 glEnd;
3264 3643
3265 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3266 3645
3267 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3268} 3647}
3269 3648
3270############################################################################# 3649#############################################################################
… …
3277 3656
3278sub new { 3657sub new {
3279 my $class = shift; 3658 my $class = shift;
3280 3659
3281 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3661 size_w => 32,
3662 size_h => 8,
3282 aspect => 1, 3663 aspect => 1,
3283 can_events => 0, 3664 can_events => 0,
3284 @_, 3665 @_,
3285 ); 3666 );
3286 3667
3287 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
3288 CFPlus::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
3289 3670
3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3290 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3674 parked => 1,
3293 interval => $self->{animspeed},
3294 cb => sub { 3675 cb => sub {
3676 return unless $::CONN;
3677
3678 my $w = $widget
3679 or return;
3680
3295 ++$widget->{frame}; 3681 ++$w->{frame};
3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3296 $widget->update; 3685 $w->update;
3686 $w->update_timer;
3297 }, 3687 },
3298 ); 3688 );
3689
3690 $self->update_face;
3691 $self->update_timer;
3299 } 3692 }
3300 3693
3301 $self 3694 $self
3302} 3695}
3303 3696
3697sub update_timer {
3698 my ($self) = @_;
3699
3700 return unless $self->{timer};
3701
3702 if ($self->{visible}) {
3703 $self->{timer}->at (
3704 $self->{anim_start}
3705 + $self->{animspeed}
3706 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3707 );
3708 $self->{timer}->start;
3709 } else {
3710 $self->{timer}->stop;
3711 }
3712}
3713
3714sub update_face {
3715 my ($self) = @_;
3716
3717 if ($::CONN) {
3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3719 if ($anim && @$anim) {
3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3721 delete $self->{face_change_cb};
3722
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 }
3727 }
3728 }
3729 }
3730 }
3731}
3732
3304sub size_request { 3733sub size_request {
3305 (32, 8) 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 }
3749
3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3306} 3751}
3307 3752
3308sub update { 3753sub update {
3309 my ($self) = @_; 3754 my ($self) = @_;
3310 3755
3311 return unless $self->{visible}; 3756 return unless $self->{visible};
3312 3757
3313 $self->SUPER::update; 3758 $self->SUPER::update;
3314} 3759}
3315 3760
3761sub invoke_visibility_change {
3762 my ($self) = @_;
3763
3764 $self->update_timer;
3765
3766 0
3767}
3768
3316sub _draw { 3769sub _draw {
3317 my ($self) = @_; 3770 my ($self) = @_;
3318 3771
3319 return unless $::CONN;
3320
3321 $self->SUPER::_draw; 3772 $self->SUPER::_draw;
3322 3773
3323 my $face; 3774 if (my $tex = $self->{tex}) {
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}];
3327
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3333
3334 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3777 glColor 0, 0, 0, 1;
3338 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3339 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
… …
3341} 3781}
3342 3782
3343sub destroy { 3783sub destroy {
3344 my ($self) = @_; 3784 my ($self) = @_;
3345 3785
3346 $self->{timer}->cancel 3786 (delete $self->{timer})->cancel
3347 if $self->{timer}; 3787 if $self->{timer};
3348 3788
3349 $self->SUPER::destroy; 3789 $self->SUPER::destroy;
3350} 3790}
3351 3791
… …
3391 children => [ 3831 children => [
3392 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3393 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3394 ], 3834 ],
3395 ; 3835 ;
3396 3836
3397 } else { 3837 } else {
3398 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3399 can_hover => 1, 3839 can_hover => 1,
3400 can_events => 1, 3840 can_events => 1,
3401 markup => $widget, 3841 markup => $widget,
… …
3526 3966
3527############################################################################# 3967#############################################################################
3528 3968
3529package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3530 3970
3971use CFPlus::OpenGL;
3972
3531our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3532 3974
3533sub new { 3975sub new {
3534 my $class = shift; 3976 my $class = shift;
3535 3977
3536 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3537 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3538 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3539 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3540 @_, 3983 @_,
3541 ); 3984 );
3542 3985
3543 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3544 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3545 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
3546 $self 4023 $self
3547} 4024}
3548 4025
3549sub 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 {
3550 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3551 4045
3552 CFPlus::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3553 4048
3554 $self->{buttonbar}->add (new CFPlus::UI::Button
3555 markup => $title,
3556 tooltip => $tooltip,
3557 on_activate => sub { $self->set_current_page ($widget) },
3558 );
3559
3560 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
3561} 4050}
3562 4051
3563sub get_current_page { 4052sub get_current_page {
3564 my ($self) = @_; 4053 my ($self) = @_;
3565 4054
… …
3569sub set_current_page { 4058sub set_current_page {
3570 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3571 4060
3572 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3573 $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 }
3574} 4083}
3575 4084
3576############################################################################# 4085#############################################################################
3577 4086
3578package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
3848} 4357}
3849 4358
3850sub update { 4359sub update {
3851 my ($self) = @_; 4360 my ($self) = @_;
3852 4361
3853 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
3854} 4363}
3855 4364
3856sub add { 4365sub add {
3857 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
3858 4367
… …
3895 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
3896 $_->() 4405 $_->()
3897 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
3898 } 4407 }
3899 4408
3900 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
3901 my %queue; 4410 my %queue;
3902 my @queue; 4411 my @queue;
3903 my $widget; 4412 my $widget;
3904 4413
3905 outer: 4414 outer:
… …
3952 } 4461 }
3953 } 4462 }
3954 4463
3955 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
3956 } 4465 }
3957 }
3958 4466
3959 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
3960 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
3961 values %$size_alloc; 4469 values %$size_alloc;
3962 4470
3963 while () { 4471 while () {
3964 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
3965 4473
3966 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3967 4475
3968 $w = 0 if $w < 0;
3969 $h = 0 if $h < 0;
3970
3971 $w = max $widget->{min_w}, $w; 4476 $w = max $widget->{min_w}, $w;
3972 $h = max $widget->{min_h}, $h; 4477 $h = max $widget->{min_h}, $h;
3973 4478
3974# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4479# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4480# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976 4481
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4482 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4483 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3979 4484
3980 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
3981 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
3982 4487
3983 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}) {
3984 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
3985 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
3986 4491
3987 $widget->{w} = $w; 4492 $widget->{w} = $w;
3988 $widget->{h} = $h; 4493 $widget->{h} = $h;
3989 4494
3990 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
3991 } 4497 }
3992 } 4498 }
3993 } 4499 }
3994 4500
3995 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {
3996 $_->() 4502 $_->()
3997 for values %{delete $self->{post_alloc_hook}}; 4503 for values %{delete $self->{post_alloc_hook}};
3998 } 4504 }
3999
4000 4505
4001 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4506 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4002 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4507 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4003 glClear GL_COLOR_BUFFER_BIT; 4508 glClear GL_COLOR_BUFFER_BIT;
4004 4509

Diff Legend

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