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.346 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 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 { __widget_ref__ => $_[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";
637 606
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
643 delete $WIDGET{$self+0};
644 611
645 eval { $self->destroy }; 612 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
647} 616}
648 617
649############################################################################# 618#############################################################################
650 619
651package CFPlus::UI::DrawBG; 620package CFPlus::UI::DrawBG;
727 can_events => 0, 696 can_events => 0,
728 %arg, 697 %arg,
729 ); 698 );
730 699
731 $self->add (@$children) 700 $self->add (@$children)
732 if $children; 701 if $children && @$children;
733 702
734 $self 703 $self
735} 704}
736 705
737sub realloc { 706sub realloc {
746 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
747 716
748 $_->set_parent ($self) 717 $_->set_parent ($self)
749 for @widgets; 718 for @widgets;
750 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 721 use sort 'stable';
752 722
753 $self->{children} = [ 723 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
756 ]; 726 ];
757 727
758 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
759} 733}
760 734
761sub children { 735sub children {
762 @{ $_[0]{children} } 736 @{ $_[0]{children} }
763} 737}
764 738
765sub remove { 739sub remove {
766 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
767 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
768 delete $child->{parent}; 745 delete $child->{parent};
769 $child->hide; 746 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
772 749
773 $self->realloc; 750 $self->realloc;
774} 751}
775 752
776sub clear { 753sub clear {
777 my ($self) = @_; 754 my ($self) = @_;
778 755
779 my $children = delete $self->{children}; 756 my $children = $self->{children};
780 $self->{children} = []; 757 $self->{children} = [];
781 758
782 for (@$children) { 759 for (@$children) {
783 delete $_->{parent}; 760 delete $_->{parent};
784 $_->hide; 761 $_->hide;
804} 781}
805 782
806sub _draw { 783sub _draw {
807 my ($self) = @_; 784 my ($self) = @_;
808 785
809 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
810} 787}
811 788
812############################################################################# 789#############################################################################
813 790
814package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
824} 801}
825 802
826sub add { 803sub add {
827 my ($self, $child) = @_; 804 my ($self, $child) = @_;
828 805
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
830 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
831} 808}
832 809
833sub remove { 810sub remove {
834 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
898 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
899 876
900 { 877 {
901 package CFPlus::UI::Base; 878 package CFPlus::UI::Base;
902 879
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
905 } 884 }
906
907 $self->_render;
908 }; 885 };
909} 886}
910 887
911sub _draw { 888sub _draw {
912 my ($self) = @_; 889 my ($self) = @_;
924} 901}
925 902
926############################################################################# 903#############################################################################
927 904
928package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
929 908
930our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
931 910
932sub new { 911sub new {
933 my $class = shift; 912 my $class = shift;
942sub size_request { 921sub size_request {
943 my ($self) = @_; 922 my ($self) = @_;
944 923
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 925
947 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
949 928
950 ($w, $h) 929 ($w, $h)
951} 930}
952 931
953sub invoke_size_allocate { 932sub invoke_size_allocate {
965} 944}
966 945
967sub set_offset { 946sub set_offset {
968 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
969 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
972 955
956 $self->emit (changed => $x, $y);
973 $self->update; 957 $self->update;
958 }
974} 959}
975 960
976# hmm, this does not work for topleft of $self... but we should not ask for that 961# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 962sub coord2local {
978 my ($self, $x, $y) = @_; 963 my ($self, $x, $y) = @_;
993 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
994 979
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 980 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 981 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 982 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 984 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 985 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 986 }
1002} 987}
1003 988
1014 999
1015############################################################################# 1000#############################################################################
1016 1001
1017package CFPlus::UI::ScrolledWindow; 1002package CFPlus::UI::ScrolledWindow;
1018 1003
1019our @ISA = CFPlus::UI::HBox::; 1004our @ISA = CFPlus::UI::Table::;
1020 1005
1021sub new { 1006sub new {
1022 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
1023 1008
1024 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
1025 1010
1026 my $self; 1011 my $self;
1027 1012
1028 my $slider = new CFPlus::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1016 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub {
1019 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 },
1022 ;
1023
1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
1029 vertical => 1, 1027 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1029 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1030 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1032 },
1034 ; 1033 ;
1035 1034
1036 $self = $class->SUPER::new ( 1035 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1036 scroll_x => 0,
1037 scroll_y => 1,
1038 can_events => 1, 1038 can_events => 1,
1039 slider => $slider, 1039 hslider => $hslider,
1040 vslider => $vslider,
1041 col_expand => [1, 0],
1042 row_expand => [1, 0],
1040 %arg, 1043 %arg,
1041 ); 1044 );
1042 1045
1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1049 expand => 1,
1050 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y},
1052 on_changed => sub {
1053 my ($vp, $x, $y) = @_;
1054
1055 $vp->{parent}{hslider}->set_value ($x);
1056 $vp->{parent}{vslider}->set_value ($y);
1057
1058 0
1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1065 ;
1066
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1067 $self->SUPER::add ($self->{vp});
1068
1044 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
1045 1070
1046 $self 1071 $self
1047} 1072}
1048
1049#TODO# update range on size_allocate depending on child
1050 1073
1051sub add { 1074sub add {
1052 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
1053 1076
1054 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
1055} 1078}
1056 1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 my $child = ($self->{vp} or return)->child;
1084
1085 if ($self->{scroll_x}) {
1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1088
1089 my $visible = $w1 > $w2;
1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1092 $visible ? $self->SUPER::add ($self->{hslider})
1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1095 }
1096
1097 if ($self->{scroll_y}) {
1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1100
1101 my $visible = $h1 > $h2;
1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1104 $visible ? $self->SUPER::add ($self->{vslider})
1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1111 my ($self, $ev) = @_;
1112
1113 $self->grab_focus;
1114
1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1125 };
1126}
1127
1057sub invoke_mouse_wheel { 1128sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1129 my ($self, $ev) = @_;
1059 1130
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1133
1064 1 1134 1
1065} 1135}
1066 1136
1067sub update_slider { 1137sub invoke_button_down {
1068 my ($self) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1069 1139
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1140 if ($ev->{button} == 2) {
1071} 1141 $self->start_dragging ($ev);
1142 return 1;
1143 }
1072 1144
1073sub update { 1145 0
1074 my ($self) = @_; 1146}
1075 1147
1076 $self->SUPER::update; 1148sub invoke_button_up {
1149 my ($self, $ev, $x, $y) = @_;
1077 1150
1078 $self->update_slider; 1151 if (delete $self->{motion}) {
1152 return 1;
1153 }
1154
1155 0
1156}
1157
1158sub invoke_mouse_motion {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($self->{motion}) {
1162 $self->{motion}->($ev, $x, $y);
1163 return 1;
1164 }
1165
1166 0
1079} 1167}
1080 1168
1081sub invoke_size_allocate { 1169sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1170 my ($self, $w, $h) = @_;
1083 1171
1084 $self->update_slider; 1172 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1173 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1174}
1088 1175
1089############################################################################# 1176#############################################################################
1090 1177
1138 my ($class, %arg) = @_; 1225 my ($class, %arg) = @_;
1139 1226
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1227 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1228 $arg{label} = new CFPlus::UI::Label
1142 align => 1, 1229 align => 1,
1143 valign => 1, 1230 valign => 0,
1144 text => $arg{label}, 1231 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1232 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1233 }
1147 1234
1148 my $self = $class->SUPER::new ( 1235 my $self = $class->SUPER::new (
1240 1327
1241my @border = 1328my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1329 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1330 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1331
1332my @icon =
1333 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1334 qw(x1_move.png x1_resize.png);
1335
1245sub new { 1336sub new {
1246 my ($class, %arg) = @_; 1337 my ($class, %arg) = @_;
1247 1338
1248 my $self = $class->SUPER::new ( 1339 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1340 bg => [1, 1, 1, 1],
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1509
1419 my $border = $self->border; 1510 my $border = $self->border;
1420 1511
1421 glColor @{ $self->{border_bg} }; 1512 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1513 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1514 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1515 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1516 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1517
1518 # move
1519 my $w2 = ($w - $border) * .5;
1520 my $h2 = ($h - $border) * .5;
1521 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1522 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1523 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1524
1525 # resize
1526 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1527 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1528 unless $self->{has_close_button};
1529 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1531
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1532 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1533 glColor @{ $self->{bg} };
1429 1534
1430 # TODO: repeat texture not scale 1535 # TODO: repeat texture not scale
1451 1556
1452############################################################################# 1557#############################################################################
1453 1558
1454package CFPlus::UI::Table; 1559package CFPlus::UI::Table;
1455 1560
1456our @ISA = CFPlus::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1457 1562
1458use List::Util qw(max sum); 1563use List::Util qw(max sum);
1459 1564
1460use CFPlus::OpenGL; 1565use CFPlus::OpenGL;
1461 1566
1462sub new { 1567sub new {
1463 my $class = shift; 1568 my $class = shift;
1464 1569
1465 $class->SUPER::new ( 1570 $class->SUPER::new (
1466 col_expand => [], 1571 col_expand => [],
1572 row_expand => [],
1467 @_, 1573 @_,
1468 ) 1574 )
1469} 1575}
1470 1576
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1577sub add {
1578 my ($self, @widgets) = @_;
1579
1580 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1584
1585 $self->SUPER::add (@widgets);
1586}
1587
1588sub add_at {
1476 my ($self) = shift; 1589 my $self = shift;
1590
1591 my @widgets;
1477 1592
1478 while (@_) { 1593 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1595
1484 $self->{force_realloc} = 1; 1596 $child->{row} = $row;
1485 $self->{force_size_alloc} = 1; 1597 $child->{col} = $col;
1486 $self->realloc;
1487}
1488 1598
1489sub remove { 1599 push @widgets, $child;
1600 }
1601
1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1490 my ($self, $child) = @_; 1606 my ($self) = @_;
1491 1607
1492 # TODO: not yet implemented 1608 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1609
1499 my @children = $self->children; 1610 my @children = $self->children;
1500 delete $self->{children}; 1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 }
1501 1621 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1622
1507 $self->realloc; 1623 # second pass, rows
1508} 1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523 1626
1524 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1631 }
1527 } 1632 }
1528 1633
1529 (\@w, \@h) 1634 (\@w, \@h)
1530} 1635}
1546 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1547 1652
1548 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1550 1655
1551 # TODO: nicer code && do row_expand 1656 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1555 1660
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1662
1560 CFPlus::UI::harmonize $ws; 1663 CFPlus::UI::harmonize $ws;
1664
1665 my @row_expand = @{$self->{row_expand}};
1666 @row_expand = (1) x @$ws unless @row_expand;
1667 my $row_expand = (sum @row_expand) || 1;
1668
1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1670
1561 CFPlus::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1562 1672
1563 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1675
1565 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567 or next;
1568 1678
1569 my $x = 0; 1679 $widget->configure (
1570 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1682 );
1572 for my $c (0 .. $#$row) { 1683 }
1573 my $col_w = $ws->[$c];
1574 1684
1575 if (my $widget = $row->[$c]) { 1685 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1686}
1577 }
1578 1687
1579 $x += $col_w; 1688#############################################################################
1689
1690package CFPlus::UI::Fixed;
1691
1692use List::Util qw(min max);
1693
1694our @ISA = CFPlus::UI::Container::;
1695
1696sub _scale($$$) {
1697 my ($rel, $val, $max) = @_;
1698
1699 $rel ? $val * $max : $val
1700}
1701
1702sub size_request {
1703 my ($self) = @_;
1704
1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1706
1707 # determine overall size by querying abs widgets
1708 for my $child ($self->visible_children) {
1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1712
1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580 } 1715 }
1716 }
1581 1717
1582 $y += $row_h; 1718 my $W = $x2 - $x1;
1719 my $H = $y2 - $y1;
1720
1721 # now layout remaining widgets
1722 for my $child ($self->visible_children) {
1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1726
1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1729 }
1730 }
1731
1732 my $W = $x2 - $x1;
1733 my $H = $y2 - $y1;
1734
1735 ($W, $H)
1736}
1737
1738sub invoke_size_allocate {
1739 my ($self, $W, $H) = @_;
1740
1741 for my $child ($self->visible_children) {
1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1744
1745 $x += $child->{c_halign} * $child->{req_w};
1746 $y += $child->{c_valign} * $child->{req_h};
1747
1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1749 }
1584 1750
1585 1 1751 1
1586} 1752}
1587 1753
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610}
1611
1612############################################################################# 1754#############################################################################
1613 1755
1614package CFPlus::UI::Box; 1756package CFPlus::UI::Box;
1615 1757
1616our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1617 1759
1618sub size_request { 1760sub size_request {
1619 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1620 1764
1621 $self->{vertical} 1765 $self->{vertical}
1622 ? ( 1766 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1769 )
1626 : ( 1770 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1629 ) 1773 )
1630} 1774}
1631 1775
1632sub invoke_size_allocate { 1776sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
1877 }; 2021 };
1878 2022
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
1881 2031
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1883} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
1884 2042
1885############################################################################# 2043#############################################################################
1886 2044
1887package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
1888 2046
1900 active_fg => [0, 0, 0], 2058 active_fg => [0, 0, 0],
1901 can_hover => 1, 2059 can_hover => 1,
1902 can_focus => 1, 2060 can_focus => 1,
1903 valign => 0, 2061 valign => 0,
1904 can_events => 1, 2062 can_events => 1,
2063 ellipsise => 0,
1905 #text => ... 2064 #text => ...
1906 #hidden => "*", 2065 #hidden => "*",
1907 @_ 2066 @_
1908 ) 2067 )
1909} 2068}
1953 my $mod = $ev->{mod}; 2112 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2113 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2114 my $uni = $ev->{unicode};
1956 2115
1957 my $text = $self->get_text; 2116 my $text = $self->get_text;
2117
2118 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2119
1959 if ($uni == 8) { 2120 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2122 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2123 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2124 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2125 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2126 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2128 } elsif ($sym == CFPlus::SDLK_HOME) {
2129 # what a hack
2130 $self->{cursor} =
2131 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2132 ? length $1
2133 : 0;
2134 } elsif ($sym == CFPlus::SDLK_END) {
2135 # uh, again
2136 $self->{cursor} =
2137 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2138 ? $self->{cursor} + length $1
2139 : length $self->{text};
2140 } elsif ($uni == 21) { # ctrl-u
2141 $text = "";
1968 $self->{cursor} = 0; 2142 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 27) { 2143 } elsif ($uni == 27) {
1972 $self->emit ('escape'); 2144 $self->emit ('escape');
1973 } elsif ($uni) { 2145 } elsif ($uni == 0x0d) {
2146 substr $text, $self->{cursor}++, 0, "\012";
2147 } elsif ($uni >= 0x20) {
1974 substr $text, $self->{cursor}++, 0, chr $uni; 2148 substr $text, $self->{cursor}++, 0, chr $uni;
1975 } else { 2149 } else {
1976 return 0; 2150 return 0;
1977 } 2151 }
1978 2152
1979 $self->_set_text ($text); 2153 $self->_set_text ($text);
1980 2154
1981 $self->realloc; 2155 $self->realloc;
2156 $self->update;
1982 2157
1983 1 2158 1
1984} 2159}
1985 2160
1986sub invoke_focus_in { 2161sub invoke_focus_in {
2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2056 glEnd; 2231 glEnd;
2057 } 2232 }
2058} 2233}
2059 2234
2235#############################################################################
2236
2060package CFPlus::UI::Entry; 2237package CFPlus::UI::Entry;
2061 2238
2062our @ISA = CFPlus::UI::EntryBase::; 2239our @ISA = CFPlus::UI::EntryBase::;
2063 2240
2064use CFPlus::OpenGL; 2241use CFPlus::OpenGL;
2066sub invoke_key_down { 2243sub invoke_key_down {
2067 my ($self, $ev) = @_; 2244 my ($self, $ev) = @_;
2068 2245
2069 my $sym = $ev->{sym}; 2246 my $sym = $ev->{sym};
2070 2247
2071 if ($sym == 13) { 2248 if ($ev->{uni} == 0x0d || $sym == 13) {
2072 unshift @{$self->{history}}, 2249 unshift @{$self->{history}},
2073 my $txt = $self->get_text; 2250 my $txt = $self->get_text;
2074 2251
2075 $self->{history_pointer} = -1; 2252 $self->{history_pointer} = -1;
2076 $self->{history_saveback} = ''; 2253 $self->{history_saveback} = '';
2106 1 2283 1
2107} 2284}
2108 2285
2109############################################################################# 2286#############################################################################
2110 2287
2288package CFPlus::UI::TextEdit;
2289
2290our @ISA = CFPlus::UI::EntryBase::;
2291
2292use CFPlus::OpenGL;
2293
2294sub move_cursor_ver {
2295 my ($self, $dy) = @_;
2296
2297 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2298
2299 $y += $dy;
2300
2301 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2302 $self->{cursor} = $index;
2303 delete $self->{cur_h};
2304 $self->update;
2305 return;
2306 }
2307}
2308
2309sub invoke_key_down {
2310 my ($self, $ev) = @_;
2311
2312 my $sym = $ev->{sym};
2313
2314 if ($sym == CFPlus::SDLK_UP) {
2315 $self->move_cursor_ver (-1);
2316 } elsif ($sym == CFPlus::SDLK_DOWN) {
2317 $self->move_cursor_ver (+1);
2318 } else {
2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
2322 1
2323}
2324
2325#############################################################################
2326
2111package CFPlus::UI::Button; 2327package CFPlus::UI::Button;
2112 2328
2113our @ISA = CFPlus::UI::Label::; 2329our @ISA = CFPlus::UI::Label::;
2114 2330
2115use CFPlus::OpenGL; 2331use CFPlus::OpenGL;
2116 2332
2117my @tex = 2333my @tex =
2118 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2334 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2119 qw(b1_button_active.png); 2335 qw(b1_button_inactive.png b1_button_active.png);
2120 2336
2121sub new { 2337sub new {
2122 my $class = shift; 2338 my $class = shift;
2123 2339
2124 $class->SUPER::new ( 2340 $class->SUPER::new (
2125 padding_x => 4, 2341 padding_x => 4,
2126 padding_y => 4, 2342 padding_y => 4,
2127 fg => [1, 1, 1], 2343 fg => [1.0, 1.0, 1.0],
2128 active_fg => [0, 0, 1], 2344 active_fg => [0.8, 0.8, 0.8],
2129 can_hover => 1, 2345 can_hover => 1,
2130 align => 0, 2346 align => 0,
2131 valign => 0, 2347 valign => 0,
2132 can_events => 1, 2348 can_events => 1,
2133 @_ 2349 @_
2151 2367
2152 glEnable GL_TEXTURE_2D; 2368 glEnable GL_TEXTURE_2D;
2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2369 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2154 glColor 0, 0, 0, 1; 2370 glColor 0, 0, 0, 1;
2155 2371
2372 my $tex = $tex[$GRAB == $self];
2156 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2373 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2157 2374
2158 glDisable GL_TEXTURE_2D; 2375 glDisable GL_TEXTURE_2D;
2159 2376
2160 $self->SUPER::_draw; 2377 $self->SUPER::_draw;
2161} 2378}
2257 or Carp::croak "'path' or 'tex' attributes required"; 2474 or Carp::croak "'path' or 'tex' attributes required";
2258 2475
2259 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2476 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2260 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2477 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2261 2478
2262 Scalar::Util::weaken $texture_cache{$self->{path}}; 2479 CFPlus::weaken $texture_cache{$self->{path}};
2263 2480
2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2481 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2265 2482
2266 $self 2483 $self
2267} 2484}
2614 2831
2615 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2616 2833
2617 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2618 2835
2619 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2620} 2839}
2621 2840
2622sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2623 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2624 2843
2640sub invoke_mouse_wheel { 2859sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_; 2860 my ($self, $ev) = @_;
2642 2861
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2862 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644 2863
2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2865
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2646 2867
2647 ! ! $delta 2868 1
2648} 2869}
2649 2870
2650sub update { 2871sub update {
2651 my ($self) = @_; 2872 my ($self) = @_;
2652 2873
2760 #font => default_font 2981 #font => default_font
2761 @_, 2982 @_,
2762 2983
2763 layout => (new CFPlus::Layout), 2984 layout => (new CFPlus::Layout),
2764 par => [], 2985 par => [],
2986 max_par => 0,
2765 height => 0, 2987 height => 0,
2766 children => [ 2988 children => [
2767 (new CFPlus::UI::Empty expand => 1), 2989 (new CFPlus::UI::Empty expand => 1),
2768 (new CFPlus::UI::Slider vertical => 1), 2990 (new CFPlus::UI::Slider vertical => 1),
2769 ], 2991 ],
2782} 3004}
2783 3005
2784sub size_request { 3006sub size_request {
2785 my ($self) = @_; 3007 my ($self) = @_;
2786 3008
2787 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
2788 3010
2789 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
2790 $self->SUPER::size_request 3012 $self->SUPER::size_request
2791} 3013}
2792 3014
2853} 3075}
2854 3076
2855sub current_paragraph { 3077sub current_paragraph {
2856 my ($self) = @_; 3078 my ($self) = @_;
2857 3079
2858 $self->force_uptodate;
2859 $self->{top_paragraph} - 1 3080 $self->{top_paragraph} - 1
2860} 3081}
2861 3082
2862sub scroll_to { 3083sub scroll_to {
2863 my ($self, $para) = @_; 3084 my ($self, $para) = @_;
2864 3085
2865 $self->force_uptodate;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 3086 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868 3087
2869 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 3088 $self->{scroll_to} = $para;
3089 $self->update;
2870} 3090}
2871 3091
2872sub clear { 3092sub clear {
2873 my ($self) = @_; 3093 my ($self) = @_;
2874 3094
2896 3116
2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3117 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para; 3118 push @{$self->{par}}, $para;
2899 } 3119 }
2900 3120
3121 if (my $max = $self->{max_par}) {
3122 shift @{$self->{par}} while @{$self->{par}} > $max;
3123 }
3124
2901 $self->{need_reflow}++; 3125 $self->{need_reflow}++;
2902 $self->update; 3126 $self->update;
2903} 3127}
2904 3128
2905sub scroll_to_bottom { 3129sub scroll_to_bottom {
2906 my ($self) = @_; 3130 my ($self) = @_;
2907 3131
2908 $self->{scroll_to_bottom} = 1; 3132 $self->{scroll_to} = $#{$self->{par}};
2909 $self->update; 3133 $self->update;
2910} 3134}
2911 3135
2912sub force_uptodate { 3136sub force_uptodate {
2913 my ($self) = @_; 3137 my ($self) = @_;
2914 3138
2915 if (delete $self->{need_reflow}) { 3139 if (delete $self->{need_reflow}) {
2916 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3140 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917 3141
2918 my $height = 0; 3142 my $height = 0;
2919 my $paridx;
2920 my $top_paragraph;
2921 my $top = int $self->{children}[1]{range}[0];
2922 3143
2923 for my $para (@{$self->{par}}) { 3144 for my $para (@{$self->{par}}) {
2924 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3145 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925 my $layout = $self->get_layout ($para); 3146 my $layout = $self->get_layout ($para);
2926 my ($w, $h) = $layout->size; 3147 my ($w, $h) = $layout->size;
2929 $para->{h} = $h; 3150 $para->{h} = $h;
2930 $para->{wrapped} = $layout->has_wrapped; 3151 $para->{wrapped} = $layout->has_wrapped;
2931 } 3152 }
2932 3153
2933 $para->{y} = $height; 3154 $para->{y} = $height;
2934
2935 $paridx++;
2936 $top_paragraph ||= $paridx if $height >= $top;
2937
2938 $height += $para->{h}; 3155 $height += $para->{h};
2939 } 3156 }
2940 3157
2941 $self->{top_paragraph} = $top_paragraph;
2942 $self->{height} = $height; 3158 $self->{height} = $height;
2943
2944 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3159 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2945 3160
2946 delete $self->{texture}; 3161 delete $self->{texture};
2947 } 3162 }
2948 3163
2949 if (delete $self->{scroll_to_bottom}) { 3164 if (my $paridx = delete $self->{scroll_to}) {
2950 $self->{children}[1]->set_value (1e10); 3165 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2951 } 3166 }
2952} 3167}
2953 3168
2954sub update { 3169sub update {
2955 my ($self) = @_; 3170 my ($self) = @_;
2967 3182
2968 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3183 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2969 glClearColor 0, 0, 0, 0; 3184 glClearColor 0, 0, 0, 0;
2970 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2971 3186
3187 package CFPlus::UI::Base;
3188 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3189 (0, 0, $self->{w}, $self->{h});
3190
3191 my $top = int $self->{children}[1]{range}[0];
3192
3193 my $paridx = 0;
3194 my $top_paragraph;
2972 my $top = int $self->{children}[1]{range}[0]; 3195 my $top = int $self->{children}[1]{range}[0];
2973 3196
2974 my $y0 = $top; 3197 my $y0 = $top;
2975 my $y1 = $top + $H; 3198 my $y1 = $top + $H;
2976 3199
2994 3217
2995 $_->draw; 3218 $_->draw;
2996 } 3219 }
2997 } 3220 }
2998 } 3221 }
3222
3223 $paridx++;
3224 $top_paragraph ||= $paridx if $y >= $top;
2999 } 3225 }
3226
3227 $self->{top_paragraph} = $top_paragraph;
3000 }; 3228 };
3001 }); 3229 });
3002} 3230}
3003 3231
3004sub reconfigure { 3232sub reconfigure {
3207 3435
3208sub new { 3436sub new {
3209 my $class = shift; 3437 my $class = shift;
3210 3438
3211 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
3440 size_w => 32,
3441 size_h => 8,
3212 aspect => 1, 3442 aspect => 1,
3213 can_events => 0, 3443 can_events => 0,
3214 @_, 3444 @_,
3215 ); 3445 );
3216 3446
3217 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3218 Scalar::Util::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3219 3449
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3220 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3221 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222 hard => 1, 3453 parked => 1,
3223 interval => $self->{animspeed},
3224 cb => sub { 3454 cb => sub {
3455 return unless $::CONN && $widget;
3456
3225 ++$widget->{frame}; 3457 ++$widget->{frame};
3458 $widget->update_face;
3226 $widget->update; 3459 $widget->update;
3460
3461 $widget->update_timer;
3227 }, 3462 },
3228 ); 3463 );
3464
3465 $self->update_face;
3466 $self->update_timer;
3229 } 3467 }
3230 3468
3231 $self 3469 $self
3232} 3470}
3233 3471
3472sub update_timer {
3473 my ($self) = @_;
3474
3475 return unless $self->{timer};
3476
3477 if ($self->{visible}) {
3478 $self->{timer}->at (
3479 $self->{anim_start}
3480 + $self->{animspeed}
3481 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3482 );
3483 $self->{timer}->start;
3484 } else {
3485 $self->{timer}->stop;
3486 }
3487}
3488
3489sub update_face {
3490 my ($self) = @_;
3491
3492 return unless $::CONN;
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3499 }
3500 }
3501}
3502
3234sub size_request { 3503sub size_request {
3235 (32, 8) 3504 my ($self) = @_;
3505
3506 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc;
3514 });
3515 }
3516 }
3517 }
3518
3519 ($self->{size_w} || 8, $self->{size_h} || 8)
3236} 3520}
3237 3521
3238sub update { 3522sub update {
3239 my ($self) = @_; 3523 my ($self) = @_;
3240 3524
3241 return unless $self->{visible}; 3525 return unless $self->{visible};
3242 3526
3243 $self->SUPER::update; 3527 $self->SUPER::update;
3244} 3528}
3245 3529
3530sub invoke_visibility_change {
3531 my ($self) = @_;
3532
3533 $self->update_timer;
3534
3535 0
3536}
3537
3246sub _draw { 3538sub _draw {
3247 my ($self) = @_; 3539 my ($self) = @_;
3248 3540
3249 return unless $::CONN;
3250
3251 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3252 3542
3253 my $face; 3543 if (my $tex = $self->{tex}) {
3254
3255 if ($self->{frame}) {
3256 my $anim = $::CONN->{anim}[$self->{anim}];
3257
3258 $face = $anim->[ $self->{frame} % @$anim ]
3259 if $anim && @$anim;
3260 }
3261
3262 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3263
3264 if ($tex) {
3265 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3267 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3268 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3269 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
3271} 3550}
3272 3551
3273sub destroy { 3552sub destroy {
3274 my ($self) = @_; 3553 my ($self) = @_;
3275 3554
3276 $self->{timer}->cancel 3555 (delete $self->{timer})->cancel
3277 if $self->{timer}; 3556 if $self->{timer};
3278 3557
3279 $self->SUPER::destroy; 3558 $self->SUPER::destroy;
3280} 3559}
3281 3560
3283 3562
3284package CFPlus::UI::Buttonbar; 3563package CFPlus::UI::Buttonbar;
3285 3564
3286our @ISA = CFPlus::UI::HBox::; 3565our @ISA = CFPlus::UI::HBox::;
3287 3566
3288# TODO: should actualyl wrap buttons and other goodies. 3567# TODO: should actually wrap buttons and other goodies.
3289 3568
3290############################################################################# 3569#############################################################################
3291 3570
3292package CFPlus::UI::Menu; 3571package CFPlus::UI::Menu;
3293 3572
3471 ); 3750 );
3472 3751
3473 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3474 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3475 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3476 $self 3789 $self
3477} 3790}
3478 3791
3479sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3480 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3481 3806
3482 Scalar::Util::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3483 3809
3484 $self->{buttonbar}->add (new CFPlus::UI::Button
3485 markup => $title,
3486 tooltip => $tooltip,
3487 on_activate => sub { $self->set_current_page ($widget) },
3488 );
3489
3490 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3491} 3811}
3492 3812
3493sub get_current_page { 3813sub get_current_page {
3494 my ($self) = @_; 3814 my ($self) = @_;
3495 3815
3571 my $self = $class->SUPER::new ( 3891 my $self = $class->SUPER::new (
3572 fontsize => 0.8, 3892 fontsize => 0.8,
3573 @_, 3893 @_,
3574 ); 3894 );
3575 3895
3576 Scalar::Util::weaken (my $this = $self); 3896 CFPlus::weaken (my $this = $self);
3577 3897
3578 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3898 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3579 3899
3580 $self 3900 $self
3581} 3901}
3704 $self->SUPER::destroy; 4024 $self->SUPER::destroy;
3705} 4025}
3706 4026
3707############################################################################# 4027#############################################################################
3708 4028
3709package CFPlus::UI::Inventory;
3710
3711our @ISA = CFPlus::UI::Table::;
3712
3713sub new {
3714 my $class = shift;
3715
3716 my $self = $class->SUPER::new (
3717 col_expand => [0, 1, 0],
3718 items => [],
3719 @_,
3720 );
3721
3722 $self->set_sort_order (undef);
3723
3724 $self
3725}
3726
3727sub update_items {
3728 my ($self) = @_;
3729
3730 $self->clear;
3731
3732 my @item = $self->{sort}->(@{ $self->{items} });
3733
3734 my @adds;
3735 my $row = 0;
3736 for my $item ($self->{sort}->(@{ $self->{items} })) {
3737 CFPlus::Item::update_widgets $item;
3738
3739 push @adds, 0, $row, $item->{face_widget};
3740 push @adds, 1, $row, $item->{desc_widget};
3741 push @adds, 2, $row, $item->{weight_widget};
3742
3743 $row++;
3744 }
3745
3746 $self->add (@adds);
3747}
3748
3749sub set_sort_order {
3750 my ($self, $order) = @_;
3751
3752 $self->{sort} = $order ||= sub {
3753 sort {
3754 $a->{type} <=> $b->{type}
3755 or $a->{name} cmp $b->{name}
3756 } @_
3757 };
3758
3759 $self->update_items;
3760}
3761
3762sub set_items {
3763 my ($self, $items) = @_;
3764
3765 $self->{items} = [$items ? values %$items : ()];
3766 $self->update_items;
3767}
3768
3769#############################################################################
3770
3771package CFPlus::UI::SpellList;
3772
3773our @ISA = CFPlus::UI::Table::;
3774
3775sub new {
3776 my $class = shift;
3777
3778 my $self = $class->SUPER::new (
3779 binding => [],
3780 commands => [],
3781 @_,
3782 )
3783}
3784
3785my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3786
3787my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3789my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3791my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3793my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3795my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3797
3798sub rebuild_spell_list {
3799 my ($self) = @_;
3800
3801 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3802 $self->clear;
3803
3804 return unless $::CONN;
3805
3806 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3808 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3809 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3810 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3811
3812 my $row = 0;
3813
3814 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3815 my $spell = $self->{spell}{$_};
3816
3817 $row++;
3818
3819 my $spell_cb = sub {
3820 my ($widget, $ev) = @_;
3821
3822 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) {
3827 (new CFPlus::UI::Menu
3828 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ],
3832 )->popup ($ev);
3833 } else {
3834 return 0;
3835 }
3836
3837 1
3838 };
3839
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3845 $self->add (0, $row, new CFPlus::UI::Face
3846 face => $spell->{face},
3847 can_hover => 1,
3848 can_events => 1,
3849 tooltip => $tooltip,
3850 on_button_down => $spell_cb,
3851 );
3852
3853 $self->add (1, $row, new CFPlus::UI::Label
3854 expand => 1,
3855 text => $spell->{name},
3856 can_hover => 1,
3857 can_events => 1,
3858 tooltip => $tooltip,
3859 on_button_down => $spell_cb,
3860 );
3861
3862 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3863 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3864 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3865 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3866 }
3867 });
3868}
3869
3870sub add_spell {
3871 my ($self, $spell) = @_;
3872
3873 $self->{spell}->{$spell->{name}} = $spell;
3874 $self->rebuild_spell_list;
3875}
3876
3877sub remove_spell {
3878 my ($self, $spell) = @_;
3879
3880 delete $self->{spell}->{$spell->{name}};
3881 $self->rebuild_spell_list;
3882}
3883
3884sub clear_spells {
3885 my ($self) = @_;
3886
3887 $self->{spell} = {};
3888 $self->rebuild_spell_list;
3889}
3890
3891#############################################################################
3892
3893package CFPlus::UI::Root; 4029package CFPlus::UI::Root;
3894 4030
3895our @ISA = CFPlus::UI::Container::; 4031our @ISA = CFPlus::UI::Container::;
3896 4032
3897use List::Util qw(min max); 4033use List::Util qw(min max);
3904 my $self = $class->SUPER::new ( 4040 my $self = $class->SUPER::new (
3905 visible => 1, 4041 visible => 1,
3906 @_, 4042 @_,
3907 ); 4043 );
3908 4044
3909 Scalar::Util::weaken ($self->{root} = $self); 4045 CFPlus::weaken ($self->{root} = $self);
3910 4046
3911 $self 4047 $self
3912} 4048}
3913 4049
3914sub size_request { 4050sub size_request {
4009 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
4010 $_->() 4146 $_->()
4011 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
4012 } 4148 }
4013 4149
4014 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
4015 my %queue; 4151 my %queue;
4016 my @queue; 4152 my @queue;
4017 my $widget; 4153 my $widget;
4018 4154
4019 outer: 4155 outer:
4066 } 4202 }
4067 } 4203 }
4068 4204
4069 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
4070 } 4206 }
4071 }
4072 4207
4073 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
4074 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
4075 values %$size_alloc; 4210 values %$size_alloc;
4076 4211
4077 while () { 4212 while () {
4078 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
4079 4214
4080 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4081 4216
4082 $w = 0 if $w < 0;
4083 $h = 0 if $h < 0;
4084
4085 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
4086 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
4087 4219
4088# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4089# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4090 4222
4091 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4092 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4093 4225
4094 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
4095 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
4096 4228
4097 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4098 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
4099 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
4100 4232
4101 $widget->{w} = $w; 4233 $widget->{w} = $w;
4102 $widget->{h} = $h; 4234 $widget->{h} = $h;
4103 4235
4104 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
4105 } 4238 }
4106 } 4239 }
4107 } 4240 }
4108 4241
4109 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {
4110 $_->() 4243 $_->()
4111 for values %{delete $self->{post_alloc_hook}}; 4244 for values %{delete $self->{post_alloc_hook}};
4112 } 4245 }
4113
4114 4246
4115 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4247 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4116 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4248 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4117 glClear GL_COLOR_BUFFER_BIT; 4249 glClear GL_COLOR_BUFFER_BIT;
4118 4250
4123 glLoadIdentity; 4255 glLoadIdentity;
4124 4256
4125 { 4257 {
4126 package CFPlus::UI::Base; 4258 package CFPlus::UI::Base;
4127 4259
4128 ($draw_x, $draw_y, $draw_w, $draw_h) = 4260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h}); 4261 (0, 0, $self->{w}, $self->{h});
4130 }
4131 4262
4132 $self->_draw; 4263 $self->_draw;
4264 }
4133} 4265}
4134 4266
4135############################################################################# 4267#############################################################################
4136 4268
4137package CFPlus::UI; 4269package CFPlus::UI;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines