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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 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";
… …
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 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
974} 977}
975 978
976# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 980sub coord2local {
978 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
994 997
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1000 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1002 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1004 }
1002} 1005}
1003 1006
… …
1014 1017
1015############################################################################# 1018#############################################################################
1016 1019
1017package CFPlus::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1018 1021
1019our @ISA = CFPlus::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1020 1023
1021sub new { 1024sub new {
1022 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1023 1026
1024 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1025 1028
1026 my $self; 1029 my $self;
1027 1030
1028 my $slider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1029 vertical => 1, 1045 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1047 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1050 },
1034 ; 1051 ;
1035 1052
1036 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1038 can_events => 1, 1056 can_events => 1,
1039 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1040 %arg, 1061 %arg,
1041 ); 1062 );
1042 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1044 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1045 1088
1046 $self 1089 $self
1047} 1090}
1048
1049#TODO# update range on size_allocate depending on child
1050 1091
1051sub add { 1092sub add {
1052 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1053 1094
1054 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1055} 1096}
1056 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1057sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1059 1152
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1155
1064 1 1156 1
1065} 1157}
1066 1158
1067sub update_slider { 1159sub invoke_button_down {
1068 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1069 1161
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1071} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1072 1166
1073sub update { 1167 0
1074 my ($self) = @_; 1168}
1075 1169
1076 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1077 1172
1078 $self->update_slider; 1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1079} 1189}
1080 1190
1081sub invoke_size_allocate { 1191sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1083 1193
1084 $self->update_slider; 1194 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1196}
1088 1197
1089############################################################################# 1198#############################################################################
1090 1199
… …
1132 1241
1133our @ISA = CFPlus::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1134 1243
1135use CFPlus::OpenGL; 1244use CFPlus::OpenGL;
1136 1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1137my $bg = 1346my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1140 1349
1141my @border = 1350my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 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); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1144 1357
1145sub new { 1358sub new {
1146 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1147 1360
1148 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1531
1319 my $border = $self->border; 1532 my $border = $self->border;
1320 1533
1321 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1326 1553
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1329 1556
1330 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1351 1578
1352############################################################################# 1579#############################################################################
1353 1580
1354package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1355 1582
1356our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1357 1584
1358use List::Util qw(max sum); 1585use List::Util qw(max sum);
1359 1586
1360use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1361 1588
1362sub new { 1589sub new {
1363 my $class = shift; 1590 my $class = shift;
1364 1591
1365 $class->SUPER::new ( 1592 $class->SUPER::new (
1366 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1367 @_, 1595 @_,
1368 ) 1596 )
1369} 1597}
1370 1598
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1376 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1377 1614
1378 while (@_) { 1615 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1617
1384 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1385 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1386 $self->realloc;
1387}
1388 1620
1389sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1390 my ($self, $child) = @_; 1628 my ($self) = @_;
1391 1629
1392 # TODO: not yet implemented 1630 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1631
1399 my @children = $self->children; 1632 my @children = $self->children;
1400 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1401 1643 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1644
1407 $self->realloc; 1645 # second pass, rows
1408} 1646 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)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1423 1648
1424 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1653 }
1427 } 1654 }
1428 1655
1429 (\@w, \@h) 1656 (\@w, \@h)
1430} 1657}
… …
1446 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1447 1674
1448 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1450 1677
1451 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1455 1682
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1684
1460 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1461 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1462 1694
1463 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1697
1465 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1467 or next;
1468 1700
1469 my $x = 0; 1701 $widget->configure (
1470 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1704 );
1472 for my $c (0 .. $#$row) { 1705 }
1473 my $col_w = $ws->[$c];
1474 1706
1475 if (my $widget = $row->[$c]) { 1707 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1477 }
1478 1709
1479 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1480 } 1737 }
1738 }
1481 1739
1482 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1483 } 1771 }
1484 1772
1485 1 1773 1
1486} 1774}
1487 1775
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############################################################################# 1776#############################################################################
1513 1777
1514package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1515 1779
1516our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1517 1781
1518sub size_request { 1782sub size_request {
1519 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1520 1786
1521 $self->{vertical} 1787 $self->{vertical}
1522 ? ( 1788 ? (
1523 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1524 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1525 ) 1791 )
1526 : ( 1792 : (
1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1528 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1529 ) 1795 )
1530} 1796}
1531 1797
1532sub invoke_size_allocate { 1798sub invoke_size_allocate {
1533 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1777 }; 2043 };
1778 2044
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1781 2053
1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1784 2064
1785############################################################################# 2065#############################################################################
1786 2066
1787package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1788 2068
… …
1794 my $class = shift; 2074 my $class = shift;
1795 2075
1796 $class->SUPER::new ( 2076 $class->SUPER::new (
1797 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1799 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1801 can_hover => 1, 2083 can_hover => 1,
1802 can_focus => 1, 2084 can_focus => 1,
1803 valign => 0, 2085 valign => 0,
1804 can_events => 1, 2086 can_events => 1,
2087 ellipsise => 0,
1805 #text => ... 2088 #text => ...
1806 #hidden => "*", 2089 #hidden => "*",
1807 @_ 2090 @_
1808 ) 2091 )
1809} 2092}
… …
1853 my $mod = $ev->{mod}; 2136 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2137 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2138 my $uni = $ev->{unicode};
1856 2139
1857 my $text = $self->get_text; 2140 my $text = $self->get_text;
2141
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2143
1859 if ($uni == 8) { 2144 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2146 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2147 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2148 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2149 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2150 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2152 } elsif ($sym == CFPlus::SDLK_HOME) {
2153 # what a hack
2154 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1
2157 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) {
2159 # uh, again
2160 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1
2163 : length $self->{text};
2164 } elsif ($uni == 21) { # ctrl-u
2165 $text = "";
1868 $self->{cursor} = 0; 2166 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2167 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2168 $self->emit ('escape');
1873 } elsif ($uni) { 2169 } elsif ($uni == 0x0d) {
2170 substr $text, $self->{cursor}++, 0, "\012";
2171 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2172 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2173 } else {
1876 return 0; 2174 return 0;
1877 } 2175 }
1878 2176
1879 $self->_set_text ($text); 2177 $self->_set_text ($text);
1880 2178
1881 $self->realloc; 2179 $self->realloc;
2180 $self->update;
1882 2181
1883 1 2182 1
1884} 2183}
1885 2184
1886sub invoke_focus_in { 2185sub invoke_focus_in {
… …
1945 2244
1946 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2247 utf8::encode $text;
1949 2248
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951 } 2250 }
1952 2251
2252 glColor_premultiply @{$self->{active_fg}};
1953 glBegin GL_LINES; 2253 glBegin GL_LINES;
1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 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}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2256 glEnd;
2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
1957 } 2277 }
1958} 2278}
2279
2280#############################################################################
1959 2281
1960package CFPlus::UI::Entry; 2282package CFPlus::UI::Entry;
1961 2283
1962our @ISA = CFPlus::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1963 2285
… …
1966sub invoke_key_down { 2288sub invoke_key_down {
1967 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1968 2290
1969 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1970 2292
1971 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1974 2296
1975 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
… …
2006 1 2328 1
2007} 2329}
2008 2330
2009############################################################################# 2331#############################################################################
2010 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
2011package CFPlus::UI::Button; 2372package CFPlus::UI::ButtonBin;
2012 2373
2013our @ISA = CFPlus::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
2014 2375
2015use CFPlus::OpenGL; 2376use CFPlus::OpenGL;
2016 2377
2017my @tex = 2378my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
2020 2381
2021sub new { 2382sub new {
2022 my $class = shift; 2383 my $class = shift;
2023 2384
2024 $class->SUPER::new ( 2385 $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, 2386 can_hover => 1,
2030 align => 0, 2387 align => 0,
2031 valign => 0, 2388 valign => 0,
2032 can_events => 1, 2389 can_events => 1,
2033 @_ 2390 @_
… …
2045} 2402}
2046 2403
2047sub _draw { 2404sub _draw {
2048 my ($self) = @_; 2405 my ($self) = @_;
2049 2406
2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2051
2052 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2055 2410
2411 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2413
2414 glDisable GL_TEXTURE_2D;
2415
2416 $self->SUPER::_draw;
2417}
2418
2419#############################################################################
2420
2421package CFPlus::UI::Button;
2422
2423our @ISA = CFPlus::UI::Label::;
2424
2425use CFPlus::OpenGL;
2426
2427my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png);
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
2435 padding_x => 4,
2436 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1,
2440 align => 0,
2441 valign => 0,
2442 can_events => 1,
2443 @_
2444 )
2445}
2446
2447sub invoke_button_up {
2448 my ($self, $ev, $x, $y) = @_;
2449
2450 $self->emit ("activate")
2451 if $x >= 0 && $x < $self->{w}
2452 && $y >= 0 && $y < $self->{h};
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2461
2462 glEnable GL_TEXTURE_2D;
2463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2464 glColor 0, 0, 0, 1;
2465
2466 my $tex = $tex[$GRAB == $self];
2467 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2468
2058 glDisable GL_TEXTURE_2D; 2469 glDisable GL_TEXTURE_2D;
2059 2470
2060 $self->SUPER::_draw; 2471 $self->SUPER::_draw;
2061} 2472}
… …
2148sub new { 2559sub new {
2149 my $class = shift; 2560 my $class = shift;
2150 2561
2151 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2152 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2153 @_, 2565 @_,
2154 ); 2566 );
2155 2567
2156 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
2158 2570
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2571 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161 2573
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2574 CFPlus::weaken $texture_cache{$self->{path}};
2163 2575
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2577
2166 $self 2578 $self
2167} 2579}
… …
2182} 2594}
2183 2595
2184sub size_request { 2596sub size_request {
2185 my ($self) = @_; 2597 my ($self) = @_;
2186 2598
2187 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2188} 2600}
2189 2601
2190sub _draw { 2602sub _draw {
2191 my ($self) = @_; 2603 my ($self) = @_;
2192 2604
… …
2202 } 2614 }
2203 2615
2204 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2206 2618
2207 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2208 2620
2209 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2210} 2622}
2211 2623
2212############################################################################# 2624#############################################################################
… …
2514 2926
2515 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516 2928
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518 2930
2519 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2520} 2934}
2521 2935
2522sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2523 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2524 2938
… …
2540sub invoke_mouse_wheel { 2954sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2955 my ($self, $ev) = @_;
2542 2956
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2958
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2960
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2962
2547 ! ! $delta 2963 1
2548} 2964}
2549 2965
2550sub update { 2966sub update {
2551 my ($self) = @_; 2967 my ($self) = @_;
2552 2968
… …
2660 #font => default_font 3076 #font => default_font
2661 @_, 3077 @_,
2662 3078
2663 layout => (new CFPlus::Layout), 3079 layout => (new CFPlus::Layout),
2664 par => [], 3080 par => [],
3081 max_par => 0,
2665 height => 0, 3082 height => 0,
2666 children => [ 3083 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3084 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3085 (new CFPlus::UI::Slider vertical => 1),
2669 ], 3086 ],
… …
2682} 3099}
2683 3100
2684sub size_request { 3101sub size_request {
2685 my ($self) = @_; 3102 my ($self) = @_;
2686 3103
2687 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
2688 3105
2689 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request 3107 $self->SUPER::size_request
2691} 3108}
2692 3109
… …
2748sub set_offset { 3165sub set_offset {
2749 my ($self, $offset) = @_; 3166 my ($self, $offset) = @_;
2750 3167
2751 # todo: base offset on lines or so, not on pixels 3168 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 3169 $self->{children}[1]->set_value ($offset);
3170}
3171
3172sub current_paragraph {
3173 my ($self) = @_;
3174
3175 $self->{top_paragraph} - 1
3176}
3177
3178sub scroll_to {
3179 my ($self, $para) = @_;
3180
3181 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3182
3183 $self->{scroll_to} = $para;
3184 $self->update;
2753} 3185}
2754 3186
2755sub clear { 3187sub clear {
2756 my ($self) = @_; 3188 my ($self) = @_;
2757 3189
… …
2779 3211
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3212 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3213 push @{$self->{par}}, $para;
2782 } 3214 }
2783 3215
3216 if (my $max = $self->{max_par}) {
3217 shift @{$self->{par}} while @{$self->{par}} > $max;
3218 }
3219
2784 $self->{need_reflow}++; 3220 $self->{need_reflow}++;
2785 $self->update; 3221 $self->update;
2786} 3222}
2787 3223
2788sub scroll_to_bottom { 3224sub scroll_to_bottom {
2789 my ($self) = @_; 3225 my ($self) = @_;
2790 3226
2791 $self->{scroll_to_bottom} = 1; 3227 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3228 $self->update;
2793} 3229}
2794 3230
3231sub force_uptodate {
3232 my ($self) = @_;
3233
3234 if (delete $self->{need_reflow}) {
3235 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3236
3237 my $height = 0;
3238
3239 for my $para (@{$self->{par}}) {
3240 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3241 my $layout = $self->get_layout ($para);
3242 my ($w, $h) = $layout->size;
3243
3244 $para->{w} = $w + $para->{indent};
3245 $para->{h} = $h;
3246 $para->{wrapped} = $layout->has_wrapped;
3247 }
3248
3249 $para->{y} = $height;
3250 $height += $para->{h};
3251 }
3252
3253 $self->{height} = $height;
3254 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3255
3256 delete $self->{texture};
3257 }
3258
3259 if (my $paridx = delete $self->{scroll_to}) {
3260 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3261 }
3262}
3263
2795sub update { 3264sub update {
2796 my ($self) = @_; 3265 my ($self) = @_;
2797 3266
2798 $self->SUPER::update; 3267 $self->SUPER::update;
2799 3268
2800 return unless $self->{h} > 0; 3269 return unless $self->{h} > 0;
2801 3270
2802 delete $self->{texture}; 3271 delete $self->{texture};
2803 3272
2804 $ROOT->on_post_alloc ($self => sub { 3273 $ROOT->on_post_alloc ($self => sub {
3274 $self->force_uptodate;
3275
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3277
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3278 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3279 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3280 glClear GL_COLOR_BUFFER_BIT;
2837 3281
3282 package CFPlus::UI::Base;
3283 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284 (0, 0, $self->{w}, $self->{h});
3285
3286 my $top = int $self->{children}[1]{range}[0];
3287
3288 my $paridx = 0;
3289 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3290 my $top = int $self->{children}[1]{range}[0];
2839 3291
2840 my $y0 = $top; 3292 my $y0 = $top;
2841 my $y1 = $top + $H; 3293 my $y1 = $top + $H;
2842 3294
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3295 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3296 my $h = $para->{h};
3297 my $y = $para->{y};
2847 3298
2848 if ($y0 < $y + $h && $y < $y1) { 3299 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3300 my $layout = $self->get_layout ($para);
2851 3301
2852 $layout->render ($para->{indent}, $y - $y0); 3302 $layout->render ($para->{indent}, $y - $y0);
2853 3303
2854 if (my @w = @{ $para->{widget} }) { 3304 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 3313 $_->draw;
2864 } 3314 }
2865 } 3315 }
2866 } 3316 }
2867 3317
2868 $y += $h; 3318 $paridx++;
3319 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3320 }
3321
3322 $self->{top_paragraph} = $top_paragraph;
2870 }; 3323 };
2871 }); 3324 });
2872} 3325}
2873 3326
2874sub reconfigure { 3327sub reconfigure {
… …
3045 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3046 3499
3047 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3048 3501
3049 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3050 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3051 glVertex 0 , 0;
3052 glVertex 0 , $h;
3053 glVertex $w, $h;
3054 glVertex $w, 0;
3055 glEnd;
3056 3504
3057 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3058 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3059 glVertex 0 , 0; 3507 glVertex 0 , 0;
3060 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3077 3525
3078sub new { 3526sub new {
3079 my $class = shift; 3527 my $class = shift;
3080 3528
3081 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
3082 aspect => 1, 3532 aspect => 1,
3083 can_events => 0, 3533 can_events => 0,
3084 @_, 3534 @_,
3085 ); 3535 );
3086 3536
3087 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
3089 3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3090 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3092 hard => 1, 3543 parked => 1,
3093 interval => $self->{animspeed},
3094 cb => sub { 3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
3095 ++$widget->{frame}; 3547 ++$widget->{frame};
3548 $widget->update_face;
3096 $widget->update; 3549 $widget->update;
3550
3551 $widget->update_timer;
3097 }, 3552 },
3098 ); 3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
3099 } 3557 }
3100 3558
3101 $self 3559 $self
3102} 3560}
3103 3561
3562sub update_timer {
3563 my ($self) = @_;
3564
3565 return unless $self->{timer};
3566
3567 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start;
3574 } else {
3575 $self->{timer}->stop;
3576 }
3577}
3578
3579sub update_face {
3580 my ($self) = @_;
3581
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
3591}
3592
3104sub size_request { 3593sub size_request {
3105 (32, 8) 3594 my ($self) = @_;
3595
3596 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc;
3604 });
3605 }
3606 }
3607 }
3608
3609 ($self->{size_w} || 8, $self->{size_h} || 8)
3106} 3610}
3107 3611
3108sub update { 3612sub update {
3109 my ($self) = @_; 3613 my ($self) = @_;
3110 3614
3111 return unless $self->{visible}; 3615 return unless $self->{visible};
3112 3616
3113 $self->SUPER::update; 3617 $self->SUPER::update;
3114} 3618}
3115 3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
3626}
3627
3116sub _draw { 3628sub _draw {
3117 my ($self) = @_; 3629 my ($self) = @_;
3118 3630
3119 return unless $::CONN;
3120
3121 $self->SUPER::_draw; 3631 $self->SUPER::_draw;
3122 3632
3123 my $face; 3633 if (my $tex = $self->{tex}) {
3124
3125 if ($self->{frame}) {
3126 my $anim = $::CONN->{anim}[$self->{anim}];
3127
3128 $face = $anim->[ $self->{frame} % @$anim ]
3129 if $anim && @$anim;
3130 }
3131
3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3133
3134 if ($tex) {
3135 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3137 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3139 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
… …
3141} 3640}
3142 3641
3143sub destroy { 3642sub destroy {
3144 my ($self) = @_; 3643 my ($self) = @_;
3145 3644
3146 $self->{timer}->cancel 3645 (delete $self->{timer})->cancel
3147 if $self->{timer}; 3646 if $self->{timer};
3148 3647
3149 $self->SUPER::destroy; 3648 $self->SUPER::destroy;
3150} 3649}
3151 3650
… …
3153 3652
3154package CFPlus::UI::Buttonbar; 3653package CFPlus::UI::Buttonbar;
3155 3654
3156our @ISA = CFPlus::UI::HBox::; 3655our @ISA = CFPlus::UI::HBox::;
3157 3656
3158# TODO: should actualyl wrap buttons and other goodies. 3657# TODO: should actually wrap buttons and other goodies.
3159 3658
3160############################################################################# 3659#############################################################################
3161 3660
3162package CFPlus::UI::Menu; 3661package CFPlus::UI::Menu;
3163 3662
3164our @ISA = CFPlus::UI::FancyFrame::; 3663our @ISA = CFPlus::UI::Toplevel::;
3165 3664
3166use CFPlus::OpenGL; 3665use CFPlus::OpenGL;
3167 3666
3168sub new { 3667sub new {
3169 my $class = shift; 3668 my $class = shift;
… …
3191 children => [ 3690 children => [
3192 (new CFPlus::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3193 (new CFPlus::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3194 ], 3693 ],
3195 ; 3694 ;
3196 3695
3197 } else { 3696 } else {
3198 $widget = new CFPlus::UI::Label 3697 $widget = new CFPlus::UI::Label
3199 can_hover => 1, 3698 can_hover => 1,
3200 can_events => 1, 3699 can_events => 1,
3201 markup => $widget, 3700 markup => $widget,
… …
3337 buttonbar => (new CFPlus::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3339 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3340 @_, 3839 @_,
3341 ); 3840 );
3342 3841
3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3344 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3345 3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3346 $self 3879 $self
3347} 3880}
3348 3881
3349sub add { 3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3350 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3351 3901
3352 Scalar::Util::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3353 3904
3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title,
3356 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) },
3358 );
3359
3360 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3361} 3906}
3362 3907
3363sub get_current_page { 3908sub get_current_page {
3364 my ($self) = @_; 3909 my ($self) = @_;
3365 3910
… …
3441 my $self = $class->SUPER::new ( 3986 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 3987 fontsize => 0.8,
3443 @_, 3988 @_,
3444 ); 3989 );
3445 3990
3446 Scalar::Util::weaken (my $this = $self); 3991 CFPlus::weaken (my $this = $self);
3447 3992
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449 3994
3450 $self 3995 $self
3451} 3996}
… …
3574 $self->SUPER::destroy; 4119 $self->SUPER::destroy;
3575} 4120}
3576 4121
3577############################################################################# 4122#############################################################################
3578 4123
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 4124package CFPlus::UI::Root;
3764 4125
3765our @ISA = CFPlus::UI::Container::; 4126our @ISA = CFPlus::UI::Container::;
3766 4127
3767use List::Util qw(min max); 4128use List::Util qw(min max);
… …
3774 my $self = $class->SUPER::new ( 4135 my $self = $class->SUPER::new (
3775 visible => 1, 4136 visible => 1,
3776 @_, 4137 @_,
3777 ); 4138 );
3778 4139
3779 Scalar::Util::weaken ($self->{root} = $self); 4140 CFPlus::weaken ($self->{root} = $self);
3780 4141
3781 $self 4142 $self
3782} 4143}
3783 4144
3784sub size_request { 4145sub size_request {
… …
3879 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
3880 $_->() 4241 $_->()
3881 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
3882 } 4243 }
3883 4244
3884 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
3885 my %queue; 4246 my %queue;
3886 my @queue; 4247 my @queue;
3887 my $widget; 4248 my $widget;
3888 4249
3889 outer: 4250 outer:
… …
3936 } 4297 }
3937 } 4298 }
3938 4299
3939 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
3940 } 4301 }
3941 }
3942 4302
3943 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
3944 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
3945 values %$size_alloc; 4305 values %$size_alloc;
3946 4306
3947 while () { 4307 while () {
3948 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
3949 4309
3950 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3951 4311
3952 $w = 0 if $w < 0;
3953 $h = 0 if $h < 0;
3954
3955 $w = max $widget->{min_w}, $w; 4312 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h; 4313 $h = max $widget->{min_h}, $h;
3957 4314
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960 4317
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3963 4320
3964 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
3965 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
3966 4323
3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3968 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
3969 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
3970 4327
3971 $widget->{w} = $w; 4328 $widget->{w} = $w;
3972 $widget->{h} = $h; 4329 $widget->{h} = $h;
3973 4330
3974 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
3975 } 4333 }
3976 } 4334 }
3977 } 4335 }
3978 4336
3979 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {
3980 $_->() 4338 $_->()
3981 for values %{delete $self->{post_alloc_hook}}; 4339 for values %{delete $self->{post_alloc_hook}};
3982 } 4340 }
3983
3984 4341
3985 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3987 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
3988 4345
… …
3993 glLoadIdentity; 4350 glLoadIdentity;
3994 4351
3995 { 4352 {
3996 package CFPlus::UI::Base; 4353 package CFPlus::UI::Base;
3997 4354
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4355 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4356 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4357
4002 $self->_draw; 4358 $self->_draw;
4359 }
4003} 4360}
4004 4361
4005############################################################################# 4362#############################################################################
4006 4363
4007package CFPlus::UI; 4364package CFPlus::UI;

Diff Legend

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