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.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.444 by root, Sat Dec 8 18:38:13 2007 UTC

2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
88 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
89 89
90 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92 92
93 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
94 } 94 }
95} 95}
96 96
97sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
98 my ($ev) = @_; 98 my ($ev) = @_;
104 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
105 105
106 $GRAB = $widget; 106 $GRAB = $widget;
107 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
108 108
109 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
110 } 110 }
111 111
112 if ($GRAB) { 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
117 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
118 } else { 122 } else {
119 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
120 } 124 }
121 } 125 }
135 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
136 $grab->update if $grab; 140 $grab->update if $grab;
137 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
138 142
139 check_hover $widget; 143 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->trigger;
141 } 145 }
142} 146}
143 147
144sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
145 my ($ev) = @_; 149 my ($ev) = @_;
265 $self->hide; 269 $self->hide;
266 $self->emit ("destroy"); 270 $self->emit ("destroy");
267 %$self = (); 271 %$self = ();
268} 272}
269 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
270sub show { 278sub show {
271 my ($self) = @_; 279 my ($self) = @_;
272 280
273 return if $self->{parent}; 281 return if $self->{parent};
274 282
301 delete $self->{root}; 309 delete $self->{root};
302 310
303 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
305 313
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->trigger
307 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
308 316
309 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
311} 319}
313sub set_visibility { 321sub set_visibility {
314 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
315 323
316 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
317 325
318 $visible ? $self->hide 326 $visible ? $self->show
319 : $self->show; 327 : $self->hide;
320} 328}
321 329
322sub toggle_visibility { 330sub toggle_visibility {
323 my ($self) = @_; 331 my ($self) = @_;
324 332
351 359
352 $self->{force_w} = $w; 360 $self->{force_w} = $w;
353 $self->{force_h} = $h; 361 $self->{force_h} = $h;
354 362
355 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
356} 374}
357 375
358sub size_request { 376sub size_request {
359 require Carp; 377 require Carp;
360 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
422 440
423 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
424 442
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->trigger;
428 } 446 }
429} 447}
430 448
431# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
432sub coord2local { 450sub coord2local {
540 558
541 # parent 559 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 561}
544 562
545sub find_widget { 563#sub find_widget {
546 my ($self, $x, $y) = @_; 564# 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 565
557sub set_parent { 566sub set_parent {
558 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
559 568
560 CFPlus::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
591 600
592# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
593# functions seems pointless. 602# functions seems pointless.
594our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
595 604
596sub draw { 605#sub draw {
597 my ($self) = @_; 606#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 607
643sub _draw { 608sub _draw {
644 my ($self) = @_; 609 my ($self) = @_;
645 610
646 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
647} 612}
648 613
649my $cntx;#d#
650sub DESTROY { 614sub DESTROY {
651 my ($self) = @_; 615 my ($self) = @_;
652 616
653 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
654 618
619 local $@;
655 eval { $self->destroy }; 620 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657 622
658 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
659} 624}
667use strict; 632use strict;
668use CFPlus::OpenGL; 633use CFPlus::OpenGL;
669 634
670sub new { 635sub new {
671 my $class = shift; 636 my $class = shift;
672
673 # range [value, low, high, page]
674 637
675 $class->SUPER::new ( 638 $class->SUPER::new (
676 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
677 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
678 @_ 641 @_
690 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
691 654
692 glEnable GL_BLEND; 655 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glColor_premultiply @$color; 657 glColor_premultiply @$color;
695
696 glBegin GL_QUADS;
697 glVertex 0 , 0;
698 glVertex 0 , $h;
699 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
700 glVertex $w, 0;
701 glEnd;
702
703 glDisable GL_BLEND; 659 glDisable GL_BLEND;
704 } 660 }
705} 661}
706 662
707############################################################################# 663#############################################################################
739 can_events => 0, 695 can_events => 0,
740 %arg, 696 %arg,
741 ); 697 );
742 698
743 $self->add (@$children) 699 $self->add (@$children)
744 if $children; 700 if $children && @$children;
745 701
746 $self 702 $self
747} 703}
748 704
749sub realloc { 705sub realloc {
758 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
759 715
760 $_->set_parent ($self) 716 $_->set_parent ($self)
761 for @widgets; 717 for @widgets;
762 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 720 use sort 'stable';
764 721
765 $self->{children} = [ 722 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
768 ]; 725 ];
769 726
770 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
771} 732}
772 733
773sub children { 734sub children {
774 @{ $_[0]{children} } 735 @{ $_[0]{children} }
775} 736}
776 737
777sub remove { 738sub remove {
778 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
779 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
780 delete $child->{parent}; 744 delete $child->{parent};
781 $child->hide; 745 $child->hide;
782
783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
784 748
785 $self->realloc; 749 $self->realloc;
786} 750}
787 751
788sub clear { 752sub clear {
789 my ($self) = @_; 753 my ($self) = @_;
790 754
791 my $children = delete $self->{children}; 755 my $children = $self->{children};
792 $self->{children} = []; 756 $self->{children} = [];
793 757
794 for (@$children) { 758 for (@$children) {
795 delete $_->{parent}; 759 delete $_->{parent};
796 $_->hide; 760 $_->hide;
816} 780}
817 781
818sub _draw { 782sub _draw {
819 my ($self) = @_; 783 my ($self) = @_;
820 784
821 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
822} 786}
823 787
824############################################################################# 788#############################################################################
825 789
826package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
836} 800}
837 801
838sub add { 802sub add {
839 my ($self, $child) = @_; 803 my ($self, $child) = @_;
840 804
841 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
842 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
843} 807}
844 808
845sub remove { 809sub remove {
846 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
864 828
865 1 829 1
866} 830}
867 831
868############################################################################# 832#############################################################################
869
870# back-buffered drawing area 833# back-buffered drawing area
871 834
872package CFPlus::UI::Window; 835package CFPlus::UI::Window;
873 836
874our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
936} 899}
937 900
938############################################################################# 901#############################################################################
939 902
940package CFPlus::UI::ViewPort; 903package CFPlus::UI::ViewPort;
904
905use List::Util qw(min max);
941 906
942our @ISA = CFPlus::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
943 908
944sub new { 909sub new {
945 my $class = shift; 910 my $class = shift;
954sub size_request { 919sub size_request {
955 my ($self) = @_; 920 my ($self) = @_;
956 921
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 923
959 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
961 926
962 ($w, $h) 927 ($w, $h)
963} 928}
964 929
965sub invoke_size_allocate { 930sub invoke_size_allocate {
977} 942}
978 943
979sub set_offset { 944sub set_offset {
980 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
981 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
982 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
984 953
954 $self->emit (changed => $x, $y);
985 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
986} 975}
987 976
988# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local { 978sub coord2local {
990 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
1005 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
1006 995
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 998 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else { 1000 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 1002 }
1014} 1003}
1015 1004
1026 1015
1027############################################################################# 1016#############################################################################
1028 1017
1029package CFPlus::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
1030 1019
1031our @ISA = CFPlus::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
1032 1021
1033sub new { 1022sub new {
1034 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
1035 1024
1036 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1037 1026
1038 my $self; 1027 my $self;
1039 1028
1040 my $slider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1032 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub {
1035 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 },
1038 ;
1039
1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1041 vertical => 1, 1043 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1045 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1048 },
1046 ; 1049 ;
1047 1050
1048 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1050 can_events => 1, 1054 can_events => 1,
1051 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1052 %arg, 1059 %arg,
1053 ); 1060 );
1054 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
1056 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1057 1086
1058 $self 1087 $self
1059} 1088}
1060
1061#TODO# update range on size_allocate depending on child
1062 1089
1063sub add { 1090sub add {
1064 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1065 1092
1066 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1067} 1094}
1068 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
1131 my ($self, $ev) = @_;
1132
1133 $self->grab_focus;
1134
1135 my $ox = $self->{vp}{view_x};
1136 my $oy = $self->{vp}{view_y};
1137
1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1069sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1071 1150
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1153
1076 1 1154 1
1077} 1155}
1078 1156
1079sub update_slider { 1157sub invoke_button_down {
1080 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1081 1159
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1160 if ($ev->{button} == 2) {
1083} 1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1084 1164
1085sub update { 1165 0
1086 my ($self) = @_; 1166}
1087 1167
1088 $self->SUPER::update; 1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1089 1170
1090 $self->update_slider; 1171 if (delete $self->{motion}) {
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1091} 1187}
1092 1188
1093sub invoke_size_allocate { 1189sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1095 1191
1096 $self->update_slider; 1192 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1194}
1100 1195
1101############################################################################# 1196#############################################################################
1102 1197
1122 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1123 1218
1124 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1125 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1127
1128 glBegin GL_QUADS;
1129 glVertex 0 , 0;
1130 glVertex 0 , $h;
1131 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1132 glVertex $w, 0;
1133 glEnd;
1134
1135 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1136 } 1224 }
1137 1225
1138 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1139} 1227}
1252 1340
1253my @border = 1341my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 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); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1257sub new { 1349sub new {
1258 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1259 1351
1260 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1296 1388
1297sub border { 1389sub border {
1298 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1299} 1391}
1300 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1301sub size_request { 1402sub size_request {
1302 my ($self) = @_; 1403 my ($self) = @_;
1303 1404
1304 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1305 if $self->{title_widget}; 1406 if $self->{title_widget};
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1531
1431 my $border = $self->border; 1532 my $border = $self->border;
1432 1533
1433 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1553
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1441 1556
1442 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
1463 1578
1464############################################################################# 1579#############################################################################
1465 1580
1466package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1467 1582
1468our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1469 1584
1470use List::Util qw(max sum); 1585use List::Util qw(max sum);
1471 1586
1472use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1473 1588
1474sub new { 1589sub new {
1475 my $class = shift; 1590 my $class = shift;
1476 1591
1477 $class->SUPER::new ( 1592 $class->SUPER::new (
1478 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1479 @_, 1595 @_,
1480 ) 1596 )
1481} 1597}
1482 1598
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1488 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1489 1614
1490 while (@_) { 1615 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1617
1496 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1497 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1498 $self->realloc;
1499}
1500 1620
1501sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1502 my ($self, $child) = @_; 1628 my ($self) = @_;
1503 1629
1504 # TODO: not yet implemented 1630 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1631
1511 my @children = $self->children; 1632 my @children = $self->children;
1512 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1513 1643 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1644
1519 $self->realloc; 1645 # second pass, rows
1520} 1646 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)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1535 1648
1536 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1653 }
1539 } 1654 }
1540 1655
1541 (\@w, \@h) 1656 (\@w, \@h)
1542} 1657}
1558 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1559 1674
1560 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1562 1677
1563 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1567 1682
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1684
1572 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1573 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1574 1694
1575 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1697
1577 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1699 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 1700
1581 my $x = 0; 1701 $widget->configure (
1582 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1704 );
1584 for my $c (0 .. $#$row) { 1705 }
1585 my $col_w = $ws->[$c];
1586 1706
1587 if (my $widget = $row->[$c]) { 1707 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1589 }
1590 1709
1591 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592 } 1737 }
1738 }
1593 1739
1594 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595 } 1771 }
1596 1772
1597 1 1773 1
1598} 1774}
1599 1775
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############################################################################# 1776#############################################################################
1625 1777
1626package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1627 1779
1628our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1629 1781
1630sub size_request { 1782sub size_request {
1631 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1632 1786
1633 $self->{vertical} 1787 $self->{vertical}
1634 ? ( 1788 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1637 ) 1791 )
1638 : ( 1792 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1641 ) 1795 )
1642} 1796}
1643 1797
1644sub invoke_size_allocate { 1798sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1769 1923
1770 delete $self->{ox}; 1924 delete $self->{ox};
1771 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1772} 1926}
1773 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1774sub set_text { 1934sub set_text {
1775 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1776 1936
1777 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1778 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1801 1961
1802sub size_request { 1962sub size_request {
1803 my ($self) = @_; 1963 my ($self) = @_;
1804 1964
1805 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1806 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1807 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1808 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1811 1973
1812 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1884 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1885 2047
1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1889 }; 2053 };
1890 2054
1891 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1892 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1893 2057# CFPlus::OpenGL::glNewList $self->{list};
1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList;
2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
2063
2064 $self->{layout}->draw;
1895} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1896 2074
1897############################################################################# 2075#############################################################################
1898 2076
1899package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1900 2078
1906 my $class = shift; 2084 my $class = shift;
1907 2085
1908 $class->SUPER::new ( 2086 $class->SUPER::new (
1909 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1910 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1911 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1912 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1913 can_hover => 1, 2093 can_hover => 1,
1914 can_focus => 1, 2094 can_focus => 1,
1915 valign => 0, 2095 valign => 0,
1916 can_events => 1, 2096 can_events => 1,
1917 ellipsise => 0, 2097 ellipsise => 0,
1967 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1969 2149
1970 my $text = $self->get_text; 2150 my $text = $self->get_text;
1971 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1972 if ($uni == 8) { 2154 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
1981 $self->{cursor} = 0; 2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2174 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2175 $text = "";
1986 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2178 $self->emit ('escape');
1989 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2183 } else {
1992 return 0; 2184 return 0;
1993 } 2185 }
1994 2186
2045 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2046 } 2238 }
2047 2239
2048 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2049 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2050 glBegin GL_QUADS;
2051 glVertex 0 , 0;
2052 glVertex 0 , $self->{h};
2053 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2054 glVertex $self->{w}, 0;
2055 glEnd;
2056 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2057 2244
2058 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2059 2246
2060 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
2062 2249
2063 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2064 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2065 utf8::encode $text; 2252 utf8::encode $text;
2066 2253
2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2068 } 2255 }
2069 2256
2257 glColor_premultiply @{$self->{active_fg}};
2070 glBegin GL_LINES; 2258 glBegin GL_LINES;
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2261 glEnd;
2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2073 glEnd; 2275 glEnd;
2074 } 2276 }
2075} 2277}
2076 2278
2077############################################################################# 2279#############################################################################
2164 1 2366 1
2165} 2367}
2166 2368
2167############################################################################# 2369#############################################################################
2168 2370
2169package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2170 2372
2171our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2172 2374
2173use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2174 2376
2175my @tex = 2377my @tex =
2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2178 2380
2179sub new { 2381sub new {
2180 my $class = shift; 2382 my $class = shift;
2181 2383
2182 $class->SUPER::new ( 2384 $class->SUPER::new (
2183 padding_x => 4,
2184 padding_y => 4,
2185 fg => [1, 1, 1],
2186 active_fg => [0, 0, 1],
2187 can_hover => 1, 2385 can_hover => 1,
2188 align => 0, 2386 align => 0,
2189 valign => 0, 2387 valign => 0,
2190 can_events => 1, 2388 can_events => 1,
2191 @_ 2389 @_
2203} 2401}
2204 2402
2205sub _draw { 2403sub _draw {
2206 my ($self) = @_; 2404 my ($self) = @_;
2207 2405
2208 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2209
2210 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2213 2409
2410 my $tex = $tex[$GRAB == $self];
2214 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2412
2413 glDisable GL_TEXTURE_2D;
2414
2415 $self->SUPER::_draw;
2416}
2417
2418#############################################################################
2419
2420package CFPlus::UI::Button;
2421
2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
2425
2426my @tex =
2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215 2467
2216 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2217 2469
2218 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2219} 2471}
2276sub _draw { 2528sub _draw {
2277 my ($self) = @_; 2529 my ($self) = @_;
2278 2530
2279 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2280 2532
2281 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2282 2534
2283 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2284 2536
2285 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2286 2538
2306sub new { 2558sub new {
2307 my $class = shift; 2559 my $class = shift;
2308 2560
2309 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2310 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2311 @_, 2564 @_,
2312 ); 2565 );
2313 2566
2314 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2315 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2340} 2593}
2341 2594
2342sub size_request { 2595sub size_request {
2343 my ($self) = @_; 2596 my ($self) = @_;
2344 2597
2345 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2346} 2599}
2347 2600
2348sub _draw { 2601sub _draw {
2349 my ($self) = @_; 2602 my ($self) = @_;
2350 2603
2360 } 2613 }
2361 2614
2362 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2364 2617
2365 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2366 2619
2367 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2368} 2621}
2369 2622
2370############################################################################# 2623#############################################################################
2389 align => 0, 2642 align => 0,
2390 valign => 0, 2643 valign => 0,
2391 can_events => 1, 2644 can_events => 1,
2392 @_ 2645 @_
2393 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2394} 2653}
2395 2654
2396sub invoke_button_up { 2655sub invoke_button_up {
2397 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2398 2657
2538 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2539} 2798}
2540 2799
2541############################################################################# 2800#############################################################################
2542 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2543package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2544 2941
2545our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2546 2943
2547sub new { 2944sub new {
2672 3069
2673 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2674 3071
2675 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2676 3073
2677 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2678} 3077}
2679 3078
2680sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2681 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2682 3081
2698sub invoke_mouse_wheel { 3097sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_; 3098 my ($self, $ev) = @_;
2700 3099
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702 3101
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3103
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704 3105
2705 ! ! $delta 3106 1
2706} 3107}
2707 3108
2708sub update { 3109sub update {
2709 my ($self) = @_; 3110 my ($self) = @_;
2710 3111
2818 #font => default_font 3219 #font => default_font
2819 @_, 3220 @_,
2820 3221
2821 layout => (new CFPlus::Layout), 3222 layout => (new CFPlus::Layout),
2822 par => [], 3223 par => [],
3224 max_par => 0,
2823 height => 0, 3225 height => 0,
2824 children => [ 3226 children => [
2825 (new CFPlus::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2826 (new CFPlus::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2827 ], 3229 ],
2840} 3242}
2841 3243
2842sub size_request { 3244sub size_request {
2843 my ($self) = @_; 3245 my ($self) = @_;
2844 3246
2845 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2846 3248
2847 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2848 $self->SUPER::size_request 3250 $self->SUPER::size_request
2849} 3251}
2850 3252
2952 3354
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para; 3356 push @{$self->{par}}, $para;
2955 } 3357 }
2956 3358
3359 if (my $max = $self->{max_par}) {
3360 shift @{$self->{par}} while @{$self->{par}} > $max;
3361 }
3362
2957 $self->{need_reflow}++; 3363 $self->{need_reflow}++;
2958 $self->update; 3364 $self->update;
2959} 3365}
2960 3366
2961sub scroll_to_bottom { 3367sub scroll_to_bottom {
3035 3441
3036 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3037 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3038 3444
3039 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3040 3447
3041 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3042 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3043 3450
3044 for (@w) { 3451 for (@w) {
3166} 3573}
3167 3574
3168sub set_tooltip_from { 3575sub set_tooltip_from {
3169 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3170 3577
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
3173
3174 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
3175 3583
3176 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3177 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3178 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3179 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3180 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3181 } 3589 }
3182 3590
3183 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3184 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3185 3593
3186 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3187 markup => $tooltip, 3595 markup => $tip,
3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3189 fontsize => 0.8, 3597 fontsize => 0.8,
3190 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3191 ellipsise => 0, 3599 ellipsise => 0,
3192 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
3230} 3638}
3231 3639
3232sub _draw { 3640sub _draw {
3233 my ($self) = @_; 3641 my ($self) = @_;
3234 3642
3235 glTranslate 0.375, 0.375;
3236
3237 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3238 3644
3239 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3240 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3241 glVertex 0 , 0;
3242 glVertex 0 , $h;
3243 glVertex $w, $h;
3244 glVertex $w, 0;
3245 glEnd;
3246 3647
3247 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3248 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3249 glVertex 0 , 0;
3250 glVertex 0 , $h;
3251 glVertex $w, $h;
3252 glVertex $w, 0;
3253 glEnd;
3254 3650
3255 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3256 3652
3257 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3258} 3654}
3259 3655
3260############################################################################# 3656#############################################################################
3267 3663
3268sub new { 3664sub new {
3269 my $class = shift; 3665 my $class = shift;
3270 3666
3271 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3272 aspect => 1, 3670 aspect => 1,
3273 can_events => 0, 3671 can_events => 0,
3274 @_, 3672 @_,
3275 ); 3673 );
3276 3674
3277 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3278 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3279 3677
3280 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3282 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3283 interval => $self->{animspeed}, 3681 return unless $::CONN;
3284 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
3285 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3286 $widget->update; 3690 $w->update;
3287 }, 3691 $w->update_timer;
3288 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
3289 } 3696 }
3290 3697
3291 $self 3698 $self
3292} 3699}
3293 3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 if ($self->{visible}) {
3707 $self->{timer}->set (
3708 $self->{anim_start}
3709 + $self->{animspeed}
3710 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3711 );
3712 $self->{timer}->start;
3713 } else {
3714 $self->{timer}->stop;
3715 }
3716}
3717
3718sub update_face {
3719 my ($self) = @_;
3720
3721 if ($::CONN) {
3722 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3723 if ($anim && @$anim) {
3724 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3725 delete $self->{face_change_cb};
3726
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3728 unless ($tex->{name} || $tex->{loading}) {
3729 $tex->upload (sub { $self->reconfigure });
3730 }
3731 }
3732 }
3733 }
3734 }
3735}
3736
3294sub size_request { 3737sub size_request {
3295 (32, 8) 3738 my ($self) = @_;
3739
3740 if ($::CONN) {
3741 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3742 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3743 if ($tex->{name}) {
3744 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3745 } elsif (!$tex->{loading}) {
3746 $tex->upload (sub { $self->reconfigure });
3747 }
3748 }
3749
3750 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3751 }
3752 }
3753
3754 ($self->{size_w} || 8, $self->{size_h} || 8)
3296} 3755}
3297 3756
3298sub update { 3757sub update {
3299 my ($self) = @_; 3758 my ($self) = @_;
3300 3759
3301 return unless $self->{visible}; 3760 return unless $self->{visible};
3302 3761
3303 $self->SUPER::update; 3762 $self->SUPER::update;
3304} 3763}
3305 3764
3765sub invoke_visibility_change {
3766 my ($self) = @_;
3767
3768 $self->update_timer;
3769
3770 0
3771}
3772
3306sub _draw { 3773sub _draw {
3307 my ($self) = @_; 3774 my ($self) = @_;
3308 3775
3309 return unless $::CONN;
3310
3311 $self->SUPER::_draw; 3776 $self->SUPER::_draw;
3312 3777
3313 my $face; 3778 if (my $tex = $self->{tex}) {
3314
3315 if ($self->{frame}) {
3316 my $anim = $::CONN->{anim}[$self->{anim}];
3317
3318 $face = $anim->[ $self->{frame} % @$anim ]
3319 if $anim && @$anim;
3320 }
3321
3322 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3323
3324 if ($tex) {
3325 glEnable GL_TEXTURE_2D; 3779 glEnable GL_TEXTURE_2D;
3326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327 glColor 0, 0, 0, 1; 3781 glColor 0, 0, 0, 1;
3328 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3782 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3329 glDisable GL_TEXTURE_2D; 3783 glDisable GL_TEXTURE_2D;
3331} 3785}
3332 3786
3333sub destroy { 3787sub destroy {
3334 my ($self) = @_; 3788 my ($self) = @_;
3335 3789
3336 $self->{timer}->cancel 3790 (delete $self->{timer})->cancel
3337 if $self->{timer}; 3791 if $self->{timer};
3338 3792
3339 $self->SUPER::destroy; 3793 $self->SUPER::destroy;
3340} 3794}
3341 3795
3381 children => [ 3835 children => [
3382 (new CFPlus::UI::Label markup => $left, expand => 1), 3836 (new CFPlus::UI::Label markup => $left, expand => 1),
3383 (new CFPlus::UI::Label markup => $right, align => +1), 3837 (new CFPlus::UI::Label markup => $right, align => +1),
3384 ], 3838 ],
3385 ; 3839 ;
3386 3840
3387 } else { 3841 } else {
3388 $widget = new CFPlus::UI::Label 3842 $widget = new CFPlus::UI::Label
3389 can_hover => 1, 3843 can_hover => 1,
3390 can_events => 1, 3844 can_events => 1,
3391 markup => $widget, 3845 markup => $widget,
3516 3970
3517############################################################################# 3971#############################################################################
3518 3972
3519package CFPlus::UI::Notebook; 3973package CFPlus::UI::Notebook;
3520 3974
3975use CFPlus::OpenGL;
3976
3521our @ISA = CFPlus::UI::VBox::; 3977our @ISA = CFPlus::UI::VBox::;
3522 3978
3523sub new { 3979sub new {
3524 my $class = shift; 3980 my $class = shift;
3525 3981
3526 my $self = $class->SUPER::new ( 3982 my $self = $class->SUPER::new (
3527 buttonbar => (new CFPlus::UI::Buttonbar), 3983 buttonbar => (new CFPlus::UI::Buttonbar),
3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3984 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3985 active_outline => [.7, .7, 0.2],
3529 # filter => # will be put between multiplexer and $self 3986 # filter => # will be put between multiplexer and $self
3530 @_, 3987 @_,
3531 ); 3988 );
3532 3989
3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3990 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3534 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3991 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3535 3992
3993 {
3994 Scalar::Util::weaken (my $wself = $self);
3995
3996 $self->{multiplexer}->connect (c_add => sub {
3997 my ($mplex, $widgets) = @_;
3998
3999 for my $child (@$widgets) {
4000 Scalar::Util::weaken $child;
4001 $child->{c_tab_} ||= do {
4002 my $tab =
4003 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4004 ? $child->{c_tab}
4005 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4006
4007 $tab->connect (activate => sub {
4008 $wself->set_current_page ($child);
4009 });
4010
4011 $tab
4012 };
4013
4014 $self->{buttonbar}->add ($child->{c_tab_});
4015 }
4016 });
4017
4018 $self->{multiplexer}->connect (c_remove => sub {
4019 my ($mplex, $widgets) = @_;
4020
4021 for my $child (@$widgets) {
4022 $wself->{buttonbar}->remove ($child->{c_tab_});
4023 }
4024 });
4025 }
4026
3536 $self 4027 $self
3537} 4028}
3538 4029
3539sub add { 4030sub add {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->add (@widgets)
4034}
4035
4036sub remove {
4037 my ($self, @widgets) = @_;
4038
4039 $self->{multiplexer}->remove (@widgets)
4040}
4041
4042sub pages {
4043 my ($self) = @_;
4044 $self->{multiplexer}->children
4045}
4046
4047sub add_tab {
3540 my ($self, $title, $widget, $tooltip) = @_; 4048 my ($self, $title, $widget, $tooltip) = @_;
3541 4049
3542 CFPlus::weaken $self; 4050 $title = [$title, $tooltip] unless ref $title;
4051 $widget->{c_tab} = $title;
3543 4052
3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3545 markup => $title,
3546 tooltip => $tooltip,
3547 on_activate => sub { $self->set_current_page ($widget) },
3548 );
3549
3550 $self->{multiplexer}->add ($widget); 4053 $self->add ($widget);
3551} 4054}
3552 4055
3553sub get_current_page { 4056sub get_current_page {
3554 my ($self) = @_; 4057 my ($self) = @_;
3555 4058
3559sub set_current_page { 4062sub set_current_page {
3560 my ($self, $page) = @_; 4063 my ($self, $page) = @_;
3561 4064
3562 $self->{multiplexer}->set_current_page ($page); 4065 $self->{multiplexer}->set_current_page ($page);
3563 $self->emit (page_changed => $self->{multiplexer}{current}); 4066 $self->emit (page_changed => $self->{multiplexer}{current});
4067}
4068
4069sub _draw {
4070 my ($self) = @_;
4071
4072 $self->SUPER::_draw ();
4073
4074 if (my $cur = $self->{multiplexer}{current}) {
4075 if ($cur = $cur->{c_tab_}) {
4076 glTranslate $self->{buttonbar}{x} + $cur->{x},
4077 $self->{buttonbar}{y} + $cur->{y};
4078 glLineWidth 3;
4079 #glEnable GL_BLEND;
4080 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4081 glColor @{$self->{active_outline}};
4082 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4083 glLineWidth 1;
4084 #glDisable GL_BLEND;
4085 }
4086 }
3564} 4087}
3565 4088
3566############################################################################# 4089#############################################################################
3567 4090
3568package CFPlus::UI::Selector; 4091package CFPlus::UI::Selector;
3600} 4123}
3601 4124
3602sub _set_value { 4125sub _set_value {
3603 my ($self, $value) = @_; 4126 my ($self, $value) = @_;
3604 4127
3605 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4128 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4129 $item ||= $self->{options}[0]
3606 or return; 4130 or return;
3607 4131
3608 $self->{value} = $item->[0]; 4132 $self->{value} = $item->[0];
3609 $self->set_markup ("$item->[1] ⇓"); 4133 $self->set_markup ("$item->[1] ⇓");
3610 $self->set_tooltip ($item->[2]); 4134# $self->set_tooltip ($item->[2]);
3611} 4135}
3612 4136
3613sub set_value { 4137sub set_value {
3614 my ($self, $value) = @_; 4138 my ($self, $value) = @_;
3615 4139
3616 return unless $self->{value} ne $value; 4140 return unless $self->{value} ne $value;
3617 4141
3618 $self->_set_value ($value); 4142 $self->_set_value ($value);
3619 $self->emit (changed => $value); 4143 $self->emit (changed => $value);
4144}
4145
4146sub set_options {
4147 my ($self, $options) = @_;
4148
4149 $self->{options} = $options;
4150 $self->_set_value ($self->{value});
3620} 4151}
3621 4152
3622############################################################################# 4153#############################################################################
3623 4154
3624package CFPlus::UI::Statusbox; 4155package CFPlus::UI::Statusbox;
3633 @_, 4164 @_,
3634 ); 4165 );
3635 4166
3636 CFPlus::weaken (my $this = $self); 4167 CFPlus::weaken (my $this = $self);
3637 4168
3638 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4169 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3639 4170
3640 $self 4171 $self
3641} 4172}
3642 4173
3643sub reorder { 4174sub reorder {
3651 4182
3652 while (my ($k, $v) = each %{ $self->{item} }) { 4183 while (my ($k, $v) = each %{ $self->{item} }) {
3653 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3654 } 4185 }
3655 4186
4187 $self->{timer}->set (1, 1);
4188
3656 my @widgets; 4189 my @widgets;
3657 4190
3658 my @items = sort { 4191 my @items = sort {
3659 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
3660 or $b->{id} <=> $a->{id} 4193 or $b->{id} <=> $a->{id}
3661 } values %{ $self->{item} }; 4194 } values %{ $self->{item} };
3662
3663 $self->{timer}->interval (1);
3664 4195
3665 my $count = 10 + 1; 4196 my $count = 10 + 1;
3666 for my $item (@items) { 4197 for my $item (@items) {
3667 last unless --$count; 4198 last unless --$count;
3668 4199
3692 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3693 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3694 $label->update; 4225 $label->update;
3695 $label->set_max_size (undef, $label->{req_h} * $diff) 4226 $label->set_max_size (undef, $label->{req_h} * $diff)
3696 if $diff < 1; 4227 if $diff < 1;
3697 $self->{timer}->interval (1/30); 4228 $self->{timer}->set (1/30, 1/30);
3698 } else { 4229 } else {
3699 $label->{fg}[3] = $item->{fg}[3] || 1; 4230 $label->{fg}[3] = $item->{fg}[3] || 1;
3700 } 4231 }
3701 4232
3702 push @widgets, $label; 4233 push @widgets, $label;
3838} 4369}
3839 4370
3840sub update { 4371sub update {
3841 my ($self) = @_; 4372 my ($self) = @_;
3842 4373
3843 $::WANT_REFRESH++; 4374 $::WANT_REFRESH->start;
3844} 4375}
3845 4376
3846sub add { 4377sub add {
3847 my ($self, @children) = @_; 4378 my ($self, @children) = @_;
3848 4379
3885 while ($self->{refresh_hook}) { 4416 while ($self->{refresh_hook}) {
3886 $_->() 4417 $_->()
3887 for values %{delete $self->{refresh_hook}}; 4418 for values %{delete $self->{refresh_hook}};
3888 } 4419 }
3889 4420
3890 if ($self->{realloc}) { 4421 while ($self->{realloc}) {
3891 my %queue; 4422 my %queue;
3892 my @queue; 4423 my @queue;
3893 my $widget; 4424 my $widget;
3894 4425
3895 outer: 4426 outer:
3942 } 4473 }
3943 } 4474 }
3944 4475
3945 delete $self->{realloc}{$widget+0}; 4476 delete $self->{realloc}{$widget+0};
3946 } 4477 }
3947 }
3948 4478
3949 while (my $size_alloc = delete $self->{size_alloc}) { 4479 while (my $size_alloc = delete $self->{size_alloc}) {
3950 my @queue = sort { $b->{visible} <=> $a->{visible} } 4480 my @queue = sort { $a->{visible} <=> $b->{visible} }
3951 values %$size_alloc; 4481 values %$size_alloc;
3952 4482
3953 while () { 4483 while () {
3954 my $widget = pop @queue || last; 4484 my $widget = pop @queue || last;
3955 4485
3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4486 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3957 4487
3958 $w = 0 if $w < 0;
3959 $h = 0 if $h < 0;
3960
3961 $w = max $widget->{min_w}, $w; 4488 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h; 4489 $h = max $widget->{min_h}, $h;
3963 4490
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4491# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4492# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966 4493
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4494 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4495 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969 4496
3970 $w = int $w + 0.5; 4497 $w = int $w + 0.5;
3971 $h = int $h + 0.5; 4498 $h = int $h + 0.5;
3972 4499
3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4500 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3974 $widget->{old_w} = $widget->{w}; 4501 $widget->{old_w} = $widget->{w};
3975 $widget->{old_h} = $widget->{h}; 4502 $widget->{old_h} = $widget->{h};
3976 4503
3977 $widget->{w} = $w; 4504 $widget->{w} = $w;
3978 $widget->{h} = $h; 4505 $widget->{h} = $h;
3979 4506
3980 $widget->emit (size_allocate => $w, $h); 4507 $widget->emit (size_allocate => $w, $h);
4508 }
3981 } 4509 }
3982 } 4510 }
3983 } 4511 }
3984 4512
3985 while ($self->{post_alloc_hook}) { 4513 while ($self->{post_alloc_hook}) {
3986 $_->() 4514 $_->()
3987 for values %{delete $self->{post_alloc_hook}}; 4515 for values %{delete $self->{post_alloc_hook}};
3988 } 4516 }
3989
3990 4517
3991 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4518 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4519 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993 glClear GL_COLOR_BUFFER_BIT; 4520 glClear GL_COLOR_BUFFER_BIT;
3994 4521

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines