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.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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
… …
954sub size_request { 958sub size_request {
955 my ($self) = @_; 959 my ($self) = @_;
956 960
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 962
959 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
961 965
962 ($w, $h) 966 ($w, $h)
963} 967}
964 968
965sub invoke_size_allocate { 969sub invoke_size_allocate {
… …
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
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1492 $child->set_parent ($self); 1627 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1494 } 1629 }
1495 1630
1496 $self->{force_realloc} = 1; 1631 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1; 1632 $self->{force_size_alloc} = 1;
1498 $self->realloc; 1633 $self->realloc;
1499} 1634}
1500 1635
1501sub remove { 1636sub remove {
1502 my ($self, $child) = @_; 1637 my ($self, $child) = @_;
1503 1638
1504 # TODO: not yet implemented 1639 for (@{ $self->{children} }) {
1640 for (@{ $_ || [] }) {
1641 $_ = undef if $_ == $child;
1642 }
1643 }
1505} 1644}
1506 1645
1507# TODO: move to container class maybe? send children a signal on removal? 1646# TODO: move to container class maybe? send children a signal on removal?
1508sub clear { 1647sub clear {
1509 my ($self) = @_; 1648 my ($self) = @_;
… …
1522sub get_wh { 1661sub get_wh {
1523 my ($self) = @_; 1662 my ($self) = @_;
1524 1663
1525 my (@w, @h); 1664 my (@w, @h);
1526 1665
1527 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1528 my $row = $self->{children}[$y]
1529 or next;
1530 1667
1531 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1532 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1533 or next;
1534 my ($w, $h) = @$widget{qw(req_w req_h)};
1535 1670
1536 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1537 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1538 } 1680 }
1539 } 1681 }
1540 1682
1541 (\@w, \@h) 1683 (\@w, \@h)
1542} 1684}
… …
1558 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1559 1701
1560 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1562 1704
1563 # TODO: nicer code && do row_expand 1705 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1567 1709
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1711
1572 CFPlus::UI::harmonize $ws; 1712 CFPlus::UI::harmonize $ws;
1713
1714 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1;
1717
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719
1573 CFPlus::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1574 1721
1575 my $y; 1722 my (@x, @y);
1576 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1577 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579 or next;
1580 1729
1581 my $x = 0; 1730 $widget->configure (
1582 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1733 );
1584 for my $c (0 .. $#$row) {
1585 my $col_w = $ws->[$c];
1586
1587 if (my $widget = $row->[$c]) {
1588 $widget->configure ($x, $y, $col_w, $row_h);
1589 }
1590
1591 $x += $col_w;
1592 }
1593
1594 $y += $row_h;
1595 } 1734 }
1596 1735
1597 1 1736 1
1598} 1737}
1599 1738
… …
1617 my ($self) = @_; 1756 my ($self) = @_;
1618 1757
1619 for (grep $_, @{$self->{children}}) { 1758 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_; 1759 $_->draw for grep $_, @$_;
1621 } 1760 }
1761}
1762
1763#############################################################################
1764
1765package CFPlus::UI::Fixed;
1766
1767use List::Util qw(min max);
1768
1769our @ISA = CFPlus::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) {
1779 my ($mode, $val, $max) = @_;
1780
1781 $mode eq "abs" ? $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784}
1785
1786sub size_request {
1787 my ($self) = @_;
1788
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790
1791 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1801 }
1802 }
1803
1804 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1;
1806
1807 # now layout remaining widgets
1808 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1810
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1819 }
1820 }
1821
1822 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1;
1824
1825 ($W, $H)
1826}
1827
1828sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_;
1830
1831 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1833
1834 $x = _scale $pos, $x, $W;
1835 $y = _scale $pos, $x, $H;
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838
1839 $child->configure ($x, $y, $w, $h);
1840 }
1841
1842 1
1622} 1843}
1623 1844
1624############################################################################# 1845#############################################################################
1625 1846
1626package CFPlus::UI::Box; 1847package CFPlus::UI::Box;
… …
1967 my $sym = $ev->{sym}; 2188 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2189 my $uni = $ev->{unicode};
1969 2190
1970 my $text = $self->get_text; 2191 my $text = $self->get_text;
1971 2192
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2194
1972 if ($uni == 8) { 2195 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2197 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2198 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2199 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2200 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2201 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2202 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2203 } elsif ($sym == CFPlus::SDLK_HOME) {
2204 # what a hack
1981 $self->{cursor} = 0; 2205 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1
2208 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2209 } elsif ($sym == CFPlus::SDLK_END) {
2210 # uh, again
2211 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2213 ? $self->{cursor} + length $1
2214 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2215 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2216 $text = "";
1986 $self->{cursor} = 0; 2217 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2218 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2219 $self->emit ('escape');
1989 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2220 } elsif ($uni == 0x0d) {
2221 substr $text, $self->{cursor}++, 0, "\012";
2222 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2223 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2224 } else {
1992 return 0; 2225 return 0;
1993 } 2226 }
1994 2227
… …
2172 2405
2173use CFPlus::OpenGL; 2406use CFPlus::OpenGL;
2174 2407
2175my @tex = 2408my @tex =
2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
2178 2411
2179sub new { 2412sub new {
2180 my $class = shift; 2413 my $class = shift;
2181 2414
2182 $class->SUPER::new ( 2415 $class->SUPER::new (
2183 padding_x => 4, 2416 padding_x => 4,
2184 padding_y => 4, 2417 padding_y => 4,
2185 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
2186 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
2187 can_hover => 1, 2420 can_hover => 1,
2188 align => 0, 2421 align => 0,
2189 valign => 0, 2422 valign => 0,
2190 can_events => 1, 2423 can_events => 1,
2191 @_ 2424 @_
… …
2209 2442
2210 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
2211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
2213 2446
2447 my $tex = $tex[$GRAB == $self];
2214 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215 2449
2216 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2217 2451
2218 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2219} 2453}
… …
2698sub invoke_mouse_wheel { 2932sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2700 2934
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702 2936
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704 2940
2705 ! ! $delta 2941 ! ! $delta
2706} 2942}
2707 2943
2708sub update { 2944sub update {
… …
2818 #font => default_font 3054 #font => default_font
2819 @_, 3055 @_,
2820 3056
2821 layout => (new CFPlus::Layout), 3057 layout => (new CFPlus::Layout),
2822 par => [], 3058 par => [],
3059 max_par => 0,
2823 height => 0, 3060 height => 0,
2824 children => [ 3061 children => [
2825 (new CFPlus::UI::Empty expand => 1), 3062 (new CFPlus::UI::Empty expand => 1),
2826 (new CFPlus::UI::Slider vertical => 1), 3063 (new CFPlus::UI::Slider vertical => 1),
2827 ], 3064 ],
… …
2950 wrapped => 1, 3187 wrapped => 1,
2951 }; 3188 };
2952 3189
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3190 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para; 3191 push @{$self->{par}}, $para;
3192 }
3193
3194 if (my $max = $self->{max_par}) {
3195 shift @{$self->{par}} while @{$self->{par}} > $max;
2955 } 3196 }
2956 3197
2957 $self->{need_reflow}++; 3198 $self->{need_reflow}++;
2958 $self->update; 3199 $self->update;
2959} 3200}
… …
3267 3508
3268sub new { 3509sub new {
3269 my $class = shift; 3510 my $class = shift;
3270 3511
3271 my $self = $class->SUPER::new ( 3512 my $self = $class->SUPER::new (
3513 size_w => 32,
3514 size_h => 8,
3272 aspect => 1, 3515 aspect => 1,
3273 can_events => 0, 3516 can_events => 0,
3274 @_, 3517 @_,
3275 ); 3518 );
3276 3519
3277 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
3278 CFPlus::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
3279 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3280 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282 hard => 1, 3526 parked => 1,
3283 interval => $self->{animspeed},
3284 cb => sub { 3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
3285 ++$widget->{frame}; 3530 ++$widget->{frame};
3531 $widget->update_face;
3286 $widget->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
3287 }, 3535 },
3288 ); 3536 );
3537
3538 $self->update_face;
3539 $self->update_timer;
3289 } 3540 }
3290 3541
3291 $self 3542 $self
3292} 3543}
3293 3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3560}
3561
3562sub update_face {
3563 my ($self) = @_;
3564
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
3294sub size_request { 3575sub size_request {
3295 (32, 8) 3576 my ($self) = @_;
3577
3578 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3582 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc;
3585 });
3586 }
3587 }
3588 }
3589
3590 ($self->{size_w} || 8, $self->{size_h} || 8)
3296} 3591}
3297 3592
3298sub update { 3593sub update {
3299 my ($self) = @_; 3594 my ($self) = @_;
3300 3595
3301 return unless $self->{visible}; 3596 return unless $self->{visible};
3302 3597
3303 $self->SUPER::update; 3598 $self->SUPER::update;
3304} 3599}
3305 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
3306sub _draw { 3609sub _draw {
3307 my ($self) = @_; 3610 my ($self) = @_;
3308 3611
3309 return unless $::CONN; 3612 return unless $::CONN;
3310 3613
3311 $self->SUPER::_draw; 3614 $self->SUPER::_draw;
3312 3615
3313 my $face;
3314
3315 if ($self->{frame}) {
3316 my $anim = $::CONN->{anim}[$self->{anim}]; 3616 my $faceid = $::CONN->{faceid}[$self->{face}]
3317 3617 or return;
3318 $face = $anim->[ $self->{frame} % @$anim ]
3319 if $anim && @$anim;
3320 }
3321 3618
3322 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3619 my $tex = $::CONN->{texture}[$faceid];
3323 3620
3324 if ($tex) { 3621 if ($tex) {
3325 glEnable GL_TEXTURE_2D; 3622 glEnable GL_TEXTURE_2D;
3326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327 glColor 0, 0, 0, 1; 3624 glColor 0, 0, 0, 1;
… …
3331} 3628}
3332 3629
3333sub destroy { 3630sub destroy {
3334 my ($self) = @_; 3631 my ($self) = @_;
3335 3632
3336 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
3337 if $self->{timer}; 3634 if $self->{timer};
3338 3635
3339 $self->SUPER::destroy; 3636 $self->SUPER::destroy;
3340} 3637}
3341 3638
… …
3985 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
3986 $_->() 4283 $_->()
3987 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
3988 } 4285 }
3989 4286
3990
3991 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
3994 4290
3995 glMatrixMode GL_PROJECTION; 4291 glMatrixMode GL_PROJECTION;

Diff Legend

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