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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

…		…
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		32
33	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
34		34
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	36	$TOOLTIP->show;
41	}	37	}
42		38
43	return;	39	return;
…		…
113	}	109	}
114		110
115	if ($GRAB) {	111	if ($GRAB) {
116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	112	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
117	# mousewheel	113	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		116
		117	$ev->{dx} = $shift ? $delta : 0;
		118	$ev->{dy} = $shift ? 0 : $delta;
		119
120	$GRAB->emit (mouse_wheel => $ev);	120	$GRAB->emit (mouse_wheel => $ev);
121	} else {	121	} else {
122	$GRAB->emit (button_down => $ev)	122	$GRAB->emit (button_down => $ev)
123	}	123	}
124	}	124	}
…		…
268	$self->hide;	268	$self->hide;
269	$self->emit ("destroy");	269	$self->emit ("destroy");
270	%$self = ();	270	%$self = ();
271	}	271	}
272		272
		273	sub TO_JSON {
		274	{ __w_ => $_[0]{s_id} }
		275	}
		276
273	sub show {	277	sub show {
274	my ($self) = @_;	278	my ($self) = @_;
275		279
276	return if $self->{parent};	280	return if $self->{parent};
277		281
…		…
316	sub set_visibility {	320	sub set_visibility {
317	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
318		322
319	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
320		324
321	$visible ? $self->hide	325	$visible ? $self->show
322	: $self->show;	326	: $self->hide;
323	}	327	}
324		328
325	sub toggle_visibility {	329	sub toggle_visibility {
326	my ($self) = @_;	330	my ($self) = @_;
327		331
…		…
543		547
544	# parent	548	# parent
545	$self->{parent} && $self->{parent}->emit ($signal, @args)	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
546	}	550	}
547		551
548	sub find_widget {	552	#sub find_widget {
549	my ($self, $x, $y) = @_;	553	# in .xs
550
551	return () unless $self->{can_events};
552
553	return $self
554	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557	()
558	}
559		554
560	sub set_parent {	555	sub set_parent {
561	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
562		557
563	CFPlus::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
…		…
594		589
595	# using global variables seems a bit hacky, but passing through all drawing	590	# using global variables seems a bit hacky, but passing through all drawing
596	# functions seems pointless.	591	# functions seems pointless.
597	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	592	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598		593
599	sub draw {	594	#sub draw {
600	my ($self) = @_;	595	#CFPlus.xs
601
602	return unless $self->{h} && $self->{w};
603
604	# update screen rectangle
605	local $draw_x = $draw_x + $self->{x};
606	local $draw_y = $draw_y + $self->{y};
607
608	# skip widgets that are entirely outside the drawing area
609	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
610	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
611
612	glPushMatrix;
613	glTranslate $self->{x}, $self->{y}, 0;
614
615	if ($self == $HOVER && $self->{can_hover}) {
616	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
617	glEnable GL_BLEND;
618	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619	glBegin GL_QUADS;
620	glVertex 0 , 0;
621	glVertex $self->{w}, 0;
622	glVertex $self->{w}, $self->{h};
623	glVertex 0 , $self->{h};
624	glEnd;
625	glDisable GL_BLEND;
626	}
627
628	if ($ENV{CFPLUS_DEBUG} & 1) {
629	glPushMatrix;
630	glColor 1, 1, 0, 1;
631	glTranslate 0.375, 0.375;
632	glBegin GL_LINE_LOOP;
633	glVertex 0 , 0;
634	glVertex $self->{w} - 1, 0;
635	glVertex $self->{w} - 1, $self->{h} - 1;
636	glVertex 0 , $self->{h} - 1;
637	glEnd;
638	glPopMatrix;
639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640	}
641
642	$self->_draw;
643	glPopMatrix;
644	}
645		596
646	sub _draw {	597	sub _draw {
647	my ($self) = @_;	598	my ($self) = @_;
648		599
649	warn "no draw defined for $self\n";	600	warn "no draw defined for $self\n";
650	}	601	}
651		602
652	my $cntx;#d#
653	sub DESTROY {	603	sub DESTROY {
654	my ($self) = @_;	604	my ($self) = @_;
655		605
656	return if CFPlus::in_destruct;	606	return if CFPlus::in_destruct;
657		607
		608	local $@;
658	eval { $self->destroy };	609	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	610	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660		611
661	delete $WIDGET{$self+0};	612	delete $WIDGET{$self+0};
662	}	613	}
…		…
670	use strict;	621	use strict;
671	use CFPlus::OpenGL;	622	use CFPlus::OpenGL;
672		623
673	sub new {	624	sub new {
674	my $class = shift;	625	my $class = shift;
675
676	# range [value, low, high, page]
677		626
678	$class->SUPER::new (	627	$class->SUPER::new (
679	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
680	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
681	@_	630	@_
…		…
693	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
694		643
695	glEnable GL_BLEND;	644	glEnable GL_BLEND;
696	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697	glColor_premultiply @$color;	646	glColor_premultiply @$color;
698
699	glBegin GL_QUADS;
700	glVertex 0 , 0;
701	glVertex 0 , $h;
702	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
703	glVertex $w, 0;
704	glEnd;
705
706	glDisable GL_BLEND;	648	glDisable GL_BLEND;
707	}	649	}
708	}	650	}
709		651
710	#############################################################################	652	#############################################################################
…		…
742	can_events => 0,	684	can_events => 0,
743	%arg,	685	%arg,
744	);	686	);
745		687
746	$self->add (@$children)	688	$self->add (@$children)
747	if $children;	689	if $children && @$children;
748		690
749	$self	691	$self
750	}	692	}
751		693
752	sub realloc {	694	sub realloc {
…		…
761	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
762		704
763	$_->set_parent ($self)	705	$_->set_parent ($self)
764	for @widgets;	706	for @widgets;
765		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
766	use sort 'stable';	709	use sort 'stable';
767		710
768	$self->{children} = [	711	$self->{children} = [
769	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
770	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
771	];	714	];
772		715
773	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
774	}	721	}
775		722
776	sub children {	723	sub children {
777	@{ $_[0]{children} }	724	@{ $_[0]{children} }
778	}	725	}
779		726
780	sub remove {	727	sub remove {
781	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
782		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
783	delete $child->{parent};	733	delete $child->{parent};
784	$child->hide;	734	$child->hide;
785
786	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
787		737
788	$self->realloc;	738	$self->realloc;
789	}	739	}
790		740
791	sub clear {	741	sub clear {
792	my ($self) = @_;	742	my ($self) = @_;
793		743
794	my $children = delete $self->{children};	744	my $children = $self->{children};
795	$self->{children} = [];	745	$self->{children} = [];
796		746
797	for (@$children) {	747	for (@$children) {
798	delete $_->{parent};	748	delete $_->{parent};
799	$_->hide;	749	$_->hide;
…		…
819	}	769	}
820		770
821	sub _draw {	771	sub _draw {
822	my ($self) = @_;	772	my ($self) = @_;
823		773
824	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
825	}	775	}
826		776
827	#############################################################################	777	#############################################################################
828		778
829	package CFPlus::UI::Bin;	779	package CFPlus::UI::Bin;
…		…
839	}	789	}
840		790
841	sub add {	791	sub add {
842	my ($self, $child) = @_;	792	my ($self, $child) = @_;
843		793
844	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
845	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
846	}	796	}
847		797
848	sub remove {	798	sub remove {
849	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
…		…
939	}	889	}
940		890
941	#############################################################################	891	#############################################################################
942		892
943	package CFPlus::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
		894
		895	use List::Util qw(min max);
944		896
945	our @ISA = CFPlus::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
946		898
947	sub new {	899	sub new {
948	my $class = shift;	900	my $class = shift;
…		…
957	sub size_request {	909	sub size_request {
958	my ($self) = @_;	910	my ($self) = @_;
959		911
960	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961		913
962	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
963	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
964		916
965	($w, $h)	917	($w, $h)
966	}	918	}
967		919
968	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
980	}	932	}
981		933
982	sub set_offset {	934	sub set_offset {
983	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
984		936
		937	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		938	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		939
		940	if ($x != $self->{view_x} or $y != $self->{view_y}) {
985	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
986	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
987		943
		944	$self->emit (changed => $x, $y);
988	$self->update;	945	$self->update;
		946	}
		947	}
		948
		949	sub set_center {
		950	my ($self, $x, $y) = @_;
		951
		952	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		953	}
		954
		955	sub make_visible {
		956	my ($self, $x, $y, $border) = @_;
		957
		958	if ( $x < $self->{view_x} + $self->{w} * $border
		959	\|\| $x > $self->{view_x} + $self->{w} * (1 - $border)
		960	\|\| $y < $self->{view_y} + $self->{h} * $border
		961	\|\| $y > $self->{view_y} + $self->{h} * (1 - $border)
		962	) {
		963	$self->set_center ($x, $y);
		964	}
989	}	965	}
990		966
991	# hmm, this does not work for topleft of $self... but we should not ask for that	967	# hmm, this does not work for topleft of $self... but we should not ask for that
992	sub coord2local {	968	sub coord2local {
993	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
1008	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
1009		985
1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012	) {	988	) {
1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	989	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014	} else {	990	} else {
1015	$self->CFPlus::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
1016	}	992	}
1017	}	993	}
1018		994
…		…
1029		1005
1030	#############################################################################	1006	#############################################################################
1031		1007
1032	package CFPlus::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
1033		1009
1034	our @ISA = CFPlus::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
1035		1011
1036	sub new {	1012	sub new {
1037	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
1038		1014
1039	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
1040		1016
1041	my $self;	1017	my $self;
1042		1018
1043	my $slider = new CFPlus::UI::Slider	1019	my $hslider = new CFPlus::UI::Slider
		1020	c_col => 0,
		1021	c_row => 1,
		1022	vertical => 0,
		1023	range => [0, 0, 1, 0.01], # HACK fix
		1024	on_changed => sub {
		1025	$self->{hpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1027	},
		1028	;
		1029
		1030	my $vslider = new CFPlus::UI::Slider
		1031	c_col => 1,
		1032	c_row => 0,
1044	vertical => 1,	1033	vertical => 1,
1045	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
1046	on_changed => sub {	1035	on_changed => sub {
1047	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048	},	1038	},
1049	;	1039	;
1050		1040
1051	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
1052	vp => (new CFPlus::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
1053	can_events => 1,	1044	can_events => 1,
1054	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
1055	%arg,	1049	%arg,
1056	);	1050	);
1057		1051
		1052	$self->{vp} = new CFPlus::UI::ViewPort
		1053	c_col => 0,
		1054	c_row => 0,
		1055	expand => 1,
		1056	scroll_x => $self->{scroll_x},
		1057	scroll_y => $self->{scroll_y},
		1058	on_changed => sub {
		1059	my ($vp, $x, $y) = @_;
		1060
		1061	$vp->{parent}{hslider}->set_value ($x);
		1062	$vp->{parent}{vslider}->set_value ($y);
		1063
		1064	0
		1065	},
		1066	on_size_allocate => sub {
		1067	my ($vp, $w, $h) = @_;
		1068	$vp->{parent}->update_slider;
		1069	0
		1070	},
		1071	;
		1072
1058	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
1059	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
1060		1076
1061	$self	1077	$self
1062	}	1078	}
1063
1064	#TODO# update range on size_allocate depending on child
1065		1079
1066	sub add {	1080	sub add {
1067	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
1068		1082
1069	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
1070	}	1084	}
1071		1085
		1086	sub set_offset { shift->{vp}->set_offset (@_) }
		1087	sub set_center { shift->{vp}->set_center (@_) }
		1088	sub make_visible { shift->{vp}->make_visible (@_) }
		1089
		1090	sub update_slider {
		1091	my ($self) = @_;
		1092
		1093	my $child = ($self->{vp} or return)->child;
		1094
		1095	if ($self->{scroll_x}) {
		1096	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1097	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1098
		1099	my $visible = $w1 > $w2;
		1100	if ($visible != $self->{hslider_visible}) {
		1101	$self->{hslider_visible} = $visible;
		1102	$visible ? $self->SUPER::add ($self->{hslider})
		1103	: $self->SUPER::remove ($self->{hslider});
		1104	}
		1105	}
		1106
		1107	if ($self->{scroll_y}) {
		1108	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1109	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1110
		1111	my $visible = $h1 > $h2;
		1112	if ($visible != $self->{vslider_visible}) {
		1113	$self->{vslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{vslider})
		1115	: $self->SUPER::remove ($self->{vslider});
		1116	}
		1117	}
		1118	}
		1119
		1120	sub start_dragging {
		1121	my ($self, $ev) = @_;
		1122
		1123	$self->grab_focus;
		1124
		1125	my $ox = $self->{vp}{view_x};
		1126	my $oy = $self->{vp}{view_y};
		1127
		1128	$self->{motion} = sub {
		1129	my ($ev, $x, $y) = @_;
		1130
		1131	$ox -= $ev->{xrel};
		1132	$oy -= $ev->{yrel};
		1133
		1134	$self->{vp}->set_offset ($ox, $oy);
		1135	};
		1136	}
		1137
1072	sub invoke_mouse_wheel {	1138	sub invoke_mouse_wheel {
1073	my ($self, $ev) = @_;	1139	my ($self, $ev) = @_;
1074		1140
1075	return 0 unless $ev->{dy}; # only vertical movements
1076
1077	$self->{slider}->emit (mouse_wheel => $ev);	1141	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1142	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078		1143
1079	1	1144	1
1080	}	1145	}
1081		1146
1082	sub update_slider {	1147	sub invoke_button_down {
1083	my ($self) = @_;	1148	my ($self, $ev, $x, $y) = @_;
1084		1149
1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1150	if ($ev->{button} == 2) {
1086	}	1151	$self->start_dragging ($ev);
		1152	return 1;
		1153	}
1087		1154
1088	sub update {	1155	0
1089	my ($self) = @_;	1156	}
1090		1157
1091	$self->SUPER::update;	1158	sub invoke_button_up {
		1159	my ($self, $ev, $x, $y) = @_;
1092		1160
1093	$self->update_slider;	1161	if (delete $self->{motion}) {
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_mouse_motion {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($self->{motion}) {
		1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
		1175
		1176	0
1094	}	1177	}
1095		1178
1096	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1097	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1098		1181
1099	$self->update_slider;	1182	$self->update_slider;
1100
1101	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1102	}	1184	}
1103		1185
1104	#############################################################################	1186	#############################################################################
1105		1187
…		…
1125	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1126		1208
1127	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1128	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1130
1131	glBegin GL_QUADS;
1132	glVertex 0 , 0;
1133	glVertex 0 , $h;
1134	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1135	glVertex $w, 0;
1136	glEnd;
1137
1138	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1139	}	1214	}
1140		1215
1141	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1142	}	1217	}
…		…
1255		1330
1256	my @border =	1331	my @border =
1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1332	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1333	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1259		1334
		1335	my @icon =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(x1_move.png x1_resize.png);
		1338
1260	sub new {	1339	sub new {
1261	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1262		1341
1263	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
1264	bg => [1, 1, 1, 1],	1343	bg => [1, 1, 1, 1],
…		…
1432	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433		1512
1434	my $border = $self->border;	1513	my $border = $self->border;
1435		1514
1436	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1437	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1519	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1520
		1521	# move
		1522	my $w2 = ($w - $border) * .5;
		1523	my $h2 = ($h - $border) * .5;
		1524	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1525	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1526	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1527
		1528	# resize
		1529	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1531	unless $self->{has_close_button};
		1532	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1533	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1441		1534
1442	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1443	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1444		1537
1445	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1466		1559
1467	#############################################################################	1560	#############################################################################
1468		1561
1469	package CFPlus::UI::Table;	1562	package CFPlus::UI::Table;
1470		1563
1471	our @ISA = CFPlus::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1472		1565
1473	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1474		1567
1475	use CFPlus::OpenGL;	1568	use CFPlus::OpenGL;
1476		1569
1477	sub new {	1570	sub new {
1478	my $class = shift;	1571	my $class = shift;
1479		1572
1480	$class->SUPER::new (	1573	$class->SUPER::new (
1481	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1482	@_,	1576	@_,
1483	)	1577	)
1484	}	1578	}
1485		1579
1486	sub children {
1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488	}
1489
1490	sub add {	1580	sub add {
		1581	my ($self, @widgets) = @_;
		1582
		1583	for my $child (@widgets) {
		1584	$child->{c_rowspan} \|\|= 1;
		1585	$child->{c_colspan} \|\|= 1;
		1586	}
		1587
		1588	$self->SUPER::add (@widgets);
		1589	}
		1590
		1591	sub add_at {
1491	my ($self) = shift;	1592	my $self = shift;
		1593
		1594	my @widgets;
1492		1595
1493	while (@_) {	1596	while (@_) {
1494	my ($x, $y, $child) = splice @_, 0, 3, ();	1597	my ($col, $row, $child) = splice @_, 0, 3, ();
1495	$child->set_parent ($self);
1496	$self->{children}[$y][$x] = $child;
1497	}
1498		1598
1499	$self->{force_realloc} = 1;	1599	$child->{c_row} = $row;
1500	$self->{force_size_alloc} = 1;	1600	$child->{c_col} = $col;
1501	$self->realloc;
1502	}
1503		1601
1504	sub remove {	1602	push @widgets, $child;
		1603	}
		1604
		1605	$self->add (@widgets);
		1606	}
		1607
		1608	sub get_wh {
1505	my ($self, $child) = @_;	1609	my ($self) = @_;
1506		1610
1507	# TODO: not yet implemented	1611	my (@w, @h);
1508	}
1509
1510	# TODO: move to container class maybe? send children a signal on removal?
1511	sub clear {
1512	my ($self) = @_;
1513		1612
1514	my @children = $self->children;	1613	my @children = $self->children;
1515	delete $self->{children};	1614
		1615	# first pass, columns
		1616	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1617	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1618
		1619	my $sw = sum @w[$c .. $c + $cs - 1];
		1620
		1621	if ($w > $sw) {
		1622	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1623	}
1516		1624	}
1517	for (@children) {
1518	delete $_->{parent};
1519	$_->hide;
1520	}
1521		1625
1522	$self->realloc;	1626	# second pass, rows
1523	}	1627	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525	sub get_wh {
1526	my ($self) = @_;
1527
1528	my (@w, @h);
1529
1530	for my $y (0 .. $#{$self->{children}}) {
1531	my $row = $self->{children}[$y]
1532	or next;
1533
1534	for my $x (0 .. $#$row) {
1535	my $widget = $row->[$x]
1536	or next;
1537	my ($w, $h) = @$widget{qw(req_w req_h)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538		1629
1539	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1540	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541	}	1634	}
1542	}	1635	}
1543		1636
1544	(\@w, \@h)	1637	(\@w, \@h)
1545	}	1638	}
…		…
1561	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1562		1655
1563	my $req_w = (sum @$ws) \|\| 1;	1656	my $req_w = (sum @$ws) \|\| 1;
1564	my $req_h = (sum @$hs) \|\| 1;	1657	my $req_h = (sum @$hs) \|\| 1;
1565		1658
1566	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1567	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1568	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1569	my $col_expand = (sum @col_expand) \|\| 1;	1662	my $col_expand = (sum @col_expand) \|\| 1;
1570		1663
1571	# linearly scale sizes
1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1574		1665
1575	CFPlus::UI::harmonize $ws;	1666	CFPlus::UI::harmonize $ws;
		1667
		1668	my @row_expand = @{$self->{row_expand}};
		1669	@row_expand = (1) x @$ws unless @row_expand;
		1670	my $row_expand = (sum @row_expand) \|\| 1;
		1671
		1672	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1673
1576	CFPlus::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1577		1675
1578	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579		1678
1580	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1581	my $row = $self->{children}[$r]	1680	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582	or next;
1583		1681
1584	my $x = 0;	1682	$widget->configure (
1585	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586		1685	);
1587	for my $c (0 .. $#$row) {	1686	}
1588	my $col_w = $ws->[$c];
1589		1687
1590	if (my $widget = $row->[$c]) {	1688	1
1591	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1592	}
1593		1690
1594	$x += $col_w;	1691	#############################################################################
		1692
		1693	package CFPlus::UI::Fixed;
		1694
		1695	use List::Util qw(min max);
		1696
		1697	our @ISA = CFPlus::UI::Container::;
		1698
		1699	sub _scale($$$) {
		1700	my ($rel, $val, $max) = @_;
		1701
		1702	$rel ? $val * $max : $val
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707
		1708	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1709
		1710	# determine overall size by querying abs widgets
		1711	for my $child ($self->visible_children) {
		1712	unless ($child->{c_rel}) {
		1713	my $x = $child->{c_x};
		1714	my $y = $child->{c_y};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595	}	1718	}
		1719	}
1596		1720
1597	$y += $row_h;	1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	if ($child->{c_rel}) {
		1727	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1728	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1729
		1730	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1731	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1732	}
		1733	}
		1734
		1735	my $W = $x2 - $x1;
		1736	my $H = $y2 - $y1;
		1737
		1738	($W, $H)
		1739	}
		1740
		1741	sub invoke_size_allocate {
		1742	my ($self, $W, $H) = @_;
		1743
		1744	for my $child ($self->visible_children) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x += $child->{c_halign} * $child->{req_w};
		1749	$y += $child->{c_valign} * $child->{req_h};
		1750
		1751	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598	}	1752	}
1599		1753
1600	1	1754	1
1601	}	1755	}
1602		1756
1603	sub find_widget {
1604	my ($self, $x, $y) = @_;
1605
1606	$x -= $self->{x};
1607	$y -= $self->{y};
1608
1609	my $res;
1610
1611	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612	$res = $_->find_widget ($x, $y)
1613	and return $res;
1614	}
1615
1616	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617	}
1618
1619	sub _draw {
1620	my ($self) = @_;
1621
1622	for (grep $_, @{$self->{children}}) {
1623	$_->draw for grep $_, @$_;
1624	}
1625	}
1626
1627	#############################################################################	1757	#############################################################################
1628		1758
1629	package CFPlus::UI::Box;	1759	package CFPlus::UI::Box;
1630		1760
1631	our @ISA = CFPlus::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1632		1762
1633	sub size_request {	1763	sub size_request {
1634	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1635		1767
1636	$self->{vertical}	1768	$self->{vertical}
1637	? (	1769	? (
1638	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1639	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1640	)	1772	)
1641	: (	1773	: (
1642	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1643	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1644	)	1776	)
1645	}	1777	}
1646		1778
1647	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1648	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1772		1904
1773	delete $self->{ox};	1905	delete $self->{ox};
1774	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
1775	}	1907	}
1776		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
		1913	}
		1914
1777	sub set_text {	1915	sub set_text {
1778	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1779		1917
1780	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1781	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
…		…
1887	: ($self->{w} - $size->[0]) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1888		2026
1889	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1892	};	2032	};
1893		2033
1894	my $w = List::Util::min $self->{w} + 4, $size->[0];	2034	# unless ($self->{list}) {
1895	my $h = List::Util::min $self->{h} + 2, $size->[1];	2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1896		2036	# CFPlus::OpenGL::glNewList $self->{list};
1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2038	# CFPlus::OpenGL::glEndList;
		2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
		2042
		2043	$self->{layout}->draw;
1898	}	2044	}
		2045
		2046	#sub destroy {
		2047	# my ($self) = @_;
		2048	#
		2049	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2050	#
		2051	# $self->SUPER::destroy;
		2052	#}
1899		2053
1900	#############################################################################	2054	#############################################################################
1901		2055
1902	package CFPlus::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1903		2057
…		…
1909	my $class = shift;	2063	my $class = shift;
1910		2064
1911	$class->SUPER::new (	2065	$class->SUPER::new (
1912	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1913	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1914	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1915	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1916	can_hover => 1,	2072	can_hover => 1,
1917	can_focus => 1,	2073	can_focus => 1,
1918	valign => 0,	2074	valign => 0,
1919	can_events => 1,	2075	can_events => 1,
1920	ellipsise => 0,	2076	ellipsise => 0,
…		…
1969	my $mod = $ev->{mod};	2125	my $mod = $ev->{mod};
1970	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1971	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1972		2128
1973	my $text = $self->get_text;	2129	my $text = $self->get_text;
		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974		2132
1975	if ($uni == 8) {	2133	if ($uni == 8) {
1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1978	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
…		…
2058	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
2059	}	2217	}
2060		2218
2061	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
2062	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063	glBegin GL_QUADS;
2064	glVertex 0 , 0;
2065	glVertex 0 , $self->{h};
2066	glVertex $self->{w}, $self->{h};	2221	glRect 0, 0, $self->{w}, $self->{h};
2067	glVertex $self->{w}, 0;
2068	glEnd;
2069	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
2070		2223
2071	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
2072		2225
2073	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
2075		2228
2076	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
2077	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
2078	utf8::encode $text;	2231	utf8::encode $text;
2079		2232
2080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2233	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081	}	2234	}
2082		2235
		2236	glColor_premultiply @{$self->{active_fg}};
2083	glBegin GL_LINES;	2237	glBegin GL_LINES;
2084	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2085	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2240	glEnd;
		2241
		2242	glLineWidth 3;
		2243	glColor @{$self->{active_outline}};
		2244	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2245	glLineWidth 1;
		2246
		2247	} else {
		2248	glColor @{$self->{outline}};
		2249	glTranslate .375, .375;
		2250	glBegin GL_LINE_STRIP;
		2251	glVertex 0, $self->{h} * .5;
		2252	glVertex 0, $self->{h} - 3;
		2253	glVertex $self->{w} - 1, $self->{h} - 3;
		2254	glVertex $self->{w} - 1, $self->{h} * .5;
2086	glEnd;	2255	glEnd;
2087	}	2256	}
2088	}	2257	}
2089		2258
2090	#############################################################################	2259	#############################################################################
…		…
2177	1	2346	1
2178	}	2347	}
2179		2348
2180	#############################################################################	2349	#############################################################################
2181		2350
2182	package CFPlus::UI::Button;	2351	package CFPlus::UI::ButtonBin;
2183		2352
2184	our @ISA = CFPlus::UI::Label::;	2353	our @ISA = CFPlus::UI::Bin::;
2185		2354
2186	use CFPlus::OpenGL;	2355	use CFPlus::OpenGL;
2187		2356
2188	my @tex =	2357	my @tex =
2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw(b1_button_active.png);	2359	qw(b1_button_inactive.png b1_button_active.png);
2191		2360
2192	sub new {	2361	sub new {
2193	my $class = shift;	2362	my $class = shift;
2194		2363
2195	$class->SUPER::new (	2364	$class->SUPER::new (
2196	padding_x => 4,
2197	padding_y => 4,
2198	fg => [1, 1, 1],
2199	active_fg => [0, 0, 1],
2200	can_hover => 1,	2365	can_hover => 1,
2201	align => 0,	2366	align => 0,
2202	valign => 0,	2367	valign => 0,
2203	can_events => 1,	2368	can_events => 1,
2204	@_	2369	@_
…		…
2216	}	2381	}
2217		2382
2218	sub _draw {	2383	sub _draw {
2219	my ($self) = @_;	2384	my ($self) = @_;
2220		2385
2221	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223	glEnable GL_TEXTURE_2D;	2386	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2387	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 0, 0, 0, 1;	2388	glColor 0, 0, 0, 1;
2226		2389
		2390	my $tex = $tex[$GRAB == $self];
2227	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2391	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2392
		2393	glDisable GL_TEXTURE_2D;
		2394
		2395	$self->SUPER::_draw;
		2396	}
		2397
		2398	#############################################################################
		2399
		2400	package CFPlus::UI::Button;
		2401
		2402	our @ISA = CFPlus::UI::Label::;
		2403
		2404	use CFPlus::OpenGL;
		2405
		2406	my @tex =
		2407	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2408	qw(b1_button_inactive.png b1_button_active.png);
		2409
		2410	sub new {
		2411	my $class = shift;
		2412
		2413	$class->SUPER::new (
		2414	padding_x => 4,
		2415	padding_y => 4,
		2416	fg => [1.0, 1.0, 1.0],
		2417	active_fg => [0.8, 0.8, 0.8],
		2418	can_hover => 1,
		2419	align => 0,
		2420	valign => 0,
		2421	can_events => 1,
		2422	@_
		2423	)
		2424	}
		2425
		2426	sub invoke_button_up {
		2427	my ($self, $ev, $x, $y) = @_;
		2428
		2429	$self->emit ("activate")
		2430	if $x >= 0 && $x < $self->{w}
		2431	&& $y >= 0 && $y < $self->{h};
		2432
		2433	1
		2434	}
		2435
		2436	sub _draw {
		2437	my ($self) = @_;
		2438
		2439	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2443	glColor 0, 0, 0, 1;
		2444
		2445	my $tex = $tex[$GRAB == $self];
		2446	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228		2447
2229	glDisable GL_TEXTURE_2D;	2448	glDisable GL_TEXTURE_2D;
2230		2449
2231	$self->SUPER::_draw;	2450	$self->SUPER::_draw;
2232	}	2451	}
…		…
2319	sub new {	2538	sub new {
2320	my $class = shift;	2539	my $class = shift;
2321		2540
2322	my $self = $class->SUPER::new (	2541	my $self = $class->SUPER::new (
2323	can_events => 0,	2542	can_events => 0,
		2543	scale => 1,
2324	@_,	2544	@_,
2325	);	2545	);
2326		2546
2327	$self->{path} \|\| $self->{tex}	2547	$self->{path} \|\| $self->{tex}
2328	or Carp::croak "'path' or 'tex' attributes required";	2548	or Carp::croak "'path' or 'tex' attributes required";
…		…
2353	}	2573	}
2354		2574
2355	sub size_request {	2575	sub size_request {
2356	my ($self) = @_;	2576	my ($self) = @_;
2357		2577
2358	($self->{tex}{w}, $self->{tex}{h})	2578	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359	}	2579	}
2360		2580
2361	sub _draw {	2581	sub _draw {
2362	my ($self) = @_;	2582	my ($self) = @_;
2363		2583
…		…
2373	}	2593	}
2374		2594
2375	glEnable GL_TEXTURE_2D;	2595	glEnable GL_TEXTURE_2D;
2376	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377		2597
2378	$tex->draw_quad (0, 0, $w, $h);	2598	$tex->draw_quad_alpha (0, 0, $w, $h);
2379		2599
2380	glDisable GL_TEXTURE_2D;	2600	glDisable GL_TEXTURE_2D;
2381	}	2601	}
2382		2602
2383	#############################################################################	2603	#############################################################################
…		…
2402	align => 0,	2622	align => 0,
2403	valign => 0,	2623	valign => 0,
2404	can_events => 1,	2624	can_events => 1,
2405	@_	2625	@_
2406	);	2626	);
		2627	}
		2628
		2629	sub invoke_button_down {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	1
2407	}	2633	}
2408		2634
2409	sub invoke_button_up {	2635	sub invoke_button_up {
2410	my ($self, $ev, $x, $y) = @_;	2636	my ($self, $ev, $x, $y) = @_;
2411		2637
…		…
2551	glDisable GL_TEXTURE_2D;	2777	glDisable GL_TEXTURE_2D;
2552	}	2778	}
2553		2779
2554	#############################################################################	2780	#############################################################################
2555		2781
		2782	package CFPlus::UI::Progress;
		2783
		2784	our @ISA = CFPlus::UI::Label::;
		2785
		2786	use CFPlus::OpenGL;
		2787
		2788	sub new {
		2789	my ($class, %arg) = @_;
		2790
		2791	my $self = $class->SUPER::new (
		2792	fg => [1, 1, 1],
		2793	bg => [0, 0, 1, 0.2],
		2794	bar => [0.7, 0.5, 0.1, 0.8],
		2795	outline => [0.4, 0.3, 0],
		2796	fontsize => 0.9,
		2797	valign => 0,
		2798	align => 0,
		2799	can_events => 1,
		2800	ellipsise => 1,
		2801	label => "%d%%",
		2802	%arg,
		2803	);
		2804
		2805	$self->set_value ($arg{value} \|\| -1);
		2806
		2807	$self
		2808	}
		2809
		2810	sub set_label {
		2811	my ($self, $label) = @_;
		2812
		2813	return if $self->{label} eq $label;
		2814	$self->{label} = $label;
		2815
		2816	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2817	}
		2818
		2819	sub set_value {
		2820	my ($self, $value) = @_;
		2821
		2822	if ($self->{value} ne $value) {
		2823	$self->{value} = $value;
		2824
		2825	if ($value < 0) {
		2826	$self->set_text ("-");
		2827	} else {
		2828	$self->set_text (sprintf $self->{label}, $value * 100);
		2829	}
		2830
		2831	$self->update;
		2832	}
		2833	}
		2834
		2835	sub _draw {
		2836	my ($self) = @_;
		2837
		2838	glEnable GL_BLEND;
		2839	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2840
		2841	if ($self->{value} >= 0) {
		2842	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2843
		2844	glColor_premultiply @{$self->{bar}};
		2845	glRect 2, 2, $s, $self->{h} - 2;
		2846	glColor_premultiply @{$self->{bg}};
		2847	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2848	}
		2849
		2850	glColor_premultiply @{$self->{outline}};
		2851	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2852
		2853	glDisable GL_BLEND;
		2854
		2855	{
		2856	local $self->{bg}; # do not draw background
		2857	$self->SUPER::_draw;
		2858	}
		2859	}
		2860
		2861	#############################################################################
		2862
		2863	package CFPlus::UI::ExperienceProgress;
		2864
		2865	our @ISA = CFPlus::UI::Progress::;
		2866
		2867	sub new {
		2868	my ($class, %arg) = @_;
		2869
		2870	my $self = $class->SUPER::new (
		2871	tooltip => sub {
		2872	my ($self) = @_;
		2873
		2874	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2875	$self->{lvl},
		2876	::formsep ($self->{exp}),
		2877	::formsep ($self->{nxt}),
		2878	::formsep ($self->{nxt} - $self->{exp}),
		2879	},
		2880	%arg
		2881	);
		2882
		2883	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2884	if $::CONN;
		2885
		2886	$self
		2887	}
		2888
		2889	sub DESTROY {
		2890	my ($self) = @_;
		2891
		2892	delete $::CONN->{on_exp_update}{$self+0}
		2893	if $::CONN;
		2894
		2895	$self->SUPER::DESTROY;
		2896	}
		2897
		2898	sub set_value {
		2899	my ($self, $lvl, $exp) = @_;
		2900
		2901	<<<<<<< UI.pm
		2902	$self->{lvl} = $lvl;
		2903	$self->{exp} = $exp;
		2904
		2905	=======
		2906	$self->{lvl} = $exp;
		2907	$self->{exp} = $exp;
		2908
		2909	>>>>>>> 1.434
		2910	my $v = -1;
		2911
		2912	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2913	my $l0 = $table->[$lvl - 1];
		2914	my $l1 = $table->[$lvl];
		2915
		2916	$self->{nxt} = $l1;
		2917
		2918	$v = ($exp - $l0) / ($l1 - $l0);
		2919	}
		2920
		2921	$self->SUPER::set_value ($v);
		2922	}
		2923
		2924	#############################################################################
		2925
2556	package CFPlus::UI::Gauge;	2926	package CFPlus::UI::Gauge;
2557		2927
2558	our @ISA = CFPlus::UI::VBox::;	2928	our @ISA = CFPlus::UI::VBox::;
2559		2929
2560	sub new {	2930	sub new {
…		…
2685		3055
2686	$self->SUPER::invoke_button_down ($ev, $x, $y);	3056	$self->SUPER::invoke_button_down ($ev, $x, $y);
2687		3057
2688	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3058	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689		3059
2690	$self->invoke_mouse_motion ($ev, $x, $y)	3060	$self->invoke_mouse_motion ($ev, $x, $y);
		3061
		3062	1
2691	}	3063	}
2692		3064
2693	sub invoke_mouse_motion {	3065	sub invoke_mouse_motion {
2694	my ($self, $ev, $x, $y) = @_;	3066	my ($self, $ev, $x, $y) = @_;
2695		3067
…		…
2715		3087
2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3088	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717		3089
2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3090	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719		3091
2720	! ! $delta	3092	1
2721	}	3093	}
2722		3094
2723	sub update {	3095	sub update {
2724	my ($self) = @_;	3096	my ($self) = @_;
2725		3097
…		…
2856	}	3228	}
2857		3229
2858	sub size_request {	3230	sub size_request {
2859	my ($self) = @_;	3231	my ($self) = @_;
2860		3232
2861	my ($empty, $slider) = @{ $self->{children} };	3233	my ($empty, $slider) = $self->visible_children;
2862		3234
2863	local $self->{children} = [$empty, $slider];	3235	local $self->{children} = [$empty, $slider];
2864	$self->SUPER::size_request	3236	$self->SUPER::size_request
2865	}	3237	}
2866		3238
…		…
3055		3427
3056	if ($y0 < $y + $h && $y < $y1) {	3428	if ($y0 < $y + $h && $y < $y1) {
3057	my $layout = $self->get_layout ($para);	3429	my $layout = $self->get_layout ($para);
3058		3430
3059	$layout->render ($para->{indent}, $y - $y0);	3431	$layout->render ($para->{indent}, $y - $y0);
		3432	$layout->draw;
3060		3433
3061	if (my @w = @{ $para->{widget} }) {	3434	if (my @w = @{ $para->{widget} }) {
3062	my @s = $layout->get_shapes;	3435	my @s = $layout->get_shapes;
3063		3436
3064	for (@w) {	3437	for (@w) {
…		…
3186	}	3559	}
3187		3560
3188	sub set_tooltip_from {	3561	sub set_tooltip_from {
3189	my ($self, $widget) = @_;	3562	my ($self, $widget) = @_;
3190		3563
3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192	if $widget->{tooltip} =~ /^#(.*)$/;
3193
3194	my $tooltip = $widget->{tooltip};	3564	my $tip = $widget->{tooltip};
		3565	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3566
		3567	$tip = CFPlus::Pod::section_label tooltip => $1
		3568	if $tip =~ /^#(.*)$/;
3195		3569
3196	if ($ENV{CFPLUS_DEBUG} & 2) {	3570	if ($ENV{CFPLUS_DEBUG} & 2) {
3197	$tooltip .= "\n\n" . (ref $widget) . "\n"	3571	$tip .= "\n\n" . (ref $widget) . "\n"
3198	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3572	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3199	. "req $widget->{req_w} $widget->{req_h}\n"	3573	. "req $widget->{req_w} $widget->{req_h}\n"
3200	. "visible $widget->{visible}";	3574	. "visible $widget->{visible}";
3201	}	3575	}
3202		3576
3203	$tooltip =~ s/^\n+//;	3577	$tip =~ s/^\n+//;
3204	$tooltip =~ s/\n+$//;	3578	$tip =~ s/\n+$//;
3205		3579
3206	$self->add (new CFPlus::UI::Label	3580	$self->add (new CFPlus::UI::Label
3207	markup => $tooltip,	3581	markup => $tip,
3208	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3582	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
3209	fontsize => 0.8,	3583	fontsize => 0.8,
3210	style => 1, # FLAG_INVERSE	3584	style => 1, # FLAG_INVERSE
3211	ellipsise => 0,	3585	ellipsise => 0,
3212	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	3586	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
3255	glTranslate 0.375, 0.375;	3629	glTranslate 0.375, 0.375;
3256		3630
3257	my ($w, $h) = @$self{qw(w h)};	3631	my ($w, $h) = @$self{qw(w h)};
3258		3632
3259	glColor 1, 0.8, 0.4;	3633	glColor 1, 0.8, 0.4;
3260	glBegin GL_QUADS;	3634	glRect 0, 0, $w, $h;
3261	glVertex 0 , 0;
3262	glVertex 0 , $h;
3263	glVertex $w, $h;
3264	glVertex $w, 0;
3265	glEnd;
3266		3635
3267	glColor 0, 0, 0;	3636	glColor 0, 0, 0;
3268	glBegin GL_LINE_LOOP;	3637	glRect_lineloop 0, 0, $w, $h;
3269	glVertex 0 , 0;
3270	glVertex 0 , $h;
3271	glVertex $w, $h;
3272	glVertex $w, 0;
3273	glEnd;
3274		3638
3275	glTranslate 2 - 0.375, 2 - 0.375;	3639	glTranslate 2 - 0.375, 2 - 0.375;
3276		3640
3277	$self->SUPER::_draw;	3641	$self->SUPER::_draw;
3278	}	3642	}
…		…
3287		3651
3288	sub new {	3652	sub new {
3289	my $class = shift;	3653	my $class = shift;
3290		3654
3291	my $self = $class->SUPER::new (	3655	my $self = $class->SUPER::new (
		3656	size_w => 32,
		3657	size_h => 8,
3292	aspect => 1,	3658	aspect => 1,
3293	can_events => 0,	3659	can_events => 0,
3294	@_,	3660	@_,
3295	);	3661	);
3296		3662
3297	if ($self->{anim} && $self->{animspeed}) {	3663	if ($self->{anim} && $self->{animspeed}) {
3298	CFPlus::weaken (my $widget = $self);	3664	CFPlus::weaken (my $widget = $self);
3299		3665
		3666	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3667	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3300	$self->{timer} = Event->timer (	3668	$self->{timer} = Event->timer (
3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302	hard => 1,	3669	parked => 1,
3303	interval => $self->{animspeed},
3304	cb => sub {	3670	cb => sub {
		3671	return unless $::CONN;
		3672
		3673	my $w = $widget
		3674	or return;
		3675
3305	++$widget->{frame};	3676	++$w->{frame};
		3677	$w->update_face;
		3678
		3679	# somehow, $widget can go away
3306	$widget->update;	3680	$w->update;
		3681	$w->update_timer;
3307	},	3682	},
3308	);	3683	);
		3684
		3685	$self->update_face;
		3686	$self->update_timer;
3309	}	3687	}
3310		3688
3311	$self	3689	$self
3312	}	3690	}
3313		3691
		3692	sub update_timer {
		3693	my ($self) = @_;
		3694
		3695	return unless $self->{timer};
		3696
		3697	if ($self->{visible}) {
		3698	$self->{timer}->at (
		3699	$self->{anim_start}
		3700	+ $self->{animspeed}
		3701	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3702	);
		3703	$self->{timer}->start;
		3704	} else {
		3705	$self->{timer}->stop;
		3706	}
		3707	}
		3708
		3709	sub update_face {
		3710	my ($self) = @_;
		3711
		3712	if ($::CONN) {
		3713	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3714	if ($anim && @$anim) {
		3715	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3716	delete $self->{face_change_cb};
		3717
		3718	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3719	unless ($tex->{name} \|\| $tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723	}
		3724	}
		3725	}
		3726	}
		3727
3314	sub size_request {	3728	sub size_request {
3315	(32, 8)	3729	my ($self) = @_;
		3730
		3731	if ($::CONN) {
		3732	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3733	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3734	if ($tex->{name}) {
		3735	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3736	} elsif (!$tex->{loading}) {
		3737	$tex->upload (sub { $self->reconfigure });
		3738	}
		3739	}
		3740
		3741	$self->{face_change_cb} \|\|= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3742	}
		3743	}
		3744
		3745	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3316	}	3746	}
3317		3747
3318	sub update {	3748	sub update {
3319	my ($self) = @_;	3749	my ($self) = @_;
3320		3750
3321	return unless $self->{visible};	3751	return unless $self->{visible};
3322		3752
3323	$self->SUPER::update;	3753	$self->SUPER::update;
3324	}	3754	}
3325		3755
		3756	sub invoke_visibility_change {
		3757	my ($self) = @_;
		3758
		3759	$self->update_timer;
		3760
		3761	0
		3762	}
		3763
3326	sub _draw {	3764	sub _draw {
3327	my ($self) = @_;	3765	my ($self) = @_;
3328		3766
3329	return unless $::CONN;
3330
3331	$self->SUPER::_draw;	3767	$self->SUPER::_draw;
3332		3768
3333	my $face;	3769	if (my $tex = $self->{tex}) {
3334
3335	if ($self->{frame}) {
3336	my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338	$face = $anim->[ $self->{frame} % @$anim ]
3339	if $anim && @$anim;
3340	}
3341
3342	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
3343
3344	if ($tex) {
3345	glEnable GL_TEXTURE_2D;	3770	glEnable GL_TEXTURE_2D;
3346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3771	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347	glColor 0, 0, 0, 1;	3772	glColor 0, 0, 0, 1;
3348	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3773	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349	glDisable GL_TEXTURE_2D;	3774	glDisable GL_TEXTURE_2D;
…		…
3351	}	3776	}
3352		3777
3353	sub destroy {	3778	sub destroy {
3354	my ($self) = @_;	3779	my ($self) = @_;
3355		3780
3356	$self->{timer}->cancel	3781	(delete $self->{timer})->cancel
3357	if $self->{timer};	3782	if $self->{timer};
3358		3783
3359	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3360	}	3785	}
3361		3786
…		…
3401	children => [	3826	children => [
3402	(new CFPlus::UI::Label markup => $left, expand => 1),	3827	(new CFPlus::UI::Label markup => $left, expand => 1),
3403	(new CFPlus::UI::Label markup => $right, align => +1),	3828	(new CFPlus::UI::Label markup => $right, align => +1),
3404	],	3829	],
3405	;	3830	;
3406		3831
3407	} else {	3832	} else {
3408	$widget = new CFPlus::UI::Label	3833	$widget = new CFPlus::UI::Label
3409	can_hover => 1,	3834	can_hover => 1,
3410	can_events => 1,	3835	can_events => 1,
3411	markup => $widget,	3836	markup => $widget,
…		…
3536		3961
3537	#############################################################################	3962	#############################################################################
3538		3963
3539	package CFPlus::UI::Notebook;	3964	package CFPlus::UI::Notebook;
3540		3965
		3966	use CFPlus::OpenGL;
		3967
3541	our @ISA = CFPlus::UI::VBox::;	3968	our @ISA = CFPlus::UI::VBox::;
3542		3969
3543	sub new {	3970	sub new {
3544	my $class = shift;	3971	my $class = shift;
3545		3972
3546	my $self = $class->SUPER::new (	3973	my $self = $class->SUPER::new (
3547	buttonbar => (new CFPlus::UI::Buttonbar),	3974	buttonbar => (new CFPlus::UI::Buttonbar),
3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3975	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3976	active_outline => [1, 1, 0],
3549	# filter => # will be put between multiplexer and $self	3977	# filter => # will be put between multiplexer and $self
3550	@_,	3978	@_,
3551	);	3979	);
3552		3980
3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3981	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});	3982	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
3555		3983
		3984	{
		3985	Scalar::Util::weaken (my $wself = $self);
		3986
		3987	$self->{multiplexer}->connect (c_add => sub {
		3988	my ($mplex, $widgets) = @_;
		3989
		3990	for my $child (@$widgets) {
		3991	Scalar::Util::weaken $child;
		3992	$child->{c_tab_} \|\|= do {
		3993	my $tab =
		3994	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3995	? $child->{c_tab}
		3996	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3997
		3998	$tab->connect (activate => sub {
		3999	$wself->set_current_page ($child);
		4000	});
		4001
		4002	$tab
		4003	};
		4004
		4005	$self->{buttonbar}->add ($child->{c_tab_});
		4006	}
		4007	});
		4008
		4009	$self->{multiplexer}->connect (c_remove => sub {
		4010	my ($mplex, $widgets) = @_;
		4011
		4012	for my $child (@$widgets) {
		4013	$wself->{buttonbar}->remove ($child->{c_tab_});
		4014	}
		4015	});
		4016	}
		4017
3556	$self	4018	$self
3557	}	4019	}
3558		4020
3559	sub add {	4021	sub add {
		4022	my ($self, @widgets) = @_;
		4023
		4024	$self->{multiplexer}->add (@widgets)
		4025	}
		4026
		4027	sub remove {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->remove (@widgets)
		4031	}
		4032
		4033	sub pages {
		4034	my ($self) = @_;
		4035	$self->{multiplexer}->children
		4036	}
		4037
		4038	sub add_tab {
3560	my ($self, $title, $widget, $tooltip) = @_;	4039	my ($self, $title, $widget, $tooltip) = @_;
3561		4040
3562	CFPlus::weaken $self;	4041	$title = [$title, $tooltip] unless ref $title;
		4042	$widget->{c_tab} = $title;
3563		4043
3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3565	markup => $title,
3566	tooltip => $tooltip,
3567	on_activate => sub { $self->set_current_page ($widget) },
3568	);
3569
3570	$self->{multiplexer}->add ($widget);	4044	$self->add ($widget);
3571	}	4045	}
3572		4046
3573	sub get_current_page {	4047	sub get_current_page {
3574	my ($self) = @_;	4048	my ($self) = @_;
3575		4049
…		…
3579	sub set_current_page {	4053	sub set_current_page {
3580	my ($self, $page) = @_;	4054	my ($self, $page) = @_;
3581		4055
3582	$self->{multiplexer}->set_current_page ($page);	4056	$self->{multiplexer}->set_current_page ($page);
3583	$self->emit (page_changed => $self->{multiplexer}{current});	4057	$self->emit (page_changed => $self->{multiplexer}{current});
		4058	}
		4059
		4060	sub _draw {
		4061	my ($self) = @_;
		4062
		4063	$self->SUPER::_draw ();
		4064
		4065	if (my $cur = $self->{multiplexer}{current}) {
		4066	if ($cur = $cur->{c_tab_}) {
		4067	glTranslate $cur->{x}, $cur->{y};
		4068	glLineWidth 3;
		4069	glColor @{$self->{active_outline}};
		4070	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4071	glLineWidth 1;
		4072	}
		4073	}
3584	}	4074	}
3585		4075
3586	#############################################################################	4076	#############################################################################
3587		4077
3588	package CFPlus::UI::Selector;	4078	package CFPlus::UI::Selector;
…		…
3858	}	4348	}
3859		4349
3860	sub update {	4350	sub update {
3861	my ($self) = @_;	4351	my ($self) = @_;
3862		4352
3863	$::WANT_REFRESH++;	4353	$::WANT_REFRESH->start;
3864	}	4354	}
3865		4355
3866	sub add {	4356	sub add {
3867	my ($self, @children) = @_;	4357	my ($self, @children) = @_;
3868		4358
…		…
3905	while ($self->{refresh_hook}) {	4395	while ($self->{refresh_hook}) {
3906	$_->()	4396	$_->()
3907	for values %{delete $self->{refresh_hook}};	4397	for values %{delete $self->{refresh_hook}};
3908	}	4398	}
3909		4399
3910	if ($self->{realloc}) {	4400	while ($self->{realloc}) {
3911	my %queue;	4401	my %queue;
3912	my @queue;	4402	my @queue;
3913	my $widget;	4403	my $widget;
3914		4404
3915	outer:	4405	outer:
…		…
3962	}	4452	}
3963	}	4453	}
3964		4454
3965	delete $self->{realloc}{$widget+0};	4455	delete $self->{realloc}{$widget+0};
3966	}	4456	}
3967	}
3968		4457
3969	while (my $size_alloc = delete $self->{size_alloc}) {	4458	while (my $size_alloc = delete $self->{size_alloc}) {
3970	my @queue = sort { $b->{visible} <=> $a->{visible} }	4459	my @queue = sort { $a->{visible} <=> $b->{visible} }
3971	values %$size_alloc;	4460	values %$size_alloc;
3972		4461
3973	while () {	4462	while () {
3974	my $widget = pop @queue \|\| last;	4463	my $widget = pop @queue \|\| last;
3975		4464
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4465	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4466
3978	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;
3980
3981	$w = max $widget->{min_w}, $w;	4467	$w = max $widget->{min_w}, $w;
3982	$h = max $widget->{min_h}, $h;	4468	$h = max $widget->{min_h}, $h;
3983		4469
3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4470	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4471	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986		4472
3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4473	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4474	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989		4475
3990	$w = int $w + 0.5;	4476	$w = int $w + 0.5;
3991	$h = int $h + 0.5;	4477	$h = int $h + 0.5;
3992		4478
3993	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4479	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
3994	$widget->{old_w} = $widget->{w};	4480	$widget->{old_w} = $widget->{w};
3995	$widget->{old_h} = $widget->{h};	4481	$widget->{old_h} = $widget->{h};
3996		4482
3997	$widget->{w} = $w;	4483	$widget->{w} = $w;
3998	$widget->{h} = $h;	4484	$widget->{h} = $h;
3999		4485
4000	$widget->emit (size_allocate => $w, $h);	4486	$widget->emit (size_allocate => $w, $h);
		4487	}
4001	}	4488	}
4002	}	4489	}
4003	}	4490	}
4004		4491
4005	while ($self->{post_alloc_hook}) {	4492	while ($self->{post_alloc_hook}) {
4006	$_->()	4493	$_->()
4007	for values %{delete $self->{post_alloc_hook}};	4494	for values %{delete $self->{post_alloc_hook}};
4008	}	4495	}
4009
4010		4496
4011	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4497	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4498	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013	glClear GL_COLOR_BUFFER_BIT;	4499	glClear GL_COLOR_BUFFER_BIT;
4014		4500

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs. Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC