ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33: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;
10use CFPlus::Pod;
11use CFPlus::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
267} 275}
268 276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
501 509
502 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
505 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
506} 520}
507 521
508my %has_coords = ( 522my %has_coords = (
509 button_down => 1, 523 button_down => 1,
510 button_up => 1, 524 button_up => 1,
… …
513); 527);
514 528
515sub emit { 529sub emit {
516 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
517 531
518 # 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
519 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
520 my @append 534 my @append
521 = $has_coords{$signal} 535 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
523 : (); 537 : ();
524 538
525 #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#
526 540
527 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($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
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 550}
532 551
533sub find_widget { 552sub find_widget {
534 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
535 554
… …
543} 562}
544 563
545sub set_parent { 564sub set_parent {
546 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
547 566
548 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
550} 569}
551 570
552sub realloc { 571sub realloc {
553 my ($self) = @_; 572 my ($self) = @_;
… …
632 my ($self) = @_; 651 my ($self) = @_;
633 652
634 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
635} 654}
636 655
656my $cntx;#d#
637sub DESTROY { 657sub DESTROY {
638 my ($self) = @_; 658 my ($self) = @_;
639 659
640 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 661
644 eval { $self->destroy }; 662 eval { $self->destroy };
645 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};
646} 666}
647 667
648############################################################################# 668#############################################################################
649 669
650package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
897 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
898 918
899 { 919 {
900 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
901 921
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
904 } 926 }
905
906 $self->_render;
907 }; 927 };
908} 928}
909 929
910sub _draw { 930sub _draw {
911 my ($self) = @_; 931 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 932
915 my $tex = $self->{texture} 933 my $tex = $self->{texture}
916 or return; 934 or return;
917 935
918 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
921 939
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
923 941
924 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
925} 943}
926 944
927############################################################################# 945#############################################################################
928 946
929package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948
949use List::Util qw(min max);
930 950
931our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
932 952
933sub new { 953sub new {
934 my $class = shift; 954 my $class = shift;
… …
966} 986}
967 987
968sub set_offset { 988sub set_offset {
969 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
970 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}) {
971 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
973 997
998 $self->emit (changed => $x, $y);
974 $self->update; 999 $self->update;
1000 }
975} 1001}
976 1002
977# 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
978sub coord2local { 1004sub coord2local {
979 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1015 1041
1016############################################################################# 1042#############################################################################
1017 1043
1018package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1019 1045
1020our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1021 1047
1022sub new { 1048sub new {
1023 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1024 1050
1025 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1026 1052
1027 my $self; 1053 my $self;
1028 1054
1029 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
1030 vertical => 1, 1065 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1067 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1070 },
1035 ; 1071 ;
1036 1072
1037 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1038 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1039 can_events => 1, 1076 can_events => 1,
1040 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1041 %arg, 1081 %arg,
1042 ); 1082 );
1043 1083
1044 $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
1045 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1046 1101
1047 $self 1102 $self
1048} 1103}
1049 1104
… …
1053 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1054 1109
1055 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1056} 1111}
1057 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->update_slider;
1141 $self->SUPER::update;
1142}
1143
1058sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1060 1146
1061 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1148
1063 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1150
1065 1 1151 1
1066} 1152}
1067 1153
1068sub update_slider { 1154sub invoke_button_down {
1069 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1070 1156
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1072} 1158 $self->grab_focus;
1073 1159
1074sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1076 1165
1077 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1078 1169
1079 $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
1080} 1195}
1081 1196
1082sub invoke_size_allocate { 1197sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1084 1199
1085 $self->update_slider; 1200 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1202}
1089 1203
1090############################################################################# 1204#############################################################################
1091 1205
… …
1133 1247
1134our @ISA = CFPlus::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1135 1249
1136use CFPlus::OpenGL; 1250use CFPlus::OpenGL;
1137 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
1138my $bg = 1352my $bg =
1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1141 1355
1142my @border = 1356my @border =
1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 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);
1145 1363
1146sub new { 1364sub new {
1147 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1148 1366
1149 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1537
1320 my $border = $self->border; 1538 my $border = $self->border;
1321 1539
1322 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $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);
1327 1559
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1330 1562
1331 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1362 1594
1363sub new { 1595sub new {
1364 my $class = shift; 1596 my $class = shift;
1365 1597
1366 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1367 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1368 @_, 1602 @_,
1369 ) 1603 )
1370} 1604}
1371 1605
1372sub children { 1606sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374} 1608}
1375 1609
1610# TODO: store row/col info in child widget and use standard add/del
1376sub add { 1611sub add {
1377 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;
1378 1620
1379 while (@_) { 1621 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1381 $child->set_parent ($self); 1624 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1383 } 1626 }
1384 1627
1385 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1387 $self->realloc; 1630 $self->realloc;
1388} 1631}
1389 1632
1390sub remove { 1633sub remove {
1391 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1392 1635
1393 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1394} 1641}
1395 1642
1396# 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?
1397sub clear { 1644sub clear {
1398 my ($self) = @_; 1645 my ($self) = @_;
… …
1447 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1448 1695
1449 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1451 1698
1452 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1453 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1456 1703
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1705
1461 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
1462 CFPlus::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1463 1715
1464 my $y; 1716 my $y;
1465 1717
1466 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
… …
1506 my ($self) = @_; 1758 my ($self) = @_;
1507 1759
1508 for (grep $_, @{$self->{children}}) { 1760 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_; 1761 $_->draw for grep $_, @$_;
1510 } 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
1511} 1845}
1512 1846
1513############################################################################# 1847#############################################################################
1514 1848
1515package CFPlus::UI::Box; 1849package CFPlus::UI::Box;
… …
1617 #active_bg => none 1951 #active_bg => none
1618 #font => default_font 1952 #font => default_font
1619 #text => initial text 1953 #text => initial text
1620 #markup => initial narkup 1954 #markup => initial narkup
1621 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1622 ellipsise => 3, # end 1957 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout), 1958 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1959 fontsize => 1,
1625 align => -1, 1960 align => -1,
1626 valign => -1, 1961 valign => -1,
… …
1777 }; 2112 };
1778 2113
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 2116
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2118}
1784 2119
1785############################################################################# 2120#############################################################################
1786 2121
1787package CFPlus::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
… …
1800 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1801 can_hover => 1, 2136 can_hover => 1,
1802 can_focus => 1, 2137 can_focus => 1,
1803 valign => 0, 2138 valign => 0,
1804 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1805 #text => ... 2141 #text => ...
1806 #hidden => "*", 2142 #hidden => "*",
1807 @_ 2143 @_
1808 ) 2144 )
1809} 2145}
… …
1853 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1856 2192
1857 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;
1858 2196
1859 if ($uni == 8) { 2197 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } 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 = "";
1868 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2221 $self->emit ('escape');
1873 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2226 } else {
1876 return 0; 2227 return 0;
1877 } 2228 }
1878 2229
1879 $self->_set_text ($text); 2230 $self->_set_text ($text);
1880 2231
1881 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1882 2234
1883 1 2235 1
1884} 2236}
1885 2237
1886sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1948 utf8::encode $text; 2300 utf8::encode $text;
1949 2301
1950 @$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)
1951 } 2303 }
1952 2304
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2305 glBegin GL_LINES;
1955 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};
1956 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};
1957 glEnd; 2308 glEnd;
1958 } 2309 }
1959} 2310}
2311
2312#############################################################################
1960 2313
1961package CFPlus::UI::Entry; 2314package CFPlus::UI::Entry;
1962 2315
1963our @ISA = CFPlus::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1964 2317
… …
1967sub invoke_key_down { 2320sub invoke_key_down {
1968 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1969 2322
1970 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1971 2324
1972 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1975 2328
1976 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
… …
2007 1 2360 1
2008} 2361}
2009 2362
2010############################################################################# 2363#############################################################################
2011 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
2012package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2013 2405
2014our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2015 2407
2016use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2017 2409
2018my @tex = 2410my @tex =
2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2021 2413
2022sub new { 2414sub new {
2023 my $class = shift; 2415 my $class = shift;
2024 2416
2025 $class->SUPER::new ( 2417 $class->SUPER::new (
2026 padding_x => 4, 2418 padding_x => 4,
2027 padding_y => 4, 2419 padding_y => 4,
2028 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2422 can_hover => 1,
2031 align => 0, 2423 align => 0,
2032 valign => 0, 2424 valign => 0,
2033 can_events => 1, 2425 can_events => 1,
2034 @_ 2426 @_
… …
2052 2444
2053 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2056 2448
2449 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2451
2059 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2060 2453
2061 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2062} 2455}
… …
2158 or Carp::croak "'path' or 'tex' attributes required"; 2551 or Carp::croak "'path' or 'tex' attributes required";
2159 2552
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 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;
2162 2555
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2164 2557
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2559
2167 $self 2560 $self
2168} 2561}
… …
2541sub invoke_mouse_wheel { 2934sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2935 my ($self, $ev) = @_;
2543 2936
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2942
2548 ! ! $delta 2943 ! ! $delta
2549} 2944}
2550 2945
2551sub update { 2946sub update {
… …
2661 #font => default_font 3056 #font => default_font
2662 @_, 3057 @_,
2663 3058
2664 layout => (new CFPlus::Layout), 3059 layout => (new CFPlus::Layout),
2665 par => [], 3060 par => [],
3061 max_par => 0,
2666 height => 0, 3062 height => 0,
2667 children => [ 3063 children => [
2668 (new CFPlus::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2669 (new CFPlus::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3066 ],
… …
2749sub set_offset { 3145sub set_offset {
2750 my ($self, $offset) = @_; 3146 my ($self, $offset) = @_;
2751 3147
2752 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2753 $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;
2754} 3165}
2755 3166
2756sub clear { 3167sub clear {
2757 my ($self) = @_; 3168 my ($self) = @_;
2758 3169
… …
2780 3191
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
2783 } 3194 }
2784 3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
3199
2785 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2786 $self->update; 3201 $self->update;
2787} 3202}
2788 3203
2789sub scroll_to_bottom { 3204sub scroll_to_bottom {
2790 my ($self) = @_; 3205 my ($self) = @_;
2791 3206
2792 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3208 $self->update;
2794} 3209}
2795 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
2796sub update { 3244sub update {
2797 my ($self) = @_; 3245 my ($self) = @_;
2798 3246
2799 $self->SUPER::update; 3247 $self->SUPER::update;
2800 3248
2801 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2802 3250
2803 delete $self->{texture}; 3251 delete $self->{texture};
2804 3252
2805 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834 3257
2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2838 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;
2839 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2840 3271
2841 my $y0 = $top; 3272 my $y0 = $top;
2842 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2843 3274
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2848 3278
2849 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2852 3281
2853 $layout->render ($para->{indent}, $y - $y0); 3282 $layout->render ($para->{indent}, $y - $y0);
2854 3283
2855 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3293 $_->draw;
2865 } 3294 }
2866 } 3295 }
2867 } 3296 }
2868 3297
2869 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3300 }
3301
3302 $self->{top_paragraph} = $top_paragraph;
2871 }; 3303 };
2872 }); 3304 });
2873} 3305}
2874 3306
2875sub reconfigure { 3307sub reconfigure {
… …
2977} 3409}
2978 3410
2979sub set_tooltip_from { 3411sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
2981 3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
3416
2982 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2983 3418
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
2993 3428
2994 $self->add (new CFPlus::UI::Label 3429 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3430 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3432 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3434 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3436 );
3002} 3437}
3003 3438
… …
3075 3510
3076sub new { 3511sub new {
3077 my $class = shift; 3512 my $class = shift;
3078 3513
3079 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3080 aspect => 1, 3517 aspect => 1,
3081 can_events => 0, 3518 can_events => 0,
3082 @_, 3519 @_,
3083 ); 3520 );
3084 3521
3085 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3087 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3528 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3093 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3094 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3095 }, 3537 },
3096 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3097 } 3542 }
3098 3543
3099 $self 3544 $self
3100} 3545}
3101 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
3102sub size_request { 3577sub size_request {
3103 (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)
3104} 3593}
3105 3594
3106sub update { 3595sub update {
3107 my ($self) = @_; 3596 my ($self) = @_;
3108 3597
3109 return unless $self->{visible}; 3598 return unless $self->{visible};
3110 3599
3111 $self->SUPER::update; 3600 $self->SUPER::update;
3112} 3601}
3113 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3114sub _draw { 3611sub _draw {
3115 my ($self) = @_; 3612 my ($self) = @_;
3116 3613
3117 return unless $::CONN; 3614 return unless $::CONN;
3118 3615
3119 $self->SUPER::_draw; 3616 $self->SUPER::_draw;
3120 3617
3121 my $face;
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3125 3619 or return;
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129 3620
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3131 3622
3132 if ($tex) { 3623 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3139} 3630}
3140 3631
3141sub destroy { 3632sub destroy {
3142 my ($self) = @_; 3633 my ($self) = @_;
3143 3634
3144 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3636 if $self->{timer};
3146 3637
3147 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3148} 3639}
3149 3640
… …
3151 3642
3152package CFPlus::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3153 3644
3154our @ISA = CFPlus::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3155 3646
3156# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3157 3648
3158############################################################################# 3649#############################################################################
3159 3650
3160package CFPlus::UI::Menu; 3651package CFPlus::UI::Menu;
3161 3652
3162our @ISA = CFPlus::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3163 3654
3164use CFPlus::OpenGL; 3655use CFPlus::OpenGL;
3165 3656
3166sub new { 3657sub new {
3167 my $class = shift; 3658 my $class = shift;
… …
3345} 3836}
3346 3837
3347sub add { 3838sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3349 3840
3350 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3351 3842
3352 $self->{buttonbar}->add (new CFPlus::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3844 markup => $title,
3354 tooltip => $tooltip, 3845 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
… …
3439 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3931 fontsize => 0.8,
3441 @_, 3932 @_,
3442 ); 3933 );
3443 3934
3444 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3445 3936
3446 $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 });
3447 3938
3448 $self 3939 $self
3449} 3940}
… …
3572 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3573} 4064}
3574 4065
3575############################################################################# 4066#############################################################################
3576 4067
3577package CFPlus::UI::Inventory;
3578
3579our @ISA = CFPlus::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFPlus::UI::Root; 4068package CFPlus::UI::Root;
3762 4069
3763our @ISA = CFPlus::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3764 4071
3765use List::Util qw(min max); 4072use List::Util qw(min max);
… …
3772 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3773 visible => 1, 4080 visible => 1,
3774 @_, 4081 @_,
3775 ); 4082 );
3776 4083
3777 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3778 4085
3779 $self 4086 $self
3780} 4087}
3781 4088
3782sub size_request { 4089sub size_request {
… …
3977 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3978 $_->() 4285 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3980 } 4287 }
3981 4288
3982
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3986 4292
3987 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;
… …
3991 glLoadIdentity; 4297 glLoadIdentity;
3992 4298
3993 { 4299 {
3994 package CFPlus::UI::Base; 4300 package CFPlus::UI::Base;
3995 4301
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4304
4000 $self->_draw; 4305 $self->_draw;
4306 }
4001} 4307}
4002 4308
4003############################################################################# 4309#############################################################################
4004 4310
4005package CFPlus::UI; 4311package CFPlus::UI;

Diff Legend

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