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.341 by root, Sun Aug 13 03:20:56 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 36 $TOOLTIP->show;
40 } 37 }
41 38
42 return; 39 return;
43 } 40 }
44 } 41 }
45 } 42 }
46 43
47 $TOOLTIP->hide; 44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 46 delete $TOOLTIP->{owner};
49}); 47});
50 48
51sub get_layout { 49sub get_layout {
52 my $layout; 50 my $layout;
… …
111 } 109 }
112 110
113 if ($GRAB) { 111 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 113 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
118 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
119 } else { 121 } else {
120 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
121 } 123 }
122 } 124 }
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __w_ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
514); 527);
515 528
516sub emit { 529sub emit {
517 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
518 531
519 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
521 my @append 534 my @append
522 = $has_coords{$signal} 535 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552#sub find_widget {
535 my ($self, $x, $y) = @_; 553# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 554
546sub set_parent { 555sub set_parent {
547 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
548 557
549 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
551} 560}
552 561
553sub realloc { 562sub realloc {
554 my ($self) = @_; 563 my ($self) = @_;
… …
580 589
581# using global variables seems a bit hacky, but passing through all drawing 590# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 591# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 593
585sub draw { 594#sub draw {
586 my ($self) = @_; 595#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 596
632sub _draw { 597sub _draw {
633 my ($self) = @_; 598 my ($self) = @_;
634 599
635 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
… …
638sub DESTROY { 603sub DESTROY {
639 my ($self) = @_; 604 my ($self) = @_;
640 605
641 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
642 607
643 delete $WIDGET{$self+0}; 608 local $@;
644
645 eval { $self->destroy }; 609 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
611
612 delete $WIDGET{$self+0};
647} 613}
648 614
649############################################################################# 615#############################################################################
650 616
651package CFPlus::UI::DrawBG; 617package CFPlus::UI::DrawBG;
… …
655use strict; 621use strict;
656use CFPlus::OpenGL; 622use CFPlus::OpenGL;
657 623
658sub new { 624sub new {
659 my $class = shift; 625 my $class = shift;
660
661 # range [value, low, high, page]
662 626
663 $class->SUPER::new ( 627 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
666 @_ 630 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
679 643
680 glEnable GL_BLEND; 644 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 646 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 648 glDisable GL_BLEND;
692 } 649 }
693} 650}
694 651
695############################################################################# 652#############################################################################
… …
727 can_events => 0, 684 can_events => 0,
728 %arg, 685 %arg,
729 ); 686 );
730 687
731 $self->add (@$children) 688 $self->add (@$children)
732 if $children; 689 if $children && @$children;
733 690
734 $self 691 $self
735} 692}
736 693
737sub realloc { 694sub realloc {
… …
746 my ($self, @widgets) = @_; 703 my ($self, @widgets) = @_;
747 704
748 $_->set_parent ($self) 705 $_->set_parent ($self)
749 for @widgets; 706 for @widgets;
750 707
708 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 709 use sort 'stable';
752 710
753 $self->{children} = [ 711 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 712 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
756 ]; 714 ];
757 715
758 $self->realloc; 716 $self->realloc;
717
718 $self->emit (c_add => \@widgets);
719
720 map $_+0, @widgets
759} 721}
760 722
761sub children { 723sub children {
762 @{ $_[0]{children} } 724 @{ $_[0]{children} }
763} 725}
764 726
765sub remove { 727sub remove {
766 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
767 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
768 delete $child->{parent}; 733 delete $child->{parent};
769 $child->hide; 734 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
772 737
773 $self->realloc; 738 $self->realloc;
774} 739}
775 740
776sub clear { 741sub clear {
777 my ($self) = @_; 742 my ($self) = @_;
778 743
779 my $children = delete $self->{children}; 744 my $children = $self->{children};
780 $self->{children} = []; 745 $self->{children} = [];
781 746
782 for (@$children) { 747 for (@$children) {
783 delete $_->{parent}; 748 delete $_->{parent};
784 $_->hide; 749 $_->hide;
… …
804} 769}
805 770
806sub _draw { 771sub _draw {
807 my ($self) = @_; 772 my ($self) = @_;
808 773
809 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
810} 775}
811 776
812############################################################################# 777#############################################################################
813 778
814package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
824} 789}
825 790
826sub add { 791sub add {
827 my ($self, $child) = @_; 792 my ($self, $child) = @_;
828 793
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
830 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
831} 796}
832 797
833sub remove { 798sub remove {
834 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
898 glClear GL_COLOR_BUFFER_BIT; 863 glClear GL_COLOR_BUFFER_BIT;
899 864
900 { 865 {
901 package CFPlus::UI::Base; 866 package CFPlus::UI::Base;
902 867
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 868 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 869 (0, 0, $self->{w}, $self->{h});
870
871 $self->_render;
905 } 872 }
906
907 $self->_render;
908 }; 873 };
909} 874}
910 875
911sub _draw { 876sub _draw {
912 my ($self) = @_; 877 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 878
916 my $tex = $self->{texture} 879 my $tex = $self->{texture}
917 or return; 880 or return;
918 881
919 glEnable GL_TEXTURE_2D; 882 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 883 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 884 glColor 0, 0, 0, 1;
922 885
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 886 $tex->draw_quad_alpha_premultiplied (0, 0);
924 887
925 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
926} 889}
927 890
928############################################################################# 891#############################################################################
929 892
930package CFPlus::UI::ViewPort; 893package CFPlus::UI::ViewPort;
894
895use List::Util qw(min max);
931 896
932our @ISA = CFPlus::UI::Window::; 897our @ISA = CFPlus::UI::Window::;
933 898
934sub new { 899sub new {
935 my $class = shift; 900 my $class = shift;
… …
944sub size_request { 909sub size_request {
945 my ($self) = @_; 910 my ($self) = @_;
946 911
947 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
948 913
949 $w = 10 if $self->{scroll_x}; 914 $w = 1 if $self->{scroll_x};
950 $h = 10 if $self->{scroll_y}; 915 $h = 1 if $self->{scroll_y};
951 916
952 ($w, $h) 917 ($w, $h)
953} 918}
954 919
955sub invoke_size_allocate { 920sub invoke_size_allocate {
… …
967} 932}
968 933
969sub set_offset { 934sub set_offset {
970 my ($self, $x, $y) = @_; 935 my ($self, $x, $y) = @_;
971 936
937 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
938 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
939
940 if ($x != $self->{view_x} or $y != $self->{view_y}) {
972 $self->{view_x} = int $x; 941 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 942 $self->{view_y} = $y;
974 943
944 $self->emit (changed => $x, $y);
975 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
964 }
976} 965}
977 966
978# hmm, this does not work for topleft of $self... but we should not ask for that 967# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 968sub coord2local {
980 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
… …
995 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
996 985
997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 986 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 987 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
999 ) { 988 ) {
1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 989 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1001 } else { 990 } else {
1002 $self->CFPlus::UI::Base::find_widget ($x, $y) 991 $self->CFPlus::UI::Base::find_widget ($x, $y)
1003 } 992 }
1004} 993}
1005 994
… …
1016 1005
1017############################################################################# 1006#############################################################################
1018 1007
1019package CFPlus::UI::ScrolledWindow; 1008package CFPlus::UI::ScrolledWindow;
1020 1009
1021our @ISA = CFPlus::UI::HBox::; 1010our @ISA = CFPlus::UI::Table::;
1022 1011
1023sub new { 1012sub new {
1024 my ($class, %arg) = @_; 1013 my ($class, %arg) = @_;
1025 1014
1026 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1027 1016
1028 my $self; 1017 my $self;
1029 1018
1030 my $slider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1020 c_col => 0,
1021 c_row => 1,
1022 vertical => 0,
1023 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub {
1025 $self->{hpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1027 },
1028 ;
1029
1030 my $vslider = new CFPlus::UI::Slider
1031 c_col => 1,
1032 c_row => 0,
1031 vertical => 1, 1033 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1035 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1036 $self->{vpos} = $_[1];
1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1038 },
1036 ; 1039 ;
1037 1040
1038 $self = $class->SUPER::new ( 1041 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1042 scroll_x => 0,
1043 scroll_y => 1,
1040 can_events => 1, 1044 can_events => 1,
1041 slider => $slider, 1045 hslider => $hslider,
1046 vslider => $vslider,
1047 col_expand => [1, 0],
1048 row_expand => [1, 0],
1042 %arg, 1049 %arg,
1043 ); 1050 );
1044 1051
1052 $self->{vp} = new CFPlus::UI::ViewPort
1053 c_col => 0,
1054 c_row => 0,
1055 expand => 1,
1056 scroll_x => $self->{scroll_x},
1057 scroll_y => $self->{scroll_y},
1058 on_changed => sub {
1059 my ($vp, $x, $y) = @_;
1060
1061 $vp->{parent}{hslider}->set_value ($x);
1062 $vp->{parent}{vslider}->set_value ($y);
1063
1064 0
1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1071 ;
1072
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1073 $self->SUPER::add ($self->{vp});
1074
1046 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
1047 1076
1048 $self 1077 $self
1049} 1078}
1050
1051#TODO# update range on size_allocate depending on child
1052 1079
1053sub add { 1080sub add {
1054 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1055 1082
1056 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1057} 1084}
1058 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1090sub update_slider {
1091 my ($self) = @_;
1092
1093 my $child = ($self->{vp} or return)->child;
1094
1095 if ($self->{scroll_x}) {
1096 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1097 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1098
1099 my $visible = $w1 > $w2;
1100 if ($visible != $self->{hslider_visible}) {
1101 $self->{hslider_visible} = $visible;
1102 $visible ? $self->SUPER::add ($self->{hslider})
1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1105 }
1106
1107 if ($self->{scroll_y}) {
1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1109 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1110
1111 my $visible = $h1 > $h2;
1112 if ($visible != $self->{vslider_visible}) {
1113 $self->{vslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{vslider})
1115 : $self->SUPER::remove ($self->{vslider});
1116 }
1117 }
1118}
1119
1120sub start_dragging {
1121 my ($self, $ev) = @_;
1122
1123 $self->grab_focus;
1124
1125 my $ox = $self->{vp}{view_x};
1126 my $oy = $self->{vp}{view_y};
1127
1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
1130
1131 $ox -= $ev->{xrel};
1132 $oy -= $ev->{yrel};
1133
1134 $self->{vp}->set_offset ($ox, $oy);
1135 };
1136}
1137
1059sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1061 1140
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev); 1141 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1142 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1065 1143
1066 1 1144 1
1067} 1145}
1068 1146
1069sub update_slider { 1147sub invoke_button_down {
1070 my ($self) = @_; 1148 my ($self, $ev, $x, $y) = @_;
1071 1149
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1150 if ($ev->{button} == 2) {
1073} 1151 $self->start_dragging ($ev);
1152 return 1;
1153 }
1074 1154
1075sub update { 1155 0
1076 my ($self) = @_; 1156}
1077 1157
1078 $self->SUPER::update; 1158sub invoke_button_up {
1159 my ($self, $ev, $x, $y) = @_;
1079 1160
1080 $self->update_slider; 1161 if (delete $self->{motion}) {
1162 return 1;
1163 }
1164
1165 0
1166}
1167
1168sub invoke_mouse_motion {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($self->{motion}) {
1172 $self->{motion}->($ev, $x, $y);
1173 return 1;
1174 }
1175
1176 0
1081} 1177}
1082 1178
1083sub invoke_size_allocate { 1179sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
1085 1181
1086 $self->update_slider; 1182 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1183 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1184}
1090 1185
1091############################################################################# 1186#############################################################################
1092 1187
… …
1112 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1113 1208
1114 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1115 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1116 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1117
1118 glBegin GL_QUADS;
1119 glVertex 0 , 0;
1120 glVertex 0 , $h;
1121 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1122 glVertex $w, 0;
1123 glEnd;
1124
1125 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1126 } 1214 }
1127 1215
1128 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1129} 1217}
1130 1218
1131############################################################################# 1219#############################################################################
1132 1220
1133package CFPlus::UI::FancyFrame; 1221package CFPlus::UI::FancyFrame;
1222
1223our @ISA = CFPlus::UI::Bin::;
1224
1225use CFPlus::OpenGL;
1226
1227sub new {
1228 my ($class, %arg) = @_;
1229
1230 if ((exists $arg{label}) && !ref $arg{label}) {
1231 $arg{label} = new CFPlus::UI::Label
1232 align => 1,
1233 valign => 0,
1234 text => $arg{label},
1235 fontsize => ($arg{border} || 0.8) * 0.75;
1236 }
1237
1238 my $self = $class->SUPER::new (
1239 # label => "",
1240 fg => [0.6, 0.3, 0.1],
1241 border => 0.8,
1242 style => 'single',
1243 %arg,
1244 );
1245
1246 $self
1247}
1248
1249sub add {
1250 my ($self, @widgets) = @_;
1251
1252 $self->SUPER::add (@widgets);
1253 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1254}
1255
1256sub border {
1257 int $_[0]{border} * $::FONTSIZE
1258}
1259
1260sub size_request {
1261 my ($self) = @_;
1262
1263 ($self->{label_w}, undef) = $self->{label}->size_request
1264 if $self->{label};
1265
1266 my ($w, $h) = $self->SUPER::size_request;
1267
1268 (
1269 $w + $self->border * 2,
1270 $h + $self->border * 2,
1271 )
1272}
1273
1274sub invoke_size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 my $border = $self->border;
1278
1279 $w -= List::Util::max 0, $border * 2;
1280 $h -= List::Util::max 0, $border * 2;
1281
1282 if (my $label = $self->{label}) {
1283 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1284 $label->{h} = List::Util::min $h, $border;
1285 $label->invoke_size_allocate ($label->{w}, $label->{h});
1286 }
1287
1288 $self->child->configure ($border, $border, $w, $h);
1289
1290 1
1291}
1292
1293sub _draw {
1294 my ($self) = @_;
1295
1296 my $child = $self->{children}[0];
1297
1298 my $border = $self->border;
1299 my ($w, $h) = ($self->{w}, $self->{h});
1300
1301 $child->draw;
1302
1303 glColor @{$self->{fg}};
1304 glBegin GL_LINE_STRIP;
1305 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1306 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1307 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1309 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1310 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1311 glEnd;
1312
1313 if ($self->{label}) {
1314 glTranslate $border * 2, 0;
1315 $self->{label}->_draw;
1316 }
1317}
1318
1319#############################################################################
1320
1321package CFPlus::UI::Toplevel;
1134 1322
1135our @ISA = CFPlus::UI::Bin::; 1323our @ISA = CFPlus::UI::Bin::;
1136 1324
1137use CFPlus::OpenGL; 1325use CFPlus::OpenGL;
1138 1326
… …
1141 mipmap => 1, wrap => 1; 1329 mipmap => 1, wrap => 1;
1142 1330
1143my @border = 1331my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1332 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1333 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1334
1335my @icon =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1337 qw(x1_move.png x1_resize.png);
1146 1338
1147sub new { 1339sub new {
1148 my ($class, %arg) = @_; 1340 my ($class, %arg) = @_;
1149 1341
1150 my $self = $class->SUPER::new ( 1342 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1512
1321 my $border = $self->border; 1513 my $border = $self->border;
1322 1514
1323 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1519 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1520
1521 # move
1522 my $w2 = ($w - $border) * .5;
1523 my $h2 = ($h - $border) * .5;
1524 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1525 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1526 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1527
1528 # resize
1529 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1531 unless $self->{has_close_button};
1532 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1533 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328 1534
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1536 glColor @{ $self->{bg} };
1331 1537
1332 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
… …
1353 1559
1354############################################################################# 1560#############################################################################
1355 1561
1356package CFPlus::UI::Table; 1562package CFPlus::UI::Table;
1357 1563
1358our @ISA = CFPlus::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1359 1565
1360use List::Util qw(max sum); 1566use List::Util qw(max sum);
1361 1567
1362use CFPlus::OpenGL; 1568use CFPlus::OpenGL;
1363 1569
1364sub new { 1570sub new {
1365 my $class = shift; 1571 my $class = shift;
1366 1572
1367 $class->SUPER::new ( 1573 $class->SUPER::new (
1368 col_expand => [], 1574 col_expand => [],
1575 row_expand => [],
1369 @_, 1576 @_,
1370 ) 1577 )
1371} 1578}
1372 1579
1373sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375}
1376
1377sub add { 1580sub add {
1581 my ($self, @widgets) = @_;
1582
1583 for my $child (@widgets) {
1584 $child->{c_rowspan} ||= 1;
1585 $child->{c_colspan} ||= 1;
1586 }
1587
1588 $self->SUPER::add (@widgets);
1589}
1590
1591sub add_at {
1378 my ($self) = shift; 1592 my $self = shift;
1593
1594 my @widgets;
1379 1595
1380 while (@_) { 1596 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child;
1384 }
1385 1598
1386 $self->{force_realloc} = 1; 1599 $child->{c_row} = $row;
1387 $self->{force_size_alloc} = 1; 1600 $child->{c_col} = $col;
1388 $self->realloc;
1389}
1390 1601
1391sub remove { 1602 push @widgets, $child;
1603 }
1604
1605 $self->add (@widgets);
1606}
1607
1608sub get_wh {
1392 my ($self, $child) = @_; 1609 my ($self) = @_;
1393 1610
1394 # TODO: not yet implemented 1611 my (@w, @h);
1395}
1396
1397# TODO: move to container class maybe? send children a signal on removal?
1398sub clear {
1399 my ($self) = @_;
1400 1612
1401 my @children = $self->children; 1613 my @children = $self->children;
1402 delete $self->{children}; 1614
1615 # first pass, columns
1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1618
1619 my $sw = sum @w[$c .. $c + $cs - 1];
1620
1621 if ($w > $sw) {
1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1623 }
1403 1624 }
1404 for (@children) {
1405 delete $_->{parent};
1406 $_->hide;
1407 }
1408 1625
1409 $self->realloc; 1626 # second pass, rows
1410} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1411
1412sub get_wh {
1413 my ($self) = @_;
1414
1415 my (@w, @h);
1416
1417 for my $y (0 .. $#{$self->{children}}) {
1418 my $row = $self->{children}[$y]
1419 or next;
1420
1421 for my $x (0 .. $#$row) {
1422 my $widget = $row->[$x]
1423 or next;
1424 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1425 1629
1426 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1427 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1428 } 1634 }
1429 } 1635 }
1430 1636
1431 (\@w, \@h) 1637 (\@w, \@h)
1432} 1638}
… …
1448 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1449 1655
1450 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1452 1658
1453 # TODO: nicer code && do row_expand 1659 # now linearly scale the rows/columns to the allocated size
1454 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1457 1663
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1665
1462 CFPlus::UI::harmonize $ws; 1666 CFPlus::UI::harmonize $ws;
1667
1668 my @row_expand = @{$self->{row_expand}};
1669 @row_expand = (1) x @$ws unless @row_expand;
1670 my $row_expand = (sum @row_expand) || 1;
1671
1672 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1673
1463 CFPlus::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1464 1675
1465 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466 1678
1467 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1468 my $row = $self->{children}[$r] 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1469 or next;
1470 1681
1471 my $x = 0; 1682 $widget->configure (
1472 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473 1685 );
1474 for my $c (0 .. $#$row) { 1686 }
1475 my $col_w = $ws->[$c];
1476 1687
1477 if (my $widget = $row->[$c]) { 1688 1
1478 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1479 }
1480 1690
1481 $x += $col_w; 1691#############################################################################
1692
1693package CFPlus::UI::Fixed;
1694
1695use List::Util qw(min max);
1696
1697our @ISA = CFPlus::UI::Container::;
1698
1699sub _scale($$$) {
1700 my ($rel, $val, $max) = @_;
1701
1702 $rel ? $val * $max : $val
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707
1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1709
1710 # determine overall size by querying abs widgets
1711 for my $child ($self->visible_children) {
1712 unless ($child->{c_rel}) {
1713 my $x = $child->{c_x};
1714 my $y = $child->{c_y};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1482 } 1718 }
1719 }
1483 1720
1484 $y += $row_h; 1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 if ($child->{c_rel}) {
1727 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1728 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1729
1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1732 }
1733 }
1734
1735 my $W = $x2 - $x1;
1736 my $H = $y2 - $y1;
1737
1738 ($W, $H)
1739}
1740
1741sub invoke_size_allocate {
1742 my ($self, $W, $H) = @_;
1743
1744 for my $child ($self->visible_children) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x += $child->{c_halign} * $child->{req_w};
1749 $y += $child->{c_valign} * $child->{req_h};
1750
1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1485 } 1752 }
1486 1753
1487 1 1754 1
1488} 1755}
1489 1756
1490sub find_widget {
1491 my ($self, $x, $y) = @_;
1492
1493 $x -= $self->{x};
1494 $y -= $self->{y};
1495
1496 my $res;
1497
1498 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1499 $res = $_->find_widget ($x, $y)
1500 and return $res;
1501 }
1502
1503 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1504}
1505
1506sub _draw {
1507 my ($self) = @_;
1508
1509 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_;
1511 }
1512}
1513
1514############################################################################# 1757#############################################################################
1515 1758
1516package CFPlus::UI::Box; 1759package CFPlus::UI::Box;
1517 1760
1518our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1519 1762
1520sub size_request { 1763sub size_request {
1521 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1522 1767
1523 $self->{vertical} 1768 $self->{vertical}
1524 ? ( 1769 ? (
1525 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1526 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1527 ) 1772 )
1528 : ( 1773 : (
1529 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1530 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1531 ) 1776 )
1532} 1777}
1533 1778
1534sub invoke_size_allocate { 1779sub invoke_size_allocate {
1535 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1618 #active_bg => none 1863 #active_bg => none
1619 #font => default_font 1864 #font => default_font
1620 #text => initial text 1865 #text => initial text
1621 #markup => initial narkup 1866 #markup => initial narkup
1622 #max_w => maximum pixel width 1867 #max_w => maximum pixel width
1868 #style => 0, # render flags
1623 ellipsise => 3, # end 1869 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1870 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1871 fontsize => 1,
1626 align => -1, 1872 align => -1,
1627 valign => -1, 1873 valign => -1,
… …
1658 1904
1659 delete $self->{ox}; 1905 delete $self->{ox};
1660 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1661} 1907}
1662 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1663sub set_text { 1915sub set_text {
1664 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1665 1917
1666 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1667 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
1773 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1774 2026
1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1777 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1778 }; 2032 };
1779 2033
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
1782 2036# CFPlus::OpenGL::glNewList $self->{list};
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2038# CFPlus::OpenGL::glEndList;
2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
2042
2043 $self->{layout}->draw;
1784} 2044}
2045
2046#sub destroy {
2047# my ($self) = @_;
2048#
2049# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2050#
2051# $self->SUPER::destroy;
2052#}
1785 2053
1786############################################################################# 2054#############################################################################
1787 2055
1788package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1789 2057
… …
1795 my $class = shift; 2063 my $class = shift;
1796 2064
1797 $class->SUPER::new ( 2065 $class->SUPER::new (
1798 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1799 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1800 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1801 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1802 can_hover => 1, 2072 can_hover => 1,
1803 can_focus => 1, 2073 can_focus => 1,
1804 valign => 0, 2074 valign => 0,
1805 can_events => 1, 2075 can_events => 1,
2076 ellipsise => 0,
1806 #text => ... 2077 #text => ...
1807 #hidden => "*", 2078 #hidden => "*",
1808 @_ 2079 @_
1809 ) 2080 )
1810} 2081}
… …
1854 my $mod = $ev->{mod}; 2125 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2126 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2127 my $uni = $ev->{unicode};
1857 2128
1858 my $text = $self->get_text; 2129 my $text = $self->get_text;
2130
2131 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2132
1860 if ($uni == 8) { 2133 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2134 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2135 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2136 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2137 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2138 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2139 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2140 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2141 } elsif ($sym == CFPlus::SDLK_HOME) {
2142 # what a hack
2143 $self->{cursor} =
2144 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2145 ? length $1
2146 : 0;
2147 } elsif ($sym == CFPlus::SDLK_END) {
2148 # uh, again
2149 $self->{cursor} =
2150 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2151 ? $self->{cursor} + length $1
2152 : length $self->{text};
2153 } elsif ($uni == 21) { # ctrl-u
2154 $text = "";
1869 $self->{cursor} = 0; 2155 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2156 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2157 $self->emit ('escape');
1874 } elsif ($uni) { 2158 } elsif ($uni == 0x0d) {
2159 substr $text, $self->{cursor}++, 0, "\012";
2160 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2161 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2162 } else {
1877 return 0; 2163 return 0;
1878 } 2164 }
1879 2165
1880 $self->_set_text ($text); 2166 $self->_set_text ($text);
1881 2167
1882 $self->realloc; 2168 $self->realloc;
2169 $self->update;
1883 2170
1884 1 2171 1
1885} 2172}
1886 2173
1887sub invoke_focus_in { 2174sub invoke_focus_in {
… …
1929 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
1930 } 2217 }
1931 2218
1932 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
1933 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1934 glBegin GL_QUADS;
1935 glVertex 0 , 0;
1936 glVertex 0 , $self->{h};
1937 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
1938 glVertex $self->{w}, 0;
1939 glEnd;
1940 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
1941 2223
1942 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
1943 2225
1944 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
1946 2228
1947 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
1948 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
1949 utf8::encode $text; 2231 utf8::encode $text;
1950 2232
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1952 } 2234 }
1953 2235
1954 glColor @{$self->{fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
1955 glBegin GL_LINES; 2237 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glTranslate .375, .375;
2250 glBegin GL_LINE_STRIP;
2251 glVertex 0, $self->{h} * .5;
2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2255 glEnd;
1959 } 2256 }
1960} 2257}
2258
2259#############################################################################
1961 2260
1962package CFPlus::UI::Entry; 2261package CFPlus::UI::Entry;
1963 2262
1964our @ISA = CFPlus::UI::EntryBase::; 2263our @ISA = CFPlus::UI::EntryBase::;
1965 2264
… …
1968sub invoke_key_down { 2267sub invoke_key_down {
1969 my ($self, $ev) = @_; 2268 my ($self, $ev) = @_;
1970 2269
1971 my $sym = $ev->{sym}; 2270 my $sym = $ev->{sym};
1972 2271
1973 if ($sym == 13) { 2272 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2273 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2274 my $txt = $self->get_text;
1976 2275
1977 $self->{history_pointer} = -1; 2276 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2277 $self->{history_saveback} = '';
… …
2008 1 2307 1
2009} 2308}
2010 2309
2011############################################################################# 2310#############################################################################
2012 2311
2312package CFPlus::UI::TextEdit;
2313
2314our @ISA = CFPlus::UI::EntryBase::;
2315
2316use CFPlus::OpenGL;
2317
2318sub move_cursor_ver {
2319 my ($self, $dy) = @_;
2320
2321 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2322
2323 $y += $dy;
2324
2325 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2326 $self->{cursor} = $index;
2327 delete $self->{cur_h};
2328 $self->update;
2329 return;
2330 }
2331}
2332
2333sub invoke_key_down {
2334 my ($self, $ev) = @_;
2335
2336 my $sym = $ev->{sym};
2337
2338 if ($sym == CFPlus::SDLK_UP) {
2339 $self->move_cursor_ver (-1);
2340 } elsif ($sym == CFPlus::SDLK_DOWN) {
2341 $self->move_cursor_ver (+1);
2342 } else {
2343 return $self->SUPER::invoke_key_down ($ev)
2344 }
2345
2346 1
2347}
2348
2349#############################################################################
2350
2013package CFPlus::UI::Button; 2351package CFPlus::UI::ButtonBin;
2014 2352
2015our @ISA = CFPlus::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
2016 2354
2017use CFPlus::OpenGL; 2355use CFPlus::OpenGL;
2018 2356
2019my @tex = 2357my @tex =
2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
2022 2360
2023sub new { 2361sub new {
2024 my $class = shift; 2362 my $class = shift;
2025 2363
2026 $class->SUPER::new ( 2364 $class->SUPER::new (
2027 padding_x => 4,
2028 padding_y => 4,
2029 fg => [1, 1, 1],
2030 active_fg => [0, 0, 1],
2031 can_hover => 1, 2365 can_hover => 1,
2032 align => 0, 2366 align => 0,
2033 valign => 0, 2367 valign => 0,
2034 can_events => 1, 2368 can_events => 1,
2035 @_ 2369 @_
… …
2047} 2381}
2048 2382
2049sub _draw { 2383sub _draw {
2050 my ($self) = @_; 2384 my ($self) = @_;
2051 2385
2052 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2053
2054 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
2057 2389
2390 my $tex = $tex[$GRAB == $self];
2058 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2392
2393 glDisable GL_TEXTURE_2D;
2394
2395 $self->SUPER::_draw;
2396}
2397
2398#############################################################################
2399
2400package CFPlus::UI::Button;
2401
2402our @ISA = CFPlus::UI::Label::;
2403
2404use CFPlus::OpenGL;
2405
2406my @tex =
2407 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2408 qw(b1_button_inactive.png b1_button_active.png);
2409
2410sub new {
2411 my $class = shift;
2412
2413 $class->SUPER::new (
2414 padding_x => 4,
2415 padding_y => 4,
2416 fg => [1.0, 1.0, 1.0],
2417 active_fg => [0.8, 0.8, 0.8],
2418 can_hover => 1,
2419 align => 0,
2420 valign => 0,
2421 can_events => 1,
2422 @_
2423 )
2424}
2425
2426sub invoke_button_up {
2427 my ($self, $ev, $x, $y) = @_;
2428
2429 $self->emit ("activate")
2430 if $x >= 0 && $x < $self->{w}
2431 && $y >= 0 && $y < $self->{h};
2432
2433 1
2434}
2435
2436sub _draw {
2437 my ($self) = @_;
2438
2439 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2440
2441 glEnable GL_TEXTURE_2D;
2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2443 glColor 0, 0, 0, 1;
2444
2445 my $tex = $tex[$GRAB == $self];
2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059 2447
2060 glDisable GL_TEXTURE_2D; 2448 glDisable GL_TEXTURE_2D;
2061 2449
2062 $self->SUPER::_draw; 2450 $self->SUPER::_draw;
2063} 2451}
… …
2150sub new { 2538sub new {
2151 my $class = shift; 2539 my $class = shift;
2152 2540
2153 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2154 can_events => 0, 2542 can_events => 0,
2543 scale => 1,
2155 @_, 2544 @_,
2156 ); 2545 );
2157 2546
2158 $self->{path} || $self->{tex} 2547 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
2160 2549
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2551 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2552
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
2165 2554
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2556
2168 $self 2557 $self
2169} 2558}
… …
2184} 2573}
2185 2574
2186sub size_request { 2575sub size_request {
2187 my ($self) = @_; 2576 my ($self) = @_;
2188 2577
2189 ($self->{tex}{w}, $self->{tex}{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2190} 2579}
2191 2580
2192sub _draw { 2581sub _draw {
2193 my ($self) = @_; 2582 my ($self) = @_;
2194 2583
… …
2204 } 2593 }
2205 2594
2206 glEnable GL_TEXTURE_2D; 2595 glEnable GL_TEXTURE_2D;
2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208 2597
2209 $tex->draw_quad (0, 0, $w, $h); 2598 $tex->draw_quad_alpha (0, 0, $w, $h);
2210 2599
2211 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2212} 2601}
2213 2602
2214############################################################################# 2603#############################################################################
… …
2233 align => 0, 2622 align => 0,
2234 valign => 0, 2623 valign => 0,
2235 can_events => 1, 2624 can_events => 1,
2236 @_ 2625 @_
2237 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2238} 2633}
2239 2634
2240sub invoke_button_up { 2635sub invoke_button_up {
2241 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2242 2637
… …
2382 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2383} 2778}
2384 2779
2385############################################################################# 2780#############################################################################
2386 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901 $self->{lvl} = $lvl;
2902 $self->{exp} = $exp;
2903
2904 my $v = -1;
2905
2906 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2907 my $l0 = $table->[$lvl - 1];
2908 my $l1 = $table->[$lvl];
2909
2910 $self->{nxt} = $l1;
2911
2912 $v = ($exp - $l0) / ($l1 - $l0);
2913 }
2914
2915 $self->SUPER::set_value ($v);
2916}
2917
2918#############################################################################
2919
2387package CFPlus::UI::Gauge; 2920package CFPlus::UI::Gauge;
2388 2921
2389our @ISA = CFPlus::UI::VBox::; 2922our @ISA = CFPlus::UI::VBox::;
2390 2923
2391sub new { 2924sub new {
… …
2516 3049
2517 $self->SUPER::invoke_button_down ($ev, $x, $y); 3050 $self->SUPER::invoke_button_down ($ev, $x, $y);
2518 3051
2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3052 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2520 3053
2521 $self->invoke_mouse_motion ($ev, $x, $y) 3054 $self->invoke_mouse_motion ($ev, $x, $y);
3055
3056 1
2522} 3057}
2523 3058
2524sub invoke_mouse_motion { 3059sub invoke_mouse_motion {
2525 my ($self, $ev, $x, $y) = @_; 3060 my ($self, $ev, $x, $y) = @_;
2526 3061
… …
2542sub invoke_mouse_wheel { 3077sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 3078 my ($self, $ev) = @_;
2544 3079
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3080 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 3081
3082 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3083
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3084 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 3085
2549 ! ! $delta 3086 1
2550} 3087}
2551 3088
2552sub update { 3089sub update {
2553 my ($self) = @_; 3090 my ($self) = @_;
2554 3091
… …
2662 #font => default_font 3199 #font => default_font
2663 @_, 3200 @_,
2664 3201
2665 layout => (new CFPlus::Layout), 3202 layout => (new CFPlus::Layout),
2666 par => [], 3203 par => [],
3204 max_par => 0,
2667 height => 0, 3205 height => 0,
2668 children => [ 3206 children => [
2669 (new CFPlus::UI::Empty expand => 1), 3207 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 3208 (new CFPlus::UI::Slider vertical => 1),
2671 ], 3209 ],
… …
2684} 3222}
2685 3223
2686sub size_request { 3224sub size_request {
2687 my ($self) = @_; 3225 my ($self) = @_;
2688 3226
2689 my ($empty, $slider) = @{ $self->{children} }; 3227 my ($empty, $slider) = $self->visible_children;
2690 3228
2691 local $self->{children} = [$empty, $slider]; 3229 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request 3230 $self->SUPER::size_request
2693} 3231}
2694 3232
… …
2750sub set_offset { 3288sub set_offset {
2751 my ($self, $offset) = @_; 3289 my ($self, $offset) = @_;
2752 3290
2753 # todo: base offset on lines or so, not on pixels 3291 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3292 $self->{children}[1]->set_value ($offset);
3293}
3294
3295sub current_paragraph {
3296 my ($self) = @_;
3297
3298 $self->{top_paragraph} - 1
3299}
3300
3301sub scroll_to {
3302 my ($self, $para) = @_;
3303
3304 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3305
3306 $self->{scroll_to} = $para;
3307 $self->update;
2755} 3308}
2756 3309
2757sub clear { 3310sub clear {
2758 my ($self) = @_; 3311 my ($self) = @_;
2759 3312
… …
2781 3334
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3335 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3336 push @{$self->{par}}, $para;
2784 } 3337 }
2785 3338
3339 if (my $max = $self->{max_par}) {
3340 shift @{$self->{par}} while @{$self->{par}} > $max;
3341 }
3342
2786 $self->{need_reflow}++; 3343 $self->{need_reflow}++;
2787 $self->update; 3344 $self->update;
2788} 3345}
2789 3346
2790sub scroll_to_bottom { 3347sub scroll_to_bottom {
2791 my ($self) = @_; 3348 my ($self) = @_;
2792 3349
2793 $self->{scroll_to_bottom} = 1; 3350 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3351 $self->update;
2795} 3352}
2796 3353
3354sub force_uptodate {
3355 my ($self) = @_;
3356
3357 if (delete $self->{need_reflow}) {
3358 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3359
3360 my $height = 0;
3361
3362 for my $para (@{$self->{par}}) {
3363 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3364 my $layout = $self->get_layout ($para);
3365 my ($w, $h) = $layout->size;
3366
3367 $para->{w} = $w + $para->{indent};
3368 $para->{h} = $h;
3369 $para->{wrapped} = $layout->has_wrapped;
3370 }
3371
3372 $para->{y} = $height;
3373 $height += $para->{h};
3374 }
3375
3376 $self->{height} = $height;
3377 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3378
3379 delete $self->{texture};
3380 }
3381
3382 if (my $paridx = delete $self->{scroll_to}) {
3383 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3384 }
3385}
3386
2797sub update { 3387sub update {
2798 my ($self) = @_; 3388 my ($self) = @_;
2799 3389
2800 $self->SUPER::update; 3390 $self->SUPER::update;
2801 3391
2802 return unless $self->{h} > 0; 3392 return unless $self->{h} > 0;
2803 3393
2804 delete $self->{texture}; 3394 delete $self->{texture};
2805 3395
2806 $ROOT->on_post_alloc ($self => sub { 3396 $ROOT->on_post_alloc ($self => sub {
3397 $self->force_uptodate;
3398
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 3400
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3401 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3402 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3403 glClear GL_COLOR_BUFFER_BIT;
2839 3404
3405 package CFPlus::UI::Base;
3406 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3407 (0, 0, $self->{w}, $self->{h});
3408
3409 my $top = int $self->{children}[1]{range}[0];
3410
3411 my $paridx = 0;
3412 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3413 my $top = int $self->{children}[1]{range}[0];
2841 3414
2842 my $y0 = $top; 3415 my $y0 = $top;
2843 my $y1 = $top + $H; 3416 my $y1 = $top + $H;
2844 3417
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3418 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3419 my $h = $para->{h};
3420 my $y = $para->{y};
2849 3421
2850 if ($y0 < $y + $h && $y < $y1) { 3422 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3423 my $layout = $self->get_layout ($para);
2853 3424
2854 $layout->render ($para->{indent}, $y - $y0); 3425 $layout->render ($para->{indent}, $y - $y0);
3426 $layout->draw;
2855 3427
2856 if (my @w = @{ $para->{widget} }) { 3428 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes; 3429 my @s = $layout->get_shapes;
2858 3430
2859 for (@w) { 3431 for (@w) {
… …
2865 $_->draw; 3437 $_->draw;
2866 } 3438 }
2867 } 3439 }
2868 } 3440 }
2869 3441
2870 $y += $h; 3442 $paridx++;
3443 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3444 }
3445
3446 $self->{top_paragraph} = $top_paragraph;
2872 }; 3447 };
2873 }); 3448 });
2874} 3449}
2875 3450
2876sub reconfigure { 3451sub reconfigure {
… …
2978} 3553}
2979 3554
2980sub set_tooltip_from { 3555sub set_tooltip_from {
2981 my ($self, $widget) = @_; 3556 my ($self, $widget) = @_;
2982 3557
2983 $widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2985
2986 my $tooltip = $widget->{tooltip}; 3558 my $tip = $widget->{tooltip};
3559 $tip = $tip->($widget) if "CODE" eq ref $tip;
3560
3561 $tip = CFPlus::Pod::section_label tooltip => $1
3562 if $tip =~ /^#(.*)$/;
2987 3563
2988 if ($ENV{CFPLUS_DEBUG} & 2) { 3564 if ($ENV{CFPLUS_DEBUG} & 2) {
2989 $tooltip .= "\n\n" . (ref $widget) . "\n" 3565 $tip .= "\n\n" . (ref $widget) . "\n"
2990 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3566 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2991 . "req $widget->{req_w} $widget->{req_h}\n" 3567 . "req $widget->{req_w} $widget->{req_h}\n"
2992 . "visible $widget->{visible}"; 3568 . "visible $widget->{visible}";
2993 } 3569 }
2994 3570
2995 $tooltip =~ s/^\n+//; 3571 $tip =~ s/^\n+//;
2996 $tooltip =~ s/\n+$//; 3572 $tip =~ s/\n+$//;
2997 3573
2998 $self->add (new CFPlus::UI::Label 3574 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3575 markup => $tip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3576 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3577 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3578 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3579 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3580 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3581 );
3006} 3582}
3007 3583
… …
3047 glTranslate 0.375, 0.375; 3623 glTranslate 0.375, 0.375;
3048 3624
3049 my ($w, $h) = @$self{qw(w h)}; 3625 my ($w, $h) = @$self{qw(w h)};
3050 3626
3051 glColor 1, 0.8, 0.4; 3627 glColor 1, 0.8, 0.4;
3052 glBegin GL_QUADS; 3628 glRect 0, 0, $w, $h;
3053 glVertex 0 , 0;
3054 glVertex 0 , $h;
3055 glVertex $w, $h;
3056 glVertex $w, 0;
3057 glEnd;
3058 3629
3059 glColor 0, 0, 0; 3630 glColor 0, 0, 0;
3060 glBegin GL_LINE_LOOP; 3631 glRect_lineloop 0, 0, $w, $h;
3061 glVertex 0 , 0;
3062 glVertex 0 , $h;
3063 glVertex $w, $h;
3064 glVertex $w, 0;
3065 glEnd;
3066 3632
3067 glTranslate 2 - 0.375, 2 - 0.375; 3633 glTranslate 2 - 0.375, 2 - 0.375;
3068 3634
3069 $self->SUPER::_draw; 3635 $self->SUPER::_draw;
3070} 3636}
… …
3079 3645
3080sub new { 3646sub new {
3081 my $class = shift; 3647 my $class = shift;
3082 3648
3083 my $self = $class->SUPER::new ( 3649 my $self = $class->SUPER::new (
3650 size_w => 32,
3651 size_h => 8,
3084 aspect => 1, 3652 aspect => 1,
3085 can_events => 0, 3653 can_events => 0,
3086 @_, 3654 @_,
3087 ); 3655 );
3088 3656
3089 if ($self->{anim} && $self->{animspeed}) { 3657 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3658 CFPlus::weaken (my $widget = $self);
3091 3659
3660 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3661 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3092 $self->{timer} = Event->timer ( 3662 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3663 parked => 1,
3095 interval => $self->{animspeed},
3096 cb => sub { 3664 cb => sub {
3665 return unless $::CONN;
3666
3667 my $w = $widget
3668 or return;
3669
3097 ++$widget->{frame}; 3670 ++$w->{frame};
3671 $w->update_face;
3672
3673 # somehow, $widget can go away
3098 $widget->update; 3674 $w->update;
3675 $w->update_timer;
3099 }, 3676 },
3100 ); 3677 );
3678
3679 $self->update_face;
3680 $self->update_timer;
3101 } 3681 }
3102 3682
3103 $self 3683 $self
3104} 3684}
3105 3685
3686sub update_timer {
3687 my ($self) = @_;
3688
3689 return unless $self->{timer};
3690
3691 if ($self->{visible}) {
3692 $self->{timer}->at (
3693 $self->{anim_start}
3694 + $self->{animspeed}
3695 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3696 );
3697 $self->{timer}->start;
3698 } else {
3699 $self->{timer}->stop;
3700 }
3701}
3702
3703sub update_face {
3704 my ($self) = @_;
3705
3706 if ($::CONN) {
3707 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3708 if ($anim && @$anim) {
3709 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3710 delete $self->{face_change_cb};
3711
3712 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3713 unless ($tex->{name} || $tex->{loading}) {
3714 $tex->upload (sub { $self->reconfigure });
3715 }
3716 }
3717 }
3718 }
3719 }
3720}
3721
3106sub size_request { 3722sub size_request {
3107 (32, 8) 3723 my ($self) = @_;
3724
3725 if ($::CONN) {
3726 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3728 if ($tex->{name}) {
3729 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3730 } elsif (!$tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734
3735 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3736 }
3737 }
3738
3739 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3740}
3109 3741
3110sub update { 3742sub update {
3111 my ($self) = @_; 3743 my ($self) = @_;
3112 3744
3113 return unless $self->{visible}; 3745 return unless $self->{visible};
3114 3746
3115 $self->SUPER::update; 3747 $self->SUPER::update;
3116} 3748}
3117 3749
3750sub invoke_visibility_change {
3751 my ($self) = @_;
3752
3753 $self->update_timer;
3754
3755 0
3756}
3757
3118sub _draw { 3758sub _draw {
3119 my ($self) = @_; 3759 my ($self) = @_;
3120 3760
3121 return unless $::CONN;
3122
3123 $self->SUPER::_draw; 3761 $self->SUPER::_draw;
3124 3762
3125 my $face; 3763 if (my $tex = $self->{tex}) {
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}];
3129
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3135
3136 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3764 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3766 glColor 0, 0, 0, 1;
3140 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3767 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3141 glDisable GL_TEXTURE_2D; 3768 glDisable GL_TEXTURE_2D;
… …
3143} 3770}
3144 3771
3145sub destroy { 3772sub destroy {
3146 my ($self) = @_; 3773 my ($self) = @_;
3147 3774
3148 $self->{timer}->cancel 3775 (delete $self->{timer})->cancel
3149 if $self->{timer}; 3776 if $self->{timer};
3150 3777
3151 $self->SUPER::destroy; 3778 $self->SUPER::destroy;
3152} 3779}
3153 3780
… …
3155 3782
3156package CFPlus::UI::Buttonbar; 3783package CFPlus::UI::Buttonbar;
3157 3784
3158our @ISA = CFPlus::UI::HBox::; 3785our @ISA = CFPlus::UI::HBox::;
3159 3786
3160# TODO: should actualyl wrap buttons and other goodies. 3787# TODO: should actually wrap buttons and other goodies.
3161 3788
3162############################################################################# 3789#############################################################################
3163 3790
3164package CFPlus::UI::Menu; 3791package CFPlus::UI::Menu;
3165 3792
3166our @ISA = CFPlus::UI::FancyFrame::; 3793our @ISA = CFPlus::UI::Toplevel::;
3167 3794
3168use CFPlus::OpenGL; 3795use CFPlus::OpenGL;
3169 3796
3170sub new { 3797sub new {
3171 my $class = shift; 3798 my $class = shift;
… …
3193 children => [ 3820 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1), 3821 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1), 3822 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ], 3823 ],
3197 ; 3824 ;
3198 3825
3199 } else { 3826 } else {
3200 $widget = new CFPlus::UI::Label 3827 $widget = new CFPlus::UI::Label
3201 can_hover => 1, 3828 can_hover => 1,
3202 can_events => 1, 3829 can_events => 1,
3203 markup => $widget, 3830 markup => $widget,
… …
3328 3955
3329############################################################################# 3956#############################################################################
3330 3957
3331package CFPlus::UI::Notebook; 3958package CFPlus::UI::Notebook;
3332 3959
3960use CFPlus::OpenGL;
3961
3333our @ISA = CFPlus::UI::VBox::; 3962our @ISA = CFPlus::UI::VBox::;
3334 3963
3335sub new { 3964sub new {
3336 my $class = shift; 3965 my $class = shift;
3337 3966
3338 my $self = $class->SUPER::new ( 3967 my $self = $class->SUPER::new (
3339 buttonbar => (new CFPlus::UI::Buttonbar), 3968 buttonbar => (new CFPlus::UI::Buttonbar),
3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3969 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3970 active_outline => [1, 1, 0],
3341 # filter => # will be put between multiplexer and $self 3971 # filter => # will be put between multiplexer and $self
3342 @_, 3972 @_,
3343 ); 3973 );
3344 3974
3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3975 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3346 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3976 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3347 3977
3978 {
3979 Scalar::Util::weaken (my $wself = $self);
3980
3981 $self->{multiplexer}->connect (c_add => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 Scalar::Util::weaken $child;
3986 $child->{c_tab_} ||= do {
3987 my $tab =
3988 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3989 ? $child->{c_tab}
3990 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3991
3992 $tab->connect (activate => sub {
3993 $wself->set_current_page ($child);
3994 });
3995
3996 $tab
3997 };
3998
3999 $self->{buttonbar}->add ($child->{c_tab_});
4000 }
4001 });
4002
4003 $self->{multiplexer}->connect (c_remove => sub {
4004 my ($mplex, $widgets) = @_;
4005
4006 for my $child (@$widgets) {
4007 $wself->{buttonbar}->remove ($child->{c_tab_});
4008 }
4009 });
4010 }
4011
3348 $self 4012 $self
3349} 4013}
3350 4014
3351sub add { 4015sub add {
4016 my ($self, @widgets) = @_;
4017
4018 $self->{multiplexer}->add (@widgets)
4019}
4020
4021sub remove {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->remove (@widgets)
4025}
4026
4027sub pages {
4028 my ($self) = @_;
4029 $self->{multiplexer}->children
4030}
4031
4032sub add_tab {
3352 my ($self, $title, $widget, $tooltip) = @_; 4033 my ($self, $title, $widget, $tooltip) = @_;
3353 4034
3354 Scalar::Util::weaken $self; 4035 $title = [$title, $tooltip] unless ref $title;
4036 $widget->{c_tab} = $title;
3355 4037
3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title,
3358 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) },
3360 );
3361
3362 $self->{multiplexer}->add ($widget); 4038 $self->add ($widget);
3363} 4039}
3364 4040
3365sub get_current_page { 4041sub get_current_page {
3366 my ($self) = @_; 4042 my ($self) = @_;
3367 4043
… …
3371sub set_current_page { 4047sub set_current_page {
3372 my ($self, $page) = @_; 4048 my ($self, $page) = @_;
3373 4049
3374 $self->{multiplexer}->set_current_page ($page); 4050 $self->{multiplexer}->set_current_page ($page);
3375 $self->emit (page_changed => $self->{multiplexer}{current}); 4051 $self->emit (page_changed => $self->{multiplexer}{current});
4052}
4053
4054sub _draw {
4055 my ($self) = @_;
4056
4057 $self->SUPER::_draw ();
4058
4059 if (my $cur = $self->{multiplexer}{current}) {
4060 if ($cur = $cur->{c_tab_}) {
4061 glTranslate $cur->{x}, $cur->{y};
4062 glLineWidth 3;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4065 glLineWidth 1;
4066 }
4067 }
3376} 4068}
3377 4069
3378############################################################################# 4070#############################################################################
3379 4071
3380package CFPlus::UI::Selector; 4072package CFPlus::UI::Selector;
… …
3443 my $self = $class->SUPER::new ( 4135 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 4136 fontsize => 0.8,
3445 @_, 4137 @_,
3446 ); 4138 );
3447 4139
3448 Scalar::Util::weaken (my $this = $self); 4140 CFPlus::weaken (my $this = $self);
3449 4141
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4142 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 4143
3452 $self 4144 $self
3453} 4145}
… …
3576 $self->SUPER::destroy; 4268 $self->SUPER::destroy;
3577} 4269}
3578 4270
3579############################################################################# 4271#############################################################################
3580 4272
3581package CFPlus::UI::Inventory;
3582
3583our @ISA = CFPlus::UI::Table::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 col_expand => [0, 1, 0],
3590 items => [],
3591 @_,
3592 );
3593
3594 $self->set_sort_order (undef);
3595
3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3632}
3633
3634sub set_items {
3635 my ($self, $items) = @_;
3636
3637 $self->{items} = [$items ? values %$items : ()];
3638 $self->update_items;
3639}
3640
3641#############################################################################
3642
3643package CFPlus::UI::SpellList;
3644
3645our @ISA = CFPlus::UI::Table::;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3656
3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3742sub add_spell {
3743 my ($self, $spell) = @_;
3744
3745 $self->{spell}->{$spell->{name}} = $spell;
3746 $self->rebuild_spell_list;
3747}
3748
3749sub remove_spell {
3750 my ($self, $spell) = @_;
3751
3752 delete $self->{spell}->{$spell->{name}};
3753 $self->rebuild_spell_list;
3754}
3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3763#############################################################################
3764
3765package CFPlus::UI::Root; 4273package CFPlus::UI::Root;
3766 4274
3767our @ISA = CFPlus::UI::Container::; 4275our @ISA = CFPlus::UI::Container::;
3768 4276
3769use List::Util qw(min max); 4277use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 4284 my $self = $class->SUPER::new (
3777 visible => 1, 4285 visible => 1,
3778 @_, 4286 @_,
3779 ); 4287 );
3780 4288
3781 Scalar::Util::weaken ($self->{root} = $self); 4289 CFPlus::weaken ($self->{root} = $self);
3782 4290
3783 $self 4291 $self
3784} 4292}
3785 4293
3786sub size_request { 4294sub size_request {
… …
3834} 4342}
3835 4343
3836sub update { 4344sub update {
3837 my ($self) = @_; 4345 my ($self) = @_;
3838 4346
3839 $::WANT_REFRESH++; 4347 $::WANT_REFRESH->start;
3840} 4348}
3841 4349
3842sub add { 4350sub add {
3843 my ($self, @children) = @_; 4351 my ($self, @children) = @_;
3844 4352
… …
3881 while ($self->{refresh_hook}) { 4389 while ($self->{refresh_hook}) {
3882 $_->() 4390 $_->()
3883 for values %{delete $self->{refresh_hook}}; 4391 for values %{delete $self->{refresh_hook}};
3884 } 4392 }
3885 4393
3886 if ($self->{realloc}) { 4394 while ($self->{realloc}) {
3887 my %queue; 4395 my %queue;
3888 my @queue; 4396 my @queue;
3889 my $widget; 4397 my $widget;
3890 4398
3891 outer: 4399 outer:
… …
3938 } 4446 }
3939 } 4447 }
3940 4448
3941 delete $self->{realloc}{$widget+0}; 4449 delete $self->{realloc}{$widget+0};
3942 } 4450 }
3943 }
3944 4451
3945 while (my $size_alloc = delete $self->{size_alloc}) { 4452 while (my $size_alloc = delete $self->{size_alloc}) {
3946 my @queue = sort { $b->{visible} <=> $a->{visible} } 4453 my @queue = sort { $a->{visible} <=> $b->{visible} }
3947 values %$size_alloc; 4454 values %$size_alloc;
3948 4455
3949 while () { 4456 while () {
3950 my $widget = pop @queue || last; 4457 my $widget = pop @queue || last;
3951 4458
3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4459 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3953 4460
3954 $w = 0 if $w < 0;
3955 $h = 0 if $h < 0;
3956
3957 $w = max $widget->{min_w}, $w; 4461 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h; 4462 $h = max $widget->{min_h}, $h;
3959 4463
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4464# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4465# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962 4466
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4467 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4468 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965 4469
3966 $w = int $w + 0.5; 4470 $w = int $w + 0.5;
3967 $h = int $h + 0.5; 4471 $h = int $h + 0.5;
3968 4472
3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4473 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3970 $widget->{old_w} = $widget->{w}; 4474 $widget->{old_w} = $widget->{w};
3971 $widget->{old_h} = $widget->{h}; 4475 $widget->{old_h} = $widget->{h};
3972 4476
3973 $widget->{w} = $w; 4477 $widget->{w} = $w;
3974 $widget->{h} = $h; 4478 $widget->{h} = $h;
3975 4479
3976 $widget->emit (size_allocate => $w, $h); 4480 $widget->emit (size_allocate => $w, $h);
4481 }
3977 } 4482 }
3978 } 4483 }
3979 } 4484 }
3980 4485
3981 while ($self->{post_alloc_hook}) { 4486 while ($self->{post_alloc_hook}) {
3982 $_->() 4487 $_->()
3983 for values %{delete $self->{post_alloc_hook}}; 4488 for values %{delete $self->{post_alloc_hook}};
3984 } 4489 }
3985
3986 4490
3987 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4491 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4492 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989 glClear GL_COLOR_BUFFER_BIT; 4493 glClear GL_COLOR_BUFFER_BIT;
3990 4494
… …
3995 glLoadIdentity; 4499 glLoadIdentity;
3996 4500
3997 { 4501 {
3998 package CFPlus::UI::Base; 4502 package CFPlus::UI::Base;
3999 4503
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4504 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4505 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4506
4004 $self->_draw; 4507 $self->_draw;
4508 }
4005} 4509}
4006 4510
4007############################################################################# 4511#############################################################################
4008 4512
4009package CFPlus::UI; 4513package CFPlus::UI;

Diff Legend

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