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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $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
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
265 $self->hide; 272 $self->hide;
266 $self->emit ("destroy"); 273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
268} 275}
269 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
273 return if $self->{parent}; 284 return if $self->{parent};
274 285
… …
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
… …
540 551
541 # parent 552 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 554}
544 555
545sub find_widget { 556#sub find_widget {
546 my ($self, $x, $y) = @_; 557# in .xs
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556 558
557sub set_parent { 559sub set_parent {
558 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
559 561
560 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
937 939
938############################################################################# 940#############################################################################
939 941
940package CFPlus::UI::ViewPort; 942package CFPlus::UI::ViewPort;
941 943
944use List::Util qw(min max);
945
942our @ISA = CFPlus::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
943 947
944sub new { 948sub new {
945 my $class = shift; 949 my $class = shift;
946 950
… …
977} 981}
978 982
979sub set_offset { 983sub set_offset {
980 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
981 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}) {
982 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
984 992
993 $self->emit (changed => $x, $y);
985 $self->update; 994 $self->update;
995 }
986} 996}
987 997
988# 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
989sub coord2local { 999sub coord2local {
990 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1006 1016
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 1019 ) {
1010 $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})
1011 } else { 1021 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 1023 }
1014} 1024}
1015 1025
… …
1026 1036
1027############################################################################# 1037#############################################################################
1028 1038
1029package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1030 1040
1031our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1032 1042
1033sub new { 1043sub new {
1034 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1035 1045
1036 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1037 1047
1038 my $self; 1048 my $self;
1039 1049
1040 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
1041 vertical => 1, 1060 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1062 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1065 },
1046 ; 1066 ;
1047 1067
1048 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1050 can_events => 1, 1071 can_events => 1,
1051 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1052 %arg, 1076 %arg,
1053 ); 1077 );
1054 1078
1055 $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
1056 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1057 1096
1058 $self 1097 $self
1059} 1098}
1060 1099
… …
1064 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1065 1104
1066 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1067} 1106}
1068 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
1069sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1071 1141
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $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};
1075 1147
1076 1 1148 1
1077} 1149}
1078 1150
1079sub update_slider { 1151sub invoke_button_down {
1080 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1081 1153
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1083} 1155 $self->grab_focus;
1084 1156
1085sub update { 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1086 my ($self) = @_; 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1087 1162
1088 $self->SUPER::update; 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1089 1166
1090 $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
1091} 1192}
1092 1193
1093sub invoke_size_allocate { 1194sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1095 1196
1096 $self->update_slider; 1197 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1199}
1100 1200
1101############################################################################# 1201#############################################################################
1102 1202
… …
1252 1352
1253my @border = 1353my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 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);
1256 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1257sub new { 1361sub new {
1258 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1259 1363
1260 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1534
1431 my $border = $self->border; 1535 my $border = $self->border;
1432 1536
1433 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $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);
1438 1556
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1441 1559
1442 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1473 1591
1474sub new { 1592sub new {
1475 my $class = shift; 1593 my $class = shift;
1476 1594
1477 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1478 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1479 @_, 1599 @_,
1480 ) 1600 )
1481} 1601}
1482 1602
1483sub children { 1603sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485} 1605}
1486 1606
1607# TODO: store row/col info in child widget and use standard add/del
1487sub add { 1608sub add {
1488 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;
1489 1617
1490 while (@_) { 1618 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1492 $child->set_parent ($self); 1621 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1494 } 1623 }
1495 1624
1496 $self->{force_realloc} = 1; 1625 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1; 1626 $self->{force_size_alloc} = 1;
1498 $self->realloc; 1627 $self->realloc;
1499} 1628}
1500 1629
1501sub remove { 1630sub remove {
1502 my ($self, $child) = @_; 1631 my ($self, $child) = @_;
1503 1632
1504 # TODO: not yet implemented 1633 for (@{ $self->{children} }) {
1634 for (@{ $_ || [] }) {
1635 $_ = undef if $_ == $child;
1636 }
1637 }
1505} 1638}
1506 1639
1507# 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?
1508sub clear { 1641sub clear {
1509 my ($self) = @_; 1642 my ($self) = @_;
… …
1558 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1559 1692
1560 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1562 1695
1563 # TODO: nicer code && do row_expand 1696 # TODO: nicer code
1564 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1567 1700
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1702
1572 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
1573 CFPlus::UI::harmonize $hs; 1711 CFPlus::UI::harmonize $hs;
1574 1712
1575 my $y; 1713 my $y;
1576 1714
1577 for my $r (0 .. $#{$self->{children}}) { 1715 for my $r (0 .. $#{$self->{children}}) {
… …
1617 my ($self) = @_; 1755 my ($self) = @_;
1618 1756
1619 for (grep $_, @{$self->{children}}) { 1757 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_; 1758 $_->draw for grep $_, @$_;
1621 } 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
1622} 1842}
1623 1843
1624############################################################################# 1844#############################################################################
1625 1845
1626package CFPlus::UI::Box; 1846package CFPlus::UI::Box;
… …
1966 my $mod = $ev->{mod}; 2186 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2187 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2188 my $uni = $ev->{unicode};
1969 2189
1970 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;
1971 2193
1972 if ($uni == 8) { 2194 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2196 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2197 substr $text, $self->{cursor}, 1, "";
… …
2182 2404
2183use CFPlus::OpenGL; 2405use CFPlus::OpenGL;
2184 2406
2185my @tex = 2407my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
2188 2410
2189sub new { 2411sub new {
2190 my $class = shift; 2412 my $class = shift;
2191 2413
2192 $class->SUPER::new ( 2414 $class->SUPER::new (
2193 padding_x => 4, 2415 padding_x => 4,
2194 padding_y => 4, 2416 padding_y => 4,
2195 fg => [1, 1, 1], 2417 fg => [1.0, 1.0, 1.0],
2196 active_fg => [0, 0, 1], 2418 active_fg => [0.8, 0.8, 0.8],
2197 can_hover => 1, 2419 can_hover => 1,
2198 align => 0, 2420 align => 0,
2199 valign => 0, 2421 valign => 0,
2200 can_events => 1, 2422 can_events => 1,
2201 @_ 2423 @_
… …
2219 2441
2220 glEnable GL_TEXTURE_2D; 2442 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2444 glColor 0, 0, 0, 1;
2223 2445
2446 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2448
2226 glDisable GL_TEXTURE_2D; 2449 glDisable GL_TEXTURE_2D;
2227 2450
2228 $self->SUPER::_draw; 2451 $self->SUPER::_draw;
2229} 2452}
… …
2708sub invoke_mouse_wheel { 2931sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 2932 my ($self, $ev) = @_;
2710 2933
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2934 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 2935
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 2939
2715 ! ! $delta 2940 ! ! $delta
2716} 2941}
2717 2942
2718sub update { 2943sub update {
… …
2828 #font => default_font 3053 #font => default_font
2829 @_, 3054 @_,
2830 3055
2831 layout => (new CFPlus::Layout), 3056 layout => (new CFPlus::Layout),
2832 par => [], 3057 par => [],
3058 max_par => 0,
2833 height => 0, 3059 height => 0,
2834 children => [ 3060 children => [
2835 (new CFPlus::UI::Empty expand => 1), 3061 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 3062 (new CFPlus::UI::Slider vertical => 1),
2837 ], 3063 ],
… …
2960 wrapped => 1, 3186 wrapped => 1,
2961 }; 3187 };
2962 3188
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3189 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 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;
2965 } 3195 }
2966 3196
2967 $self->{need_reflow}++; 3197 $self->{need_reflow}++;
2968 $self->update; 3198 $self->update;
2969} 3199}
… …
3277 3507
3278sub new { 3508sub new {
3279 my $class = shift; 3509 my $class = shift;
3280 3510
3281 my $self = $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3512 size_w => 32,
3513 size_h => 8,
3282 aspect => 1, 3514 aspect => 1,
3283 can_events => 0, 3515 can_events => 0,
3284 @_, 3516 @_,
3285 ); 3517 );
3286 3518
3287 if ($self->{anim} && $self->{animspeed}) { 3519 if ($self->{anim} && $self->{animspeed}) {
3288 CFPlus::weaken (my $widget = $self); 3520 CFPlus::weaken (my $widget = $self);
3289 3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3290 $self->{timer} = Event->timer ( 3524 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3525 parked => 1,
3293 interval => $self->{animspeed},
3294 cb => sub { 3526 cb => sub {
3527 return unless $::CONN && $widget;
3528
3295 ++$widget->{frame}; 3529 ++$widget->{frame};
3530 $widget->update_face;
3296 $widget->update; 3531 $widget->update;
3532
3533 $widget->update_timer;
3297 }, 3534 },
3298 ); 3535 );
3536
3537 $self->update_face;
3538 $self->update_timer;
3299 } 3539 }
3300 3540
3301 $self 3541 $self
3302} 3542}
3303 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
3304sub size_request { 3574sub size_request {
3305 (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)
3306} 3590}
3307 3591
3308sub update { 3592sub update {
3309 my ($self) = @_; 3593 my ($self) = @_;
3310 3594
3311 return unless $self->{visible}; 3595 return unless $self->{visible};
3312 3596
3313 $self->SUPER::update; 3597 $self->SUPER::update;
3314} 3598}
3315 3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
3606}
3607
3316sub _draw { 3608sub _draw {
3317 my ($self) = @_; 3609 my ($self) = @_;
3318 3610
3319 return unless $::CONN; 3611 return unless $::CONN;
3320 3612
3321 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3322 3614
3323 my $face;
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}]; 3615 my $faceid = $::CONN->{faceid}[$self->{face}]
3327 3616 or return;
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331 3617
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3618 my $tex = $::CONN->{texture}[$faceid];
3333 3619
3334 if ($tex) { 3620 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3621 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3623 glColor 0, 0, 0, 1;
… …
3341} 3627}
3342 3628
3343sub destroy { 3629sub destroy {
3344 my ($self) = @_; 3630 my ($self) = @_;
3345 3631
3346 $self->{timer}->cancel 3632 (delete $self->{timer})->cancel
3347 if $self->{timer}; 3633 if $self->{timer};
3348 3634
3349 $self->SUPER::destroy; 3635 $self->SUPER::destroy;
3350} 3636}
3351 3637
… …
3995 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
3996 $_->() 4282 $_->()
3997 for values %{delete $self->{post_alloc_hook}}; 4283 for values %{delete $self->{post_alloc_hook}};
3998 } 4284 }
3999 4285
4000
4001 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4286 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4002 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4003 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
4004 4289
4005 glMatrixMode GL_PROJECTION; 4290 glMatrixMode GL_PROJECTION;

Diff Legend

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