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.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 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
1062#TODO# update range on size_allocate depending on child
1063 1106
1064sub add { 1107sub add {
1065 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1066 1109
1067 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1068} 1111}
1069 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
1070sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1072 1160
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev);
1162 $self->{hslider}->emit (mouse_wheel => $ev);
1076 1163
1077 1 1164 1
1078} 1165}
1079 1166
1080sub update_slider { 1167sub invoke_button_down {
1081 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1082 1169
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1170 $self->start_dragging ($ev);
1084}
1085 1171
1086sub update { 1172 1
1087 my ($self) = @_; 1173}
1088 1174
1089 $self->SUPER::update; 1175sub invoke_button_up {
1176 my ($self, $ev, $x, $y) = @_;
1090 1177
1091 $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
1092} 1194}
1093 1195
1094sub invoke_size_allocate { 1196sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
1096 1198
1097 $self->update_slider; 1199 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1200 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1201}
1101 1202
1102############################################################################# 1203#############################################################################
1103 1204
… …
1253 1354
1254my @border = 1355my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 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); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257 1358
1359my @icon =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1362
1258sub new { 1363sub new {
1259 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1260 1365
1261 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1262 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
… …
1430 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431 1536
1432 my $border = $self->border; 1537 my $border = $self->border;
1433 1538
1434 glColor @{ $self->{border_bg} }; 1539 glColor @{ $self->{border_bg} };
1435 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1540 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1541 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1542 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438 $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);
1439 1558
1440 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1559 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441 glColor @{ $self->{bg} }; 1560 glColor @{ $self->{bg} };
1442 1561
1443 # TODO: repeat texture not scale 1562 # TODO: repeat texture not scale
… …
1464 1583
1465############################################################################# 1584#############################################################################
1466 1585
1467package CFPlus::UI::Table; 1586package CFPlus::UI::Table;
1468 1587
1469our @ISA = CFPlus::UI::Base::; 1588our @ISA = CFPlus::UI::Container::;
1470 1589
1471use List::Util qw(max sum); 1590use List::Util qw(max sum);
1472 1591
1473use CFPlus::OpenGL; 1592use CFPlus::OpenGL;
1474 1593
1475sub new { 1594sub new {
1476 my $class = shift; 1595 my $class = shift;
1477 1596
1478 $class->SUPER::new ( 1597 $class->SUPER::new (
1479 col_expand => [], 1598 col_expand => [],
1599 row_expand => [],
1480 @_, 1600 @_,
1481 ) 1601 )
1482} 1602}
1483 1603
1484sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486}
1487
1488sub 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 {
1489 my ($self) = shift; 1616 my $self = shift;
1617
1618 my @widgets;
1490 1619
1491 while (@_) { 1620 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1621 my ($col, $row, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child;
1495 }
1496 1622
1497 $self->{force_realloc} = 1; 1623 $child->{row} = $row;
1498 $self->{force_size_alloc} = 1; 1624 $child->{col} = $col;
1499 $self->realloc;
1500}
1501 1625
1502sub remove { 1626 push @widgets, $child;
1627 }
1628
1629 $self->add (@widgets);
1630}
1631
1632sub get_wh {
1503 my ($self, $child) = @_; 1633 my ($self) = @_;
1504 1634
1505 # TODO: not yet implemented 1635 my (@w, @h);
1506}
1507
1508# TODO: move to container class maybe? send children a signal on removal?
1509sub clear {
1510 my ($self) = @_;
1511 1636
1512 my @children = $self->children; 1637 my @children = $self->children;
1513 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 }
1514 1648 }
1515 for (@children) {
1516 delete $_->{parent};
1517 $_->hide;
1518 }
1519 1649
1520 $self->realloc; 1650 # second pass, rows
1521} 1651 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)}; 1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1536 1653
1537 $w[$x] = max $w[$x], $w; 1654 my $sh = sum @h[$r .. $r + $rs - 1];
1538 $h[$y] = max $h[$y], $h; 1655
1656 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539 } 1658 }
1540 } 1659 }
1541 1660
1542 (\@w, \@h) 1661 (\@w, \@h)
1543} 1662}
… …
1559 my ($ws, $hs) = $self->get_wh; 1678 my ($ws, $hs) = $self->get_wh;
1560 1679
1561 my $req_w = (sum @$ws) || 1; 1680 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1681 my $req_h = (sum @$hs) || 1;
1563 1682
1564 # TODO: nicer code && do row_expand 1683 # now linearly scale the rows/columns to the allocated size
1565 my @col_expand = @{$self->{col_expand}}; 1684 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1685 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1686 my $col_expand = (sum @col_expand) || 1;
1568 1687
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1688 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1689
1573 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
1574 CFPlus::UI::harmonize $hs; 1698 CFPlus::UI::harmonize $hs;
1575 1699
1576 my $y; 1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577 1702
1578 for my $r (0 .. $#{$self->{children}}) { 1703 for my $widget ($self->children) {
1579 my $row = $self->{children}[$r] 1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1580 or next;
1581 1705
1582 my $x = 0; 1706 $widget->configure (
1583 my $row_h = $hs->[$r]; 1707 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584 1709 );
1585 for my $c (0 .. $#$row) { 1710 }
1586 my $col_w = $ws->[$c];
1587 1711
1588 if (my $widget = $row->[$c]) { 1712 1
1589 $widget->configure ($x, $y, $col_w, $row_h); 1713}
1590 }
1591 1714
1592 $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;
1593 } 1753 }
1754 }
1594 1755
1595 $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);
1596 } 1792 }
1597 1793
1598 1 1794 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} 1795}
1624 1796
1625############################################################################# 1797#############################################################################
1626 1798
1627package CFPlus::UI::Box; 1799package CFPlus::UI::Box;
… …
1913 active_fg => [0, 0, 0], 2085 active_fg => [0, 0, 0],
1914 can_hover => 1, 2086 can_hover => 1,
1915 can_focus => 1, 2087 can_focus => 1,
1916 valign => 0, 2088 valign => 0,
1917 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1918 #text => ... 2091 #text => ...
1919 #hidden => "*", 2092 #hidden => "*",
1920 @_ 2093 @_
1921 ) 2094 )
1922} 2095}
… …
1966 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1969 2142
1970 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;
1971 2146
1972 if ($uni == 8) { 2147 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2155 } elsif ($sym == CFPlus::SDLK_HOME) {
2156 # what a hack
1981 $self->{cursor} = 0; 2157 $self->{cursor} =
2158 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2159 ? length $1
2160 : 0;
1982 } 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/
1983 $self->{cursor} = length $text; 2165 ? $self->{cursor} + length $1
2166 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2167 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2168 $text = "";
1986 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2171 $self->emit ('escape');
1989 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2176 } else {
1992 return 0; 2177 return 0;
1993 } 2178 }
1994 2179
1995 $self->_set_text ($text); 2180 $self->_set_text ($text);
1996 2181
1997 $self->realloc; 2182 $self->realloc;
2183 $self->update;
1998 2184
1999 1 2185 1
2000} 2186}
2001 2187
2002sub invoke_focus_in { 2188sub invoke_focus_in {
… …
2071 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};
2072 glEnd; 2258 glEnd;
2073 } 2259 }
2074} 2260}
2075 2261
2262#############################################################################
2263
2076package CFPlus::UI::Entry; 2264package CFPlus::UI::Entry;
2077 2265
2078our @ISA = CFPlus::UI::EntryBase::; 2266our @ISA = CFPlus::UI::EntryBase::;
2079 2267
2080use CFPlus::OpenGL; 2268use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2270sub invoke_key_down {
2083 my ($self, $ev) = @_; 2271 my ($self, $ev) = @_;
2084 2272
2085 my $sym = $ev->{sym}; 2273 my $sym = $ev->{sym};
2086 2274
2087 if ($sym == 13) { 2275 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2276 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2277 my $txt = $self->get_text;
2090 2278
2091 $self->{history_pointer} = -1; 2279 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2280 $self->{history_saveback} = '';
… …
2122 1 2310 1
2123} 2311}
2124 2312
2125############################################################################# 2313#############################################################################
2126 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
2127package CFPlus::UI::Button; 2354package CFPlus::UI::Button;
2128 2355
2129our @ISA = CFPlus::UI::Label::; 2356our @ISA = CFPlus::UI::Label::;
2130 2357
2131use CFPlus::OpenGL; 2358use CFPlus::OpenGL;
2132 2359
2133my @tex = 2360my @tex =
2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135 qw(b1_button_active.png); 2362 qw(b1_button_inactive.png b1_button_active.png);
2136 2363
2137sub new { 2364sub new {
2138 my $class = shift; 2365 my $class = shift;
2139 2366
2140 $class->SUPER::new ( 2367 $class->SUPER::new (
2141 padding_x => 4, 2368 padding_x => 4,
2142 padding_y => 4, 2369 padding_y => 4,
2143 fg => [1, 1, 1], 2370 fg => [1.0, 1.0, 1.0],
2144 active_fg => [0, 0, 1], 2371 active_fg => [0.8, 0.8, 0.8],
2145 can_hover => 1, 2372 can_hover => 1,
2146 align => 0, 2373 align => 0,
2147 valign => 0, 2374 valign => 0,
2148 can_events => 1, 2375 can_events => 1,
2149 @_ 2376 @_
… …
2167 2394
2168 glEnable GL_TEXTURE_2D; 2395 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2396 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 glColor 0, 0, 0, 1; 2397 glColor 0, 0, 0, 1;
2171 2398
2399 my $tex = $tex[$GRAB == $self];
2172 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2400 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173 2401
2174 glDisable GL_TEXTURE_2D; 2402 glDisable GL_TEXTURE_2D;
2175 2403
2176 $self->SUPER::_draw; 2404 $self->SUPER::_draw;
2177} 2405}
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2501 or Carp::croak "'path' or 'tex' attributes required";
2274 2502
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2503 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 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;
2277 2505
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2506 CFPlus::weaken $texture_cache{$self->{path}};
2279 2507
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2508 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2509
2282 $self 2510 $self
2283} 2511}
… …
2656sub invoke_mouse_wheel { 2884sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2885 my ($self, $ev) = @_;
2658 2886
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2887 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2888
2889 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2890
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2891 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2892
2663 ! ! $delta 2893 ! ! $delta
2664} 2894}
2665 2895
2666sub update { 2896sub update {
… …
2776 #font => default_font 3006 #font => default_font
2777 @_, 3007 @_,
2778 3008
2779 layout => (new CFPlus::Layout), 3009 layout => (new CFPlus::Layout),
2780 par => [], 3010 par => [],
3011 max_par => 0,
2781 height => 0, 3012 height => 0,
2782 children => [ 3013 children => [
2783 (new CFPlus::UI::Empty expand => 1), 3014 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 3015 (new CFPlus::UI::Slider vertical => 1),
2785 ], 3016 ],
… …
2908 wrapped => 1, 3139 wrapped => 1,
2909 }; 3140 };
2910 3141
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3142 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 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;
2913 } 3148 }
2914 3149
2915 $self->{need_reflow}++; 3150 $self->{need_reflow}++;
2916 $self->update; 3151 $self->update;
2917} 3152}
… …
3225 3460
3226sub new { 3461sub new {
3227 my $class = shift; 3462 my $class = shift;
3228 3463
3229 my $self = $class->SUPER::new ( 3464 my $self = $class->SUPER::new (
3465 size_w => 32,
3466 size_h => 8,
3230 aspect => 1, 3467 aspect => 1,
3231 can_events => 0, 3468 can_events => 0,
3232 @_, 3469 @_,
3233 ); 3470 );
3234 3471
3235 if ($self->{anim} && $self->{animspeed}) { 3472 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3473 CFPlus::weaken (my $widget = $self);
3237 3474
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3238 $self->{timer} = Event->timer ( 3477 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3478 parked => 1,
3241 interval => $self->{animspeed},
3242 cb => sub { 3479 cb => sub {
3480 return unless $::CONN && $widget;
3481
3243 ++$widget->{frame}; 3482 ++$widget->{frame};
3483 $widget->update_face;
3244 $widget->update; 3484 $widget->update;
3485
3486 $widget->update_timer;
3245 }, 3487 },
3246 ); 3488 );
3489
3490 $self->update_face;
3491 $self->update_timer;
3247 } 3492 }
3248 3493
3249 $self 3494 $self
3250} 3495}
3251 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
3252sub size_request { 3527sub size_request {
3253 (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)
3254} 3543}
3255 3544
3256sub update { 3545sub update {
3257 my ($self) = @_; 3546 my ($self) = @_;
3258 3547
3259 return unless $self->{visible}; 3548 return unless $self->{visible};
3260 3549
3261 $self->SUPER::update; 3550 $self->SUPER::update;
3262} 3551}
3263 3552
3553sub invoke_visibility_change {
3554 my ($self) = @_;
3555
3556 $self->update_timer;
3557
3558 0
3559}
3560
3264sub _draw { 3561sub _draw {
3265 my ($self) = @_; 3562 my ($self) = @_;
3266 3563
3267 return unless $::CONN; 3564 return unless $::CONN;
3268 3565
3269 $self->SUPER::_draw; 3566 $self->SUPER::_draw;
3270 3567
3271 my $face;
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}]; 3568 my $faceid = $::CONN->{faceid}[$self->{face}]
3275 3569 or return;
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279 3570
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3571 my $tex = $::CONN->{texture}[$faceid];
3281 3572
3282 if ($tex) { 3573 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3574 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3576 glColor 0, 0, 0, 1;
… …
3289} 3580}
3290 3581
3291sub destroy { 3582sub destroy {
3292 my ($self) = @_; 3583 my ($self) = @_;
3293 3584
3294 $self->{timer}->cancel 3585 (delete $self->{timer})->cancel
3295 if $self->{timer}; 3586 if $self->{timer};
3296 3587
3297 $self->SUPER::destroy; 3588 $self->SUPER::destroy;
3298} 3589}
3299 3590
… …
3495} 3786}
3496 3787
3497sub add { 3788sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3789 my ($self, $title, $widget, $tooltip) = @_;
3499 3790
3500 Scalar::Util::weaken $self; 3791 CFPlus::weaken $self;
3501 3792
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3793 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title, 3794 markup => $title,
3504 tooltip => $tooltip, 3795 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) }, 3796 on_activate => sub { $self->set_current_page ($widget) },
… …
3589 my $self = $class->SUPER::new ( 3880 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3881 fontsize => 0.8,
3591 @_, 3882 @_,
3592 ); 3883 );
3593 3884
3594 Scalar::Util::weaken (my $this = $self); 3885 CFPlus::weaken (my $this = $self);
3595 3886
3596 $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 });
3597 3888
3598 $self 3889 $self
3599} 3890}
… …
3722 $self->SUPER::destroy; 4013 $self->SUPER::destroy;
3723} 4014}
3724 4015
3725############################################################################# 4016#############################################################################
3726 4017
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; 4018package CFPlus::UI::Root;
3912 4019
3913our @ISA = CFPlus::UI::Container::; 4020our @ISA = CFPlus::UI::Container::;
3914 4021
3915use List::Util qw(min max); 4022use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 4029 my $self = $class->SUPER::new (
3923 visible => 1, 4030 visible => 1,
3924 @_, 4031 @_,
3925 ); 4032 );
3926 4033
3927 Scalar::Util::weaken ($self->{root} = $self); 4034 CFPlus::weaken ($self->{root} = $self);
3928 4035
3929 $self 4036 $self
3930} 4037}
3931 4038
3932sub size_request { 4039sub size_request {
… …
4127 while ($self->{post_alloc_hook}) { 4234 while ($self->{post_alloc_hook}) {
4128 $_->() 4235 $_->()
4129 for values %{delete $self->{post_alloc_hook}}; 4236 for values %{delete $self->{post_alloc_hook}};
4130 } 4237 }
4131 4238
4132
4133 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4239 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4240 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135 glClear GL_COLOR_BUFFER_BIT; 4241 glClear GL_COLOR_BUFFER_BIT;
4136 4242
4137 glMatrixMode GL_PROJECTION; 4243 glMatrixMode GL_PROJECTION;

Diff Legend

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