[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.403 by root, Sat Jul 21 21:25:23 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);
…		…
651	my ($self) = @_;	646	my ($self) = @_;
652		647
653	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
654	}	649	}
655		650
656	my $cntx;#d#
657	sub DESTROY {	651	sub DESTROY {
658	my ($self) = @_;	652	my ($self) = @_;
659		653
660	return if CFPlus::in_destruct;	654	return if CFPlus::in_destruct;
661		655
…		…
746	can_events => 0,	740	can_events => 0,
747	%arg,	741	%arg,
748	);	742	);
749		743
750	$self->add (@$children)	744	$self->add (@$children)
751	if $children;	745	if $children && @$children;
752		746
753	$self	747	$self
754	}	748	}
755		749
756	sub realloc {	750	sub realloc {
…		…
765	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
766		760
767	$_->set_parent ($self)	761	$_->set_parent ($self)
768	for @widgets;	762	for @widgets;
769		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	765	use sort 'stable';
771		766
772	$self->{children} = [	767	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
775	];	770	];
776		771
777	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
778	}	775	}
779		776
780	sub children {	777	sub children {
781	@{ $_[0]{children} }	778	@{ $_[0]{children} }
782	}	779	}
…		…
793	}	790	}
794		791
795	sub clear {	792	sub clear {
796	my ($self) = @_;	793	my ($self) = @_;
797		794
798	my $children = delete $self->{children};	795	my $children = $self->{children};
799	$self->{children} = [];	796	$self->{children} = [];
800		797
801	for (@$children) {	798	for (@$children) {
802	delete $_->{parent};	799	delete $_->{parent};
803	$_->hide;	800	$_->hide;
…		…
943	}	940	}
944		941
945	#############################################################################	942	#############################################################################
946		943
947	package CFPlus::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
		945
		946	use List::Util qw(min max);
948		947
949	our @ISA = CFPlus::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
950		949
951	sub new {	950	sub new {
952	my $class = shift;	951	my $class = shift;
…		…
961	sub size_request {	960	sub size_request {
962	my ($self) = @_;	961	my ($self) = @_;
963		962
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		964
966	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
968		967
969	($w, $h)	968	($w, $h)
970	}	969	}
971		970
972	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
984	}	983	}
985		984
986	sub set_offset {	985	sub set_offset {
987	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
988		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
991		994
		995	$self->emit (changed => $x, $y);
992	$self->update;	996	$self->update;
		997	}
993	}	998	}
994		999
995	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	1001	sub coord2local {
997	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
1013		1018
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1021	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	1023	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1025	}
1021	}	1026	}
1022		1027
…		…
1043	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1044		1049
1045	my $self;	1050	my $self;
1046		1051
1047	my $hslider = new CFPlus::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
1048	vertical => 0,	1055	vertical => 0,
1049	range => [0, 0, 1, 0.01], # HACK fix	1056	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1057	on_changed => sub {
1051	$self->{hpos} = $_[1];	1058	$self->{hpos} = $_[1];
1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053	},	1060	},
1054	;	1061	;
1055		1062
1056	my $vslider = new CFPlus::UI::Slider	1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
1057	vertical => 1,	1066	vertical => 1,
1058	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1059	on_changed => sub {	1068	on_changed => sub {
1060	$self->{vpos} = $_[1];	1069	$self->{vpos} = $_[1];
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1071	},
1063	;	1072	;
1064		1073
1065	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1067	can_events => 1,	1077	can_events => 1,
1068	hslider => $hslider,	1078	hslider => $hslider,
1069	vslider => $vslider,	1079	vslider => $vslider,
1070	col_expand => [1, 0],	1080	col_expand => [1, 0],
1071	row_expand => [1, 0],	1081	row_expand => [1, 0],
1072	%arg,	1082	%arg,
1073	);	1083	);
1074		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
1075	$self->SUPER::add (0, 0, $self->{vp});	1106	$self->SUPER::add ($self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1107
1079	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
1080		1109
1081	$self	1110	$self
1082	}	1111	}
1083
1084	#TODO# update range on size_allocate depending on child
1085		1112
1086	sub add {	1113	sub add {
1087	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1088		1115
1089	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1090	}	1117	}
1091		1118
		1119	sub update_slider {
		1120	my ($self) = @_;
		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1127
		1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
		1150	my ($self, $ev) = @_;
		1151
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
1092	sub invoke_mouse_wheel {	1167	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1168	my ($self, $ev) = @_;
1094		1169
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098		1172
1099	1	1173	1
1100	}	1174	}
1101		1175
1102	sub update_slider {	1176	sub invoke_button_down {
1103	my ($self) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1104		1178
1105	my $child = ($self->{vp} or return)->child;	1179	if ($ev->{button} == 2) {
		1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
1106		1183
1107	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1184	0
1108	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109	#$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113	#$self->{vslider}->set_visibility ($h1 != $h2);
1114	}	1185	}
1115		1186
1116	sub update {	1187	sub invoke_button_up {
1117	my ($self) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1118		1189
1119	$self->SUPER::update;	1190	if (delete $self->{motion}) {
1120	$self->update_slider;	1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1121	}	1206	}
1122		1207
1123	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1125		1210
…		…
1281		1366
1282	my @border =	1367	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1368	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);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
		1374
1286	sub new {	1375	sub new {
1287	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1288		1377
1289	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1548
1460	my $border = $self->border;	1549	my $border = $self->border;
1461		1550
1462	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467		1570
1468	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1470		1573
1471	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1492		1595
1493	#############################################################################	1596	#############################################################################
1494		1597
1495	package CFPlus::UI::Table;	1598	package CFPlus::UI::Table;
1496		1599
1497	our @ISA = CFPlus::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1498		1601
1499	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1500		1603
1501	use CFPlus::OpenGL;	1604	use CFPlus::OpenGL;
1502		1605
…		…
1508	row_expand => [],	1611	row_expand => [],
1509	@_,	1612	@_,
1510	)	1613	)
1511	}	1614	}
1512		1615
1513	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}
1516
1517	sub add {	1616	sub add {
		1617	my ($self, @widgets) = @_;
		1618
		1619	for my $child (@widgets) {
		1620	$child->{rowspan} \|\|= 1;
		1621	$child->{colspan} \|\|= 1;
		1622	}
		1623
		1624	$self->SUPER::add (@widgets);
		1625	}
		1626
		1627	sub add_at {
1518	my ($self) = shift;	1628	my $self = shift;
		1629
		1630	my @widgets;
1519		1631
1520	while (@_) {	1632	while (@_) {
1521	my ($x, $y, $child) = splice @_, 0, 3, ();	1633	my ($col, $row, $child) = splice @_, 0, 3, ();
1522	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;
1524	}
1525		1634
1526	$self->{force_realloc} = 1;	1635	$child->{row} = $row;
1527	$self->{force_size_alloc} = 1;	1636	$child->{col} = $col;
1528	$self->realloc;
1529	}
1530		1637
1531	sub remove {	1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1532	my ($self, $child) = @_;	1645	my ($self) = @_;
1533		1646
1534	# TODO: not yet implemented	1647	my (@w, @h);
1535	}
1536
1537	# TODO: move to container class maybe? send children a signal on removal?
1538	sub clear {
1539	my ($self) = @_;
1540		1648
1541	my @children = $self->children;	1649	my @children = $self->children;
1542	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1543		1660	}
1544	for (@children) {
1545	delete $_->{parent};
1546	$_->hide;
1547	}
1548		1661
1549	$self->realloc;	1662	# second pass, rows
1550	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1551
1552	sub get_wh {
1553	my ($self) = @_;
1554
1555	my (@w, @h);
1556
1557	for my $y (0 .. $#{$self->{children}}) {
1558	my $row = $self->{children}[$y]
1559	or next;
1560
1561	for my $x (0 .. $#$row) {
1562	my $widget = $row->[$x]
1563	or next;
1564	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1565		1665
1566	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1567	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568	}	1670	}
1569	}	1671	}
1570		1672
1571	(\@w, \@h)	1673	(\@w, \@h)
1572	}	1674	}
…		…
1588	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1589		1691
1590	my $req_w = (sum @$ws) \|\| 1;	1692	my $req_w = (sum @$ws) \|\| 1;
1591	my $req_h = (sum @$hs) \|\| 1;	1693	my $req_h = (sum @$hs) \|\| 1;
1592		1694
1593	# TODO: nicer code	1695	# now linearly scale the rows/columns to the allocated size
1594	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1595	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1596	my $col_expand = (sum @col_expand) \|\| 1;	1698	my $col_expand = (sum @col_expand) \|\| 1;
1597		1699
1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1605		1707
1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607		1709
1608	CFPlus::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1609		1711
1610	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611		1714
1612	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1613	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1614	or next;
1615		1717
1616	my $x = 0;	1718	$widget->configure (
1617	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618		1721	);
1619	for my $c (0 .. $#$row) {	1722	}
1620	my $col_w = $ws->[$c];
1621		1723
1622	if (my $widget = $row->[$c]) {	1724	1
1623	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1624	}
1625		1726
1626	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1627	}	1765	}
		1766	}
1628		1767
1629	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $W;
		1801	$h = _scale $size, $h, $H;
		1802
		1803	$child->configure ($x, $y, $w, $h);
1630	}	1804	}
1631		1805
1632	1	1806	1
1633	}
1634
1635	sub find_widget {
1636	my ($self, $x, $y) = @_;
1637
1638	$x -= $self->{x};
1639	$y -= $self->{y};
1640
1641	my $res;
1642
1643	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644	$res = $_->find_widget ($x, $y)
1645	and return $res;
1646	}
1647
1648	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649	}
1650
1651	sub _draw {
1652	my ($self) = @_;
1653
1654	for (grep $_, @{$self->{children}}) {
1655	$_->draw for grep $_, @$_;
1656	}
1657	}	1807	}
1658		1808
1659	#############################################################################	1809	#############################################################################
1660		1810
1661	package CFPlus::UI::Box;	1811	package CFPlus::UI::Box;
…		…
2219		2369
2220	use CFPlus::OpenGL;	2370	use CFPlus::OpenGL;
2221		2371
2222	my @tex =	2372	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
2225		2375
2226	sub new {	2376	sub new {
2227	my $class = shift;	2377	my $class = shift;
2228		2378
2229	$class->SUPER::new (	2379	$class->SUPER::new (
2230	padding_x => 4,	2380	padding_x => 4,
2231	padding_y => 4,	2381	padding_y => 4,
2232	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
2233	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
2234	can_hover => 1,	2384	can_hover => 1,
2235	align => 0,	2385	align => 0,
2236	valign => 0,	2386	valign => 0,
2237	can_events => 1,	2387	can_events => 1,
2238	@_	2388	@_
…		…
2256		2406
2257	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2260		2410
		2411	my $tex = $tex[$GRAB == $self];
2261	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262		2413
2263	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2264		2415
2265	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2266	}	2417	}
…		…
3321		3472
3322	sub new {	3473	sub new {
3323	my $class = shift;	3474	my $class = shift;
3324		3475
3325	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
3326	aspect => 1,	3479	aspect => 1,
3327	can_events => 0,	3480	can_events => 0,
3328	@_,	3481	@_,
3329	);	3482	);
3330		3483
3331	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
3333		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336	hard => 1,	3490	parked => 1,
3337	interval => $self->{animspeed},
3338	cb => sub {	3491	cb => sub {
3339	delete $self->{wait_face};	3492	return unless $::CONN && $widget;
		3493
3340	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3341	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3342	},	3499	},
3343	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3344	}	3504	}
3345		3505
3346	$self	3506	$self
3347	}	3507	}
3348		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3536	}
		3537	}
		3538	}
		3539
3349	sub size_request {	3540	sub size_request {
3350	(32, 8)	3541	my ($self) = @_;
		3542
		3543	if ($::CONN) {
		3544	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3545	if (my $tex = $::CONN->{texture}[$faceid]) {
		3546	$self->{tex} = $tex;
		3547	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3548	} else {
		3549	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3550	$self->realloc;
		3551	});
		3552	}
		3553	}
		3554	}
		3555
		3556	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3351	}	3557	}
3352		3558
3353	sub update {	3559	sub update {
3354	my ($self) = @_;	3560	my ($self) = @_;
3355		3561
3356	return unless $self->{visible};	3562	return unless $self->{visible};
3357		3563
3358	$self->SUPER::update;	3564	$self->SUPER::update;
3359	}	3565	}
3360		3566
		3567	sub invoke_visibility_change {
		3568	my ($self) = @_;
		3569
		3570	$self->update_timer;
		3571
		3572	0
		3573	}
		3574
3361	sub _draw {	3575	sub _draw {
3362	my ($self) = @_;	3576	my ($self) = @_;
3363		3577
3364	return unless $::CONN;
3365
3366	$self->SUPER::_draw;	3578	$self->SUPER::_draw;
3367		3579
3368	my $face;	3580	if (my $tex = $self->{tex}) {
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}]
3378	or return;
3379
3380	my $tex = $::CONN->{texture}[$faceid];
3381
3382	if ($tex) {
3383	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3584	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387	glDisable GL_TEXTURE_2D;	3585	glDisable GL_TEXTURE_2D;
3388	} else {
3389	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
3390	$self->update;
3391	});
3392	}	3586	}
3393	}	3587	}
3394		3588
3395	sub destroy {	3589	sub destroy {
3396	my ($self) = @_;	3590	my ($self) = @_;
3397		3591
3398	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3399	if $self->{timer};	3593	if $self->{timer};
3400		3594
3401	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3402	}	3596	}
3403		3597
…		…
3947	while ($self->{refresh_hook}) {	4141	while ($self->{refresh_hook}) {
3948	$_->()	4142	$_->()
3949	for values %{delete $self->{refresh_hook}};	4143	for values %{delete $self->{refresh_hook}};
3950	}	4144	}
3951		4145
3952	if ($self->{realloc}) {	4146	while ($self->{realloc}) {
3953	my %queue;	4147	my %queue;
3954	my @queue;	4148	my @queue;
3955	my $widget;	4149	my $widget;
3956		4150
3957	outer:	4151	outer:
…		…
4004	}	4198	}
4005	}	4199	}
4006		4200
4007	delete $self->{realloc}{$widget+0};	4201	delete $self->{realloc}{$widget+0};
4008	}	4202	}
4009	}
4010		4203
4011	while (my $size_alloc = delete $self->{size_alloc}) {	4204	while (my $size_alloc = delete $self->{size_alloc}) {
4012	my @queue = sort { $b->{visible} <=> $a->{visible} }	4205	my @queue = sort { $a->{visible} <=> $b->{visible} }
4013	values %$size_alloc;	4206	values %$size_alloc;
4014		4207
4015	while () {	4208	while () {
4016	my $widget = pop @queue \|\| last;	4209	my $widget = pop @queue \|\| last;
4017		4210
4018	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4211	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019		4212
4020	$w = 0 if $w < 0;
4021	$h = 0 if $h < 0;
4022
4023	$w = max $widget->{min_w}, $w;	4213	$w = max $widget->{min_w}, $w;
4024	$h = max $widget->{min_h}, $h;	4214	$h = max $widget->{min_h}, $h;
4025		4215
4026	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4216	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4217	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028		4218
4029	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031		4221
4032	$w = int $w + 0.5;	4222	$w = int $w + 0.5;
4033	$h = int $h + 0.5;	4223	$h = int $h + 0.5;
4034		4224
4035	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4225	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
4036	$widget->{old_w} = $widget->{w};	4226	$widget->{old_w} = $widget->{w};
4037	$widget->{old_h} = $widget->{h};	4227	$widget->{old_h} = $widget->{h};
4038		4228
4039	$widget->{w} = $w;	4229	$widget->{w} = $w;
4040	$widget->{h} = $h;	4230	$widget->{h} = $h;
4041		4231
4042	$widget->emit (size_allocate => $w, $h);	4232	$widget->emit (size_allocate => $w, $h);
		4233	}
4043	}	4234	}
4044	}	4235	}
4045	}	4236	}
4046		4237
4047	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
4048	$_->()	4239	$_->()
4049	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
4050	}	4241	}
4051
4052		4242
4053	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
4056		4246

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.403 by root, Sat Jul 21 21:25:23 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.403 by root, Sat Jul 21 21:25:23 2007 UTC