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.345 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 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) = @_;
… …
924} 893}
925 894
926############################################################################# 895#############################################################################
927 896
928package CFPlus::UI::ViewPort; 897package CFPlus::UI::ViewPort;
898
899use List::Util qw(min max);
929 900
930our @ISA = CFPlus::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
931 902
932sub new { 903sub new {
933 my $class = shift; 904 my $class = shift;
… …
942sub size_request { 913sub size_request {
943 my ($self) = @_; 914 my ($self) = @_;
944 915
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 917
947 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
949 920
950 ($w, $h) 921 ($w, $h)
951} 922}
952 923
953sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
965} 936}
966 937
967sub set_offset { 938sub set_offset {
968 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
969 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}) {
970 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
972 947
948 $self->emit (changed => $x, $y);
973 $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 }
974} 969}
975 970
976# 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
977sub coord2local { 972sub coord2local {
978 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
994 989
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 992 ) {
998 $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})
999 } else { 994 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 996 }
1002} 997}
1003 998
… …
1014 1009
1015############################################################################# 1010#############################################################################
1016 1011
1017package CFPlus::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
1018 1013
1019our @ISA = CFPlus::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
1020 1015
1021sub new { 1016sub new {
1022 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
1023 1018
1024 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1025 1020
1026 my $self; 1021 my $self;
1027 1022
1028 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,
1029 vertical => 1, 1037 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1039 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1042 },
1034 ; 1043 ;
1035 1044
1036 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1038 can_events => 1, 1048 can_events => 1,
1039 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1040 %arg, 1053 %arg,
1041 ); 1054 );
1042 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
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1044 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1045 1080
1046 $self 1081 $self
1047} 1082}
1048
1049#TODO# update range on size_allocate depending on child
1050 1083
1051sub add { 1084sub add {
1052 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1053 1086
1054 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1055} 1088}
1056 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
1057sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1059 1144
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $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};
1063 1147
1064 1 1148 1
1065} 1149}
1066 1150
1067sub update_slider { 1151sub invoke_button_down {
1068 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1069 1153
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1071} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1072 1158
1073sub update { 1159 0
1074 my ($self) = @_; 1160}
1075 1161
1076 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1077 1164
1078 $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
1079} 1181}
1080 1182
1081sub invoke_size_allocate { 1183sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1083 1185
1084 $self->update_slider; 1186 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1188}
1088 1189
1089############################################################################# 1190#############################################################################
1090 1191
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1111 1212
1112 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1124 } 1218 }
1125 1219
1126 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1127} 1221}
1128 1222
1129############################################################################# 1223#############################################################################
1130 1224
1131package 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;
1132 1326
1133our @ISA = CFPlus::UI::Bin::; 1327our @ISA = CFPlus::UI::Bin::;
1134 1328
1135use CFPlus::OpenGL; 1329use CFPlus::OpenGL;
1136 1330
… …
1139 mipmap => 1, wrap => 1; 1333 mipmap => 1, wrap => 1;
1140 1334
1141my @border = 1335my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143 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);
1144 1342
1145sub new { 1343sub new {
1146 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1147 1345
1148 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1516
1319 my $border = $self->border; 1517 my $border = $self->border;
1320 1518
1321 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $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);
1326 1538
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1329 1541
1330 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1351 1563
1352############################################################################# 1564#############################################################################
1353 1565
1354package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1355 1567
1356our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1357 1569
1358use List::Util qw(max sum); 1570use List::Util qw(max sum);
1359 1571
1360use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1361 1573
1362sub new { 1574sub new {
1363 my $class = shift; 1575 my $class = shift;
1364 1576
1365 $class->SUPER::new ( 1577 $class->SUPER::new (
1366 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1367 @_, 1580 @_,
1368 ) 1581 )
1369} 1582}
1370 1583
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub 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 {
1376 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1377 1599
1378 while (@_) { 1600 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1602
1384 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1385 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1386 $self->realloc;
1387}
1388 1605
1389sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1390 my ($self, $child) = @_; 1613 my ($self) = @_;
1391 1614
1392 # TODO: not yet implemented 1615 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1616
1399 my @children = $self->children; 1617 my @children = $self->children;
1400 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 }
1401 1628 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1629
1407 $self->realloc; 1630 # second pass, rows
1408} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1409
1410sub get_wh {
1411 my ($self) = @_;
1412
1413 my (@w, @h);
1414
1415 for my $y (0 .. $#{$self->{children}}) {
1416 my $row = $self->{children}[$y]
1417 or next;
1418
1419 for my $x (0 .. $#$row) {
1420 my $widget = $row->[$x]
1421 or next;
1422 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1423 1633
1424 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1638 }
1427 } 1639 }
1428 1640
1429 (\@w, \@h) 1641 (\@w, \@h)
1430} 1642}
… …
1446 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1447 1659
1448 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1450 1662
1451 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1455 1667
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1669
1460 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
1461 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1462 1679
1463 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1682
1465 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1466 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)};
1467 or next;
1468 1685
1469 my $x = 0; 1686 $widget->configure (
1470 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1689 );
1472 for my $c (0 .. $#$row) { 1690 }
1473 my $col_w = $ws->[$c];
1474 1691
1475 if (my $widget = $row->[$c]) { 1692 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1477 }
1478 1694
1479 $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};
1480 } 1722 }
1723 }
1481 1724
1482 $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});
1483 } 1756 }
1484 1757
1485 1 1758 1
1486} 1759}
1487 1760
1488sub find_widget {
1489 my ($self, $x, $y) = @_;
1490
1491 $x -= $self->{x};
1492 $y -= $self->{y};
1493
1494 my $res;
1495
1496 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1497 $res = $_->find_widget ($x, $y)
1498 and return $res;
1499 }
1500
1501 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1502}
1503
1504sub _draw {
1505 my ($self) = @_;
1506
1507 for (grep $_, @{$self->{children}}) {
1508 $_->draw for grep $_, @$_;
1509 }
1510}
1511
1512############################################################################# 1761#############################################################################
1513 1762
1514package CFPlus::UI::Box; 1763package CFPlus::UI::Box;
1515 1764
1516our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1517 1766
1518sub size_request { 1767sub size_request {
1519 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1520 1771
1521 $self->{vertical} 1772 $self->{vertical}
1522 ? ( 1773 ? (
1523 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1524 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1525 ) 1776 )
1526 : ( 1777 : (
1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1528 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1529 ) 1780 )
1530} 1781}
1531 1782
1532sub invoke_size_allocate { 1783sub invoke_size_allocate {
1533 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1657 1908
1658 delete $self->{ox}; 1909 delete $self->{ox};
1659 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1660} 1911}
1661 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1662sub set_text { 1919sub set_text {
1663 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1664 1921
1665 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1666 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
1772 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1773 2030
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 }; 2036 };
1778 2037
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1781 2040# CFPlus::OpenGL::glNewList $self->{list};
1782 $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;
1783} 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#}
1784 2057
1785############################################################################# 2058#############################################################################
1786 2059
1787package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1788 2061
… …
1794 my $class = shift; 2067 my $class = shift;
1795 2068
1796 $class->SUPER::new ( 2069 $class->SUPER::new (
1797 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1799 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1801 can_hover => 1, 2076 can_hover => 1,
1802 can_focus => 1, 2077 can_focus => 1,
1803 valign => 0, 2078 valign => 0,
1804 can_events => 1, 2079 can_events => 1,
2080 ellipsise => 0,
1805 #text => ... 2081 #text => ...
1806 #hidden => "*", 2082 #hidden => "*",
1807 @_ 2083 @_
1808 ) 2084 )
1809} 2085}
… …
1853 my $mod = $ev->{mod}; 2129 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1856 2132
1857 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;
1858 2136
1859 if ($uni == 8) { 2137 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } 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 = "";
1868 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2161 $self->emit ('escape');
1873 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2166 } else {
1876 return 0; 2167 return 0;
1877 } 2168 }
1878 2169
1879 $self->_set_text ($text); 2170 $self->_set_text ($text);
1880 2171
1881 $self->realloc; 2172 $self->realloc;
2173 $self->update;
1882 2174
1883 1 2175 1
1884} 2176}
1885 2177
1886sub invoke_focus_in { 2178sub invoke_focus_in {
… …
1928 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
1929 } 2221 }
1930 2222
1931 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933 glBegin GL_QUADS;
1934 glVertex 0 , 0;
1935 glVertex 0 , $self->{h};
1936 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
1937 glVertex $self->{w}, 0;
1938 glEnd;
1939 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
1940 2227
1941 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1942 2229
1943 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
1945 2232
1946 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2235 utf8::encode $text;
1949 2236
1950 @$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);
1951 } 2238 }
1952 2239
2240 glColor_premultiply @{$self->{active_fg}};
1953 glBegin GL_LINES; 2241 glBegin GL_LINES;
1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1955 glVertex 0.5 + $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};
1956 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;
1957 } 2260 }
1958} 2261}
2262
2263#############################################################################
1959 2264
1960package CFPlus::UI::Entry; 2265package CFPlus::UI::Entry;
1961 2266
1962our @ISA = CFPlus::UI::EntryBase::; 2267our @ISA = CFPlus::UI::EntryBase::;
1963 2268
… …
1966sub invoke_key_down { 2271sub invoke_key_down {
1967 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
1968 2273
1969 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
1970 2275
1971 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
1974 2279
1975 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
… …
2006 1 2311 1
2007} 2312}
2008 2313
2009############################################################################# 2314#############################################################################
2010 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
2011package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2012 2356
2013our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2014 2358
2015use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2016 2360
2017my @tex = 2361my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2020 2364
2021sub new { 2365sub new {
2022 my $class = shift; 2366 my $class = shift;
2023 2367
2024 $class->SUPER::new ( 2368 $class->SUPER::new (
2025 padding_x => 4,
2026 padding_y => 4,
2027 fg => [1, 1, 1],
2028 active_fg => [0, 0, 1],
2029 can_hover => 1, 2369 can_hover => 1,
2030 align => 0, 2370 align => 0,
2031 valign => 0, 2371 valign => 0,
2032 can_events => 1, 2372 can_events => 1,
2033 @_ 2373 @_
… …
2045} 2385}
2046 2386
2047sub _draw { 2387sub _draw {
2048 my ($self) = @_; 2388 my ($self) = @_;
2049 2389
2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2051
2052 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2055 2393
2394 my $tex = $tex[$GRAB == $self];
2056 $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});
2057 2451
2058 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2059 2453
2060 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2061} 2455}
… …
2148sub new { 2542sub new {
2149 my $class = shift; 2543 my $class = shift;
2150 2544
2151 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2152 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2153 @_, 2548 @_,
2154 ); 2549 );
2155 2550
2156 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
2158 2553
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 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;
2161 2556
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2557 CFPlus::weaken $texture_cache{$self->{path}};
2163 2558
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2560
2166 $self 2561 $self
2167} 2562}
… …
2182} 2577}
2183 2578
2184sub size_request { 2579sub size_request {
2185 my ($self) = @_; 2580 my ($self) = @_;
2186 2581
2187 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2188} 2583}
2189 2584
2190sub _draw { 2585sub _draw {
2191 my ($self) = @_; 2586 my ($self) = @_;
2192 2587
… …
2202 } 2597 }
2203 2598
2204 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2206 2601
2207 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2208 2603
2209 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2210} 2605}
2211 2606
2212############################################################################# 2607#############################################################################
… …
2231 align => 0, 2626 align => 0,
2232 valign => 0, 2627 valign => 0,
2233 can_events => 1, 2628 can_events => 1,
2234 @_ 2629 @_
2235 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2236} 2637}
2237 2638
2238sub invoke_button_up { 2639sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2240 2641
… …
2380 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2381} 2782}
2382 2783
2383############################################################################# 2784#############################################################################
2384 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 %arg,
2806 );
2807
2808 $self->set_value ($arg{value} || -1);
2809
2810 $self
2811}
2812
2813sub set_value {
2814 my ($self, $value) = @_;
2815
2816 if ($self->{value} != $value) {
2817 $self->{value} = $value;
2818
2819 if ($value < 0) {
2820 $self->set_text ("-");
2821 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100);
2823 }
2824 $self->update;
2825 }
2826}
2827
2828sub _draw {
2829 my ($self) = @_;
2830
2831 glEnable GL_BLEND;
2832 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2833
2834 if ($self->{value} >= 0) {
2835 my $s = 3 + ($self->{w} - 6) * $self->{value};
2836
2837 glColor_premultiply @{$self->{bar}};
2838 glRect 2, 2, $s, $self->{h} - 2;
2839 glColor_premultiply @{$self->{bg}};
2840 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2841 }
2842
2843 glColor_premultiply @{$self->{outline}};
2844 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2845
2846 glDisable GL_BLEND;
2847
2848 {
2849 local $self->{bg}; # do not draw background
2850 $self->SUPER::_draw;
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFPlus::UI::ExperienceProgress;
2857
2858our @ISA = CFPlus::UI::Progress::;
2859
2860sub new {
2861 my ($class, %arg) = @_;
2862
2863 my $self = $class->SUPER::new (
2864 %arg
2865 );
2866
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN;
2869
2870 $self
2871}
2872
2873sub DESTROY {
2874 my ($self) = @_;
2875
2876 delete $::CONN->{on_exp_update}{$self+0}
2877 if $::CONN;
2878
2879 $self->SUPER::DESTROY;
2880}
2881
2882sub set_value {
2883 my ($self, $lvl, $exp) = @_;
2884
2885 my $v = -1;
2886
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl];
2890
2891 $v = ($exp - $l0) / ($l1 - $l0);
2892 }
2893
2894 $self->SUPER::set_value ($v);
2895}
2896
2897#############################################################################
2898
2385package CFPlus::UI::Gauge; 2899package CFPlus::UI::Gauge;
2386 2900
2387our @ISA = CFPlus::UI::VBox::; 2901our @ISA = CFPlus::UI::VBox::;
2388 2902
2389sub new { 2903sub new {
… …
2514 3028
2515 $self->SUPER::invoke_button_down ($ev, $x, $y); 3029 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516 3030
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3031 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518 3032
2519 $self->invoke_mouse_motion ($ev, $x, $y) 3033 $self->invoke_mouse_motion ($ev, $x, $y);
3034
3035 1
2520} 3036}
2521 3037
2522sub invoke_mouse_motion { 3038sub invoke_mouse_motion {
2523 my ($self, $ev, $x, $y) = @_; 3039 my ($self, $ev, $x, $y) = @_;
2524 3040
… …
2540sub invoke_mouse_wheel { 3056sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 3057 my ($self, $ev) = @_;
2542 3058
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3059 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 3060
3061 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3062
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3063 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 3064
2547 ! ! $delta 3065 1
2548} 3066}
2549 3067
2550sub update { 3068sub update {
2551 my ($self) = @_; 3069 my ($self) = @_;
2552 3070
… …
2660 #font => default_font 3178 #font => default_font
2661 @_, 3179 @_,
2662 3180
2663 layout => (new CFPlus::Layout), 3181 layout => (new CFPlus::Layout),
2664 par => [], 3182 par => [],
3183 max_par => 0,
2665 height => 0, 3184 height => 0,
2666 children => [ 3185 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3186 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3187 (new CFPlus::UI::Slider vertical => 1),
2669 ], 3188 ],
… …
2682} 3201}
2683 3202
2684sub size_request { 3203sub size_request {
2685 my ($self) = @_; 3204 my ($self) = @_;
2686 3205
2687 my ($empty, $slider) = @{ $self->{children} }; 3206 my ($empty, $slider) = $self->visible_children;
2688 3207
2689 local $self->{children} = [$empty, $slider]; 3208 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request 3209 $self->SUPER::size_request
2691} 3210}
2692 3211
… …
2753} 3272}
2754 3273
2755sub current_paragraph { 3274sub current_paragraph {
2756 my ($self) = @_; 3275 my ($self) = @_;
2757 3276
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1 3277 $self->{top_paragraph} - 1
2760} 3278}
2761 3279
2762sub scroll_to { 3280sub scroll_to {
2763 my ($self, $para) = @_; 3281 my ($self, $para) = @_;
2764 3282
2765 $self->force_uptodate;
2766
2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 3283 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768 3284
2769 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 3285 $self->{scroll_to} = $para;
3286 $self->update;
2770} 3287}
2771 3288
2772sub clear { 3289sub clear {
2773 my ($self) = @_; 3290 my ($self) = @_;
2774 3291
… …
2796 3313
2797 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3314 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2798 push @{$self->{par}}, $para; 3315 push @{$self->{par}}, $para;
2799 } 3316 }
2800 3317
3318 if (my $max = $self->{max_par}) {
3319 shift @{$self->{par}} while @{$self->{par}} > $max;
3320 }
3321
2801 $self->{need_reflow}++; 3322 $self->{need_reflow}++;
2802 $self->update; 3323 $self->update;
2803} 3324}
2804 3325
2805sub scroll_to_bottom { 3326sub scroll_to_bottom {
2806 my ($self) = @_; 3327 my ($self) = @_;
2807 3328
2808 $self->{scroll_to_bottom} = 1; 3329 $self->{scroll_to} = $#{$self->{par}};
2809 $self->update; 3330 $self->update;
2810} 3331}
2811 3332
2812sub force_uptodate { 3333sub force_uptodate {
2813 my ($self) = @_; 3334 my ($self) = @_;
2814 3335
2815 if (delete $self->{need_reflow}) { 3336 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3337 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817 3338
2818 my $height = 0; 3339 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822 3340
2823 for my $para (@{$self->{par}}) { 3341 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3342 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para); 3343 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size; 3344 my ($w, $h) = $layout->size;
… …
2829 $para->{h} = $h; 3347 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped; 3348 $para->{wrapped} = $layout->has_wrapped;
2831 } 3349 }
2832 3350
2833 $para->{y} = $height; 3351 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h}; 3352 $height += $para->{h};
2839 } 3353 }
2840 3354
2841 $self->{top_paragraph} = $top_paragraph;
2842 $self->{height} = $height; 3355 $self->{height} = $height;
2843
2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3356 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845 3357
2846 delete $self->{texture}; 3358 delete $self->{texture};
2847 } 3359 }
2848 3360
2849 if (delete $self->{scroll_to_bottom}) { 3361 if (my $paridx = delete $self->{scroll_to}) {
2850 $self->{children}[1]->set_value (1e10); 3362 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851 } 3363 }
2852} 3364}
2853 3365
2854sub update { 3366sub update {
2855 my ($self) = @_; 3367 my ($self) = @_;
… …
2867 3379
2868 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3380 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869 glClearColor 0, 0, 0, 0; 3381 glClearColor 0, 0, 0, 0;
2870 glClear GL_COLOR_BUFFER_BIT; 3382 glClear GL_COLOR_BUFFER_BIT;
2871 3383
3384 package CFPlus::UI::Base;
3385 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3386 (0, 0, $self->{w}, $self->{h});
3387
3388 my $top = int $self->{children}[1]{range}[0];
3389
3390 my $paridx = 0;
3391 my $top_paragraph;
2872 my $top = int $self->{children}[1]{range}[0]; 3392 my $top = int $self->{children}[1]{range}[0];
2873 3393
2874 my $y0 = $top; 3394 my $y0 = $top;
2875 my $y1 = $top + $H; 3395 my $y1 = $top + $H;
2876 3396
… …
2880 3400
2881 if ($y0 < $y + $h && $y < $y1) { 3401 if ($y0 < $y + $h && $y < $y1) {
2882 my $layout = $self->get_layout ($para); 3402 my $layout = $self->get_layout ($para);
2883 3403
2884 $layout->render ($para->{indent}, $y - $y0); 3404 $layout->render ($para->{indent}, $y - $y0);
3405 $layout->draw;
2885 3406
2886 if (my @w = @{ $para->{widget} }) { 3407 if (my @w = @{ $para->{widget} }) {
2887 my @s = $layout->get_shapes; 3408 my @s = $layout->get_shapes;
2888 3409
2889 for (@w) { 3410 for (@w) {
… …
2894 3415
2895 $_->draw; 3416 $_->draw;
2896 } 3417 }
2897 } 3418 }
2898 } 3419 }
3420
3421 $paridx++;
3422 $top_paragraph ||= $paridx if $y >= $top;
2899 } 3423 }
3424
3425 $self->{top_paragraph} = $top_paragraph;
2900 }; 3426 };
2901 }); 3427 });
2902} 3428}
2903 3429
2904sub reconfigure { 3430sub reconfigure {
… …
3075 glTranslate 0.375, 0.375; 3601 glTranslate 0.375, 0.375;
3076 3602
3077 my ($w, $h) = @$self{qw(w h)}; 3603 my ($w, $h) = @$self{qw(w h)};
3078 3604
3079 glColor 1, 0.8, 0.4; 3605 glColor 1, 0.8, 0.4;
3080 glBegin GL_QUADS; 3606 glRect 0, 0, $w, $h;
3081 glVertex 0 , 0;
3082 glVertex 0 , $h;
3083 glVertex $w, $h;
3084 glVertex $w, 0;
3085 glEnd;
3086 3607
3087 glColor 0, 0, 0; 3608 glColor 0, 0, 0;
3088 glBegin GL_LINE_LOOP; 3609 glRect_lineloop 0, 0, $w, $h;
3089 glVertex 0 , 0;
3090 glVertex 0 , $h;
3091 glVertex $w, $h;
3092 glVertex $w, 0;
3093 glEnd;
3094 3610
3095 glTranslate 2 - 0.375, 2 - 0.375; 3611 glTranslate 2 - 0.375, 2 - 0.375;
3096 3612
3097 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3098} 3614}
… …
3107 3623
3108sub new { 3624sub new {
3109 my $class = shift; 3625 my $class = shift;
3110 3626
3111 my $self = $class->SUPER::new ( 3627 my $self = $class->SUPER::new (
3628 size_w => 32,
3629 size_h => 8,
3112 aspect => 1, 3630 aspect => 1,
3113 can_events => 0, 3631 can_events => 0,
3114 @_, 3632 @_,
3115 ); 3633 );
3116 3634
3117 if ($self->{anim} && $self->{animspeed}) { 3635 if ($self->{anim} && $self->{animspeed}) {
3118 Scalar::Util::weaken (my $widget = $self); 3636 CFPlus::weaken (my $widget = $self);
3119 3637
3638 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3639 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3120 $self->{timer} = Event->timer ( 3640 $self->{timer} = Event->timer (
3121 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3122 hard => 1, 3641 parked => 1,
3123 interval => $self->{animspeed},
3124 cb => sub { 3642 cb => sub {
3643 return unless $::CONN;
3644
3645 my $w = $widget
3646 or return;
3647
3125 ++$widget->{frame}; 3648 ++$w->{frame};
3649 $w->update_face;
3650
3651 # somehow, $widget can go away
3126 $widget->update; 3652 $w->update;
3653 $w->update_timer;
3127 }, 3654 },
3128 ); 3655 );
3656
3657 $self->update_face;
3658 $self->update_timer;
3129 } 3659 }
3130 3660
3131 $self 3661 $self
3132} 3662}
3133 3663
3664sub update_timer {
3665 my ($self) = @_;
3666
3667 return unless $self->{timer};
3668
3669 if ($self->{visible}) {
3670 $self->{timer}->at (
3671 $self->{anim_start}
3672 + $self->{animspeed}
3673 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3674 );
3675 $self->{timer}->start;
3676 } else {
3677 $self->{timer}->stop;
3678 }
3679}
3680
3681sub update_face {
3682 my ($self) = @_;
3683
3684 if ($::CONN) {
3685 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3686 if ($anim && @$anim) {
3687 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3688 delete $self->{face_change_cb};
3689
3690 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3691 unless ($tex->{name} || $tex->{loading}) {
3692 $tex->upload (sub { $self->reconfigure });
3693 }
3694 }
3695 }
3696 }
3697 }
3698}
3699
3134sub size_request { 3700sub size_request {
3135 (32, 8) 3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3705 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3706 if ($tex->{name}) {
3707 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3708 } elsif (!$tex->{loading}) {
3709 $tex->upload (sub { $self->reconfigure });
3710 }
3711 }
3712
3713 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3714 }
3715 }
3716
3717 ($self->{size_w} || 8, $self->{size_h} || 8)
3136} 3718}
3137 3719
3138sub update { 3720sub update {
3139 my ($self) = @_; 3721 my ($self) = @_;
3140 3722
3141 return unless $self->{visible}; 3723 return unless $self->{visible};
3142 3724
3143 $self->SUPER::update; 3725 $self->SUPER::update;
3144} 3726}
3145 3727
3728sub invoke_visibility_change {
3729 my ($self) = @_;
3730
3731 $self->update_timer;
3732
3733 0
3734}
3735
3146sub _draw { 3736sub _draw {
3147 my ($self) = @_; 3737 my ($self) = @_;
3148 3738
3149 return unless $::CONN;
3150
3151 $self->SUPER::_draw; 3739 $self->SUPER::_draw;
3152 3740
3153 my $face; 3741 if (my $tex = $self->{tex}) {
3154
3155 if ($self->{frame}) {
3156 my $anim = $::CONN->{anim}[$self->{anim}];
3157
3158 $face = $anim->[ $self->{frame} % @$anim ]
3159 if $anim && @$anim;
3160 }
3161
3162 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3163
3164 if ($tex) {
3165 glEnable GL_TEXTURE_2D; 3742 glEnable GL_TEXTURE_2D;
3166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3167 glColor 0, 0, 0, 1; 3744 glColor 0, 0, 0, 1;
3168 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3169 glDisable GL_TEXTURE_2D; 3746 glDisable GL_TEXTURE_2D;
… …
3171} 3748}
3172 3749
3173sub destroy { 3750sub destroy {
3174 my ($self) = @_; 3751 my ($self) = @_;
3175 3752
3176 $self->{timer}->cancel 3753 (delete $self->{timer})->cancel
3177 if $self->{timer}; 3754 if $self->{timer};
3178 3755
3179 $self->SUPER::destroy; 3756 $self->SUPER::destroy;
3180} 3757}
3181 3758
… …
3183 3760
3184package CFPlus::UI::Buttonbar; 3761package CFPlus::UI::Buttonbar;
3185 3762
3186our @ISA = CFPlus::UI::HBox::; 3763our @ISA = CFPlus::UI::HBox::;
3187 3764
3188# TODO: should actualyl wrap buttons and other goodies. 3765# TODO: should actually wrap buttons and other goodies.
3189 3766
3190############################################################################# 3767#############################################################################
3191 3768
3192package CFPlus::UI::Menu; 3769package CFPlus::UI::Menu;
3193 3770
3194our @ISA = CFPlus::UI::FancyFrame::; 3771our @ISA = CFPlus::UI::Toplevel::;
3195 3772
3196use CFPlus::OpenGL; 3773use CFPlus::OpenGL;
3197 3774
3198sub new { 3775sub new {
3199 my $class = shift; 3776 my $class = shift;
… …
3221 children => [ 3798 children => [
3222 (new CFPlus::UI::Label markup => $left, expand => 1), 3799 (new CFPlus::UI::Label markup => $left, expand => 1),
3223 (new CFPlus::UI::Label markup => $right, align => +1), 3800 (new CFPlus::UI::Label markup => $right, align => +1),
3224 ], 3801 ],
3225 ; 3802 ;
3226 3803
3227 } else { 3804 } else {
3228 $widget = new CFPlus::UI::Label 3805 $widget = new CFPlus::UI::Label
3229 can_hover => 1, 3806 can_hover => 1,
3230 can_events => 1, 3807 can_events => 1,
3231 markup => $widget, 3808 markup => $widget,
… …
3356 3933
3357############################################################################# 3934#############################################################################
3358 3935
3359package CFPlus::UI::Notebook; 3936package CFPlus::UI::Notebook;
3360 3937
3938use CFPlus::OpenGL;
3939
3361our @ISA = CFPlus::UI::VBox::; 3940our @ISA = CFPlus::UI::VBox::;
3362 3941
3363sub new { 3942sub new {
3364 my $class = shift; 3943 my $class = shift;
3365 3944
3366 my $self = $class->SUPER::new ( 3945 my $self = $class->SUPER::new (
3367 buttonbar => (new CFPlus::UI::Buttonbar), 3946 buttonbar => (new CFPlus::UI::Buttonbar),
3368 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3947 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3948 active_outline => [1, 1, 0],
3369 # filter => # will be put between multiplexer and $self 3949 # filter => # will be put between multiplexer and $self
3370 @_, 3950 @_,
3371 ); 3951 );
3372 3952
3373 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3953 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3374 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3954 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3375 3955
3956 {
3957 Scalar::Util::weaken (my $wself = $self);
3958
3959 $self->{multiplexer}->connect (c_add => sub {
3960 my ($mplex, $widgets) = @_;
3961
3962 for my $child (@$widgets) {
3963 Scalar::Util::weaken $child;
3964 $child->{c_tab_} ||= do {
3965 my $tab =
3966 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3967 ? $child->{c_tab}
3968 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3969
3970 $tab->connect (activate => sub {
3971 $wself->set_current_page ($child);
3972 });
3973
3974 $tab
3975 };
3976
3977 $self->{buttonbar}->add ($child->{c_tab_});
3978 }
3979 });
3980
3981 $self->{multiplexer}->connect (c_remove => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 $wself->{buttonbar}->remove ($child->{c_tab_});
3986 }
3987 });
3988 }
3989
3376 $self 3990 $self
3377} 3991}
3378 3992
3379sub add { 3993sub add {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->add (@widgets)
3997}
3998
3999sub remove {
4000 my ($self, @widgets) = @_;
4001
4002 $self->{multiplexer}->remove (@widgets)
4003}
4004
4005sub pages {
4006 my ($self) = @_;
4007 $self->{multiplexer}->children
4008}
4009
4010sub add_tab {
3380 my ($self, $title, $widget, $tooltip) = @_; 4011 my ($self, $title, $widget, $tooltip) = @_;
3381 4012
3382 Scalar::Util::weaken $self; 4013 $title = [$title, $tooltip] unless ref $title;
4014 $widget->{c_tab} = $title;
3383 4015
3384 $self->{buttonbar}->add (new CFPlus::UI::Button
3385 markup => $title,
3386 tooltip => $tooltip,
3387 on_activate => sub { $self->set_current_page ($widget) },
3388 );
3389
3390 $self->{multiplexer}->add ($widget); 4016 $self->add ($widget);
3391} 4017}
3392 4018
3393sub get_current_page { 4019sub get_current_page {
3394 my ($self) = @_; 4020 my ($self) = @_;
3395 4021
… …
3399sub set_current_page { 4025sub set_current_page {
3400 my ($self, $page) = @_; 4026 my ($self, $page) = @_;
3401 4027
3402 $self->{multiplexer}->set_current_page ($page); 4028 $self->{multiplexer}->set_current_page ($page);
3403 $self->emit (page_changed => $self->{multiplexer}{current}); 4029 $self->emit (page_changed => $self->{multiplexer}{current});
4030}
4031
4032sub _draw {
4033 my ($self) = @_;
4034
4035 $self->SUPER::_draw ();
4036
4037 if (my $cur = $self->{multiplexer}{current}) {
4038 if ($cur = $cur->{c_tab_}) {
4039 glTranslate $cur->{x}, $cur->{y};
4040 glLineWidth 3;
4041 glColor @{$self->{active_outline}};
4042 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4043 glLineWidth 1;
4044 }
4045 }
3404} 4046}
3405 4047
3406############################################################################# 4048#############################################################################
3407 4049
3408package CFPlus::UI::Selector; 4050package CFPlus::UI::Selector;
… …
3471 my $self = $class->SUPER::new ( 4113 my $self = $class->SUPER::new (
3472 fontsize => 0.8, 4114 fontsize => 0.8,
3473 @_, 4115 @_,
3474 ); 4116 );
3475 4117
3476 Scalar::Util::weaken (my $this = $self); 4118 CFPlus::weaken (my $this = $self);
3477 4119
3478 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4120 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3479 4121
3480 $self 4122 $self
3481} 4123}
… …
3604 $self->SUPER::destroy; 4246 $self->SUPER::destroy;
3605} 4247}
3606 4248
3607############################################################################# 4249#############################################################################
3608 4250
3609package CFPlus::UI::Inventory;
3610
3611our @ISA = CFPlus::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 col_expand => [0, 1, 0],
3618 items => [],
3619 @_,
3620 );
3621
3622 $self->set_sort_order (undef);
3623
3624 $self
3625}
3626
3627sub update_items {
3628 my ($self) = @_;
3629
3630 $self->clear;
3631
3632 my @item = $self->{sort}->(@{ $self->{items} });
3633
3634 my @adds;
3635 my $row = 0;
3636 for my $item ($self->{sort}->(@{ $self->{items} })) {
3637 CFPlus::Item::update_widgets $item;
3638
3639 push @adds, 0, $row, $item->{face_widget};
3640 push @adds, 1, $row, $item->{desc_widget};
3641 push @adds, 2, $row, $item->{weight_widget};
3642
3643 $row++;
3644 }
3645
3646 $self->add (@adds);
3647}
3648
3649sub set_sort_order {
3650 my ($self, $order) = @_;
3651
3652 $self->{sort} = $order ||= sub {
3653 sort {
3654 $a->{type} <=> $b->{type}
3655 or $a->{name} cmp $b->{name}
3656 } @_
3657 };
3658
3659 $self->update_items;
3660}
3661
3662sub set_items {
3663 my ($self, $items) = @_;
3664
3665 $self->{items} = [$items ? values %$items : ()];
3666 $self->update_items;
3667}
3668
3669#############################################################################
3670
3671package CFPlus::UI::SpellList;
3672
3673our @ISA = CFPlus::UI::Table::;
3674
3675sub new {
3676 my $class = shift;
3677
3678 my $self = $class->SUPER::new (
3679 binding => [],
3680 commands => [],
3681 @_,
3682 )
3683}
3684
3685my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698sub rebuild_spell_list {
3699 my ($self) = @_;
3700
3701 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3702 $self->clear;
3703
3704 return unless $::CONN;
3705
3706 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712 my $row = 0;
3713
3714 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715 my $spell = $self->{spell}{$_};
3716
3717 $row++;
3718
3719 my $spell_cb = sub {
3720 my ($widget, $ev) = @_;
3721
3722 if ($ev->{button} == 1) {
3723 $::CONN->user_send ("cast $spell->{name}");
3724 } elsif ($ev->{button} == 2) {
3725 $::CONN->user_send ("invoke $spell->{name}");
3726 } elsif ($ev->{button} == 3) {
3727 (new CFPlus::UI::Menu
3728 items => [
3729 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731 ],
3732 )->popup ($ev);
3733 } else {
3734 return 0;
3735 }
3736
3737 1
3738 };
3739
3740 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742 #TODO: add path info to tooltip
3743 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745 $self->add (0, $row, new CFPlus::UI::Face
3746 face => $spell->{face},
3747 can_hover => 1,
3748 can_events => 1,
3749 tooltip => $tooltip,
3750 on_button_down => $spell_cb,
3751 );
3752
3753 $self->add (1, $row, new CFPlus::UI::Label
3754 expand => 1,
3755 text => $spell->{name},
3756 can_hover => 1,
3757 can_events => 1,
3758 tooltip => $tooltip,
3759 on_button_down => $spell_cb,
3760 );
3761
3762 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766 }
3767 });
3768}
3769
3770sub add_spell {
3771 my ($self, $spell) = @_;
3772
3773 $self->{spell}->{$spell->{name}} = $spell;
3774 $self->rebuild_spell_list;
3775}
3776
3777sub remove_spell {
3778 my ($self, $spell) = @_;
3779
3780 delete $self->{spell}->{$spell->{name}};
3781 $self->rebuild_spell_list;
3782}
3783
3784sub clear_spells {
3785 my ($self) = @_;
3786
3787 $self->{spell} = {};
3788 $self->rebuild_spell_list;
3789}
3790
3791#############################################################################
3792
3793package CFPlus::UI::Root; 4251package CFPlus::UI::Root;
3794 4252
3795our @ISA = CFPlus::UI::Container::; 4253our @ISA = CFPlus::UI::Container::;
3796 4254
3797use List::Util qw(min max); 4255use List::Util qw(min max);
… …
3804 my $self = $class->SUPER::new ( 4262 my $self = $class->SUPER::new (
3805 visible => 1, 4263 visible => 1,
3806 @_, 4264 @_,
3807 ); 4265 );
3808 4266
3809 Scalar::Util::weaken ($self->{root} = $self); 4267 CFPlus::weaken ($self->{root} = $self);
3810 4268
3811 $self 4269 $self
3812} 4270}
3813 4271
3814sub size_request { 4272sub size_request {
… …
3862} 4320}
3863 4321
3864sub update { 4322sub update {
3865 my ($self) = @_; 4323 my ($self) = @_;
3866 4324
3867 $::WANT_REFRESH++; 4325 $::WANT_REFRESH->start;
3868} 4326}
3869 4327
3870sub add { 4328sub add {
3871 my ($self, @children) = @_; 4329 my ($self, @children) = @_;
3872 4330
… …
3909 while ($self->{refresh_hook}) { 4367 while ($self->{refresh_hook}) {
3910 $_->() 4368 $_->()
3911 for values %{delete $self->{refresh_hook}}; 4369 for values %{delete $self->{refresh_hook}};
3912 } 4370 }
3913 4371
3914 if ($self->{realloc}) { 4372 while ($self->{realloc}) {
3915 my %queue; 4373 my %queue;
3916 my @queue; 4374 my @queue;
3917 my $widget; 4375 my $widget;
3918 4376
3919 outer: 4377 outer:
… …
3966 } 4424 }
3967 } 4425 }
3968 4426
3969 delete $self->{realloc}{$widget+0}; 4427 delete $self->{realloc}{$widget+0};
3970 } 4428 }
3971 }
3972 4429
3973 while (my $size_alloc = delete $self->{size_alloc}) { 4430 while (my $size_alloc = delete $self->{size_alloc}) {
3974 my @queue = sort { $b->{visible} <=> $a->{visible} } 4431 my @queue = sort { $a->{visible} <=> $b->{visible} }
3975 values %$size_alloc; 4432 values %$size_alloc;
3976 4433
3977 while () { 4434 while () {
3978 my $widget = pop @queue || last; 4435 my $widget = pop @queue || last;
3979 4436
3980 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4437 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3981 4438
3982 $w = 0 if $w < 0;
3983 $h = 0 if $h < 0;
3984
3985 $w = max $widget->{min_w}, $w; 4439 $w = max $widget->{min_w}, $w;
3986 $h = max $widget->{min_h}, $h; 4440 $h = max $widget->{min_h}, $h;
3987 4441
3988# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4442# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3989# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4443# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3990 4444
3991 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4445 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3992 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4446 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3993 4447
3994 $w = int $w + 0.5; 4448 $w = int $w + 0.5;
3995 $h = int $h + 0.5; 4449 $h = int $h + 0.5;
3996 4450
3997 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4451 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3998 $widget->{old_w} = $widget->{w}; 4452 $widget->{old_w} = $widget->{w};
3999 $widget->{old_h} = $widget->{h}; 4453 $widget->{old_h} = $widget->{h};
4000 4454
4001 $widget->{w} = $w; 4455 $widget->{w} = $w;
4002 $widget->{h} = $h; 4456 $widget->{h} = $h;
4003 4457
4004 $widget->emit (size_allocate => $w, $h); 4458 $widget->emit (size_allocate => $w, $h);
4459 }
4005 } 4460 }
4006 } 4461 }
4007 } 4462 }
4008 4463
4009 while ($self->{post_alloc_hook}) { 4464 while ($self->{post_alloc_hook}) {
4010 $_->() 4465 $_->()
4011 for values %{delete $self->{post_alloc_hook}}; 4466 for values %{delete $self->{post_alloc_hook}};
4012 } 4467 }
4013
4014 4468
4015 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4469 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4016 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4470 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4017 glClear GL_COLOR_BUFFER_BIT; 4471 glClear GL_COLOR_BUFFER_BIT;
4018 4472
… …
4023 glLoadIdentity; 4477 glLoadIdentity;
4024 4478
4025 { 4479 {
4026 package CFPlus::UI::Base; 4480 package CFPlus::UI::Base;
4027 4481
4028 ($draw_x, $draw_y, $draw_w, $draw_h) = 4482 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4029 (0, 0, $self->{w}, $self->{h}); 4483 (0, 0, $self->{w}, $self->{h});
4030 }
4031 4484
4032 $self->_draw; 4485 $self->_draw;
4486 }
4033} 4487}
4034 4488
4035############################################################################# 4489#############################################################################
4036 4490
4037package CFPlus::UI; 4491package CFPlus::UI;

Diff Legend

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