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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 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	}
…		…
269	$self->emit ("destroy");	269	$self->emit ("destroy");
270	%$self = ();	270	%$self = ();
271	}	271	}
272		272
273	sub TO_JSON {	273	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	274	{ "\fw" => $_[0]{s_id} }
275	}	275	}
276		276
277	sub show {	277	sub show {
278	my ($self) = @_;	278	my ($self) = @_;
279		279
…		…
358		358
359	$self->{force_w} = $w;	359	$self->{force_w} = $w;
360	$self->{force_h} = $h;	360	$self->{force_h} = $h;
361		361
362	$self->realloc;	362	$self->realloc;
		363	}
		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
363	}	373	}
364		374
365	sub size_request {	375	sub size_request {
366	require Carp;	376	require Carp;
367	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
…		…
547		557
548	# parent	558	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	560	}
551		561
552	sub find_widget {	562	#sub find_widget {
553	my ($self, $x, $y) = @_;	563	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		564
564	sub set_parent {	565	sub set_parent {
565	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
566		567
567	CFPlus::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
…		…
598		599
599	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	601	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		603
603	sub draw {	604	#sub draw {
604	my ($self) = @_;	605	#CFPlus.xs
605
606	return unless $self->{h} && $self->{w};
607
608	# update screen rectangle
609	local $draw_x = $draw_x + $self->{x};
610	local $draw_y = $draw_y + $self->{y};
611
612	# skip widgets that are entirely outside the drawing area
613	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
614	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
615
616	glPushMatrix;
617	glTranslate $self->{x}, $self->{y}, 0;
618
619	if ($self == $HOVER && $self->{can_hover}) {
620	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
621	glEnable GL_BLEND;
622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glBegin GL_QUADS;
624	glVertex 0 , 0;
625	glVertex $self->{w}, 0;
626	glVertex $self->{w}, $self->{h};
627	glVertex 0 , $self->{h};
628	glEnd;
629	glDisable GL_BLEND;
630	}
631
632	if ($ENV{CFPLUS_DEBUG} & 1) {
633	glPushMatrix;
634	glColor 1, 1, 0, 1;
635	glTranslate 0.375, 0.375;
636	glBegin GL_LINE_LOOP;
637	glVertex 0 , 0;
638	glVertex $self->{w} - 1, 0;
639	glVertex $self->{w} - 1, $self->{h} - 1;
640	glVertex 0 , $self->{h} - 1;
641	glEnd;
642	glPopMatrix;
643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644	}
645
646	$self->_draw;
647	glPopMatrix;
648	}
649		606
650	sub _draw {	607	sub _draw {
651	my ($self) = @_;	608	my ($self) = @_;
652		609
653	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
654	}	611	}
655		612
656	my $cntx;#d#
657	sub DESTROY {	613	sub DESTROY {
658	my ($self) = @_;	614	my ($self) = @_;
659		615
660	return if CFPlus::in_destruct;	616	return if CFPlus::in_destruct;
661		617
		618	local $@;
662	eval { $self->destroy };	619	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		621
665	delete $WIDGET{$self+0};	622	delete $WIDGET{$self+0};
666	}	623	}
…		…
674	use strict;	631	use strict;
675	use CFPlus::OpenGL;	632	use CFPlus::OpenGL;
676		633
677	sub new {	634	sub new {
678	my $class = shift;	635	my $class = shift;
679
680	# range [value, low, high, page]
681		636
682	$class->SUPER::new (	637	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
685	@_	640	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
698		653
699	glEnable GL_BLEND;	654	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	656	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	658	glDisable GL_BLEND;
711	}	659	}
712	}	660	}
713		661
714	#############################################################################	662	#############################################################################
…		…
746	can_events => 0,	694	can_events => 0,
747	%arg,	695	%arg,
748	);	696	);
749		697
750	$self->add (@$children)	698	$self->add (@$children)
751	if $children;	699	if $children && @$children;
752		700
753	$self	701	$self
754	}	702	}
755		703
756	sub realloc {	704	sub realloc {
…		…
765	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
766		714
767	$_->set_parent ($self)	715	$_->set_parent ($self)
768	for @widgets;	716	for @widgets;
769		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	719	use sort 'stable';
771		720
772	$self->{children} = [	721	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
775	];	724	];
776		725
777	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
778	}	731	}
779		732
780	sub children {	733	sub children {
781	@{ $_[0]{children} }	734	@{ $_[0]{children} }
782	}	735	}
783		736
784	sub remove {	737	sub remove {
785	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
786		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
787	delete $child->{parent};	743	delete $child->{parent};
788	$child->hide;	744	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
791		747
792	$self->realloc;	748	$self->realloc;
793	}	749	}
794		750
795	sub clear {	751	sub clear {
796	my ($self) = @_;	752	my ($self) = @_;
797		753
798	my $children = delete $self->{children};	754	my $children = $self->{children};
799	$self->{children} = [];	755	$self->{children} = [];
800		756
801	for (@$children) {	757	for (@$children) {
802	delete $_->{parent};	758	delete $_->{parent};
803	$_->hide;	759	$_->hide;
…		…
823	}	779	}
824		780
825	sub _draw {	781	sub _draw {
826	my ($self) = @_;	782	my ($self) = @_;
827		783
828	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
829	}	785	}
830		786
831	#############################################################################	787	#############################################################################
832		788
833	package CFPlus::UI::Bin;	789	package CFPlus::UI::Bin;
…		…
843	}	799	}
844		800
845	sub add {	801	sub add {
846	my ($self, $child) = @_;	802	my ($self, $child) = @_;
847		803
848	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
849	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
850	}	806	}
851		807
852	sub remove {	808	sub remove {
853	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
…		…
871		827
872	1	828	1
873	}	829	}
874		830
875	#############################################################################	831	#############################################################################
876
877	# back-buffered drawing area	832	# back-buffered drawing area
878		833
879	package CFPlus::UI::Window;	834	package CFPlus::UI::Window;
880		835
881	our @ISA = CFPlus::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
…		…
963	sub size_request {	918	sub size_request {
964	my ($self) = @_;	919	my ($self) = @_;
965		920
966	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967		922
968	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
969	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
970		925
971	($w, $h)	926	($w, $h)
972	}	927	}
973		928
974	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
998	$self->emit (changed => $x, $y);	953	$self->emit (changed => $x, $y);
999	$self->update;	954	$self->update;
1000	}	955	}
1001	}	956	}
1002		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	\|\| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	\|\| $y < $self->{view_y} + $self->{h} * $border
		970	\|\| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
		974	}
		975
1003	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
1004	sub coord2local {	977	sub coord2local {
1005	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
1006		979
1007	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	980	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
1020	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
1021		994
1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024	) {	997	) {
1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026	} else {	999	} else {
1027	$self->CFPlus::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
1028	}	1001	}
1029	}	1002	}
1030		1003
…		…
1051	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1052		1025
1053	my $self;	1026	my $self;
1054		1027
1055	my $hslider = new CFPlus::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
1056	vertical => 0,	1031	vertical => 0,
1057	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
1058	on_changed => sub {	1033	on_changed => sub {
1059	$self->{hpos} = $_[1];	1034	$self->{hpos} = $_[1];
1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061	},	1036	},
1062	;	1037	;
1063		1038
1064	my $vslider = new CFPlus::UI::Slider	1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
1065	vertical => 1,	1042	vertical => 1,
1066	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1067	on_changed => sub {	1044	on_changed => sub {
1068	$self->{vpos} = $_[1];	1045	$self->{vpos} = $_[1];
1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1080	row_expand => [1, 0],	1057	row_expand => [1, 0],
1081	%arg,	1058	%arg,
1082	);	1059	);
1083		1060
1084	$self->{vp} = new CFPlus::UI::ViewPort	1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
1085	expand => 1,	1064	expand => 1,
1086	scroll_x => $self->{scroll_x},	1065	scroll_x => $self->{scroll_x},
1087	scroll_y => $self->{scroll_y},	1066	scroll_y => $self->{scroll_y},
1088	on_changed => sub {	1067	on_changed => sub {
1089	my ($vp, $x, $y) = @_;	1068	my ($vp, $x, $y) = @_;
…		…
1091	$vp->{parent}{hslider}->set_value ($x);	1070	$vp->{parent}{hslider}->set_value ($x);
1092	$vp->{parent}{vslider}->set_value ($y);	1071	$vp->{parent}{vslider}->set_value ($y);
1093		1072
1094	0	1073	0
1095	},	1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
1096	;	1080	;
1097		1081
1098	$self->SUPER::add (0, 0, $self->{vp});	1082	$self->SUPER::add ($self->{vp});
1099		1083
1100	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
1101		1085
1102	$self	1086	$self
1103	}	1087	}
1104
1105	#TODO# update range on size_allocate depending on child
1106		1088
1107	sub add {	1089	sub add {
1108	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
1109		1091
1110	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
1111	}	1093	}
1112		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
1113	sub update_slider {	1099	sub update_slider {
1114	my ($self) = @_;	1100	my ($self) = @_;
1115		1101
1116	my $child = ($self->{vp} or return)->child;	1102	my $child = ($self->{vp} or return)->child;
1117		1103
		1104	if ($self->{scroll_x}) {
1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120		1107
1121	my $visible = $w1 > $w2;	1108	my $visible = $w1 > $w2;
1122	if ($visible != $self->{hslider}{visible}) {	1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1111	$visible ? $self->SUPER::add ($self->{hslider})
1124	: $self->{hslider}->hide;	1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
1125	}	1114	}
1126		1115
		1116	if ($self->{scroll_y}) {
1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129		1119
1130	my $visible = $h1 > $h2;	1120	my $visible = $h1 > $h2;
1131	if ($visible != $self->{vslider}{visible}) {	1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1123	$visible ? $self->SUPER::add ($self->{vslider})
1133	: $self->{vslider}->hide;	1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
		1130	my ($self, $ev) = @_;
		1131
		1132	$self->grab_focus;
		1133
		1134	my $ox = $self->{vp}{view_x};
		1135	my $oy = $self->{vp}{view_y};
		1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
1134	}	1144	};
1135	}
1136
1137	sub update {
1138	my ($self) = @_;
1139
1140	$self->SUPER::update;
1141	$self->update_slider;
1142	}	1145	}
1143		1146
1144	sub invoke_mouse_wheel {	1147	sub invoke_mouse_wheel {
1145	my ($self, $ev) = @_;	1148	my ($self, $ev) = @_;
1146		1149
1147	return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149	$self->{vslider}->emit (mouse_wheel => $ev);	1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150		1152
1151	1	1153	1
1152	}	1154	}
1153		1155
1154	sub invoke_button_down {	1156	sub invoke_button_down {
1155	my ($self, $ev, $x, $y) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1156		1158
1157	if ($ev->{button} == 2) {	1159	if ($ev->{button} == 2) {
1158	$self->grab_focus;	1160	$self->start_dragging ($ev);
1159
1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1161	my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163	$self->{motion} = sub {
1164	my ($ev, $x, $y) = @_;
1165
1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167	$self->update;
1168	};
1169
1170	return 1;	1161	return 1;
1171	}	1162	}
1172		1163
1173	0	1164	0
1174	}	1165	}
…		…
1225	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1226		1217
1227	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1228	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1230
1231	glBegin GL_QUADS;
1232	glVertex 0 , 0;
1233	glVertex 0 , $h;
1234	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1235	glVertex $w, 0;
1236	glEnd;
1237
1238	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1239	}	1223	}
1240		1224
1241	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1242	}	1226	}
…		…
1355		1339
1356	my @border =	1340	my @border =
1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1341	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
		1347
1360	sub new {	1348	sub new {
1361	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1362		1350
1363	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
1364	bg => [1, 1, 1, 1],	1352	bg => [1, 1, 1, 1],
…		…
1399		1387
1400	sub border {	1388	sub border {
1401	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
1402	}	1390	}
1403		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
		1399	}
		1400
1404	sub size_request {	1401	sub size_request {
1405	my ($self) = @_;	1402	my ($self) = @_;
1406		1403
1407	$self->{title_widget}->size_request	1404	$self->{title_widget}->size_request
1408	if $self->{title_widget};	1405	if $self->{title_widget};
…		…
1532	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533		1530
1534	my $border = $self->border;	1531	my $border = $self->border;
1535		1532
1536	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1537	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541		1552
1542	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1543	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1544		1555
1545	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1566		1577
1567	#############################################################################	1578	#############################################################################
1568		1579
1569	package CFPlus::UI::Table;	1580	package CFPlus::UI::Table;
1570		1581
1571	our @ISA = CFPlus::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1572		1583
1573	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1574		1585
1575	use CFPlus::OpenGL;	1586	use CFPlus::OpenGL;
1576		1587
1577	sub new {	1588	sub new {
1578	my $class = shift;	1589	my $class = shift;
1579		1590
1580	$class->SUPER::new (	1591	$class->SUPER::new (
1581	children => [],
1582	col_expand => [],	1592	col_expand => [],
1583	row_expand => [],	1593	row_expand => [],
1584	@_,	1594	@_,
1585	)	1595	)
1586	}	1596	}
1587		1597
1588	sub children {
1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590	}
1591
1592	# TODO: store row/col info in child widget and use standard add/del
1593	sub add {	1598	sub add {
		1599	my ($self, @widgets) = @_;
		1600
		1601	for my $child (@widgets) {
		1602	$child->{c_rowspan} \|\|= 1;
		1603	$child->{c_colspan} \|\|= 1;
		1604	}
		1605
		1606	$self->SUPER::add (@widgets);
		1607	}
		1608
		1609	sub add_at {
1594	my ($self) = shift;	1610	my $self = shift;
		1611
		1612	my @widgets;
1595		1613
1596	while (@_) {	1614	while (@_) {
1597	my ($x, $y, $child) = splice @_, 0, 3, ();	1615	my ($col, $row, $child) = splice @_, 0, 3, ();
1598	$child->set_parent ($self);
1599	$self->{children}[$y][$x] = $child;
1600	}
1601		1616
1602	$self->{force_realloc} = 1;	1617	$child->{c_row} = $row;
1603	$self->{force_size_alloc} = 1;	1618	$child->{c_col} = $col;
1604	$self->realloc;
1605	}
1606		1619
1607	sub remove {	1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1608	my ($self, $child) = @_;	1627	my ($self) = @_;
1609		1628
1610	for (@{ $self->{children} }) {	1629	my (@w, @h);
1611	for (@{ $_ \|\| [] }) {	1630
1612	$_ = undef if $_ == $child;	1631	my @children = $self->children;
		1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613	}	1641	}
1614	}	1642	}
1615	}
1616		1643
1617	# TODO: move to container class maybe? send children a signal on removal?	1644	# second pass, rows
1618	sub clear {	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1619	my ($self) = @_;
1620
1621	my @children = $self->children;
1622	delete $self->{children};
1623
1624	for (@children) {
1625	delete $_->{parent};
1626	$_->hide;
1627	}
1628
1629	$self->realloc;
1630	}
1631
1632	sub get_wh {
1633	my ($self) = @_;
1634
1635	my (@w, @h);
1636
1637	for my $y (0 .. $#{$self->{children}}) {
1638	my $row = $self->{children}[$y]
1639	or next;
1640
1641	for my $x (0 .. $#$row) {
1642	my $widget = $row->[$x]
1643	or next;
1644	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645		1647
1646	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1647	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648	}	1652	}
1649	}	1653	}
1650		1654
1651	(\@w, \@h)	1655	(\@w, \@h)
1652	}	1656	}
…		…
1668	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1669		1673
1670	my $req_w = (sum @$ws) \|\| 1;	1674	my $req_w = (sum @$ws) \|\| 1;
1671	my $req_h = (sum @$hs) \|\| 1;	1675	my $req_h = (sum @$hs) \|\| 1;
1672		1676
1673	# TODO: nicer code	1677	# now linearly scale the rows/columns to the allocated size
1674	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1675	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1676	my $col_expand = (sum @col_expand) \|\| 1;	1680	my $col_expand = (sum @col_expand) \|\| 1;
1677		1681
1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1685		1689
1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687		1691
1688	CFPlus::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1689		1693
1690	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691		1696
1692	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1693	my $row = $self->{children}[$r]	1698	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1694	or next;
1695		1699
1696	my $x = 0;	1700	$widget->configure (
1697	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698		1703	);
1699	for my $c (0 .. $#$row) {
1700	my $col_w = $ws->[$c];
1701
1702	if (my $widget = $row->[$c]) {
1703	$widget->configure ($x, $y, $col_w, $row_h);
1704	}
1705
1706	$x += $col_w;
1707	}
1708
1709	$y += $row_h;
1710	}	1704	}
1711		1705
1712	1	1706	1
1713	}	1707	}
1714		1708
1715	sub find_widget {
1716	my ($self, $x, $y) = @_;
1717
1718	$x -= $self->{x};
1719	$y -= $self->{y};
1720
1721	my $res;
1722
1723	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724	$res = $_->find_widget ($x, $y)
1725	and return $res;
1726	}
1727
1728	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729	}
1730
1731	sub _draw {
1732	my ($self) = @_;
1733
1734	for (grep $_, @{$self->{children}}) {
1735	$_->draw for grep $_, @$_;
1736	}
1737	}
1738
1739	#############################################################################	1709	#############################################################################
1740		1710
1741	package CFPlus::UI::Fixed;	1711	package CFPlus::UI::Fixed;
1742		1712
1743	use List::Util qw(min max);	1713	use List::Util qw(min max);
1744		1714
1745	our @ISA = CFPlus::UI::Container::;	1715	our @ISA = CFPlus::UI::Container::;
1746		1716
1747	sub add {
1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751	$self->SUPER::add ($child);
1752	}
1753
1754	sub _scale($$$) {	1717	sub _scale($$$) {
1755	my ($mode, $val, $max) = @_;	1718	my ($rel, $val, $max) = @_;
1756		1719
1757	$mode eq "abs" ? $val	1720	$rel ? $val * $max : $val
1758	: $mode eq "rel" ? $val * $max
1759	: 0
1760	}	1721	}
1761		1722
1762	sub size_request {	1723	sub size_request {
1763	my ($self) = @_;	1724	my ($self) = @_;
1764		1725
1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766		1727
1767	# determine overall size by querying abs widgets	1728	# determine overall size by querying abs widgets
1768	for my $child ($self->visible_children) {	1729	for my $child ($self->visible_children) {
1769	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
1770		1733
1771	if ($pos eq "abs") {
1772	$w = _scale $size, $w, $child->{req_w};
1773	$h = _scale $size, $h, $child->{req_h};
1774
1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777	}	1736	}
1778	}	1737	}
1779		1738
1780	my $W = $x2 - $x1;	1739	my $W = $x2 - $x1;
1781	my $H = $y2 - $y1;	1740	my $H = $y2 - $y1;
1782		1741
1783	# now layout remaining widgets	1742	# now layout remaining widgets
1784	for my $child ($self->visible_children) {	1743	for my $child ($self->visible_children) {
1785	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1786		1747
1787	if ($pos ne "abs") {
1788	$x = _scale $pos, $x, $W;
1789	$y = _scale $pos, $x, $H;
1790	$w = _scale $size, $w, $child->{req_w};
1791	$h = _scale $size, $h, $child->{req_h};
1792
1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795	}	1750	}
1796	}	1751	}
1797		1752
1798	my $W = $x2 - $x1;	1753	my $W = $x2 - $x1;
1799	my $H = $y2 - $y1;	1754	my $H = $y2 - $y1;
…		…
1803		1758
1804	sub invoke_size_allocate {	1759	sub invoke_size_allocate {
1805	my ($self, $W, $H) = @_;	1760	my ($self, $W, $H) = @_;
1806		1761
1807	for my $child ($self->visible_children) {	1762	for my $child ($self->visible_children) {
1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809		1765
1810	$x = _scale $pos, $x, $W;	1766	$x += $child->{c_halign} * $child->{req_w};
1811	$y = _scale $pos, $x, $H;	1767	$y += $child->{c_valign} * $child->{req_h};
1812	$w = _scale $size, $w, $child->{req_w};
1813	$h = _scale $size, $h, $child->{req_h};
1814		1768
1815	$child->configure ($x, $y, $w, $h);	1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816	}	1770	}
1817		1771
1818	1	1772	1
1819	}	1773	}
1820		1774
…		…
1824		1778
1825	our @ISA = CFPlus::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1826		1780
1827	sub size_request {	1781	sub size_request {
1828	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1829		1785
1830	$self->{vertical}	1786	$self->{vertical}
1831	? (	1787	? (
1832	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1833	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1834	)	1790	)
1835	: (	1791	: (
1836	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1837	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1838	)	1794	)
1839	}	1795	}
1840		1796
1841	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1842	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1966		1922
1967	delete $self->{ox};	1923	delete $self->{ox};
1968	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1969	}	1925	}
1970		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1971	sub set_text {	1933	sub set_text {
1972	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1973		1935
1974	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1975	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
…		…
1998		1960
1999	sub size_request {	1961	sub size_request {
2000	my ($self) = @_;	1962	my ($self) = @_;
2001		1963
2002	$self->{size_req} \|\|= do {	1964	$self->{size_req} \|\|= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
2003	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
2004	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1968	$self->{layout}->set_width ($self->{max_w} \|\| $max_w \|\| -1);
2005	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
2006	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2007	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2008		1972
2009	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
…		…
2081	: ($self->{w} - $size->[0]) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
2082		2046
2083	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2084	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085	: ($self->{h} - $size->[1]) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2086	};	2052	};
2087		2053
2088	my $w = List::Util::min $self->{w} + 4, $size->[0];	2054	# unless ($self->{list}) {
2089	my $h = List::Util::min $self->{h} + 2, $size->[1];	2055	# $self->{list} = CFPlus::OpenGL::glGenList;
2090		2056	# CFPlus::OpenGL::glNewList $self->{list};
2091	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2058	# CFPlus::OpenGL::glEndList;
		2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
		2062
		2063	$self->{layout}->draw;
2092	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
2093		2073
2094	#############################################################################	2074	#############################################################################
2095		2075
2096	package CFPlus::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
2097		2077
…		…
2103	my $class = shift;	2083	my $class = shift;
2104		2084
2105	$class->SUPER::new (	2085	$class->SUPER::new (
2106	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
2107	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
2108	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
2109	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
2110	can_hover => 1,	2092	can_hover => 1,
2111	can_focus => 1,	2093	can_focus => 1,
2112	valign => 0,	2094	valign => 0,
2113	can_events => 1,	2095	can_events => 1,
2114	ellipsise => 0,	2096	ellipsise => 0,
…		…
2254	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
2255	}	2237	}
2256		2238
2257	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
2258	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259	glBegin GL_QUADS;
2260	glVertex 0 , 0;
2261	glVertex 0 , $self->{h};
2262	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
2263	glVertex $self->{w}, 0;
2264	glEnd;
2265	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
2266		2243
2267	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
2268		2245
2269	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
2271		2248
2272	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
2273	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
2274	utf8::encode $text;	2251	utf8::encode $text;
2275		2252
2276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2277	}	2254	}
2278		2255
		2256	glColor_premultiply @{$self->{active_fg}};
2279	glBegin GL_LINES;	2257	glBegin GL_LINES;
2280	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2281	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2260	glEnd;
		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
2282	glEnd;	2274	glEnd;
2283	}	2275	}
2284	}	2276	}
2285		2277
2286	#############################################################################	2278	#############################################################################
…		…
2373	1	2365	1
2374	}	2366	}
2375		2367
2376	#############################################################################	2368	#############################################################################
2377		2369
2378	package CFPlus::UI::Button;	2370	package CFPlus::UI::ButtonBin;
2379		2371
2380	our @ISA = CFPlus::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
2381		2373
2382	use CFPlus::OpenGL;	2374	use CFPlus::OpenGL;
2383		2375
2384	my @tex =	2376	my @tex =
2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
2387		2379
2388	sub new {	2380	sub new {
2389	my $class = shift;	2381	my $class = shift;
2390		2382
2391	$class->SUPER::new (	2383	$class->SUPER::new (
2392	padding_x => 4,
2393	padding_y => 4,
2394	fg => [1, 1, 1],
2395	active_fg => [0, 0, 1],
2396	can_hover => 1,	2384	can_hover => 1,
2397	align => 0,	2385	align => 0,
2398	valign => 0,	2386	valign => 0,
2399	can_events => 1,	2387	can_events => 1,
2400	@_	2388	@_
…		…
2412	}	2400	}
2413		2401
2414	sub _draw {	2402	sub _draw {
2415	my ($self) = @_;	2403	my ($self) = @_;
2416		2404
2417	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
2419	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
2420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
2422		2408
		2409	my $tex = $tex[$GRAB == $self];
2423	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2411
		2412	glDisable GL_TEXTURE_2D;
		2413
		2414	$self->SUPER::_draw;
		2415	}
		2416
		2417	#############################################################################
		2418
		2419	package CFPlus::UI::Button;
		2420
		2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424		2466
2425	glDisable GL_TEXTURE_2D;	2467	glDisable GL_TEXTURE_2D;
2426		2468
2427	$self->SUPER::_draw;	2469	$self->SUPER::_draw;
2428	}	2470	}
…		…
2485	sub _draw {	2527	sub _draw {
2486	my ($self) = @_;	2528	my ($self) = @_;
2487		2529
2488	$self->SUPER::_draw;	2530	$self->SUPER::_draw;
2489		2531
2490	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2491		2533
2492	my ($w, $h) = @$self{qw(w h)};	2534	my ($w, $h) = @$self{qw(w h)};
2493		2535
2494	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2495		2537
…		…
2515	sub new {	2557	sub new {
2516	my $class = shift;	2558	my $class = shift;
2517		2559
2518	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
2519	can_events => 0,	2561	can_events => 0,
		2562	scale => 1,
2520	@_,	2563	@_,
2521	);	2564	);
2522		2565
2523	$self->{path} \|\| $self->{tex}	2566	$self->{path} \|\| $self->{tex}
2524	or Carp::croak "'path' or 'tex' attributes required";	2567	or Carp::croak "'path' or 'tex' attributes required";
…		…
2549	}	2592	}
2550		2593
2551	sub size_request {	2594	sub size_request {
2552	my ($self) = @_;	2595	my ($self) = @_;
2553		2596
2554	($self->{tex}{w}, $self->{tex}{h})	2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555	}	2598	}
2556		2599
2557	sub _draw {	2600	sub _draw {
2558	my ($self) = @_;	2601	my ($self) = @_;
2559		2602
…		…
2569	}	2612	}
2570		2613
2571	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573		2616
2574	$tex->draw_quad (0, 0, $w, $h);	2617	$tex->draw_quad_alpha (0, 0, $w, $h);
2575		2618
2576	glDisable GL_TEXTURE_2D;	2619	glDisable GL_TEXTURE_2D;
2577	}	2620	}
2578		2621
2579	#############################################################################	2622	#############################################################################
…		…
2598	align => 0,	2641	align => 0,
2599	valign => 0,	2642	valign => 0,
2600	can_events => 1,	2643	can_events => 1,
2601	@_	2644	@_
2602	);	2645	);
		2646	}
		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
2603	}	2652	}
2604		2653
2605	sub invoke_button_up {	2654	sub invoke_button_up {
2606	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2607		2656
…		…
2747	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2748	}	2797	}
2749		2798
2750	#############################################################################	2799	#############################################################################
2751		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} \|\| -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2752	package CFPlus::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2753		2940
2754	our @ISA = CFPlus::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2755		2942
2756	sub new {	2943	sub new {
…		…
2881		3068
2882	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2883		3070
2884	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885		3072
2886	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2887	}	3076	}
2888		3077
2889	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2890	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2891		3080
…		…
2911		3100
2912	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913		3102
2914	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915		3104
2916	! ! $delta	3105	1
2917	}	3106	}
2918		3107
2919	sub update {	3108	sub update {
2920	my ($self) = @_;	3109	my ($self) = @_;
2921		3110
…		…
3052	}	3241	}
3053		3242
3054	sub size_request {	3243	sub size_request {
3055	my ($self) = @_;	3244	my ($self) = @_;
3056		3245
3057	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
3058		3247
3059	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
3060	$self->SUPER::size_request	3249	$self->SUPER::size_request
3061	}	3250	}
3062		3251
…		…
3251		3440
3252	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
3253	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
3254		3443
3255	$layout->render ($para->{indent}, $y - $y0);	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
3256		3446
3257	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
3258	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
3259		3449
3260	for (@w) {	3450	for (@w) {
…		…
3382	}	3572	}
3383		3573
3384	sub set_tooltip_from {	3574	sub set_tooltip_from {
3385	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
3386		3576
3387	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388	if $widget->{tooltip} =~ /^#(.*)$/;
3389
3390	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
3391		3582
3392	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
3393	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
3394	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3395	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
3396	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
3397	}	3588	}
3398		3589
3399	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
3400	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
3401		3592
3402	$self->add (new CFPlus::UI::Label	3593	$self->add (new CFPlus::UI::Label
3403	markup => $tooltip,	3594	markup => $tip,
3404	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
3405	fontsize => 0.8,	3596	fontsize => 0.8,
3406	style => 1, # FLAG_INVERSE	3597	style => 1, # FLAG_INVERSE
3407	ellipsise => 0,	3598	ellipsise => 0,
3408	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	3599	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
3446	}	3637	}
3447		3638
3448	sub _draw {	3639	sub _draw {
3449	my ($self) = @_;	3640	my ($self) = @_;
3450		3641
3451	glTranslate 0.375, 0.375;
3452
3453	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
3454		3643
3455	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
3456	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
3457	glVertex 0 , 0;
3458	glVertex 0 , $h;
3459	glVertex $w, $h;
3460	glVertex $w, 0;
3461	glEnd;
3462		3646
3463	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
3464	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
3465	glVertex 0 , 0;
3466	glVertex 0 , $h;
3467	glVertex $w, $h;
3468	glVertex $w, 0;
3469	glEnd;
3470		3649
3471	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
3472		3651
3473	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
3474	}	3653	}
3475		3654
3476	#############################################################################	3655	#############################################################################
…		…
3494		3673
3495	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
3496	CFPlus::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
3497		3676
3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3500	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
3501	parked => 1,	3680	parked => 1,
3502	cb => sub {	3681	cb => sub {
3503	return unless $::CONN;	3682	return unless $::CONN;
3504		3683
3505	if (!$widget) {#d#	3684	my $w = $widget
3506	warn "animation widget timer active but widgetd estroyed\n";#d#	3685	or return;
3507	warn $_[0]->w->active;#d#
3508	}#d#
3509		3686
3510	++$widget->{frame};	3687	++$w->{frame};
3511	$widget->update_face;	3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
3512	$widget->update;	3691	$w->update;
3513
3514	$widget->update_timer;	3692	$w->update_timer;
3515	},	3693	},
3516	);	3694	);
3517		3695
3518	$self->update_face;	3696	$self->update_face;
3519	$self->update_timer;	3697	$self->update_timer;
…		…
3540	}	3718	}
3541		3719
3542	sub update_face {	3720	sub update_face {
3543	my ($self) = @_;	3721	my ($self) = @_;
3544		3722
3545	return unless $::CONN;
3546
3547	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3548	if ($anim && @$anim) {
3549	delete $self->{wait_face};
3550	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3551	}
3552	}
3553	}
3554
3555	sub size_request {
3556	my ($self) = @_;
3557
3558	if ($::CONN) {	3723	if ($::CONN) {
3559	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3560	if (my $tex = $::CONN->{texture}[$faceid]) {	3725	if ($anim && @$anim) {
3561	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});	3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3562	} else {	3727	delete $self->{face_change_cb};
3563	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {	3728
3564	$self->realloc;	3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} \|\| $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
3565	});	3733	}
3566	}	3734	}
3567	}	3735	}
3568	}	3736	}
		3737	}
		3738
		3739	sub size_request {
		3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} \|\|= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
3569		3755
3570	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)	3756	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3571	}	3757	}
3572		3758
3573	sub update {	3759	sub update {
…		…
3587	}	3773	}
3588		3774
3589	sub _draw {	3775	sub _draw {
3590	my ($self) = @_;	3776	my ($self) = @_;
3591		3777
3592	return unless $::CONN;
3593
3594	$self->SUPER::_draw;	3778	$self->SUPER::_draw;
3595		3779
3596	my $faceid = $::CONN->{faceid}[$self->{face}]	3780	if (my $tex = $self->{tex}) {
3597	or return;
3598
3599	my $tex = $::CONN->{texture}[$faceid];
3600
3601	if ($tex) {
3602	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
3603	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3604	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3605	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3606	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3658	children => [	3837	children => [
3659	(new CFPlus::UI::Label markup => $left, expand => 1),	3838	(new CFPlus::UI::Label markup => $left, expand => 1),
3660	(new CFPlus::UI::Label markup => $right, align => +1),	3839	(new CFPlus::UI::Label markup => $right, align => +1),
3661	],	3840	],
3662	;	3841	;
3663		3842
3664	} else {	3843	} else {
3665	$widget = new CFPlus::UI::Label	3844	$widget = new CFPlus::UI::Label
3666	can_hover => 1,	3845	can_hover => 1,
3667	can_events => 1,	3846	can_events => 1,
3668	markup => $widget,	3847	markup => $widget,
…		…
3793		3972
3794	#############################################################################	3973	#############################################################################
3795		3974
3796	package CFPlus::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3797		3976
		3977	use CFPlus::OpenGL;
		3978
3798	our @ISA = CFPlus::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3799		3980
3800	sub new {	3981	sub new {
3801	my $class = shift;	3982	my $class = shift;
3802		3983
3803	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3804	buttonbar => (new CFPlus::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3805	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3806	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3807	@_,	3989	@_,
3808	);	3990	);
3809		3991
3810	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3811	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
3812		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} \|\|= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3813	$self	4029	$self
3814	}	4030	}
3815		4031
3816	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3817	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3818		4051
3819	CFPlus::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3820		4054
3821	$self->{buttonbar}->add (new CFPlus::UI::Button
3822	markup => $title,
3823	tooltip => $tooltip,
3824	on_activate => sub { $self->set_current_page ($widget) },
3825	);
3826
3827	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
3828	}	4056	}
3829		4057
3830	sub get_current_page {	4058	sub get_current_page {
3831	my ($self) = @_;	4059	my ($self) = @_;
3832		4060
…		…
3836	sub set_current_page {	4064	sub set_current_page {
3837	my ($self, $page) = @_;	4065	my ($self, $page) = @_;
3838		4066
3839	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3840	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
		4069	}
		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
3841	}	4089	}
3842		4090
3843	#############################################################################	4091	#############################################################################
3844		4092
3845	package CFPlus::UI::Selector;	4093	package CFPlus::UI::Selector;
…		…
4115	}	4363	}
4116		4364
4117	sub update {	4365	sub update {
4118	my ($self) = @_;	4366	my ($self) = @_;
4119		4367
4120	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
4121	}	4369	}
4122		4370
4123	sub add {	4371	sub add {
4124	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
4125		4373
…		…
4162	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
4163	$_->()	4411	$_->()
4164	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
4165	}	4413	}
4166		4414
4167	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
4168	my %queue;	4416	my %queue;
4169	my @queue;	4417	my @queue;
4170	my $widget;	4418	my $widget;
4171		4419
4172	outer:	4420	outer:
…		…
4219	}	4467	}
4220	}	4468	}
4221		4469
4222	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
4223	}	4471	}
4224	}
4225		4472
4226	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
4227	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
4228	values %$size_alloc;	4475	values %$size_alloc;
4229		4476
4230	while () {	4477	while () {
4231	my $widget = pop @queue \|\| last;	4478	my $widget = pop @queue \|\| last;
4232		4479
4233	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4234		4481
4235	$w = 0 if $w < 0;
4236	$h = 0 if $h < 0;
4237
4238	$w = max $widget->{min_w}, $w;	4482	$w = max $widget->{min_w}, $w;
4239	$h = max $widget->{min_h}, $h;	4483	$h = max $widget->{min_h}, $h;
4240		4484
4241	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4242	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4243		4487
4244	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4245	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4246		4490
4247	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
4248	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
4249		4493
4250	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
4251	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
4252	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
4253		4497
4254	$widget->{w} = $w;	4498	$widget->{w} = $w;
4255	$widget->{h} = $h;	4499	$widget->{h} = $h;
4256		4500
4257	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
4258	}	4503	}
4259	}	4504	}
4260	}	4505	}
4261		4506
4262	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
4263	$_->()	4508	$_->()
4264	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
4265	}	4510	}
4266
4267		4511
4268	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4269	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4270	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
4271		4515

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs. Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC