[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

…		…
113	}	113	}
114		114
115	if ($GRAB) {	115	if ($GRAB) {
116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
117	# mousewheel	117	# mousewheel
118	$ev->{dx} = 0;
119	$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
120	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
121	} else {	125	} else {
122	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
123	}	127	}
124	}	128	}
…		…
547		551
548	# parent	552	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	554	}
551		555
552	sub find_widget {	556	#sub find_widget {
553	my ($self, $x, $y) = @_;	557	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		558
564	sub set_parent {	559	sub set_parent {
565	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
566		561
567	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
944		939
945	#############################################################################	940	#############################################################################
946		941
947	package CFPlus::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
948		943
		944	use List::Util qw(min max);
		945
949	our @ISA = CFPlus::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
950		947
951	sub new {	948	sub new {
952	my $class = shift;	949	my $class = shift;
953		950
…		…
961	sub size_request {	958	sub size_request {
962	my ($self) = @_;	959	my ($self) = @_;
963		960
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		962
966	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
968		965
969	($w, $h)	966	($w, $h)
970	}	967	}
971		968
972	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
984	}	981	}
985		982
986	sub set_offset {	983	sub set_offset {
987	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
988		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}) {
989	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
991		992
		993	$self->emit (changed => $x, $y);
992	$self->update;	994	$self->update;
		995	}
993	}	996	}
994		997
995	# 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
996	sub coord2local {	999	sub coord2local {
997	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
1013		1016
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1019	) {
1017	$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})
1018	} else {	1021	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1023	}
1021	}	1024	}
1022		1025
…		…
1072	row_expand => [1, 0],	1075	row_expand => [1, 0],
1073	%arg,	1076	%arg,
1074	);	1077	);
1075		1078
1076	$self->{vp} = new CFPlus::UI::ViewPort	1079	$self->{vp} = new CFPlus::UI::ViewPort
1077	expand => 1,	1080	expand => 1,
1078	scroll_x => $self->{scroll_x},	1081	scroll_x => $self->{scroll_x},
1079	scroll_y => $self->{scroll_y},	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	},
1080	;	1091	;
1081		1092
1082	$self->SUPER::add (0, 0, $self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
1083	$self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084	$self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085		1094
1086	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1087		1096
1088	$self	1097	$self
1089	}	1098	}
…		…
1094	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1095		1104
1096	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1097	}	1106	}
1098		1107
		1108	sub 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
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1099	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1100	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1101		1141
1102	return 0 unless $ev->{dy}; # only vertical movements
1103
1104	$self->{vslider}->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};
1105		1147
1106	1	1148	1
1107	}	1149	}
1108		1150
1109	sub update_slider {	1151	sub invoke_button_down {
1110	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1111		1153
1112	my $child = ($self->{vp} or return)->child;	1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
1113		1156
1114	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1115	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1116	#$self->{hslider}->set_visibility ($w1 != $w2);	1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1117		1162
1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1164	$self->update;
1120	#$self->{vslider}->set_visibility ($h1 != $h2);	1165	};
1121	}
1122		1166
1123	sub update {	1167	return 1;
1124	my ($self) = @_;	1168	}
1125		1169
1126	$self->SUPER::update;	1170	0
1127	$self->update_slider;	1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub 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
1128	}	1192	}
1129		1193
1130	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1131	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1132		1196
…		…
1288		1352
1289	my @border =	1353	my @border =
1290	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291	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);
1292		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
1293	sub new {	1361	sub new {
1294	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1295		1363
1296	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1297	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
…		…
1465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466		1534
1467	my $border = $self->border;	1535	my $border = $self->border;
1468		1536
1469	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1470	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473	$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);
1474		1556
1475	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1476	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1477		1559
1478	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1509		1591
1510	sub new {	1592	sub new {
1511	my $class = shift;	1593	my $class = shift;
1512		1594
1513	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1514	col_expand => [],	1597	col_expand => [],
1515	row_expand => [],	1598	row_expand => [],
1516	@_,	1599	@_,
1517	)	1600	)
1518	}	1601	}
1519		1602
1520	sub children {	1603	sub children {
1521	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522	}	1605	}
1523		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1524	sub add {	1608	sub add {
1525	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
		1615	sub add_at {
		1616	my $self = shift;
1526		1617
1527	while (@_) {	1618	while (@_) {
1528	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
1529	$child->set_parent ($self);	1627	$child->set_parent ($self);
1530	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
1531	}	1629	}
1532		1630
1533	$self->{force_realloc} = 1;	1631	$self->{force_realloc} = 1;
1534	$self->{force_size_alloc} = 1;	1632	$self->{force_size_alloc} = 1;
1535	$self->realloc;	1633	$self->realloc;
1536	}	1634	}
1537		1635
1538	sub remove {	1636	sub remove {
1539	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1540		1638
1541	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ \|\| [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1542	}	1644	}
1543		1645
1544	# 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?
1545	sub clear {	1647	sub clear {
1546	my ($self) = @_;	1648	my ($self) = @_;
…		…
1559	sub get_wh {	1661	sub get_wh {
1560	my ($self) = @_;	1662	my ($self) = @_;
1561		1663
1562	my (@w, @h);	1664	my (@w, @h);
1563		1665
1564	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1565	my $row = $self->{children}[$y]
1566	or next;
1567		1667
1568	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1569	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1570	or next;
1571	my ($w, $h) = @$widget{qw(req_w req_h)};
1572		1670
1573	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1574	$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];
1575	}	1680	}
1576	}	1681	}
1577		1682
1578	(\@w, \@h)	1683	(\@w, \@h)
1579	}	1684	}
…		…
1595	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1596		1701
1597	my $req_w = (sum @$ws) \|\| 1;	1702	my $req_w = (sum @$ws) \|\| 1;
1598	my $req_h = (sum @$hs) \|\| 1;	1703	my $req_h = (sum @$hs) \|\| 1;
1599		1704
1600	# TODO: nicer code	1705	# now linearly scale the rows/columns to the allocated size
1601	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1602	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1603	my $col_expand = (sum @col_expand) \|\| 1;	1708	my $col_expand = (sum @col_expand) \|\| 1;
1604		1709
1605	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1612		1717
1613	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614		1719
1615	CFPlus::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1616		1721
1617	my $y;	1722	my (@x, @y);
1618		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1619	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1620	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1621	or next;
1622		1729
1623	my $x = 0;	1730	$widget->configure (
1624	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1625		1733	);
1626	for my $c (0 .. $#$row) {
1627	my $col_w = $ws->[$c];
1628
1629	if (my $widget = $row->[$c]) {
1630	$widget->configure ($x, $y, $col_w, $row_h);
1631	}
1632
1633	$x += $col_w;
1634	}
1635
1636	$y += $row_h;
1637	}	1734	}
1638		1735
1639	1	1736	1
1640	}	1737	}
1641		1738
…		…
1659	my ($self) = @_;	1756	my ($self) = @_;
1660		1757
1661	for (grep $_, @{$self->{children}}) {	1758	for (grep $_, @{$self->{children}}) {
1662	$_->draw for grep $_, @$_;	1759	$_->draw for grep $_, @$_;
1663	}	1760	}
		1761	}
		1762
		1763	#############################################################################
		1764
		1765	package CFPlus::UI::Fixed;
		1766
		1767	use List::Util qw(min max);
		1768
		1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub 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
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub 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
		1828	sub 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
1664	}	1843	}
1665		1844
1666	#############################################################################	1845	#############################################################################
1667		1846
1668	package CFPlus::UI::Box;	1847	package CFPlus::UI::Box;
…		…
2226		2405
2227	use CFPlus::OpenGL;	2406	use CFPlus::OpenGL;
2228		2407
2229	my @tex =	2408	my @tex =
2230	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
2232		2411
2233	sub new {	2412	sub new {
2234	my $class = shift;	2413	my $class = shift;
2235		2414
2236	$class->SUPER::new (	2415	$class->SUPER::new (
2237	padding_x => 4,	2416	padding_x => 4,
2238	padding_y => 4,	2417	padding_y => 4,
2239	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
2240	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
2241	can_hover => 1,	2420	can_hover => 1,
2242	align => 0,	2421	align => 0,
2243	valign => 0,	2422	valign => 0,
2244	can_events => 1,	2423	can_events => 1,
2245	@_	2424	@_
…		…
2263		2442
2264	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
2265	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
2267		2446
		2447	my $tex = $tex[$GRAB == $self];
2268	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2269		2449
2270	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
2271		2451
2272	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
2273	}	2453	}
…		…
3338	);	3518	);
3339		3519
3340	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
3341	CFPlus::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
3342		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3343	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
3344	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3345	hard => 1,	3526	parked => 1,
3346	interval => $self->{animspeed},
3347	cb => sub {	3527	cb => sub {
3348	return unless $::CONN;	3528	return unless $::CONN && $widget;
3349		3529
3350	++$widget->{frame};	3530	++$widget->{frame};
3351	$self->update_face;	3531	$widget->update_face;
3352	$self->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
3353	},	3535	},
3354	);	3536	);
3355		3537
3356	$self->update_face;	3538	$self->update_face;
		3539	$self->update_timer;
3357	}	3540	}
3358		3541
3359	$self	3542	$self
		3543	}
		3544
		3545	sub 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	}
3360	}	3560	}
3361		3561
3362	sub update_face {	3562	sub update_face {
3363	my ($self) = @_;	3563	my ($self) = @_;
3364		3564
…		…
3396	return unless $self->{visible};	3596	return unless $self->{visible};
3397		3597
3398	$self->SUPER::update;	3598	$self->SUPER::update;
3399	}	3599	}
3400		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
3401	sub _draw {	3609	sub _draw {
3402	my ($self) = @_;	3610	my ($self) = @_;
3403		3611
3404	return unless $::CONN;	3612	return unless $::CONN;
3405		3613
…		…
3420	}	3628	}
3421		3629
3422	sub destroy {	3630	sub destroy {
3423	my ($self) = @_;	3631	my ($self) = @_;
3424		3632
3425	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3426	if $self->{timer};	3634	if $self->{timer};
3427		3635
3428	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3429	}	3637	}
3430		3638
…		…
4074	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
4075	$_->()	4283	$_->()
4076	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
4077	}	4285	}
4078		4286
4079
4080	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4081	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4082	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
4083		4290
4084	glMatrixMode GL_PROJECTION;	4291	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs. Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC