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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.402 by root, Sat Jul 21 20:49:44 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	}
…		…
268	$self->hide;	272	$self->hide;
269	$self->emit ("destroy");	273	$self->emit ("destroy");
270	%$self = ();	274	%$self = ();
271	}	275	}
272		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
273	sub show {	281	sub show {
274	my ($self) = @_;	282	my ($self) = @_;
275		283
276	return if $self->{parent};	284	return if $self->{parent};
277		285
…		…
316	sub set_visibility {	324	sub set_visibility {
317	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
318		326
319	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
320		328
321	$visible ? $self->hide	329	$visible ? $self->show
322	: $self->show;	330	: $self->hide;
323	}	331	}
324		332
325	sub toggle_visibility {	333	sub toggle_visibility {
326	my ($self) = @_;	334	my ($self) = @_;
327		335
…		…
543		551
544	# parent	552	# parent
545	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
546	}	554	}
547		555
548	sub find_widget {	556	#sub find_widget {
549	my ($self, $x, $y) = @_;	557	# in .xs
550
551	return () unless $self->{can_events};
552
553	return $self
554	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557	()
558	}
559		558
560	sub set_parent {	559	sub set_parent {
561	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
562		561
563	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
647	my ($self) = @_;	646	my ($self) = @_;
648		647
649	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
650	}	649	}
651		650
652	my $cntx;#d#
653	sub DESTROY {	651	sub DESTROY {
654	my ($self) = @_;	652	my ($self) = @_;
655		653
656	return if CFPlus::in_destruct;	654	return if CFPlus::in_destruct;
657		655
…		…
742	can_events => 0,	740	can_events => 0,
743	%arg,	741	%arg,
744	);	742	);
745		743
746	$self->add (@$children)	744	$self->add (@$children)
747	if $children;	745	if $children && @$children;
748		746
749	$self	747	$self
750	}	748	}
751		749
752	sub realloc {	750	sub realloc {
…		…
761	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
762		760
763	$_->set_parent ($self)	761	$_->set_parent ($self)
764	for @widgets;	762	for @widgets;
765		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
766	use sort 'stable';	765	use sort 'stable';
767		766
768	$self->{children} = [	767	$self->{children} = [
769	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
770	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
771	];	770	];
772		771
773	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
774	}	775	}
775		776
776	sub children {	777	sub children {
777	@{ $_[0]{children} }	778	@{ $_[0]{children} }
778	}	779	}
…		…
789	}	790	}
790		791
791	sub clear {	792	sub clear {
792	my ($self) = @_;	793	my ($self) = @_;
793		794
794	my $children = delete $self->{children};	795	my $children = $self->{children};
795	$self->{children} = [];	796	$self->{children} = [];
796		797
797	for (@$children) {	798	for (@$children) {
798	delete $_->{parent};	799	delete $_->{parent};
799	$_->hide;	800	$_->hide;
…		…
939	}	940	}
940		941
941	#############################################################################	942	#############################################################################
942		943
943	package CFPlus::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
		945
		946	use List::Util qw(min max);
944		947
945	our @ISA = CFPlus::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
946		949
947	sub new {	950	sub new {
948	my $class = shift;	951	my $class = shift;
…		…
957	sub size_request {	960	sub size_request {
958	my ($self) = @_;	961	my ($self) = @_;
959		962
960	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961		964
962	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
963	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
964		967
965	($w, $h)	968	($w, $h)
966	}	969	}
967		970
968	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
980	}	983	}
981		984
982	sub set_offset {	985	sub set_offset {
983	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
984		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}) {
985	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
986	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
987		994
		995	$self->emit (changed => $x, $y);
988	$self->update;	996	$self->update;
		997	}
989	}	998	}
990		999
991	# 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
992	sub coord2local {	1001	sub coord2local {
993	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
1008	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
1009		1018
1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012	) {	1021	) {
1013	$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})
1014	} else {	1023	} else {
1015	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1016	}	1025	}
1017	}	1026	}
1018		1027
…		…
1029		1038
1030	#############################################################################	1039	#############################################################################
1031		1040
1032	package CFPlus::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
1033		1042
1034	our @ISA = CFPlus::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
1035		1044
1036	sub new {	1045	sub new {
1037	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1038		1047
1039	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1040		1049
1041	my $self;	1050	my $self;
1042		1051
1043	my $slider = new CFPlus::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
1044	vertical => 1,	1066	vertical => 1,
1045	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1046	on_changed => sub {	1068	on_changed => sub {
1047	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048	},	1071	},
1049	;	1072	;
1050		1073
1051	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1052	vp => (new CFPlus::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1053	can_events => 1,	1077	can_events => 1,
1054	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
1055	%arg,	1082	%arg,
1056	);	1083	);
1057		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
1058	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
1059	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
1060		1109
1061	$self	1110	$self
1062	}	1111	}
1063
1064	#TODO# update range on size_allocate depending on child
1065		1112
1066	sub add {	1113	sub add {
1067	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1068		1115
1069	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1070	}	1117	}
1071		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
1072	sub invoke_mouse_wheel {	1167	sub invoke_mouse_wheel {
1073	my ($self, $ev) = @_;	1168	my ($self, $ev) = @_;
1074		1169
1075	return 0 unless $ev->{dy}; # only vertical movements
1076
1077	$self->{slider}->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};
1078		1172
1079	1	1173	1
1080	}	1174	}
1081		1175
1082	sub update_slider {	1176	sub invoke_button_down {
1083	my ($self) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1084		1178
1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1179	if ($ev->{button} == 2) {
1086	}	1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
1087		1183
1088	sub update {	1184	0
1089	my ($self) = @_;	1185	}
1090		1186
1091	$self->SUPER::update;	1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
1092		1189
1093	$self->update_slider;	1190	if (delete $self->{motion}) {
		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
1094	}	1206	}
1095		1207
1096	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1097	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1098		1210
1099	$self->update_slider;	1211	$self->update_slider;
1100
1101	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1102	}	1213	}
1103		1214
1104	#############################################################################	1215	#############################################################################
1105		1216
…		…
1255		1366
1256	my @border =	1367	my @border =
1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258	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);
1259		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
1260	sub new {	1375	sub new {
1261	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1262		1377
1263	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1264	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
…		…
1432	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433		1548
1434	my $border = $self->border;	1549	my $border = $self->border;
1435		1550
1436	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1437	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440	$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);
1441		1570
1442	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1443	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1444		1573
1445	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1466		1595
1467	#############################################################################	1596	#############################################################################
1468		1597
1469	package CFPlus::UI::Table;	1598	package CFPlus::UI::Table;
1470		1599
1471	our @ISA = CFPlus::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1472		1601
1473	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1474		1603
1475	use CFPlus::OpenGL;	1604	use CFPlus::OpenGL;
1476		1605
1477	sub new {	1606	sub new {
1478	my $class = shift;	1607	my $class = shift;
1479		1608
1480	$class->SUPER::new (	1609	$class->SUPER::new (
1481	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1482	@_,	1612	@_,
1483	)	1613	)
1484	}	1614	}
1485		1615
1486	sub children {
1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488	}
1489
1490	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 {
1491	my ($self) = shift;	1628	my $self = shift;
		1629
		1630	my @widgets;
1492		1631
1493	while (@_) {	1632	while (@_) {
1494	my ($x, $y, $child) = splice @_, 0, 3, ();	1633	my ($col, $row, $child) = splice @_, 0, 3, ();
1495	$child->set_parent ($self);
1496	$self->{children}[$y][$x] = $child;
1497	}
1498		1634
1499	$self->{force_realloc} = 1;	1635	$child->{row} = $row;
1500	$self->{force_size_alloc} = 1;	1636	$child->{col} = $col;
1501	$self->realloc;
1502	}
1503		1637
1504	sub remove {	1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1505	my ($self, $child) = @_;	1645	my ($self) = @_;
1506		1646
1507	# TODO: not yet implemented	1647	my (@w, @h);
1508	}
1509
1510	# TODO: move to container class maybe? send children a signal on removal?
1511	sub clear {
1512	my ($self) = @_;
1513		1648
1514	my @children = $self->children;	1649	my @children = $self->children;
1515	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	}
1516		1660	}
1517	for (@children) {
1518	delete $_->{parent};
1519	$_->hide;
1520	}
1521		1661
1522	$self->realloc;	1662	# second pass, rows
1523	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1524
1525	sub get_wh {
1526	my ($self) = @_;
1527
1528	my (@w, @h);
1529
1530	for my $y (0 .. $#{$self->{children}}) {
1531	my $row = $self->{children}[$y]
1532	or next;
1533
1534	for my $x (0 .. $#$row) {
1535	my $widget = $row->[$x]
1536	or next;
1537	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1538		1665
1539	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1540	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541	}	1670	}
1542	}	1671	}
1543		1672
1544	(\@w, \@h)	1673	(\@w, \@h)
1545	}	1674	}
…		…
1561	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1562		1691
1563	my $req_w = (sum @$ws) \|\| 1;	1692	my $req_w = (sum @$ws) \|\| 1;
1564	my $req_h = (sum @$hs) \|\| 1;	1693	my $req_h = (sum @$hs) \|\| 1;
1565		1694
1566	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1567	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1568	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1569	my $col_expand = (sum @col_expand) \|\| 1;	1698	my $col_expand = (sum @col_expand) \|\| 1;
1570		1699
1571	# linearly scale sizes
1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1574		1701
1575	CFPlus::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) \|\| 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1576	CFPlus::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1577		1711
1578	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579		1714
1580	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1581	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1582	or next;
1583		1717
1584	my $x = 0;	1718	$widget->configure (
1585	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586		1721	);
1587	for my $c (0 .. $#$row) {	1722	}
1588	my $col_w = $ws->[$c];
1589		1723
1590	if (my $widget = $row->[$c]) {	1724	1
1591	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1592	}
1593		1726
1594	$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;
1595	}	1765	}
		1766	}
1596		1767
1597	$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);
1598	}	1804	}
1599		1805
1600	1	1806	1
1601	}
1602
1603	sub find_widget {
1604	my ($self, $x, $y) = @_;
1605
1606	$x -= $self->{x};
1607	$y -= $self->{y};
1608
1609	my $res;
1610
1611	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612	$res = $_->find_widget ($x, $y)
1613	and return $res;
1614	}
1615
1616	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617	}
1618
1619	sub _draw {
1620	my ($self) = @_;
1621
1622	for (grep $_, @{$self->{children}}) {
1623	$_->draw for grep $_, @$_;
1624	}
1625	}	1807	}
1626		1808
1627	#############################################################################	1809	#############################################################################
1628		1810
1629	package CFPlus::UI::Box;	1811	package CFPlus::UI::Box;
…		…
1969	my $mod = $ev->{mod};	2151	my $mod = $ev->{mod};
1970	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1971	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1972		2154
1973	my $text = $self->get_text;	2155	my $text = $self->get_text;
		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974		2158
1975	if ($uni == 8) {	2159	if ($uni == 8) {
1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1978	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
…		…
2185		2369
2186	use CFPlus::OpenGL;	2370	use CFPlus::OpenGL;
2187		2371
2188	my @tex =	2372	my @tex =
2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
2191		2375
2192	sub new {	2376	sub new {
2193	my $class = shift;	2377	my $class = shift;
2194		2378
2195	$class->SUPER::new (	2379	$class->SUPER::new (
2196	padding_x => 4,	2380	padding_x => 4,
2197	padding_y => 4,	2381	padding_y => 4,
2198	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
2199	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
2200	can_hover => 1,	2384	can_hover => 1,
2201	align => 0,	2385	align => 0,
2202	valign => 0,	2386	valign => 0,
2203	can_events => 1,	2387	can_events => 1,
2204	@_	2388	@_
…		…
2222		2406
2223	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2226		2410
		2411	my $tex = $tex[$GRAB == $self];
2227	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228		2413
2229	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2230		2415
2231	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2232	}	2417	}
…		…
3287		3472
3288	sub new {	3473	sub new {
3289	my $class = shift;	3474	my $class = shift;
3290		3475
3291	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
3292	aspect => 1,	3479	aspect => 1,
3293	can_events => 0,	3480	can_events => 0,
3294	@_,	3481	@_,
3295	);	3482	);
3296		3483
3297	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
3298	CFPlus::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
3299		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3300	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302	hard => 1,	3490	parked => 1,
3303	interval => $self->{animspeed},
3304	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
3305	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3306	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3307	},	3499	},
3308	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3309	}	3504	}
3310		3505
3311	$self	3506	$self
3312	}	3507	}
3313		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	}
		3536	}
		3537	}
		3538
3314	sub size_request {	3539	sub size_request {
3315	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	$self->{tex} = $tex;
		3546	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3547	} else {
		3548	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3549	$self->realloc;
		3550	});
		3551	}
		3552	}
		3553	}
		3554
		3555	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3316	}	3556	}
3317		3557
3318	sub update {	3558	sub update {
3319	my ($self) = @_;	3559	my ($self) = @_;
3320		3560
3321	return unless $self->{visible};	3561	return unless $self->{visible};
3322		3562
3323	$self->SUPER::update;	3563	$self->SUPER::update;
3324	}	3564	}
3325		3565
		3566	sub invoke_visibility_change {
		3567	my ($self) = @_;
		3568
		3569	$self->update_timer;
		3570
		3571	0
		3572	}
		3573
3326	sub _draw {	3574	sub _draw {
3327	my ($self) = @_;	3575	my ($self) = @_;
3328		3576
3329	return unless $::CONN;
3330
3331	$self->SUPER::_draw;	3577	$self->SUPER::_draw;
3332		3578
3333	my $face;	3579	if (my $tex = $self->{tex}) {
3334
3335	if ($self->{frame}) {
3336	my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338	$face = $anim->[ $self->{frame} % @$anim ]
3339	if $anim && @$anim;
3340	}
3341
3342	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
3343
3344	if ($tex) {
3345	glEnable GL_TEXTURE_2D;	3580	glEnable GL_TEXTURE_2D;
3346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3581	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347	glColor 0, 0, 0, 1;	3582	glColor 0, 0, 0, 1;
3348	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3583	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349	glDisable GL_TEXTURE_2D;	3584	glDisable GL_TEXTURE_2D;
…		…
3351	}	3586	}
3352		3587
3353	sub destroy {	3588	sub destroy {
3354	my ($self) = @_;	3589	my ($self) = @_;
3355		3590
3356	$self->{timer}->cancel	3591	(delete $self->{timer})->cancel
3357	if $self->{timer};	3592	if $self->{timer};
3358		3593
3359	$self->SUPER::destroy;	3594	$self->SUPER::destroy;
3360	}	3595	}
3361		3596
…		…
3905	while ($self->{refresh_hook}) {	4140	while ($self->{refresh_hook}) {
3906	$_->()	4141	$_->()
3907	for values %{delete $self->{refresh_hook}};	4142	for values %{delete $self->{refresh_hook}};
3908	}	4143	}
3909		4144
3910	if ($self->{realloc}) {	4145	while ($self->{realloc}) {
3911	my %queue;	4146	my %queue;
3912	my @queue;	4147	my @queue;
3913	my $widget;	4148	my $widget;
3914		4149
3915	outer:	4150	outer:
…		…
3962	}	4197	}
3963	}	4198	}
3964		4199
3965	delete $self->{realloc}{$widget+0};	4200	delete $self->{realloc}{$widget+0};
3966	}	4201	}
3967	}
3968		4202
3969	while (my $size_alloc = delete $self->{size_alloc}) {	4203	while (my $size_alloc = delete $self->{size_alloc}) {
3970	my @queue = sort { $b->{visible} <=> $a->{visible} }	4204	my @queue = sort { $a->{visible} <=> $b->{visible} }
3971	values %$size_alloc;	4205	values %$size_alloc;
3972		4206
3973	while () {	4207	while () {
3974	my $widget = pop @queue \|\| last;	4208	my $widget = pop @queue \|\| last;
3975		4209
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4210	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4211
3978	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;
3980
3981	$w = max $widget->{min_w}, $w;	4212	$w = max $widget->{min_w}, $w;
3982	$h = max $widget->{min_h}, $h;	4213	$h = max $widget->{min_h}, $h;
3983		4214
3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4215	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4216	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986		4217
3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4218	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4219	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989		4220
3990	$w = int $w + 0.5;	4221	$w = int $w + 0.5;
3991	$h = int $h + 0.5;	4222	$h = int $h + 0.5;
3992		4223
3993	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4224	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
3994	$widget->{old_w} = $widget->{w};	4225	$widget->{old_w} = $widget->{w};
3995	$widget->{old_h} = $widget->{h};	4226	$widget->{old_h} = $widget->{h};
3996		4227
3997	$widget->{w} = $w;	4228	$widget->{w} = $w;
3998	$widget->{h} = $h;	4229	$widget->{h} = $h;
3999		4230
4000	$widget->emit (size_allocate => $w, $h);	4231	$widget->emit (size_allocate => $w, $h);
		4232	}
4001	}	4233	}
4002	}	4234	}
4003	}	4235	}
4004		4236
4005	while ($self->{post_alloc_hook}) {	4237	while ($self->{post_alloc_hook}) {
4006	$_->()	4238	$_->()
4007	for values %{delete $self->{post_alloc_hook}};	4239	for values %{delete $self->{post_alloc_hook}};
4008	}	4240	}
4009
4010		4241
4011	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4242	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4243	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013	glClear GL_COLOR_BUFFER_BIT;	4244	glClear GL_COLOR_BUFFER_BIT;
4014		4245

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs. Revision 1.402 by root, Sat Jul 21 20:49:44 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.402 by root, Sat Jul 21 20:49:44 2007 UTC