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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $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
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
358 359
359 $self->{force_w} = $w; 360 $self->{force_w} = $w;
360 $self->{force_h} = $h; 361 $self->{force_h} = $h;
361 362
362 $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)
363} 374}
364 375
365sub size_request { 376sub size_request {
366 require Carp; 377 require Carp;
367 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
429 440
430 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
431 442
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
435 } 446 }
436} 447}
437 448
438# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
439sub coord2local { 450sub coord2local {
440 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
441 452
442 Carp::confess unless $self->{parent};#d# 453 return (undef, undef) unless $self->{parent};
443 454
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 456}
446 457
447# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
448sub coord2global { 459sub coord2global {
449 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
450 461
451 Carp::confess unless $self->{parent};#d# 462 return (undef, undef) unless $self->{parent};
452 463
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 465}
455 466
456sub invoke_focus_in { 467sub invoke_focus_in {
547 558
548 # parent 559 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 561}
551 562
552sub find_widget { 563#sub find_widget {
553 my ($self, $x, $y) = @_; 564# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 565
564sub set_parent { 566sub set_parent {
565 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
566 568
567 CFPlus::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
598 600
599# 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
600# functions seems pointless. 602# functions seems pointless.
601our ($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
602 604
603sub draw { 605#sub draw {
604 my ($self) = @_; 606#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 607
650sub _draw { 608sub _draw {
651 my ($self) = @_; 609 my ($self) = @_;
652 610
653 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
654} 612}
655 613
656my $cntx;#d#
657sub DESTROY { 614sub DESTROY {
658 my ($self) = @_; 615 my ($self) = @_;
659 616
660 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
661 618
619 local $@;
662 eval { $self->destroy }; 620 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 622
665 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
666} 624}
674use strict; 632use strict;
675use CFPlus::OpenGL; 633use CFPlus::OpenGL;
676 634
677sub new { 635sub new {
678 my $class = shift; 636 my $class = shift;
679
680 # range [value, low, high, page]
681 637
682 $class->SUPER::new ( 638 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
685 @_ 641 @_
697 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
698 654
699 glEnable GL_BLEND; 655 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 657 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 659 glDisable GL_BLEND;
711 } 660 }
712} 661}
713 662
714############################################################################# 663#############################################################################
746 can_events => 0, 695 can_events => 0,
747 %arg, 696 %arg,
748 ); 697 );
749 698
750 $self->add (@$children) 699 $self->add (@$children)
751 if $children; 700 if $children && @$children;
752 701
753 $self 702 $self
754} 703}
755 704
756sub realloc { 705sub realloc {
765 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
766 715
767 $_->set_parent ($self) 716 $_->set_parent ($self)
768 for @widgets; 717 for @widgets;
769 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 720 use sort 'stable';
771 721
772 $self->{children} = [ 722 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
775 ]; 725 ];
776 726
777 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
778} 732}
779 733
780sub children { 734sub children {
781 @{ $_[0]{children} } 735 @{ $_[0]{children} }
782} 736}
783 737
784sub remove { 738sub remove {
785 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
786 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
787 delete $child->{parent}; 744 delete $child->{parent};
788 $child->hide; 745 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
791 748
792 $self->realloc; 749 $self->realloc;
793} 750}
794 751
795sub clear { 752sub clear {
796 my ($self) = @_; 753 my ($self) = @_;
797 754
798 my $children = delete $self->{children}; 755 my $children = $self->{children};
799 $self->{children} = []; 756 $self->{children} = [];
800 757
801 for (@$children) { 758 for (@$children) {
802 delete $_->{parent}; 759 delete $_->{parent};
803 $_->hide; 760 $_->hide;
823} 780}
824 781
825sub _draw { 782sub _draw {
826 my ($self) = @_; 783 my ($self) = @_;
827 784
828 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
829} 786}
830 787
831############################################################################# 788#############################################################################
832 789
833package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
843} 800}
844 801
845sub add { 802sub add {
846 my ($self, $child) = @_; 803 my ($self, $child) = @_;
847 804
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
849 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
850} 807}
851 808
852sub remove { 809sub remove {
853 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
871 828
872 1 829 1
873} 830}
874 831
875############################################################################# 832#############################################################################
876
877# back-buffered drawing area 833# back-buffered drawing area
878 834
879package CFPlus::UI::Window; 835package CFPlus::UI::Window;
880 836
881our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
963sub size_request { 919sub size_request {
964 my ($self) = @_; 920 my ($self) = @_;
965 921
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 923
968 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
970 926
971 ($w, $h) 927 ($w, $h)
972} 928}
973 929
974sub invoke_size_allocate { 930sub invoke_size_allocate {
986} 942}
987 943
988sub set_offset { 944sub set_offset {
989 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
990 946
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
951 $self->{view_x} = $x;
952 $self->{view_y} = $y;
953
954 $self->emit (changed => $x, $y);
994 $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 }
995} 975}
996 976
997# 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
998sub coord2local { 978sub coord2local {
999 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
1014 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
1015 995
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 998 ) {
1019 $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})
1020 } else { 1000 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1002 }
1023} 1003}
1024 1004
1045 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1046 1026
1047 my $self; 1027 my $self;
1048 1028
1049 my $hslider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1050 vertical => 0, 1032 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1033 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1034 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1035 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1037 },
1056 ; 1038 ;
1057 1039
1058 my $vslider = new CFPlus::UI::Slider 1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1059 vertical => 1, 1043 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1045 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1046 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1074 row_expand => [1, 0], 1058 row_expand => [1, 0],
1075 %arg, 1059 %arg,
1076 ); 1060 );
1077 1061
1078 $self->{vp} = new CFPlus::UI::ViewPort 1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1079 expand => 1, 1065 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1066 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 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 },
1082 ; 1081 ;
1083 1082
1084 $self->SUPER::add (0, 0, $self->{vp}); 1083 $self->SUPER::add ($self->{vp});
1085 1084
1086 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1087 1086
1088 $self 1087 $self
1089} 1088}
1090
1091#TODO# update range on size_allocate depending on child
1092 1089
1093sub add { 1090sub add {
1094 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1095 1092
1096 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1097} 1094}
1098 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1099sub update_slider { 1100sub update_slider {
1100 my ($self) = @_; 1101 my ($self) = @_;
1101 1102
1102 my $child = ($self->{vp} or return)->child; 1103 my $child = ($self->{vp} or return)->child;
1103 1104
1105 if ($self->{scroll_x}) {
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106 1108
1107 my $visible = $w1 > $w2; 1109 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1112 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1111 } 1115 }
1112 1116
1117 if ($self->{scroll_y}) {
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115 1120
1116 my $visible = $h1 > $h2; 1121 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1124 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->{vslider}->hide; 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);
1120 } 1145 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1146}
1129 1147
1130sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1132 1150
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->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};
1136 1153
1137 1 1154 1
1138} 1155}
1139 1156
1140sub invoke_button_down { 1157sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1142 1159
1143 if ($ev->{button} == 2) { 1160 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1161 $self->start_dragging ($ev);
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1; 1162 return 1;
1156 } 1163 }
1157 1164
1158 0 1165 0
1159} 1166}
1210 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1211 1218
1212 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1213 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1214 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1215
1216 glBegin GL_QUADS;
1217 glVertex 0 , 0;
1218 glVertex 0 , $h;
1219 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1220 glVertex $w, 0;
1221 glEnd;
1222
1223 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1224 } 1224 }
1225 1225
1226 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1227} 1227}
1340 1340
1341my @border = 1341my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 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);
1344 1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1345sub new { 1349sub new {
1346 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1347 1351
1348 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1384 1388
1385sub border { 1389sub border {
1386 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1387} 1391}
1388 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
1389sub size_request { 1402sub size_request {
1390 my ($self) = @_; 1403 my ($self) = @_;
1391 1404
1392 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1393 if $self->{title_widget}; 1406 if $self->{title_widget};
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1531
1519 my $border = $self->border; 1532 my $border = $self->border;
1520 1533
1521 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1553
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1529 1556
1530 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
1551 1578
1552############################################################################# 1579#############################################################################
1553 1580
1554package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1555 1582
1556our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1557 1584
1558use List::Util qw(max sum); 1585use List::Util qw(max sum);
1559 1586
1560use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1561 1588
1562sub new { 1589sub new {
1563 my $class = shift; 1590 my $class = shift;
1564 1591
1565 $class->SUPER::new ( 1592 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1593 col_expand => [],
1568 row_expand => [], 1594 row_expand => [],
1569 @_, 1595 @_,
1570 ) 1596 )
1571} 1597}
1572 1598
1573sub children {
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575}
1576
1577# TODO: store row/col info in child widget and use standard add/del
1578sub 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 {
1579 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1580 1614
1581 while (@_) { 1615 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1617
1587 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1588 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1589 $self->realloc;
1590}
1591 1620
1592sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1593 my ($self, $child) = @_; 1628 my ($self) = @_;
1594 1629
1595 for (@{ $self->{children} }) { 1630 my (@w, @h);
1596 for (@{ $_ || [] }) { 1631
1597 $_ = undef if $_ == $child; 1632 my @children = $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];
1598 } 1642 }
1599 } 1643 }
1600}
1601 1644
1602# TODO: move to container class maybe? send children a signal on removal? 1645 # second pass, rows
1603sub clear { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1604 my ($self) = @_;
1605
1606 my @children = $self->children;
1607 delete $self->{children};
1608
1609 for (@children) {
1610 delete $_->{parent};
1611 $_->hide;
1612 }
1613
1614 $self->realloc;
1615}
1616
1617sub get_wh {
1618 my ($self) = @_;
1619
1620 my (@w, @h);
1621
1622 for my $y (0 .. $#{$self->{children}}) {
1623 my $row = $self->{children}[$y]
1624 or next;
1625
1626 for my $x (0 .. $#$row) {
1627 my $widget = $row->[$x]
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1630 1648
1631 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1653 }
1634 } 1654 }
1635 1655
1636 (\@w, \@h) 1656 (\@w, \@h)
1637} 1657}
1653 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1654 1674
1655 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1657 1677
1658 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1662 1682
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1670 1690
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1692
1673 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1674 1694
1675 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1697
1677 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1678 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)};
1679 or next;
1680 1700
1681 my $x = 0; 1701 $widget->configure (
1682 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1704 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1705 }
1696 1706
1697 1 1707 1
1698} 1708}
1699 1709
1700sub find_widget {
1701 my ($self, $x, $y) = @_;
1702
1703 $x -= $self->{x};
1704 $y -= $self->{y};
1705
1706 my $res;
1707
1708 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1709 $res = $_->find_widget ($x, $y)
1710 and return $res;
1711 }
1712
1713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1714}
1715
1716sub _draw {
1717 my ($self) = @_;
1718
1719 for (grep $_, @{$self->{children}}) {
1720 $_->draw for grep $_, @$_;
1721 }
1722}
1723
1724############################################################################# 1710#############################################################################
1725 1711
1726package CFPlus::UI::Fixed; 1712package CFPlus::UI::Fixed;
1727 1713
1728use List::Util qw(min max); 1714use List::Util qw(min max);
1729 1715
1730our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1731 1717
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) { 1718sub _scale($$$) {
1740 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1741 1720
1742 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745} 1722}
1746 1723
1747sub size_request { 1724sub size_request {
1748 my ($self) = @_; 1725 my ($self) = @_;
1749 1726
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751 1728
1752 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1755 1734
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 } 1737 }
1763 } 1738 }
1764 1739
1765 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1767 1742
1768 # now layout remaining widgets 1743 # now layout remaining widgets
1769 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 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;
1771 1748
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1780 } 1751 }
1781 } 1752 }
1782 1753
1783 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
1788 1759
1789sub invoke_size_allocate { 1760sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1791 1762
1792 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1794 1766
1795 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1796 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799 1769
1800 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1801 } 1771 }
1802 1772
1803 1 1773 1
1804} 1774}
1805 1775
1809 1779
1810our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1811 1781
1812sub size_request { 1782sub size_request {
1813 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1814 1786
1815 $self->{vertical} 1787 $self->{vertical}
1816 ? ( 1788 ? (
1817 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1818 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1819 ) 1791 )
1820 : ( 1792 : (
1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1822 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1823 ) 1795 )
1824} 1796}
1825 1797
1826sub invoke_size_allocate { 1798sub invoke_size_allocate {
1827 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1951 1923
1952 delete $self->{ox}; 1924 delete $self->{ox};
1953 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1954} 1926}
1955 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1956sub set_text { 1934sub set_text {
1957 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1958 1936
1959 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1960 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1983 1961
1984sub size_request { 1962sub size_request {
1985 my ($self) = @_; 1963 my ($self) = @_;
1986 1964
1987 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1988 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1989 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1990 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1991 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1992 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1993 1973
1994 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
2066 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
2067 2047
2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2070 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2071 }; 2053 };
2072 2054
2073 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
2074 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
2075 2057# CFPlus::OpenGL::glNewList $self->{list};
2076 $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;
2077} 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#}
2078 2074
2079############################################################################# 2075#############################################################################
2080 2076
2081package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
2082 2078
2088 my $class = shift; 2084 my $class = shift;
2089 2085
2090 $class->SUPER::new ( 2086 $class->SUPER::new (
2091 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
2092 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
2093 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
2094 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
2095 can_hover => 1, 2093 can_hover => 1,
2096 can_focus => 1, 2094 can_focus => 1,
2097 valign => 0, 2095 valign => 0,
2098 can_events => 1, 2096 can_events => 1,
2099 ellipsise => 0, 2097 ellipsise => 0,
2239 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2240 } 2238 }
2241 2239
2242 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glBegin GL_QUADS;
2245 glVertex 0 , 0;
2246 glVertex 0 , $self->{h};
2247 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2248 glVertex $self->{w}, 0;
2249 glEnd;
2250 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2251 2244
2252 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2253 2246
2254 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
2256 2249
2257 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2258 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2259 utf8::encode $text; 2252 utf8::encode $text;
2260 2253
2261 @$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);
2262 } 2255 }
2263 2256
2257 glColor_premultiply @{$self->{active_fg}};
2264 glBegin GL_LINES; 2258 glBegin GL_LINES;
2265 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};
2266 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;
2267 glEnd; 2275 glEnd;
2268 } 2276 }
2269} 2277}
2270 2278
2271############################################################################# 2279#############################################################################
2358 1 2366 1
2359} 2367}
2360 2368
2361############################################################################# 2369#############################################################################
2362 2370
2363package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2364 2372
2365our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2366 2374
2367use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2368 2376
2369my @tex = 2377my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2372 2380
2373sub new { 2381sub new {
2374 my $class = shift; 2382 my $class = shift;
2375 2383
2376 $class->SUPER::new ( 2384 $class->SUPER::new (
2377 padding_x => 4,
2378 padding_y => 4,
2379 fg => [1, 1, 1],
2380 active_fg => [0, 0, 1],
2381 can_hover => 1, 2385 can_hover => 1,
2382 align => 0, 2386 align => 0,
2383 valign => 0, 2387 valign => 0,
2384 can_events => 1, 2388 can_events => 1,
2385 @_ 2389 @_
2397} 2401}
2398 2402
2399sub _draw { 2403sub _draw {
2400 my ($self) = @_; 2404 my ($self) = @_;
2401 2405
2402 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2403
2404 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2407 2409
2410 my $tex = $tex[$GRAB == $self];
2408 $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});
2409 2467
2410 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2411 2469
2412 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2413} 2471}
2470sub _draw { 2528sub _draw {
2471 my ($self) = @_; 2529 my ($self) = @_;
2472 2530
2473 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2474 2532
2475 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2476 2534
2477 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2478 2536
2479 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;
2480 2538
2500sub new { 2558sub new {
2501 my $class = shift; 2559 my $class = shift;
2502 2560
2503 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2504 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2505 @_, 2564 @_,
2506 ); 2565 );
2507 2566
2508 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2534} 2593}
2535 2594
2536sub size_request { 2595sub size_request {
2537 my ($self) = @_; 2596 my ($self) = @_;
2538 2597
2539 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2540} 2599}
2541 2600
2542sub _draw { 2601sub _draw {
2543 my ($self) = @_; 2602 my ($self) = @_;
2544 2603
2554 } 2613 }
2555 2614
2556 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558 2617
2559 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2560 2619
2561 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2562} 2621}
2563 2622
2564############################################################################# 2623#############################################################################
2583 align => 0, 2642 align => 0,
2584 valign => 0, 2643 valign => 0,
2585 can_events => 1, 2644 can_events => 1,
2586 @_ 2645 @_
2587 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2588} 2653}
2589 2654
2590sub invoke_button_up { 2655sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2592 2657
2732 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2733} 2798}
2734 2799
2735############################################################################# 2800#############################################################################
2736 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
2737package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2738 2941
2739our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2740 2943
2741sub new { 2944sub new {
2866 3069
2867 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2868 3071
2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2870 3073
2871 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2872} 3077}
2873 3078
2874sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2875 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2876 3081
2896 3101
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2898 3103
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900 3105
2901 ! ! $delta 3106 1
2902} 3107}
2903 3108
2904sub update { 3109sub update {
2905 my ($self) = @_; 3110 my ($self) = @_;
2906 3111
3037} 3242}
3038 3243
3039sub size_request { 3244sub size_request {
3040 my ($self) = @_; 3245 my ($self) = @_;
3041 3246
3042 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
3043 3248
3044 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request 3250 $self->SUPER::size_request
3046} 3251}
3047 3252
3236 3441
3237 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3238 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3239 3444
3240 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3241 3447
3242 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3243 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3244 3450
3245 for (@w) { 3451 for (@w) {
3367} 3573}
3368 3574
3369sub set_tooltip_from { 3575sub set_tooltip_from {
3370 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3371 3577
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
3374
3375 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 =~ /^#(.*)$/;
3376 3583
3377 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3378 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3379 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3380 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3381 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3382 } 3589 }
3383 3590
3384 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3385 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3386 3593
3387 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3388 markup => $tooltip, 3595 markup => $tip,
3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3390 fontsize => 0.8, 3597 fontsize => 0.8,
3391 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3392 ellipsise => 0, 3599 ellipsise => 0,
3393 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
3431} 3638}
3432 3639
3433sub _draw { 3640sub _draw {
3434 my ($self) = @_; 3641 my ($self) = @_;
3435 3642
3436 glTranslate 0.375, 0.375;
3437
3438 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3439 3644
3440 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3441 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3442 glVertex 0 , 0;
3443 glVertex 0 , $h;
3444 glVertex $w, $h;
3445 glVertex $w, 0;
3446 glEnd;
3447 3647
3448 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3449 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3450 glVertex 0 , 0;
3451 glVertex 0 , $h;
3452 glVertex $w, $h;
3453 glVertex $w, 0;
3454 glEnd;
3455 3650
3456 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3457 3652
3458 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3459} 3654}
3460 3655
3461############################################################################# 3656#############################################################################
3478 ); 3673 );
3479 3674
3480 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3482 3677
3483 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3485 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3486 interval => $self->{animspeed},
3487 cb => sub {
3488 return unless $::CONN; 3681 return unless $::CONN;
3489 3682
3683 my $w = $widget
3684 or return;
3685
3490 ++$widget->{frame}; 3686 ++$w->{frame};
3491 $self->update_face; 3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3492 $self->update; 3690 $w->update;
3493 }, 3691 $w->update_timer;
3494 ); 3692 };
3495 3693
3496 $self->update_face; 3694 $self->update_face;
3695 $self->update_timer;
3497 } 3696 }
3498 3697
3499 $self 3698 $self
3500} 3699}
3501 3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 $self->{timer}->stop;
3707 if ($self->{visible}) {
3708 $self->{timer}->set (
3709 $self->{anim_start}
3710 + $self->{animspeed}
3711 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3712 );
3713 $self->{timer}->start;
3714 }
3715}
3716
3502sub update_face { 3717sub update_face {
3503 my ($self) = @_; 3718 my ($self) = @_;
3504 3719
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
3515sub size_request {
3516 my ($self) = @_;
3517
3518 if ($::CONN) { 3720 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3721 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) { 3722 if ($anim && @$anim) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3723 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3522 } else { 3724 delete $self->{face_change_cb};
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3725
3524 $self->realloc; 3726 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3727 unless ($tex->{name} || $tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3525 }); 3730 }
3526 } 3731 }
3527 } 3732 }
3528 } 3733 }
3734}
3735
3736sub size_request {
3737 my ($self) = @_;
3738
3739 if ($::CONN) {
3740 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3742 if ($tex->{name}) {
3743 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3744 } elsif (!$tex->{loading}) {
3745 $tex->upload (sub { $self->reconfigure });
3746 }
3747 }
3748
3749 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3750 }
3751 }
3529 3752
3530 ($self->{size_w} || 8, $self->{size_h} || 8) 3753 ($self->{size_w} || 8, $self->{size_h} || 8)
3531} 3754}
3532 3755
3533sub update { 3756sub update {
3536 return unless $self->{visible}; 3759 return unless $self->{visible};
3537 3760
3538 $self->SUPER::update; 3761 $self->SUPER::update;
3539} 3762}
3540 3763
3764sub invoke_visibility_change {
3765 my ($self) = @_;
3766
3767 $self->update_timer;
3768
3769 0
3770}
3771
3541sub _draw { 3772sub _draw {
3542 my ($self) = @_; 3773 my ($self) = @_;
3543 3774
3544 return unless $::CONN;
3545
3546 $self->SUPER::_draw; 3775 $self->SUPER::_draw;
3547 3776
3548 my $faceid = $::CONN->{faceid}[$self->{face}] 3777 if (my $tex = $self->{tex}) {
3549 or return;
3550
3551 my $tex = $::CONN->{texture}[$faceid];
3552
3553 if ($tex) {
3554 glEnable GL_TEXTURE_2D; 3778 glEnable GL_TEXTURE_2D;
3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3556 glColor 0, 0, 0, 1; 3780 glColor 0, 0, 0, 1;
3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3781 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3558 glDisable GL_TEXTURE_2D; 3782 glDisable GL_TEXTURE_2D;
3560} 3784}
3561 3785
3562sub destroy { 3786sub destroy {
3563 my ($self) = @_; 3787 my ($self) = @_;
3564 3788
3565 $self->{timer}->cancel 3789 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3790 if $self->{timer};
3567 3791
3568 $self->SUPER::destroy; 3792 $self->SUPER::destroy;
3569} 3793}
3570 3794
3610 children => [ 3834 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1), 3835 (new CFPlus::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1), 3836 (new CFPlus::UI::Label markup => $right, align => +1),
3613 ], 3837 ],
3614 ; 3838 ;
3615 3839
3616 } else { 3840 } else {
3617 $widget = new CFPlus::UI::Label 3841 $widget = new CFPlus::UI::Label
3618 can_hover => 1, 3842 can_hover => 1,
3619 can_events => 1, 3843 can_events => 1,
3620 markup => $widget, 3844 markup => $widget,
3745 3969
3746############################################################################# 3970#############################################################################
3747 3971
3748package CFPlus::UI::Notebook; 3972package CFPlus::UI::Notebook;
3749 3973
3974use CFPlus::OpenGL;
3975
3750our @ISA = CFPlus::UI::VBox::; 3976our @ISA = CFPlus::UI::VBox::;
3751 3977
3752sub new { 3978sub new {
3753 my $class = shift; 3979 my $class = shift;
3754 3980
3755 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3756 buttonbar => (new CFPlus::UI::Buttonbar), 3982 buttonbar => (new CFPlus::UI::Buttonbar),
3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2],
3758 # filter => # will be put between multiplexer and $self 3985 # filter => # will be put between multiplexer and $self
3759 @_, 3986 @_,
3760 ); 3987 );
3761 3988
3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3989 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3763 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3990 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3764 3991
3992 {
3993 Scalar::Util::weaken (my $wself = $self);
3994
3995 $self->{multiplexer}->connect (c_add => sub {
3996 my ($mplex, $widgets) = @_;
3997
3998 for my $child (@$widgets) {
3999 Scalar::Util::weaken $child;
4000 $child->{c_tab_} ||= do {
4001 my $tab =
4002 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4003 ? $child->{c_tab}
4004 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4005
4006 $tab->connect (activate => sub {
4007 $wself->set_current_page ($child);
4008 });
4009
4010 $tab
4011 };
4012
4013 $self->{buttonbar}->add ($child->{c_tab_});
4014 }
4015 });
4016
4017 $self->{multiplexer}->connect (c_remove => sub {
4018 my ($mplex, $widgets) = @_;
4019
4020 for my $child (@$widgets) {
4021 $wself->{buttonbar}->remove ($child->{c_tab_});
4022 }
4023 });
4024 }
4025
3765 $self 4026 $self
3766} 4027}
3767 4028
3768sub add { 4029sub add {
4030 my ($self, @widgets) = @_;
4031
4032 $self->{multiplexer}->add (@widgets)
4033}
4034
4035sub remove {
4036 my ($self, @widgets) = @_;
4037
4038 $self->{multiplexer}->remove (@widgets)
4039}
4040
4041sub pages {
4042 my ($self) = @_;
4043 $self->{multiplexer}->children
4044}
4045
4046sub add_tab {
3769 my ($self, $title, $widget, $tooltip) = @_; 4047 my ($self, $title, $widget, $tooltip) = @_;
3770 4048
3771 CFPlus::weaken $self; 4049 $title = [$title, $tooltip] unless ref $title;
4050 $widget->{c_tab} = $title;
3772 4051
3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3774 markup => $title,
3775 tooltip => $tooltip,
3776 on_activate => sub { $self->set_current_page ($widget) },
3777 );
3778
3779 $self->{multiplexer}->add ($widget); 4052 $self->add ($widget);
3780} 4053}
3781 4054
3782sub get_current_page { 4055sub get_current_page {
3783 my ($self) = @_; 4056 my ($self) = @_;
3784 4057
3788sub set_current_page { 4061sub set_current_page {
3789 my ($self, $page) = @_; 4062 my ($self, $page) = @_;
3790 4063
3791 $self->{multiplexer}->set_current_page ($page); 4064 $self->{multiplexer}->set_current_page ($page);
3792 $self->emit (page_changed => $self->{multiplexer}{current}); 4065 $self->emit (page_changed => $self->{multiplexer}{current});
4066}
4067
4068sub _draw {
4069 my ($self) = @_;
4070
4071 $self->SUPER::_draw ();
4072
4073 if (my $cur = $self->{multiplexer}{current}) {
4074 if ($cur = $cur->{c_tab_}) {
4075 glTranslate $self->{buttonbar}{x} + $cur->{x},
4076 $self->{buttonbar}{y} + $cur->{y};
4077 glLineWidth 3;
4078 #glEnable GL_BLEND;
4079 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4080 glColor @{$self->{active_outline}};
4081 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4082 glLineWidth 1;
4083 #glDisable GL_BLEND;
4084 }
4085 }
3793} 4086}
3794 4087
3795############################################################################# 4088#############################################################################
3796 4089
3797package CFPlus::UI::Selector; 4090package CFPlus::UI::Selector;
3829} 4122}
3830 4123
3831sub _set_value { 4124sub _set_value {
3832 my ($self, $value) = @_; 4125 my ($self, $value) = @_;
3833 4126
3834 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4127 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4128 $item ||= $self->{options}[0]
3835 or return; 4129 or return;
3836 4130
3837 $self->{value} = $item->[0]; 4131 $self->{value} = $item->[0];
3838 $self->set_markup ("$item->[1] ⇓"); 4132 $self->set_markup ("$item->[1] ⇓");
3839 $self->set_tooltip ($item->[2]); 4133# $self->set_tooltip ($item->[2]);
3840} 4134}
3841 4135
3842sub set_value { 4136sub set_value {
3843 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3844 4138
3845 return unless $self->{value} ne $value; 4139 return unless $self->{value} ne $value;
3846 4140
3847 $self->_set_value ($value); 4141 $self->_set_value ($value);
3848 $self->emit (changed => $value); 4142 $self->emit (changed => $value);
4143}
4144
4145sub set_options {
4146 my ($self, $options) = @_;
4147
4148 $self->{options} = $options;
4149 $self->_set_value ($self->{value});
3849} 4150}
3850 4151
3851############################################################################# 4152#############################################################################
3852 4153
3853package CFPlus::UI::Statusbox; 4154package CFPlus::UI::Statusbox;
3862 @_, 4163 @_,
3863 ); 4164 );
3864 4165
3865 CFPlus::weaken (my $this = $self); 4166 CFPlus::weaken (my $this = $self);
3866 4167
3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3868 4169
3869 $self 4170 $self
3870} 4171}
3871 4172
3872sub reorder { 4173sub reorder {
3886 4187
3887 my @items = sort { 4188 my @items = sort {
3888 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3889 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3890 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3891
3892 $self->{timer}->interval (1);
3893 4192
3894 my $count = 10 + 1; 4193 my $count = 10 + 1;
3895 for my $item (@items) { 4194 for my $item (@items) {
3896 last unless --$count; 4195 last unless --$count;
3897 4196
3921 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3922 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3923 $label->update; 4222 $label->update;
3924 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3925 if $diff < 1; 4224 if $diff < 1;
3926 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3927 } else { 4226 } else {
3928 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3929 } 4228 }
3930 4229
3931 push @widgets, $label; 4230 push @widgets, $label;
4067} 4366}
4068 4367
4069sub update { 4368sub update {
4070 my ($self) = @_; 4369 my ($self) = @_;
4071 4370
4072 $::WANT_REFRESH++; 4371 $::WANT_REFRESH->start;
4073} 4372}
4074 4373
4075sub add { 4374sub add {
4076 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4077 4376
4114 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
4115 $_->() 4414 $_->()
4116 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
4117 } 4416 }
4118 4417
4119 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
4120 my %queue; 4419 my %queue;
4121 my @queue; 4420 my @queue;
4122 my $widget; 4421 my $widget;
4123 4422
4124 outer: 4423 outer:
4171 } 4470 }
4172 } 4471 }
4173 4472
4174 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
4175 } 4474 }
4176 }
4177 4475
4178 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
4179 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4180 values %$size_alloc; 4478 values %$size_alloc;
4181 4479
4182 while () { 4480 while () {
4183 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
4184 4482
4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4186 4484
4187 $w = 0 if $w < 0;
4188 $h = 0 if $h < 0;
4189
4190 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
4192 4487
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195 4490
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198 4493
4199 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
4200 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
4201 4496
4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4203 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
4204 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
4205 4500
4206 $widget->{w} = $w; 4501 $widget->{w} = $w;
4207 $widget->{h} = $h; 4502 $widget->{h} = $h;
4208 4503
4209 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4210 } 4506 }
4211 } 4507 }
4212 } 4508 }
4213 4509
4214 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
4215 $_->() 4511 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
4217 } 4513 }
4218
4219 4514
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
4223 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines