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.343 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 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 { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
899 918
900 { 919 {
901 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
902 921
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
905 } 926 }
906
907 $self->_render;
908 }; 927 };
909} 928}
910 929
911sub _draw { 930sub _draw {
912 my ($self) = @_; 931 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 932
916 my $tex = $self->{texture} 933 my $tex = $self->{texture}
917 or return; 934 or return;
918 935
919 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
922 939
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
924 941
925 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
926} 943}
927 944
928############################################################################# 945#############################################################################
929 946
930package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948
949use List::Util qw(min max);
931 950
932our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
933 952
934sub new { 953sub new {
935 my $class = shift; 954 my $class = shift;
… …
967} 986}
968 987
969sub set_offset { 988sub set_offset {
970 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
971 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
972 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
974 997
998 $self->emit (changed => $x, $y);
975 $self->update; 999 $self->update;
1000 }
976} 1001}
977 1002
978# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 1004sub coord2local {
980 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1016 1041
1017############################################################################# 1042#############################################################################
1018 1043
1019package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1020 1045
1021our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1022 1047
1023sub new { 1048sub new {
1024 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1025 1050
1026 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1027 1052
1028 my $self; 1053 my $self;
1029 1054
1030 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1031 vertical => 1, 1065 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1067 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1070 },
1036 ; 1071 ;
1037 1072
1038 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1040 can_events => 1, 1076 can_events => 1,
1041 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1042 %arg, 1081 %arg,
1043 ); 1082 );
1044 1083
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
1046 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1047 1101
1048 $self 1102 $self
1049} 1103}
1050 1104
… …
1054 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1055 1109
1056 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1057} 1111}
1058 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1059sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1061 1146
1062 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1063 1148
1064 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1150
1066 1 1151 1
1067} 1152}
1068 1153
1069sub update_slider { 1154sub invoke_button_down {
1070 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1071 1156
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1073} 1158 $self->grab_focus;
1074 1159
1075sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1076 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1077 1165
1078 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1079 1169
1080 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1081} 1195}
1082 1196
1083sub invoke_size_allocate { 1197sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1085 1199
1086 $self->update_slider; 1200 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1202}
1090 1203
1091############################################################################# 1204#############################################################################
1092 1205
… …
1134 1247
1135our @ISA = CFPlus::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1136 1249
1137use CFPlus::OpenGL; 1250use CFPlus::OpenGL;
1138 1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1351
1139my $bg = 1352my $bg =
1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1142 1355
1143my @border = 1356my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 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); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1146 1363
1147sub new { 1364sub new {
1148 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1149 1366
1150 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1537
1321 my $border = $self->border; 1538 my $border = $self->border;
1322 1539
1323 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328 1559
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1331 1562
1332 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1363 1594
1364sub new { 1595sub new {
1365 my $class = shift; 1596 my $class = shift;
1366 1597
1367 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1368 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1369 @_, 1602 @_,
1370 ) 1603 )
1371} 1604}
1372 1605
1373sub children { 1606sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375} 1608}
1376 1609
1610# TODO: store row/col info in child widget and use standard add/del
1377sub add { 1611sub add {
1378 my ($self) = shift; 1612 my $self = shift;
1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1379 1620
1380 while (@_) { 1621 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1382 $child->set_parent ($self); 1624 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1384 } 1626 }
1385 1627
1386 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1388 $self->realloc; 1630 $self->realloc;
1389} 1631}
1390 1632
1391sub remove { 1633sub remove {
1392 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1393 1635
1394 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1395} 1641}
1396 1642
1397# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1398sub clear { 1644sub clear {
1399 my ($self) = @_; 1645 my ($self) = @_;
… …
1448 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1449 1695
1450 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1452 1698
1453 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1457 1703
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1705
1462 CFPlus::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1463 CFPlus::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1464 1715
1465 my $y; 1716 my $y;
1466 1717
1467 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
… …
1507 my ($self) = @_; 1758 my ($self) = @_;
1508 1759
1509 for (grep $_, @{$self->{children}}) { 1760 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_; 1761 $_->draw for grep $_, @$_;
1511 } 1762 }
1763}
1764
1765#############################################################################
1766
1767package CFPlus::UI::Fixed;
1768
1769use List::Util qw(min max);
1770
1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1512} 1845}
1513 1846
1514############################################################################# 1847#############################################################################
1515 1848
1516package CFPlus::UI::Box; 1849package CFPlus::UI::Box;
… …
1802 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1803 can_hover => 1, 2136 can_hover => 1,
1804 can_focus => 1, 2137 can_focus => 1,
1805 valign => 0, 2138 valign => 0,
1806 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1807 #text => ... 2141 #text => ...
1808 #hidden => "*", 2142 #hidden => "*",
1809 @_ 2143 @_
1810 ) 2144 )
1811} 2145}
… …
1855 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1856 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1858 2192
1859 my $text = $self->get_text; 2193 my $text = $self->get_text;
2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1860 2196
1861 if ($uni == 8) { 2197 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFPlus::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFPlus::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1870 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1871 } elsif ($sym == CFPlus::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2221 $self->emit ('escape');
1875 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2226 } else {
1878 return 0; 2227 return 0;
1879 } 2228 }
1880 2229
1881 $self->_set_text ($text); 2230 $self->_set_text ($text);
1882 2231
1883 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1884 2234
1885 1 2235 1
1886} 2236}
1887 2237
1888sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1950 utf8::encode $text; 2300 utf8::encode $text;
1951 2301
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2303 }
1954 2304
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2305 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2308 glEnd;
1960 } 2309 }
1961} 2310}
2311
2312#############################################################################
1962 2313
1963package CFPlus::UI::Entry; 2314package CFPlus::UI::Entry;
1964 2315
1965our @ISA = CFPlus::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1966 2317
… …
1969sub invoke_key_down { 2320sub invoke_key_down {
1970 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1971 2322
1972 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1973 2324
1974 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1977 2328
1978 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
… …
2009 1 2360 1
2010} 2361}
2011 2362
2012############################################################################# 2363#############################################################################
2013 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
2014package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2015 2405
2016our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2017 2407
2018use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2019 2409
2020my @tex = 2410my @tex =
2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2023 2413
2024sub new { 2414sub new {
2025 my $class = shift; 2415 my $class = shift;
2026 2416
2027 $class->SUPER::new ( 2417 $class->SUPER::new (
2028 padding_x => 4, 2418 padding_x => 4,
2029 padding_y => 4, 2419 padding_y => 4,
2030 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2031 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2032 can_hover => 1, 2422 can_hover => 1,
2033 align => 0, 2423 align => 0,
2034 valign => 0, 2424 valign => 0,
2035 can_events => 1, 2425 can_events => 1,
2036 @_ 2426 @_
… …
2054 2444
2055 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2058 2448
2449 my $tex = $tex[$GRAB == $self];
2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060 2451
2061 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2062 2453
2063 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2064} 2455}
… …
2160 or Carp::croak "'path' or 'tex' attributes required"; 2551 or Carp::croak "'path' or 'tex' attributes required";
2161 2552
2162 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2164 2555
2165 Scalar::Util::weaken $texture_cache{$self->{path}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2166 2557
2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2168 2559
2169 $self 2560 $self
2170} 2561}
… …
2543sub invoke_mouse_wheel { 2934sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_; 2935 my ($self, $ev) = @_;
2545 2936
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547 2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2549 2942
2550 ! ! $delta 2943 ! ! $delta
2551} 2944}
2552 2945
2553sub update { 2946sub update {
… …
2663 #font => default_font 3056 #font => default_font
2664 @_, 3057 @_,
2665 3058
2666 layout => (new CFPlus::Layout), 3059 layout => (new CFPlus::Layout),
2667 par => [], 3060 par => [],
3061 max_par => 0,
2668 height => 0, 3062 height => 0,
2669 children => [ 3063 children => [
2670 (new CFPlus::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2671 (new CFPlus::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2672 ], 3066 ],
… …
2751sub set_offset { 3145sub set_offset {
2752 my ($self, $offset) = @_; 3146 my ($self, $offset) = @_;
2753 3147
2754 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2755 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
3150}
3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
2756} 3165}
2757 3166
2758sub clear { 3167sub clear {
2759 my ($self) = @_; 3168 my ($self) = @_;
2760 3169
… …
2782 3191
2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
2785 } 3194 }
2786 3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
3199
2787 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2788 $self->update; 3201 $self->update;
2789} 3202}
2790 3203
2791sub scroll_to_bottom { 3204sub scroll_to_bottom {
2792 my ($self) = @_; 3205 my ($self) = @_;
2793 3206
2794 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2795 $self->update; 3208 $self->update;
2796} 3209}
2797 3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
3233 $self->{height} = $height;
3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3235
3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
3242}
3243
2798sub update { 3244sub update {
2799 my ($self) = @_; 3245 my ($self) = @_;
2800 3246
2801 $self->SUPER::update; 3247 $self->SUPER::update;
2802 3248
2803 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2804 3250
2805 delete $self->{texture}; 3251 delete $self->{texture};
2806 3252
2807 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2809
2810 if (delete $self->{need_reflow}) {
2811 my $height = 0;
2812
2813 for my $para (@{$self->{par}}) {
2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2815 my $layout = $self->get_layout ($para);
2816 my ($w, $h) = $layout->size;
2817
2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2821 }
2822
2823 $height += $para->{h};
2824 }
2825
2826 $self->{height} = $height;
2827
2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2829
2830 delete $self->{texture};
2831 }
2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836 3257
2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2838 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2839 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2840 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2841 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2842 3271
2843 my $y0 = $top; 3272 my $y0 = $top;
2844 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2845 3274
2846 my $y = 0;
2847
2848 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2849 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2850 3278
2851 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2852
2853 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2854 3281
2855 $layout->render ($para->{indent}, $y - $y0); 3282 $layout->render ($para->{indent}, $y - $y0);
2856 3283
2857 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
… …
2866 $_->draw; 3293 $_->draw;
2867 } 3294 }
2868 } 3295 }
2869 } 3296 }
2870 3297
2871 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2872 } 3300 }
3301
3302 $self->{top_paragraph} = $top_paragraph;
2873 }; 3303 };
2874 }); 3304 });
2875} 3305}
2876 3306
2877sub reconfigure { 3307sub reconfigure {
… …
3080 3510
3081sub new { 3511sub new {
3082 my $class = shift; 3512 my $class = shift;
3083 3513
3084 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3085 aspect => 1, 3517 aspect => 1,
3086 can_events => 0, 3518 can_events => 0,
3087 @_, 3519 @_,
3088 ); 3520 );
3089 3521
3090 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3091 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3092 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3093 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3094 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3095 hard => 1, 3528 parked => 1,
3096 interval => $self->{animspeed},
3097 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3098 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3099 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3100 }, 3537 },
3101 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3102 } 3542 }
3103 3543
3104 $self 3544 $self
3105} 3545}
3106 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3107sub size_request { 3577sub size_request {
3108 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3109} 3593}
3110 3594
3111sub update { 3595sub update {
3112 my ($self) = @_; 3596 my ($self) = @_;
3113 3597
3114 return unless $self->{visible}; 3598 return unless $self->{visible};
3115 3599
3116 $self->SUPER::update; 3600 $self->SUPER::update;
3117} 3601}
3118 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3119sub _draw { 3611sub _draw {
3120 my ($self) = @_; 3612 my ($self) = @_;
3121 3613
3122 return unless $::CONN; 3614 return unless $::CONN;
3123 3615
3124 $self->SUPER::_draw; 3616 $self->SUPER::_draw;
3125 3617
3126 my $face;
3127
3128 if ($self->{frame}) {
3129 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3130 3619 or return;
3131 $face = $anim->[ $self->{frame} % @$anim ]
3132 if $anim && @$anim;
3133 }
3134 3620
3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3136 3622
3137 if ($tex) { 3623 if ($tex) {
3138 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3140 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3144} 3630}
3145 3631
3146sub destroy { 3632sub destroy {
3147 my ($self) = @_; 3633 my ($self) = @_;
3148 3634
3149 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3150 if $self->{timer}; 3636 if $self->{timer};
3151 3637
3152 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3153} 3639}
3154 3640
… …
3156 3642
3157package CFPlus::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3158 3644
3159our @ISA = CFPlus::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3160 3646
3161# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3162 3648
3163############################################################################# 3649#############################################################################
3164 3650
3165package CFPlus::UI::Menu; 3651package CFPlus::UI::Menu;
3166 3652
3167our @ISA = CFPlus::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3168 3654
3169use CFPlus::OpenGL; 3655use CFPlus::OpenGL;
3170 3656
3171sub new { 3657sub new {
3172 my $class = shift; 3658 my $class = shift;
… …
3350} 3836}
3351 3837
3352sub add { 3838sub add {
3353 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3354 3840
3355 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3356 3842
3357 $self->{buttonbar}->add (new CFPlus::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3358 markup => $title, 3844 markup => $title,
3359 tooltip => $tooltip, 3845 tooltip => $tooltip,
3360 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
… …
3444 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3445 fontsize => 0.8, 3931 fontsize => 0.8,
3446 @_, 3932 @_,
3447 ); 3933 );
3448 3934
3449 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3450 3936
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452 3938
3453 $self 3939 $self
3454} 3940}
… …
3577 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3578} 4064}
3579 4065
3580############################################################################# 4066#############################################################################
3581 4067
3582package CFPlus::UI::Inventory;
3583
3584our @ISA = CFPlus::UI::Table::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3590 col_expand => [0, 1, 0],
3591 items => [],
3592 @_,
3593 );
3594
3595 $self->set_sort_order (undef);
3596
3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3633}
3634
3635sub set_items {
3636 my ($self, $items) = @_;
3637
3638 $self->{items} = [$items ? values %$items : ()];
3639 $self->update_items;
3640}
3641
3642#############################################################################
3643
3644package CFPlus::UI::SpellList;
3645
3646our @ISA = CFPlus::UI::Table::;
3647
3648sub new {
3649 my $class = shift;
3650
3651 my $self = $class->SUPER::new (
3652 binding => [],
3653 commands => [],
3654 @_,
3655 )
3656}
3657
3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3743sub add_spell {
3744 my ($self, $spell) = @_;
3745
3746 $self->{spell}->{$spell->{name}} = $spell;
3747 $self->rebuild_spell_list;
3748}
3749
3750sub remove_spell {
3751 my ($self, $spell) = @_;
3752
3753 delete $self->{spell}->{$spell->{name}};
3754 $self->rebuild_spell_list;
3755}
3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3764#############################################################################
3765
3766package CFPlus::UI::Root; 4068package CFPlus::UI::Root;
3767 4069
3768our @ISA = CFPlus::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3769 4071
3770use List::Util qw(min max); 4072use List::Util qw(min max);
… …
3777 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3778 visible => 1, 4080 visible => 1,
3779 @_, 4081 @_,
3780 ); 4082 );
3781 4083
3782 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3783 4085
3784 $self 4086 $self
3785} 4087}
3786 4088
3787sub size_request { 4089sub size_request {
… …
3982 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3983 $_->() 4285 $_->()
3984 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3985 } 4287 }
3986 4288
3987
3988 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3989 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3990 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3991 4292
3992 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;
… …
3996 glLoadIdentity; 4297 glLoadIdentity;
3997 4298
3998 { 4299 {
3999 package CFPlus::UI::Base; 4300 package CFPlus::UI::Base;
4000 4301
4001 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4002 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
4003 }
4004 4304
4005 $self->_draw; 4305 $self->_draw;
4306 }
4006} 4307}
4007 4308
4008############################################################################# 4309#############################################################################
4009 4310
4010package CFPlus::UI; 4311package CFPlus::UI;

Diff Legend

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