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.343 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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