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.381 by root, Thu Jul 19 13:45:18 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
514); 527);
515 528
516sub emit { 529sub emit {
517 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
518 531
519 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
521 my @append 534 my @append
522 = $has_coords{$signal} 535 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
899 918
900 { 919 {
901 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
902 921
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
905 } 926 }
906
907 $self->_render;
908 }; 927 };
909} 928}
910 929
911sub _draw { 930sub _draw {
912 my ($self) = @_; 931 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 932
916 my $tex = $self->{texture} 933 my $tex = $self->{texture}
917 or return; 934 or return;
918 935
919 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
922 939
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
924 941
925 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
926} 943}
927 944
928############################################################################# 945#############################################################################
929 946
930package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948
949use List::Util qw(min max);
931 950
932our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
933 952
934sub new { 953sub new {
935 my $class = shift; 954 my $class = shift;
… …
967} 986}
968 987
969sub set_offset { 988sub set_offset {
970 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
971 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
972 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
974 997
998 $self->emit (changed => $x, $y);
975 $self->update; 999 $self->update;
1000 }
976} 1001}
977 1002
978# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 1004sub coord2local {
980 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1016 1041
1017############################################################################# 1042#############################################################################
1018 1043
1019package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1020 1045
1021our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1022 1047
1023sub new { 1048sub new {
1024 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1025 1050
1026 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1027 1052
1028 my $self; 1053 my $self;
1029 1054
1030 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1031 vertical => 1, 1065 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1067 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1070 },
1036 ; 1071 ;
1037 1072
1038 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1040 can_events => 1, 1076 can_events => 1,
1041 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1042 %arg, 1081 %arg,
1043 ); 1082 );
1044 1083
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
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1046 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1047 1101
1048 $self 1102 $self
1049} 1103}
1050 1104
… …
1054 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1055 1109
1056 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1057} 1111}
1058 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (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 (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1059sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1061 1146
1062 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1063 1148
1064 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1150
1066 1 1151 1
1067} 1152}
1068 1153
1069sub update_slider { 1154sub invoke_button_down {
1070 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1071 1156
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1073} 1158 $self->grab_focus;
1074 1159
1075sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1076 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1077 1165
1078 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1079 1169
1080 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1081} 1195}
1082 1196
1083sub invoke_size_allocate { 1197sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1085 1199
1086 $self->update_slider; 1200 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1202}
1090 1203
1091############################################################################# 1204#############################################################################
1092 1205
… …
1129} 1242}
1130 1243
1131############################################################################# 1244#############################################################################
1132 1245
1133package CFPlus::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
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;
1134 1347
1135our @ISA = CFPlus::UI::Bin::; 1348our @ISA = CFPlus::UI::Bin::;
1136 1349
1137use CFPlus::OpenGL; 1350use CFPlus::OpenGL;
1138 1351
… …
1363 1576
1364sub new { 1577sub new {
1365 my $class = shift; 1578 my $class = shift;
1366 1579
1367 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1368 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1369 @_, 1584 @_,
1370 ) 1585 )
1371} 1586}
1372 1587
1373sub children { 1588sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375} 1590}
1376 1591
1592# TODO: store row/col info in child widget and use standard add/del
1377sub add { 1593sub add {
1378 my ($self) = shift; 1594 my ($self) = shift;
1379 1595
1380 while (@_) { 1596 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self); 1598 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1384 } 1600 }
1385 1601
1386 $self->{force_realloc} = 1; 1602 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1; 1603 $self->{force_size_alloc} = 1;
1388 $self->realloc; 1604 $self->realloc;
1389} 1605}
1390 1606
1391sub remove { 1607sub remove {
1392 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1393 1609
1394 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1395} 1615}
1396 1616
1397# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1398sub clear { 1618sub clear {
1399 my ($self) = @_; 1619 my ($self) = @_;
… …
1448 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1449 1669
1450 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1452 1672
1453 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1457 1677
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1679
1462 CFPlus::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1463 CFPlus::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1464 1689
1465 my $y; 1690 my $y;
1466 1691
1467 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
… …
1507 my ($self) = @_; 1732 my ($self) = @_;
1508 1733
1509 for (grep $_, @{$self->{children}}) { 1734 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_; 1735 $_->draw for grep $_, @$_;
1511 } 1736 }
1737}
1738
1739#############################################################################
1740
1741package CFPlus::UI::Fixed;
1742
1743use List::Util qw(min max);
1744
1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1512} 1819}
1513 1820
1514############################################################################# 1821#############################################################################
1515 1822
1516package CFPlus::UI::Box; 1823package CFPlus::UI::Box;
… …
1618 #active_bg => none 1925 #active_bg => none
1619 #font => default_font 1926 #font => default_font
1620 #text => initial text 1927 #text => initial text
1621 #markup => initial narkup 1928 #markup => initial narkup
1622 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1623 ellipsise => 3, # end 1931 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1932 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1933 fontsize => 1,
1626 align => -1, 1934 align => -1,
1627 valign => -1, 1935 valign => -1,
… …
1778 }; 2086 };
1779 2087
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 2090
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 2092}
1785 2093
1786############################################################################# 2094#############################################################################
1787 2095
1788package CFPlus::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1802 can_hover => 1, 2110 can_hover => 1,
1803 can_focus => 1, 2111 can_focus => 1,
1804 valign => 0, 2112 valign => 0,
1805 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1806 #text => ... 2115 #text => ...
1807 #hidden => "*", 2116 #hidden => "*",
1808 @_ 2117 @_
1809 ) 2118 )
1810} 2119}
… …
1854 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1857 2166
1858 my $text = $self->get_text; 2167 my $text = $self->get_text;
2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2170
1860 if ($uni == 8) { 2171 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1869 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2195 $self->emit ('escape');
1874 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2200 } else {
1877 return 0; 2201 return 0;
1878 } 2202 }
1879 2203
1880 $self->_set_text ($text); 2204 $self->_set_text ($text);
1881 2205
1882 $self->realloc; 2206 $self->realloc;
2207 $self->update;
1883 2208
1884 1 2209 1
1885} 2210}
1886 2211
1887sub invoke_focus_in { 2212sub invoke_focus_in {
… …
1949 utf8::encode $text; 2274 utf8::encode $text;
1950 2275
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2277 }
1953 2278
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2279 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 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}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2282 glEnd;
1959 } 2283 }
1960} 2284}
2285
2286#############################################################################
1961 2287
1962package CFPlus::UI::Entry; 2288package CFPlus::UI::Entry;
1963 2289
1964our @ISA = CFPlus::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1965 2291
… …
1968sub invoke_key_down { 2294sub invoke_key_down {
1969 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1970 2296
1971 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1972 2298
1973 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1976 2302
1977 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
… …
2008 1 2334 1
2009} 2335}
2010 2336
2011############################################################################# 2337#############################################################################
2012 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
2013package CFPlus::UI::Button; 2378package CFPlus::UI::Button;
2014 2379
2015our @ISA = CFPlus::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
2016 2381
2017use CFPlus::OpenGL; 2382use CFPlus::OpenGL;
2018 2383
2019my @tex = 2384my @tex =
2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
2022 2387
2023sub new { 2388sub new {
2024 my $class = shift; 2389 my $class = shift;
2025 2390
2026 $class->SUPER::new ( 2391 $class->SUPER::new (
2027 padding_x => 4, 2392 padding_x => 4,
2028 padding_y => 4, 2393 padding_y => 4,
2029 fg => [1, 1, 1], 2394 fg => [1.0, 1.0, 1.0],
2030 active_fg => [0, 0, 1], 2395 active_fg => [0.8, 0.8, 0.8],
2031 can_hover => 1, 2396 can_hover => 1,
2032 align => 0, 2397 align => 0,
2033 valign => 0, 2398 valign => 0,
2034 can_events => 1, 2399 can_events => 1,
2035 @_ 2400 @_
… …
2053 2418
2054 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
2057 2422
2423 my $tex = $tex[$GRAB == $self];
2058 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2424 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059 2425
2060 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
2061 2427
2062 $self->SUPER::_draw; 2428 $self->SUPER::_draw;
2063} 2429}
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2525 or Carp::croak "'path' or 'tex' attributes required";
2160 2526
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2527 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2528 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2529
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2530 CFPlus::weaken $texture_cache{$self->{path}};
2165 2531
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2532 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2533
2168 $self 2534 $self
2169} 2535}
… …
2542sub invoke_mouse_wheel { 2908sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2909 my ($self, $ev) = @_;
2544 2910
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2911 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2912
2913 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2914
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2915 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2916
2549 ! ! $delta 2917 ! ! $delta
2550} 2918}
2551 2919
2552sub update { 2920sub update {
… …
2662 #font => default_font 3030 #font => default_font
2663 @_, 3031 @_,
2664 3032
2665 layout => (new CFPlus::Layout), 3033 layout => (new CFPlus::Layout),
2666 par => [], 3034 par => [],
3035 max_par => 0,
2667 height => 0, 3036 height => 0,
2668 children => [ 3037 children => [
2669 (new CFPlus::UI::Empty expand => 1), 3038 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 3039 (new CFPlus::UI::Slider vertical => 1),
2671 ], 3040 ],
… …
2750sub set_offset { 3119sub set_offset {
2751 my ($self, $offset) = @_; 3120 my ($self, $offset) = @_;
2752 3121
2753 # todo: base offset on lines or so, not on pixels 3122 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3123 $self->{children}[1]->set_value ($offset);
3124}
3125
3126sub current_paragraph {
3127 my ($self) = @_;
3128
3129 $self->{top_paragraph} - 1
3130}
3131
3132sub scroll_to {
3133 my ($self, $para) = @_;
3134
3135 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3136
3137 $self->{scroll_to} = $para;
3138 $self->update;
2755} 3139}
2756 3140
2757sub clear { 3141sub clear {
2758 my ($self) = @_; 3142 my ($self) = @_;
2759 3143
… …
2781 3165
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3166 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3167 push @{$self->{par}}, $para;
2784 } 3168 }
2785 3169
3170 if (my $max = $self->{max_par}) {
3171 shift @{$self->{par}} while @{$self->{par}} > $max;
3172 }
3173
2786 $self->{need_reflow}++; 3174 $self->{need_reflow}++;
2787 $self->update; 3175 $self->update;
2788} 3176}
2789 3177
2790sub scroll_to_bottom { 3178sub scroll_to_bottom {
2791 my ($self) = @_; 3179 my ($self) = @_;
2792 3180
2793 $self->{scroll_to_bottom} = 1; 3181 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3182 $self->update;
2795} 3183}
2796 3184
3185sub force_uptodate {
3186 my ($self) = @_;
3187
3188 if (delete $self->{need_reflow}) {
3189 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3190
3191 my $height = 0;
3192
3193 for my $para (@{$self->{par}}) {
3194 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3195 my $layout = $self->get_layout ($para);
3196 my ($w, $h) = $layout->size;
3197
3198 $para->{w} = $w + $para->{indent};
3199 $para->{h} = $h;
3200 $para->{wrapped} = $layout->has_wrapped;
3201 }
3202
3203 $para->{y} = $height;
3204 $height += $para->{h};
3205 }
3206
3207 $self->{height} = $height;
3208 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3209
3210 delete $self->{texture};
3211 }
3212
3213 if (my $paridx = delete $self->{scroll_to}) {
3214 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3215 }
3216}
3217
2797sub update { 3218sub update {
2798 my ($self) = @_; 3219 my ($self) = @_;
2799 3220
2800 $self->SUPER::update; 3221 $self->SUPER::update;
2801 3222
2802 return unless $self->{h} > 0; 3223 return unless $self->{h} > 0;
2803 3224
2804 delete $self->{texture}; 3225 delete $self->{texture};
2805 3226
2806 $ROOT->on_post_alloc ($self => sub { 3227 $ROOT->on_post_alloc ($self => sub {
3228 $self->force_uptodate;
3229
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3230 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 3231
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3232 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3233 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3234 glClear GL_COLOR_BUFFER_BIT;
2839 3235
3236 package CFPlus::UI::Base;
3237 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3238 (0, 0, $self->{w}, $self->{h});
3239
3240 my $top = int $self->{children}[1]{range}[0];
3241
3242 my $paridx = 0;
3243 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3244 my $top = int $self->{children}[1]{range}[0];
2841 3245
2842 my $y0 = $top; 3246 my $y0 = $top;
2843 my $y1 = $top + $H; 3247 my $y1 = $top + $H;
2844 3248
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3249 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3250 my $h = $para->{h};
3251 my $y = $para->{y};
2849 3252
2850 if ($y0 < $y + $h && $y < $y1) { 3253 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3254 my $layout = $self->get_layout ($para);
2853 3255
2854 $layout->render ($para->{indent}, $y - $y0); 3256 $layout->render ($para->{indent}, $y - $y0);
2855 3257
2856 if (my @w = @{ $para->{widget} }) { 3258 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3267 $_->draw;
2866 } 3268 }
2867 } 3269 }
2868 } 3270 }
2869 3271
2870 $y += $h; 3272 $paridx++;
3273 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3274 }
3275
3276 $self->{top_paragraph} = $top_paragraph;
2872 }; 3277 };
2873 }); 3278 });
2874} 3279}
2875 3280
2876sub reconfigure { 3281sub reconfigure {
… …
2997 3402
2998 $self->add (new CFPlus::UI::Label 3403 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3404 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3405 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3406 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3407 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3408 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3409 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3410 );
3006} 3411}
3007 3412
… …
3079 3484
3080sub new { 3485sub new {
3081 my $class = shift; 3486 my $class = shift;
3082 3487
3083 my $self = $class->SUPER::new ( 3488 my $self = $class->SUPER::new (
3489 size_w => 32,
3490 size_h => 8,
3084 aspect => 1, 3491 aspect => 1,
3085 can_events => 0, 3492 can_events => 0,
3086 @_, 3493 @_,
3087 ); 3494 );
3088 3495
3089 if ($self->{anim} && $self->{animspeed}) { 3496 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3497 CFPlus::weaken (my $widget = $self);
3091 3498
3499 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3500 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3092 $self->{timer} = Event->timer ( 3501 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3502 parked => 1,
3095 interval => $self->{animspeed},
3096 cb => sub { 3503 cb => sub {
3504 return unless $::CONN && $widget;
3505
3097 ++$widget->{frame}; 3506 ++$widget->{frame};
3507 $widget->update_face;
3098 $widget->update; 3508 $widget->update;
3509
3510 $widget->update_timer;
3099 }, 3511 },
3100 ); 3512 );
3513
3514 $self->update_face;
3515 $self->update_timer;
3101 } 3516 }
3102 3517
3103 $self 3518 $self
3104} 3519}
3105 3520
3521sub update_timer {
3522 my ($self) = @_;
3523
3524 return unless $self->{timer};
3525
3526 if ($self->{visible}) {
3527 $self->{timer}->at (
3528 $self->{anim_start}
3529 + $self->{animspeed}
3530 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3531 );
3532 $self->{timer}->start;
3533 } else {
3534 $self->{timer}->stop;
3535 }
3536}
3537
3538sub update_face {
3539 my ($self) = @_;
3540
3541 return unless $::CONN;
3542
3543 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if ($anim && @$anim) {
3545 delete $self->{wait_face};
3546 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 }
3548 }
3549}
3550
3106sub size_request { 3551sub size_request {
3107 (32, 8) 3552 my ($self) = @_;
3553
3554 if ($::CONN) {
3555 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3556 if (my $tex = $::CONN->{texture}[$faceid]) {
3557 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3558 } else {
3559 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3560 $self->realloc;
3561 });
3562 }
3563 }
3564 }
3565
3566 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3567}
3109 3568
3110sub update { 3569sub update {
3111 my ($self) = @_; 3570 my ($self) = @_;
3112 3571
3113 return unless $self->{visible}; 3572 return unless $self->{visible};
3114 3573
3115 $self->SUPER::update; 3574 $self->SUPER::update;
3116} 3575}
3117 3576
3577sub invoke_visibility_change {
3578 my ($self) = @_;
3579
3580 $self->update_timer;
3581
3582 0
3583}
3584
3118sub _draw { 3585sub _draw {
3119 my ($self) = @_; 3586 my ($self) = @_;
3120 3587
3121 return unless $::CONN; 3588 return unless $::CONN;
3122 3589
3123 $self->SUPER::_draw; 3590 $self->SUPER::_draw;
3124 3591
3125 my $face;
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}]; 3592 my $faceid = $::CONN->{faceid}[$self->{face}]
3129 3593 or return;
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133 3594
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3595 my $tex = $::CONN->{texture}[$faceid];
3135 3596
3136 if ($tex) { 3597 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3598 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3600 glColor 0, 0, 0, 1;
… …
3143} 3604}
3144 3605
3145sub destroy { 3606sub destroy {
3146 my ($self) = @_; 3607 my ($self) = @_;
3147 3608
3148 $self->{timer}->cancel 3609 (delete $self->{timer})->cancel
3149 if $self->{timer}; 3610 if $self->{timer};
3150 3611
3151 $self->SUPER::destroy; 3612 $self->SUPER::destroy;
3152} 3613}
3153 3614
… …
3155 3616
3156package CFPlus::UI::Buttonbar; 3617package CFPlus::UI::Buttonbar;
3157 3618
3158our @ISA = CFPlus::UI::HBox::; 3619our @ISA = CFPlus::UI::HBox::;
3159 3620
3160# TODO: should actualyl wrap buttons and other goodies. 3621# TODO: should actually wrap buttons and other goodies.
3161 3622
3162############################################################################# 3623#############################################################################
3163 3624
3164package CFPlus::UI::Menu; 3625package CFPlus::UI::Menu;
3165 3626
3166our @ISA = CFPlus::UI::FancyFrame::; 3627our @ISA = CFPlus::UI::Toplevel::;
3167 3628
3168use CFPlus::OpenGL; 3629use CFPlus::OpenGL;
3169 3630
3170sub new { 3631sub new {
3171 my $class = shift; 3632 my $class = shift;
… …
3349} 3810}
3350 3811
3351sub add { 3812sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3813 my ($self, $title, $widget, $tooltip) = @_;
3353 3814
3354 Scalar::Util::weaken $self; 3815 CFPlus::weaken $self;
3355 3816
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3817 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3818 markup => $title,
3358 tooltip => $tooltip, 3819 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3820 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3905 fontsize => 0.8,
3445 @_, 3906 @_,
3446 ); 3907 );
3447 3908
3448 Scalar::Util::weaken (my $this = $self); 3909 CFPlus::weaken (my $this = $self);
3449 3910
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3911 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3912
3452 $self 3913 $self
3453} 3914}
… …
3576 $self->SUPER::destroy; 4037 $self->SUPER::destroy;
3577} 4038}
3578 4039
3579############################################################################# 4040#############################################################################
3580 4041
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; 4042package CFPlus::UI::Root;
3766 4043
3767our @ISA = CFPlus::UI::Container::; 4044our @ISA = CFPlus::UI::Container::;
3768 4045
3769use List::Util qw(min max); 4046use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 4053 my $self = $class->SUPER::new (
3777 visible => 1, 4054 visible => 1,
3778 @_, 4055 @_,
3779 ); 4056 );
3780 4057
3781 Scalar::Util::weaken ($self->{root} = $self); 4058 CFPlus::weaken ($self->{root} = $self);
3782 4059
3783 $self 4060 $self
3784} 4061}
3785 4062
3786sub size_request { 4063sub size_request {
… …
3981 while ($self->{post_alloc_hook}) { 4258 while ($self->{post_alloc_hook}) {
3982 $_->() 4259 $_->()
3983 for values %{delete $self->{post_alloc_hook}}; 4260 for values %{delete $self->{post_alloc_hook}};
3984 } 4261 }
3985 4262
3986
3987 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4263 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989 glClear GL_COLOR_BUFFER_BIT; 4265 glClear GL_COLOR_BUFFER_BIT;
3990 4266
3991 glMatrixMode GL_PROJECTION; 4267 glMatrixMode GL_PROJECTION;
… …
3995 glLoadIdentity; 4271 glLoadIdentity;
3996 4272
3997 { 4273 {
3998 package CFPlus::UI::Base; 4274 package CFPlus::UI::Base;
3999 4275
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4277 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4278
4004 $self->_draw; 4279 $self->_draw;
4280 }
4005} 4281}
4006 4282
4007############################################################################# 4283#############################################################################
4008 4284
4009package CFPlus::UI; 4285package CFPlus::UI;

Diff Legend

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