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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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