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.359 by root, Fri Dec 8 15:07:08 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 #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
… …
774} 789}
775 790
776sub clear { 791sub clear {
777 my ($self) = @_; 792 my ($self) = @_;
778 793
779 my $children = delete $self->{children}; 794 my $children = $self->{children};
780 $self->{children} = []; 795 $self->{children} = [];
781 796
782 for (@$children) { 797 for (@$children) {
783 delete $_->{parent}; 798 delete $_->{parent};
784 $_->hide; 799 $_->hide;
… …
924} 939}
925 940
926############################################################################# 941#############################################################################
927 942
928package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
929 946
930our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
931 948
932sub new { 949sub new {
933 my $class = shift; 950 my $class = shift;
… …
942sub size_request { 959sub size_request {
943 my ($self) = @_; 960 my ($self) = @_;
944 961
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 963
947 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
949 966
950 ($w, $h) 967 ($w, $h)
951} 968}
952 969
953sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
965} 982}
966 983
967sub set_offset { 984sub set_offset {
968 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
969 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}) {
970 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
972 993
994 $self->emit (changed => $x, $y);
973 $self->update; 995 $self->update;
996 }
974} 997}
975 998
976# 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
977sub coord2local { 1000sub coord2local {
978 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
994 1017
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1020 ) {
998 $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})
999 } else { 1022 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1024 }
1002} 1025}
1003 1026
… …
1014 1037
1015############################################################################# 1038#############################################################################
1016 1039
1017package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1018 1041
1019our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1020 1043
1021sub new { 1044sub new {
1022 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1023 1046
1024 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1025 1048
1026 my $self; 1049 my $self;
1027 1050
1028 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,
1029 vertical => 1, 1065 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1067 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1070 },
1034 ; 1071 ;
1035 1072
1036 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1038 can_events => 1, 1076 can_events => 1,
1039 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1040 %arg, 1081 %arg,
1041 ); 1082 );
1042 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
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1044 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1045 1103
1046 $self 1104 $self
1047} 1105}
1048 1106
1049#TODO# update range on size_allocate depending on child 1107#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 update {
1142 my ($self) = @_;
1143
1144 $self->update_slider;
1145 $self->SUPER::update;
1146}
1147
1057sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1059 1150
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $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};
1063 1156
1064 1 1157 1
1065} 1158}
1066 1159
1067sub update_slider { 1160sub invoke_button_down {
1068 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1069 1162
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1071} 1164 $self->grab_focus;
1072 1165
1073sub update { 1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1075 1171
1076 $self->SUPER::update; 1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1077 1175
1078 $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
1079} 1201}
1080 1202
1081sub invoke_size_allocate { 1203sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1083 1205
1084 $self->update_slider; 1206 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1208}
1088 1209
1089############################################################################# 1210#############################################################################
1090 1211
… …
1240 1361
1241my @border = 1362my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1363 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); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1245sub new { 1370sub new {
1246 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1247 1372
1248 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1543
1419 my $border = $self->border; 1544 my $border = $self->border;
1420 1545
1421 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $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);
1426 1565
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1429 1568
1430 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1451 1590
1452############################################################################# 1591#############################################################################
1453 1592
1454package CFPlus::UI::Table; 1593package CFPlus::UI::Table;
1455 1594
1456our @ISA = CFPlus::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1457 1596
1458use List::Util qw(max sum); 1597use List::Util qw(max sum);
1459 1598
1460use CFPlus::OpenGL; 1599use CFPlus::OpenGL;
1461 1600
1462sub new { 1601sub new {
1463 my $class = shift; 1602 my $class = shift;
1464 1603
1465 $class->SUPER::new ( 1604 $class->SUPER::new (
1466 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1467 @_, 1607 @_,
1468 ) 1608 )
1469} 1609}
1470 1610
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub 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 {
1476 my ($self) = shift; 1623 my $self = shift;
1624
1625 my @widgets;
1477 1626
1478 while (@_) { 1627 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1629
1484 $self->{force_realloc} = 1; 1630 $child->{row} = $row;
1485 $self->{force_size_alloc} = 1; 1631 $child->{col} = $col;
1486 $self->realloc;
1487}
1488 1632
1489sub remove { 1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1490 my ($self, $child) = @_; 1640 my ($self) = @_;
1491 1641
1492 # TODO: not yet implemented 1642 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1643
1499 my @children = $self->children; 1644 my @children = $self->children;
1500 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 }
1501 1655 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1656
1507 $self->realloc; 1657 # second pass, rows
1508} 1658 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)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523 1660
1524 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1665 }
1527 } 1666 }
1528 1667
1529 (\@w, \@h) 1668 (\@w, \@h)
1530} 1669}
… …
1546 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1547 1686
1548 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1550 1689
1551 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1555 1694
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1696
1560 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
1561 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1562 1706
1563 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1709
1565 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567 or next;
1568 1712
1569 my $x = 0; 1713 $widget->configure (
1570 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1716 );
1572 for my $c (0 .. $#$row) { 1717 }
1573 my $col_w = $ws->[$c];
1574 1718
1575 if (my $widget = $row->[$c]) { 1719 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1577 }
1578 1721
1579 $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;
1580 } 1760 }
1761 }
1581 1762
1582 $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);
1583 } 1799 }
1584 1800
1585 1 1801 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} 1802}
1611 1803
1612############################################################################# 1804#############################################################################
1613 1805
1614package CFPlus::UI::Box; 1806package CFPlus::UI::Box;
… …
1955 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1957 2149
1958 my $text = $self->get_text; 2150 my $text = $self->get_text;
1959 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1960 if ($uni == 8) { 2154 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
1969 $self->{cursor} = 0; 2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
1970 } 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/
1971 $self->{cursor} = length $text; 2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2174 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2175 $text = "";
1974 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2178 $self->emit ('escape');
1977 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2183 } else {
1980 return 0; 2184 return 0;
1981 } 2185 }
1982 2186
… …
2073sub invoke_key_down { 2277sub invoke_key_down {
2074 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
2075 2279
2076 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
2077 2281
2078 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
2081 2285
2082 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
… …
2104 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2308 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2105 } else { 2309 } else {
2106 $self->set_text ($self->{history_saveback}); 2310 $self->set_text ($self->{history_saveback});
2107 } 2311 }
2108 2312
2109 } elsif ($ev->{unicode} >= 0x20) { 2313 } else {
2110 return $self->SUPER::invoke_key_down ($ev) 2314 return $self->SUPER::invoke_key_down ($ev)
2111 } 2315 }
2112 2316
2113 1 2317 1
2114} 2318}
… …
2160 2364
2161use CFPlus::OpenGL; 2365use CFPlus::OpenGL;
2162 2366
2163my @tex = 2367my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
2166 2370
2167sub new { 2371sub new {
2168 my $class = shift; 2372 my $class = shift;
2169 2373
2170 $class->SUPER::new ( 2374 $class->SUPER::new (
2171 padding_x => 4, 2375 padding_x => 4,
2172 padding_y => 4, 2376 padding_y => 4,
2173 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
2174 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
2175 can_hover => 1, 2379 can_hover => 1,
2176 align => 0, 2380 align => 0,
2177 valign => 0, 2381 valign => 0,
2178 can_events => 1, 2382 can_events => 1,
2179 @_ 2383 @_
… …
2197 2401
2198 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
2201 2405
2406 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2408
2204 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
2205 2410
2206 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
2207} 2412}
… …
2303 or Carp::croak "'path' or 'tex' attributes required"; 2508 or Carp::croak "'path' or 'tex' attributes required";
2304 2509
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 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;
2307 2512
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2513 CFPlus::weaken $texture_cache{$self->{path}};
2309 2514
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2516
2312 $self 2517 $self
2313} 2518}
… …
2686sub invoke_mouse_wheel { 2891sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 2892 my ($self, $ev) = @_;
2688 2893
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 2899
2693 ! ! $delta 2900 ! ! $delta
2694} 2901}
2695 2902
2696sub update { 2903sub update {
… …
2806 #font => default_font 3013 #font => default_font
2807 @_, 3014 @_,
2808 3015
2809 layout => (new CFPlus::Layout), 3016 layout => (new CFPlus::Layout),
2810 par => [], 3017 par => [],
3018 max_par => 0,
2811 height => 0, 3019 height => 0,
2812 children => [ 3020 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3023 ],
… …
2938 wrapped => 1, 3146 wrapped => 1,
2939 }; 3147 };
2940 3148
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 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;
2943 } 3155 }
2944 3156
2945 $self->{need_reflow}++; 3157 $self->{need_reflow}++;
2946 $self->update; 3158 $self->update;
2947} 3159}
… …
3255 3467
3256sub new { 3468sub new {
3257 my $class = shift; 3469 my $class = shift;
3258 3470
3259 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
3260 aspect => 1, 3474 aspect => 1,
3261 can_events => 0, 3475 can_events => 0,
3262 @_, 3476 @_,
3263 ); 3477 );
3264 3478
3265 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
3267 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3268 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3485 parked => 1,
3271 interval => $self->{animspeed},
3272 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
3273 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
3274 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
3275 }, 3494 },
3276 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
3277 } 3499 }
3278 3500
3279 $self 3501 $self
3280} 3502}
3281 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
3282sub size_request { 3534sub size_request {
3283 (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)
3284} 3550}
3285 3551
3286sub update { 3552sub update {
3287 my ($self) = @_; 3553 my ($self) = @_;
3288 3554
3289 return unless $self->{visible}; 3555 return unless $self->{visible};
3290 3556
3291 $self->SUPER::update; 3557 $self->SUPER::update;
3292} 3558}
3293 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
3294sub _draw { 3568sub _draw {
3295 my ($self) = @_; 3569 my ($self) = @_;
3296 3570
3297 return unless $::CONN; 3571 return unless $::CONN;
3298 3572
3299 $self->SUPER::_draw; 3573 $self->SUPER::_draw;
3300 3574
3301 my $face;
3302
3303 if ($self->{frame}) {
3304 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
3305 3576 or return;
3306 $face = $anim->[ $self->{frame} % @$anim ]
3307 if $anim && @$anim;
3308 }
3309 3577
3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
3311 3579
3312 if ($tex) { 3580 if ($tex) {
3313 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
… …
3319} 3587}
3320 3588
3321sub destroy { 3589sub destroy {
3322 my ($self) = @_; 3590 my ($self) = @_;
3323 3591
3324 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3593 if $self->{timer};
3326 3594
3327 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3328} 3596}
3329 3597
… …
3525} 3793}
3526 3794
3527sub add { 3795sub add {
3528 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3529 3797
3530 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3531 3799
3532 $self->{buttonbar}->add (new CFPlus::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title, 3801 markup => $title,
3534 tooltip => $tooltip, 3802 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
… …
3619 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 3888 fontsize => 0.8,
3621 @_, 3889 @_,
3622 ); 3890 );
3623 3891
3624 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3625 3893
3626 $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 });
3627 3895
3628 $self 3896 $self
3629} 3897}
… …
3752 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3753} 4021}
3754 4022
3755############################################################################# 4023#############################################################################
3756 4024
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 4025package CFPlus::UI::Root;
3943 4026
3944our @ISA = CFPlus::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3945 4028
3946use List::Util qw(min max); 4029use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3954 visible => 1, 4037 visible => 1,
3955 @_, 4038 @_,
3956 ); 4039 );
3957 4040
3958 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3959 4042
3960 $self 4043 $self
3961} 4044}
3962 4045
3963sub size_request { 4046sub size_request {
… …
4158 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4159 $_->() 4242 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4161 } 4244 }
4162 4245
4163
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4167 4249
4168 glMatrixMode GL_PROJECTION; 4250 glMatrixMode GL_PROJECTION;

Diff Legend

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