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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
266 $self->hide; 272 $self->hide;
267 $self->emit ("destroy"); 273 $self->emit ("destroy");
268 %$self = (); 274 %$self = ();
269} 275}
270 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
271sub show { 281sub show {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
274 return if $self->{parent}; 284 return if $self->{parent};
275 285
… …
314sub set_visibility { 324sub set_visibility {
315 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
316 326
317 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
318 328
319 $visible ? $self->hide 329 $visible ? $self->show
320 : $self->show; 330 : $self->hide;
321} 331}
322 332
323sub toggle_visibility { 333sub toggle_visibility {
324 my ($self) = @_; 334 my ($self) = @_;
325 335
… …
530 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
531 : (); 541 : ();
532 542
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 544
535 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 554}
540 555
541sub find_widget { 556#sub find_widget {
542 my ($self, $x, $y) = @_; 557# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 558
553sub set_parent { 559sub set_parent {
554 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
555 561
556 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
558} 564}
559 565
560sub realloc { 566sub realloc {
561 my ($self) = @_; 567 my ($self) = @_;
… …
587 593
588# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
589# functions seems pointless. 595# functions seems pointless.
590our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
591 597
592sub draw { 598#sub draw {
593 my ($self) = @_; 599#CFPlus.xs
594
595 return unless $self->{h} && $self->{w};
596
597 # update screen rectangle
598 local $draw_x = $draw_x + $self->{x};
599 local $draw_y = $draw_y + $self->{y};
600
601 # skip widgets that are entirely outside the drawing area
602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605 glPushMatrix;
606 glTranslate $self->{x}, $self->{y}, 0;
607
608 if ($self == $HOVER && $self->{can_hover}) {
609 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610 glEnable GL_BLEND;
611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glBegin GL_QUADS;
613 glVertex 0 , 0;
614 glVertex $self->{w}, 0;
615 glVertex $self->{w}, $self->{h};
616 glVertex 0 , $self->{h};
617 glEnd;
618 glDisable GL_BLEND;
619 }
620
621 if ($ENV{CFPLUS_DEBUG} & 1) {
622 glPushMatrix;
623 glColor 1, 1, 0, 1;
624 glTranslate 0.375, 0.375;
625 glBegin GL_LINE_LOOP;
626 glVertex 0 , 0;
627 glVertex $self->{w} - 1, 0;
628 glVertex $self->{w} - 1, $self->{h} - 1;
629 glVertex 0 , $self->{h} - 1;
630 glEnd;
631 glPopMatrix;
632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633 }
634
635 $self->_draw;
636 glPopMatrix;
637}
638 600
639sub _draw { 601sub _draw {
640 my ($self) = @_; 602 my ($self) = @_;
641 603
642 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
… …
645sub DESTROY { 607sub DESTROY {
646 my ($self) = @_; 608 my ($self) = @_;
647 609
648 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
649 611
612 local $@;
650 eval { $self->destroy }; 613 eval { $self->destroy };
651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652 615
653 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
654} 617}
… …
662use strict; 625use strict;
663use CFPlus::OpenGL; 626use CFPlus::OpenGL;
664 627
665sub new { 628sub new {
666 my $class = shift; 629 my $class = shift;
667
668 # range [value, low, high, page]
669 630
670 $class->SUPER::new ( 631 $class->SUPER::new (
671 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
672 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
673 @_ 634 @_
… …
685 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
686 647
687 glEnable GL_BLEND; 648 glEnable GL_BLEND;
688 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
689 glColor_premultiply @$color; 650 glColor_premultiply @$color;
690
691 glBegin GL_QUADS;
692 glVertex 0 , 0;
693 glVertex 0 , $h;
694 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
695 glVertex $w, 0;
696 glEnd;
697
698 glDisable GL_BLEND; 652 glDisable GL_BLEND;
699 } 653 }
700} 654}
701 655
702############################################################################# 656#############################################################################
… …
734 can_events => 0, 688 can_events => 0,
735 %arg, 689 %arg,
736 ); 690 );
737 691
738 $self->add (@$children) 692 $self->add (@$children)
739 if $children; 693 if $children && @$children;
740 694
741 $self 695 $self
742} 696}
743 697
744sub realloc { 698sub realloc {
… …
753 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
754 708
755 $_->set_parent ($self) 709 $_->set_parent ($self)
756 for @widgets; 710 for @widgets;
757 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 713 use sort 'stable';
759 714
760 $self->{children} = [ 715 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
763 ]; 718 ];
764 719
765 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
766} 725}
767 726
768sub children { 727sub children {
769 @{ $_[0]{children} } 728 @{ $_[0]{children} }
770} 729}
771 730
772sub remove { 731sub remove {
773 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
774 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
775 delete $child->{parent}; 737 delete $child->{parent};
776 $child->hide; 738 $child->hide;
777
778 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
779 741
780 $self->realloc; 742 $self->realloc;
781} 743}
782 744
783sub clear { 745sub clear {
784 my ($self) = @_; 746 my ($self) = @_;
785 747
786 my $children = delete $self->{children}; 748 my $children = $self->{children};
787 $self->{children} = []; 749 $self->{children} = [];
788 750
789 for (@$children) { 751 for (@$children) {
790 delete $_->{parent}; 752 delete $_->{parent};
791 $_->hide; 753 $_->hide;
… …
811} 773}
812 774
813sub _draw { 775sub _draw {
814 my ($self) = @_; 776 my ($self) = @_;
815 777
816 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
817} 779}
818 780
819############################################################################# 781#############################################################################
820 782
821package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
831} 793}
832 794
833sub add { 795sub add {
834 my ($self, $child) = @_; 796 my ($self, $child) = @_;
835 797
836 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
837 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
838} 800}
839 801
840sub remove { 802sub remove {
841 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
931} 893}
932 894
933############################################################################# 895#############################################################################
934 896
935package CFPlus::UI::ViewPort; 897package CFPlus::UI::ViewPort;
898
899use List::Util qw(min max);
936 900
937our @ISA = CFPlus::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
938 902
939sub new { 903sub new {
940 my $class = shift; 904 my $class = shift;
… …
949sub size_request { 913sub size_request {
950 my ($self) = @_; 914 my ($self) = @_;
951 915
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 917
954 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
956 920
957 ($w, $h) 921 ($w, $h)
958} 922}
959 923
960sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
972} 936}
973 937
974sub set_offset { 938sub set_offset {
975 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
976 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
977 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
979 947
948 $self->emit (changed => $x, $y);
980 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
981} 969}
982 970
983# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
984sub coord2local { 972sub coord2local {
985 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
1001 989
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 992 ) {
1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1006 } else { 994 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 996 }
1009} 997}
1010 998
… …
1021 1009
1022############################################################################# 1010#############################################################################
1023 1011
1024package CFPlus::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
1025 1013
1026our @ISA = CFPlus::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
1027 1015
1028sub new { 1016sub new {
1029 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
1030 1018
1031 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1032 1020
1033 my $self; 1021 my $self;
1034 1022
1035 my $slider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1036 vertical => 1, 1037 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1039 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1042 },
1041 ; 1043 ;
1042 1044
1043 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1045 can_events => 1, 1048 can_events => 1,
1046 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1047 %arg, 1053 %arg,
1048 ); 1054 );
1049 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1051 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1052 1080
1053 $self 1081 $self
1054} 1082}
1055
1056#TODO# update range on size_allocate depending on child
1057 1083
1058sub add { 1084sub add {
1059 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1060 1086
1061 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1062} 1088}
1063 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1064sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1066 1144
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1070 1147
1071 1 1148 1
1072} 1149}
1073 1150
1074sub update_slider { 1151sub invoke_button_down {
1075 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1076 1153
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1078} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1079 1158
1080sub update { 1159 0
1081 my ($self) = @_; 1160}
1082 1161
1083 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1084 1164
1085 $self->update_slider; 1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1086} 1181}
1087 1182
1088sub invoke_size_allocate { 1183sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1090 1185
1091 $self->update_slider; 1186 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1188}
1095 1189
1096############################################################################# 1190#############################################################################
1097 1191
… …
1117 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1118 1212
1119 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1120 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1121 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1122
1123 glBegin GL_QUADS;
1124 glVertex 0 , 0;
1125 glVertex 0 , $h;
1126 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1127 glVertex $w, 0;
1128 glEnd;
1129
1130 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1131 } 1218 }
1132 1219
1133 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1134} 1221}
… …
1247 1334
1248my @border = 1335my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251 1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1252sub new { 1343sub new {
1253 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1254 1345
1255 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1516
1426 my $border = $self->border; 1517 my $border = $self->border;
1427 1518
1428 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433 1538
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1436 1541
1437 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1458 1563
1459############################################################################# 1564#############################################################################
1460 1565
1461package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1462 1567
1463our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1464 1569
1465use List::Util qw(max sum); 1570use List::Util qw(max sum);
1466 1571
1467use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1468 1573
1469sub new { 1574sub new {
1470 my $class = shift; 1575 my $class = shift;
1471 1576
1472 $class->SUPER::new ( 1577 $class->SUPER::new (
1473 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1474 @_, 1580 @_,
1475 ) 1581 )
1476} 1582}
1477 1583
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1584sub add {
1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1483 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1484 1599
1485 while (@_) { 1600 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1602
1491 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1492 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1493 $self->realloc;
1494}
1495 1605
1496sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1497 my ($self, $child) = @_; 1613 my ($self) = @_;
1498 1614
1499 # TODO: not yet implemented 1615 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1616
1506 my @children = $self->children; 1617 my @children = $self->children;
1507 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1508 1628 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1629
1514 $self->realloc; 1630 # second pass, rows
1515} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1530 1633
1531 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1638 }
1534 } 1639 }
1535 1640
1536 (\@w, \@h) 1641 (\@w, \@h)
1537} 1642}
… …
1553 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1554 1659
1555 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1557 1662
1558 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1562 1667
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1669
1567 CFPlus::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1568 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1569 1679
1570 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1682
1572 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1574 or next;
1575 1685
1576 my $x = 0; 1686 $widget->configure (
1577 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1689 );
1579 for my $c (0 .. $#$row) { 1690 }
1580 my $col_w = $ws->[$c];
1581 1691
1582 if (my $widget = $row->[$c]) { 1692 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1584 }
1585 1694
1586 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1587 } 1722 }
1723 }
1588 1724
1589 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1590 } 1756 }
1591 1757
1592 1 1758 1
1593} 1759}
1594 1760
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617}
1618
1619############################################################################# 1761#############################################################################
1620 1762
1621package CFPlus::UI::Box; 1763package CFPlus::UI::Box;
1622 1764
1623our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1624 1766
1625sub size_request { 1767sub size_request {
1626 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1627 1771
1628 $self->{vertical} 1772 $self->{vertical}
1629 ? ( 1773 ? (
1630 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1631 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1632 ) 1776 )
1633 : ( 1777 : (
1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1635 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1636 ) 1780 )
1637} 1781}
1638 1782
1639sub invoke_size_allocate { 1783sub invoke_size_allocate {
1640 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1764 1908
1765 delete $self->{ox}; 1909 delete $self->{ox};
1766 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1767} 1911}
1768 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1769sub set_text { 1919sub set_text {
1770 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1771 1921
1772 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1773 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
1879 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1880 2030
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1884 }; 2036 };
1885 2037
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1887 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1888 2040# CFPlus::OpenGL::glNewList $self->{list};
1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
1890} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1891 2057
1892############################################################################# 2058#############################################################################
1893 2059
1894package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1895 2061
… …
1901 my $class = shift; 2067 my $class = shift;
1902 2068
1903 $class->SUPER::new ( 2069 $class->SUPER::new (
1904 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1905 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1906 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1907 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1908 can_hover => 1, 2076 can_hover => 1,
1909 can_focus => 1, 2077 can_focus => 1,
1910 valign => 0, 2078 valign => 0,
1911 can_events => 1, 2079 can_events => 1,
1912 ellipsise => 0, 2080 ellipsise => 0,
… …
1962 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1964 2132
1965 my $text = $self->get_text; 2133 my $text = $self->get_text;
1966 2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136
1967 if ($uni == 8) { 2137 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2145 } elsif ($sym == CFPlus::SDLK_HOME) {
2146 # what a hack
1976 $self->{cursor} = 0; 2147 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1
2150 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2151 } elsif ($sym == CFPlus::SDLK_END) {
2152 # uh, again
2153 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2155 ? $self->{cursor} + length $1
2156 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2157 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2158 $text = "";
1981 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2161 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2166 } else {
1987 return 0; 2167 return 0;
1988 } 2168 }
1989 2169
… …
2040 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2041 } 2221 }
2042 2222
2043 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2044 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2045 glBegin GL_QUADS;
2046 glVertex 0 , 0;
2047 glVertex 0 , $self->{h};
2048 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2049 glVertex $self->{w}, 0;
2050 glEnd;
2051 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2052 2227
2053 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2054 2229
2055 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2057 2232
2058 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2059 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2060 utf8::encode $text; 2235 utf8::encode $text;
2061 2236
2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2063 } 2238 }
2064 2239
2240 glColor_premultiply @{$self->{active_fg}};
2065 glBegin GL_LINES; 2241 glBegin GL_LINES;
2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2068 glEnd; 2259 glEnd;
2069 } 2260 }
2070} 2261}
2071 2262
2072############################################################################# 2263#############################################################################
… …
2159 1 2350 1
2160} 2351}
2161 2352
2162############################################################################# 2353#############################################################################
2163 2354
2164package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2165 2356
2166our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2167 2358
2168use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2169 2360
2170my @tex = 2361my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2173 2364
2174sub new { 2365sub new {
2175 my $class = shift; 2366 my $class = shift;
2176 2367
2177 $class->SUPER::new ( 2368 $class->SUPER::new (
2178 padding_x => 4,
2179 padding_y => 4,
2180 fg => [1, 1, 1],
2181 active_fg => [0, 0, 1],
2182 can_hover => 1, 2369 can_hover => 1,
2183 align => 0, 2370 align => 0,
2184 valign => 0, 2371 valign => 0,
2185 can_events => 1, 2372 can_events => 1,
2186 @_ 2373 @_
… …
2198} 2385}
2199 2386
2200sub _draw { 2387sub _draw {
2201 my ($self) = @_; 2388 my ($self) = @_;
2202 2389
2203 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2208 2393
2394 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2451
2211 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2212 2453
2213 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2214} 2455}
… …
2301sub new { 2542sub new {
2302 my $class = shift; 2543 my $class = shift;
2303 2544
2304 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2305 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2306 @_, 2548 @_,
2307 ); 2549 );
2308 2550
2309 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
2311 2553
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2556
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2557 CFPlus::weaken $texture_cache{$self->{path}};
2316 2558
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2560
2319 $self 2561 $self
2320} 2562}
… …
2335} 2577}
2336 2578
2337sub size_request { 2579sub size_request {
2338 my ($self) = @_; 2580 my ($self) = @_;
2339 2581
2340 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341} 2583}
2342 2584
2343sub _draw { 2585sub _draw {
2344 my ($self) = @_; 2586 my ($self) = @_;
2345 2587
… …
2355 } 2597 }
2356 2598
2357 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359 2601
2360 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2361 2603
2362 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2363} 2605}
2364 2606
2365############################################################################# 2607#############################################################################
… …
2384 align => 0, 2626 align => 0,
2385 valign => 0, 2627 valign => 0,
2386 can_events => 1, 2628 can_events => 1,
2387 @_ 2629 @_
2388 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2389} 2637}
2390 2638
2391sub invoke_button_up { 2639sub invoke_button_up {
2392 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2393 2641
… …
2533 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2534} 2782}
2535 2783
2536############################################################################# 2784#############################################################################
2537 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2538package CFPlus::UI::Gauge; 2910package CFPlus::UI::Gauge;
2539 2911
2540our @ISA = CFPlus::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2541 2913
2542sub new { 2914sub new {
… …
2667 3039
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 3040 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 3041
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3042 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 3043
2672 $self->invoke_mouse_motion ($ev, $x, $y) 3044 $self->invoke_mouse_motion ($ev, $x, $y);
3045
3046 1
2673} 3047}
2674 3048
2675sub invoke_mouse_motion { 3049sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2677 3051
… …
2693sub invoke_mouse_wheel { 3067sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2695 3069
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 3071
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3073
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 3075
2700 ! ! $delta 3076 1
2701} 3077}
2702 3078
2703sub update { 3079sub update {
2704 my ($self) = @_; 3080 my ($self) = @_;
2705 3081
… …
2813 #font => default_font 3189 #font => default_font
2814 @_, 3190 @_,
2815 3191
2816 layout => (new CFPlus::Layout), 3192 layout => (new CFPlus::Layout),
2817 par => [], 3193 par => [],
3194 max_par => 0,
2818 height => 0, 3195 height => 0,
2819 children => [ 3196 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3197 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3198 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3199 ],
… …
2835} 3212}
2836 3213
2837sub size_request { 3214sub size_request {
2838 my ($self) = @_; 3215 my ($self) = @_;
2839 3216
2840 my ($empty, $slider) = @{ $self->{children} }; 3217 my ($empty, $slider) = $self->visible_children;
2841 3218
2842 local $self->{children} = [$empty, $slider]; 3219 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request 3220 $self->SUPER::size_request
2844} 3221}
2845 3222
… …
2947 3324
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3325 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3326 push @{$self->{par}}, $para;
2950 } 3327 }
2951 3328
3329 if (my $max = $self->{max_par}) {
3330 shift @{$self->{par}} while @{$self->{par}} > $max;
3331 }
3332
2952 $self->{need_reflow}++; 3333 $self->{need_reflow}++;
2953 $self->update; 3334 $self->update;
2954} 3335}
2955 3336
2956sub scroll_to_bottom { 3337sub scroll_to_bottom {
… …
3030 3411
3031 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
3032 my $layout = $self->get_layout ($para); 3413 my $layout = $self->get_layout ($para);
3033 3414
3034 $layout->render ($para->{indent}, $y - $y0); 3415 $layout->render ($para->{indent}, $y - $y0);
3416 $layout->draw;
3035 3417
3036 if (my @w = @{ $para->{widget} }) { 3418 if (my @w = @{ $para->{widget} }) {
3037 my @s = $layout->get_shapes; 3419 my @s = $layout->get_shapes;
3038 3420
3039 for (@w) { 3421 for (@w) {
… …
3230 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
3231 3613
3232 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
3233 3615
3234 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
3235 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
3236 glVertex 0 , 0;
3237 glVertex 0 , $h;
3238 glVertex $w, $h;
3239 glVertex $w, 0;
3240 glEnd;
3241 3618
3242 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
3243 glBegin GL_LINE_LOOP; 3620 glRect_lineloop 0, 0, $w, $h;
3244 glVertex 0 , 0;
3245 glVertex 0 , $h;
3246 glVertex $w, $h;
3247 glVertex $w, 0;
3248 glEnd;
3249 3621
3250 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
3251 3623
3252 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
3253} 3625}
… …
3262 3634
3263sub new { 3635sub new {
3264 my $class = shift; 3636 my $class = shift;
3265 3637
3266 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 size_w => 32,
3640 size_h => 8,
3267 aspect => 1, 3641 aspect => 1,
3268 can_events => 0, 3642 can_events => 0,
3269 @_, 3643 @_,
3270 ); 3644 );
3271 3645
3272 if ($self->{anim} && $self->{animspeed}) { 3646 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3647 CFPlus::weaken (my $widget = $self);
3274 3648
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3652 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3653 cb => sub {
3654 return unless $::CONN;
3655
3656 my $w = $widget
3657 or return;
3658
3280 ++$widget->{frame}; 3659 ++$w->{frame};
3660 $w->update_face;
3661
3662 # somehow, $widget can go away
3281 $widget->update; 3663 $w->update;
3664 $w->update_timer;
3282 }, 3665 },
3283 ); 3666 );
3667
3668 $self->update_face;
3669 $self->update_timer;
3284 } 3670 }
3285 3671
3286 $self 3672 $self
3287} 3673}
3288 3674
3675sub update_timer {
3676 my ($self) = @_;
3677
3678 return unless $self->{timer};
3679
3680 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start;
3687 } else {
3688 $self->{timer}->stop;
3689 }
3690}
3691
3692sub update_face {
3693 my ($self) = @_;
3694
3695 if ($::CONN) {
3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3697 if ($anim && @$anim) {
3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3699 delete $self->{face_change_cb};
3700
3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3705 }
3706 }
3707 }
3708 }
3709}
3710
3289sub size_request { 3711sub size_request {
3290 (32, 8) 3712 my ($self) = @_;
3713
3714 if ($::CONN) {
3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3717 if ($tex->{name}) {
3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3719 } elsif (!$tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3725 }
3726 }
3727
3728 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3729}
3292 3730
3293sub update { 3731sub update {
3294 my ($self) = @_; 3732 my ($self) = @_;
3295 3733
3296 return unless $self->{visible}; 3734 return unless $self->{visible};
3297 3735
3298 $self->SUPER::update; 3736 $self->SUPER::update;
3299} 3737}
3300 3738
3739sub invoke_visibility_change {
3740 my ($self) = @_;
3741
3742 $self->update_timer;
3743
3744 0
3745}
3746
3301sub _draw { 3747sub _draw {
3302 my ($self) = @_; 3748 my ($self) = @_;
3303 3749
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3750 $self->SUPER::_draw;
3307 3751
3308 my $face; 3752 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3753 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3755 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3756 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3757 glDisable GL_TEXTURE_2D;
… …
3326} 3759}
3327 3760
3328sub destroy { 3761sub destroy {
3329 my ($self) = @_; 3762 my ($self) = @_;
3330 3763
3331 $self->{timer}->cancel 3764 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3765 if $self->{timer};
3333 3766
3334 $self->SUPER::destroy; 3767 $self->SUPER::destroy;
3335} 3768}
3336 3769
… …
3376 children => [ 3809 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1), 3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1), 3811 (new CFPlus::UI::Label markup => $right, align => +1),
3379 ], 3812 ],
3380 ; 3813 ;
3381 3814
3382 } else { 3815 } else {
3383 $widget = new CFPlus::UI::Label 3816 $widget = new CFPlus::UI::Label
3384 can_hover => 1, 3817 can_hover => 1,
3385 can_events => 1, 3818 can_events => 1,
3386 markup => $widget, 3819 markup => $widget,
… …
3511 3944
3512############################################################################# 3945#############################################################################
3513 3946
3514package CFPlus::UI::Notebook; 3947package CFPlus::UI::Notebook;
3515 3948
3949use CFPlus::OpenGL;
3950
3516our @ISA = CFPlus::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3517 3952
3518sub new { 3953sub new {
3519 my $class = shift; 3954 my $class = shift;
3520 3955
3521 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3522 buttonbar => (new CFPlus::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3524 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3525 @_, 3961 @_,
3526 ); 3962 );
3527 3963
3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3531 $self 4001 $self
3532} 4002}
3533 4003
3534sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3535 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3536 4023
3537 Scalar::Util::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3538 4026
3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title,
3541 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) },
3543 );
3544
3545 $self->{multiplexer}->add ($widget); 4027 $self->add ($widget);
3546} 4028}
3547 4029
3548sub get_current_page { 4030sub get_current_page {
3549 my ($self) = @_; 4031 my ($self) = @_;
3550 4032
… …
3554sub set_current_page { 4036sub set_current_page {
3555 my ($self, $page) = @_; 4037 my ($self, $page) = @_;
3556 4038
3557 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3558 $self->emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
4041}
4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
3559} 4057}
3560 4058
3561############################################################################# 4059#############################################################################
3562 4060
3563package CFPlus::UI::Selector; 4061package CFPlus::UI::Selector;
… …
3626 my $self = $class->SUPER::new ( 4124 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 4125 fontsize => 0.8,
3628 @_, 4126 @_,
3629 ); 4127 );
3630 4128
3631 Scalar::Util::weaken (my $this = $self); 4129 CFPlus::weaken (my $this = $self);
3632 4130
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 4132
3635 $self 4133 $self
3636} 4134}
… …
3775 my $self = $class->SUPER::new ( 4273 my $self = $class->SUPER::new (
3776 visible => 1, 4274 visible => 1,
3777 @_, 4275 @_,
3778 ); 4276 );
3779 4277
3780 Scalar::Util::weaken ($self->{root} = $self); 4278 CFPlus::weaken ($self->{root} = $self);
3781 4279
3782 $self 4280 $self
3783} 4281}
3784 4282
3785sub size_request { 4283sub size_request {
… …
3833} 4331}
3834 4332
3835sub update { 4333sub update {
3836 my ($self) = @_; 4334 my ($self) = @_;
3837 4335
3838 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
3839} 4337}
3840 4338
3841sub add { 4339sub add {
3842 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
3843 4341
… …
3880 while ($self->{refresh_hook}) { 4378 while ($self->{refresh_hook}) {
3881 $_->() 4379 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4380 for values %{delete $self->{refresh_hook}};
3883 } 4381 }
3884 4382
3885 if ($self->{realloc}) { 4383 while ($self->{realloc}) {
3886 my %queue; 4384 my %queue;
3887 my @queue; 4385 my @queue;
3888 my $widget; 4386 my $widget;
3889 4387
3890 outer: 4388 outer:
… …
3937 } 4435 }
3938 } 4436 }
3939 4437
3940 delete $self->{realloc}{$widget+0}; 4438 delete $self->{realloc}{$widget+0};
3941 } 4439 }
3942 }
3943 4440
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4441 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4442 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4443 values %$size_alloc;
3947 4444
3948 while () { 4445 while () {
3949 my $widget = pop @queue || last; 4446 my $widget = pop @queue || last;
3950 4447
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4448 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4449
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4450 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4451 $h = max $widget->{min_h}, $h;
3958 4452
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4453# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4454# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4455
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4458
3965 $w = int $w + 0.5; 4459 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4460 $h = int $h + 0.5;
3967 4461
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4462 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4463 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4464 $widget->{old_h} = $widget->{h};
3971 4465
3972 $widget->{w} = $w; 4466 $widget->{w} = $w;
3973 $widget->{h} = $h; 4467 $widget->{h} = $h;
3974 4468
3975 $widget->emit (size_allocate => $w, $h); 4469 $widget->emit (size_allocate => $w, $h);
4470 }
3976 } 4471 }
3977 } 4472 }
3978 } 4473 }
3979 4474
3980 while ($self->{post_alloc_hook}) { 4475 while ($self->{post_alloc_hook}) {
3981 $_->() 4476 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4477 for values %{delete $self->{post_alloc_hook}};
3983 } 4478 }
3984
3985 4479
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4480 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4481 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4482 glClear GL_COLOR_BUFFER_BIT;
3989 4483

Diff Legend

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