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.367 by root, Fri Apr 27 00:59:14 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) = @_;
268 $self->hide; 269 $self->hide;
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
273sub show { 278sub show {
274 my ($self) = @_; 279 my ($self) = @_;
275 280
276 return if $self->{parent}; 281 return if $self->{parent};
277 282
304 delete $self->{root}; 309 delete $self->{root};
305 310
306 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
307 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
308 313
309 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
310 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
311 316
312 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
313 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
314} 319}
316sub set_visibility { 321sub set_visibility {
317 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
318 323
319 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
320 325
321 $visible ? $self->hide 326 $visible ? $self->show
322 : $self->show; 327 : $self->hide;
323} 328}
324 329
325sub toggle_visibility { 330sub toggle_visibility {
326 my ($self) = @_; 331 my ($self) = @_;
327 332
354 359
355 $self->{force_w} = $w; 360 $self->{force_w} = $w;
356 $self->{force_h} = $h; 361 $self->{force_h} = $h;
357 362
358 $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)
359} 374}
360 375
361sub size_request { 376sub size_request {
362 require Carp; 377 require Carp;
363 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
425 440
426 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
427 442
428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
429 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
430 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
431 } 446 }
432} 447}
433 448
434# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
435sub coord2local { 450sub coord2local {
436 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
437 452
438 Carp::confess unless $self->{parent};#d# 453 return (undef, undef) unless $self->{parent};
439 454
440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
441} 456}
442 457
443# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
444sub coord2global { 459sub coord2global {
445 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
446 461
447 Carp::confess unless $self->{parent};#d# 462 return (undef, undef) unless $self->{parent};
448 463
449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
450} 465}
451 466
452sub invoke_focus_in { 467sub invoke_focus_in {
543 558
544 # parent 559 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 561}
547 562
548sub find_widget { 563#sub find_widget {
549 my ($self, $x, $y) = @_; 564# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 565
560sub set_parent { 566sub set_parent {
561 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
562 568
563 CFPlus::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
594 600
595# 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
596# functions seems pointless. 602# functions seems pointless.
597our ($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
598 604
599sub draw { 605#sub draw {
600 my ($self) = @_; 606#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 607
646sub _draw { 608sub _draw {
647 my ($self) = @_; 609 my ($self) = @_;
648 610
649 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
650} 612}
651 613
652my $cntx;#d#
653sub DESTROY { 614sub DESTROY {
654 my ($self) = @_; 615 my ($self) = @_;
655 616
656 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
657 618
619 local $@;
658 eval { $self->destroy }; 620 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660 622
661 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
662} 624}
670use strict; 632use strict;
671use CFPlus::OpenGL; 633use CFPlus::OpenGL;
672 634
673sub new { 635sub new {
674 my $class = shift; 636 my $class = shift;
675
676 # range [value, low, high, page]
677 637
678 $class->SUPER::new ( 638 $class->SUPER::new (
679 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
680 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
681 @_ 641 @_
693 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
694 654
695 glEnable GL_BLEND; 655 glEnable GL_BLEND;
696 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697 glColor_premultiply @$color; 657 glColor_premultiply @$color;
698
699 glBegin GL_QUADS;
700 glVertex 0 , 0;
701 glVertex 0 , $h;
702 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
703 glVertex $w, 0;
704 glEnd;
705
706 glDisable GL_BLEND; 659 glDisable GL_BLEND;
707 } 660 }
708} 661}
709 662
710############################################################################# 663#############################################################################
742 can_events => 0, 695 can_events => 0,
743 %arg, 696 %arg,
744 ); 697 );
745 698
746 $self->add (@$children) 699 $self->add (@$children)
747 if $children; 700 if $children && @$children;
748 701
749 $self 702 $self
750} 703}
751 704
752sub realloc { 705sub realloc {
761 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
762 715
763 $_->set_parent ($self) 716 $_->set_parent ($self)
764 for @widgets; 717 for @widgets;
765 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 720 use sort 'stable';
767 721
768 $self->{children} = [ 722 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
771 ]; 725 ];
772 726
773 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
774} 732}
775 733
776sub children { 734sub children {
777 @{ $_[0]{children} } 735 @{ $_[0]{children} }
778} 736}
779 737
780sub remove { 738sub remove {
781 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
782 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
783 delete $child->{parent}; 744 delete $child->{parent};
784 $child->hide; 745 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
787 748
788 $self->realloc; 749 $self->realloc;
789} 750}
790 751
791sub clear { 752sub clear {
792 my ($self) = @_; 753 my ($self) = @_;
793 754
794 my $children = delete $self->{children}; 755 my $children = $self->{children};
795 $self->{children} = []; 756 $self->{children} = [];
796 757
797 for (@$children) { 758 for (@$children) {
798 delete $_->{parent}; 759 delete $_->{parent};
799 $_->hide; 760 $_->hide;
819} 780}
820 781
821sub _draw { 782sub _draw {
822 my ($self) = @_; 783 my ($self) = @_;
823 784
824 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
825} 786}
826 787
827############################################################################# 788#############################################################################
828 789
829package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
839} 800}
840 801
841sub add { 802sub add {
842 my ($self, $child) = @_; 803 my ($self, $child) = @_;
843 804
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
845 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
846} 807}
847 808
848sub remove { 809sub remove {
849 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
867 828
868 1 829 1
869} 830}
870 831
871############################################################################# 832#############################################################################
872
873# back-buffered drawing area 833# back-buffered drawing area
874 834
875package CFPlus::UI::Window; 835package CFPlus::UI::Window;
876 836
877our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
939} 899}
940 900
941############################################################################# 901#############################################################################
942 902
943package CFPlus::UI::ViewPort; 903package CFPlus::UI::ViewPort;
904
905use List::Util qw(min max);
944 906
945our @ISA = CFPlus::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
946 908
947sub new { 909sub new {
948 my $class = shift; 910 my $class = shift;
957sub size_request { 919sub size_request {
958 my ($self) = @_; 920 my ($self) = @_;
959 921
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 923
962 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
964 926
965 ($w, $h) 927 ($w, $h)
966} 928}
967 929
968sub invoke_size_allocate { 930sub invoke_size_allocate {
980} 942}
981 943
982sub set_offset { 944sub set_offset {
983 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
984 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}) {
985 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
987 953
954 $self->emit (changed => $x, $y);
988 $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 }
989} 975}
990 976
991# 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
992sub coord2local { 978sub coord2local {
993 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
1008 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
1009 995
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 998 ) {
1013 $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})
1014 } else { 1000 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1016 } 1002 }
1017} 1003}
1018 1004
1029 1015
1030############################################################################# 1016#############################################################################
1031 1017
1032package CFPlus::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
1033 1019
1034our @ISA = CFPlus::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
1035 1021
1036sub new { 1022sub new {
1037 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
1038 1024
1039 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1040 1026
1041 my $self; 1027 my $self;
1042 1028
1043 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,
1044 vertical => 1, 1043 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1045 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1048 },
1049 ; 1049 ;
1050 1050
1051 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1053 can_events => 1, 1054 can_events => 1,
1054 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1055 %arg, 1059 %arg,
1056 ); 1060 );
1057 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
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
1059 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1060 1086
1061 $self 1087 $self
1062} 1088}
1063
1064#TODO# update range on size_allocate depending on child
1065 1089
1066sub add { 1090sub add {
1067 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1068 1092
1069 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1070} 1094}
1071 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
1072sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1074 1150
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $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};
1078 1153
1079 1 1154 1
1080} 1155}
1081 1156
1082sub update_slider { 1157sub invoke_button_down {
1083 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1084 1159
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1160 if ($ev->{button} == 2) {
1086} 1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1087 1164
1088sub update { 1165 0
1089 my ($self) = @_; 1166}
1090 1167
1091 $self->SUPER::update; 1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1092 1170
1093 $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
1094} 1187}
1095 1188
1096sub invoke_size_allocate { 1189sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1098 1191
1099 $self->update_slider; 1192 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1194}
1103 1195
1104############################################################################# 1196#############################################################################
1105 1197
1125 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1126 1218
1127 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1128 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1130
1131 glBegin GL_QUADS;
1132 glVertex 0 , 0;
1133 glVertex 0 , $h;
1134 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1135 glVertex $w, 0;
1136 glEnd;
1137
1138 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1139 } 1224 }
1140 1225
1141 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1142} 1227}
1255 1340
1256my @border = 1341my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258 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);
1259 1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1260sub new { 1349sub new {
1261 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1262 1351
1263 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1299 1388
1300sub border { 1389sub border {
1301 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1302} 1391}
1303 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
1304sub size_request { 1402sub size_request {
1305 my ($self) = @_; 1403 my ($self) = @_;
1306 1404
1307 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1308 if $self->{title_widget}; 1406 if $self->{title_widget};
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1531
1434 my $border = $self->border; 1532 my $border = $self->border;
1435 1533
1436 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $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);
1441 1553
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1444 1556
1445 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
1466 1578
1467############################################################################# 1579#############################################################################
1468 1580
1469package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1470 1582
1471our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1472 1584
1473use List::Util qw(max sum); 1585use List::Util qw(max sum);
1474 1586
1475use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1476 1588
1477sub new { 1589sub new {
1478 my $class = shift; 1590 my $class = shift;
1479 1591
1480 $class->SUPER::new ( 1592 $class->SUPER::new (
1481 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1482 @_, 1595 @_,
1483 ) 1596 )
1484} 1597}
1485 1598
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub 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 {
1491 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1492 1614
1493 while (@_) { 1615 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1617
1499 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1620
1504sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1505 my ($self, $child) = @_; 1628 my ($self) = @_;
1506 1629
1507 # TODO: not yet implemented 1630 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1631
1514 my @children = $self->children; 1632 my @children = $self->children;
1515 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 }
1516 1643 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1644
1522 $self->realloc; 1645 # second pass, rows
1523} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1648
1539 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1653 }
1542 } 1654 }
1543 1655
1544 (\@w, \@h) 1656 (\@w, \@h)
1545} 1657}
1561 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1562 1674
1563 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1565 1677
1566 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1570 1682
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1684
1575 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
1576 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1577 1694
1578 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1697
1580 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1581 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)};
1582 or next;
1583 1700
1584 my $x = 0; 1701 $widget->configure (
1585 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1704 );
1587 for my $c (0 .. $#$row) { 1705 }
1588 my $col_w = $ws->[$c];
1589 1706
1590 if (my $widget = $row->[$c]) { 1707 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1592 }
1593 1709
1594 $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};
1595 } 1737 }
1738 }
1596 1739
1597 $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});
1598 } 1771 }
1599 1772
1600 1 1773 1
1601} 1774}
1602 1775
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1776#############################################################################
1628 1777
1629package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1630 1779
1631our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1632 1781
1633sub size_request { 1782sub size_request {
1634 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1635 1786
1636 $self->{vertical} 1787 $self->{vertical}
1637 ? ( 1788 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1791 )
1641 : ( 1792 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1644 ) 1795 )
1645} 1796}
1646 1797
1647sub invoke_size_allocate { 1798sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1772 1923
1773 delete $self->{ox}; 1924 delete $self->{ox};
1774 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1775} 1926}
1776 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1777sub set_text { 1934sub set_text {
1778 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1779 1936
1780 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1804 1961
1805sub size_request { 1962sub size_request {
1806 my ($self) = @_; 1963 my ($self) = @_;
1807 1964
1808 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1809 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1810 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1811 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1812 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1813 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1814 1973
1815 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1887 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1888 2047
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1892 }; 2053 };
1893 2054
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1896 2057# CFPlus::OpenGL::glNewList $self->{list};
1897 $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;
1898} 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#}
1899 2074
1900############################################################################# 2075#############################################################################
1901 2076
1902package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1903 2078
1909 my $class = shift; 2084 my $class = shift;
1910 2085
1911 $class->SUPER::new ( 2086 $class->SUPER::new (
1912 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1914 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1916 can_hover => 1, 2093 can_hover => 1,
1917 can_focus => 1, 2094 can_focus => 1,
1918 valign => 0, 2095 valign => 0,
1919 can_events => 1, 2096 can_events => 1,
1920 ellipsise => 0, 2097 ellipsise => 0,
2060 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2061 } 2238 }
2062 2239
2063 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2064 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2065 glBegin GL_QUADS;
2066 glVertex 0 , 0;
2067 glVertex 0 , $self->{h};
2068 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2069 glVertex $self->{w}, 0;
2070 glEnd;
2071 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2072 2244
2073 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2074 2246
2075 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
2077 2249
2078 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2079 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2080 utf8::encode $text; 2252 utf8::encode $text;
2081 2253
2082 @$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);
2083 } 2255 }
2084 2256
2257 glColor_premultiply @{$self->{active_fg}};
2085 glBegin GL_LINES; 2258 glBegin GL_LINES;
2086 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};
2087 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;
2088 glEnd; 2275 glEnd;
2089 } 2276 }
2090} 2277}
2091 2278
2092############################################################################# 2279#############################################################################
2179 1 2366 1
2180} 2367}
2181 2368
2182############################################################################# 2369#############################################################################
2183 2370
2184package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2185 2372
2186our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2187 2374
2188use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2189 2376
2190my @tex = 2377my @tex =
2191 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2192 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2193 2380
2194sub new { 2381sub new {
2195 my $class = shift; 2382 my $class = shift;
2196 2383
2197 $class->SUPER::new ( 2384 $class->SUPER::new (
2198 padding_x => 4,
2199 padding_y => 4,
2200 fg => [1, 1, 1],
2201 active_fg => [0, 0, 1],
2202 can_hover => 1, 2385 can_hover => 1,
2203 align => 0, 2386 align => 0,
2204 valign => 0, 2387 valign => 0,
2205 can_events => 1, 2388 can_events => 1,
2206 @_ 2389 @_
2218} 2401}
2219 2402
2220sub _draw { 2403sub _draw {
2221 my ($self) = @_; 2404 my ($self) = @_;
2222 2405
2223 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2224
2225 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2228 2409
2410 my $tex = $tex[$GRAB == $self];
2229 $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});
2230 2467
2231 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2232 2469
2233 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2234} 2471}
2291sub _draw { 2528sub _draw {
2292 my ($self) = @_; 2529 my ($self) = @_;
2293 2530
2294 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2295 2532
2296 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2297 2534
2298 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2299 2536
2300 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;
2301 2538
2321sub new { 2558sub new {
2322 my $class = shift; 2559 my $class = shift;
2323 2560
2324 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2325 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2326 @_, 2564 @_,
2327 ); 2565 );
2328 2566
2329 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2330 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2355} 2593}
2356 2594
2357sub size_request { 2595sub size_request {
2358 my ($self) = @_; 2596 my ($self) = @_;
2359 2597
2360 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2361} 2599}
2362 2600
2363sub _draw { 2601sub _draw {
2364 my ($self) = @_; 2602 my ($self) = @_;
2365 2603
2375 } 2613 }
2376 2614
2377 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2379 2617
2380 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2381 2619
2382 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2383} 2621}
2384 2622
2385############################################################################# 2623#############################################################################
2404 align => 0, 2642 align => 0,
2405 valign => 0, 2643 valign => 0,
2406 can_events => 1, 2644 can_events => 1,
2407 @_ 2645 @_
2408 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2409} 2653}
2410 2654
2411sub invoke_button_up { 2655sub invoke_button_up {
2412 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2413 2657
2553 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2554} 2798}
2555 2799
2556############################################################################# 2800#############################################################################
2557 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
2558package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2559 2941
2560our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2561 2943
2562sub new { 2944sub new {
2687 3069
2688 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2689 3071
2690 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2691 3073
2692 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2693} 3077}
2694 3078
2695sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2696 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2697 3081
2717 3101
2718 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2719 3103
2720 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2721 3105
2722 ! ! $delta 3106 1
2723} 3107}
2724 3108
2725sub update { 3109sub update {
2726 my ($self) = @_; 3110 my ($self) = @_;
2727 3111
2858} 3242}
2859 3243
2860sub size_request { 3244sub size_request {
2861 my ($self) = @_; 3245 my ($self) = @_;
2862 3246
2863 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2864 3248
2865 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2866 $self->SUPER::size_request 3250 $self->SUPER::size_request
2867} 3251}
2868 3252
3057 3441
3058 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3059 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3060 3444
3061 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3062 3447
3063 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3064 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3065 3450
3066 for (@w) { 3451 for (@w) {
3188} 3573}
3189 3574
3190sub set_tooltip_from { 3575sub set_tooltip_from {
3191 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3192 3577
3193 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3194 if $widget->{tooltip} =~ /^#(.*)$/;
3195
3196 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 =~ /^#(.*)$/;
3197 3583
3198 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3199 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3200 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3201 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3202 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3203 } 3589 }
3204 3590
3205 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3206 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3207 3593
3208 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3209 markup => $tooltip, 3595 markup => $tip,
3210 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3211 fontsize => 0.8, 3597 fontsize => 0.8,
3212 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3213 ellipsise => 0, 3599 ellipsise => 0,
3214 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
3252} 3638}
3253 3639
3254sub _draw { 3640sub _draw {
3255 my ($self) = @_; 3641 my ($self) = @_;
3256 3642
3257 glTranslate 0.375, 0.375;
3258
3259 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3260 3644
3261 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3262 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3263 glVertex 0 , 0;
3264 glVertex 0 , $h;
3265 glVertex $w, $h;
3266 glVertex $w, 0;
3267 glEnd;
3268 3647
3269 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3270 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3271 glVertex 0 , 0;
3272 glVertex 0 , $h;
3273 glVertex $w, $h;
3274 glVertex $w, 0;
3275 glEnd;
3276 3650
3277 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3278 3652
3279 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3280} 3654}
3281 3655
3282############################################################################# 3656#############################################################################
3289 3663
3290sub new { 3664sub new {
3291 my $class = shift; 3665 my $class = shift;
3292 3666
3293 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3294 aspect => 1, 3670 aspect => 1,
3295 can_events => 0, 3671 can_events => 0,
3296 @_, 3672 @_,
3297 ); 3673 );
3298 3674
3299 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3300 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3301 3677
3302 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3303 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3304 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3305 interval => $self->{animspeed}, 3681 return unless $::CONN;
3306 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
3307 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3308 $widget->update; 3690 $w->update;
3309 }, 3691 $w->update_timer;
3310 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
3311 } 3696 }
3312 3697
3313 $self 3698 $self
3314} 3699}
3315 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
3717sub update_face {
3718 my ($self) = @_;
3719
3720 if ($::CONN) {
3721 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3722 if ($anim && @$anim) {
3723 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3724 delete $self->{face_change_cb};
3725
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 }
3730 }
3731 }
3732 }
3733 }
3734}
3735
3316sub size_request { 3736sub size_request {
3317 (32, 8) 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 }
3752
3753 ($self->{size_w} || 8, $self->{size_h} || 8)
3318} 3754}
3319 3755
3320sub update { 3756sub update {
3321 my ($self) = @_; 3757 my ($self) = @_;
3322 3758
3323 return unless $self->{visible}; 3759 return unless $self->{visible};
3324 3760
3325 $self->SUPER::update; 3761 $self->SUPER::update;
3326} 3762}
3327 3763
3764sub invoke_visibility_change {
3765 my ($self) = @_;
3766
3767 $self->update_timer;
3768
3769 0
3770}
3771
3328sub _draw { 3772sub _draw {
3329 my ($self) = @_; 3773 my ($self) = @_;
3330 3774
3331 return unless $::CONN;
3332
3333 $self->SUPER::_draw; 3775 $self->SUPER::_draw;
3334 3776
3335 my $face; 3777 if (my $tex = $self->{tex}) {
3336
3337 if ($self->{frame}) {
3338 my $anim = $::CONN->{anim}[$self->{anim}];
3339
3340 $face = $anim->[ $self->{frame} % @$anim ]
3341 if $anim && @$anim;
3342 }
3343
3344 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3345
3346 if ($tex) {
3347 glEnable GL_TEXTURE_2D; 3778 glEnable GL_TEXTURE_2D;
3348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3349 glColor 0, 0, 0, 1; 3780 glColor 0, 0, 0, 1;
3350 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3781 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3351 glDisable GL_TEXTURE_2D; 3782 glDisable GL_TEXTURE_2D;
3353} 3784}
3354 3785
3355sub destroy { 3786sub destroy {
3356 my ($self) = @_; 3787 my ($self) = @_;
3357 3788
3358 $self->{timer}->cancel 3789 (delete $self->{timer})->cancel
3359 if $self->{timer}; 3790 if $self->{timer};
3360 3791
3361 $self->SUPER::destroy; 3792 $self->SUPER::destroy;
3362} 3793}
3363 3794
3403 children => [ 3834 children => [
3404 (new CFPlus::UI::Label markup => $left, expand => 1), 3835 (new CFPlus::UI::Label markup => $left, expand => 1),
3405 (new CFPlus::UI::Label markup => $right, align => +1), 3836 (new CFPlus::UI::Label markup => $right, align => +1),
3406 ], 3837 ],
3407 ; 3838 ;
3408 3839
3409 } else { 3840 } else {
3410 $widget = new CFPlus::UI::Label 3841 $widget = new CFPlus::UI::Label
3411 can_hover => 1, 3842 can_hover => 1,
3412 can_events => 1, 3843 can_events => 1,
3413 markup => $widget, 3844 markup => $widget,
3538 3969
3539############################################################################# 3970#############################################################################
3540 3971
3541package CFPlus::UI::Notebook; 3972package CFPlus::UI::Notebook;
3542 3973
3974use CFPlus::OpenGL;
3975
3543our @ISA = CFPlus::UI::VBox::; 3976our @ISA = CFPlus::UI::VBox::;
3544 3977
3545sub new { 3978sub new {
3546 my $class = shift; 3979 my $class = shift;
3547 3980
3548 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3549 buttonbar => (new CFPlus::UI::Buttonbar), 3982 buttonbar => (new CFPlus::UI::Buttonbar),
3550 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2],
3551 # filter => # will be put between multiplexer and $self 3985 # filter => # will be put between multiplexer and $self
3552 @_, 3986 @_,
3553 ); 3987 );
3554 3988
3555 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3989 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3556 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3990 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3557 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
3558 $self 4026 $self
3559} 4027}
3560 4028
3561sub 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 {
3562 my ($self, $title, $widget, $tooltip) = @_; 4047 my ($self, $title, $widget, $tooltip) = @_;
3563 4048
3564 CFPlus::weaken $self; 4049 $title = [$title, $tooltip] unless ref $title;
4050 $widget->{c_tab} = $title;
3565 4051
3566 $self->{buttonbar}->add (new CFPlus::UI::Button
3567 markup => $title,
3568 tooltip => $tooltip,
3569 on_activate => sub { $self->set_current_page ($widget) },
3570 );
3571
3572 $self->{multiplexer}->add ($widget); 4052 $self->add ($widget);
3573} 4053}
3574 4054
3575sub get_current_page { 4055sub get_current_page {
3576 my ($self) = @_; 4056 my ($self) = @_;
3577 4057
3581sub set_current_page { 4061sub set_current_page {
3582 my ($self, $page) = @_; 4062 my ($self, $page) = @_;
3583 4063
3584 $self->{multiplexer}->set_current_page ($page); 4064 $self->{multiplexer}->set_current_page ($page);
3585 $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 }
3586} 4086}
3587 4087
3588############################################################################# 4088#############################################################################
3589 4089
3590package CFPlus::UI::Selector; 4090package CFPlus::UI::Selector;
3622} 4122}
3623 4123
3624sub _set_value { 4124sub _set_value {
3625 my ($self, $value) = @_; 4125 my ($self, $value) = @_;
3626 4126
3627 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4127 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4128 $item ||= $self->{options}[0]
3628 or return; 4129 or return;
3629 4130
3630 $self->{value} = $item->[0]; 4131 $self->{value} = $item->[0];
3631 $self->set_markup ("$item->[1] ⇓"); 4132 $self->set_markup ("$item->[1] ⇓");
3632 $self->set_tooltip ($item->[2]); 4133# $self->set_tooltip ($item->[2]);
3633} 4134}
3634 4135
3635sub set_value { 4136sub set_value {
3636 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3637 4138
3638 return unless $self->{value} ne $value; 4139 return unless $self->{value} ne $value;
3639 4140
3640 $self->_set_value ($value); 4141 $self->_set_value ($value);
3641 $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});
3642} 4150}
3643 4151
3644############################################################################# 4152#############################################################################
3645 4153
3646package CFPlus::UI::Statusbox; 4154package CFPlus::UI::Statusbox;
3655 @_, 4163 @_,
3656 ); 4164 );
3657 4165
3658 CFPlus::weaken (my $this = $self); 4166 CFPlus::weaken (my $this = $self);
3659 4167
3660 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3661 4169
3662 $self 4170 $self
3663} 4171}
3664 4172
3665sub reorder { 4173sub reorder {
3679 4187
3680 my @items = sort { 4188 my @items = sort {
3681 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3682 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3683 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3684
3685 $self->{timer}->interval (1);
3686 4192
3687 my $count = 10 + 1; 4193 my $count = 10 + 1;
3688 for my $item (@items) { 4194 for my $item (@items) {
3689 last unless --$count; 4195 last unless --$count;
3690 4196
3714 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3715 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3716 $label->update; 4222 $label->update;
3717 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3718 if $diff < 1; 4224 if $diff < 1;
3719 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3720 } else { 4226 } else {
3721 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3722 } 4228 }
3723 4229
3724 push @widgets, $label; 4230 push @widgets, $label;
3860} 4366}
3861 4367
3862sub update { 4368sub update {
3863 my ($self) = @_; 4369 my ($self) = @_;
3864 4370
3865 $::WANT_REFRESH++; 4371 $::WANT_REFRESH->start;
3866} 4372}
3867 4373
3868sub add { 4374sub add {
3869 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3870 4376
3907 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3908 $_->() 4414 $_->()
3909 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3910 } 4416 }
3911 4417
3912 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3913 my %queue; 4419 my %queue;
3914 my @queue; 4420 my @queue;
3915 my $widget; 4421 my $widget;
3916 4422
3917 outer: 4423 outer:
3964 } 4470 }
3965 } 4471 }
3966 4472
3967 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3968 } 4474 }
3969 }
3970 4475
3971 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3972 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3973 values %$size_alloc; 4478 values %$size_alloc;
3974 4479
3975 while () { 4480 while () {
3976 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3977 4482
3978 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3979 4484
3980 $w = 0 if $w < 0;
3981 $h = 0 if $h < 0;
3982
3983 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
3984 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
3985 4487
3986# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3987# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3988 4490
3989 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3990 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3991 4493
3992 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3993 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3994 4496
3995 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}) {
3996 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3997 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3998 4500
3999 $widget->{w} = $w; 4501 $widget->{w} = $w;
4000 $widget->{h} = $h; 4502 $widget->{h} = $h;
4001 4503
4002 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4003 } 4506 }
4004 } 4507 }
4005 } 4508 }
4006 4509
4007 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
4008 $_->() 4511 $_->()
4009 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
4010 } 4513 }
4011
4012 4514
4013 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4014 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4015 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
4016 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines