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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 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,
… …
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 if ($self->{tooltip} =~ /Apply.*audio/) { 545 for my $cb (
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d# 546 @{$self->{signal_cb}{$signal} || []}, # before
530 warn "3 $self->{parent}\n";#d# 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
531 } 550 }
532 551
533 #d##TODO# stop propagating at first true, do not use sum 552 # parent
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
545} 554}
546 555
547sub find_widget { 556#sub find_widget {
548 my ($self, $x, $y) = @_; 557# in .xs
549
550 return () unless $self->{can_events};
551
552 return $self
553 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556 ()
557}
558 558
559sub set_parent { 559sub set_parent {
560 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
561 561
562 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
564} 564}
565 565
566sub realloc { 566sub realloc {
567 my ($self) = @_; 567 my ($self) = @_;
… …
593 593
594# 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
595# functions seems pointless. 595# functions seems pointless.
596our ($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
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
… …
650 606
651sub DESTROY { 607sub DESTROY {
652 my ($self) = @_; 608 my ($self) = @_;
653 609
654 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
655
656 delete $WIDGET{$self+0};
657 611
658 eval { $self->destroy }; 612 eval { $self->destroy };
659 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};
660} 616}
661 617
662############################################################################# 618#############################################################################
663 619
664package CFPlus::UI::DrawBG; 620package CFPlus::UI::DrawBG;
… …
740 can_events => 0, 696 can_events => 0,
741 %arg, 697 %arg,
742 ); 698 );
743 699
744 $self->add (@$children) 700 $self->add (@$children)
745 if $children; 701 if $children && @$children;
746 702
747 $self 703 $self
748} 704}
749 705
750sub realloc { 706sub realloc {
… …
759 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
760 716
761 $_->set_parent ($self) 717 $_->set_parent ($self)
762 for @widgets; 718 for @widgets;
763 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
764 use sort 'stable'; 721 use sort 'stable';
765 722
766 $self->{children} = [ 723 $self->{children} = [
767 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
768 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
769 ]; 726 ];
770 727
771 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
772} 731}
773 732
774sub children { 733sub children {
775 @{ $_[0]{children} } 734 @{ $_[0]{children} }
776} 735}
… …
787} 746}
788 747
789sub clear { 748sub clear {
790 my ($self) = @_; 749 my ($self) = @_;
791 750
792 my $children = delete $self->{children}; 751 my $children = $self->{children};
793 $self->{children} = []; 752 $self->{children} = [];
794 753
795 for (@$children) { 754 for (@$children) {
796 delete $_->{parent}; 755 delete $_->{parent};
797 $_->hide; 756 $_->hide;
… …
937} 896}
938 897
939############################################################################# 898#############################################################################
940 899
941package CFPlus::UI::ViewPort; 900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
942 903
943our @ISA = CFPlus::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
944 905
945sub new { 906sub new {
946 my $class = shift; 907 my $class = shift;
… …
955sub size_request { 916sub size_request {
956 my ($self) = @_; 917 my ($self) = @_;
957 918
958 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959 920
960 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
961 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
962 923
963 ($w, $h) 924 ($w, $h)
964} 925}
965 926
966sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
978} 939}
979 940
980sub set_offset { 941sub set_offset {
981 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
982 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
983 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
984 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
985 950
951 $self->emit (changed => $x, $y);
986 $self->update; 952 $self->update;
953 }
987} 954}
988 955
989# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
990sub coord2local { 957sub coord2local {
991 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
1006 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1007 974
1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010 ) { 977 ) {
1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012 } else { 979 } else {
1013 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1014 } 981 }
1015} 982}
1016 983
… …
1027 994
1028############################################################################# 995#############################################################################
1029 996
1030package CFPlus::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1031 998
1032our @ISA = CFPlus::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1033 1000
1034sub new { 1001sub new {
1035 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1036 1003
1037 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1038 1005
1039 my $self; 1006 my $self;
1040 1007
1041 my $slider = new CFPlus::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1042 vertical => 1, 1022 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1024 on_changed => sub {
1045 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046 }, 1027 },
1047 ; 1028 ;
1048 1029
1049 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1050 vp => (new CFPlus::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1051 can_events => 1, 1033 can_events => 1,
1052 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1053 %arg, 1038 %arg,
1054 ); 1039 );
1055 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
1056 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1057 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1058 1065
1059 $self 1066 $self
1060} 1067}
1061
1062#TODO# update range on size_allocate depending on child
1063 1068
1064sub add { 1069sub add {
1065 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1066 1071
1067 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1068} 1073}
1069 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1070sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1072 1125
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076 1128
1077 1 1129 1
1078} 1130}
1079 1131
1080sub update_slider { 1132sub invoke_button_down {
1081 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1082 1134
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1084} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1085 1139
1086sub update { 1140 0
1087 my ($self) = @_; 1141}
1088 1142
1089 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1090 1145
1091 $self->update_slider; 1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1092} 1162}
1093 1163
1094sub invoke_size_allocate { 1164sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1096 1166
1097 $self->update_slider; 1167 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1169}
1101 1170
1102############################################################################# 1171#############################################################################
1103 1172
… …
1253 1322
1254my @border = 1323my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1258sub new { 1331sub new {
1259 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1260 1333
1261 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1262 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
… …
1430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431 1504
1432 my $border = $self->border; 1505 my $border = $self->border;
1433 1506
1434 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1435 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439 1526
1440 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1442 1529
1443 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1464 1551
1465############################################################################# 1552#############################################################################
1466 1553
1467package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1468 1555
1469our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1470 1557
1471use List::Util qw(max sum); 1558use List::Util qw(max sum);
1472 1559
1473use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1474 1561
1475sub new { 1562sub new {
1476 my $class = shift; 1563 my $class = shift;
1477 1564
1478 $class->SUPER::new ( 1565 $class->SUPER::new (
1479 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1480 @_, 1568 @_,
1481 ) 1569 )
1482} 1570}
1483 1571
1484sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486}
1487
1488sub add { 1572sub add {
1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1489 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1490 1587
1491 while (@_) { 1588 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child;
1495 }
1496 1590
1497 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1498 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1499 $self->realloc;
1500}
1501 1593
1502sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1503 my ($self, $child) = @_; 1601 my ($self) = @_;
1504 1602
1505 # TODO: not yet implemented 1603 my (@w, @h);
1506}
1507
1508# TODO: move to container class maybe? send children a signal on removal?
1509sub clear {
1510 my ($self) = @_;
1511 1604
1512 my @children = $self->children; 1605 my @children = $self->children;
1513 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1514 1616 }
1515 for (@children) {
1516 delete $_->{parent};
1517 $_->hide;
1518 }
1519 1617
1520 $self->realloc; 1618 # second pass, rows
1521} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1522
1523sub get_wh {
1524 my ($self) = @_;
1525
1526 my (@w, @h);
1527
1528 for my $y (0 .. $#{$self->{children}}) {
1529 my $row = $self->{children}[$y]
1530 or next;
1531
1532 for my $x (0 .. $#$row) {
1533 my $widget = $row->[$x]
1534 or next;
1535 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1536 1621
1537 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1538 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539 } 1626 }
1540 } 1627 }
1541 1628
1542 (\@w, \@h) 1629 (\@w, \@h)
1543} 1630}
… …
1559 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1560 1647
1561 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1563 1650
1564 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1565 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1568 1655
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1657
1573 CFPlus::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1574 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1575 1667
1576 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577 1670
1578 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1579 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1580 or next;
1581 1673
1582 my $x = 0; 1674 $widget->configure (
1583 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584 1677 );
1585 for my $c (0 .. $#$row) { 1678 }
1586 my $col_w = $ws->[$c];
1587 1679
1588 if (my $widget = $row->[$c]) { 1680 1
1589 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1590 }
1591 1682
1592 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1593 } 1721 }
1722 }
1594 1723
1595 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1596 } 1760 }
1597 1761
1598 1 1762 1
1599}
1600
1601sub find_widget {
1602 my ($self, $x, $y) = @_;
1603
1604 $x -= $self->{x};
1605 $y -= $self->{y};
1606
1607 my $res;
1608
1609 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610 $res = $_->find_widget ($x, $y)
1611 and return $res;
1612 }
1613
1614 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615}
1616
1617sub _draw {
1618 my ($self) = @_;
1619
1620 for (grep $_, @{$self->{children}}) {
1621 $_->draw for grep $_, @$_;
1622 }
1623} 1763}
1624 1764
1625############################################################################# 1765#############################################################################
1626 1766
1627package CFPlus::UI::Box; 1767package CFPlus::UI::Box;
… …
1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1889 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1890 }; 2030 };
1891 2031
1892 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
1893 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1894 2040
1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1896} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1897 2051
1898############################################################################# 2052#############################################################################
1899 2053
1900package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1901 2055
… …
1913 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1914 can_hover => 1, 2068 can_hover => 1,
1915 can_focus => 1, 2069 can_focus => 1,
1916 valign => 0, 2070 valign => 0,
1917 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1918 #text => ... 2073 #text => ...
1919 #hidden => "*", 2074 #hidden => "*",
1920 @_ 2075 @_
1921 ) 2076 )
1922} 2077}
… …
1966 my $mod = $ev->{mod}; 2121 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1969 2124
1970 my $text = $self->get_text; 2125 my $text = $self->get_text;
2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2128
1972 if ($uni == 8) { 2129 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
1981 $self->{cursor} = 0; 2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2149 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2150 $text = "";
1986 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2153 $self->emit ('escape');
1989 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2158 } else {
1992 return 0; 2159 return 0;
1993 } 2160 }
1994 2161
1995 $self->_set_text ($text); 2162 $self->_set_text ($text);
1996 2163
1997 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1998 2166
1999 1 2167 1
2000} 2168}
2001 2169
2002sub invoke_focus_in { 2170sub invoke_focus_in {
… …
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2240 glEnd;
2073 } 2241 }
2074} 2242}
2075 2243
2244#############################################################################
2245
2076package CFPlus::UI::Entry; 2246package CFPlus::UI::Entry;
2077 2247
2078our @ISA = CFPlus::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
2079 2249
2080use CFPlus::OpenGL; 2250use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2252sub invoke_key_down {
2083 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
2084 2254
2085 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
2086 2256
2087 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
2090 2260
2091 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
… …
2122 1 2292 1
2123} 2293}
2124 2294
2125############################################################################# 2295#############################################################################
2126 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
2127package CFPlus::UI::Button; 2336package CFPlus::UI::Button;
2128 2337
2129our @ISA = CFPlus::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
2130 2339
2131use CFPlus::OpenGL; 2340use CFPlus::OpenGL;
2132 2341
2133my @tex = 2342my @tex =
2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
2136 2345
2137sub new { 2346sub new {
2138 my $class = shift; 2347 my $class = shift;
2139 2348
2140 $class->SUPER::new ( 2349 $class->SUPER::new (
2141 padding_x => 4, 2350 padding_x => 4,
2142 padding_y => 4, 2351 padding_y => 4,
2143 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
2144 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
2145 can_hover => 1, 2354 can_hover => 1,
2146 align => 0, 2355 align => 0,
2147 valign => 0, 2356 valign => 0,
2148 can_events => 1, 2357 can_events => 1,
2149 @_ 2358 @_
… …
2167 2376
2168 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
2171 2380
2381 my $tex = $tex[$GRAB == $self];
2172 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173 2383
2174 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
2175 2385
2176 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
2177} 2387}
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2483 or Carp::croak "'path' or 'tex' attributes required";
2274 2484
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277 2487
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2488 CFPlus::weaken $texture_cache{$self->{path}};
2279 2489
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2491
2282 $self 2492 $self
2283} 2493}
… …
2656sub invoke_mouse_wheel { 2866sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2867 my ($self, $ev) = @_;
2658 2868
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2874
2663 ! ! $delta 2875 ! ! $delta
2664} 2876}
2665 2877
2666sub update { 2878sub update {
… …
2776 #font => default_font 2988 #font => default_font
2777 @_, 2989 @_,
2778 2990
2779 layout => (new CFPlus::Layout), 2991 layout => (new CFPlus::Layout),
2780 par => [], 2992 par => [],
2993 max_par => 0,
2781 height => 0, 2994 height => 0,
2782 children => [ 2995 children => [
2783 (new CFPlus::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2785 ], 2998 ],
… …
2908 wrapped => 1, 3121 wrapped => 1,
2909 }; 3122 };
2910 3123
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
2913 } 3130 }
2914 3131
2915 $self->{need_reflow}++; 3132 $self->{need_reflow}++;
2916 $self->update; 3133 $self->update;
2917} 3134}
… …
3225 3442
3226sub new { 3443sub new {
3227 my $class = shift; 3444 my $class = shift;
3228 3445
3229 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
3230 aspect => 1, 3449 aspect => 1,
3231 can_events => 0, 3450 can_events => 0,
3232 @_, 3451 @_,
3233 ); 3452 );
3234 3453
3235 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
3237 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3238 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3460 parked => 1,
3241 interval => $self->{animspeed},
3242 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
3243 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
3244 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
3245 }, 3469 },
3246 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
3247 } 3474 }
3248 3475
3249 $self 3476 $self
3250} 3477}
3251 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
3252sub size_request { 3510sub size_request {
3253 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
3254} 3527}
3255 3528
3256sub update { 3529sub update {
3257 my ($self) = @_; 3530 my ($self) = @_;
3258 3531
3259 return unless $self->{visible}; 3532 return unless $self->{visible};
3260 3533
3261 $self->SUPER::update; 3534 $self->SUPER::update;
3262} 3535}
3263 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
3264sub _draw { 3545sub _draw {
3265 my ($self) = @_; 3546 my ($self) = @_;
3266 3547
3267 return unless $::CONN;
3268
3269 $self->SUPER::_draw; 3548 $self->SUPER::_draw;
3270 3549
3271 my $face; 3550 if (my $tex = $self->{tex}) {
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}];
3275
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3281
3282 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
3289} 3557}
3290 3558
3291sub destroy { 3559sub destroy {
3292 my ($self) = @_; 3560 my ($self) = @_;
3293 3561
3294 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
3295 if $self->{timer}; 3563 if $self->{timer};
3296 3564
3297 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
3298} 3566}
3299 3567
… …
3495} 3763}
3496 3764
3497sub add { 3765sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3499 3767
3500 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3501 3769
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3503 markup => $title, 3772 markup => $title,
3504 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3505 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3506 ); 3778 $self->{buttonbar}->add ($title);
3507 3779
3508 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3509} 3781}
3510 3782
3511sub get_current_page { 3783sub get_current_page {
… …
3589 my $self = $class->SUPER::new ( 3861 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3862 fontsize => 0.8,
3591 @_, 3863 @_,
3592 ); 3864 );
3593 3865
3594 Scalar::Util::weaken (my $this = $self); 3866 CFPlus::weaken (my $this = $self);
3595 3867
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597 3869
3598 $self 3870 $self
3599} 3871}
… …
3722 $self->SUPER::destroy; 3994 $self->SUPER::destroy;
3723} 3995}
3724 3996
3725############################################################################# 3997#############################################################################
3726 3998
3727package CFPlus::UI::Inventory;
3728
3729our @ISA = CFPlus::UI::Table::;
3730
3731sub new {
3732 my $class = shift;
3733
3734 my $self = $class->SUPER::new (
3735 col_expand => [0, 1, 0],
3736 items => [],
3737 @_,
3738 );
3739
3740 $self->set_sort_order (undef);
3741
3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3778}
3779
3780sub set_items {
3781 my ($self, $items) = @_;
3782
3783 $self->{items} = [$items ? values %$items : ()];
3784 $self->update_items;
3785}
3786
3787#############################################################################
3788
3789package CFPlus::UI::SpellList;
3790
3791our @ISA = CFPlus::UI::Table::;
3792
3793sub new {
3794 my $class = shift;
3795
3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3802
3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3888sub add_spell {
3889 my ($self, $spell) = @_;
3890
3891 $self->{spell}->{$spell->{name}} = $spell;
3892 $self->rebuild_spell_list;
3893}
3894
3895sub remove_spell {
3896 my ($self, $spell) = @_;
3897
3898 delete $self->{spell}->{$spell->{name}};
3899 $self->rebuild_spell_list;
3900}
3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3909#############################################################################
3910
3911package CFPlus::UI::Root; 3999package CFPlus::UI::Root;
3912 4000
3913our @ISA = CFPlus::UI::Container::; 4001our @ISA = CFPlus::UI::Container::;
3914 4002
3915use List::Util qw(min max); 4003use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3923 visible => 1, 4011 visible => 1,
3924 @_, 4012 @_,
3925 ); 4013 );
3926 4014
3927 Scalar::Util::weaken ($self->{root} = $self); 4015 CFPlus::weaken ($self->{root} = $self);
3928 4016
3929 $self 4017 $self
3930} 4018}
3931 4019
3932sub size_request { 4020sub size_request {
… …
4027 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
4028 $_->() 4116 $_->()
4029 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
4030 } 4118 }
4031 4119
4032 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
4033 my %queue; 4121 my %queue;
4034 my @queue; 4122 my @queue;
4035 my $widget; 4123 my $widget;
4036 4124
4037 outer: 4125 outer:
… …
4084 } 4172 }
4085 } 4173 }
4086 4174
4087 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
4088 } 4176 }
4089 }
4090 4177
4091 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
4092 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
4093 values %$size_alloc; 4180 values %$size_alloc;
4094 4181
4095 while () { 4182 while () {
4096 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
4097 4184
4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099 4186
4100 $w = 0 if $w < 0;
4101 $h = 0 if $h < 0;
4102
4103 $w = max $widget->{min_w}, $w; 4187 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h; 4188 $h = max $widget->{min_h}, $h;
4105 4189
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108 4192
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111 4195
4112 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
4113 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
4114 4198
4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
4117 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
4118 4202
4119 $widget->{w} = $w; 4203 $widget->{w} = $w;
4120 $widget->{h} = $h; 4204 $widget->{h} = $h;
4121 4205
4122 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
4123 } 4208 }
4124 } 4209 }
4125 } 4210 }
4126 4211
4127 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {
4128 $_->() 4213 $_->()
4129 for values %{delete $self->{post_alloc_hook}}; 4214 for values %{delete $self->{post_alloc_hook}};
4130 } 4215 }
4131
4132 4216
4133 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4217 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4218 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135 glClear GL_COLOR_BUFFER_BIT; 4219 glClear GL_COLOR_BUFFER_BIT;
4136 4220

Diff Legend

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