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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
262 268
263sub destroy { 269sub destroy {
264 my ($self) = @_; 270 my ($self) = @_;
265 271
266 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
268} 279}
269 280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
502 513
503 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
506 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
507} 524}
508 525
509my %has_coords = ( 526my %has_coords = (
510 button_down => 1, 527 button_down => 1,
511 button_up => 1, 528 button_up => 1,
… …
523 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
524 : (); 541 : ();
525 542
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 544
528 if ($self->{tooltip} =~ /Apply.*audio/) { 545 for my $cb (
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d# 546 @{$self->{signal_cb}{$signal} || []}, # before
530 warn "3 $self->{parent}\n";#d# 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
531 } 550 }
532 551
533 #d##TODO# stop propagating at first true, do not use sum 552 # parent
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
545} 554}
546 555
547sub find_widget { 556#sub find_widget {
548 my ($self, $x, $y) = @_; 557# in .xs
549
550 return () unless $self->{can_events};
551
552 return $self
553 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556 ()
557}
558 558
559sub set_parent { 559sub set_parent {
560 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
561 561
562 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
564} 564}
565 565
566sub realloc { 566sub realloc {
567 my ($self) = @_; 567 my ($self) = @_;
… …
646 my ($self) = @_; 646 my ($self) = @_;
647 647
648 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
649} 649}
650 650
651my $cntx;#d#
651sub DESTROY { 652sub DESTROY {
652 my ($self) = @_; 653 my ($self) = @_;
653 654
654 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
655
656 delete $WIDGET{$self+0};
657 656
658 eval { $self->destroy }; 657 eval { $self->destroy };
659 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};
660} 661}
661 662
662############################################################################# 663#############################################################################
663 664
664package CFPlus::UI::DrawBG; 665package CFPlus::UI::DrawBG;
… …
740 can_events => 0, 741 can_events => 0,
741 %arg, 742 %arg,
742 ); 743 );
743 744
744 $self->add (@$children) 745 $self->add (@$children)
745 if $children; 746 if $children && @$children;
746 747
747 $self 748 $self
748} 749}
749 750
750sub realloc { 751sub realloc {
… …
759 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
760 761
761 $_->set_parent ($self) 762 $_->set_parent ($self)
762 for @widgets; 763 for @widgets;
763 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
764 use sort 'stable'; 766 use sort 'stable';
765 767
766 $self->{children} = [ 768 $self->{children} = [
767 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
768 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
787} 789}
788 790
789sub clear { 791sub clear {
790 my ($self) = @_; 792 my ($self) = @_;
791 793
792 my $children = delete $self->{children}; 794 my $children = $self->{children};
793 $self->{children} = []; 795 $self->{children} = [];
794 796
795 for (@$children) { 797 for (@$children) {
796 delete $_->{parent}; 798 delete $_->{parent};
797 $_->hide; 799 $_->hide;
… …
937} 939}
938 940
939############################################################################# 941#############################################################################
940 942
941package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
942 946
943our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
944 948
945sub new { 949sub new {
946 my $class = shift; 950 my $class = shift;
… …
955sub size_request { 959sub size_request {
956 my ($self) = @_; 960 my ($self) = @_;
957 961
958 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959 963
960 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
961 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
962 966
963 ($w, $h) 967 ($w, $h)
964} 968}
965 969
966sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
978} 982}
979 983
980sub set_offset { 984sub set_offset {
981 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
982 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
983 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
984 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
985 993
994 $self->emit (changed => $x, $y);
986 $self->update; 995 $self->update;
996 }
987} 997}
988 998
989# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
990sub coord2local { 1000sub coord2local {
991 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1006 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1007 1017
1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010 ) { 1020 ) {
1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012 } else { 1022 } else {
1013 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1014 } 1024 }
1015} 1025}
1016 1026
… …
1027 1037
1028############################################################################# 1038#############################################################################
1029 1039
1030package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1031 1041
1032our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1033 1043
1034sub new { 1044sub new {
1035 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1036 1046
1037 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1038 1048
1039 my $self; 1049 my $self;
1040 1050
1041 my $slider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1042 vertical => 1, 1065 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1067 on_changed => sub {
1045 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046 }, 1070 },
1047 ; 1071 ;
1048 1072
1049 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1050 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1051 can_events => 1, 1076 can_events => 1,
1052 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1053 %arg, 1081 %arg,
1054 ); 1082 );
1055 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
1056 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1057 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1058 1103
1059 $self 1104 $self
1060} 1105}
1061 1106
1062#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1063 1108
1064sub add { 1109sub add {
1065 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1066 1111
1067 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1068} 1113}
1069 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 update {
1142 my ($self) = @_;
1143
1144 $self->update_slider;
1145 $self->SUPER::update;
1146}
1147
1070sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1072 1150
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1076 1156
1077 1 1157 1
1078} 1158}
1079 1159
1080sub update_slider { 1160sub invoke_button_down {
1081 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1082 1162
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1084} 1164 $self->grab_focus;
1085 1165
1086sub update { 1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1087 my ($self) = @_; 1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1088 1171
1089 $self->SUPER::update; 1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1090 1175
1091 $self->update_slider; 1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1092} 1201}
1093 1202
1094sub invoke_size_allocate { 1203sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1096 1205
1097 $self->update_slider; 1206 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1208}
1101 1209
1102############################################################################# 1210#############################################################################
1103 1211
… …
1253 1361
1254my @border = 1362my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257 1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1258sub new { 1370sub new {
1259 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1260 1372
1261 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1262 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
… …
1430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431 1543
1432 my $border = $self->border; 1544 my $border = $self->border;
1433 1545
1434 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1435 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439 1565
1440 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1442 1568
1443 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1464 1590
1465############################################################################# 1591#############################################################################
1466 1592
1467package CFPlus::UI::Table; 1593package CFPlus::UI::Table;
1468 1594
1469our @ISA = CFPlus::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1470 1596
1471use List::Util qw(max sum); 1597use List::Util qw(max sum);
1472 1598
1473use CFPlus::OpenGL; 1599use CFPlus::OpenGL;
1474 1600
1475sub new { 1601sub new {
1476 my $class = shift; 1602 my $class = shift;
1477 1603
1478 $class->SUPER::new ( 1604 $class->SUPER::new (
1479 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1480 @_, 1607 @_,
1481 ) 1608 )
1482} 1609}
1483 1610
1484sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486}
1487
1488sub add { 1611sub add {
1612 my ($self, @widgets) = @_;
1613
1614 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1618
1619 $self->SUPER::add (@widgets);
1620}
1621
1622sub add_at {
1489 my ($self) = shift; 1623 my $self = shift;
1624
1625 my @widgets;
1490 1626
1491 while (@_) { 1627 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child;
1495 }
1496 1629
1497 $self->{force_realloc} = 1; 1630 $child->{row} = $row;
1498 $self->{force_size_alloc} = 1; 1631 $child->{col} = $col;
1499 $self->realloc;
1500}
1501 1632
1502sub remove { 1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1503 my ($self, $child) = @_; 1640 my ($self) = @_;
1504 1641
1505 # TODO: not yet implemented 1642 my (@w, @h);
1506}
1507
1508# TODO: move to container class maybe? send children a signal on removal?
1509sub clear {
1510 my ($self) = @_;
1511 1643
1512 my @children = $self->children; 1644 my @children = $self->children;
1513 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1514 1655 }
1515 for (@children) {
1516 delete $_->{parent};
1517 $_->hide;
1518 }
1519 1656
1520 $self->realloc; 1657 # second pass, rows
1521} 1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1522
1523sub get_wh {
1524 my ($self) = @_;
1525
1526 my (@w, @h);
1527
1528 for my $y (0 .. $#{$self->{children}}) {
1529 my $row = $self->{children}[$y]
1530 or next;
1531
1532 for my $x (0 .. $#$row) {
1533 my $widget = $row->[$x]
1534 or next;
1535 my ($w, $h) = @$widget{qw(req_w req_h)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1536 1660
1537 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1538 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539 } 1665 }
1540 } 1666 }
1541 1667
1542 (\@w, \@h) 1668 (\@w, \@h)
1543} 1669}
… …
1559 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1560 1686
1561 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1563 1689
1564 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1565 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1568 1694
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1696
1573 CFPlus::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1574 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1575 1706
1576 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577 1709
1578 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1579 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1580 or next;
1581 1712
1582 my $x = 0; 1713 $widget->configure (
1583 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584 1716 );
1585 for my $c (0 .. $#$row) { 1717 }
1586 my $col_w = $ws->[$c];
1587 1718
1588 if (my $widget = $row->[$c]) { 1719 1
1589 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1590 }
1591 1721
1592 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1593 } 1760 }
1761 }
1594 1762
1595 $y += $row_h; 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1765
1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_;
1789
1790 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1792
1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $child->configure ($x, $y, $w, $h);
1596 } 1799 }
1597 1800
1598 1 1801 1
1599}
1600
1601sub find_widget {
1602 my ($self, $x, $y) = @_;
1603
1604 $x -= $self->{x};
1605 $y -= $self->{y};
1606
1607 my $res;
1608
1609 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610 $res = $_->find_widget ($x, $y)
1611 and return $res;
1612 }
1613
1614 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615}
1616
1617sub _draw {
1618 my ($self) = @_;
1619
1620 for (grep $_, @{$self->{children}}) {
1621 $_->draw for grep $_, @$_;
1622 }
1623} 1802}
1624 1803
1625############################################################################# 1804#############################################################################
1626 1805
1627package CFPlus::UI::Box; 1806package CFPlus::UI::Box;
… …
1913 active_fg => [0, 0, 0], 2092 active_fg => [0, 0, 0],
1914 can_hover => 1, 2093 can_hover => 1,
1915 can_focus => 1, 2094 can_focus => 1,
1916 valign => 0, 2095 valign => 0,
1917 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1918 #text => ... 2098 #text => ...
1919 #hidden => "*", 2099 #hidden => "*",
1920 @_ 2100 @_
1921 ) 2101 )
1922} 2102}
… …
1966 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1969 2149
1970 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2153
1972 if ($uni == 8) { 2154 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
1981 $self->{cursor} = 0; 2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2174 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2175 $text = "";
1986 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2178 $self->emit ('escape');
1989 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2183 } else {
1992 return 0; 2184 return 0;
1993 } 2185 }
1994 2186
1995 $self->_set_text ($text); 2187 $self->_set_text ($text);
1996 2188
1997 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1998 2191
1999 1 2192 1
2000} 2193}
2001 2194
2002sub invoke_focus_in { 2195sub invoke_focus_in {
… …
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2265 glEnd;
2073 } 2266 }
2074} 2267}
2075 2268
2269#############################################################################
2270
2076package CFPlus::UI::Entry; 2271package CFPlus::UI::Entry;
2077 2272
2078our @ISA = CFPlus::UI::EntryBase::; 2273our @ISA = CFPlus::UI::EntryBase::;
2079 2274
2080use CFPlus::OpenGL; 2275use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2277sub invoke_key_down {
2083 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
2084 2279
2085 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
2086 2281
2087 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
2090 2285
2091 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
… …
2122 1 2317 1
2123} 2318}
2124 2319
2125############################################################################# 2320#############################################################################
2126 2321
2322package CFPlus::UI::TextEdit;
2323
2324our @ISA = CFPlus::UI::EntryBase::;
2325
2326use CFPlus::OpenGL;
2327
2328sub move_cursor_ver {
2329 my ($self, $dy) = @_;
2330
2331 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2332
2333 $y += $dy;
2334
2335 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2336 $self->{cursor} = $index;
2337 delete $self->{cur_h};
2338 $self->update;
2339 return;
2340 }
2341}
2342
2343sub invoke_key_down {
2344 my ($self, $ev) = @_;
2345
2346 my $sym = $ev->{sym};
2347
2348 if ($sym == CFPlus::SDLK_UP) {
2349 $self->move_cursor_ver (-1);
2350 } elsif ($sym == CFPlus::SDLK_DOWN) {
2351 $self->move_cursor_ver (+1);
2352 } else {
2353 return $self->SUPER::invoke_key_down ($ev)
2354 }
2355
2356 1
2357}
2358
2359#############################################################################
2360
2127package CFPlus::UI::Button; 2361package CFPlus::UI::Button;
2128 2362
2129our @ISA = CFPlus::UI::Label::; 2363our @ISA = CFPlus::UI::Label::;
2130 2364
2131use CFPlus::OpenGL; 2365use CFPlus::OpenGL;
2132 2366
2133my @tex = 2367my @tex =
2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
2136 2370
2137sub new { 2371sub new {
2138 my $class = shift; 2372 my $class = shift;
2139 2373
2140 $class->SUPER::new ( 2374 $class->SUPER::new (
2141 padding_x => 4, 2375 padding_x => 4,
2142 padding_y => 4, 2376 padding_y => 4,
2143 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
2144 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
2145 can_hover => 1, 2379 can_hover => 1,
2146 align => 0, 2380 align => 0,
2147 valign => 0, 2381 valign => 0,
2148 can_events => 1, 2382 can_events => 1,
2149 @_ 2383 @_
… …
2167 2401
2168 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
2171 2405
2406 my $tex = $tex[$GRAB == $self];
2172 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173 2408
2174 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
2175 2410
2176 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
2177} 2412}
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2508 or Carp::croak "'path' or 'tex' attributes required";
2274 2509
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2511 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277 2512
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2513 CFPlus::weaken $texture_cache{$self->{path}};
2279 2514
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2516
2282 $self 2517 $self
2283} 2518}
… …
2656sub invoke_mouse_wheel { 2891sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2892 my ($self, $ev) = @_;
2658 2893
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2899
2663 ! ! $delta 2900 ! ! $delta
2664} 2901}
2665 2902
2666sub update { 2903sub update {
… …
2776 #font => default_font 3013 #font => default_font
2777 @_, 3014 @_,
2778 3015
2779 layout => (new CFPlus::Layout), 3016 layout => (new CFPlus::Layout),
2780 par => [], 3017 par => [],
3018 max_par => 0,
2781 height => 0, 3019 height => 0,
2782 children => [ 3020 children => [
2783 (new CFPlus::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2785 ], 3023 ],
… …
2908 wrapped => 1, 3146 wrapped => 1,
2909 }; 3147 };
2910 3148
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 3150 push @{$self->{par}}, $para;
3151 }
3152
3153 if (my $max = $self->{max_par}) {
3154 shift @{$self->{par}} while @{$self->{par}} > $max;
2913 } 3155 }
2914 3156
2915 $self->{need_reflow}++; 3157 $self->{need_reflow}++;
2916 $self->update; 3158 $self->update;
2917} 3159}
… …
3225 3467
3226sub new { 3468sub new {
3227 my $class = shift; 3469 my $class = shift;
3228 3470
3229 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
3230 aspect => 1, 3474 aspect => 1,
3231 can_events => 0, 3475 can_events => 0,
3232 @_, 3476 @_,
3233 ); 3477 );
3234 3478
3235 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
3237 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3238 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3485 parked => 1,
3241 interval => $self->{animspeed},
3242 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
3243 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
3244 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
3245 }, 3494 },
3246 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
3247 } 3499 }
3248 3500
3249 $self 3501 $self
3250} 3502}
3251 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
3252sub size_request { 3534sub size_request {
3253 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
3254} 3550}
3255 3551
3256sub update { 3552sub update {
3257 my ($self) = @_; 3553 my ($self) = @_;
3258 3554
3259 return unless $self->{visible}; 3555 return unless $self->{visible};
3260 3556
3261 $self->SUPER::update; 3557 $self->SUPER::update;
3262} 3558}
3263 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
3264sub _draw { 3568sub _draw {
3265 my ($self) = @_; 3569 my ($self) = @_;
3266 3570
3267 return unless $::CONN; 3571 return unless $::CONN;
3268 3572
3269 $self->SUPER::_draw; 3573 $self->SUPER::_draw;
3270 3574
3271 my $face;
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
3275 3576 or return;
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279 3577
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
3281 3579
3282 if ($tex) { 3580 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
… …
3289} 3587}
3290 3588
3291sub destroy { 3589sub destroy {
3292 my ($self) = @_; 3590 my ($self) = @_;
3293 3591
3294 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3295 if $self->{timer}; 3593 if $self->{timer};
3296 3594
3297 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3298} 3596}
3299 3597
… …
3495} 3793}
3496 3794
3497sub add { 3795sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3499 3797
3500 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3501 3799
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title, 3801 markup => $title,
3504 tooltip => $tooltip, 3802 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
… …
3589 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3888 fontsize => 0.8,
3591 @_, 3889 @_,
3592 ); 3890 );
3593 3891
3594 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3595 3893
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597 3895
3598 $self 3896 $self
3599} 3897}
… …
3722 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3723} 4021}
3724 4022
3725############################################################################# 4023#############################################################################
3726 4024
3727package CFPlus::UI::Inventory;
3728
3729our @ISA = CFPlus::UI::Table::;
3730
3731sub new {
3732 my $class = shift;
3733
3734 my $self = $class->SUPER::new (
3735 col_expand => [0, 1, 0],
3736 items => [],
3737 @_,
3738 );
3739
3740 $self->set_sort_order (undef);
3741
3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3778}
3779
3780sub set_items {
3781 my ($self, $items) = @_;
3782
3783 $self->{items} = [$items ? values %$items : ()];
3784 $self->update_items;
3785}
3786
3787#############################################################################
3788
3789package CFPlus::UI::SpellList;
3790
3791our @ISA = CFPlus::UI::Table::;
3792
3793sub new {
3794 my $class = shift;
3795
3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3802
3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3888sub add_spell {
3889 my ($self, $spell) = @_;
3890
3891 $self->{spell}->{$spell->{name}} = $spell;
3892 $self->rebuild_spell_list;
3893}
3894
3895sub remove_spell {
3896 my ($self, $spell) = @_;
3897
3898 delete $self->{spell}->{$spell->{name}};
3899 $self->rebuild_spell_list;
3900}
3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3909#############################################################################
3910
3911package CFPlus::UI::Root; 4025package CFPlus::UI::Root;
3912 4026
3913our @ISA = CFPlus::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3914 4028
3915use List::Util qw(min max); 4029use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3923 visible => 1, 4037 visible => 1,
3924 @_, 4038 @_,
3925 ); 4039 );
3926 4040
3927 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3928 4042
3929 $self 4043 $self
3930} 4044}
3931 4045
3932sub size_request { 4046sub size_request {
… …
4127 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4128 $_->() 4242 $_->()
4129 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4130 } 4244 }
4131 4245
4132
4133 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4136 4249
4137 glMatrixMode GL_PROJECTION; 4250 glMatrixMode GL_PROJECTION;

Diff Legend

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