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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.371 by root, Sun Jul 15 22:07:48 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
…		…
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1065	},
1063	;	1066	;
1064		1067
1065	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1067	can_events => 1,	1071	can_events => 1,
1068	hslider => $hslider,	1072	hslider => $hslider,
1069	vslider => $vslider,	1073	vslider => $vslider,
1070	col_expand => [1, 0],	1074	col_expand => [1, 0],
1071	row_expand => [1, 0],	1075	row_expand => [1, 0],
1072	%arg,	1076	%arg,
1073	);	1077	);
1074		1078
		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
1075	$self->SUPER::add (0, 0, $self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1094
1079	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1080		1096
1081	$self	1097	$self
1082	}	1098	}
…		…
1087	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1088		1104
1089	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1090	}	1106	}
1091		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
1092	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1094		1141
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$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};
1098		1147
1099	1	1148	1
1100	}	1149	}
1101		1150
1102	sub update_slider {	1151	sub invoke_button_down {
1103	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1104		1153
1105	my $child = ($self->{vp} or return)->child;	1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
1106		1156
1107	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1108	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1109	#$self->{hslider}->set_visibility ($w1 != $w2);	1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1110		1162
1111	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1112	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1164	$self->update;
1113	#$self->{vslider}->set_visibility ($h1 != $h2);	1165	};
1114	}
1115		1166
1116	sub update {	1167	return 1;
1117	my ($self) = @_;	1168	}
1118		1169
1119	$self->SUPER::update;	1170	0
1120	$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
1121	}	1192	}
1122		1193
1123	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1125		1196
…		…
1281		1352
1282	my @border =	1353	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284	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);
1285		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
1286	sub new {	1361	sub new {
1287	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1288		1363
1289	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1534
1460	my $border = $self->border;	1535	my $border = $self->border;
1461		1536
1462	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$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);
1467		1556
1468	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1470		1559
1471	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1502		1591
1503	sub new {	1592	sub new {
1504	my $class = shift;	1593	my $class = shift;
1505		1594
1506	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1507	col_expand => [],	1597	col_expand => [],
1508	row_expand => [],	1598	row_expand => [],
1509	@_,	1599	@_,
1510	)	1600	)
1511	}	1601	}
1512		1602
1513	sub children {	1603	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}	1605	}
1516		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1517	sub add {	1608	sub add {
1518	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;
1519		1617
1520	while (@_) {	1618	while (@_) {
1521	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
1522	$child->set_parent ($self);	1627	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
1524	}	1629	}
1525		1630
1526	$self->{force_realloc} = 1;	1631	$self->{force_realloc} = 1;
1527	$self->{force_size_alloc} = 1;	1632	$self->{force_size_alloc} = 1;
1528	$self->realloc;	1633	$self->realloc;
1529	}	1634	}
1530		1635
1531	sub remove {	1636	sub remove {
1532	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1533		1638
1534	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ \|\| [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1535	}	1644	}
1536		1645
1537	# 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?
1538	sub clear {	1647	sub clear {
1539	my ($self) = @_;	1648	my ($self) = @_;
…		…
1552	sub get_wh {	1661	sub get_wh {
1553	my ($self) = @_;	1662	my ($self) = @_;
1554		1663
1555	my (@w, @h);	1664	my (@w, @h);
1556		1665
1557	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1558	my $row = $self->{children}[$y]
1559	or next;
1560		1667
1561	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1562	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1563	or next;
1564	my ($w, $h) = @$widget{qw(req_w req_h)};
1565		1670
1566	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1567	$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];
1568	}	1680	}
1569	}	1681	}
1570		1682
1571	(\@w, \@h)	1683	(\@w, \@h)
1572	}	1684	}
…		…
1588	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1589		1701
1590	my $req_w = (sum @$ws) \|\| 1;	1702	my $req_w = (sum @$ws) \|\| 1;
1591	my $req_h = (sum @$hs) \|\| 1;	1703	my $req_h = (sum @$hs) \|\| 1;
1592		1704
1593	# TODO: nicer code	1705	# now linearly scale the rows/columns to the allocated size
1594	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1595	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1596	my $col_expand = (sum @col_expand) \|\| 1;	1708	my $col_expand = (sum @col_expand) \|\| 1;
1597		1709
1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1605		1717
1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607		1719
1608	CFPlus::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1609		1721
1610	my $y;	1722	my (@x, @y);
1611		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1612	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1613	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1614	or next;
1615		1729
1616	my $x = 0;	1730	$widget->configure (
1617	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618		1733	);
1619	for my $c (0 .. $#$row) {
1620	my $col_w = $ws->[$c];
1621
1622	if (my $widget = $row->[$c]) {
1623	$widget->configure ($x, $y, $col_w, $row_h);
1624	}
1625
1626	$x += $col_w;
1627	}
1628
1629	$y += $row_h;
1630	}	1734	}
1631		1735
1632	1	1736	1
1633	}	1737	}
1634		1738
…		…
1652	my ($self) = @_;	1756	my ($self) = @_;
1653		1757
1654	for (grep $_, @{$self->{children}}) {	1758	for (grep $_, @{$self->{children}}) {
1655	$_->draw for grep $_, @$_;	1759	$_->draw for grep $_, @$_;
1656	}	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
1657	}	1843	}
1658		1844
1659	#############################################################################	1845	#############################################################################
1660		1846
1661	package CFPlus::UI::Box;	1847	package CFPlus::UI::Box;
…		…
2219		2405
2220	use CFPlus::OpenGL;	2406	use CFPlus::OpenGL;
2221		2407
2222	my @tex =	2408	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
2225		2411
2226	sub new {	2412	sub new {
2227	my $class = shift;	2413	my $class = shift;
2228		2414
2229	$class->SUPER::new (	2415	$class->SUPER::new (
2230	padding_x => 4,	2416	padding_x => 4,
2231	padding_y => 4,	2417	padding_y => 4,
2232	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
2233	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
2234	can_hover => 1,	2420	can_hover => 1,
2235	align => 0,	2421	align => 0,
2236	valign => 0,	2422	valign => 0,
2237	can_events => 1,	2423	can_events => 1,
2238	@_	2424	@_
…		…
2256		2442
2257	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
2260		2446
		2447	my $tex = $tex[$GRAB == $self];
2261	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262		2449
2263	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
2264		2451
2265	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
2266	}	2453	}
…		…
3321		3508
3322	sub new {	3509	sub new {
3323	my $class = shift;	3510	my $class = shift;
3324		3511
3325	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
3326	aspect => 1,	3515	aspect => 1,
3327	can_events => 0,	3516	can_events => 0,
3328	@_,	3517	@_,
3329	);	3518	);
3330		3519
3331	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
3333		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336	hard => 1,	3526	parked => 1,
3337	interval => $self->{animspeed},
3338	cb => sub {	3527	cb => sub {
3339	delete $self->{wait_face};	3528	return unless $::CONN && $widget;
		3529
3340	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
3341	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
3342	},	3535	},
3343	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
3344	}	3540	}
3345		3541
3346	$self	3542	$self
3347	}	3543	}
3348		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	}
		3560	}
		3561
		3562	sub 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
3349	sub size_request {	3575	sub size_request {
3350	(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)
3351	}	3591	}
3352		3592
3353	sub update {	3593	sub update {
3354	my ($self) = @_;	3594	my ($self) = @_;
3355		3595
3356	return unless $self->{visible};	3596	return unless $self->{visible};
3357		3597
3358	$self->SUPER::update;	3598	$self->SUPER::update;
3359	}	3599	}
3360		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
3361	sub _draw {	3609	sub _draw {
3362	my ($self) = @_;	3610	my ($self) = @_;
3363		3611
3364	return unless $::CONN;	3612	return unless $::CONN;
3365		3613
3366	$self->SUPER::_draw;	3614	$self->SUPER::_draw;
3367		3615
3368	my $face;
3369
3370	if ($self->{frame}) {
3371	my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373	$face = $anim->[ $self->{frame} % @$anim ]
3374	if $anim && @$anim;
3375	}
3376
3377	my $faceid = $::CONN->{faceid}[$face \|\| $self->{face}]	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
3378	or return;	3617	or return;
3379		3618
3380	my $tex = $::CONN->{texture}[$faceid];	3619	my $tex = $::CONN->{texture}[$faceid];
3381		3620
3382	if ($tex) {	3621	if ($tex) {
3383	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385	glColor 0, 0, 0, 1;	3624	glColor 0, 0, 0, 1;
3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3625	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387	glDisable GL_TEXTURE_2D;	3626	glDisable GL_TEXTURE_2D;
3388	} else {
3389	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
3390	$self->update;
3391	});
3392	}	3627	}
3393	}	3628	}
3394		3629
3395	sub destroy {	3630	sub destroy {
3396	my ($self) = @_;	3631	my ($self) = @_;
3397		3632
3398	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3399	if $self->{timer};	3634	if $self->{timer};
3400		3635
3401	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3402	}	3637	}
3403		3638
…		…
4047	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
4048	$_->()	4283	$_->()
4049	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
4050	}	4285	}
4051		4286
4052
4053	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
4056		4290
4057	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.371 by root, Sun Jul 15 22:07:48 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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC