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.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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	}
…		…
269	$self->emit ("destroy");	273	$self->emit ("destroy");
270	%$self = ();	274	%$self = ();
271	}	275	}
272		276
273	sub TO_JSON {	277	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	278	{ __w_ => $_[0]{s_id} }
275	}	279	}
276		280
277	sub show {	281	sub show {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
589		593
590	# 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
591	# functions seems pointless.	595	# functions seems pointless.
592	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
593		597
594	sub draw {	598	#sub draw {
595	my ($self) = @_;	599	#CFPlus.xs
596
597	return unless $self->{h} && $self->{w};
598
599	# update screen rectangle
600	local $draw_x = $draw_x + $self->{x};
601	local $draw_y = $draw_y + $self->{y};
602
603	# skip widgets that are entirely outside the drawing area
604	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
605	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
606
607	glPushMatrix;
608	glTranslate $self->{x}, $self->{y}, 0;
609
610	if ($self == $HOVER && $self->{can_hover}) {
611	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
612	glEnable GL_BLEND;
613	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
614	glBegin GL_QUADS;
615	glVertex 0 , 0;
616	glVertex $self->{w}, 0;
617	glVertex $self->{w}, $self->{h};
618	glVertex 0 , $self->{h};
619	glEnd;
620	glDisable GL_BLEND;
621	}
622
623	if ($ENV{CFPLUS_DEBUG} & 1) {
624	glPushMatrix;
625	glColor 1, 1, 0, 1;
626	glTranslate 0.375, 0.375;
627	glBegin GL_LINE_LOOP;
628	glVertex 0 , 0;
629	glVertex $self->{w} - 1, 0;
630	glVertex $self->{w} - 1, $self->{h} - 1;
631	glVertex 0 , $self->{h} - 1;
632	glEnd;
633	glPopMatrix;
634	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
635	}
636
637	$self->_draw;
638	glPopMatrix;
639	}
640		600
641	sub _draw {	601	sub _draw {
642	my ($self) = @_;	602	my ($self) = @_;
643		603
644	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
645	}	605	}
646		606
647	my $cntx;#d#
648	sub DESTROY {	607	sub DESTROY {
649	my ($self) = @_;	608	my ($self) = @_;
650		609
651	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
652		611
		612	local $@;
653	eval { $self->destroy };	613	eval { $self->destroy };
654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655		615
656	delete $WIDGET{$self+0};	616	delete $WIDGET{$self+0};
657	}	617	}
…		…
665	use strict;	625	use strict;
666	use CFPlus::OpenGL;	626	use CFPlus::OpenGL;
667		627
668	sub new {	628	sub new {
669	my $class = shift;	629	my $class = shift;
670
671	# range [value, low, high, page]
672		630
673	$class->SUPER::new (	631	$class->SUPER::new (
674	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
675	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
676	@_	634	@_
…		…
688	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
689		647
690	glEnable GL_BLEND;	648	glEnable GL_BLEND;
691	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
692	glColor_premultiply @$color;	650	glColor_premultiply @$color;
693
694	glBegin GL_QUADS;
695	glVertex 0 , 0;
696	glVertex 0 , $h;
697	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
698	glVertex $w, 0;
699	glEnd;
700
701	glDisable GL_BLEND;	652	glDisable GL_BLEND;
702	}	653	}
703	}	654	}
704		655
705	#############################################################################	656	#############################################################################
…		…
737	can_events => 0,	688	can_events => 0,
738	%arg,	689	%arg,
739	);	690	);
740		691
741	$self->add (@$children)	692	$self->add (@$children)
742	if $children;	693	if $children && @$children;
743		694
744	$self	695	$self
745	}	696	}
746		697
747	sub realloc {	698	sub realloc {
…		…
756	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
757		708
758	$_->set_parent ($self)	709	$_->set_parent ($self)
759	for @widgets;	710	for @widgets;
760		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
761	use sort 'stable';	713	use sort 'stable';
762		714
763	$self->{children} = [	715	$self->{children} = [
764	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
765	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
766	];	718	];
767		719
768	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
769	}	725	}
770		726
771	sub children {	727	sub children {
772	@{ $_[0]{children} }	728	@{ $_[0]{children} }
773	}	729	}
774		730
775	sub remove {	731	sub remove {
776	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
777		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
778	delete $child->{parent};	737	delete $child->{parent};
779	$child->hide;	738	$child->hide;
780
781	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
782		741
783	$self->realloc;	742	$self->realloc;
784	}	743	}
785		744
786	sub clear {	745	sub clear {
787	my ($self) = @_;	746	my ($self) = @_;
788		747
789	my $children = delete $self->{children};	748	my $children = $self->{children};
790	$self->{children} = [];	749	$self->{children} = [];
791		750
792	for (@$children) {	751	for (@$children) {
793	delete $_->{parent};	752	delete $_->{parent};
794	$_->hide;	753	$_->hide;
…		…
814	}	773	}
815		774
816	sub _draw {	775	sub _draw {
817	my ($self) = @_;	776	my ($self) = @_;
818		777
819	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
820	}	779	}
821		780
822	#############################################################################	781	#############################################################################
823		782
824	package CFPlus::UI::Bin;	783	package CFPlus::UI::Bin;
…		…
834	}	793	}
835		794
836	sub add {	795	sub add {
837	my ($self, $child) = @_;	796	my ($self, $child) = @_;
838		797
839	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
840	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
841	}	800	}
842		801
843	sub remove {	802	sub remove {
844	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
…		…
954	sub size_request {	913	sub size_request {
955	my ($self) = @_;	914	my ($self) = @_;
956		915
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		917
959	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
961		920
962	($w, $h)	921	($w, $h)
963	}	922	}
964		923
965	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
986	$self->{view_x} = $x;	945	$self->{view_x} = $x;
987	$self->{view_y} = $y;	946	$self->{view_y} = $y;
988		947
989	$self->emit (changed => $x, $y);	948	$self->emit (changed => $x, $y);
990	$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);
991	}	968	}
992	}	969	}
993		970
994	# 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
995	sub coord2local {	972	sub coord2local {
…		…
1042	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1043		1020
1044	my $self;	1021	my $self;
1045		1022
1046	my $hslider = new CFPlus::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
1047	vertical => 0,	1026	vertical => 0,
1048	range => [0, 0, 1, 0.01], # HACK fix	1027	range => [0, 0, 1, 0.01], # HACK fix
1049	on_changed => sub {	1028	on_changed => sub {
1050	$self->{hpos} = $_[1];	1029	$self->{hpos} = $_[1];
1051	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052	},	1031	},
1053	;	1032	;
1054		1033
1055	my $vslider = new CFPlus::UI::Slider	1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1056	vertical => 1,	1037	vertical => 1,
1057	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1058	on_changed => sub {	1039	on_changed => sub {
1059	$self->{vpos} = $_[1];	1040	$self->{vpos} = $_[1];
1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1071	row_expand => [1, 0],	1052	row_expand => [1, 0],
1072	%arg,	1053	%arg,
1073	);	1054	);
1074		1055
1075	$self->{vp} = new CFPlus::UI::ViewPort	1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
1076	expand => 1,	1059	expand => 1,
1077	scroll_x => $self->{scroll_x},	1060	scroll_x => $self->{scroll_x},
1078	scroll_y => $self->{scroll_y},	1061	scroll_y => $self->{scroll_y},
1079	on_changed => sub {	1062	on_changed => sub {
1080	my ($vp, $x, $y) = @_;	1063	my ($vp, $x, $y) = @_;
…		…
1082	$vp->{parent}{hslider}->set_value ($x);	1065	$vp->{parent}{hslider}->set_value ($x);
1083	$vp->{parent}{vslider}->set_value ($y);	1066	$vp->{parent}{vslider}->set_value ($y);
1084		1067
1085	0	1068	0
1086	},	1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
1087	;	1075	;
1088		1076
1089	$self->SUPER::add_at (0, 0, $self->{vp});	1077	$self->SUPER::add ($self->{vp});
1090		1078
1091	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1092		1080
1093	$self	1081	$self
1094	}	1082	}
1095
1096	#TODO# update range on size_allocate depending on child
1097		1083
1098	sub add {	1084	sub add {
1099	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1100		1086
1101	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1102	}	1088	}
1103		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
1104	sub update_slider {	1094	sub update_slider {
1105	my ($self) = @_;	1095	my ($self) = @_;
1106		1096
1107	my $child = ($self->{vp} or return)->child;	1097	my $child = ($self->{vp} or return)->child;
1108		1098
		1099	if ($self->{scroll_x}) {
1109	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110	$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]);
1111		1102
1112	my $visible = $w1 > $w2;	1103	my $visible = $w1 > $w2;
1113	if ($visible != $self->{hslider}{visible}) {	1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
1114	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})	1106	$visible ? $self->SUPER::add ($self->{hslider})
1115	: $self->{hslider}->hide;	1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
1116	}	1109	}
1117		1110
		1111	if ($self->{scroll_y}) {
1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119	$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]);
1120		1114
1121	my $visible = $h1 > $h2;	1115	my $visible = $h1 > $h2;
1122	if ($visible != $self->{vslider}{visible}) {	1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
1123	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})	1118	$visible ? $self->SUPER::add ($self->{vslider})
1124	: $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);
1125	}	1139	};
1126	}
1127
1128	sub update {
1129	my ($self) = @_;
1130
1131	$self->update_slider;
1132	$self->SUPER::update;
1133	}	1140	}
1134		1141
1135	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1136	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1137		1144
1138	return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140	$self->{vslider}->emit (mouse_wheel => $ev);	1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1141		1147
1142	1	1148	1
1143	}	1149	}
1144		1150
1145	sub invoke_button_down {	1151	sub invoke_button_down {
1146	my ($self, $ev, $x, $y) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1147		1153
1148	if ($ev->{button} == 2) {	1154	if ($ev->{button} == 2) {
1149	$self->grab_focus;	1155	$self->start_dragging ($ev);
1150
1151	my $ox = $self->{vp}{view_x} + $ev->{x};
1152	my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154	$self->{motion} = sub {
1155	my ($ev, $x, $y) = @_;
1156
1157	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158	$self->update;
1159	};
1160
1161	return 1;	1156	return 1;
1162	}	1157	}
1163		1158
1164	0	1159	0
1165	}	1160	}
…		…
1216	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1217		1212
1218	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1220	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1221
1222	glBegin GL_QUADS;
1223	glVertex 0 , 0;
1224	glVertex 0 , $h;
1225	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1226	glVertex $w, 0;
1227	glEnd;
1228
1229	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1230	}	1218	}
1231		1219
1232	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1233	}	1221	}
…		…
1575		1563
1576	#############################################################################	1564	#############################################################################
1577		1565
1578	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1579		1567
1580	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1581		1569
1582	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1583		1571
1584	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1585		1573
1586	sub new {	1574	sub new {
1587	my $class = shift;	1575	my $class = shift;
1588		1576
1589	$class->SUPER::new (	1577	$class->SUPER::new (
1590	children => [],
1591	col_expand => [],	1578	col_expand => [],
1592	row_expand => [],	1579	row_expand => [],
1593	@_,	1580	@_,
1594	)	1581	)
1595	}	1582	}
1596		1583
1597	sub children {
1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1599	}
1600
1601	# TODO: store row/col info in child widget and use standard add/del
1602	sub add {	1584	sub add {
1603	my $self = shift;	1585	my ($self, @widgets) = @_;
1604		1586
1605	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#	1587	for my $child (@widgets) {
1606	$self->add_at (@_);	1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
1607	}	1593	}
1608		1594
1609	sub add_at {	1595	sub add_at {
1610	my $self = shift;	1596	my $self = shift;
1611		1597
		1598	my @widgets;
		1599
1612	while (@_) {	1600	while (@_) {
1613	my ($col, $row, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1614		1602
1615	$child->set_parent ($self);	1603	$child->{c_row} = $row;
1616	$self->{children}[$row][$col] = $child;	1604	$child->{c_col} = $col;
1617	}
1618		1605
1619	$self->{force_realloc} = 1;	1606	push @widgets, $child;
1620	$self->{force_size_alloc} = 1;	1607	}
1621	$self->realloc;
1622	}
1623		1608
1624	sub remove {	1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1625	my ($self, $child) = @_;	1613	my ($self) = @_;
1626		1614
1627	for (@{ $self->{children} }) {	1615	my (@w, @h);
1628	for (@{ $_ || [] }) {	1616
1629	$_ = 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];
1630	}	1627	}
1631	}	1628	}
1632	}
1633		1629
1634	# TODO: move to container class maybe? send children a signal on removal?	1630	# second pass, rows
1635	sub clear {	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1636	my ($self) = @_;
1637
1638	my @children = $self->children;
1639	delete $self->{children};
1640
1641	for (@children) {
1642	delete $_->{parent};
1643	$_->hide;
1644	}
1645
1646	$self->realloc;
1647	}
1648
1649	sub get_wh {
1650	my ($self) = @_;
1651
1652	my (@w, @h);
1653
1654	for my $y (0 .. $#{$self->{children}}) {
1655	my $row = $self->{children}[$y]
1656	or next;
1657
1658	for my $x (0 .. $#$row) {
1659	my $widget = $row->[$x]
1660	or next;
1661	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1662		1633
1663	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1664	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1665	}	1638	}
1666	}	1639	}
1667		1640
1668	(\@w, \@h)	1641	(\@w, \@h)
1669	}	1642	}
…		…
1685	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1686		1659
1687	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1688	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1689		1662
1690	# TODO: nicer code	1663	# now linearly scale the rows/columns to the allocated size
1691	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1692	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1693	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1694		1667
1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1702		1675
1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704		1677
1705	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1706		1679
1707	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1708		1682
1709	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1710	my $row = $self->{children}[$r]	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1711	or next;
1712		1685
1713	my $x = 0;	1686	$widget->configure (
1714	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1715		1689	);
1716	for my $c (0 .. $#$row) {
1717	my $col_w = $ws->[$c];
1718
1719	if (my $widget = $row->[$c]) {
1720	$widget->configure ($x, $y, $col_w, $row_h);
1721	}
1722
1723	$x += $col_w;
1724	}
1725
1726	$y += $row_h;
1727	}	1690	}
1728		1691
1729	1	1692	1
1730	}	1693	}
1731		1694
1732	sub find_widget {
1733	my ($self, $x, $y) = @_;
1734
1735	$x -= $self->{x};
1736	$y -= $self->{y};
1737
1738	my $res;
1739
1740	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1741	$res = $_->find_widget ($x, $y)
1742	and return $res;
1743	}
1744
1745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1746	}
1747
1748	sub _draw {
1749	my ($self) = @_;
1750
1751	for (grep $_, @{$self->{children}}) {
1752	$_->draw for grep $_, @$_;
1753	}
1754	}
1755
1756	#############################################################################	1695	#############################################################################
1757		1696
1758	package CFPlus::UI::Fixed;	1697	package CFPlus::UI::Fixed;
1759		1698
1760	use List::Util qw(min max);	1699	use List::Util qw(min max);
1761		1700
1762	our @ISA = CFPlus::UI::Container::;	1701	our @ISA = CFPlus::UI::Container::;
1763		1702
1764	sub add {
1765	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768	$self->SUPER::add ($child);
1769	}
1770
1771	sub _scale($$$) {	1703	sub _scale($$$) {
1772	my ($mode, $val, $max) = @_;	1704	my ($rel, $val, $max) = @_;
1773		1705
1774	$mode eq "abs" ? $val	1706	$rel ? $val * $max : $val
1775	: $mode eq "rel" ? $val * $max
1776	: 0
1777	}	1707	}
1778		1708
1779	sub size_request {	1709	sub size_request {
1780	my ($self) = @_;	1710	my ($self) = @_;
1781		1711
1782	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783		1713
1784	# determine overall size by querying abs widgets	1714	# determine overall size by querying abs widgets
1785	for my $child ($self->visible_children) {	1715	for my $child ($self->visible_children) {
1786	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};
1787		1719
1788	if ($pos eq "abs") {
1789	$w = _scale $size, $w, $child->{req_w};
1790	$h = _scale $size, $h, $child->{req_h};
1791
1792	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1793	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1794	}	1722	}
1795	}	1723	}
1796		1724
1797	my $W = $x2 - $x1;	1725	my $W = $x2 - $x1;
1798	my $H = $y2 - $y1;	1726	my $H = $y2 - $y1;
1799		1727
1800	# now layout remaining widgets	1728	# now layout remaining widgets
1801	for my $child ($self->visible_children) {	1729	for my $child ($self->visible_children) {
1802	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;
1803		1733
1804	if ($pos ne "abs") {
1805	$x = _scale $pos, $x, $W;
1806	$y = _scale $pos, $x, $H;
1807	$w = _scale $size, $w, $child->{req_w};
1808	$h = _scale $size, $h, $child->{req_h};
1809
1810	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1811	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1812	}	1736	}
1813	}	1737	}
1814		1738
1815	my $W = $x2 - $x1;	1739	my $W = $x2 - $x1;
1816	my $H = $y2 - $y1;	1740	my $H = $y2 - $y1;
…		…
1820		1744
1821	sub invoke_size_allocate {	1745	sub invoke_size_allocate {
1822	my ($self, $W, $H) = @_;	1746	my ($self, $W, $H) = @_;
1823		1747
1824	for my $child ($self->visible_children) {	1748	for my $child ($self->visible_children) {
1825	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;
1826		1751
1827	$x = _scale $pos, $x, $W;	1752	$x += $child->{c_halign} * $child->{req_w};
1828	$y = _scale $pos, $x, $H;	1753	$y += $child->{c_valign} * $child->{req_h};
1829	$w = _scale $size, $w, $child->{req_w};
1830	$h = _scale $size, $h, $child->{req_h};
1831		1754
1832	$child->configure ($x, $y, $w, $h);	1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1833	}	1756	}
1834		1757
1835	1	1758	1
1836	}	1759	}
1837		1760
…		…
1841		1764
1842	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1843		1766
1844	sub size_request {	1767	sub size_request {
1845	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1846		1771
1847	$self->{vertical}	1772	$self->{vertical}
1848	? (	1773	? (
1849	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1850	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1851	)	1776	)
1852	: (	1777	: (
1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1855	)	1780	)
1856	}	1781	}
1857		1782
1858	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1859	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1983		1908
1984	delete $self->{ox};	1909	delete $self->{ox};
1985	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1986	}	1911	}
1987		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1988	sub set_text {	1919	sub set_text {
1989	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1990		1921
1991	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1992	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
2098	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
2099		2030
2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2102	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2103	};	2036	};
2104		2037
2105	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
2106	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
2107		2040	# CFPlus::OpenGL::glNewList $self->{list};
2108	$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;
2109	}	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	#}
2110		2057
2111	#############################################################################	2058	#############################################################################
2112		2059
2113	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
2114		2061
…		…
2120	my $class = shift;	2067	my $class = shift;
2121		2068
2122	$class->SUPER::new (	2069	$class->SUPER::new (
2123	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
2124	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
2125	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
2126	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
2127	can_hover => 1,	2076	can_hover => 1,
2128	can_focus => 1,	2077	can_focus => 1,
2129	valign => 0,	2078	valign => 0,
2130	can_events => 1,	2079	can_events => 1,
2131	ellipsise => 0,	2080	ellipsise => 0,
…		…
2271	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2272	}	2221	}
2273		2222
2274	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2275	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2276	glBegin GL_QUADS;
2277	glVertex 0 , 0;
2278	glVertex 0 , $self->{h};
2279	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2280	glVertex $self->{w}, 0;
2281	glEnd;
2282	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2283		2227
2284	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2285		2229
2286	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2288		2232
2289	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2290	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2291	utf8::encode $text;	2235	utf8::encode $text;
2292		2236
2293	@$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);
2294	}	2238	}
2295		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2296	glBegin GL_LINES;	2241	glBegin GL_LINES;
2297	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};
2298	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;
2299	glEnd;	2259	glEnd;
2300	}	2260	}
2301	}	2261	}
2302		2262
2303	#############################################################################	2263	#############################################################################
…		…
2390	1	2350	1
2391	}	2351	}
2392		2352
2393	#############################################################################	2353	#############################################################################
2394		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
2395	package CFPlus::UI::Button;	2404	package CFPlus::UI::Button;
2396		2405
2397	our @ISA = CFPlus::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
2398		2407
2399	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
…		…
2533	sub new {	2542	sub new {
2534	my $class = shift;	2543	my $class = shift;
2535		2544
2536	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2537	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2538	@_,	2548	@_,
2539	);	2549	);
2540		2550
2541	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2542	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2567	}	2577	}
2568		2578
2569	sub size_request {	2579	sub size_request {
2570	my ($self) = @_;	2580	my ($self) = @_;
2571		2581
2572	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2573	}	2583	}
2574		2584
2575	sub _draw {	2585	sub _draw {
2576	my ($self) = @_;	2586	my ($self) = @_;
2577		2587
…		…
2587	}	2597	}
2588		2598
2589	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591		2601
2592	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2593		2603
2594	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2595	}	2605	}
2596		2606
2597	#############################################################################	2607	#############################################################################
…		…
2616	align => 0,	2626	align => 0,
2617	valign => 0,	2627	valign => 0,
2618	can_events => 1,	2628	can_events => 1,
2619	@_	2629	@_
2620	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2621	}	2637	}
2622		2638
2623	sub invoke_button_up {	2639	sub invoke_button_up {
2624	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2625		2641
…		…
2765	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2766	}	2782	}
2767		2783
2768	#############################################################################	2784	#############################################################################
2769		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	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2770	package CFPlus::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2771		2911
2772	our @ISA = CFPlus::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2773		2913
2774	sub new {	2914	sub new {
…		…
2899		3039
2900	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2901		3041
2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2903		3043
2904	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2905	}	3047	}
2906		3048
2907	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2908	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2909		3051
…		…
2929		3071
2930	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931		3073
2932	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933		3075
2934	! ! $delta	3076	1
2935	}	3077	}
2936		3078
2937	sub update {	3079	sub update {
2938	my ($self) = @_;	3080	my ($self) = @_;
2939		3081
…		…
3070	}	3212	}
3071		3213
3072	sub size_request {	3214	sub size_request {
3073	my ($self) = @_;	3215	my ($self) = @_;
3074		3216
3075	my ($empty, $slider) = @{ $self->{children} };	3217	my ($empty, $slider) = $self->visible_children;
3076		3218
3077	local $self->{children} = [$empty, $slider];	3219	local $self->{children} = [$empty, $slider];
3078	$self->SUPER::size_request	3220	$self->SUPER::size_request
3079	}	3221	}
3080		3222
…		…
3269		3411
3270	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
3271	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
3272		3414
3273	$layout->render ($para->{indent}, $y - $y0);	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
3274		3417
3275	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
3276	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
3277		3420
3278	for (@w) {	3421	for (@w) {
…		…
3469	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
3470		3613
3471	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
3472		3615
3473	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
3474	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
3475	glVertex 0 , 0;
3476	glVertex 0 , $h;
3477	glVertex $w, $h;
3478	glVertex $w, 0;
3479	glEnd;
3480		3618
3481	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
3482	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
3483	glVertex 0 , 0;
3484	glVertex 0 , $h;
3485	glVertex $w, $h;
3486	glVertex $w, 0;
3487	glEnd;
3488		3621
3489	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
3490		3623
3491	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
3492	}	3625	}
…		…
3512		3645
3513	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
3514	CFPlus::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
3515		3648
3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3518	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
3519	parked => 1,	3652	parked => 1,
3520	cb => sub {	3653	cb => sub {
3521	return unless $::CONN && $widget;	3654	return unless $::CONN;
3522		3655
		3656	my $w = $widget
		3657	or return;
		3658
3523	++$widget->{frame};	3659	++$w->{frame};
3524	$widget->update_face;	3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
3525	$widget->update;	3663	$w->update;
3526
3527	$widget->update_timer;	3664	$w->update_timer;
3528	},	3665	},
3529	);	3666	);
3530		3667
3531	$self->update_face;	3668	$self->update_face;
3532	$self->update_timer;	3669	$self->update_timer;
…		…
3553	}	3690	}
3554		3691
3555	sub update_face {	3692	sub update_face {
3556	my ($self) = @_;	3693	my ($self) = @_;
3557		3694
3558	return unless $::CONN;
3559
3560	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561	if ($anim && @$anim) {
3562	delete $self->{wait_face};
3563	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3564	}
3565	}
3566	}
3567
3568	sub size_request {
3569	my ($self) = @_;
3570
3571	if ($::CONN) {	3695	if ($::CONN) {
3572	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3573	if (my $tex = $::CONN->{texture}[$faceid]) {	3697	if ($anim && @$anim) {
3574	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3575	} else {	3699	delete $self->{face_change_cb};
3576	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3700
3577	$self->realloc;	3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
3578	});	3705	}
3579	}	3706	}
3580	}	3707	}
3581	}	3708	}
		3709	}
		3710
		3711	sub size_request {
		3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
3582		3727
3583	($self->{size_w} || 8, $self->{size_h} || 8)	3728	($self->{size_w} || 8, $self->{size_h} || 8)
3584	}	3729	}
3585		3730
3586	sub update {	3731	sub update {
…		…
3600	}	3745	}
3601		3746
3602	sub _draw {	3747	sub _draw {
3603	my ($self) = @_;	3748	my ($self) = @_;
3604		3749
3605	return unless $::CONN;
3606
3607	$self->SUPER::_draw;	3750	$self->SUPER::_draw;
3608		3751
3609	my $faceid = $::CONN->{faceid}[$self->{face}]	3752	if (my $tex = $self->{tex}) {
3610	or return;
3611
3612	my $tex = $::CONN->{texture}[$faceid];
3613
3614	if ($tex) {
3615	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3617	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3618	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3619	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3671	children => [	3809	children => [
3672	(new CFPlus::UI::Label markup => $left, expand => 1),	3810	(new CFPlus::UI::Label markup => $left, expand => 1),
3673	(new CFPlus::UI::Label markup => $right, align => +1),	3811	(new CFPlus::UI::Label markup => $right, align => +1),
3674	],	3812	],
3675	;	3813	;
3676		3814
3677	} else {	3815	} else {
3678	$widget = new CFPlus::UI::Label	3816	$widget = new CFPlus::UI::Label
3679	can_hover => 1,	3817	can_hover => 1,
3680	can_events => 1,	3818	can_events => 1,
3681	markup => $widget,	3819	markup => $widget,
…		…
3806		3944
3807	#############################################################################	3945	#############################################################################
3808		3946
3809	package CFPlus::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3810		3948
		3949	use CFPlus::OpenGL;
		3950
3811	our @ISA = CFPlus::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3812		3952
3813	sub new {	3953	sub new {
3814	my $class = shift;	3954	my $class = shift;
3815		3955
3816	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3817	buttonbar => (new CFPlus::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3819	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3820	@_,	3961	@_,
3821	);	3962	);
3822		3963
3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3824	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3825		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3826	$self	4001	$self
3827	}	4002	}
3828		4003
3829	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3830	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3831		4023
3832	CFPlus::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3833		4026
3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3835	markup => $title,
3836	tooltip => $tooltip,
3837	on_activate => sub { $self->set_current_page ($widget) },
3838	);
3839
3840	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
3841	}	4028	}
3842		4029
3843	sub get_current_page {	4030	sub get_current_page {
3844	my ($self) = @_;	4031	my ($self) = @_;
3845		4032
…		…
3849	sub set_current_page {	4036	sub set_current_page {
3850	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3851		4038
3852	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3853	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
		4041	}
		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
3854	}	4057	}
3855		4058
3856	#############################################################################	4059	#############################################################################
3857		4060
3858	package CFPlus::UI::Selector;	4061	package CFPlus::UI::Selector;
…		…
4128	}	4331	}
4129		4332
4130	sub update {	4333	sub update {
4131	my ($self) = @_;	4334	my ($self) = @_;
4132		4335
4133	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
4134	}	4337	}
4135		4338
4136	sub add {	4339	sub add {
4137	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
4138		4341
…		…
4175	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
4176	$_->()	4379	$_->()
4177	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
4178	}	4381	}
4179		4382
4180	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
4181	my %queue;	4384	my %queue;
4182	my @queue;	4385	my @queue;
4183	my $widget;	4386	my $widget;
4184		4387
4185	outer:	4388	outer:
…		…
4232	}	4435	}
4233	}	4436	}
4234		4437
4235	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
4236	}	4439	}
4237	}
4238		4440
4239	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
4240	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
4241	values %$size_alloc;	4443	values %$size_alloc;
4242		4444
4243	while () {	4445	while () {
4244	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
4245		4447
4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4247		4449
4248	$w = 0 if $w < 0;
4249	$h = 0 if $h < 0;
4250
4251	$w = max $widget->{min_w}, $w;	4450	$w = max $widget->{min_w}, $w;
4252	$h = max $widget->{min_h}, $h;	4451	$h = max $widget->{min_h}, $h;
4253		4452
4254	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256		4455
4257	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259		4458
4260	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
4261	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
4262		4461
4263	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4264	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
4265	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
4266		4465
4267	$widget->{w} = $w;	4466	$widget->{w} = $w;
4268	$widget->{h} = $h;	4467	$widget->{h} = $h;
4269		4468
4270	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
4271	}	4471	}
4272	}	4472	}
4273	}	4473	}
4274		4474
4275	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {

Diff Legend

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