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.351 by root, Sun Oct 1 12:08:58 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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) = @_;
… …
633 my ($self) = @_; 646 my ($self) = @_;
634 647
635 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
636} 649}
637 650
651my $cntx;#d#
638sub DESTROY { 652sub DESTROY {
639 my ($self) = @_; 653 my ($self) = @_;
640 654
641 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 656
645 eval { $self->destroy }; 657 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
647} 661}
648 662
649############################################################################# 663#############################################################################
650 664
651package CFPlus::UI::DrawBG; 665package CFPlus::UI::DrawBG;
… …
727 can_events => 0, 741 can_events => 0,
728 %arg, 742 %arg,
729 ); 743 );
730 744
731 $self->add (@$children) 745 $self->add (@$children)
732 if $children; 746 if $children && @$children;
733 747
734 $self 748 $self
735} 749}
736 750
737sub realloc { 751sub realloc {
… …
746 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
747 761
748 $_->set_parent ($self) 762 $_->set_parent ($self)
749 for @widgets; 763 for @widgets;
750 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 766 use sort 'stable';
752 767
753 $self->{children} = [ 768 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
756 ]; 771 ];
757 772
758 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
759} 776}
760 777
761sub children { 778sub children {
762 @{ $_[0]{children} } 779 @{ $_[0]{children} }
763} 780}
… …
774} 791}
775 792
776sub clear { 793sub clear {
777 my ($self) = @_; 794 my ($self) = @_;
778 795
779 my $children = delete $self->{children}; 796 my $children = $self->{children};
780 $self->{children} = []; 797 $self->{children} = [];
781 798
782 for (@$children) { 799 for (@$children) {
783 delete $_->{parent}; 800 delete $_->{parent};
784 $_->hide; 801 $_->hide;
… …
900 { 917 {
901 package CFPlus::UI::Base; 918 package CFPlus::UI::Base;
902 919
903 local ($draw_x, $draw_y, $draw_w, $draw_h) = 920 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 921 (0, 0, $self->{w}, $self->{h});
922
923 $self->_render;
905 } 924 }
906
907 $self->_render;
908 }; 925 };
909} 926}
910 927
911sub _draw { 928sub _draw {
912 my ($self) = @_; 929 my ($self) = @_;
… …
924} 941}
925 942
926############################################################################# 943#############################################################################
927 944
928package CFPlus::UI::ViewPort; 945package CFPlus::UI::ViewPort;
946
947use List::Util qw(min max);
929 948
930our @ISA = CFPlus::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
931 950
932sub new { 951sub new {
933 my $class = shift; 952 my $class = shift;
… …
942sub size_request { 961sub size_request {
943 my ($self) = @_; 962 my ($self) = @_;
944 963
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 965
947 $w = 10 if $self->{scroll_x}; 966 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 967 $h = 1 if $self->{scroll_y};
949 968
950 ($w, $h) 969 ($w, $h)
951} 970}
952 971
953sub invoke_size_allocate { 972sub invoke_size_allocate {
… …
965} 984}
966 985
967sub set_offset { 986sub set_offset {
968 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
969 988
989 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
990 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
991
992 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 993 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 994 $self->{view_y} = $y;
972 995
996 $self->emit (changed => $x, $y);
973 $self->update; 997 $self->update;
998 }
974} 999}
975 1000
976# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 1002sub coord2local {
978 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
994 1019
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1022 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1024 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1026 }
1002} 1027}
1003 1028
… …
1014 1039
1015############################################################################# 1040#############################################################################
1016 1041
1017package CFPlus::UI::ScrolledWindow; 1042package CFPlus::UI::ScrolledWindow;
1018 1043
1019our @ISA = CFPlus::UI::HBox::; 1044our @ISA = CFPlus::UI::Table::;
1020 1045
1021sub new { 1046sub new {
1022 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1023 1048
1024 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1025 1050
1026 my $self; 1051 my $self;
1027 1052
1028 my $slider = new CFPlus::UI::Slider 1053 my $hslider = new CFPlus::UI::Slider
1054 col => 0,
1055 row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 col => 1,
1066 row => 0,
1029 vertical => 1, 1067 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1069 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1072 },
1034 ; 1073 ;
1035 1074
1036 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1038 can_events => 1, 1078 can_events => 1,
1039 slider => $slider, 1079 hslider => $hslider,
1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
1040 %arg, 1083 %arg,
1041 ); 1084 );
1042 1085
1086 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0,
1088 row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 ;
1101
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1102 $self->SUPER::add ($self->{vp});
1103
1044 $self->add ($child) if $child; 1104 $self->add ($child) if $child;
1045 1105
1046 $self 1106 $self
1047} 1107}
1048
1049#TODO# update range on size_allocate depending on child
1050 1108
1051sub add { 1109sub add {
1052 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1053 1111
1054 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1055} 1113}
1056 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1057sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1059 1161
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1164
1064 1 1165 1
1065} 1166}
1066 1167
1067sub update_slider { 1168sub invoke_button_down {
1068 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1069 1170
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1071} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1072 1175
1073sub update { 1176 0
1074 my ($self) = @_; 1177}
1075 1178
1076 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1077 1181
1078 $self->update_slider; 1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1079} 1198}
1080 1199
1081sub invoke_size_allocate { 1200sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1083 1202
1084 $self->update_slider; 1203 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1205}
1088 1206
1089############################################################################# 1207#############################################################################
1090 1208
… …
1240 1358
1241my @border = 1359my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1362
1363my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png);
1366
1245sub new { 1367sub new {
1246 my ($class, %arg) = @_; 1368 my ($class, %arg) = @_;
1247 1369
1248 my $self = $class->SUPER::new ( 1370 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1371 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1540
1419 my $border = $self->border; 1541 my $border = $self->border;
1420 1542
1421 glColor @{ $self->{border_bg} }; 1543 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548
1549 # move
1550 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555
1556 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1562
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1564 glColor @{ $self->{bg} };
1429 1565
1430 # TODO: repeat texture not scale 1566 # TODO: repeat texture not scale
… …
1451 1587
1452############################################################################# 1588#############################################################################
1453 1589
1454package CFPlus::UI::Table; 1590package CFPlus::UI::Table;
1455 1591
1456our @ISA = CFPlus::UI::Base::; 1592our @ISA = CFPlus::UI::Container::;
1457 1593
1458use List::Util qw(max sum); 1594use List::Util qw(max sum);
1459 1595
1460use CFPlus::OpenGL; 1596use CFPlus::OpenGL;
1461 1597
1462sub new { 1598sub new {
1463 my $class = shift; 1599 my $class = shift;
1464 1600
1465 $class->SUPER::new ( 1601 $class->SUPER::new (
1466 col_expand => [], 1602 col_expand => [],
1603 row_expand => [],
1467 @_, 1604 @_,
1468 ) 1605 )
1469} 1606}
1470 1607
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1608sub add {
1609 my ($self, @widgets) = @_;
1610
1611 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1;
1613 $child->{colspan} ||= 1;
1614 }
1615
1616 $self->SUPER::add (@widgets);
1617}
1618
1619sub add_at {
1476 my ($self) = shift; 1620 my $self = shift;
1621
1622 my @widgets;
1477 1623
1478 while (@_) { 1624 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1625 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1626
1484 $self->{force_realloc} = 1; 1627 $child->{row} = $row;
1485 $self->{force_size_alloc} = 1; 1628 $child->{col} = $col;
1486 $self->realloc;
1487}
1488 1629
1489sub remove { 1630 push @widgets, $child;
1631 }
1632
1633 $self->add (@widgets);
1634}
1635
1636sub get_wh {
1490 my ($self, $child) = @_; 1637 my ($self) = @_;
1491 1638
1492 # TODO: not yet implemented 1639 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1640
1499 my @children = $self->children; 1641 my @children = $self->children;
1500 delete $self->{children}; 1642
1643 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646
1647 my $sw = sum @w[$c .. $c + $cs - 1];
1648
1649 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 }
1501 1652 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1653
1507 $self->realloc; 1654 # second pass, rows
1508} 1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523 1657
1524 $w[$x] = max $w[$x], $w; 1658 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1659
1660 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1662 }
1527 } 1663 }
1528 1664
1529 (\@w, \@h) 1665 (\@w, \@h)
1530} 1666}
… …
1546 my ($ws, $hs) = $self->get_wh; 1682 my ($ws, $hs) = $self->get_wh;
1547 1683
1548 my $req_w = (sum @$ws) || 1; 1684 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1685 my $req_h = (sum @$hs) || 1;
1550 1686
1551 # TODO: nicer code && do row_expand 1687 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1688 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1689 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1690 my $col_expand = (sum @col_expand) || 1;
1555 1691
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1693
1560 CFPlus::UI::harmonize $ws; 1694 CFPlus::UI::harmonize $ws;
1695
1696 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1;
1699
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701
1561 CFPlus::UI::harmonize $hs; 1702 CFPlus::UI::harmonize $hs;
1562 1703
1563 my $y; 1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1706
1565 for my $r (0 .. $#{$self->{children}}) { 1707 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567 or next;
1568 1709
1569 my $x = 0; 1710 $widget->configure (
1570 my $row_h = $hs->[$r]; 1711 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1713 );
1572 for my $c (0 .. $#$row) { 1714 }
1573 my $col_w = $ws->[$c];
1574 1715
1575 if (my $widget = $row->[$c]) { 1716 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1717}
1577 }
1578 1718
1579 $x += $col_w; 1719#############################################################################
1720
1721package CFPlus::UI::Fixed;
1722
1723use List::Util qw(min max);
1724
1725our @ISA = CFPlus::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) {
1735 my ($mode, $val, $max) = @_;
1736
1737 $mode eq "abs" ? $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1580 } 1757 }
1758 }
1581 1759
1582 $y += $row_h; 1760 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1;
1762
1763 # now layout remaining widgets
1764 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1766
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1775 }
1776 }
1777
1778 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1;
1780
1781 ($W, $H)
1782}
1783
1784sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_;
1786
1787 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1789
1790 $x = _scale $pos, $x, $W;
1791 $y = _scale $pos, $x, $H;
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794
1795 $child->configure ($x, $y, $w, $h);
1583 } 1796 }
1584 1797
1585 1 1798 1
1586}
1587
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610} 1799}
1611 1800
1612############################################################################# 1801#############################################################################
1613 1802
1614package CFPlus::UI::Box; 1803package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2089 active_fg => [0, 0, 0],
1901 can_hover => 1, 2090 can_hover => 1,
1902 can_focus => 1, 2091 can_focus => 1,
1903 valign => 0, 2092 valign => 0,
1904 can_events => 1, 2093 can_events => 1,
2094 ellipsise => 0,
1905 #text => ... 2095 #text => ...
1906 #hidden => "*", 2096 #hidden => "*",
1907 @_ 2097 @_
1908 ) 2098 )
1909} 2099}
… …
1953 my $mod = $ev->{mod}; 2143 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2144 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2145 my $uni = $ev->{unicode};
1956 2146
1957 my $text = $self->get_text; 2147 my $text = $self->get_text;
2148
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2150
1959 if ($uni == 8) { 2151 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2153 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2154 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2155 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2156 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2157 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2158 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2159 } elsif ($sym == CFPlus::SDLK_HOME) {
2160 # what a hack
1968 $self->{cursor} = 0; 2161 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1
2164 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2165 } elsif ($sym == CFPlus::SDLK_END) {
2166 # uh, again
2167 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2169 ? $self->{cursor} + length $1
2170 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2171 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2172 $text = "";
1973 $self->{cursor} = 0; 2173 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2174 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2175 $self->emit ('escape');
1976 } elsif ($uni) { 2176 } elsif ($uni == 0x0d) {
2177 substr $text, $self->{cursor}++, 0, "\012";
2178 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2179 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2180 } else {
1979 return 0; 2181 return 0;
1980 } 2182 }
1981 2183
1982 $self->_set_text ($text); 2184 $self->_set_text ($text);
1983 2185
1984 $self->realloc; 2186 $self->realloc;
2187 $self->update;
1985 2188
1986 1 2189 1
1987} 2190}
1988 2191
1989sub invoke_focus_in { 2192sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2262 glEnd;
2060 } 2263 }
2061} 2264}
2062 2265
2266#############################################################################
2267
2063package CFPlus::UI::Entry; 2268package CFPlus::UI::Entry;
2064 2269
2065our @ISA = CFPlus::UI::EntryBase::; 2270our @ISA = CFPlus::UI::EntryBase::;
2066 2271
2067use CFPlus::OpenGL; 2272use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2274sub invoke_key_down {
2070 my ($self, $ev) = @_; 2275 my ($self, $ev) = @_;
2071 2276
2072 my $sym = $ev->{sym}; 2277 my $sym = $ev->{sym};
2073 2278
2074 if ($sym == 13) { 2279 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2280 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2281 my $txt = $self->get_text;
2077 2282
2078 $self->{history_pointer} = -1; 2283 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2284 $self->{history_saveback} = '';
… …
2109 1 2314 1
2110} 2315}
2111 2316
2112############################################################################# 2317#############################################################################
2113 2318
2319package CFPlus::UI::TextEdit;
2320
2321our @ISA = CFPlus::UI::EntryBase::;
2322
2323use CFPlus::OpenGL;
2324
2325sub move_cursor_ver {
2326 my ($self, $dy) = @_;
2327
2328 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2329
2330 $y += $dy;
2331
2332 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2333 $self->{cursor} = $index;
2334 delete $self->{cur_h};
2335 $self->update;
2336 return;
2337 }
2338}
2339
2340sub invoke_key_down {
2341 my ($self, $ev) = @_;
2342
2343 my $sym = $ev->{sym};
2344
2345 if ($sym == CFPlus::SDLK_UP) {
2346 $self->move_cursor_ver (-1);
2347 } elsif ($sym == CFPlus::SDLK_DOWN) {
2348 $self->move_cursor_ver (+1);
2349 } else {
2350 return $self->SUPER::invoke_key_down ($ev)
2351 }
2352
2353 1
2354}
2355
2356#############################################################################
2357
2114package CFPlus::UI::Button; 2358package CFPlus::UI::Button;
2115 2359
2116our @ISA = CFPlus::UI::Label::; 2360our @ISA = CFPlus::UI::Label::;
2117 2361
2118use CFPlus::OpenGL; 2362use CFPlus::OpenGL;
2119 2363
2120my @tex = 2364my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png); 2366 qw(b1_button_inactive.png b1_button_active.png);
2123 2367
2124sub new { 2368sub new {
2125 my $class = shift; 2369 my $class = shift;
2126 2370
2127 $class->SUPER::new ( 2371 $class->SUPER::new (
2128 padding_x => 4, 2372 padding_x => 4,
2129 padding_y => 4, 2373 padding_y => 4,
2130 fg => [1, 1, 1], 2374 fg => [1.0, 1.0, 1.0],
2131 active_fg => [0, 0, 1], 2375 active_fg => [0.8, 0.8, 0.8],
2132 can_hover => 1, 2376 can_hover => 1,
2133 align => 0, 2377 align => 0,
2134 valign => 0, 2378 valign => 0,
2135 can_events => 1, 2379 can_events => 1,
2136 @_ 2380 @_
… …
2154 2398
2155 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
2158 2402
2403 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2405
2161 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
2162 2407
2163 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
2164} 2409}
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2505 or Carp::croak "'path' or 'tex' attributes required";
2261 2506
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2507 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2508 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2509
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2510 CFPlus::weaken $texture_cache{$self->{path}};
2266 2511
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2512 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2513
2269 $self 2514 $self
2270} 2515}
… …
2643sub invoke_mouse_wheel { 2888sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2889 my ($self, $ev) = @_;
2645 2890
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2892
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2896
2650 ! ! $delta 2897 ! ! $delta
2651} 2898}
2652 2899
2653sub update { 2900sub update {
… …
2763 #font => default_font 3010 #font => default_font
2764 @_, 3011 @_,
2765 3012
2766 layout => (new CFPlus::Layout), 3013 layout => (new CFPlus::Layout),
2767 par => [], 3014 par => [],
3015 max_par => 0,
2768 height => 0, 3016 height => 0,
2769 children => [ 3017 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3018 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3019 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3020 ],
… …
2897 3145
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3146 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3147 push @{$self->{par}}, $para;
2900 } 3148 }
2901 3149
3150 if (my $max = $self->{max_par}) {
3151 shift @{$self->{par}} while @{$self->{par}} > $max;
3152 }
3153
2902 $self->{need_reflow}++; 3154 $self->{need_reflow}++;
2903 $self->update; 3155 $self->update;
2904} 3156}
2905 3157
2906sub scroll_to_bottom { 3158sub scroll_to_bottom {
… …
2959 3211
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3212 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3213 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3214 glClear GL_COLOR_BUFFER_BIT;
2963 3215
2964 {
2965 package CFPlus::UI::Base; 3216 package CFPlus::UI::Base;
2966
2967 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3217 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2968 (0, 0, $self->{w}, $self->{h}); 3218 (0, 0, $self->{w}, $self->{h});
2969 }
2970 3219
2971 my $top = int $self->{children}[1]{range}[0]; 3220 my $top = int $self->{children}[1]{range}[0];
2972 3221
2973 my $paridx = 0; 3222 my $paridx = 0;
2974 my $top_paragraph; 3223 my $top_paragraph;
… …
3215 3464
3216sub new { 3465sub new {
3217 my $class = shift; 3466 my $class = shift;
3218 3467
3219 my $self = $class->SUPER::new ( 3468 my $self = $class->SUPER::new (
3469 size_w => 32,
3470 size_h => 8,
3220 aspect => 1, 3471 aspect => 1,
3221 can_events => 0, 3472 can_events => 0,
3222 @_, 3473 @_,
3223 ); 3474 );
3224 3475
3225 if ($self->{anim} && $self->{animspeed}) { 3476 if ($self->{anim} && $self->{animspeed}) {
3226 Scalar::Util::weaken (my $widget = $self); 3477 CFPlus::weaken (my $widget = $self);
3227 3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3228 $self->{timer} = Event->timer ( 3481 $self->{timer} = Event->timer (
3229 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3230 hard => 1, 3482 parked => 1,
3231 interval => $self->{animspeed},
3232 cb => sub { 3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
3233 ++$widget->{frame}; 3486 ++$widget->{frame};
3487 $widget->update_face;
3234 $widget->update; 3488 $widget->update;
3489
3490 $widget->update_timer;
3235 }, 3491 },
3236 ); 3492 );
3493
3494 $self->update_face;
3495 $self->update_timer;
3237 } 3496 }
3238 3497
3239 $self 3498 $self
3240} 3499}
3241 3500
3501sub update_timer {
3502 my ($self) = @_;
3503
3504 return unless $self->{timer};
3505
3506 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start;
3513 } else {
3514 $self->{timer}->stop;
3515 }
3516}
3517
3518sub update_face {
3519 my ($self) = @_;
3520
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
3242sub size_request { 3531sub size_request {
3243 (32, 8) 3532 my ($self) = @_;
3533
3534 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc;
3541 });
3542 }
3543 }
3544 }
3545
3546 ($self->{size_w} || 8, $self->{size_h} || 8)
3244} 3547}
3245 3548
3246sub update { 3549sub update {
3247 my ($self) = @_; 3550 my ($self) = @_;
3248 3551
3249 return unless $self->{visible}; 3552 return unless $self->{visible};
3250 3553
3251 $self->SUPER::update; 3554 $self->SUPER::update;
3252} 3555}
3253 3556
3557sub invoke_visibility_change {
3558 my ($self) = @_;
3559
3560 $self->update_timer;
3561
3562 0
3563}
3564
3254sub _draw { 3565sub _draw {
3255 my ($self) = @_; 3566 my ($self) = @_;
3256 3567
3257 return unless $::CONN; 3568 return unless $::CONN;
3258 3569
3259 $self->SUPER::_draw; 3570 $self->SUPER::_draw;
3260 3571
3261 my $face;
3262
3263 if ($self->{frame}) {
3264 my $anim = $::CONN->{anim}[$self->{anim}]; 3572 my $faceid = $::CONN->{faceid}[$self->{face}]
3265 3573 or return;
3266 $face = $anim->[ $self->{frame} % @$anim ]
3267 if $anim && @$anim;
3268 }
3269 3574
3270 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3575 my $tex = $::CONN->{texture}[$faceid];
3271 3576
3272 if ($tex) { 3577 if ($tex) {
3273 glEnable GL_TEXTURE_2D; 3578 glEnable GL_TEXTURE_2D;
3274 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3275 glColor 0, 0, 0, 1; 3580 glColor 0, 0, 0, 1;
… …
3279} 3584}
3280 3585
3281sub destroy { 3586sub destroy {
3282 my ($self) = @_; 3587 my ($self) = @_;
3283 3588
3284 $self->{timer}->cancel 3589 (delete $self->{timer})->cancel
3285 if $self->{timer}; 3590 if $self->{timer};
3286 3591
3287 $self->SUPER::destroy; 3592 $self->SUPER::destroy;
3288} 3593}
3289 3594
… …
3291 3596
3292package CFPlus::UI::Buttonbar; 3597package CFPlus::UI::Buttonbar;
3293 3598
3294our @ISA = CFPlus::UI::HBox::; 3599our @ISA = CFPlus::UI::HBox::;
3295 3600
3296# TODO: should actualyl wrap buttons and other goodies. 3601# TODO: should actually wrap buttons and other goodies.
3297 3602
3298############################################################################# 3603#############################################################################
3299 3604
3300package CFPlus::UI::Menu; 3605package CFPlus::UI::Menu;
3301 3606
… …
3485} 3790}
3486 3791
3487sub add { 3792sub add {
3488 my ($self, $title, $widget, $tooltip) = @_; 3793 my ($self, $title, $widget, $tooltip) = @_;
3489 3794
3490 Scalar::Util::weaken $self; 3795 CFPlus::weaken $self;
3491 3796
3492 $self->{buttonbar}->add (new CFPlus::UI::Button 3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3493 markup => $title, 3798 markup => $title,
3494 tooltip => $tooltip, 3799 tooltip => $tooltip,
3495 on_activate => sub { $self->set_current_page ($widget) }, 3800 on_activate => sub { $self->set_current_page ($widget) },
… …
3579 my $self = $class->SUPER::new ( 3884 my $self = $class->SUPER::new (
3580 fontsize => 0.8, 3885 fontsize => 0.8,
3581 @_, 3886 @_,
3582 ); 3887 );
3583 3888
3584 Scalar::Util::weaken (my $this = $self); 3889 CFPlus::weaken (my $this = $self);
3585 3890
3586 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3891 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3587 3892
3588 $self 3893 $self
3589} 3894}
… …
3712 $self->SUPER::destroy; 4017 $self->SUPER::destroy;
3713} 4018}
3714 4019
3715############################################################################# 4020#############################################################################
3716 4021
3717package CFPlus::UI::Inventory;
3718
3719our @ISA = CFPlus::UI::Table::;
3720
3721sub new {
3722 my $class = shift;
3723
3724 my $self = $class->SUPER::new (
3725 col_expand => [0, 1, 0],
3726 items => [],
3727 @_,
3728 );
3729
3730 $self->set_sort_order (undef);
3731
3732 $self
3733}
3734
3735sub update_items {
3736 my ($self) = @_;
3737
3738 $self->clear;
3739
3740 my @item = $self->{sort}->(@{ $self->{items} });
3741
3742 my @adds;
3743 my $row = 0;
3744 for my $item ($self->{sort}->(@{ $self->{items} })) {
3745 CFPlus::Item::update_widgets $item;
3746
3747 push @adds, 0, $row, $item->{face_widget};
3748 push @adds, 1, $row, $item->{desc_widget};
3749 push @adds, 2, $row, $item->{weight_widget};
3750
3751 $row++;
3752 }
3753
3754 $self->add (@adds);
3755}
3756
3757sub set_sort_order {
3758 my ($self, $order) = @_;
3759
3760 $self->{sort} = $order ||= sub {
3761 sort {
3762 $a->{type} <=> $b->{type}
3763 or $a->{name} cmp $b->{name}
3764 } @_
3765 };
3766
3767 $self->update_items;
3768}
3769
3770sub set_items {
3771 my ($self, $items) = @_;
3772
3773 $self->{items} = [$items ? values %$items : ()];
3774 $self->update_items;
3775}
3776
3777#############################################################################
3778
3779package CFPlus::UI::SpellList;
3780
3781our @ISA = CFPlus::UI::Table::;
3782
3783sub new {
3784 my $class = shift;
3785
3786 my $self = $class->SUPER::new (
3787 binding => [],
3788 commands => [],
3789 @_,
3790 )
3791}
3792
3793my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3794
3795my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3797my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3798 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3799my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3800 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3801my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3802 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3803my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3804 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3805
3806sub rebuild_spell_list {
3807 my ($self) = @_;
3808
3809 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3810 $self->clear;
3811
3812 return unless $::CONN;
3813
3814 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3815 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3816 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3817 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3818 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3819
3820 my $row = 0;
3821
3822 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3823 my $spell = $self->{spell}{$_};
3824
3825 $row++;
3826
3827 my $spell_cb = sub {
3828 my ($widget, $ev) = @_;
3829
3830 if ($ev->{button} == 1) {
3831 $::CONN->user_send ("cast $spell->{name}");
3832 } elsif ($ev->{button} == 2) {
3833 $::CONN->user_send ("invoke $spell->{name}");
3834 } elsif ($ev->{button} == 3) {
3835 (new CFPlus::UI::Menu
3836 items => [
3837 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3838 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3839 ],
3840 )->popup ($ev);
3841 } else {
3842 return 0;
3843 }
3844
3845 1
3846 };
3847
3848 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3849
3850 #TODO: add path info to tooltip
3851 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3852
3853 $self->add (0, $row, new CFPlus::UI::Face
3854 face => $spell->{face},
3855 can_hover => 1,
3856 can_events => 1,
3857 tooltip => $tooltip,
3858 on_button_down => $spell_cb,
3859 );
3860
3861 $self->add (1, $row, new CFPlus::UI::Label
3862 expand => 1,
3863 text => $spell->{name},
3864 can_hover => 1,
3865 can_events => 1,
3866 tooltip => $tooltip,
3867 on_button_down => $spell_cb,
3868 );
3869
3870 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3871 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3872 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3873 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3874 }
3875 });
3876}
3877
3878sub add_spell {
3879 my ($self, $spell) = @_;
3880
3881 $self->{spell}->{$spell->{name}} = $spell;
3882 $self->rebuild_spell_list;
3883}
3884
3885sub remove_spell {
3886 my ($self, $spell) = @_;
3887
3888 delete $self->{spell}->{$spell->{name}};
3889 $self->rebuild_spell_list;
3890}
3891
3892sub clear_spells {
3893 my ($self) = @_;
3894
3895 $self->{spell} = {};
3896 $self->rebuild_spell_list;
3897}
3898
3899#############################################################################
3900
3901package CFPlus::UI::Root; 4022package CFPlus::UI::Root;
3902 4023
3903our @ISA = CFPlus::UI::Container::; 4024our @ISA = CFPlus::UI::Container::;
3904 4025
3905use List::Util qw(min max); 4026use List::Util qw(min max);
… …
3912 my $self = $class->SUPER::new ( 4033 my $self = $class->SUPER::new (
3913 visible => 1, 4034 visible => 1,
3914 @_, 4035 @_,
3915 ); 4036 );
3916 4037
3917 Scalar::Util::weaken ($self->{root} = $self); 4038 CFPlus::weaken ($self->{root} = $self);
3918 4039
3919 $self 4040 $self
3920} 4041}
3921 4042
3922sub size_request { 4043sub size_request {
… …
4117 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
4118 $_->() 4239 $_->()
4119 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
4120 } 4241 }
4121 4242
4122
4123 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4124 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4125 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
4126 4246
4127 glMatrixMode GL_PROJECTION; 4247 glMatrixMode GL_PROJECTION;
… …
4133 { 4253 {
4134 package CFPlus::UI::Base; 4254 package CFPlus::UI::Base;
4135 4255
4136 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4137 (0, 0, $self->{w}, $self->{h}); 4257 (0, 0, $self->{w}, $self->{h});
4138 }
4139 4258
4140 $self->_draw; 4259 $self->_draw;
4260 }
4141} 4261}
4142 4262
4143############################################################################# 4263#############################################################################
4144 4264
4145package CFPlus::UI; 4265package CFPlus::UI;

Diff Legend

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