ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
262 268
263sub destroy { 269sub destroy {
264 my ($self) = @_; 270 my ($self) = @_;
265 271
266 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
268} 279}
269 280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
502 513
503 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
506 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
507} 524}
508 525
509my %has_coords = ( 526my %has_coords = (
510 button_down => 1, 527 button_down => 1,
511 button_up => 1, 528 button_up => 1,
… …
514); 531);
515 532
516sub emit { 533sub emit {
517 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
518 535
519 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
521 my @append 538 my @append
522 = $has_coords{$signal} 539 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
524 : (); 541 : ();
525 542
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 544
528 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 554}
533 555
534sub find_widget { 556#sub find_widget {
535 my ($self, $x, $y) = @_; 557# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 558
546sub set_parent { 559sub set_parent {
547 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
548 561
549 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
551} 564}
552 565
553sub realloc { 566sub realloc {
554 my ($self) = @_; 567 my ($self) = @_;
… …
580 593
581# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 595# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 597
585sub draw { 598#sub draw {
586 my ($self) = @_; 599#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 600
632sub _draw { 601sub _draw {
633 my ($self) = @_; 602 my ($self) = @_;
634 603
635 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
… …
637 606
638sub DESTROY { 607sub DESTROY {
639 my ($self) = @_; 608 my ($self) = @_;
640 609
641 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 611
645 eval { $self->destroy }; 612 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
647} 616}
648 617
649############################################################################# 618#############################################################################
650 619
651package CFPlus::UI::DrawBG; 620package CFPlus::UI::DrawBG;
… …
727 can_events => 0, 696 can_events => 0,
728 %arg, 697 %arg,
729 ); 698 );
730 699
731 $self->add (@$children) 700 $self->add (@$children)
732 if $children; 701 if $children && @$children;
733 702
734 $self 703 $self
735} 704}
736 705
737sub realloc { 706sub realloc {
… …
746 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
747 716
748 $_->set_parent ($self) 717 $_->set_parent ($self)
749 for @widgets; 718 for @widgets;
750 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 721 use sort 'stable';
752 722
753 $self->{children} = [ 723 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
756 ]; 726 ];
757 727
758 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
759} 731}
760 732
761sub children { 733sub children {
762 @{ $_[0]{children} } 734 @{ $_[0]{children} }
763} 735}
… …
774} 746}
775 747
776sub clear { 748sub clear {
777 my ($self) = @_; 749 my ($self) = @_;
778 750
779 my $children = delete $self->{children}; 751 my $children = $self->{children};
780 $self->{children} = []; 752 $self->{children} = [];
781 753
782 for (@$children) { 754 for (@$children) {
783 delete $_->{parent}; 755 delete $_->{parent};
784 $_->hide; 756 $_->hide;
… …
898 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
899 871
900 { 872 {
901 package CFPlus::UI::Base; 873 package CFPlus::UI::Base;
902 874
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
905 } 879 }
906
907 $self->_render;
908 }; 880 };
909} 881}
910 882
911sub _draw { 883sub _draw {
912 my ($self) = @_; 884 my ($self) = @_;
… …
924} 896}
925 897
926############################################################################# 898#############################################################################
927 899
928package CFPlus::UI::ViewPort; 900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
929 903
930our @ISA = CFPlus::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
931 905
932sub new { 906sub new {
933 my $class = shift; 907 my $class = shift;
… …
942sub size_request { 916sub size_request {
943 my ($self) = @_; 917 my ($self) = @_;
944 918
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 920
947 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
949 923
950 ($w, $h) 924 ($w, $h)
951} 925}
952 926
953sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
965} 939}
966 940
967sub set_offset { 941sub set_offset {
968 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
969 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}) {
970 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
972 950
951 $self->emit (changed => $x, $y);
973 $self->update; 952 $self->update;
953 }
974} 954}
975 955
976# 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
977sub coord2local { 957sub coord2local {
978 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
994 974
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 977 ) {
998 $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})
999 } else { 979 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 981 }
1002} 982}
1003 983
… …
1014 994
1015############################################################################# 995#############################################################################
1016 996
1017package CFPlus::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1018 998
1019our @ISA = CFPlus::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1020 1000
1021sub new { 1001sub new {
1022 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1023 1003
1024 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1025 1005
1026 my $self; 1006 my $self;
1027 1007
1028 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,
1029 vertical => 1, 1022 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1024 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1027 },
1034 ; 1028 ;
1035 1029
1036 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1038 can_events => 1, 1033 can_events => 1,
1039 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1040 %arg, 1038 %arg,
1041 ); 1039 );
1042 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
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1044 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1045 1065
1046 $self 1066 $self
1047} 1067}
1048
1049#TODO# update range on size_allocate depending on child
1050 1068
1051sub add { 1069sub add {
1052 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1053 1071
1054 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1055} 1073}
1056 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
1057sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1059 1125
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $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};
1063 1128
1064 1 1129 1
1065} 1130}
1066 1131
1067sub update_slider { 1132sub invoke_button_down {
1068 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1069 1134
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1071} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1072 1139
1073sub update { 1140 0
1074 my ($self) = @_; 1141}
1075 1142
1076 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1077 1145
1078 $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
1079} 1162}
1080 1163
1081sub invoke_size_allocate { 1164sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1083 1166
1084 $self->update_slider; 1167 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1169}
1088 1170
1089############################################################################# 1171#############################################################################
1090 1172
… …
1132 1214
1133our @ISA = CFPlus::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1134 1216
1135use CFPlus::OpenGL; 1217use CFPlus::OpenGL;
1136 1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1318
1137my $bg = 1319my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1140 1322
1141my @border = 1323my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1144 1330
1145sub new { 1331sub new {
1146 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1147 1333
1148 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1504
1319 my $border = $self->border; 1505 my $border = $self->border;
1320 1506
1321 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $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);
1326 1526
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1329 1529
1330 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1351 1551
1352############################################################################# 1552#############################################################################
1353 1553
1354package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1355 1555
1356our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1357 1557
1358use List::Util qw(max sum); 1558use List::Util qw(max sum);
1359 1559
1360use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1361 1561
1362sub new { 1562sub new {
1363 my $class = shift; 1563 my $class = shift;
1364 1564
1365 $class->SUPER::new ( 1565 $class->SUPER::new (
1366 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1367 @_, 1568 @_,
1368 ) 1569 )
1369} 1570}
1370 1571
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub 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 {
1376 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1377 1587
1378 while (@_) { 1588 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1590
1384 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1385 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1386 $self->realloc;
1387}
1388 1593
1389sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1390 my ($self, $child) = @_; 1601 my ($self) = @_;
1391 1602
1392 # TODO: not yet implemented 1603 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1604
1399 my @children = $self->children; 1605 my @children = $self->children;
1400 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 }
1401 1616 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1617
1407 $self->realloc; 1618 # second pass, rows
1408} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1423 1621
1424 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1626 }
1427 } 1627 }
1428 1628
1429 (\@w, \@h) 1629 (\@w, \@h)
1430} 1630}
… …
1446 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1447 1647
1448 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1450 1650
1451 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1455 1655
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1657
1460 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
1461 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1462 1667
1463 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1670
1465 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1467 or next;
1468 1673
1469 my $x = 0; 1674 $widget->configure (
1470 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1677 );
1472 for my $c (0 .. $#$row) { 1678 }
1473 my $col_w = $ws->[$c];
1474 1679
1475 if (my $widget = $row->[$c]) { 1680 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1477 }
1478 1682
1479 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1480 } 1710 }
1711 }
1481 1712
1482 $y += $row_h; 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1715
1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1734 my ($self, $W, $H) = @_;
1735
1736 for my $child ($self->visible_children) {
1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739
1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1742
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1483 } 1744 }
1484 1745
1485 1 1746 1
1486}
1487
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} 1747}
1511 1748
1512############################################################################# 1749#############################################################################
1513 1750
1514package CFPlus::UI::Box; 1751package CFPlus::UI::Box;
… …
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1777 }; 2014 };
1778 2015
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1781 2024
1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1784 2035
1785############################################################################# 2036#############################################################################
1786 2037
1787package CFPlus::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1788 2039
… …
1800 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1801 can_hover => 1, 2052 can_hover => 1,
1802 can_focus => 1, 2053 can_focus => 1,
1803 valign => 0, 2054 valign => 0,
1804 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1805 #text => ... 2057 #text => ...
1806 #hidden => "*", 2058 #hidden => "*",
1807 @_ 2059 @_
1808 ) 2060 )
1809} 2061}
… …
1853 my $mod = $ev->{mod}; 2105 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1856 2108
1857 my $text = $self->get_text; 2109 my $text = $self->get_text;
2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2112
1859 if ($uni == 8) { 2113 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1868 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2137 $self->emit ('escape');
1873 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2142 } else {
1876 return 0; 2143 return 0;
1877 } 2144 }
1878 2145
1879 $self->_set_text ($text); 2146 $self->_set_text ($text);
1880 2147
1881 $self->realloc; 2148 $self->realloc;
2149 $self->update;
1882 2150
1883 1 2151 1
1884} 2152}
1885 2153
1886sub invoke_focus_in { 2154sub invoke_focus_in {
… …
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2224 glEnd;
1957 } 2225 }
1958} 2226}
1959 2227
2228#############################################################################
2229
1960package CFPlus::UI::Entry; 2230package CFPlus::UI::Entry;
1961 2231
1962our @ISA = CFPlus::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1963 2233
1964use CFPlus::OpenGL; 2234use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2236sub invoke_key_down {
1967 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1968 2238
1969 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1970 2240
1971 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
1974 2244
1975 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
… …
2006 1 2276 1
2007} 2277}
2008 2278
2009############################################################################# 2279#############################################################################
2010 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
2011package CFPlus::UI::Button; 2320package CFPlus::UI::Button;
2012 2321
2013our @ISA = CFPlus::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
2014 2323
2015use CFPlus::OpenGL; 2324use CFPlus::OpenGL;
2016 2325
2017my @tex = 2326my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
2020 2329
2021sub new { 2330sub new {
2022 my $class = shift; 2331 my $class = shift;
2023 2332
2024 $class->SUPER::new ( 2333 $class->SUPER::new (
2025 padding_x => 4, 2334 padding_x => 4,
2026 padding_y => 4, 2335 padding_y => 4,
2027 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
2028 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
2029 can_hover => 1, 2338 can_hover => 1,
2030 align => 0, 2339 align => 0,
2031 valign => 0, 2340 valign => 0,
2032 can_events => 1, 2341 can_events => 1,
2033 @_ 2342 @_
… …
2051 2360
2052 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
2055 2364
2365 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2367
2058 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
2059 2369
2060 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
2061} 2371}
… …
2157 or Carp::croak "'path' or 'tex' attributes required"; 2467 or Carp::croak "'path' or 'tex' attributes required";
2158 2468
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161 2471
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
2163 2473
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2475
2166 $self 2476 $self
2167} 2477}
… …
2514 2824
2515 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516 2826
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518 2828
2519 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2520} 2832}
2521 2833
2522sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2523 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2524 2836
… …
2540sub invoke_mouse_wheel { 2852sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2853 my ($self, $ev) = @_;
2542 2854
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2860
2547 ! ! $delta 2861 1
2548} 2862}
2549 2863
2550sub update { 2864sub update {
2551 my ($self) = @_; 2865 my ($self) = @_;
2552 2866
… …
2660 #font => default_font 2974 #font => default_font
2661 @_, 2975 @_,
2662 2976
2663 layout => (new CFPlus::Layout), 2977 layout => (new CFPlus::Layout),
2664 par => [], 2978 par => [],
2979 max_par => 0,
2665 height => 0, 2980 height => 0,
2666 children => [ 2981 children => [
2667 (new CFPlus::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2669 ], 2984 ],
… …
2753} 3068}
2754 3069
2755sub current_paragraph { 3070sub current_paragraph {
2756 my ($self) = @_; 3071 my ($self) = @_;
2757 3072
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1 3073 $self->{top_paragraph} - 1
2760} 3074}
2761 3075
2762sub scroll_to { 3076sub scroll_to {
2763 my ($self, $para) = @_; 3077 my ($self, $para) = @_;
2764 3078
2765 $self->force_uptodate;
2766
2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768 3080
2769 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 3081 $self->{scroll_to} = $para;
3082 $self->update;
2770} 3083}
2771 3084
2772sub clear { 3085sub clear {
2773 my ($self) = @_; 3086 my ($self) = @_;
2774 3087
… …
2796 3109
2797 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2798 push @{$self->{par}}, $para; 3111 push @{$self->{par}}, $para;
2799 } 3112 }
2800 3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
2801 $self->{need_reflow}++; 3118 $self->{need_reflow}++;
2802 $self->update; 3119 $self->update;
2803} 3120}
2804 3121
2805sub scroll_to_bottom { 3122sub scroll_to_bottom {
2806 my ($self) = @_; 3123 my ($self) = @_;
2807 3124
2808 $self->{scroll_to_bottom} = 1; 3125 $self->{scroll_to} = $#{$self->{par}};
2809 $self->update; 3126 $self->update;
2810} 3127}
2811 3128
2812sub force_uptodate { 3129sub force_uptodate {
2813 my ($self) = @_; 3130 my ($self) = @_;
2814 3131
2815 if (delete $self->{need_reflow}) { 3132 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817 3134
2818 my $height = 0; 3135 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822 3136
2823 for my $para (@{$self->{par}}) { 3137 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para); 3139 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size; 3140 my ($w, $h) = $layout->size;
… …
2829 $para->{h} = $h; 3143 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped; 3144 $para->{wrapped} = $layout->has_wrapped;
2831 } 3145 }
2832 3146
2833 $para->{y} = $height; 3147 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h}; 3148 $height += $para->{h};
2839 } 3149 }
2840 3150
2841 $self->{top_paragraph} = $top_paragraph;
2842 $self->{height} = $height; 3151 $self->{height} = $height;
2843
2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845 3153
2846 delete $self->{texture}; 3154 delete $self->{texture};
2847 } 3155 }
2848 3156
2849 if (delete $self->{scroll_to_bottom}) { 3157 if (my $paridx = delete $self->{scroll_to}) {
2850 $self->{children}[1]->set_value (1e10); 3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851 } 3159 }
2852} 3160}
2853 3161
2854sub update { 3162sub update {
2855 my ($self) = @_; 3163 my ($self) = @_;
… …
2867 3175
2868 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2870 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2871 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2872 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2873 3189
2874 my $y0 = $top; 3190 my $y0 = $top;
2875 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2876 3192
… …
2894 3210
2895 $_->draw; 3211 $_->draw;
2896 } 3212 }
2897 } 3213 }
2898 } 3214 }
3215
3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2899 } 3218 }
3219
3220 $self->{top_paragraph} = $top_paragraph;
2900 }; 3221 };
2901 }); 3222 });
2902} 3223}
2903 3224
2904sub reconfigure { 3225sub reconfigure {
… …
3107 3428
3108sub new { 3429sub new {
3109 my $class = shift; 3430 my $class = shift;
3110 3431
3111 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
3112 aspect => 1, 3435 aspect => 1,
3113 can_events => 0, 3436 can_events => 0,
3114 @_, 3437 @_,
3115 ); 3438 );
3116 3439
3117 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3118 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3119 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3120 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3121 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3122 hard => 1, 3446 parked => 1,
3123 interval => $self->{animspeed},
3124 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
3125 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
3126 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
3127 }, 3455 },
3128 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
3129 } 3460 }
3130 3461
3131 $self 3462 $self
3132} 3463}
3133 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
3134sub size_request { 3496sub size_request {
3135 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
3136} 3513}
3137 3514
3138sub update { 3515sub update {
3139 my ($self) = @_; 3516 my ($self) = @_;
3140 3517
3141 return unless $self->{visible}; 3518 return unless $self->{visible};
3142 3519
3143 $self->SUPER::update; 3520 $self->SUPER::update;
3144} 3521}
3145 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3146sub _draw { 3531sub _draw {
3147 my ($self) = @_; 3532 my ($self) = @_;
3148 3533
3149 return unless $::CONN;
3150
3151 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3152 3535
3153 my $face; 3536 if (my $tex = $self->{tex}) {
3154
3155 if ($self->{frame}) {
3156 my $anim = $::CONN->{anim}[$self->{anim}];
3157
3158 $face = $anim->[ $self->{frame} % @$anim ]
3159 if $anim && @$anim;
3160 }
3161
3162 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3163
3164 if ($tex) {
3165 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3167 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3168 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3169 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3171} 3543}
3172 3544
3173sub destroy { 3545sub destroy {
3174 my ($self) = @_; 3546 my ($self) = @_;
3175 3547
3176 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3177 if $self->{timer}; 3549 if $self->{timer};
3178 3550
3179 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3180} 3552}
3181 3553
… …
3183 3555
3184package CFPlus::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
3185 3557
3186our @ISA = CFPlus::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
3187 3559
3188# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
3189 3561
3190############################################################################# 3562#############################################################################
3191 3563
3192package CFPlus::UI::Menu; 3564package CFPlus::UI::Menu;
3193 3565
3194our @ISA = CFPlus::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
3195 3567
3196use CFPlus::OpenGL; 3568use CFPlus::OpenGL;
3197 3569
3198sub new { 3570sub new {
3199 my $class = shift; 3571 my $class = shift;
… …
3377} 3749}
3378 3750
3379sub add { 3751sub add {
3380 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3381 3753
3382 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3383 3755
3384 $self->{buttonbar}->add (new CFPlus::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3385 markup => $title, 3758 markup => $title,
3386 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3387 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3388 ); 3764 $self->{buttonbar}->add ($title);
3389 3765
3390 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3391} 3767}
3392 3768
3393sub get_current_page { 3769sub get_current_page {
… …
3471 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3472 fontsize => 0.8, 3848 fontsize => 0.8,
3473 @_, 3849 @_,
3474 ); 3850 );
3475 3851
3476 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3477 3853
3478 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3479 3855
3480 $self 3856 $self
3481} 3857}
… …
3604 $self->SUPER::destroy; 3980 $self->SUPER::destroy;
3605} 3981}
3606 3982
3607############################################################################# 3983#############################################################################
3608 3984
3609package CFPlus::UI::Inventory;
3610
3611our @ISA = CFPlus::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 col_expand => [0, 1, 0],
3618 items => [],
3619 @_,
3620 );
3621
3622 $self->set_sort_order (undef);
3623
3624 $self
3625}
3626
3627sub update_items {
3628 my ($self) = @_;
3629
3630 $self->clear;
3631
3632 my @item = $self->{sort}->(@{ $self->{items} });
3633
3634 my @adds;
3635 my $row = 0;
3636 for my $item ($self->{sort}->(@{ $self->{items} })) {
3637 CFPlus::Item::update_widgets $item;
3638
3639 push @adds, 0, $row, $item->{face_widget};
3640 push @adds, 1, $row, $item->{desc_widget};
3641 push @adds, 2, $row, $item->{weight_widget};
3642
3643 $row++;
3644 }
3645
3646 $self->add (@adds);
3647}
3648
3649sub set_sort_order {
3650 my ($self, $order) = @_;
3651
3652 $self->{sort} = $order ||= sub {
3653 sort {
3654 $a->{type} <=> $b->{type}
3655 or $a->{name} cmp $b->{name}
3656 } @_
3657 };
3658
3659 $self->update_items;
3660}
3661
3662sub set_items {
3663 my ($self, $items) = @_;
3664
3665 $self->{items} = [$items ? values %$items : ()];
3666 $self->update_items;
3667}
3668
3669#############################################################################
3670
3671package CFPlus::UI::SpellList;
3672
3673our @ISA = CFPlus::UI::Table::;
3674
3675sub new {
3676 my $class = shift;
3677
3678 my $self = $class->SUPER::new (
3679 binding => [],
3680 commands => [],
3681 @_,
3682 )
3683}
3684
3685my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698sub rebuild_spell_list {
3699 my ($self) = @_;
3700
3701 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3702 $self->clear;
3703
3704 return unless $::CONN;
3705
3706 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712 my $row = 0;
3713
3714 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715 my $spell = $self->{spell}{$_};
3716
3717 $row++;
3718
3719 my $spell_cb = sub {
3720 my ($widget, $ev) = @_;
3721
3722 if ($ev->{button} == 1) {
3723 $::CONN->user_send ("cast $spell->{name}");
3724 } elsif ($ev->{button} == 2) {
3725 $::CONN->user_send ("invoke $spell->{name}");
3726 } elsif ($ev->{button} == 3) {
3727 (new CFPlus::UI::Menu
3728 items => [
3729 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731 ],
3732 )->popup ($ev);
3733 } else {
3734 return 0;
3735 }
3736
3737 1
3738 };
3739
3740 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742 #TODO: add path info to tooltip
3743 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745 $self->add (0, $row, new CFPlus::UI::Face
3746 face => $spell->{face},
3747 can_hover => 1,
3748 can_events => 1,
3749 tooltip => $tooltip,
3750 on_button_down => $spell_cb,
3751 );
3752
3753 $self->add (1, $row, new CFPlus::UI::Label
3754 expand => 1,
3755 text => $spell->{name},
3756 can_hover => 1,
3757 can_events => 1,
3758 tooltip => $tooltip,
3759 on_button_down => $spell_cb,
3760 );
3761
3762 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766 }
3767 });
3768}
3769
3770sub add_spell {
3771 my ($self, $spell) = @_;
3772
3773 $self->{spell}->{$spell->{name}} = $spell;
3774 $self->rebuild_spell_list;
3775}
3776
3777sub remove_spell {
3778 my ($self, $spell) = @_;
3779
3780 delete $self->{spell}->{$spell->{name}};
3781 $self->rebuild_spell_list;
3782}
3783
3784sub clear_spells {
3785 my ($self) = @_;
3786
3787 $self->{spell} = {};
3788 $self->rebuild_spell_list;
3789}
3790
3791#############################################################################
3792
3793package CFPlus::UI::Root; 3985package CFPlus::UI::Root;
3794 3986
3795our @ISA = CFPlus::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3796 3988
3797use List::Util qw(min max); 3989use List::Util qw(min max);
… …
3804 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3805 visible => 1, 3997 visible => 1,
3806 @_, 3998 @_,
3807 ); 3999 );
3808 4000
3809 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3810 4002
3811 $self 4003 $self
3812} 4004}
3813 4005
3814sub size_request { 4006sub size_request {
… …
3909 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3910 $_->() 4102 $_->()
3911 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3912 } 4104 }
3913 4105
3914 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3915 my %queue; 4107 my %queue;
3916 my @queue; 4108 my @queue;
3917 my $widget; 4109 my $widget;
3918 4110
3919 outer: 4111 outer:
… …
3966 } 4158 }
3967 } 4159 }
3968 4160
3969 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3970 } 4162 }
3971 }
3972 4163
3973 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3974 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3975 values %$size_alloc; 4166 values %$size_alloc;
3976 4167
3977 while () { 4168 while () {
3978 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3979 4170
3980 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3981 4172
3982 $w = 0 if $w < 0;
3983 $h = 0 if $h < 0;
3984
3985 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
3986 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
3987 4175
3988# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3989# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3990 4178
3991 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3992 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3993 4181
3994 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3995 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3996 4184
3997 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3998 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3999 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
4000 4188
4001 $widget->{w} = $w; 4189 $widget->{w} = $w;
4002 $widget->{h} = $h; 4190 $widget->{h} = $h;
4003 4191
4004 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
4005 } 4194 }
4006 } 4195 }
4007 } 4196 }
4008 4197
4009 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
4010 $_->() 4199 $_->()
4011 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
4012 } 4201 }
4013
4014 4202
4015 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4016 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4017 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
4018 4206
… …
4023 glLoadIdentity; 4211 glLoadIdentity;
4024 4212
4025 { 4213 {
4026 package CFPlus::UI::Base; 4214 package CFPlus::UI::Base;
4027 4215
4028 ($draw_x, $draw_y, $draw_w, $draw_h) = 4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4029 (0, 0, $self->{w}, $self->{h}); 4217 (0, 0, $self->{w}, $self->{h});
4030 }
4031 4218
4032 $self->_draw; 4219 $self->_draw;
4220 }
4033} 4221}
4034 4222
4035############################################################################# 4223#############################################################################
4036 4224
4037package CFPlus::UI; 4225package CFPlus::UI;

Diff Legend

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