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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 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);
…		…
746	can_events => 0,	741	can_events => 0,
747	%arg,	742	%arg,
748	);	743	);
749		744
750	$self->add (@$children)	745	$self->add (@$children)
751	if $children;	746	if $children && @$children;
752		747
753	$self	748	$self
754	}	749	}
755		750
756	sub realloc {	751	sub realloc {
…		…
765	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
766		761
767	$_->set_parent ($self)	762	$_->set_parent ($self)
768	for @widgets;	763	for @widgets;
769		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	766	use sort 'stable';
771		767
772	$self->{children} = [	768	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
943	}	939	}
944		940
945	#############################################################################	941	#############################################################################
946		942
947	package CFPlus::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
		944
		945	use List::Util qw(min max);
948		946
949	our @ISA = CFPlus::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
950		948
951	sub new {	949	sub new {
952	my $class = shift;	950	my $class = shift;
…		…
961	sub size_request {	959	sub size_request {
962	my ($self) = @_;	960	my ($self) = @_;
963		961
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		963
966	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
968		966
969	($w, $h)	967	($w, $h)
970	}	968	}
971		969
972	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
984	}	982	}
985		983
986	sub set_offset {	984	sub set_offset {
987	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
988		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
991		993
		994	$self->emit (changed => $x, $y);
992	$self->update;	995	$self->update;
		996	}
993	}	997	}
994		998
995	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	1000	sub coord2local {
997	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
1013		1017
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1020	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	1022	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1024	}
1021	}	1025	}
1022		1026
…		…
1043	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
1044		1048
1045	my $self;	1049	my $self;
1046		1050
1047	my $hslider = new CFPlus::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
1048	vertical => 0,	1054	vertical => 0,
1049	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1056	on_changed => sub {
1051	$self->{hpos} = $_[1];	1057	$self->{hpos} = $_[1];
1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053	},	1059	},
1054	;	1060	;
1055		1061
1056	my $vslider = new CFPlus::UI::Slider	1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
1057	vertical => 1,	1065	vertical => 1,
1058	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1059	on_changed => sub {	1067	on_changed => sub {
1060	$self->{vpos} = $_[1];	1068	$self->{vpos} = $_[1];
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1070	},
1063	;	1071	;
1064		1072
1065	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1067	can_events => 1,	1076	can_events => 1,
1068	hslider => $hslider,	1077	hslider => $hslider,
1069	vslider => $vslider,	1078	vslider => $vslider,
1070	col_expand => [1, 0],	1079	col_expand => [1, 0],
1071	row_expand => [1, 0],	1080	row_expand => [1, 0],
1072	%arg,	1081	%arg,
1073	);	1082	);
1074		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
1075	$self->SUPER::add (0, 0, $self->{vp});	1100	$self->SUPER::add ($self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1101
1079	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
1080		1103
1081	$self	1104	$self
1082	}	1105	}
1083		1106
1084	#TODO# update range on size_allocate depending on child	1107	#TODO# update range on size_allocate depending on child?
1085		1108
1086	sub add {	1109	sub add {
1087	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
1088		1111
1089	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
1090	}	1113	}
1091		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider}{visible}) {
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
		1139	sub update {
		1140	my ($self) = @_;
		1141
		1142	$self->update_slider;
		1143	$self->SUPER::update;
		1144	}
		1145
1092	sub invoke_mouse_wheel {	1146	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1147	my ($self, $ev) = @_;
1094		1148
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
1098		1154
1099	1	1155	1
1100	}	1156	}
1101		1157
1102	sub update_slider {	1158	sub invoke_button_down {
1103	my ($self) = @_;	1159	my ($self, $ev, $x, $y) = @_;
1104		1160
1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});	1161	if ($ev->{button} == 2) {
1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1162	$self->grab_focus;
1107	#$self->{hslider}->set_visibility ($w1 != $w2);
1108		1163
1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});	1164	my $ox = $self->{vp}{view_x} + $ev->{x};
1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1165	my $oy = $self->{vp}{view_y} + $ev->{y};
1111	#$self->{vslider}->set_visibility ($h1 != $h2);	1166
1112	}	1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
1113		1169
1114	sub update {	1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1115	my ($self) = @_;	1171	$self->update;
		1172	};
1116		1173
1117	$self->SUPER::update;	1174	return 1;
1118	$self->update_slider;	1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
1119	}	1199	}
1120		1200
1121	sub invoke_size_allocate {	1201	sub invoke_size_allocate {
1122	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1123		1203
…		…
1279		1359
1280	my @border =	1360	my @border =
1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1283		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
		1367
1284	sub new {	1368	sub new {
1285	my ($class, %arg) = @_;	1369	my ($class, %arg) = @_;
1286		1370
1287	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
1288	bg => [1, 1, 1, 1],	1372	bg => [1, 1, 1, 1],
…		…
1456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457		1541
1458	my $border = $self->border;	1542	my $border = $self->border;
1459		1543
1460	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1461	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1465		1563
1466	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1467	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1468		1566
1469	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1490		1588
1491	#############################################################################	1589	#############################################################################
1492		1590
1493	package CFPlus::UI::Table;	1591	package CFPlus::UI::Table;
1494		1592
1495	our @ISA = CFPlus::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1496		1594
1497	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1498		1596
1499	use CFPlus::OpenGL;	1597	use CFPlus::OpenGL;
1500		1598
…		…
1506	row_expand => [],	1604	row_expand => [],
1507	@_,	1605	@_,
1508	)	1606	)
1509	}	1607	}
1510		1608
1511	sub children {
1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513	}
1514
1515	sub add {	1609	sub add {
		1610	my ($self, @widgets) = @_;
		1611
		1612	for my $child (@widgets) {
		1613	$child->{rowspan} \|\|= 1;
		1614	$child->{colspan} \|\|= 1;
		1615	}
		1616
		1617	$self->SUPER::add (@widgets);
		1618	}
		1619
		1620	sub add_at {
1516	my ($self) = shift;	1621	my $self = shift;
		1622
		1623	my @widgets;
1517		1624
1518	while (@_) {	1625	while (@_) {
1519	my ($x, $y, $child) = splice @_, 0, 3, ();	1626	my ($col, $row, $child) = splice @_, 0, 3, ();
1520	$child->set_parent ($self);
1521	$self->{children}[$y][$x] = $child;
1522	}
1523		1627
1524	$self->{force_realloc} = 1;	1628	$child->{row} = $row;
1525	$self->{force_size_alloc} = 1;	1629	$child->{col} = $col;
1526	$self->realloc;
1527	}
1528		1630
1529	sub remove {	1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
1530	my ($self, $child) = @_;	1638	my ($self) = @_;
1531		1639
1532	# TODO: not yet implemented	1640	my (@w, @h);
1533	}
1534
1535	# TODO: move to container class maybe? send children a signal on removal?
1536	sub clear {
1537	my ($self) = @_;
1538		1641
1539	my @children = $self->children;	1642	my @children = $self->children;
1540	delete $self->{children};	1643
		1644	# first pass, columns
		1645	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1646	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1647
		1648	my $sw = sum @w[$c .. $c + $cs - 1];
		1649
		1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1541		1653	}
1542	for (@children) {
1543	delete $_->{parent};
1544	$_->hide;
1545	}
1546		1654
1547	$self->realloc;	1655	# second pass, rows
1548	}	1656	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1549
1550	sub get_wh {
1551	my ($self) = @_;
1552
1553	my (@w, @h);
1554
1555	for my $y (0 .. $#{$self->{children}}) {
1556	my $row = $self->{children}[$y]
1557	or next;
1558
1559	for my $x (0 .. $#$row) {
1560	my $widget = $row->[$x]
1561	or next;
1562	my ($w, $h) = @$widget{qw(req_w req_h)};	1657	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1563		1658
1564	$w[$x] = max $w[$x], $w;	1659	my $sh = sum @h[$r .. $r + $rs - 1];
1565	$h[$y] = max $h[$y], $h;	1660
		1661	if ($h > $sh) {
		1662	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1566	}	1663	}
1567	}	1664	}
1568		1665
1569	(\@w, \@h)	1666	(\@w, \@h)
1570	}	1667	}
…		…
1586	my ($ws, $hs) = $self->get_wh;	1683	my ($ws, $hs) = $self->get_wh;
1587		1684
1588	my $req_w = (sum @$ws) \|\| 1;	1685	my $req_w = (sum @$ws) \|\| 1;
1589	my $req_h = (sum @$hs) \|\| 1;	1686	my $req_h = (sum @$hs) \|\| 1;
1590		1687
1591	# TODO: nicer code	1688	# now linearly scale the rows/columns to the allocated size
1592	my @col_expand = @{$self->{col_expand}};	1689	my @col_expand = @{$self->{col_expand}};
1593	@col_expand = (1) x @$ws unless @col_expand;	1690	@col_expand = (1) x @$ws unless @col_expand;
1594	my $col_expand = (sum @col_expand) \|\| 1;	1691	my $col_expand = (sum @col_expand) \|\| 1;
1595		1692
1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1693	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1603		1700
1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1701	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605		1702
1606	CFPlus::UI::harmonize $hs;	1703	CFPlus::UI::harmonize $hs;
1607		1704
1608	my $y;	1705	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1706	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1609		1707
1610	for my $r (0 .. $#{$self->{children}}) {	1708	for my $widget ($self->children) {
1611	my $row = $self->{children}[$r]	1709	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1612	or next;
1613		1710
1614	my $x = 0;	1711	$widget->configure (
1615	my $row_h = $hs->[$r];	1712	$x[$c], $y[$r],
		1713	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1616		1714	);
1617	for my $c (0 .. $#$row) {	1715	}
1618	my $col_w = $ws->[$c];
1619		1716
1620	if (my $widget = $row->[$c]) {	1717	1
1621	$widget->configure ($x, $y, $col_w, $row_h);	1718	}
1622	}
1623		1719
1624	$x += $col_w;	1720	#############################################################################
		1721
		1722	package CFPlus::UI::Fixed;
		1723
		1724	use List::Util qw(min max);
		1725
		1726	our @ISA = CFPlus::UI::Container::;
		1727
		1728	sub add {
		1729	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1730
		1731	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1732	$self->SUPER::add ($child);
		1733	}
		1734
		1735	sub _scale($$$) {
		1736	my ($mode, $val, $max) = @_;
		1737
		1738	$mode eq "abs" ? $val
		1739	: $mode eq "rel" ? $val * $max
		1740	: 0
		1741	}
		1742
		1743	sub size_request {
		1744	my ($self) = @_;
		1745
		1746	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1747
		1748	# determine overall size by querying abs widgets
		1749	for my $child ($self->visible_children) {
		1750	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1751
		1752	if ($pos eq "abs") {
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1757	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1625	}	1758	}
		1759	}
1626		1760
1627	$y += $row_h;	1761	my $W = $x2 - $x1;
		1762	my $H = $y2 - $y1;
		1763
		1764	# now layout remaining widgets
		1765	for my $child ($self->visible_children) {
		1766	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1767
		1768	if ($pos ne "abs") {
		1769	$x = _scale $pos, $x, $W;
		1770	$y = _scale $pos, $x, $H;
		1771	$w = _scale $size, $w, $child->{req_w};
		1772	$h = _scale $size, $h, $child->{req_h};
		1773
		1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1776	}
		1777	}
		1778
		1779	my $W = $x2 - $x1;
		1780	my $H = $y2 - $y1;
		1781
		1782	($W, $H)
		1783	}
		1784
		1785	sub invoke_size_allocate {
		1786	my ($self, $W, $H) = @_;
		1787
		1788	for my $child ($self->visible_children) {
		1789	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1790
		1791	$x = _scale $pos, $x, $W;
		1792	$y = _scale $pos, $x, $H;
		1793	$w = _scale $size, $w, $child->{req_w};
		1794	$h = _scale $size, $h, $child->{req_h};
		1795
		1796	$child->configure ($x, $y, $w, $h);
1628	}	1797	}
1629		1798
1630	1	1799	1
1631	}
1632
1633	sub find_widget {
1634	my ($self, $x, $y) = @_;
1635
1636	$x -= $self->{x};
1637	$y -= $self->{y};
1638
1639	my $res;
1640
1641	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1642	$res = $_->find_widget ($x, $y)
1643	and return $res;
1644	}
1645
1646	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1647	}
1648
1649	sub _draw {
1650	my ($self) = @_;
1651
1652	for (grep $_, @{$self->{children}}) {
1653	$_->draw for grep $_, @$_;
1654	}
1655	}	1800	}
1656		1801
1657	#############################################################################	1802	#############################################################################
1658		1803
1659	package CFPlus::UI::Box;	1804	package CFPlus::UI::Box;
…		…
2217		2362
2218	use CFPlus::OpenGL;	2363	use CFPlus::OpenGL;
2219		2364
2220	my @tex =	2365	my @tex =
2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw(b1_button_active.png);	2367	qw(b1_button_inactive.png b1_button_active.png);
2223		2368
2224	sub new {	2369	sub new {
2225	my $class = shift;	2370	my $class = shift;
2226		2371
2227	$class->SUPER::new (	2372	$class->SUPER::new (
2228	padding_x => 4,	2373	padding_x => 4,
2229	padding_y => 4,	2374	padding_y => 4,
2230	fg => [1, 1, 1],	2375	fg => [1.0, 1.0, 1.0],
2231	active_fg => [0, 0, 1],	2376	active_fg => [0.8, 0.8, 0.8],
2232	can_hover => 1,	2377	can_hover => 1,
2233	align => 0,	2378	align => 0,
2234	valign => 0,	2379	valign => 0,
2235	can_events => 1,	2380	can_events => 1,
2236	@_	2381	@_
…		…
2254		2399
2255	glEnable GL_TEXTURE_2D;	2400	glEnable GL_TEXTURE_2D;
2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257	glColor 0, 0, 0, 1;	2402	glColor 0, 0, 0, 1;
2258		2403
		2404	my $tex = $tex[$GRAB == $self];
2259	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2405	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2260		2406
2261	glDisable GL_TEXTURE_2D;	2407	glDisable GL_TEXTURE_2D;
2262		2408
2263	$self->SUPER::_draw;	2409	$self->SUPER::_draw;
2264	}	2410	}
…		…
3319		3465
3320	sub new {	3466	sub new {
3321	my $class = shift;	3467	my $class = shift;
3322		3468
3323	my $self = $class->SUPER::new (	3469	my $self = $class->SUPER::new (
		3470	size_w => 32,
		3471	size_h => 8,
3324	aspect => 1,	3472	aspect => 1,
3325	can_events => 0,	3473	can_events => 0,
3326	@_,	3474	@_,
3327	);	3475	);
3328		3476
3329	if ($self->{anim} && $self->{animspeed}) {	3477	if ($self->{anim} && $self->{animspeed}) {
3330	CFPlus::weaken (my $widget = $self);	3478	CFPlus::weaken (my $widget = $self);
3331		3479
		3480	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3481	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3332	$self->{timer} = Event->timer (	3482	$self->{timer} = Event->timer (
3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334	hard => 1,	3483	parked => 1,
3335	interval => $self->{animspeed},
3336	cb => sub {	3484	cb => sub {
		3485	return unless $::CONN && $widget;
		3486
3337	++$widget->{frame};	3487	++$widget->{frame};
		3488	$widget->update_face;
3338	$widget->update;	3489	$widget->update;
		3490
		3491	$widget->update_timer;
3339	},	3492	},
3340	);	3493	);
		3494
		3495	$self->update_face;
		3496	$self->update_timer;
3341	}	3497	}
3342		3498
3343	$self	3499	$self
3344	}	3500	}
3345		3501
		3502	sub update_timer {
		3503	my ($self) = @_;
		3504
		3505	return unless $self->{timer};
		3506
		3507	if ($self->{visible}) {
		3508	$self->{timer}->at (
		3509	$self->{anim_start}
		3510	+ $self->{animspeed}
		3511	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3512	);
		3513	$self->{timer}->start;
		3514	} else {
		3515	$self->{timer}->stop;
		3516	}
		3517	}
		3518
		3519	sub update_face {
		3520	my ($self) = @_;
		3521
		3522	return unless $::CONN;
		3523
		3524	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3525	if ($anim && @$anim) {
		3526	delete $self->{wait_face};
		3527	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3528	}
		3529	}
		3530	}
		3531
3346	sub size_request {	3532	sub size_request {
3347	(32, 8)	3533	my ($self) = @_;
		3534
		3535	if ($::CONN) {
		3536	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3537	if (my $tex = $::CONN->{texture}[$faceid]) {
		3538	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3539	} else {
		3540	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3541	$self->realloc;
		3542	});
		3543	}
		3544	}
		3545	}
		3546
		3547	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3348	}	3548	}
3349		3549
3350	sub update {	3550	sub update {
3351	my ($self) = @_;	3551	my ($self) = @_;
3352		3552
3353	return unless $self->{visible};	3553	return unless $self->{visible};
3354		3554
3355	$self->SUPER::update;	3555	$self->SUPER::update;
3356	}	3556	}
3357		3557
		3558	sub invoke_visibility_change {
		3559	my ($self) = @_;
		3560
		3561	$self->update_timer;
		3562
		3563	0
		3564	}
		3565
3358	sub _draw {	3566	sub _draw {
3359	my ($self) = @_;	3567	my ($self) = @_;
3360		3568
3361	return unless $::CONN;	3569	return unless $::CONN;
3362		3570
3363	$self->SUPER::_draw;	3571	$self->SUPER::_draw;
3364		3572
3365	my $face;
3366
3367	if ($self->{frame}) {
3368	my $anim = $::CONN->{anim}[$self->{anim}];	3573	my $faceid = $::CONN->{faceid}[$self->{face}]
3369		3574	or return;
3370	$face = $anim->[ $self->{frame} % @$anim ]
3371	if $anim && @$anim;
3372	}
3373		3575
3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	3576	my $tex = $::CONN->{texture}[$faceid];
3375		3577
3376	if ($tex) {	3578	if ($tex) {
3377	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
…		…
3383	}	3585	}
3384		3586
3385	sub destroy {	3587	sub destroy {
3386	my ($self) = @_;	3588	my ($self) = @_;
3387		3589
3388	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
3389	if $self->{timer};	3591	if $self->{timer};
3390		3592
3391	$self->SUPER::destroy;	3593	$self->SUPER::destroy;
3392	}	3594	}
3393		3595
…		…
4037	while ($self->{post_alloc_hook}) {	4239	while ($self->{post_alloc_hook}) {
4038	$_->()	4240	$_->()
4039	for values %{delete $self->{post_alloc_hook}};	4241	for values %{delete $self->{post_alloc_hook}};
4040	}	4242	}
4041		4243
4042
4043	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4244	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4245	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045	glClear GL_COLOR_BUFFER_BIT;	4246	glClear GL_COLOR_BUFFER_BIT;
4046		4247
4047	glMatrixMode GL_PROJECTION;	4248	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs. Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC