ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

…		…
273	$self->emit ("destroy");	273	$self->emit ("destroy");
274	%$self = ();	274	%$self = ();
275	}	275	}
276		276
277	sub TO_JSON {	277	sub TO_JSON {
278	{ __widget_ref__ => $_[0]{s_id} }	278	{ __w_ => $_[0]{s_id} }
279	}	279	}
280		280
281	sub show {	281	sub show {
282	my ($self) = @_;	282	my ($self) = @_;
283		283
…		…
593		593
594	# 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
595	# functions seems pointless.	595	# functions seems pointless.
596	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
597		597
598	sub draw {	598	#sub draw {
599	my ($self) = @_;	599	#CFPlus.xs
600
601	return unless $self->{h} && $self->{w};
602
603	# update screen rectangle
604	local $draw_x = $draw_x + $self->{x};
605	local $draw_y = $draw_y + $self->{y};
606
607	# skip widgets that are entirely outside the drawing area
608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611	glPushMatrix;
612	glTranslate $self->{x}, $self->{y}, 0;
613
614	if ($self == $HOVER && $self->{can_hover}) {
615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616	glEnable GL_BLEND;
617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618	glBegin GL_QUADS;
619	glVertex 0 , 0;
620	glVertex $self->{w}, 0;
621	glVertex $self->{w}, $self->{h};
622	glVertex 0 , $self->{h};
623	glEnd;
624	glDisable GL_BLEND;
625	}
626
627	if ($ENV{CFPLUS_DEBUG} & 1) {
628	glPushMatrix;
629	glColor 1, 1, 0, 1;
630	glTranslate 0.375, 0.375;
631	glBegin GL_LINE_LOOP;
632	glVertex 0 , 0;
633	glVertex $self->{w} - 1, 0;
634	glVertex $self->{w} - 1, $self->{h} - 1;
635	glVertex 0 , $self->{h} - 1;
636	glEnd;
637	glPopMatrix;
638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639	}
640
641	$self->_draw;
642	glPopMatrix;
643	}
644		600
645	sub _draw {	601	sub _draw {
646	my ($self) = @_;	602	my ($self) = @_;
647		603
648	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
649	}	605	}
650		606
651	my $cntx;#d#
652	sub DESTROY {	607	sub DESTROY {
653	my ($self) = @_;	608	my ($self) = @_;
654		609
655	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
656		611
		612	local $@;
657	eval { $self->destroy };	613	eval { $self->destroy };
658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659		615
660	delete $WIDGET{$self+0};	616	delete $WIDGET{$self+0};
661	}	617	}
…		…
669	use strict;	625	use strict;
670	use CFPlus::OpenGL;	626	use CFPlus::OpenGL;
671		627
672	sub new {	628	sub new {
673	my $class = shift;	629	my $class = shift;
674
675	# range [value, low, high, page]
676		630
677	$class->SUPER::new (	631	$class->SUPER::new (
678	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
679	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
680	@_	634	@_
…		…
692	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
693		647
694	glEnable GL_BLEND;	648	glEnable GL_BLEND;
695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696	glColor_premultiply @$color;	650	glColor_premultiply @$color;
697
698	glBegin GL_QUADS;
699	glVertex 0 , 0;
700	glVertex 0 , $h;
701	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
702	glVertex $w, 0;
703	glEnd;
704
705	glDisable GL_BLEND;	652	glDisable GL_BLEND;
706	}	653	}
707	}	654	}
708		655
709	#############################################################################	656	#############################################################################
…		…
741	can_events => 0,	688	can_events => 0,
742	%arg,	689	%arg,
743	);	690	);
744		691
745	$self->add (@$children)	692	$self->add (@$children)
746	if $children;	693	if $children && @$children;
747		694
748	$self	695	$self
749	}	696	}
750		697
751	sub realloc {	698	sub realloc {
…		…
760	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
761		708
762	$_->set_parent ($self)	709	$_->set_parent ($self)
763	for @widgets;	710	for @widgets;
764		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
765	use sort 'stable';	713	use sort 'stable';
766		714
767	$self->{children} = [	715	$self->{children} = [
768	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
769	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
770	];	718	];
771		719
772	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
773	}	725	}
774		726
775	sub children {	727	sub children {
776	@{ $_[0]{children} }	728	@{ $_[0]{children} }
777	}	729	}
778		730
779	sub remove {	731	sub remove {
780	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
781		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
782	delete $child->{parent};	737	delete $child->{parent};
783	$child->hide;	738	$child->hide;
784
785	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
786		741
787	$self->realloc;	742	$self->realloc;
788	}	743	}
789		744
790	sub clear {	745	sub clear {
791	my ($self) = @_;	746	my ($self) = @_;
792		747
793	my $children = delete $self->{children};	748	my $children = $self->{children};
794	$self->{children} = [];	749	$self->{children} = [];
795		750
796	for (@$children) {	751	for (@$children) {
797	delete $_->{parent};	752	delete $_->{parent};
798	$_->hide;	753	$_->hide;
…		…
818	}	773	}
819		774
820	sub _draw {	775	sub _draw {
821	my ($self) = @_;	776	my ($self) = @_;
822		777
823	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
824	}	779	}
825		780
826	#############################################################################	781	#############################################################################
827		782
828	package CFPlus::UI::Bin;	783	package CFPlus::UI::Bin;
…		…
838	}	793	}
839		794
840	sub add {	795	sub add {
841	my ($self, $child) = @_;	796	my ($self, $child) = @_;
842		797
843	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
844	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
845	}	800	}
846		801
847	sub remove {	802	sub remove {
848	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
…		…
990	$self->{view_x} = $x;	945	$self->{view_x} = $x;
991	$self->{view_y} = $y;	946	$self->{view_y} = $y;
992		947
993	$self->emit (changed => $x, $y);	948	$self->emit (changed => $x, $y);
994	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
995	}	968	}
996	}	969	}
997		970
998	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
999	sub coord2local {	972	sub coord2local {
…		…
1046	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1047		1020
1048	my $self;	1021	my $self;
1049		1022
1050	my $hslider = new CFPlus::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
1051	vertical => 0,	1026	vertical => 0,
1052	range => [0, 0, 1, 0.01], # HACK fix	1027	range => [0, 0, 1, 0.01], # HACK fix
1053	on_changed => sub {	1028	on_changed => sub {
1054	$self->{hpos} = $_[1];	1029	$self->{hpos} = $_[1];
1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056	},	1031	},
1057	;	1032	;
1058		1033
1059	my $vslider = new CFPlus::UI::Slider	1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1060	vertical => 1,	1037	vertical => 1,
1061	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1062	on_changed => sub {	1039	on_changed => sub {
1063	$self->{vpos} = $_[1];	1040	$self->{vpos} = $_[1];
1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1075	row_expand => [1, 0],	1052	row_expand => [1, 0],
1076	%arg,	1053	%arg,
1077	);	1054	);
1078		1055
1079	$self->{vp} = new CFPlus::UI::ViewPort	1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
1080	expand => 1,	1059	expand => 1,
1081	scroll_x => $self->{scroll_x},	1060	scroll_x => $self->{scroll_x},
1082	scroll_y => $self->{scroll_y},	1061	scroll_y => $self->{scroll_y},
1083	on_changed => sub {	1062	on_changed => sub {
1084	my ($vp, $x, $y) = @_;	1063	my ($vp, $x, $y) = @_;
…		…
1086	$vp->{parent}{hslider}->set_value ($x);	1065	$vp->{parent}{hslider}->set_value ($x);
1087	$vp->{parent}{vslider}->set_value ($y);	1066	$vp->{parent}{vslider}->set_value ($y);
1088		1067
1089	0	1068	0
1090	},	1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
1091	;	1075	;
1092		1076
1093	$self->SUPER::add_at (0, 0, $self->{vp});	1077	$self->SUPER::add ($self->{vp});
1094		1078
1095	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1096		1080
1097	$self	1081	$self
1098	}	1082	}
1099
1100	#TODO# update range on size_allocate depending on child
1101		1083
1102	sub add {	1084	sub add {
1103	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1104		1086
1105	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1106	}	1088	}
1107		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
1108	sub update_slider {	1094	sub update_slider {
1109	my ($self) = @_;	1095	my ($self) = @_;
1110		1096
1111	my $child = ($self->{vp} or return)->child;	1097	my $child = ($self->{vp} or return)->child;
1112		1098
		1099	if ($self->{scroll_x}) {
1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115		1102
1116	my $visible = $w1 > $w2;	1103	my $visible = $w1 > $w2;
1117	if ($visible != $self->{hslider}{visible}) {	1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})	1106	$visible ? $self->SUPER::add ($self->{hslider})
1119	: $self->{hslider}->hide;	1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
1120	}	1109	}
1121		1110
		1111	if ($self->{scroll_y}) {
1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124		1114
1125	my $visible = $h1 > $h2;	1115	my $visible = $h1 > $h2;
1126	if ($visible != $self->{vslider}{visible}) {	1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})	1118	$visible ? $self->SUPER::add ($self->{vslider})
1128	: $self->{vslider}->hide;	1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
		1125	my ($self, $ev) = @_;
		1126
		1127	$self->grab_focus;
		1128
		1129	my $ox = $self->{vp}{view_x};
		1130	my $oy = $self->{vp}{view_y};
		1131
		1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
1129	}	1139	};
1130	}
1131
1132	sub update {
1133	my ($self) = @_;
1134
1135	$self->update_slider;
1136	$self->SUPER::update;
1137	}	1140	}
1138		1141
1139	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1140	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1141		1144
1142	$self->{vslider}->emit (mouse_wheel => $ev)	1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143	if $ev->{dy};
1144
1145	$self->{hslider}->emit (mouse_wheel => $ev)	1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146	if $ev->{dx};
1147		1147
1148	1	1148	1
1149	}	1149	}
1150		1150
1151	sub invoke_button_down {	1151	sub invoke_button_down {
1152	my ($self, $ev, $x, $y) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1153		1153
1154	if ($ev->{button} == 2) {	1154	if ($ev->{button} == 2) {
1155	$self->grab_focus;	1155	$self->start_dragging ($ev);
1156
1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160	$self->{motion} = sub {
1161	my ($ev, $x, $y) = @_;
1162
1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164	$self->update;
1165	};
1166
1167	return 1;	1156	return 1;
1168	}	1157	}
1169		1158
1170	0	1159	0
1171	}	1160	}
…		…
1222	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1223		1212
1224	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1227
1228	glBegin GL_QUADS;
1229	glVertex 0 , 0;
1230	glVertex 0 , $h;
1231	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1232	glVertex $w, 0;
1233	glEnd;
1234
1235	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1236	}	1218	}
1237		1219
1238	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1239	}	1221	}
…		…
1581		1563
1582	#############################################################################	1564	#############################################################################
1583		1565
1584	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1585		1567
1586	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1587		1569
1588	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1589		1571
1590	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1591		1573
1592	sub new {	1574	sub new {
1593	my $class = shift;	1575	my $class = shift;
1594		1576
1595	$class->SUPER::new (	1577	$class->SUPER::new (
1596	children => [],
1597	col_expand => [],	1578	col_expand => [],
1598	row_expand => [],	1579	row_expand => [],
1599	@_,	1580	@_,
1600	)	1581	)
1601	}	1582	}
1602		1583
1603	sub children {
1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1605	}
1606
1607	# TODO: store row/col info in child widget and use standard add/del
1608	sub add {	1584	sub add {
1609	my $self = shift;	1585	my ($self, @widgets) = @_;
1610		1586
1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#	1587	for my $child (@widgets) {
1612	$self->add_at (@_);	1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
1613	}	1593	}
1614		1594
1615	sub add_at {	1595	sub add_at {
1616	my $self = shift;	1596	my $self = shift;
1617		1597
		1598	my @widgets;
		1599
1618	while (@_) {	1600	while (@_) {
1619	my ($col, $row, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1620		1602
1621	$child->{row} = $row;	1603	$child->{c_row} = $row;
1622	$child->{col} = $col;	1604	$child->{c_col} = $col;
1623		1605
1624	$child->{rowspan} ||= 1;	1606	push @widgets, $child;
1625	$child->{colspan} ||= 1;
1626
1627	$child->set_parent ($self);
1628	$self->{children}[$row][$col] = $child;
1629	}	1607	}
1630		1608
1631	$self->{force_realloc} = 1;	1609	$self->add (@widgets);
1632	$self->{force_size_alloc} = 1;
1633	$self->realloc;
1634	}	1610	}
1635		1611
1636	sub remove {	1612	sub get_wh {
1637	my ($self, $child) = @_;	1613	my ($self) = @_;
1638		1614
1639	for (@{ $self->{children} }) {	1615	my (@w, @h);
1640	for (@{ $_ || [] }) {	1616
1641	$_ = undef if $_ == $child;	1617	my @children = $self->children;
		1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642	}	1627	}
1643	}	1628	}
1644	}
1645		1629
1646	# TODO: move to container class maybe? send children a signal on removal?	1630	# second pass, rows
1647	sub clear {
1648	my ($self) = @_;
1649
1650	my @children = $self->children;
1651	delete $self->{children};
1652
1653	for (@children) {
1654	delete $_->{parent};
1655	$_->hide;
1656	}
1657
1658	$self->realloc;
1659	}
1660
1661	sub get_wh {
1662	my ($self) = @_;
1663
1664	my (@w, @h);
1665
1666	my @children = $self->children;
1667
1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1670		1633
1671	my $sw = sum @w[$c .. $c + $cs - 1];
1672	my $sh = sum @h[$r .. $r + $rs - 1];	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1673		1635
1674	if ($w > $sw) {
1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676	}
1677
1678	if ($h > $sh) {	1636	if ($h > $sh) {
1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];	1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1680	}	1638	}
1681	}	1639	}
1682		1640
1683	(\@w, \@h)	1641	(\@w, \@h)
1684	}	1642	}
…		…
1717		1675
1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719		1677
1720	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1721		1679
1722	my (@x, @y);
1723
1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726		1682
1727	for my $widget ($self->children) {	1683	for my $widget ($self->children) {
1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1729		1685
1730	$widget->configure (	1686	$widget->configure (
1731	$x[$c], $y[$r],	1687	$x[$c], $y[$r],
1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1733	);	1689	);
1734	}	1690	}
1735		1691
1736	1	1692	1
1737	}	1693	}
1738		1694
1739	sub find_widget {
1740	my ($self, $x, $y) = @_;
1741
1742	$x -= $self->{x};
1743	$y -= $self->{y};
1744
1745	my $res;
1746
1747	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1748	$res = $_->find_widget ($x, $y)
1749	and return $res;
1750	}
1751
1752	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1753	}
1754
1755	sub _draw {
1756	my ($self) = @_;
1757
1758	for (grep $_, @{$self->{children}}) {
1759	$_->draw for grep $_, @$_;
1760	}
1761	}
1762
1763	#############################################################################	1695	#############################################################################
1764		1696
1765	package CFPlus::UI::Fixed;	1697	package CFPlus::UI::Fixed;
1766		1698
1767	use List::Util qw(min max);	1699	use List::Util qw(min max);
1768		1700
1769	our @ISA = CFPlus::UI::Container::;	1701	our @ISA = CFPlus::UI::Container::;
1770		1702
1771	sub add {
1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775	$self->SUPER::add ($child);
1776	}
1777
1778	sub _scale($$$) {	1703	sub _scale($$$) {
1779	my ($mode, $val, $max) = @_;	1704	my ($rel, $val, $max) = @_;
1780		1705
1781	$mode eq "abs" ? $val	1706	$rel ? $val * $max : $val
1782	: $mode eq "rel" ? $val * $max
1783	: 0
1784	}	1707	}
1785		1708
1786	sub size_request {	1709	sub size_request {
1787	my ($self) = @_;	1710	my ($self) = @_;
1788		1711
1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790		1713
1791	# determine overall size by querying abs widgets	1714	# determine overall size by querying abs widgets
1792	for my $child ($self->visible_children) {	1715	for my $child ($self->visible_children) {
1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
1794		1719
1795	if ($pos eq "abs") {
1796	$w = _scale $size, $w, $child->{req_w};
1797	$h = _scale $size, $h, $child->{req_h};
1798
1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1801	}	1722	}
1802	}	1723	}
1803		1724
1804	my $W = $x2 - $x1;	1725	my $W = $x2 - $x1;
1805	my $H = $y2 - $y1;	1726	my $H = $y2 - $y1;
1806		1727
1807	# now layout remaining widgets	1728	# now layout remaining widgets
1808	for my $child ($self->visible_children) {	1729	for my $child ($self->visible_children) {
1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1810		1733
1811	if ($pos ne "abs") {
1812	$x = _scale $pos, $x, $W;
1813	$y = _scale $pos, $x, $H;
1814	$w = _scale $size, $w, $child->{req_w};
1815	$h = _scale $size, $h, $child->{req_h};
1816
1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1819	}	1736	}
1820	}	1737	}
1821		1738
1822	my $W = $x2 - $x1;	1739	my $W = $x2 - $x1;
1823	my $H = $y2 - $y1;	1740	my $H = $y2 - $y1;
…		…
1827		1744
1828	sub invoke_size_allocate {	1745	sub invoke_size_allocate {
1829	my ($self, $W, $H) = @_;	1746	my ($self, $W, $H) = @_;
1830		1747
1831	for my $child ($self->visible_children) {	1748	for my $child ($self->visible_children) {
1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1833		1751
1834	$x = _scale $pos, $x, $W;	1752	$x += $child->{c_halign} * $child->{req_w};
1835	$y = _scale $pos, $x, $H;	1753	$y += $child->{c_valign} * $child->{req_h};
1836	$w = _scale $size, $w, $child->{req_w};
1837	$h = _scale $size, $h, $child->{req_h};
1838		1754
1839	$child->configure ($x, $y, $w, $h);	1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1840	}	1756	}
1841		1757
1842	1	1758	1
1843	}	1759	}
1844		1760
…		…
1848		1764
1849	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1850		1766
1851	sub size_request {	1767	sub size_request {
1852	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1853		1771
1854	$self->{vertical}	1772	$self->{vertical}
1855	? (	1773	? (
1856	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1857	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1858	)	1776	)
1859	: (	1777	: (
1860	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1861	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1862	)	1780	)
1863	}	1781	}
1864		1782
1865	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1866	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1990		1908
1991	delete $self->{ox};	1909	delete $self->{ox};
1992	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1993	}	1911	}
1994		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1995	sub set_text {	1919	sub set_text {
1996	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1997		1921
1998	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1999	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
2105	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
2106		2030
2107	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2108	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2109	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2110	};	2036	};
2111		2037
2112	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
2113	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
2114		2040	# CFPlus::OpenGL::glNewList $self->{list};
2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
		2046
		2047	$self->{layout}->draw;
2116	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
2117		2057
2118	#############################################################################	2058	#############################################################################
2119		2059
2120	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
2121		2061
…		…
2127	my $class = shift;	2067	my $class = shift;
2128		2068
2129	$class->SUPER::new (	2069	$class->SUPER::new (
2130	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
2131	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
2132	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
2133	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
2134	can_hover => 1,	2076	can_hover => 1,
2135	can_focus => 1,	2077	can_focus => 1,
2136	valign => 0,	2078	valign => 0,
2137	can_events => 1,	2079	can_events => 1,
2138	ellipsise => 0,	2080	ellipsise => 0,
…		…
2278	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2279	}	2221	}
2280		2222
2281	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2282	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2283	glBegin GL_QUADS;
2284	glVertex 0 , 0;
2285	glVertex 0 , $self->{h};
2286	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2287	glVertex $self->{w}, 0;
2288	glEnd;
2289	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2290		2227
2291	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2292		2229
2293	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2295		2232
2296	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2297	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2298	utf8::encode $text;	2235	utf8::encode $text;
2299		2236
2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2301	}	2238	}
2302		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2303	glBegin GL_LINES;	2241	glBegin GL_LINES;
2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2244	glEnd;
		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
2306	glEnd;	2259	glEnd;
2307	}	2260	}
2308	}	2261	}
2309		2262
2310	#############################################################################	2263	#############################################################################
…		…
2397	1	2350	1
2398	}	2351	}
2399		2352
2400	#############################################################################	2353	#############################################################################
2401		2354
		2355	package CFPlus::UI::ButtonBin;
		2356
		2357	our @ISA = CFPlus::UI::Bin::;
		2358
		2359	use CFPlus::OpenGL;
		2360
		2361	my @tex =
		2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2363	qw(b1_button_inactive.png b1_button_active.png);
		2364
		2365	sub new {
		2366	my $class = shift;
		2367
		2368	$class->SUPER::new (
		2369	can_hover => 1,
		2370	align => 0,
		2371	valign => 0,
		2372	can_events => 1,
		2373	@_
		2374	)
		2375	}
		2376
		2377	sub invoke_button_up {
		2378	my ($self, $ev, $x, $y) = @_;
		2379
		2380	$self->emit ("activate")
		2381	if $x >= 0 && $x < $self->{w}
		2382	&& $y >= 0 && $y < $self->{h};
		2383
		2384	1
		2385	}
		2386
		2387	sub _draw {
		2388	my ($self) = @_;
		2389
		2390	glEnable GL_TEXTURE_2D;
		2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2392	glColor 0, 0, 0, 1;
		2393
		2394	my $tex = $tex[$GRAB == $self];
		2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2396
		2397	glDisable GL_TEXTURE_2D;
		2398
		2399	$self->SUPER::_draw;
		2400	}
		2401
		2402	#############################################################################
		2403
2402	package CFPlus::UI::Button;	2404	package CFPlus::UI::Button;
2403		2405
2404	our @ISA = CFPlus::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
2405		2407
2406	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
…		…
2540	sub new {	2542	sub new {
2541	my $class = shift;	2543	my $class = shift;
2542		2544
2543	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2544	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2545	@_,	2548	@_,
2546	);	2549	);
2547		2550
2548	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2549	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2574	}	2577	}
2575		2578
2576	sub size_request {	2579	sub size_request {
2577	my ($self) = @_;	2580	my ($self) = @_;
2578		2581
2579	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2580	}	2583	}
2581		2584
2582	sub _draw {	2585	sub _draw {
2583	my ($self) = @_;	2586	my ($self) = @_;
2584		2587
…		…
2594	}	2597	}
2595		2598
2596	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2598		2601
2599	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2600		2603
2601	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2602	}	2605	}
2603		2606
2604	#############################################################################	2607	#############################################################################
…		…
2623	align => 0,	2626	align => 0,
2624	valign => 0,	2627	valign => 0,
2625	can_events => 1,	2628	can_events => 1,
2626	@_	2629	@_
2627	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2628	}	2637	}
2629		2638
2630	sub invoke_button_up {	2639	sub invoke_button_up {
2631	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2632		2641
…		…
2772	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2773	}	2782	}
2774		2783
2775	#############################################################################	2784	#############################################################################
2776		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	tooltip => sub {
		2876	my ($self) = @_;
		2877
		2878	sprintf "%s points experience (level %d).\n%s points to next level %s.",
		2879	::formsep $self->{exp},
		2880	$self->{lvl},
		2881	::formsep $self->{nxt}
		2882	},
		2883	%arg
		2884	);
		2885
		2886	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2887	if $::CONN;
		2888
		2889	$self
		2890	}
		2891
		2892	sub DESTROY {
		2893	my ($self) = @_;
		2894
		2895	delete $::CONN->{on_exp_update}{$self+0}
		2896	if $::CONN;
		2897
		2898	$self->SUPER::DESTROY;
		2899	}
		2900
		2901	sub set_value {
		2902	my ($self, $lvl, $exp) = @_;
		2903
		2904	$self->{lvl} = $exp;
		2905	$self->{exp} = $exp;
		2906
		2907	my $v = -1;
		2908
		2909	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2910	my $l0 = $table->[$lvl - 1];
		2911	my $l1 = $table->[$lvl];
		2912
		2913	$self->{nxt} = $l1;
		2914
		2915	$v = ($exp - $l0) / ($l1 - $l0);
		2916	}
		2917
		2918	$self->SUPER::set_value ($v);
		2919	}
		2920
		2921	#############################################################################
		2922
2777	package CFPlus::UI::Gauge;	2923	package CFPlus::UI::Gauge;
2778		2924
2779	our @ISA = CFPlus::UI::VBox::;	2925	our @ISA = CFPlus::UI::VBox::;
2780		2926
2781	sub new {	2927	sub new {
…		…
2906		3052
2907	$self->SUPER::invoke_button_down ($ev, $x, $y);	3053	$self->SUPER::invoke_button_down ($ev, $x, $y);
2908		3054
2909	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3055	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2910		3056
2911	$self->invoke_mouse_motion ($ev, $x, $y)	3057	$self->invoke_mouse_motion ($ev, $x, $y);
		3058
		3059	1
2912	}	3060	}
2913		3061
2914	sub invoke_mouse_motion {	3062	sub invoke_mouse_motion {
2915	my ($self, $ev, $x, $y) = @_;	3063	my ($self, $ev, $x, $y) = @_;
2916		3064
…		…
2936		3084
2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3085	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938		3086
2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3087	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940		3088
2941	! ! $delta	3089	1
2942	}	3090	}
2943		3091
2944	sub update {	3092	sub update {
2945	my ($self) = @_;	3093	my ($self) = @_;
2946		3094
…		…
3077	}	3225	}
3078		3226
3079	sub size_request {	3227	sub size_request {
3080	my ($self) = @_;	3228	my ($self) = @_;
3081		3229
3082	my ($empty, $slider) = @{ $self->{children} };	3230	my ($empty, $slider) = $self->visible_children;
3083		3231
3084	local $self->{children} = [$empty, $slider];	3232	local $self->{children} = [$empty, $slider];
3085	$self->SUPER::size_request	3233	$self->SUPER::size_request
3086	}	3234	}
3087		3235
…		…
3276		3424
3277	if ($y0 < $y + $h && $y < $y1) {	3425	if ($y0 < $y + $h && $y < $y1) {
3278	my $layout = $self->get_layout ($para);	3426	my $layout = $self->get_layout ($para);
3279		3427
3280	$layout->render ($para->{indent}, $y - $y0);	3428	$layout->render ($para->{indent}, $y - $y0);
		3429	$layout->draw;
3281		3430
3282	if (my @w = @{ $para->{widget} }) {	3431	if (my @w = @{ $para->{widget} }) {
3283	my @s = $layout->get_shapes;	3432	my @s = $layout->get_shapes;
3284		3433
3285	for (@w) {	3434	for (@w) {
…		…
3476	glTranslate 0.375, 0.375;	3625	glTranslate 0.375, 0.375;
3477		3626
3478	my ($w, $h) = @$self{qw(w h)};	3627	my ($w, $h) = @$self{qw(w h)};
3479		3628
3480	glColor 1, 0.8, 0.4;	3629	glColor 1, 0.8, 0.4;
3481	glBegin GL_QUADS;	3630	glRect 0, 0, $w, $h;
3482	glVertex 0 , 0;
3483	glVertex 0 , $h;
3484	glVertex $w, $h;
3485	glVertex $w, 0;
3486	glEnd;
3487		3631
3488	glColor 0, 0, 0;	3632	glColor 0, 0, 0;
3489	glBegin GL_LINE_LOOP;	3633	glRect_lineloop 0, 0, $w, $h;
3490	glVertex 0 , 0;
3491	glVertex 0 , $h;
3492	glVertex $w, $h;
3493	glVertex $w, 0;
3494	glEnd;
3495		3634
3496	glTranslate 2 - 0.375, 2 - 0.375;	3635	glTranslate 2 - 0.375, 2 - 0.375;
3497		3636
3498	$self->SUPER::_draw;	3637	$self->SUPER::_draw;
3499	}	3638	}
…		…
3519		3658
3520	if ($self->{anim} && $self->{animspeed}) {	3659	if ($self->{anim} && $self->{animspeed}) {
3521	CFPlus::weaken (my $widget = $self);	3660	CFPlus::weaken (my $widget = $self);
3522		3661
3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3662	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3663	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3525	$self->{timer} = Event->timer (	3664	$self->{timer} = Event->timer (
3526	parked => 1,	3665	parked => 1,
3527	cb => sub {	3666	cb => sub {
3528	return unless $::CONN && $widget;	3667	return unless $::CONN;
3529		3668
		3669	my $w = $widget
		3670	or return;
		3671
3530	++$widget->{frame};	3672	++$w->{frame};
3531	$widget->update_face;	3673	$w->update_face;
		3674
		3675	# somehow, $widget can go away
3532	$widget->update;	3676	$w->update;
3533
3534	$widget->update_timer;	3677	$w->update_timer;
3535	},	3678	},
3536	);	3679	);
3537		3680
3538	$self->update_face;	3681	$self->update_face;
3539	$self->update_timer;	3682	$self->update_timer;
…		…
3560	}	3703	}
3561		3704
3562	sub update_face {	3705	sub update_face {
3563	my ($self) = @_;	3706	my ($self) = @_;
3564		3707
3565	return unless $::CONN;
3566
3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568	if ($anim && @$anim) {
3569	delete $self->{wait_face};
3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3571	}
3572	}
3573	}
3574
3575	sub size_request {
3576	my ($self) = @_;
3577
3578	if ($::CONN) {	3708	if ($::CONN) {
3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3709	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580	if (my $tex = $::CONN->{texture}[$faceid]) {	3710	if ($anim && @$anim) {
3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3711	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3582	} else {	3712	delete $self->{face_change_cb};
3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3713
3584	$self->realloc;	3714	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3715	unless ($tex->{name} || $tex->{loading}) {
		3716	$tex->upload (sub { $self->reconfigure });
		3717	}
3585	});	3718	}
3586	}	3719	}
3587	}	3720	}
3588	}	3721	}
		3722	}
		3723
		3724	sub size_request {
		3725	my ($self) = @_;
		3726
		3727	if ($::CONN) {
		3728	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3730	if ($tex->{name}) {
		3731	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3732	} elsif (!$tex->{loading}) {
		3733	$tex->upload (sub { $self->reconfigure });
		3734	}
		3735	}
		3736
		3737	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3738	}
		3739	}
3589		3740
3590	($self->{size_w} || 8, $self->{size_h} || 8)	3741	($self->{size_w} || 8, $self->{size_h} || 8)
3591	}	3742	}
3592		3743
3593	sub update {	3744	sub update {
…		…
3607	}	3758	}
3608		3759
3609	sub _draw {	3760	sub _draw {
3610	my ($self) = @_;	3761	my ($self) = @_;
3611		3762
3612	return unless $::CONN;
3613
3614	$self->SUPER::_draw;	3763	$self->SUPER::_draw;
3615		3764
3616	my $faceid = $::CONN->{faceid}[$self->{face}]	3765	if (my $tex = $self->{tex}) {
3617	or return;
3618
3619	my $tex = $::CONN->{texture}[$faceid];
3620
3621	if ($tex) {
3622	glEnable GL_TEXTURE_2D;	3766	glEnable GL_TEXTURE_2D;
3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3624	glColor 0, 0, 0, 1;	3768	glColor 0, 0, 0, 1;
3625	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3626	glDisable GL_TEXTURE_2D;	3770	glDisable GL_TEXTURE_2D;
…		…
3678	children => [	3822	children => [
3679	(new CFPlus::UI::Label markup => $left, expand => 1),	3823	(new CFPlus::UI::Label markup => $left, expand => 1),
3680	(new CFPlus::UI::Label markup => $right, align => +1),	3824	(new CFPlus::UI::Label markup => $right, align => +1),
3681	],	3825	],
3682	;	3826	;
3683		3827
3684	} else {	3828	} else {
3685	$widget = new CFPlus::UI::Label	3829	$widget = new CFPlus::UI::Label
3686	can_hover => 1,	3830	can_hover => 1,
3687	can_events => 1,	3831	can_events => 1,
3688	markup => $widget,	3832	markup => $widget,
…		…
3813		3957
3814	#############################################################################	3958	#############################################################################
3815		3959
3816	package CFPlus::UI::Notebook;	3960	package CFPlus::UI::Notebook;
3817		3961
		3962	use CFPlus::OpenGL;
		3963
3818	our @ISA = CFPlus::UI::VBox::;	3964	our @ISA = CFPlus::UI::VBox::;
3819		3965
3820	sub new {	3966	sub new {
3821	my $class = shift;	3967	my $class = shift;
3822		3968
3823	my $self = $class->SUPER::new (	3969	my $self = $class->SUPER::new (
3824	buttonbar => (new CFPlus::UI::Buttonbar),	3970	buttonbar => (new CFPlus::UI::Buttonbar),
3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3971	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3972	active_outline => [1, 1, 0],
3826	# filter => # will be put between multiplexer and $self	3973	# filter => # will be put between multiplexer and $self
3827	@_,	3974	@_,
3828	);	3975	);
3829		3976
3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3977	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3831	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3978	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3832		3979
		3980	{
		3981	Scalar::Util::weaken (my $wself = $self);
		3982
		3983	$self->{multiplexer}->connect (c_add => sub {
		3984	my ($mplex, $widgets) = @_;
		3985
		3986	for my $child (@$widgets) {
		3987	Scalar::Util::weaken $child;
		3988	$child->{c_tab_} ||= do {
		3989	my $tab =
		3990	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3991	? $child->{c_tab}
		3992	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3993
		3994	$tab->connect (activate => sub {
		3995	$wself->set_current_page ($child);
		3996	});
		3997
		3998	$tab
		3999	};
		4000
		4001	$self->{buttonbar}->add ($child->{c_tab_});
		4002	}
		4003	});
		4004
		4005	$self->{multiplexer}->connect (c_remove => sub {
		4006	my ($mplex, $widgets) = @_;
		4007
		4008	for my $child (@$widgets) {
		4009	$wself->{buttonbar}->remove ($child->{c_tab_});
		4010	}
		4011	});
		4012	}
		4013
3833	$self	4014	$self
3834	}	4015	}
3835		4016
3836	sub add {	4017	sub add {
		4018	my ($self, @widgets) = @_;
		4019
		4020	$self->{multiplexer}->add (@widgets)
		4021	}
		4022
		4023	sub remove {
		4024	my ($self, @widgets) = @_;
		4025
		4026	$self->{multiplexer}->remove (@widgets)
		4027	}
		4028
		4029	sub pages {
		4030	my ($self) = @_;
		4031	$self->{multiplexer}->children
		4032	}
		4033
		4034	sub add_tab {
3837	my ($self, $title, $widget, $tooltip) = @_;	4035	my ($self, $title, $widget, $tooltip) = @_;
3838		4036
3839	CFPlus::weaken $self;	4037	$title = [$title, $tooltip] unless ref $title;
		4038	$widget->{c_tab} = $title;
3840		4039
3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3842	markup => $title,
3843	tooltip => $tooltip,
3844	on_activate => sub { $self->set_current_page ($widget) },
3845	);
3846
3847	$self->{multiplexer}->add ($widget);	4040	$self->add ($widget);
3848	}	4041	}
3849		4042
3850	sub get_current_page {	4043	sub get_current_page {
3851	my ($self) = @_;	4044	my ($self) = @_;
3852		4045
…		…
3856	sub set_current_page {	4049	sub set_current_page {
3857	my ($self, $page) = @_;	4050	my ($self, $page) = @_;
3858		4051
3859	$self->{multiplexer}->set_current_page ($page);	4052	$self->{multiplexer}->set_current_page ($page);
3860	$self->emit (page_changed => $self->{multiplexer}{current});	4053	$self->emit (page_changed => $self->{multiplexer}{current});
		4054	}
		4055
		4056	sub _draw {
		4057	my ($self) = @_;
		4058
		4059	$self->SUPER::_draw ();
		4060
		4061	if (my $cur = $self->{multiplexer}{current}) {
		4062	if ($cur = $cur->{c_tab_}) {
		4063	glTranslate $cur->{x}, $cur->{y};
		4064	glLineWidth 3;
		4065	glColor @{$self->{active_outline}};
		4066	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4067	glLineWidth 1;
		4068	}
		4069	}
3861	}	4070	}
3862		4071
3863	#############################################################################	4072	#############################################################################
3864		4073
3865	package CFPlus::UI::Selector;	4074	package CFPlus::UI::Selector;
…		…
4135	}	4344	}
4136		4345
4137	sub update {	4346	sub update {
4138	my ($self) = @_;	4347	my ($self) = @_;
4139		4348
4140	$::WANT_REFRESH++;	4349	$::WANT_REFRESH->start;
4141	}	4350	}
4142		4351
4143	sub add {	4352	sub add {
4144	my ($self, @children) = @_;	4353	my ($self, @children) = @_;
4145		4354
…		…
4182	while ($self->{refresh_hook}) {	4391	while ($self->{refresh_hook}) {
4183	$_->()	4392	$_->()
4184	for values %{delete $self->{refresh_hook}};	4393	for values %{delete $self->{refresh_hook}};
4185	}	4394	}
4186		4395
4187	if ($self->{realloc}) {	4396	while ($self->{realloc}) {
4188	my %queue;	4397	my %queue;
4189	my @queue;	4398	my @queue;
4190	my $widget;	4399	my $widget;
4191		4400
4192	outer:	4401	outer:
…		…
4239	}	4448	}
4240	}	4449	}
4241		4450
4242	delete $self->{realloc}{$widget+0};	4451	delete $self->{realloc}{$widget+0};
4243	}	4452	}
4244	}
4245		4453
4246	while (my $size_alloc = delete $self->{size_alloc}) {	4454	while (my $size_alloc = delete $self->{size_alloc}) {
4247	my @queue = sort { $b->{visible} <=> $a->{visible} }	4455	my @queue = sort { $a->{visible} <=> $b->{visible} }
4248	values %$size_alloc;	4456	values %$size_alloc;
4249		4457
4250	while () {	4458	while () {
4251	my $widget = pop @queue || last;	4459	my $widget = pop @queue || last;
4252		4460
4253	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4461	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4254		4462
4255	$w = 0 if $w < 0;
4256	$h = 0 if $h < 0;
4257
4258	$w = max $widget->{min_w}, $w;	4463	$w = max $widget->{min_w}, $w;
4259	$h = max $widget->{min_h}, $h;	4464	$h = max $widget->{min_h}, $h;
4260		4465
4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4466	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4467	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263		4468
4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4469	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4470	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266		4471
4267	$w = int $w + 0.5;	4472	$w = int $w + 0.5;
4268	$h = int $h + 0.5;	4473	$h = int $h + 0.5;
4269		4474
4270	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4475	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4271	$widget->{old_w} = $widget->{w};	4476	$widget->{old_w} = $widget->{w};
4272	$widget->{old_h} = $widget->{h};	4477	$widget->{old_h} = $widget->{h};
4273		4478
4274	$widget->{w} = $w;	4479	$widget->{w} = $w;
4275	$widget->{h} = $h;	4480	$widget->{h} = $h;
4276		4481
4277	$widget->emit (size_allocate => $w, $h);	4482	$widget->emit (size_allocate => $w, $h);
		4483	}
4278	}	4484	}
4279	}	4485	}
4280	}	4486	}
4281		4487
4282	while ($self->{post_alloc_hook}) {	4488	while ($self->{post_alloc_hook}) {

Diff Legend

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