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.361 by root, Sat Dec 9 02:21:25 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 }
… …
266 $self->hide; 272 $self->hide;
267 $self->emit ("destroy"); 273 $self->emit ("destroy");
268 %$self = (); 274 %$self = ();
269} 275}
270 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
271sub show { 281sub show {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
274 return if $self->{parent}; 284 return if $self->{parent};
275 285
… …
314sub set_visibility { 324sub set_visibility {
315 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
316 326
317 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
318 328
319 $visible ? $self->hide 329 $visible ? $self->show
320 : $self->show; 330 : $self->hide;
321} 331}
322 332
323sub toggle_visibility { 333sub toggle_visibility {
324 my ($self) = @_; 334 my ($self) = @_;
325 335
… …
530 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
531 : (); 541 : ();
532 542
533 #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#
534 544
535 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($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
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 554}
540 555
541sub find_widget { 556#sub find_widget {
542 my ($self, $x, $y) = @_; 557# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 558
553sub set_parent { 559sub set_parent {
554 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
555 561
556 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
558} 564}
559 565
560sub realloc { 566sub realloc {
561 my ($self) = @_; 567 my ($self) = @_;
… …
640 my ($self) = @_; 646 my ($self) = @_;
641 647
642 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
643} 649}
644 650
651my $cntx;#d#
645sub DESTROY { 652sub DESTROY {
646 my ($self) = @_; 653 my ($self) = @_;
647 654
648 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
649 656
… …
932 939
933############################################################################# 940#############################################################################
934 941
935package CFPlus::UI::ViewPort; 942package CFPlus::UI::ViewPort;
936 943
944use List::Util qw(min max);
945
937our @ISA = CFPlus::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
938 947
939sub new { 948sub new {
940 my $class = shift; 949 my $class = shift;
941 950
… …
972} 981}
973 982
974sub set_offset { 983sub set_offset {
975 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
976 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}) {
977 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
979 992
993 $self->emit (changed => $x, $y);
980 $self->update; 994 $self->update;
995 }
981} 996}
982 997
983# 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
984sub coord2local { 999sub coord2local {
985 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1001 1016
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1019 ) {
1005 $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})
1006 } else { 1021 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 1023 }
1009} 1024}
1010 1025
… …
1021 1036
1022############################################################################# 1037#############################################################################
1023 1038
1024package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1025 1040
1026our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1027 1042
1028sub new { 1043sub new {
1029 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1030 1045
1031 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1032 1047
1033 my $self; 1048 my $self;
1034 1049
1035 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
1036 vertical => 1, 1060 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1062 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1065 },
1041 ; 1066 ;
1042 1067
1043 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1045 can_events => 1, 1071 can_events => 1,
1046 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1047 %arg, 1076 %arg,
1048 ); 1077 );
1049 1078
1050 $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
1051 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1052 1096
1053 $self 1097 $self
1054} 1098}
1055 1099
… …
1059 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1060 1104
1061 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1062} 1106}
1063 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
1064sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1066 1141
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $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};
1070 1147
1071 1 1148 1
1072} 1149}
1073 1150
1074sub update_slider { 1151sub invoke_button_down {
1075 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1076 1153
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1078} 1155 $self->grab_focus;
1079 1156
1080sub update { 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1081 my ($self) = @_; 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1082 1162
1083 $self->SUPER::update; 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1084 1166
1085 $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
1086} 1192}
1087 1193
1088sub invoke_size_allocate { 1194sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1090 1196
1091 $self->update_slider; 1197 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1199}
1095 1200
1096############################################################################# 1201#############################################################################
1097 1202
… …
1247 1352
1248my @border = 1353my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 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);
1251 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1252sub new { 1361sub new {
1253 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1254 1363
1255 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1534
1426 my $border = $self->border; 1535 my $border = $self->border;
1427 1536
1428 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $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);
1433 1556
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1436 1559
1437 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1468 1591
1469sub new { 1592sub new {
1470 my $class = shift; 1593 my $class = shift;
1471 1594
1472 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1473 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1474 @_, 1599 @_,
1475 ) 1600 )
1476} 1601}
1477 1602
1478sub children { 1603sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480} 1605}
1481 1606
1607# TODO: store row/col info in child widget and use standard add/del
1482sub add { 1608sub add {
1483 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;
1484 1617
1485 while (@_) { 1618 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1487 $child->set_parent ($self); 1621 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1489 } 1623 }
1490 1624
1491 $self->{force_realloc} = 1; 1625 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1; 1626 $self->{force_size_alloc} = 1;
1493 $self->realloc; 1627 $self->realloc;
1494} 1628}
1495 1629
1496sub remove { 1630sub remove {
1497 my ($self, $child) = @_; 1631 my ($self, $child) = @_;
1498 1632
1499 # TODO: not yet implemented 1633 for (@{ $self->{children} }) {
1634 for (@{ $_ || [] }) {
1635 $_ = undef if $_ == $child;
1636 }
1637 }
1500} 1638}
1501 1639
1502# 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?
1503sub clear { 1641sub clear {
1504 my ($self) = @_; 1642 my ($self) = @_;
… …
1553 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1554 1692
1555 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1557 1695
1558 # TODO: nicer code && do row_expand 1696 # TODO: nicer code
1559 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1562 1700
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1702
1567 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
1568 CFPlus::UI::harmonize $hs; 1711 CFPlus::UI::harmonize $hs;
1569 1712
1570 my $y; 1713 my $y;
1571 1714
1572 for my $r (0 .. $#{$self->{children}}) { 1715 for my $r (0 .. $#{$self->{children}}) {
… …
1612 my ($self) = @_; 1755 my ($self) = @_;
1613 1756
1614 for (grep $_, @{$self->{children}}) { 1757 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_; 1758 $_->draw for grep $_, @$_;
1616 } 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
1617} 1842}
1618 1843
1619############################################################################# 1844#############################################################################
1620 1845
1621package CFPlus::UI::Box; 1846package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2187 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2188 my $uni = $ev->{unicode};
1964 2189
1965 my $text = $self->get_text; 2190 my $text = $self->get_text;
1966 2191
2192 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2193
1967 if ($uni == 8) { 2194 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2196 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2197 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2198 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2199 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2200 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2202 } elsif ($sym == CFPlus::SDLK_HOME) {
2203 # what a hack
1976 $self->{cursor} = 0; 2204 $self->{cursor} =
2205 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2206 ? length $1
2207 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2208 } elsif ($sym == CFPlus::SDLK_END) {
2209 # uh, again
2210 $self->{cursor} =
2211 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2212 ? $self->{cursor} + length $1
2213 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2214 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2215 $text = "";
1981 $self->{cursor} = 0; 2216 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2217 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2218 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2219 } elsif ($uni == 0x0d) {
2220 substr $text, $self->{cursor}++, 0, "\012";
2221 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2222 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2223 } else {
1987 return 0; 2224 return 0;
1988 } 2225 }
1989 2226
… …
2167 2404
2168use CFPlus::OpenGL; 2405use CFPlus::OpenGL;
2169 2406
2170my @tex = 2407my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
2173 2410
2174sub new { 2411sub new {
2175 my $class = shift; 2412 my $class = shift;
2176 2413
2177 $class->SUPER::new ( 2414 $class->SUPER::new (
2178 padding_x => 4, 2415 padding_x => 4,
2179 padding_y => 4, 2416 padding_y => 4,
2180 fg => [1, 1, 1], 2417 fg => [1.0, 1.0, 1.0],
2181 active_fg => [0, 0, 1], 2418 active_fg => [0.8, 0.8, 0.8],
2182 can_hover => 1, 2419 can_hover => 1,
2183 align => 0, 2420 align => 0,
2184 valign => 0, 2421 valign => 0,
2185 can_events => 1, 2422 can_events => 1,
2186 @_ 2423 @_
… …
2204 2441
2205 glEnable GL_TEXTURE_2D; 2442 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2444 glColor 0, 0, 0, 1;
2208 2445
2446 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2448
2211 glDisable GL_TEXTURE_2D; 2449 glDisable GL_TEXTURE_2D;
2212 2450
2213 $self->SUPER::_draw; 2451 $self->SUPER::_draw;
2214} 2452}
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
2311 2549
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 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;
2314 2552
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
2316 2554
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2556
2319 $self 2557 $self
2320} 2558}
… …
2693sub invoke_mouse_wheel { 2931sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2932 my ($self, $ev) = @_;
2695 2933
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2934 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2935
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2939
2700 ! ! $delta 2940 ! ! $delta
2701} 2941}
2702 2942
2703sub update { 2943sub update {
… …
2813 #font => default_font 3053 #font => default_font
2814 @_, 3054 @_,
2815 3055
2816 layout => (new CFPlus::Layout), 3056 layout => (new CFPlus::Layout),
2817 par => [], 3057 par => [],
3058 max_par => 0,
2818 height => 0, 3059 height => 0,
2819 children => [ 3060 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3061 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3062 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3063 ],
… …
2945 wrapped => 1, 3186 wrapped => 1,
2946 }; 3187 };
2947 3188
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3189 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3190 push @{$self->{par}}, $para;
3191 }
3192
3193 if (my $max = $self->{max_par}) {
3194 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3195 }
2951 3196
2952 $self->{need_reflow}++; 3197 $self->{need_reflow}++;
2953 $self->update; 3198 $self->update;
2954} 3199}
… …
3262 3507
3263sub new { 3508sub new {
3264 my $class = shift; 3509 my $class = shift;
3265 3510
3266 my $self = $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3512 size_w => 32,
3513 size_h => 8,
3267 aspect => 1, 3514 aspect => 1,
3268 can_events => 0, 3515 can_events => 0,
3269 @_, 3516 @_,
3270 ); 3517 );
3271 3518
3272 if ($self->{anim} && $self->{animspeed}) { 3519 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3520 CFPlus::weaken (my $widget = $self);
3274 3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3524 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3525 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3526 cb => sub {
3527 return unless $::CONN && $widget;
3528
3280 ++$widget->{frame}; 3529 ++$widget->{frame};
3530 $widget->update_face;
3281 $widget->update; 3531 $widget->update;
3532
3533 $widget->update_timer;
3282 }, 3534 },
3283 ); 3535 );
3536
3537 $self->update_face;
3538 $self->update_timer;
3284 } 3539 }
3285 3540
3286 $self 3541 $self
3287} 3542}
3288 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
3289sub size_request { 3574sub size_request {
3290 (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)
3291} 3590}
3292 3591
3293sub update { 3592sub update {
3294 my ($self) = @_; 3593 my ($self) = @_;
3295 3594
3296 return unless $self->{visible}; 3595 return unless $self->{visible};
3297 3596
3298 $self->SUPER::update; 3597 $self->SUPER::update;
3299} 3598}
3300 3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
3606}
3607
3301sub _draw { 3608sub _draw {
3302 my ($self) = @_; 3609 my ($self) = @_;
3303 3610
3304 return unless $::CONN; 3611 return unless $::CONN;
3305 3612
3306 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3307 3614
3308 my $face;
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3615 my $faceid = $::CONN->{faceid}[$self->{face}]
3312 3616 or return;
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316 3617
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3618 my $tex = $::CONN->{texture}[$faceid];
3318 3619
3319 if ($tex) { 3620 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3621 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3623 glColor 0, 0, 0, 1;
… …
3326} 3627}
3327 3628
3328sub destroy { 3629sub destroy {
3329 my ($self) = @_; 3630 my ($self) = @_;
3330 3631
3331 $self->{timer}->cancel 3632 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3633 if $self->{timer};
3333 3634
3334 $self->SUPER::destroy; 3635 $self->SUPER::destroy;
3335} 3636}
3336 3637
… …
3532} 3833}
3533 3834
3534sub add { 3835sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3836 my ($self, $title, $widget, $tooltip) = @_;
3536 3837
3537 Scalar::Util::weaken $self; 3838 CFPlus::weaken $self;
3538 3839
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3841 markup => $title,
3541 tooltip => $tooltip, 3842 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3843 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3927 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3928 fontsize => 0.8,
3628 @_, 3929 @_,
3629 ); 3930 );
3630 3931
3631 Scalar::Util::weaken (my $this = $self); 3932 CFPlus::weaken (my $this = $self);
3632 3933
3633 $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 });
3634 3935
3635 $self 3936 $self
3636} 3937}
… …
3775 my $self = $class->SUPER::new ( 4076 my $self = $class->SUPER::new (
3776 visible => 1, 4077 visible => 1,
3777 @_, 4078 @_,
3778 ); 4079 );
3779 4080
3780 Scalar::Util::weaken ($self->{root} = $self); 4081 CFPlus::weaken ($self->{root} = $self);
3781 4082
3782 $self 4083 $self
3783} 4084}
3784 4085
3785sub size_request { 4086sub size_request {
… …
3980 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
3981 $_->() 4282 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4283 for values %{delete $self->{post_alloc_hook}};
3983 } 4284 }
3984 4285
3985
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4286 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
3989 4289
3990 glMatrixMode GL_PROJECTION; 4290 glMatrixMode GL_PROJECTION;

Diff Legend

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