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.340 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $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
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
267} 279}
268 280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
501 513
502 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
505 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
506} 524}
507 525
508my %has_coords = ( 526my %has_coords = (
509 button_down => 1, 527 button_down => 1,
510 button_up => 1, 528 button_up => 1,
… …
513); 531);
514 532
515sub emit { 533sub emit {
516 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
517 535
518 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
520 my @append 538 my @append
521 = $has_coords{$signal} 539 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
523 : (); 541 : ();
524 542
525 #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#
526 544
527 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($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
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 554}
532 555
533sub find_widget { 556#sub find_widget {
534 my ($self, $x, $y) = @_; 557# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 558
545sub set_parent { 559sub set_parent {
546 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
547 561
548 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
550} 564}
551 565
552sub realloc { 566sub realloc {
553 my ($self) = @_; 567 my ($self) = @_;
… …
637sub DESTROY { 651sub DESTROY {
638 my ($self) = @_; 652 my ($self) = @_;
639 653
640 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
641 655
642 delete $WIDGET{$self+0};
643
644 eval { $self->destroy }; 656 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
646} 660}
647 661
648############################################################################# 662#############################################################################
649 663
650package CFPlus::UI::DrawBG; 664package CFPlus::UI::DrawBG;
… …
726 can_events => 0, 740 can_events => 0,
727 %arg, 741 %arg,
728 ); 742 );
729 743
730 $self->add (@$children) 744 $self->add (@$children)
731 if $children; 745 if $children && @$children;
732 746
733 $self 747 $self
734} 748}
735 749
736sub realloc { 750sub realloc {
… …
745 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
746 760
747 $_->set_parent ($self) 761 $_->set_parent ($self)
748 for @widgets; 762 for @widgets;
749 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 765 use sort 'stable';
751 766
752 $self->{children} = [ 767 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
755 ]; 770 ];
756 771
757 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
758} 775}
759 776
760sub children { 777sub children {
761 @{ $_[0]{children} } 778 @{ $_[0]{children} }
762} 779}
… …
773} 790}
774 791
775sub clear { 792sub clear {
776 my ($self) = @_; 793 my ($self) = @_;
777 794
778 my $children = delete $self->{children}; 795 my $children = $self->{children};
779 $self->{children} = []; 796 $self->{children} = [];
780 797
781 for (@$children) { 798 for (@$children) {
782 delete $_->{parent}; 799 delete $_->{parent};
783 $_->hide; 800 $_->hide;
… …
897 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
898 915
899 { 916 {
900 package CFPlus::UI::Base; 917 package CFPlus::UI::Base;
901 918
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
904 } 923 }
905
906 $self->_render;
907 }; 924 };
908} 925}
909 926
910sub _draw { 927sub _draw {
911 my ($self) = @_; 928 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 929
915 my $tex = $self->{texture} 930 my $tex = $self->{texture}
916 or return; 931 or return;
917 932
918 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
921 936
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
923 938
924 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
925} 940}
926 941
927############################################################################# 942#############################################################################
928 943
929package CFPlus::UI::ViewPort; 944package CFPlus::UI::ViewPort;
945
946use List::Util qw(min max);
930 947
931our @ISA = CFPlus::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
932 949
933sub new { 950sub new {
934 my $class = shift; 951 my $class = shift;
… …
943sub size_request { 960sub size_request {
944 my ($self) = @_; 961 my ($self) = @_;
945 962
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 964
948 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
950 967
951 ($w, $h) 968 ($w, $h)
952} 969}
953 970
954sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
966} 983}
967 984
968sub set_offset { 985sub set_offset {
969 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
970 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
973 994
995 $self->emit (changed => $x, $y);
974 $self->update; 996 $self->update;
997 }
975} 998}
976 999
977# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 1001sub coord2local {
979 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
995 1018
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1021 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1023 } else {
1001 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1025 }
1003} 1026}
1004 1027
… …
1015 1038
1016############################################################################# 1039#############################################################################
1017 1040
1018package CFPlus::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1019 1042
1020our @ISA = CFPlus::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1021 1044
1022sub new { 1045sub new {
1023 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1024 1047
1025 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1026 1049
1027 my $self; 1050 my $self;
1028 1051
1029 my $slider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1030 vertical => 1, 1066 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1068 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1071 },
1035 ; 1072 ;
1036 1073
1037 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1038 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1039 can_events => 1, 1077 can_events => 1,
1040 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1041 %arg, 1082 %arg,
1042 ); 1083 );
1043 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 ;
1100
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1101 $self->SUPER::add ($self->{vp});
1102
1045 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
1046 1104
1047 $self 1105 $self
1048} 1106}
1049
1050#TODO# update range on size_allocate depending on child
1051 1107
1052sub add { 1108sub add {
1053 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
1054 1110
1055 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
1056} 1112}
1057 1113
1114sub update_slider {
1115 my ($self) = @_;
1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1121
1122 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
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
1058sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1060 1160
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1163
1065 1 1164 1
1066} 1165}
1067 1166
1068sub update_slider { 1167sub invoke_button_down {
1069 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1070 1169
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1170 if ($ev->{button} == 2) {
1072} 1171 $self->start_dragging ($ev);
1172 return 1;
1173 }
1073 1174
1074sub update { 1175 0
1075 my ($self) = @_; 1176}
1076 1177
1077 $self->SUPER::update; 1178sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_;
1078 1180
1079 $self->update_slider; 1181 if (delete $self->{motion}) {
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1188sub invoke_mouse_motion {
1189 my ($self, $ev, $x, $y) = @_;
1190
1191 if ($self->{motion}) {
1192 $self->{motion}->($ev, $x, $y);
1193 return 1;
1194 }
1195
1196 0
1080} 1197}
1081 1198
1082sub invoke_size_allocate { 1199sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1084 1201
1085 $self->update_slider; 1202 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1203 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1204}
1089 1205
1090############################################################################# 1206#############################################################################
1091 1207
… …
1133 1249
1134our @ISA = CFPlus::UI::Bin::; 1250our @ISA = CFPlus::UI::Bin::;
1135 1251
1136use CFPlus::OpenGL; 1252use CFPlus::OpenGL;
1137 1253
1254sub new {
1255 my ($class, %arg) = @_;
1256
1257 if ((exists $arg{label}) && !ref $arg{label}) {
1258 $arg{label} = new CFPlus::UI::Label
1259 align => 1,
1260 valign => 0,
1261 text => $arg{label},
1262 fontsize => ($arg{border} || 0.8) * 0.75;
1263 }
1264
1265 my $self = $class->SUPER::new (
1266 # label => "",
1267 fg => [0.6, 0.3, 0.1],
1268 border => 0.8,
1269 style => 'single',
1270 %arg,
1271 );
1272
1273 $self
1274}
1275
1276sub add {
1277 my ($self, @widgets) = @_;
1278
1279 $self->SUPER::add (@widgets);
1280 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1281}
1282
1283sub border {
1284 int $_[0]{border} * $::FONTSIZE
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 ($self->{label_w}, undef) = $self->{label}->size_request
1291 if $self->{label};
1292
1293 my ($w, $h) = $self->SUPER::size_request;
1294
1295 (
1296 $w + $self->border * 2,
1297 $h + $self->border * 2,
1298 )
1299}
1300
1301sub invoke_size_allocate {
1302 my ($self, $w, $h) = @_;
1303
1304 my $border = $self->border;
1305
1306 $w -= List::Util::max 0, $border * 2;
1307 $h -= List::Util::max 0, $border * 2;
1308
1309 if (my $label = $self->{label}) {
1310 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1311 $label->{h} = List::Util::min $h, $border;
1312 $label->invoke_size_allocate ($label->{w}, $label->{h});
1313 }
1314
1315 $self->child->configure ($border, $border, $w, $h);
1316
1317 1
1318}
1319
1320sub _draw {
1321 my ($self) = @_;
1322
1323 my $child = $self->{children}[0];
1324
1325 my $border = $self->border;
1326 my ($w, $h) = ($self->{w}, $self->{h});
1327
1328 $child->draw;
1329
1330 glColor @{$self->{fg}};
1331 glBegin GL_LINE_STRIP;
1332 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1337 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1338 glEnd;
1339
1340 if ($self->{label}) {
1341 glTranslate $border * 2, 0;
1342 $self->{label}->_draw;
1343 }
1344}
1345
1346#############################################################################
1347
1348package CFPlus::UI::Toplevel;
1349
1350our @ISA = CFPlus::UI::Bin::;
1351
1352use CFPlus::OpenGL;
1353
1138my $bg = 1354my $bg =
1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1355 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1356 mipmap => 1, wrap => 1;
1141 1357
1142my @border = 1358my @border =
1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1360 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1145 1365
1146sub new { 1366sub new {
1147 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1148 1368
1149 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1539
1320 my $border = $self->border; 1540 my $border = $self->border;
1321 1541
1322 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1546 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1547
1548 # move
1549 my $w2 = ($w - $border) * .5;
1550 my $h2 = ($h - $border) * .5;
1551 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1554
1555 # resize
1556 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1558 unless $self->{has_close_button};
1559 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1561
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1330 1564
1331 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1352 1586
1353############################################################################# 1587#############################################################################
1354 1588
1355package CFPlus::UI::Table; 1589package CFPlus::UI::Table;
1356 1590
1357our @ISA = CFPlus::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1358 1592
1359use List::Util qw(max sum); 1593use List::Util qw(max sum);
1360 1594
1361use CFPlus::OpenGL; 1595use CFPlus::OpenGL;
1362 1596
1363sub new { 1597sub new {
1364 my $class = shift; 1598 my $class = shift;
1365 1599
1366 $class->SUPER::new ( 1600 $class->SUPER::new (
1367 col_expand => [], 1601 col_expand => [],
1602 row_expand => [],
1368 @_, 1603 @_,
1369 ) 1604 )
1370} 1605}
1371 1606
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1607sub add {
1608 my ($self, @widgets) = @_;
1609
1610 for my $child (@widgets) {
1611 $child->{rowspan} ||= 1;
1612 $child->{colspan} ||= 1;
1613 }
1614
1615 $self->SUPER::add (@widgets);
1616}
1617
1618sub add_at {
1377 my ($self) = shift; 1619 my $self = shift;
1620
1621 my @widgets;
1378 1622
1379 while (@_) { 1623 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1625
1385 $self->{force_realloc} = 1; 1626 $child->{row} = $row;
1386 $self->{force_size_alloc} = 1; 1627 $child->{col} = $col;
1387 $self->realloc;
1388}
1389 1628
1390sub remove { 1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1391 my ($self, $child) = @_; 1636 my ($self) = @_;
1392 1637
1393 # TODO: not yet implemented 1638 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1639
1400 my @children = $self->children; 1640 my @children = $self->children;
1401 delete $self->{children}; 1641
1642 # first pass, columns
1643 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1644 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1645
1646 my $sw = sum @w[$c .. $c + $cs - 1];
1647
1648 if ($w > $sw) {
1649 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1650 }
1402 1651 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1652
1408 $self->realloc; 1653 # second pass, rows
1409} 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411sub get_wh {
1412 my ($self) = @_;
1413
1414 my (@w, @h);
1415
1416 for my $y (0 .. $#{$self->{children}}) {
1417 my $row = $self->{children}[$y]
1418 or next;
1419
1420 for my $x (0 .. $#$row) {
1421 my $widget = $row->[$x]
1422 or next;
1423 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424 1656
1425 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427 } 1661 }
1428 } 1662 }
1429 1663
1430 (\@w, \@h) 1664 (\@w, \@h)
1431} 1665}
… …
1447 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1448 1682
1449 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1451 1685
1452 # TODO: nicer code && do row_expand 1686 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1456 1690
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1692
1461 CFPlus::UI::harmonize $ws; 1693 CFPlus::UI::harmonize $ws;
1694
1695 my @row_expand = @{$self->{row_expand}};
1696 @row_expand = (1) x @$ws unless @row_expand;
1697 my $row_expand = (sum @row_expand) || 1;
1698
1699 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1700
1462 CFPlus::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1463 1702
1464 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1705
1466 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468 or next;
1469 1708
1470 my $x = 0; 1709 $widget->configure (
1471 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1712 );
1473 for my $c (0 .. $#$row) { 1713 }
1474 my $col_w = $ws->[$c];
1475 1714
1476 if (my $widget = $row->[$c]) { 1715 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1716}
1478 }
1479 1717
1480 $x += $col_w; 1718#############################################################################
1719
1720package CFPlus::UI::Fixed;
1721
1722use List::Util qw(min max);
1723
1724our @ISA = CFPlus::UI::Container::;
1725
1726sub add {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child);
1731}
1732
1733sub _scale($$$) {
1734 my ($mode, $val, $max) = @_;
1735
1736 $mode eq "abs" ? $val
1737 : $mode eq "rel" ? $val * $max
1738 : 0
1739}
1740
1741sub size_request {
1742 my ($self) = @_;
1743
1744 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1745
1746 # determine overall size by querying abs widgets
1747 for my $child ($self->visible_children) {
1748 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1749
1750 if ($pos eq "abs") {
1751 $w = _scale $size, $w, $child->{req_w};
1752 $h = _scale $size, $h, $child->{req_h};
1753
1754 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1755 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481 } 1756 }
1757 }
1482 1758
1483 $y += $row_h; 1759 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1;
1761
1762 # now layout remaining widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos ne "abs") {
1767 $x = _scale $pos, $x, $W;
1768 $y = _scale $pos, $x, $H;
1769 $w = _scale $size, $w, $child->{req_w};
1770 $h = _scale $size, $h, $child->{req_h};
1771
1772 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1773 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1774 }
1775 }
1776
1777 my $W = $x2 - $x1;
1778 my $H = $y2 - $y1;
1779
1780 ($W, $H)
1781}
1782
1783sub invoke_size_allocate {
1784 my ($self, $W, $H) = @_;
1785
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 $x = _scale $pos, $x, $W;
1790 $y = _scale $pos, $x, $H;
1791 $w = _scale $size, $w, $child->{req_w};
1792 $h = _scale $size, $h, $child->{req_h};
1793
1794 $child->configure ($x, $y, $w, $h);
1484 } 1795 }
1485 1796
1486 1 1797 1
1487}
1488
1489sub find_widget {
1490 my ($self, $x, $y) = @_;
1491
1492 $x -= $self->{x};
1493 $y -= $self->{y};
1494
1495 my $res;
1496
1497 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498 $res = $_->find_widget ($x, $y)
1499 and return $res;
1500 }
1501
1502 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503}
1504
1505sub _draw {
1506 my ($self) = @_;
1507
1508 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_;
1510 }
1511} 1798}
1512 1799
1513############################################################################# 1800#############################################################################
1514 1801
1515package CFPlus::UI::Box; 1802package CFPlus::UI::Box;
… …
1617 #active_bg => none 1904 #active_bg => none
1618 #font => default_font 1905 #font => default_font
1619 #text => initial text 1906 #text => initial text
1620 #markup => initial narkup 1907 #markup => initial narkup
1621 #max_w => maximum pixel width 1908 #max_w => maximum pixel width
1909 #style => 0, # render flags
1622 ellipsise => 3, # end 1910 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout), 1911 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1912 fontsize => 1,
1625 align => -1, 1913 align => -1,
1626 valign => -1, 1914 valign => -1,
… …
1777 }; 2065 };
1778 2066
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2067 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2068 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 2069
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2070 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2071}
1784 2072
1785############################################################################# 2073#############################################################################
1786 2074
1787package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
… …
1800 active_fg => [0, 0, 0], 2088 active_fg => [0, 0, 0],
1801 can_hover => 1, 2089 can_hover => 1,
1802 can_focus => 1, 2090 can_focus => 1,
1803 valign => 0, 2091 valign => 0,
1804 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1805 #text => ... 2094 #text => ...
1806 #hidden => "*", 2095 #hidden => "*",
1807 @_ 2096 @_
1808 ) 2097 )
1809} 2098}
… …
1853 my $mod = $ev->{mod}; 2142 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1856 2145
1857 my $text = $self->get_text; 2146 my $text = $self->get_text;
2147
2148 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2149
1859 if ($uni == 8) { 2150 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2158 } elsif ($sym == CFPlus::SDLK_HOME) {
2159 # what a hack
2160 $self->{cursor} =
2161 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162 ? length $1
2163 : 0;
2164 } elsif ($sym == CFPlus::SDLK_END) {
2165 # uh, again
2166 $self->{cursor} =
2167 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168 ? $self->{cursor} + length $1
2169 : length $self->{text};
2170 } elsif ($uni == 21) { # ctrl-u
2171 $text = "";
1868 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2174 $self->emit ('escape');
1873 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2179 } else {
1876 return 0; 2180 return 0;
1877 } 2181 }
1878 2182
1879 $self->_set_text ($text); 2183 $self->_set_text ($text);
1880 2184
1881 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1882 2187
1883 1 2188 1
1884} 2189}
1885 2190
1886sub invoke_focus_in { 2191sub invoke_focus_in {
… …
1948 utf8::encode $text; 2253 utf8::encode $text;
1949 2254
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2256 }
1952 2257
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2258 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2261 glEnd;
1958 } 2262 }
1959} 2263}
2264
2265#############################################################################
1960 2266
1961package CFPlus::UI::Entry; 2267package CFPlus::UI::Entry;
1962 2268
1963our @ISA = CFPlus::UI::EntryBase::; 2269our @ISA = CFPlus::UI::EntryBase::;
1964 2270
… …
1967sub invoke_key_down { 2273sub invoke_key_down {
1968 my ($self, $ev) = @_; 2274 my ($self, $ev) = @_;
1969 2275
1970 my $sym = $ev->{sym}; 2276 my $sym = $ev->{sym};
1971 2277
1972 if ($sym == 13) { 2278 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2279 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2280 my $txt = $self->get_text;
1975 2281
1976 $self->{history_pointer} = -1; 2282 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2283 $self->{history_saveback} = '';
… …
2007 1 2313 1
2008} 2314}
2009 2315
2010############################################################################# 2316#############################################################################
2011 2317
2318package CFPlus::UI::TextEdit;
2319
2320our @ISA = CFPlus::UI::EntryBase::;
2321
2322use CFPlus::OpenGL;
2323
2324sub move_cursor_ver {
2325 my ($self, $dy) = @_;
2326
2327 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2328
2329 $y += $dy;
2330
2331 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2332 $self->{cursor} = $index;
2333 delete $self->{cur_h};
2334 $self->update;
2335 return;
2336 }
2337}
2338
2339sub invoke_key_down {
2340 my ($self, $ev) = @_;
2341
2342 my $sym = $ev->{sym};
2343
2344 if ($sym == CFPlus::SDLK_UP) {
2345 $self->move_cursor_ver (-1);
2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
2347 $self->move_cursor_ver (+1);
2348 } else {
2349 return $self->SUPER::invoke_key_down ($ev)
2350 }
2351
2352 1
2353}
2354
2355#############################################################################
2356
2012package CFPlus::UI::Button; 2357package CFPlus::UI::Button;
2013 2358
2014our @ISA = CFPlus::UI::Label::; 2359our @ISA = CFPlus::UI::Label::;
2015 2360
2016use CFPlus::OpenGL; 2361use CFPlus::OpenGL;
2017 2362
2018my @tex = 2363my @tex =
2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
2021 2366
2022sub new { 2367sub new {
2023 my $class = shift; 2368 my $class = shift;
2024 2369
2025 $class->SUPER::new ( 2370 $class->SUPER::new (
2026 padding_x => 4, 2371 padding_x => 4,
2027 padding_y => 4, 2372 padding_y => 4,
2028 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2375 can_hover => 1,
2031 align => 0, 2376 align => 0,
2032 valign => 0, 2377 valign => 0,
2033 can_events => 1, 2378 can_events => 1,
2034 @_ 2379 @_
… …
2052 2397
2053 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
2056 2401
2402 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2404
2059 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
2060 2406
2061 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
2062} 2408}
… …
2158 or Carp::croak "'path' or 'tex' attributes required"; 2504 or Carp::croak "'path' or 'tex' attributes required";
2159 2505
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2506 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2507 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2508
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2509 CFPlus::weaken $texture_cache{$self->{path}};
2164 2510
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2511 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2512
2167 $self 2513 $self
2168} 2514}
… …
2541sub invoke_mouse_wheel { 2887sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2888 my ($self, $ev) = @_;
2543 2889
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2890 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2891
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2895
2548 ! ! $delta 2896 ! ! $delta
2549} 2897}
2550 2898
2551sub update { 2899sub update {
… …
2661 #font => default_font 3009 #font => default_font
2662 @_, 3010 @_,
2663 3011
2664 layout => (new CFPlus::Layout), 3012 layout => (new CFPlus::Layout),
2665 par => [], 3013 par => [],
3014 max_par => 0,
2666 height => 0, 3015 height => 0,
2667 children => [ 3016 children => [
2668 (new CFPlus::UI::Empty expand => 1), 3017 (new CFPlus::UI::Empty expand => 1),
2669 (new CFPlus::UI::Slider vertical => 1), 3018 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3019 ],
… …
2749sub set_offset { 3098sub set_offset {
2750 my ($self, $offset) = @_; 3099 my ($self, $offset) = @_;
2751 3100
2752 # todo: base offset on lines or so, not on pixels 3101 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3102 $self->{children}[1]->set_value ($offset);
3103}
3104
3105sub current_paragraph {
3106 my ($self) = @_;
3107
3108 $self->{top_paragraph} - 1
3109}
3110
3111sub scroll_to {
3112 my ($self, $para) = @_;
3113
3114 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3115
3116 $self->{scroll_to} = $para;
3117 $self->update;
2754} 3118}
2755 3119
2756sub clear { 3120sub clear {
2757 my ($self) = @_; 3121 my ($self) = @_;
2758 3122
… …
2780 3144
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3145 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3146 push @{$self->{par}}, $para;
2783 } 3147 }
2784 3148
3149 if (my $max = $self->{max_par}) {
3150 shift @{$self->{par}} while @{$self->{par}} > $max;
3151 }
3152
2785 $self->{need_reflow}++; 3153 $self->{need_reflow}++;
2786 $self->update; 3154 $self->update;
2787} 3155}
2788 3156
2789sub scroll_to_bottom { 3157sub scroll_to_bottom {
2790 my ($self) = @_; 3158 my ($self) = @_;
2791 3159
2792 $self->{scroll_to_bottom} = 1; 3160 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3161 $self->update;
2794} 3162}
2795 3163
3164sub force_uptodate {
3165 my ($self) = @_;
3166
3167 if (delete $self->{need_reflow}) {
3168 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3169
3170 my $height = 0;
3171
3172 for my $para (@{$self->{par}}) {
3173 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3174 my $layout = $self->get_layout ($para);
3175 my ($w, $h) = $layout->size;
3176
3177 $para->{w} = $w + $para->{indent};
3178 $para->{h} = $h;
3179 $para->{wrapped} = $layout->has_wrapped;
3180 }
3181
3182 $para->{y} = $height;
3183 $height += $para->{h};
3184 }
3185
3186 $self->{height} = $height;
3187 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3188
3189 delete $self->{texture};
3190 }
3191
3192 if (my $paridx = delete $self->{scroll_to}) {
3193 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3194 }
3195}
3196
2796sub update { 3197sub update {
2797 my ($self) = @_; 3198 my ($self) = @_;
2798 3199
2799 $self->SUPER::update; 3200 $self->SUPER::update;
2800 3201
2801 return unless $self->{h} > 0; 3202 return unless $self->{h} > 0;
2802 3203
2803 delete $self->{texture}; 3204 delete $self->{texture};
2804 3205
2805 $ROOT->on_post_alloc ($self => sub { 3206 $ROOT->on_post_alloc ($self => sub {
3207 $self->force_uptodate;
3208
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3209 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834 3210
2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3211 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3212 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3213 glClear GL_COLOR_BUFFER_BIT;
2838 3214
3215 package CFPlus::UI::Base;
3216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3217 (0, 0, $self->{w}, $self->{h});
3218
3219 my $top = int $self->{children}[1]{range}[0];
3220
3221 my $paridx = 0;
3222 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3223 my $top = int $self->{children}[1]{range}[0];
2840 3224
2841 my $y0 = $top; 3225 my $y0 = $top;
2842 my $y1 = $top + $H; 3226 my $y1 = $top + $H;
2843 3227
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3228 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3229 my $h = $para->{h};
3230 my $y = $para->{y};
2848 3231
2849 if ($y0 < $y + $h && $y < $y1) { 3232 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3233 my $layout = $self->get_layout ($para);
2852 3234
2853 $layout->render ($para->{indent}, $y - $y0); 3235 $layout->render ($para->{indent}, $y - $y0);
2854 3236
2855 if (my @w = @{ $para->{widget} }) { 3237 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3246 $_->draw;
2865 } 3247 }
2866 } 3248 }
2867 } 3249 }
2868 3250
2869 $y += $h; 3251 $paridx++;
3252 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3253 }
3254
3255 $self->{top_paragraph} = $top_paragraph;
2871 }; 3256 };
2872 }); 3257 });
2873} 3258}
2874 3259
2875sub reconfigure { 3260sub reconfigure {
… …
2977} 3362}
2978 3363
2979sub set_tooltip_from { 3364sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3365 my ($self, $widget) = @_;
2981 3366
3367 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3368 if $widget->{tooltip} =~ /^#(.*)$/;
3369
2982 my $tooltip = $widget->{tooltip}; 3370 my $tooltip = $widget->{tooltip};
2983 3371
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3372 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3373 $tooltip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3374 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
2993 3381
2994 $self->add (new CFPlus::UI::Label 3382 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3383 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3384 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3385 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3386 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3387 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3388 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3389 );
3002} 3390}
3003 3391
… …
3075 3463
3076sub new { 3464sub new {
3077 my $class = shift; 3465 my $class = shift;
3078 3466
3079 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3468 size_w => 32,
3469 size_h => 8,
3080 aspect => 1, 3470 aspect => 1,
3081 can_events => 0, 3471 can_events => 0,
3082 @_, 3472 @_,
3083 ); 3473 );
3084 3474
3085 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
3087 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3481 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3482 cb => sub {
3483 return unless $::CONN && $widget;
3484
3093 ++$widget->{frame}; 3485 ++$widget->{frame};
3486 $widget->update_face;
3094 $widget->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
3095 }, 3490 },
3096 ); 3491 );
3492
3493 $self->update_face;
3494 $self->update_timer;
3097 } 3495 }
3098 3496
3099 $self 3497 $self
3100} 3498}
3101 3499
3500sub update_timer {
3501 my ($self) = @_;
3502
3503 return unless $self->{timer};
3504
3505 if ($self->{visible}) {
3506 $self->{timer}->at (
3507 $self->{anim_start}
3508 + $self->{animspeed}
3509 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3510 );
3511 $self->{timer}->start;
3512 } else {
3513 $self->{timer}->stop;
3514 }
3515}
3516
3517sub update_face {
3518 my ($self) = @_;
3519
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
3102sub size_request { 3530sub size_request {
3103 (32, 8) 3531 my ($self) = @_;
3532
3533 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc;
3540 });
3541 }
3542 }
3543 }
3544
3545 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3546}
3105 3547
3106sub update { 3548sub update {
3107 my ($self) = @_; 3549 my ($self) = @_;
3108 3550
3109 return unless $self->{visible}; 3551 return unless $self->{visible};
3110 3552
3111 $self->SUPER::update; 3553 $self->SUPER::update;
3112} 3554}
3113 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
3114sub _draw { 3564sub _draw {
3115 my ($self) = @_; 3565 my ($self) = @_;
3116 3566
3117 return unless $::CONN; 3567 return unless $::CONN;
3118 3568
3119 $self->SUPER::_draw; 3569 $self->SUPER::_draw;
3120 3570
3121 my $face;
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3571 my $faceid = $::CONN->{faceid}[$self->{face}]
3125 3572 or return;
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129 3573
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3574 my $tex = $::CONN->{texture}[$faceid];
3131 3575
3132 if ($tex) { 3576 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3577 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3579 glColor 0, 0, 0, 1;
… …
3139} 3583}
3140 3584
3141sub destroy { 3585sub destroy {
3142 my ($self) = @_; 3586 my ($self) = @_;
3143 3587
3144 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3589 if $self->{timer};
3146 3590
3147 $self->SUPER::destroy; 3591 $self->SUPER::destroy;
3148} 3592}
3149 3593
… …
3151 3595
3152package CFPlus::UI::Buttonbar; 3596package CFPlus::UI::Buttonbar;
3153 3597
3154our @ISA = CFPlus::UI::HBox::; 3598our @ISA = CFPlus::UI::HBox::;
3155 3599
3156# TODO: should actualyl wrap buttons and other goodies. 3600# TODO: should actually wrap buttons and other goodies.
3157 3601
3158############################################################################# 3602#############################################################################
3159 3603
3160package CFPlus::UI::Menu; 3604package CFPlus::UI::Menu;
3161 3605
3162our @ISA = CFPlus::UI::FancyFrame::; 3606our @ISA = CFPlus::UI::Toplevel::;
3163 3607
3164use CFPlus::OpenGL; 3608use CFPlus::OpenGL;
3165 3609
3166sub new { 3610sub new {
3167 my $class = shift; 3611 my $class = shift;
… …
3345} 3789}
3346 3790
3347sub add { 3791sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3792 my ($self, $title, $widget, $tooltip) = @_;
3349 3793
3350 Scalar::Util::weaken $self; 3794 CFPlus::weaken $self;
3351 3795
3352 $self->{buttonbar}->add (new CFPlus::UI::Button 3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3797 markup => $title,
3354 tooltip => $tooltip, 3798 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3799 on_activate => sub { $self->set_current_page ($widget) },
… …
3439 my $self = $class->SUPER::new ( 3883 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3884 fontsize => 0.8,
3441 @_, 3885 @_,
3442 ); 3886 );
3443 3887
3444 Scalar::Util::weaken (my $this = $self); 3888 CFPlus::weaken (my $this = $self);
3445 3889
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3890 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3891
3448 $self 3892 $self
3449} 3893}
… …
3572 $self->SUPER::destroy; 4016 $self->SUPER::destroy;
3573} 4017}
3574 4018
3575############################################################################# 4019#############################################################################
3576 4020
3577package CFPlus::UI::Inventory;
3578
3579our @ISA = CFPlus::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFPlus::UI::Root; 4021package CFPlus::UI::Root;
3762 4022
3763our @ISA = CFPlus::UI::Container::; 4023our @ISA = CFPlus::UI::Container::;
3764 4024
3765use List::Util qw(min max); 4025use List::Util qw(min max);
… …
3772 my $self = $class->SUPER::new ( 4032 my $self = $class->SUPER::new (
3773 visible => 1, 4033 visible => 1,
3774 @_, 4034 @_,
3775 ); 4035 );
3776 4036
3777 Scalar::Util::weaken ($self->{root} = $self); 4037 CFPlus::weaken ($self->{root} = $self);
3778 4038
3779 $self 4039 $self
3780} 4040}
3781 4041
3782sub size_request { 4042sub size_request {
… …
3977 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3978 $_->() 4238 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3980 } 4240 }
3981 4241
3982
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3986 4245
3987 glMatrixMode GL_PROJECTION; 4246 glMatrixMode GL_PROJECTION;
… …
3991 glLoadIdentity; 4250 glLoadIdentity;
3992 4251
3993 { 4252 {
3994 package CFPlus::UI::Base; 4253 package CFPlus::UI::Base;
3995 4254
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4257
4000 $self->_draw; 4258 $self->_draw;
4259 }
4001} 4260}
4002 4261
4003############################################################################# 4262#############################################################################
4004 4263
4005package CFPlus::UI; 4264package CFPlus::UI;

Diff Legend

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