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.341 by root, Sun Aug 13 03:20:56 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
514); 527);
515 528
516sub emit { 529sub emit {
517 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
518 531
519 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
521 my @append 534 my @append
522 = $has_coords{$signal} 535 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552#sub find_widget {
535 my ($self, $x, $y) = @_; 553# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 554
546sub set_parent { 555sub set_parent {
547 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
548 557
549 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
551} 560}
552 561
553sub realloc { 562sub realloc {
554 my ($self) = @_; 563 my ($self) = @_;
… …
633 my ($self) = @_; 642 my ($self) = @_;
634 643
635 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
636} 645}
637 646
647my $cntx;#d#
638sub DESTROY { 648sub DESTROY {
639 my ($self) = @_; 649 my ($self) = @_;
640 650
641 return if CFPlus::in_destruct; 651 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 652
645 eval { $self->destroy }; 653 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
647} 657}
648 658
649############################################################################# 659#############################################################################
650 660
651package CFPlus::UI::DrawBG; 661package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
899 909
900 { 910 {
901 package CFPlus::UI::Base; 911 package CFPlus::UI::Base;
902 912
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
905 } 917 }
906
907 $self->_render;
908 }; 918 };
909} 919}
910 920
911sub _draw { 921sub _draw {
912 my ($self) = @_; 922 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 923
916 my $tex = $self->{texture} 924 my $tex = $self->{texture}
917 or return; 925 or return;
918 926
919 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
922 930
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
924 932
925 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
926} 934}
927 935
928############################################################################# 936#############################################################################
929 937
930package CFPlus::UI::ViewPort; 938package CFPlus::UI::ViewPort;
939
940use List::Util qw(min max);
931 941
932our @ISA = CFPlus::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
933 943
934sub new { 944sub new {
935 my $class = shift; 945 my $class = shift;
… …
967} 977}
968 978
969sub set_offset { 979sub set_offset {
970 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
971 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
972 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
974 988
989 $self->emit (changed => $x, $y);
975 $self->update; 990 $self->update;
991 }
976} 992}
977 993
978# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 995sub coord2local {
980 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
995 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
996 1012
997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
999 ) { 1015 ) {
1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1001 } else { 1017 } else {
1002 $self->CFPlus::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1003 } 1019 }
1004} 1020}
1005 1021
… …
1016 1032
1017############################################################################# 1033#############################################################################
1018 1034
1019package CFPlus::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
1020 1036
1021our @ISA = CFPlus::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
1022 1038
1023sub new { 1039sub new {
1024 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
1025 1041
1026 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
1027 1043
1028 my $self; 1044 my $self;
1029 1045
1030 my $slider = new CFPlus::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
1031 vertical => 1, 1056 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1058 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1061 },
1036 ; 1062 ;
1037 1063
1038 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1040 can_events => 1, 1067 can_events => 1,
1041 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1042 %arg, 1072 %arg,
1043 ); 1073 );
1044 1074
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
1046 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1047 1092
1048 $self 1093 $self
1049} 1094}
1050 1095
… …
1054 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
1055 1100
1056 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
1057} 1102}
1058 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133}
1134
1059sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1061 1137
1062 return 0 unless $ev->{dy}; # only vertical movements 1138 return 0 unless $ev->{dy}; # only vertical movements for now
1063 1139
1064 $self->{slider}->emit (mouse_wheel => $ev); 1140 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1141
1066 1 1142 1
1067} 1143}
1068 1144
1069sub update_slider { 1145sub invoke_button_down {
1070 my ($self) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1071 1147
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1148 if ($ev->{button} == 2) {
1073} 1149 $self->grab_focus;
1074 1150
1075sub update { 1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1076 my ($self) = @_; 1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1077 1156
1078 $self->SUPER::update; 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1079 1160
1080 $self->update_slider; 1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1081} 1186}
1082 1187
1083sub invoke_size_allocate { 1188sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1085 1190
1086 $self->update_slider; 1191 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1193}
1090 1194
1091############################################################################# 1195#############################################################################
1092 1196
… …
1134 1238
1135our @ISA = CFPlus::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1136 1240
1137use CFPlus::OpenGL; 1241use CFPlus::OpenGL;
1138 1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1342
1139my $bg = 1343my $bg =
1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1142 1346
1143my @border = 1347my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1146 1354
1147sub new { 1355sub new {
1148 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1149 1357
1150 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1528
1321 my $border = $self->border; 1529 my $border = $self->border;
1322 1530
1323 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328 1550
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1331 1553
1332 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1363 1585
1364sub new { 1586sub new {
1365 my $class = shift; 1587 my $class = shift;
1366 1588
1367 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1368 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1369 @_, 1593 @_,
1370 ) 1594 )
1371} 1595}
1372 1596
1373sub children { 1597sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375} 1599}
1376 1600
1601# TODO: store row/col info in child widget and use standard add/del
1377sub add { 1602sub add {
1378 my ($self) = shift; 1603 my $self = shift;
1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1379 1611
1380 while (@_) { 1612 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1382 $child->set_parent ($self); 1615 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1384 } 1617 }
1385 1618
1386 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1388 $self->realloc; 1621 $self->realloc;
1389} 1622}
1390 1623
1391sub remove { 1624sub remove {
1392 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1393 1626
1394 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1395} 1632}
1396 1633
1397# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1398sub clear { 1635sub clear {
1399 my ($self) = @_; 1636 my ($self) = @_;
… …
1448 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1449 1686
1450 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1452 1689
1453 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1457 1694
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1696
1462 CFPlus::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1463 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1464 1706
1465 my $y; 1707 my $y;
1466 1708
1467 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
… …
1507 my ($self) = @_; 1749 my ($self) = @_;
1508 1750
1509 for (grep $_, @{$self->{children}}) { 1751 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_; 1752 $_->draw for grep $_, @$_;
1511 } 1753 }
1754}
1755
1756#############################################################################
1757
1758package CFPlus::UI::Fixed;
1759
1760use List::Util qw(min max);
1761
1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1512} 1836}
1513 1837
1514############################################################################# 1838#############################################################################
1515 1839
1516package CFPlus::UI::Box; 1840package CFPlus::UI::Box;
… …
1618 #active_bg => none 1942 #active_bg => none
1619 #font => default_font 1943 #font => default_font
1620 #text => initial text 1944 #text => initial text
1621 #markup => initial narkup 1945 #markup => initial narkup
1622 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1623 ellipsise => 3, # end 1948 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1949 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1950 fontsize => 1,
1626 align => -1, 1951 align => -1,
1627 valign => -1, 1952 valign => -1,
… …
1778 }; 2103 };
1779 2104
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 2107
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 2109}
1785 2110
1786############################################################################# 2111#############################################################################
1787 2112
1788package CFPlus::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1802 can_hover => 1, 2127 can_hover => 1,
1803 can_focus => 1, 2128 can_focus => 1,
1804 valign => 0, 2129 valign => 0,
1805 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1806 #text => ... 2132 #text => ...
1807 #hidden => "*", 2133 #hidden => "*",
1808 @_ 2134 @_
1809 ) 2135 )
1810} 2136}
… …
1854 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1857 2183
1858 my $text = $self->get_text; 2184 my $text = $self->get_text;
2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2187
1860 if ($uni == 8) { 2188 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1869 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2212 $self->emit ('escape');
1874 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2217 } else {
1877 return 0; 2218 return 0;
1878 } 2219 }
1879 2220
1880 $self->_set_text ($text); 2221 $self->_set_text ($text);
1881 2222
1882 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1883 2225
1884 1 2226 1
1885} 2227}
1886 2228
1887sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1949 utf8::encode $text; 2291 utf8::encode $text;
1950 2292
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2294 }
1953 2295
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2296 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2299 glEnd;
1959 } 2300 }
1960} 2301}
2302
2303#############################################################################
1961 2304
1962package CFPlus::UI::Entry; 2305package CFPlus::UI::Entry;
1963 2306
1964our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1965 2308
… …
1968sub invoke_key_down { 2311sub invoke_key_down {
1969 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1970 2313
1971 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1972 2315
1973 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1976 2319
1977 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
… …
2008 1 2351 1
2009} 2352}
2010 2353
2011############################################################################# 2354#############################################################################
2012 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
2013package CFPlus::UI::Button; 2395package CFPlus::UI::Button;
2014 2396
2015our @ISA = CFPlus::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
2016 2398
2017use CFPlus::OpenGL; 2399use CFPlus::OpenGL;
2018 2400
2019my @tex = 2401my @tex =
2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2022 2404
2023sub new { 2405sub new {
2024 my $class = shift; 2406 my $class = shift;
2025 2407
2026 $class->SUPER::new ( 2408 $class->SUPER::new (
2027 padding_x => 4, 2409 padding_x => 4,
2028 padding_y => 4, 2410 padding_y => 4,
2029 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2030 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2031 can_hover => 1, 2413 can_hover => 1,
2032 align => 0, 2414 align => 0,
2033 valign => 0, 2415 valign => 0,
2034 can_events => 1, 2416 can_events => 1,
2035 @_ 2417 @_
… …
2053 2435
2054 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2057 2439
2440 my $tex = $tex[$GRAB == $self];
2058 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059 2442
2060 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2061 2444
2062 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2063} 2446}
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2542 or Carp::croak "'path' or 'tex' attributes required";
2160 2543
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2546
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2165 2548
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2550
2168 $self 2551 $self
2169} 2552}
… …
2542sub invoke_mouse_wheel { 2925sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2544 2927
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2933
2549 ! ! $delta 2934 ! ! $delta
2550} 2935}
2551 2936
2552sub update { 2937sub update {
… …
2662 #font => default_font 3047 #font => default_font
2663 @_, 3048 @_,
2664 3049
2665 layout => (new CFPlus::Layout), 3050 layout => (new CFPlus::Layout),
2666 par => [], 3051 par => [],
3052 max_par => 0,
2667 height => 0, 3053 height => 0,
2668 children => [ 3054 children => [
2669 (new CFPlus::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2671 ], 3057 ],
… …
2750sub set_offset { 3136sub set_offset {
2751 my ($self, $offset) = @_; 3137 my ($self, $offset) = @_;
2752 3138
2753 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
3141}
3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
2755} 3156}
2756 3157
2757sub clear { 3158sub clear {
2758 my ($self) = @_; 3159 my ($self) = @_;
2759 3160
… …
2781 3182
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
2784 } 3185 }
2785 3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
3190
2786 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2787 $self->update; 3192 $self->update;
2788} 3193}
2789 3194
2790sub scroll_to_bottom { 3195sub scroll_to_bottom {
2791 my ($self) = @_; 3196 my ($self) = @_;
2792 3197
2793 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3199 $self->update;
2795} 3200}
2796 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2797sub update { 3235sub update {
2798 my ($self) = @_; 3236 my ($self) = @_;
2799 3237
2800 $self->SUPER::update; 3238 $self->SUPER::update;
2801 3239
2802 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2803 3241
2804 delete $self->{texture}; 3242 delete $self->{texture};
2805 3243
2806 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 3248
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2839 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2841 3262
2842 my $y0 = $top; 3263 my $y0 = $top;
2843 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2844 3265
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2849 3269
2850 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2853 3272
2854 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2855 3274
2856 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3284 $_->draw;
2866 } 3285 }
2867 } 3286 }
2868 } 3287 }
2869 3288
2870 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2872 }; 3294 };
2873 }); 3295 });
2874} 3296}
2875 3297
2876sub reconfigure { 3298sub reconfigure {
… …
2978} 3400}
2979 3401
2980sub set_tooltip_from { 3402sub set_tooltip_from {
2981 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
2982 3404
2983 $widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1 3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/; 3406 if $widget->{tooltip} =~ /^#(.*)$/;
2985 3407
2986 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2987 3409
2988 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
… …
2997 3419
2998 $self->add (new CFPlus::UI::Label 3420 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3421 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3423 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3425 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3427 );
3006} 3428}
3007 3429
… …
3079 3501
3080sub new { 3502sub new {
3081 my $class = shift; 3503 my $class = shift;
3082 3504
3083 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
3084 aspect => 1, 3508 aspect => 1,
3085 can_events => 0, 3509 can_events => 0,
3086 @_, 3510 @_,
3087 ); 3511 );
3088 3512
3089 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3091 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3092 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3519 parked => 1,
3095 interval => $self->{animspeed},
3096 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3097 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
3098 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3099 }, 3528 },
3100 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
3101 } 3533 }
3102 3534
3103 $self 3535 $self
3104} 3536}
3105 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3106sub size_request { 3568sub size_request {
3107 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3584}
3109 3585
3110sub update { 3586sub update {
3111 my ($self) = @_; 3587 my ($self) = @_;
3112 3588
3113 return unless $self->{visible}; 3589 return unless $self->{visible};
3114 3590
3115 $self->SUPER::update; 3591 $self->SUPER::update;
3116} 3592}
3117 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3118sub _draw { 3602sub _draw {
3119 my ($self) = @_; 3603 my ($self) = @_;
3120 3604
3121 return unless $::CONN; 3605 return unless $::CONN;
3122 3606
3123 $self->SUPER::_draw; 3607 $self->SUPER::_draw;
3124 3608
3125 my $face;
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3129 3610 or return;
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133 3611
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3135 3613
3136 if ($tex) { 3614 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3143} 3621}
3144 3622
3145sub destroy { 3623sub destroy {
3146 my ($self) = @_; 3624 my ($self) = @_;
3147 3625
3148 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3149 if $self->{timer}; 3627 if $self->{timer};
3150 3628
3151 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3152} 3630}
3153 3631
… …
3155 3633
3156package CFPlus::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3157 3635
3158our @ISA = CFPlus::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3159 3637
3160# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3161 3639
3162############################################################################# 3640#############################################################################
3163 3641
3164package CFPlus::UI::Menu; 3642package CFPlus::UI::Menu;
3165 3643
3166our @ISA = CFPlus::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3167 3645
3168use CFPlus::OpenGL; 3646use CFPlus::OpenGL;
3169 3647
3170sub new { 3648sub new {
3171 my $class = shift; 3649 my $class = shift;
… …
3349} 3827}
3350 3828
3351sub add { 3829sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3353 3831
3354 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3355 3833
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3835 markup => $title,
3358 tooltip => $tooltip, 3836 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3922 fontsize => 0.8,
3445 @_, 3923 @_,
3446 ); 3924 );
3447 3925
3448 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3449 3927
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3929
3452 $self 3930 $self
3453} 3931}
… …
3576 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3577} 4055}
3578 4056
3579############################################################################# 4057#############################################################################
3580 4058
3581package CFPlus::UI::Inventory;
3582
3583our @ISA = CFPlus::UI::Table::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 col_expand => [0, 1, 0],
3590 items => [],
3591 @_,
3592 );
3593
3594 $self->set_sort_order (undef);
3595
3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3632}
3633
3634sub set_items {
3635 my ($self, $items) = @_;
3636
3637 $self->{items} = [$items ? values %$items : ()];
3638 $self->update_items;
3639}
3640
3641#############################################################################
3642
3643package CFPlus::UI::SpellList;
3644
3645our @ISA = CFPlus::UI::Table::;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3656
3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3742sub add_spell {
3743 my ($self, $spell) = @_;
3744
3745 $self->{spell}->{$spell->{name}} = $spell;
3746 $self->rebuild_spell_list;
3747}
3748
3749sub remove_spell {
3750 my ($self, $spell) = @_;
3751
3752 delete $self->{spell}->{$spell->{name}};
3753 $self->rebuild_spell_list;
3754}
3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3763#############################################################################
3764
3765package CFPlus::UI::Root; 4059package CFPlus::UI::Root;
3766 4060
3767our @ISA = CFPlus::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3768 4062
3769use List::Util qw(min max); 4063use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3777 visible => 1, 4071 visible => 1,
3778 @_, 4072 @_,
3779 ); 4073 );
3780 4074
3781 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3782 4076
3783 $self 4077 $self
3784} 4078}
3785 4079
3786sub size_request { 4080sub size_request {
… …
3981 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3982 $_->() 4276 $_->()
3983 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3984 } 4278 }
3985 4279
3986
3987 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3990 4283
3991 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;
… …
3995 glLoadIdentity; 4288 glLoadIdentity;
3996 4289
3997 { 4290 {
3998 package CFPlus::UI::Base; 4291 package CFPlus::UI::Base;
3999 4292
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4295
4004 $self->_draw; 4296 $self->_draw;
4297 }
4005} 4298}
4006 4299
4007############################################################################# 4300#############################################################################
4008 4301
4009package CFPlus::UI; 4302package CFPlus::UI;

Diff Legend

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