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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 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	}
…		…
320	sub set_visibility {	324	sub set_visibility {
321	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
322		326
323	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
324		328
325	$visible ? $self->hide	329	$visible ? $self->show
326	: $self->show;	330	: $self->hide;
327	}	331	}
328		332
329	sub toggle_visibility {	333	sub toggle_visibility {
330	my ($self) = @_;	334	my ($self) = @_;
331		335
…		…
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);
…		…
598		593
599	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	595	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		597
603	sub draw {	598	#sub draw {
604	my ($self) = @_;	599	#CFPlus.xs
605
606	return unless $self->{h} && $self->{w};
607
608	# update screen rectangle
609	local $draw_x = $draw_x + $self->{x};
610	local $draw_y = $draw_y + $self->{y};
611
612	# skip widgets that are entirely outside the drawing area
613	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
614	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
615
616	glPushMatrix;
617	glTranslate $self->{x}, $self->{y}, 0;
618
619	if ($self == $HOVER && $self->{can_hover}) {
620	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
621	glEnable GL_BLEND;
622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glBegin GL_QUADS;
624	glVertex 0 , 0;
625	glVertex $self->{w}, 0;
626	glVertex $self->{w}, $self->{h};
627	glVertex 0 , $self->{h};
628	glEnd;
629	glDisable GL_BLEND;
630	}
631
632	if ($ENV{CFPLUS_DEBUG} & 1) {
633	glPushMatrix;
634	glColor 1, 1, 0, 1;
635	glTranslate 0.375, 0.375;
636	glBegin GL_LINE_LOOP;
637	glVertex 0 , 0;
638	glVertex $self->{w} - 1, 0;
639	glVertex $self->{w} - 1, $self->{h} - 1;
640	glVertex 0 , $self->{h} - 1;
641	glEnd;
642	glPopMatrix;
643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644	}
645
646	$self->_draw;
647	glPopMatrix;
648	}
649		600
650	sub _draw {	601	sub _draw {
651	my ($self) = @_;	602	my ($self) = @_;
652		603
653	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
654	}	605	}
655		606
656	my $cntx;#d#
657	sub DESTROY {	607	sub DESTROY {
658	my ($self) = @_;	608	my ($self) = @_;
659		609
660	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
661		611
…		…
746	can_events => 0,	696	can_events => 0,
747	%arg,	697	%arg,
748	);	698	);
749		699
750	$self->add (@$children)	700	$self->add (@$children)
751	if $children;	701	if $children && @$children;
752		702
753	$self	703	$self
754	}	704	}
755		705
756	sub realloc {	706	sub realloc {
…		…
765	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
766		716
767	$_->set_parent ($self)	717	$_->set_parent ($self)
768	for @widgets;	718	for @widgets;
769		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	721	use sort 'stable';
771		722
772	$self->{children} = [	723	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
775	];	726	];
776		727
777	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
778	}	731	}
779		732
780	sub children {	733	sub children {
781	@{ $_[0]{children} }	734	@{ $_[0]{children} }
782	}	735	}
…		…
793	}	746	}
794		747
795	sub clear {	748	sub clear {
796	my ($self) = @_;	749	my ($self) = @_;
797		750
798	my $children = delete $self->{children};	751	my $children = $self->{children};
799	$self->{children} = [];	752	$self->{children} = [];
800		753
801	for (@$children) {	754	for (@$children) {
802	delete $_->{parent};	755	delete $_->{parent};
803	$_->hide;	756	$_->hide;
…		…
943	}	896	}
944		897
945	#############################################################################	898	#############################################################################
946		899
947	package CFPlus::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
		901
		902	use List::Util qw(min max);
948		903
949	our @ISA = CFPlus::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
950		905
951	sub new {	906	sub new {
952	my $class = shift;	907	my $class = shift;
…		…
961	sub size_request {	916	sub size_request {
962	my ($self) = @_;	917	my ($self) = @_;
963		918
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		920
966	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
968		923
969	($w, $h)	924	($w, $h)
970	}	925	}
971		926
972	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
984	}	939	}
985		940
986	sub set_offset {	941	sub set_offset {
987	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
988		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
991		950
		951	$self->emit (changed => $x, $y);
992	$self->update;	952	$self->update;
		953	}
993	}	954	}
994		955
995	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	957	sub coord2local {
997	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
1013		974
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	977	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	979	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	981	}
1021	}	982	}
1022		983
…		…
1033		994
1034	#############################################################################	995	#############################################################################
1035		996
1036	package CFPlus::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
1037		998
1038	our @ISA = CFPlus::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
1039		1000
1040	sub new {	1001	sub new {
1041	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
1042		1003
1043	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
1044		1005
1045	my $self;	1006	my $self;
1046		1007
1047	my $slider = new CFPlus::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
1048	vertical => 1,	1022	vertical => 1,
1049	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1024	on_changed => sub {
1051	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052	},	1027	},
1053	;	1028	;
1054		1029
1055	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
1056	vp => (new CFPlus::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
1057	can_events => 1,	1033	can_events => 1,
1058	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
1059	%arg,	1038	%arg,
1060	);	1039	);
1061		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
1062	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
1063	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
1064		1065
1065	$self	1066	$self
1066	}	1067	}
1067
1068	#TODO# update range on size_allocate depending on child
1069		1068
1070	sub add {	1069	sub add {
1071	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
1072		1071
1073	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
1074	}	1073	}
1075		1074
		1075	sub update_slider {
		1076	my ($self) = @_;
		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1083
		1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
		1106	my ($self, $ev) = @_;
		1107
		1108	$self->grab_focus;
		1109
		1110	my $ox = $self->{vp}{view_x};
		1111	my $oy = $self->{vp}{view_y};
		1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
1076	sub invoke_mouse_wheel {	1123	sub invoke_mouse_wheel {
1077	my ($self, $ev) = @_;	1124	my ($self, $ev) = @_;
1078		1125
1079	return 0 unless $ev->{dy}; # only vertical movements
1080
1081	$self->{slider}->emit (mouse_wheel => $ev);	1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1082		1128
1083	1	1129	1
1084	}	1130	}
1085		1131
1086	sub update_slider {	1132	sub invoke_button_down {
1087	my ($self) = @_;	1133	my ($self, $ev, $x, $y) = @_;
1088		1134
1089	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1135	if ($ev->{button} == 2) {
1090	}	1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
1091		1139
1092	sub update {	1140	0
1093	my ($self) = @_;	1141	}
1094		1142
1095	$self->SUPER::update;	1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
1096		1145
1097	$self->update_slider;	1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1098	}	1162	}
1099		1163
1100	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1101	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1102		1166
1103	$self->update_slider;	1167	$self->update_slider;
1104
1105	$self->SUPER::invoke_size_allocate ($w, $h)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1106	}	1169	}
1107		1170
1108	#############################################################################	1171	#############################################################################
1109		1172
…		…
1259		1322
1260	my @border =	1323	my @border =
1261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
		1330
1264	sub new {	1331	sub new {
1265	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1266		1333
1267	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
1268	bg => [1, 1, 1, 1],	1335	bg => [1, 1, 1, 1],
…		…
1436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437		1504
1438	my $border = $self->border;	1505	my $border = $self->border;
1439		1506
1440	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1441	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1445		1526
1446	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1447	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1448		1529
1449	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1470		1551
1471	#############################################################################	1552	#############################################################################
1472		1553
1473	package CFPlus::UI::Table;	1554	package CFPlus::UI::Table;
1474		1555
1475	our @ISA = CFPlus::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1476		1557
1477	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1478		1559
1479	use CFPlus::OpenGL;	1560	use CFPlus::OpenGL;
1480		1561
1481	sub new {	1562	sub new {
1482	my $class = shift;	1563	my $class = shift;
1483		1564
1484	$class->SUPER::new (	1565	$class->SUPER::new (
1485	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1486	@_,	1568	@_,
1487	)	1569	)
1488	}	1570	}
1489		1571
1490	sub children {
1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492	}
1493
1494	sub add {	1572	sub add {
		1573	my ($self, @widgets) = @_;
		1574
		1575	for my $child (@widgets) {
		1576	$child->{rowspan} \|\|= 1;
		1577	$child->{colspan} \|\|= 1;
		1578	}
		1579
		1580	$self->SUPER::add (@widgets);
		1581	}
		1582
		1583	sub add_at {
1495	my ($self) = shift;	1584	my $self = shift;
		1585
		1586	my @widgets;
1496		1587
1497	while (@_) {	1588	while (@_) {
1498	my ($x, $y, $child) = splice @_, 0, 3, ();	1589	my ($col, $row, $child) = splice @_, 0, 3, ();
1499	$child->set_parent ($self);
1500	$self->{children}[$y][$x] = $child;
1501	}
1502		1590
1503	$self->{force_realloc} = 1;	1591	$child->{row} = $row;
1504	$self->{force_size_alloc} = 1;	1592	$child->{col} = $col;
1505	$self->realloc;
1506	}
1507		1593
1508	sub remove {	1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1509	my ($self, $child) = @_;	1601	my ($self) = @_;
1510		1602
1511	# TODO: not yet implemented	1603	my (@w, @h);
1512	}
1513
1514	# TODO: move to container class maybe? send children a signal on removal?
1515	sub clear {
1516	my ($self) = @_;
1517		1604
1518	my @children = $self->children;	1605	my @children = $self->children;
1519	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1520		1616	}
1521	for (@children) {
1522	delete $_->{parent};
1523	$_->hide;
1524	}
1525		1617
1526	$self->realloc;	1618	# second pass, rows
1527	}	1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1528
1529	sub get_wh {
1530	my ($self) = @_;
1531
1532	my (@w, @h);
1533
1534	for my $y (0 .. $#{$self->{children}}) {
1535	my $row = $self->{children}[$y]
1536	or next;
1537
1538	for my $x (0 .. $#$row) {
1539	my $widget = $row->[$x]
1540	or next;
1541	my ($w, $h) = @$widget{qw(req_w req_h)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1542		1621
1543	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1544	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1545	}	1626	}
1546	}	1627	}
1547		1628
1548	(\@w, \@h)	1629	(\@w, \@h)
1549	}	1630	}
…		…
1565	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1566		1647
1567	my $req_w = (sum @$ws) \|\| 1;	1648	my $req_w = (sum @$ws) \|\| 1;
1568	my $req_h = (sum @$hs) \|\| 1;	1649	my $req_h = (sum @$hs) \|\| 1;
1569		1650
1570	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1571	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1572	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1573	my $col_expand = (sum @col_expand) \|\| 1;	1654	my $col_expand = (sum @col_expand) \|\| 1;
1574		1655
1575	# linearly scale sizes
1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1578		1657
1579	CFPlus::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) \|\| 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1580	CFPlus::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1581		1667
1582	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1583		1670
1584	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1585	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1586	or next;
1587		1673
1588	my $x = 0;	1674	$widget->configure (
1589	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1590		1677	);
1591	for my $c (0 .. $#$row) {	1678	}
1592	my $col_w = $ws->[$c];
1593		1679
1594	if (my $widget = $row->[$c]) {	1680	1
1595	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1596	}
1597		1682
1598	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub _scale($$$) {
		1692	my ($rel, $val, $max) = @_;
		1693
		1694	$rel ? $val * $max : $val
		1695	}
		1696
		1697	sub size_request {
		1698	my ($self) = @_;
		1699
		1700	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1701
		1702	# determine overall size by querying abs widgets
		1703	for my $child ($self->visible_children) {
		1704	unless ($child->{c_rel}) {
		1705	my $x = $child->{c_x};
		1706	my $y = $child->{c_y};
		1707
		1708	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1709	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1599	}	1710	}
		1711	}
1600		1712
1601	$y += $row_h;	1713	my $W = $x2 - $x1;
		1714	my $H = $y2 - $y1;
		1715
		1716	# now layout remaining widgets
		1717	for my $child ($self->visible_children) {
		1718	if ($child->{c_rel}) {
		1719	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1720	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1721
		1722	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1723	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1724	}
		1725	}
		1726
		1727	my $W = $x2 - $x1;
		1728	my $H = $y2 - $y1;
		1729
		1730	($W, $H)
		1731	}
		1732
		1733	sub invoke_size_allocate {
		1734	my ($self, $W, $H) = @_;
		1735
		1736	for my $child ($self->visible_children) {
		1737	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1738	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1739
		1740	$x += $child->{c_halign} * $child->{req_w};
		1741	$y += $child->{c_valign} * $child->{req_h};
		1742
		1743	$child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1602	}	1744	}
1603		1745
1604	1	1746	1
1605	}
1606
1607	sub find_widget {
1608	my ($self, $x, $y) = @_;
1609
1610	$x -= $self->{x};
1611	$y -= $self->{y};
1612
1613	my $res;
1614
1615	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1616	$res = $_->find_widget ($x, $y)
1617	and return $res;
1618	}
1619
1620	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1621	}
1622
1623	sub _draw {
1624	my ($self) = @_;
1625
1626	for (grep $_, @{$self->{children}}) {
1627	$_->draw for grep $_, @$_;
1628	}
1629	}	1747	}
1630		1748
1631	#############################################################################	1749	#############################################################################
1632		1750
1633	package CFPlus::UI::Box;	1751	package CFPlus::UI::Box;
…		…
1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2011	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2012	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1895	: ($self->{h} - $size->[1]) * 0.5);	2013	: ($self->{h} - $size->[1]) * 0.5);
1896	};	2014	};
1897		2015
1898	my $w = List::Util::min $self->{w} + 4, $size->[0];	2016	# unless ($self->{list}) {
1899	my $h = List::Util::min $self->{h} + 2, $size->[1];	2017	# $self->{list} = CFPlus::OpenGL::glGenList;
		2018	# CFPlus::OpenGL::glNewList $self->{list};
		2019	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2020	# CFPlus::OpenGL::glEndList;
		2021	# }
		2022	#
		2023	# CFPlus::OpenGL::glCallList $self->{list};
1900		2024
1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2025	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1902	}	2026	}
		2027
		2028	#sub destroy {
		2029	# my ($self) = @_;
		2030	#
		2031	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2032	#
		2033	# $self->SUPER::destroy;
		2034	#}
1903		2035
1904	#############################################################################	2036	#############################################################################
1905		2037
1906	package CFPlus::UI::EntryBase;	2038	package CFPlus::UI::EntryBase;
1907		2039
…		…
2191		2323
2192	use CFPlus::OpenGL;	2324	use CFPlus::OpenGL;
2193		2325
2194	my @tex =	2326	my @tex =
2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2327	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2196	qw(b1_button_active.png);	2328	qw(b1_button_inactive.png b1_button_active.png);
2197		2329
2198	sub new {	2330	sub new {
2199	my $class = shift;	2331	my $class = shift;
2200		2332
2201	$class->SUPER::new (	2333	$class->SUPER::new (
2202	padding_x => 4,	2334	padding_x => 4,
2203	padding_y => 4,	2335	padding_y => 4,
2204	fg => [1, 1, 1],	2336	fg => [1.0, 1.0, 1.0],
2205	active_fg => [0, 0, 1],	2337	active_fg => [0.8, 0.8, 0.8],
2206	can_hover => 1,	2338	can_hover => 1,
2207	align => 0,	2339	align => 0,
2208	valign => 0,	2340	valign => 0,
2209	can_events => 1,	2341	can_events => 1,
2210	@_	2342	@_
…		…
2228		2360
2229	glEnable GL_TEXTURE_2D;	2361	glEnable GL_TEXTURE_2D;
2230	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231	glColor 0, 0, 0, 1;	2363	glColor 0, 0, 0, 1;
2232		2364
		2365	my $tex = $tex[$GRAB == $self];
2233	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2366	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2234		2367
2235	glDisable GL_TEXTURE_2D;	2368	glDisable GL_TEXTURE_2D;
2236		2369
2237	$self->SUPER::_draw;	2370	$self->SUPER::_draw;
2238	}	2371	}
…		…
2691		2824
2692	$self->SUPER::invoke_button_down ($ev, $x, $y);	2825	$self->SUPER::invoke_button_down ($ev, $x, $y);
2693		2826
2694	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2827	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695		2828
2696	$self->invoke_mouse_motion ($ev, $x, $y)	2829	$self->invoke_mouse_motion ($ev, $x, $y);
		2830
		2831	1
2697	}	2832	}
2698		2833
2699	sub invoke_mouse_motion {	2834	sub invoke_mouse_motion {
2700	my ($self, $ev, $x, $y) = @_;	2835	my ($self, $ev, $x, $y) = @_;
2701		2836
…		…
2721		2856
2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	2857	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723		2858
2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	2859	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725		2860
2726	! ! $delta	2861	1
2727	}	2862	}
2728		2863
2729	sub update {	2864	sub update {
2730	my ($self) = @_;	2865	my ($self) = @_;
2731		2866
…		…
3293		3428
3294	sub new {	3429	sub new {
3295	my $class = shift;	3430	my $class = shift;
3296		3431
3297	my $self = $class->SUPER::new (	3432	my $self = $class->SUPER::new (
		3433	size_w => 32,
		3434	size_h => 8,
3298	aspect => 1,	3435	aspect => 1,
3299	can_events => 0,	3436	can_events => 0,
3300	@_,	3437	@_,
3301	);	3438	);
3302		3439
3303	if ($self->{anim} && $self->{animspeed}) {	3440	if ($self->{anim} && $self->{animspeed}) {
3304	CFPlus::weaken (my $widget = $self);	3441	CFPlus::weaken (my $widget = $self);
3305		3442
		3443	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3444	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3306	$self->{timer} = Event->timer (	3445	$self->{timer} = Event->timer (
3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308	hard => 1,	3446	parked => 1,
3309	interval => $self->{animspeed},
3310	cb => sub {	3447	cb => sub {
		3448	return unless $::CONN && $widget;
		3449
3311	++$widget->{frame};	3450	++$widget->{frame};
		3451	$widget->update_face;
3312	$widget->update;	3452	$widget->update;
		3453
		3454	$widget->update_timer;
3313	},	3455	},
3314	);	3456	);
		3457
		3458	$self->update_face;
		3459	$self->update_timer;
3315	}	3460	}
3316		3461
3317	$self	3462	$self
3318	}	3463	}
3319		3464
		3465	sub update_timer {
		3466	my ($self) = @_;
		3467
		3468	return unless $self->{timer};
		3469
		3470	if ($self->{visible}) {
		3471	$self->{timer}->at (
		3472	$self->{anim_start}
		3473	+ $self->{animspeed}
		3474	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3475	);
		3476	$self->{timer}->start;
		3477	} else {
		3478	$self->{timer}->stop;
		3479	}
		3480	}
		3481
		3482	sub update_face {
		3483	my ($self) = @_;
		3484
		3485	return unless $::CONN;
		3486
		3487	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3488	if ($anim && @$anim) {
		3489	delete $self->{wait_face};
		3490	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3491	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3492	}
		3493	}
		3494	}
		3495
3320	sub size_request {	3496	sub size_request {
3321	(32, 8)	3497	my ($self) = @_;
		3498
		3499	if ($::CONN) {
		3500	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3501	if (my $tex = $::CONN->{texture}[$faceid]) {
		3502	$self->{tex} = $tex;
		3503	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3504	} else {
		3505	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3506	$self->realloc;
		3507	});
		3508	}
		3509	}
		3510	}
		3511
		3512	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3322	}	3513	}
3323		3514
3324	sub update {	3515	sub update {
3325	my ($self) = @_;	3516	my ($self) = @_;
3326		3517
3327	return unless $self->{visible};	3518	return unless $self->{visible};
3328		3519
3329	$self->SUPER::update;	3520	$self->SUPER::update;
3330	}	3521	}
3331		3522
		3523	sub invoke_visibility_change {
		3524	my ($self) = @_;
		3525
		3526	$self->update_timer;
		3527
		3528	0
		3529	}
		3530
3332	sub _draw {	3531	sub _draw {
3333	my ($self) = @_;	3532	my ($self) = @_;
3334		3533
3335	return unless $::CONN;
3336
3337	$self->SUPER::_draw;	3534	$self->SUPER::_draw;
3338		3535
3339	my $face;	3536	if (my $tex = $self->{tex}) {
3340
3341	if ($self->{frame}) {
3342	my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344	$face = $anim->[ $self->{frame} % @$anim ]
3345	if $anim && @$anim;
3346	}
3347
3348	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
3349
3350	if ($tex) {
3351	glEnable GL_TEXTURE_2D;	3537	glEnable GL_TEXTURE_2D;
3352	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3538	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353	glColor 0, 0, 0, 1;	3539	glColor 0, 0, 0, 1;
3354	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3540	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3355	glDisable GL_TEXTURE_2D;	3541	glDisable GL_TEXTURE_2D;
…		…
3357	}	3543	}
3358		3544
3359	sub destroy {	3545	sub destroy {
3360	my ($self) = @_;	3546	my ($self) = @_;
3361		3547
3362	$self->{timer}->cancel	3548	(delete $self->{timer})->cancel
3363	if $self->{timer};	3549	if $self->{timer};
3364		3550
3365	$self->SUPER::destroy;	3551	$self->SUPER::destroy;
3366	}	3552	}
3367		3553
…		…
3565	sub add {	3751	sub add {
3566	my ($self, $title, $widget, $tooltip) = @_;	3752	my ($self, $title, $widget, $tooltip) = @_;
3567		3753
3568	CFPlus::weaken $self;	3754	CFPlus::weaken $self;
3569		3755
3570	$self->{buttonbar}->add (new CFPlus::UI::Button	3756	unless (ref $title) {
		3757	$title = new CFPlus::UI::Button
3571	markup => $title,	3758	markup => $title,
3572	tooltip => $tooltip,	3759	tooltip => $tooltip,
		3760	;
		3761	}
		3762
3573	on_activate => sub { $self->set_current_page ($widget) },	3763	$title->connect (activate => sub { $self->set_current_page ($widget) });
3574	);	3764	$self->{buttonbar}->add ($title);
3575		3765
3576	$self->{multiplexer}->add ($widget);	3766	$self->{multiplexer}->add ($widget);
3577	}	3767	}
3578		3768
3579	sub get_current_page {	3769	sub get_current_page {
…		…
3911	while ($self->{refresh_hook}) {	4101	while ($self->{refresh_hook}) {
3912	$_->()	4102	$_->()
3913	for values %{delete $self->{refresh_hook}};	4103	for values %{delete $self->{refresh_hook}};
3914	}	4104	}
3915		4105
3916	if ($self->{realloc}) {	4106	while ($self->{realloc}) {
3917	my %queue;	4107	my %queue;
3918	my @queue;	4108	my @queue;
3919	my $widget;	4109	my $widget;
3920		4110
3921	outer:	4111	outer:
…		…
3968	}	4158	}
3969	}	4159	}
3970		4160
3971	delete $self->{realloc}{$widget+0};	4161	delete $self->{realloc}{$widget+0};
3972	}	4162	}
3973	}
3974		4163
3975	while (my $size_alloc = delete $self->{size_alloc}) {	4164	while (my $size_alloc = delete $self->{size_alloc}) {
3976	my @queue = sort { $b->{visible} <=> $a->{visible} }	4165	my @queue = sort { $a->{visible} <=> $b->{visible} }
3977	values %$size_alloc;	4166	values %$size_alloc;
3978		4167
3979	while () {	4168	while () {
3980	my $widget = pop @queue \|\| last;	4169	my $widget = pop @queue \|\| last;
3981		4170
3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4171	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3983		4172
3984	$w = 0 if $w < 0;
3985	$h = 0 if $h < 0;
3986
3987	$w = max $widget->{min_w}, $w;	4173	$w = max $widget->{min_w}, $w;
3988	$h = max $widget->{min_h}, $h;	4174	$h = max $widget->{min_h}, $h;
3989		4175
3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4176	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4177	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992		4178
3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4179	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4180	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995		4181
3996	$w = int $w + 0.5;	4182	$w = int $w + 0.5;
3997	$h = int $h + 0.5;	4183	$h = int $h + 0.5;
3998		4184
3999	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4185	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
4000	$widget->{old_w} = $widget->{w};	4186	$widget->{old_w} = $widget->{w};
4001	$widget->{old_h} = $widget->{h};	4187	$widget->{old_h} = $widget->{h};
4002		4188
4003	$widget->{w} = $w;	4189	$widget->{w} = $w;
4004	$widget->{h} = $h;	4190	$widget->{h} = $h;
4005		4191
4006	$widget->emit (size_allocate => $w, $h);	4192	$widget->emit (size_allocate => $w, $h);
		4193	}
4007	}	4194	}
4008	}	4195	}
4009	}	4196	}
4010		4197
4011	while ($self->{post_alloc_hook}) {	4198	while ($self->{post_alloc_hook}) {
4012	$_->()	4199	$_->()
4013	for values %{delete $self->{post_alloc_hook}};	4200	for values %{delete $self->{post_alloc_hook}};
4014	}	4201	}
4015
4016		4202
4017	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4203	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4204	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019	glClear GL_COLOR_BUFFER_BIT;	4205	glClear GL_COLOR_BUFFER_BIT;
4020		4206

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC vs. Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC