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.355 by root, Sun Nov 19 00:07:50 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 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
1049#TODO# update range on size_allocate depending on child
1050 1106
1051sub add { 1107sub add {
1052 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1053 1109
1054 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1055} 1111}
1056 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139
1140sub start_dragging {
1141 my ($self, $ev) = @_;
1142
1143 $self->grab_focus;
1144
1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1057sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1059 1160
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev);
1162 $self->{hslider}->emit (mouse_wheel => $ev);
1063 1163
1064 1 1164 1
1065} 1165}
1066 1166
1067sub update_slider { 1167sub invoke_button_down {
1068 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1069 1169
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1170 $self->start_dragging ($ev);
1071}
1072 1171
1073sub update { 1172 1
1074 my ($self) = @_; 1173}
1075 1174
1076 $self->SUPER::update; 1175sub invoke_button_up {
1176 my ($self, $ev, $x, $y) = @_;
1077 1177
1078 $self->update_slider; 1178 if (delete $self->{motion}) {
1179 return 1;
1180 }
1181
1182 0
1183}
1184
1185sub invoke_mouse_motion {
1186 my ($self, $ev, $x, $y) = @_;
1187
1188 if ($self->{motion}) {
1189 $self->{motion}->($ev, $x, $y);
1190 return 1;
1191 }
1192
1193 0
1079} 1194}
1080 1195
1081sub invoke_size_allocate { 1196sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
1083 1198
1084 $self->update_slider; 1199 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1200 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1201}
1088 1202
1089############################################################################# 1203#############################################################################
1090 1204
… …
1240 1354
1241my @border = 1355my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 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); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1358
1359my @icon =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1362
1245sub new { 1363sub new {
1246 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1247 1365
1248 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1536
1419 my $border = $self->border; 1537 my $border = $self->border;
1420 1538
1421 glColor @{ $self->{border_bg} }; 1539 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1540 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1541 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1542 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1543 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1544
1545 # move
1546 my $w2 = ($w - $border) * .5;
1547 my $h2 = ($h - $border) * .5;
1548 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1549 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1551
1552 # resize
1553 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1554 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1555 unless $self->{has_close_button};
1556 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1558
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1559 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1560 glColor @{ $self->{bg} };
1429 1561
1430 # TODO: repeat texture not scale 1562 # TODO: repeat texture not scale
… …
1451 1583
1452############################################################################# 1584#############################################################################
1453 1585
1454package CFPlus::UI::Table; 1586package CFPlus::UI::Table;
1455 1587
1456our @ISA = CFPlus::UI::Base::; 1588our @ISA = CFPlus::UI::Container::;
1457 1589
1458use List::Util qw(max sum); 1590use List::Util qw(max sum);
1459 1591
1460use CFPlus::OpenGL; 1592use CFPlus::OpenGL;
1461 1593
1462sub new { 1594sub new {
1463 my $class = shift; 1595 my $class = shift;
1464 1596
1465 $class->SUPER::new ( 1597 $class->SUPER::new (
1466 col_expand => [], 1598 col_expand => [],
1599 row_expand => [],
1467 @_, 1600 @_,
1468 ) 1601 )
1469} 1602}
1470 1603
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1604sub add {
1605 my ($self, @widgets) = @_;
1606
1607 for my $child (@widgets) {
1608 $child->{rowspan} ||= 1;
1609 $child->{colspan} ||= 1;
1610 }
1611
1612 $self->SUPER::add (@widgets);
1613}
1614
1615sub add_at {
1476 my ($self) = shift; 1616 my $self = shift;
1617
1618 my @widgets;
1477 1619
1478 while (@_) { 1620 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1621 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1622
1484 $self->{force_realloc} = 1; 1623 $child->{row} = $row;
1485 $self->{force_size_alloc} = 1; 1624 $child->{col} = $col;
1486 $self->realloc;
1487}
1488 1625
1489sub remove { 1626 push @widgets, $child;
1627 }
1628
1629 $self->add (@widgets);
1630}
1631
1632sub get_wh {
1490 my ($self, $child) = @_; 1633 my ($self) = @_;
1491 1634
1492 # TODO: not yet implemented 1635 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1636
1499 my @children = $self->children; 1637 my @children = $self->children;
1500 delete $self->{children}; 1638
1639 # first pass, columns
1640 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1641 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1642
1643 my $sw = sum @w[$c .. $c + $cs - 1];
1644
1645 if ($w > $sw) {
1646 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1647 }
1501 1648 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1649
1507 $self->realloc; 1650 # second pass, rows
1508} 1651 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)}; 1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523 1653
1524 $w[$x] = max $w[$x], $w; 1654 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1655
1656 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1658 }
1527 } 1659 }
1528 1660
1529 (\@w, \@h) 1661 (\@w, \@h)
1530} 1662}
… …
1546 my ($ws, $hs) = $self->get_wh; 1678 my ($ws, $hs) = $self->get_wh;
1547 1679
1548 my $req_w = (sum @$ws) || 1; 1680 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1681 my $req_h = (sum @$hs) || 1;
1550 1682
1551 # TODO: nicer code && do row_expand 1683 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1684 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1685 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1686 my $col_expand = (sum @col_expand) || 1;
1555 1687
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1688 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1689
1560 CFPlus::UI::harmonize $ws; 1690 CFPlus::UI::harmonize $ws;
1691
1692 my @row_expand = @{$self->{row_expand}};
1693 @row_expand = (1) x @$ws unless @row_expand;
1694 my $row_expand = (sum @row_expand) || 1;
1695
1696 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1697
1561 CFPlus::UI::harmonize $hs; 1698 CFPlus::UI::harmonize $hs;
1562 1699
1563 my $y; 1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1702
1565 for my $r (0 .. $#{$self->{children}}) { 1703 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567 or next;
1568 1705
1569 my $x = 0; 1706 $widget->configure (
1570 my $row_h = $hs->[$r]; 1707 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1709 );
1572 for my $c (0 .. $#$row) { 1710 }
1573 my $col_w = $ws->[$c];
1574 1711
1575 if (my $widget = $row->[$c]) { 1712 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1713}
1577 }
1578 1714
1579 $x += $col_w; 1715#############################################################################
1716
1717package CFPlus::UI::Fixed;
1718
1719use List::Util qw(min max);
1720
1721our @ISA = CFPlus::UI::Container::;
1722
1723sub add {
1724 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1725
1726 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1727 $self->SUPER::add ($child);
1728}
1729
1730sub _scale($$$) {
1731 my ($mode, $val, $max) = @_;
1732
1733 $mode eq "abs" ? $val
1734 : $mode eq "rel" ? $val * $max
1735 : 0
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742
1743 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) {
1745 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1746
1747 if ($pos eq "abs") {
1748 $w = _scale $size, $w, $child->{req_w};
1749 $h = _scale $size, $h, $child->{req_h};
1750
1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1580 } 1753 }
1754 }
1581 1755
1582 $y += $row_h; 1756 my $W = $x2 - $x1;
1757 my $H = $y2 - $y1;
1758
1759 # now layout remaining widgets
1760 for my $child ($self->visible_children) {
1761 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1762
1763 if ($pos ne "abs") {
1764 $x = _scale $pos, $x, $W;
1765 $y = _scale $pos, $x, $H;
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 ($W, $H)
1778}
1779
1780sub invoke_size_allocate {
1781 my ($self, $W, $H) = @_;
1782
1783 for my $child ($self->visible_children) {
1784 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1785
1786 $x = _scale $pos, $x, $W;
1787 $y = _scale $pos, $x, $H;
1788 $w = _scale $size, $w, $child->{req_w};
1789 $h = _scale $size, $h, $child->{req_h};
1790
1791 $child->configure ($x, $y, $w, $h);
1583 } 1792 }
1584 1793
1585 1 1794 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} 1795}
1611 1796
1612############################################################################# 1797#############################################################################
1613 1798
1614package CFPlus::UI::Box; 1799package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2085 active_fg => [0, 0, 0],
1901 can_hover => 1, 2086 can_hover => 1,
1902 can_focus => 1, 2087 can_focus => 1,
1903 valign => 0, 2088 valign => 0,
1904 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1905 #text => ... 2091 #text => ...
1906 #hidden => "*", 2092 #hidden => "*",
1907 @_ 2093 @_
1908 ) 2094 )
1909} 2095}
… …
1953 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1956 2142
1957 my $text = $self->get_text; 2143 my $text = $self->get_text;
2144
2145 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2146
1959 if ($uni == 8) { 2147 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2155 } elsif ($sym == CFPlus::SDLK_HOME) {
2156 # what a hack
1968 $self->{cursor} = 0; 2157 $self->{cursor} =
2158 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2159 ? length $1
2160 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2161 } elsif ($sym == CFPlus::SDLK_END) {
2162 # uh, again
2163 $self->{cursor} =
2164 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2165 ? $self->{cursor} + length $1
2166 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2167 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2168 $text = "";
1973 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2171 $self->emit ('escape');
1976 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2176 } else {
1979 return 0; 2177 return 0;
1980 } 2178 }
1981 2179
1982 $self->_set_text ($text); 2180 $self->_set_text ($text);
1983 2181
1984 $self->realloc; 2182 $self->realloc;
2183 $self->update;
1985 2184
1986 1 2185 1
1987} 2186}
1988 2187
1989sub invoke_focus_in { 2188sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2257 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2258 glEnd;
2060 } 2259 }
2061} 2260}
2062 2261
2262#############################################################################
2263
2063package CFPlus::UI::Entry; 2264package CFPlus::UI::Entry;
2064 2265
2065our @ISA = CFPlus::UI::EntryBase::; 2266our @ISA = CFPlus::UI::EntryBase::;
2066 2267
2067use CFPlus::OpenGL; 2268use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2270sub invoke_key_down {
2070 my ($self, $ev) = @_; 2271 my ($self, $ev) = @_;
2071 2272
2072 my $sym = $ev->{sym}; 2273 my $sym = $ev->{sym};
2073 2274
2074 if ($sym == 13) { 2275 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2276 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2277 my $txt = $self->get_text;
2077 2278
2078 $self->{history_pointer} = -1; 2279 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2280 $self->{history_saveback} = '';
… …
2109 1 2310 1
2110} 2311}
2111 2312
2112############################################################################# 2313#############################################################################
2113 2314
2315package CFPlus::UI::TextEdit;
2316
2317our @ISA = CFPlus::UI::EntryBase::;
2318
2319use CFPlus::OpenGL;
2320
2321sub move_cursor_ver {
2322 my ($self, $dy) = @_;
2323
2324 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2325
2326 $y += $dy;
2327
2328 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2329 $self->{cursor} = $index;
2330 delete $self->{cur_h};
2331 $self->update;
2332 return;
2333 }
2334}
2335
2336sub invoke_key_down {
2337 my ($self, $ev) = @_;
2338
2339 my $sym = $ev->{sym};
2340
2341 if ($sym == CFPlus::SDLK_UP) {
2342 $self->move_cursor_ver (-1);
2343 } elsif ($sym == CFPlus::SDLK_DOWN) {
2344 $self->move_cursor_ver (+1);
2345 } else {
2346 return $self->SUPER::invoke_key_down ($ev)
2347 }
2348
2349 1
2350}
2351
2352#############################################################################
2353
2114package CFPlus::UI::Button; 2354package CFPlus::UI::Button;
2115 2355
2116our @ISA = CFPlus::UI::Label::; 2356our @ISA = CFPlus::UI::Label::;
2117 2357
2118use CFPlus::OpenGL; 2358use CFPlus::OpenGL;
2119 2359
2120my @tex = 2360my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png); 2362 qw(b1_button_inactive.png b1_button_active.png);
2123 2363
2124sub new { 2364sub new {
2125 my $class = shift; 2365 my $class = shift;
2126 2366
2127 $class->SUPER::new ( 2367 $class->SUPER::new (
2128 padding_x => 4, 2368 padding_x => 4,
2129 padding_y => 4, 2369 padding_y => 4,
2130 fg => [1, 1, 1], 2370 fg => [1.0, 1.0, 1.0],
2131 active_fg => [0, 0, 1], 2371 active_fg => [0.8, 0.8, 0.8],
2132 can_hover => 1, 2372 can_hover => 1,
2133 align => 0, 2373 align => 0,
2134 valign => 0, 2374 valign => 0,
2135 can_events => 1, 2375 can_events => 1,
2136 @_ 2376 @_
… …
2154 2394
2155 glEnable GL_TEXTURE_2D; 2395 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2396 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2397 glColor 0, 0, 0, 1;
2158 2398
2399 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2400 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2401
2161 glDisable GL_TEXTURE_2D; 2402 glDisable GL_TEXTURE_2D;
2162 2403
2163 $self->SUPER::_draw; 2404 $self->SUPER::_draw;
2164} 2405}
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2501 or Carp::croak "'path' or 'tex' attributes required";
2261 2502
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2503 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2504 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2505
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2506 CFPlus::weaken $texture_cache{$self->{path}};
2266 2507
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2508 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2509
2269 $self 2510 $self
2270} 2511}
… …
2643sub invoke_mouse_wheel { 2884sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2885 my ($self, $ev) = @_;
2645 2886
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2887 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2888
2889 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2890
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2891 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2892
2650 ! ! $delta 2893 ! ! $delta
2651} 2894}
2652 2895
2653sub update { 2896sub update {
… …
2763 #font => default_font 3006 #font => default_font
2764 @_, 3007 @_,
2765 3008
2766 layout => (new CFPlus::Layout), 3009 layout => (new CFPlus::Layout),
2767 par => [], 3010 par => [],
3011 max_par => 0,
2768 height => 0, 3012 height => 0,
2769 children => [ 3013 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3014 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3015 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3016 ],
… …
2895 wrapped => 1, 3139 wrapped => 1,
2896 }; 3140 };
2897 3141
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3142 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3143 push @{$self->{par}}, $para;
3144 }
3145
3146 if (my $max = $self->{max_par}) {
3147 shift @{$self->{par}} while @{$self->{par}} > $max;
2900 } 3148 }
2901 3149
2902 $self->{need_reflow}++; 3150 $self->{need_reflow}++;
2903 $self->update; 3151 $self->update;
2904} 3152}
… …
3212 3460
3213sub new { 3461sub new {
3214 my $class = shift; 3462 my $class = shift;
3215 3463
3216 my $self = $class->SUPER::new ( 3464 my $self = $class->SUPER::new (
3465 size_w => 32,
3466 size_h => 8,
3217 aspect => 1, 3467 aspect => 1,
3218 can_events => 0, 3468 can_events => 0,
3219 @_, 3469 @_,
3220 ); 3470 );
3221 3471
3222 if ($self->{anim} && $self->{animspeed}) { 3472 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3473 CFPlus::weaken (my $widget = $self);
3224 3474
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3225 $self->{timer} = Event->timer ( 3477 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1, 3478 parked => 1,
3228 interval => $self->{animspeed},
3229 cb => sub { 3479 cb => sub {
3480 return unless $::CONN && $widget;
3481
3230 ++$widget->{frame}; 3482 ++$widget->{frame};
3483 $widget->update_face;
3231 $widget->update; 3484 $widget->update;
3485
3486 $widget->update_timer;
3232 }, 3487 },
3233 ); 3488 );
3489
3490 $self->update_face;
3491 $self->update_timer;
3234 } 3492 }
3235 3493
3236 $self 3494 $self
3237} 3495}
3238 3496
3497sub update_timer {
3498 my ($self) = @_;
3499
3500 return unless $self->{timer};
3501
3502 if ($self->{visible}) {
3503 $self->{timer}->at (
3504 $self->{anim_start}
3505 + $self->{animspeed}
3506 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3507 );
3508 $self->{timer}->start;
3509 } else {
3510 $self->{timer}->stop;
3511 }
3512}
3513
3514sub update_face {
3515 my ($self) = @_;
3516
3517 return unless $::CONN;
3518
3519 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if ($anim && @$anim) {
3521 delete $self->{wait_face};
3522 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3523 }
3524 }
3525}
3526
3239sub size_request { 3527sub size_request {
3240 (32, 8) 3528 my ($self) = @_;
3529
3530 if ($::CONN) {
3531 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3532 if (my $tex = $::CONN->{texture}[$faceid]) {
3533 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3534 } else {
3535 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3536 $self->realloc;
3537 });
3538 }
3539 }
3540 }
3541
3542 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3543}
3242 3544
3243sub update { 3545sub update {
3244 my ($self) = @_; 3546 my ($self) = @_;
3245 3547
3246 return unless $self->{visible}; 3548 return unless $self->{visible};
3247 3549
3248 $self->SUPER::update; 3550 $self->SUPER::update;
3249} 3551}
3250 3552
3553sub invoke_visibility_change {
3554 my ($self) = @_;
3555
3556 $self->update_timer;
3557
3558 0
3559}
3560
3251sub _draw { 3561sub _draw {
3252 my ($self) = @_; 3562 my ($self) = @_;
3253 3563
3254 return unless $::CONN; 3564 return unless $::CONN;
3255 3565
3256 $self->SUPER::_draw; 3566 $self->SUPER::_draw;
3257 3567
3258 my $face;
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}]; 3568 my $faceid = $::CONN->{faceid}[$self->{face}]
3262 3569 or return;
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266 3570
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3571 my $tex = $::CONN->{texture}[$faceid];
3268 3572
3269 if ($tex) { 3573 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3574 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3576 glColor 0, 0, 0, 1;
… …
3276} 3580}
3277 3581
3278sub destroy { 3582sub destroy {
3279 my ($self) = @_; 3583 my ($self) = @_;
3280 3584
3281 $self->{timer}->cancel 3585 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3586 if $self->{timer};
3283 3587
3284 $self->SUPER::destroy; 3588 $self->SUPER::destroy;
3285} 3589}
3286 3590
… …
3482} 3786}
3483 3787
3484sub add { 3788sub add {
3485 my ($self, $title, $widget, $tooltip) = @_; 3789 my ($self, $title, $widget, $tooltip) = @_;
3486 3790
3487 Scalar::Util::weaken $self; 3791 CFPlus::weaken $self;
3488 3792
3489 $self->{buttonbar}->add (new CFPlus::UI::Button 3793 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title, 3794 markup => $title,
3491 tooltip => $tooltip, 3795 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) }, 3796 on_activate => sub { $self->set_current_page ($widget) },
… …
3576 my $self = $class->SUPER::new ( 3880 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 3881 fontsize => 0.8,
3578 @_, 3882 @_,
3579 ); 3883 );
3580 3884
3581 Scalar::Util::weaken (my $this = $self); 3885 CFPlus::weaken (my $this = $self);
3582 3886
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3887 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584 3888
3585 $self 3889 $self
3586} 3890}
… …
3709 $self->SUPER::destroy; 4013 $self->SUPER::destroy;
3710} 4014}
3711 4015
3712############################################################################# 4016#############################################################################
3713 4017
3714package CFPlus::UI::Inventory;
3715
3716our @ISA = CFPlus::UI::Table::;
3717
3718sub new {
3719 my $class = shift;
3720
3721 my $self = $class->SUPER::new (
3722 col_expand => [0, 1, 0],
3723 items => [],
3724 @_,
3725 );
3726
3727 $self->set_sort_order (undef);
3728
3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3765}
3766
3767sub set_items {
3768 my ($self, $items) = @_;
3769
3770 $self->{items} = [$items ? values %$items : ()];
3771 $self->update_items;
3772}
3773
3774#############################################################################
3775
3776package CFPlus::UI::SpellList;
3777
3778our @ISA = CFPlus::UI::Table::;
3779
3780sub new {
3781 my $class = shift;
3782
3783 my $self = $class->SUPER::new (
3784 binding => [],
3785 commands => [],
3786 @_,
3787 )
3788}
3789
3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 (new CFPlus::UI::Menu
3833 items => [
3834 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3835 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3836 ],
3837 )->popup ($ev);
3838 } else {
3839 return 0;
3840 }
3841
3842 1
3843 };
3844
3845 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3846
3847 #TODO: add path info to tooltip
3848 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3849
3850 $self->add (0, $row, new CFPlus::UI::Face
3851 face => $spell->{face},
3852 can_hover => 1,
3853 can_events => 1,
3854 tooltip => $tooltip,
3855 on_button_down => $spell_cb,
3856 );
3857
3858 $self->add (1, $row, new CFPlus::UI::Label
3859 expand => 1,
3860 text => $spell->{name},
3861 can_hover => 1,
3862 can_events => 1,
3863 tooltip => $tooltip,
3864 on_button_down => $spell_cb,
3865 );
3866
3867 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3868 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3869 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3870 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3871 }
3872 });
3873}
3874
3875sub add_spell {
3876 my ($self, $spell) = @_;
3877
3878 $self->{spell}->{$spell->{name}} = $spell;
3879 $self->rebuild_spell_list;
3880}
3881
3882sub remove_spell {
3883 my ($self, $spell) = @_;
3884
3885 delete $self->{spell}->{$spell->{name}};
3886 $self->rebuild_spell_list;
3887}
3888
3889sub clear_spells {
3890 my ($self) = @_;
3891
3892 $self->{spell} = {};
3893 $self->rebuild_spell_list;
3894}
3895
3896#############################################################################
3897
3898package CFPlus::UI::Root; 4018package CFPlus::UI::Root;
3899 4019
3900our @ISA = CFPlus::UI::Container::; 4020our @ISA = CFPlus::UI::Container::;
3901 4021
3902use List::Util qw(min max); 4022use List::Util qw(min max);
… …
3909 my $self = $class->SUPER::new ( 4029 my $self = $class->SUPER::new (
3910 visible => 1, 4030 visible => 1,
3911 @_, 4031 @_,
3912 ); 4032 );
3913 4033
3914 Scalar::Util::weaken ($self->{root} = $self); 4034 CFPlus::weaken ($self->{root} = $self);
3915 4035
3916 $self 4036 $self
3917} 4037}
3918 4038
3919sub size_request { 4039sub size_request {
… …
4114 while ($self->{post_alloc_hook}) { 4234 while ($self->{post_alloc_hook}) {
4115 $_->() 4235 $_->()
4116 for values %{delete $self->{post_alloc_hook}}; 4236 for values %{delete $self->{post_alloc_hook}};
4117 } 4237 }
4118 4238
4119
4120 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4239 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4121 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4240 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4122 glClear GL_COLOR_BUFFER_BIT; 4241 glClear GL_COLOR_BUFFER_BIT;
4123 4242
4124 glMatrixMode GL_PROJECTION; 4243 glMatrixMode GL_PROJECTION;

Diff Legend

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