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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.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";
…		…
589		599
590	# 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
591	# functions seems pointless.	601	# functions seems pointless.
592	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
593		603
594	sub draw {	604	#sub draw {
595	my ($self) = @_;	605	#CFPlus.xs
596
597	return unless $self->{h} && $self->{w};
598
599	# update screen rectangle
600	local $draw_x = $draw_x + $self->{x};
601	local $draw_y = $draw_y + $self->{y};
602
603	# skip widgets that are entirely outside the drawing area
604	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
605	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
606
607	glPushMatrix;
608	glTranslate $self->{x}, $self->{y}, 0;
609
610	if ($self == $HOVER && $self->{can_hover}) {
611	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
612	glEnable GL_BLEND;
613	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
614	glBegin GL_QUADS;
615	glVertex 0 , 0;
616	glVertex $self->{w}, 0;
617	glVertex $self->{w}, $self->{h};
618	glVertex 0 , $self->{h};
619	glEnd;
620	glDisable GL_BLEND;
621	}
622
623	if ($ENV{CFPLUS_DEBUG} & 1) {
624	glPushMatrix;
625	glColor 1, 1, 0, 1;
626	glTranslate 0.375, 0.375;
627	glBegin GL_LINE_LOOP;
628	glVertex 0 , 0;
629	glVertex $self->{w} - 1, 0;
630	glVertex $self->{w} - 1, $self->{h} - 1;
631	glVertex 0 , $self->{h} - 1;
632	glEnd;
633	glPopMatrix;
634	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
635	}
636
637	$self->_draw;
638	glPopMatrix;
639	}
640		606
641	sub _draw {	607	sub _draw {
642	my ($self) = @_;	608	my ($self) = @_;
643		609
644	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
645	}	611	}
646		612
647	my $cntx;#d#
648	sub DESTROY {	613	sub DESTROY {
649	my ($self) = @_;	614	my ($self) = @_;
650		615
651	return if CFPlus::in_destruct;	616	return if CFPlus::in_destruct;
652		617
		618	local $@;
653	eval { $self->destroy };	619	eval { $self->destroy };
654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655		621
656	delete $WIDGET{$self+0};	622	delete $WIDGET{$self+0};
657	}	623	}
…		…
665	use strict;	631	use strict;
666	use CFPlus::OpenGL;	632	use CFPlus::OpenGL;
667		633
668	sub new {	634	sub new {
669	my $class = shift;	635	my $class = shift;
670
671	# range [value, low, high, page]
672		636
673	$class->SUPER::new (	637	$class->SUPER::new (
674	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
675	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
676	@_	640	@_
…		…
688	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
689		653
690	glEnable GL_BLEND;	654	glEnable GL_BLEND;
691	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
692	glColor_premultiply @$color;	656	glColor_premultiply @$color;
693
694	glBegin GL_QUADS;
695	glVertex 0 , 0;
696	glVertex 0 , $h;
697	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
698	glVertex $w, 0;
699	glEnd;
700
701	glDisable GL_BLEND;	658	glDisable GL_BLEND;
702	}	659	}
703	}	660	}
704		661
705	#############################################################################	662	#############################################################################
…		…
737	can_events => 0,	694	can_events => 0,
738	%arg,	695	%arg,
739	);	696	);
740		697
741	$self->add (@$children)	698	$self->add (@$children)
742	if $children;	699	if $children && @$children;
743		700
744	$self	701	$self
745	}	702	}
746		703
747	sub realloc {	704	sub realloc {
…		…
756	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
757		714
758	$_->set_parent ($self)	715	$_->set_parent ($self)
759	for @widgets;	716	for @widgets;
760		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
761	use sort 'stable';	719	use sort 'stable';
762		720
763	$self->{children} = [	721	$self->{children} = [
764	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
765	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
766	];	724	];
767		725
768	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
769	}	731	}
770		732
771	sub children {	733	sub children {
772	@{ $_[0]{children} }	734	@{ $_[0]{children} }
773	}	735	}
774		736
775	sub remove {	737	sub remove {
776	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
777		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
778	delete $child->{parent};	743	delete $child->{parent};
779	$child->hide;	744	$child->hide;
780
781	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
782		747
783	$self->realloc;	748	$self->realloc;
784	}	749	}
785		750
786	sub clear {	751	sub clear {
787	my ($self) = @_;	752	my ($self) = @_;
788		753
789	my $children = delete $self->{children};	754	my $children = $self->{children};
790	$self->{children} = [];	755	$self->{children} = [];
791		756
792	for (@$children) {	757	for (@$children) {
793	delete $_->{parent};	758	delete $_->{parent};
794	$_->hide;	759	$_->hide;
…		…
814	}	779	}
815		780
816	sub _draw {	781	sub _draw {
817	my ($self) = @_;	782	my ($self) = @_;
818		783
819	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
820	}	785	}
821		786
822	#############################################################################	787	#############################################################################
823		788
824	package CFPlus::UI::Bin;	789	package CFPlus::UI::Bin;
…		…
834	}	799	}
835		800
836	sub add {	801	sub add {
837	my ($self, $child) = @_;	802	my ($self, $child) = @_;
838		803
839	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
840	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
841	}	806	}
842		807
843	sub remove {	808	sub remove {
844	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
…		…
862		827
863	1	828	1
864	}	829	}
865		830
866	#############################################################################	831	#############################################################################
867
868	# back-buffered drawing area	832	# back-buffered drawing area
869		833
870	package CFPlus::UI::Window;	834	package CFPlus::UI::Window;
871		835
872	our @ISA = CFPlus::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
…		…
954	sub size_request {	918	sub size_request {
955	my ($self) = @_;	919	my ($self) = @_;
956		920
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		922
959	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
961		925
962	($w, $h)	926	($w, $h)
963	}	927	}
964		928
965	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
986	$self->{view_x} = $x;	950	$self->{view_x} = $x;
987	$self->{view_y} = $y;	951	$self->{view_y} = $y;
988		952
989	$self->emit (changed => $x, $y);	953	$self->emit (changed => $x, $y);
990	$self->update;	954	$self->update;
		955	}
		956	}
		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);
991	}	973	}
992	}	974	}
993		975
994	# 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
995	sub coord2local {	977	sub coord2local {
…		…
1042	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1043		1025
1044	my $self;	1026	my $self;
1045		1027
1046	my $hslider = new CFPlus::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
1047	vertical => 0,	1031	vertical => 0,
1048	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
1049	on_changed => sub {	1033	on_changed => sub {
1050	$self->{hpos} = $_[1];	1034	$self->{hpos} = $_[1];
1051	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052	},	1036	},
1053	;	1037	;
1054		1038
1055	my $vslider = new CFPlus::UI::Slider	1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
1056	vertical => 1,	1042	vertical => 1,
1057	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1058	on_changed => sub {	1044	on_changed => sub {
1059	$self->{vpos} = $_[1];	1045	$self->{vpos} = $_[1];
1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1071	row_expand => [1, 0],	1057	row_expand => [1, 0],
1072	%arg,	1058	%arg,
1073	);	1059	);
1074		1060
1075	$self->{vp} = new CFPlus::UI::ViewPort	1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
1076	expand => 1,	1064	expand => 1,
1077	scroll_x => $self->{scroll_x},	1065	scroll_x => $self->{scroll_x},
1078	scroll_y => $self->{scroll_y},	1066	scroll_y => $self->{scroll_y},
1079	on_changed => sub {	1067	on_changed => sub {
1080	my ($vp, $x, $y) = @_;	1068	my ($vp, $x, $y) = @_;
…		…
1082	$vp->{parent}{hslider}->set_value ($x);	1070	$vp->{parent}{hslider}->set_value ($x);
1083	$vp->{parent}{vslider}->set_value ($y);	1071	$vp->{parent}{vslider}->set_value ($y);
1084		1072
1085	0	1073	0
1086	},	1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
1087	;	1080	;
1088		1081
1089	$self->SUPER::add_at (0, 0, $self->{vp});	1082	$self->SUPER::add ($self->{vp});
1090		1083
1091	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
1092		1085
1093	$self	1086	$self
1094	}	1087	}
1095
1096	#TODO# update range on size_allocate depending on child
1097		1088
1098	sub add {	1089	sub add {
1099	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
1100		1091
1101	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
1102	}	1093	}
1103		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
1104	sub update_slider {	1099	sub update_slider {
1105	my ($self) = @_;	1100	my ($self) = @_;
1106		1101
1107	my $child = ($self->{vp} or return)->child;	1102	my $child = ($self->{vp} or return)->child;
1108		1103
		1104	if ($self->{scroll_x}) {
1109	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110	$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]);
1111		1107
1112	my $visible = $w1 > $w2;	1108	my $visible = $w1 > $w2;
1113	if ($visible != $self->{hslider}{visible}) {	1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
1114	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})	1111	$visible ? $self->SUPER::add ($self->{hslider})
1115	: $self->{hslider}->hide;	1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
1116	}	1114	}
1117		1115
		1116	if ($self->{scroll_y}) {
1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119	$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]);
1120		1119
1121	my $visible = $h1 > $h2;	1120	my $visible = $h1 > $h2;
1122	if ($visible != $self->{vslider}{visible}) {	1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
1123	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})	1123	$visible ? $self->SUPER::add ($self->{vslider})
1124	: $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);
1125	}	1144	};
1126	}
1127
1128	sub update {
1129	my ($self) = @_;
1130
1131	$self->update_slider;
1132	$self->SUPER::update;
1133	}	1145	}
1134		1146
1135	sub invoke_mouse_wheel {	1147	sub invoke_mouse_wheel {
1136	my ($self, $ev) = @_;	1148	my ($self, $ev) = @_;
1137		1149
1138	return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140	$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};
1141		1152
1142	1	1153	1
1143	}	1154	}
1144		1155
1145	sub invoke_button_down {	1156	sub invoke_button_down {
1146	my ($self, $ev, $x, $y) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1147		1158
1148	if ($ev->{button} == 2) {	1159	if ($ev->{button} == 2) {
1149	$self->grab_focus;	1160	$self->start_dragging ($ev);
1150
1151	my $ox = $self->{vp}{view_x} + $ev->{x};
1152	my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154	$self->{motion} = sub {
1155	my ($ev, $x, $y) = @_;
1156
1157	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158	$self->update;
1159	};
1160
1161	return 1;	1161	return 1;
1162	}	1162	}
1163		1163
1164	0	1164	0
1165	}	1165	}
…		…
1216	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1217		1217
1218	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1220	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1221
1222	glBegin GL_QUADS;
1223	glVertex 0 , 0;
1224	glVertex 0 , $h;
1225	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1226	glVertex $w, 0;
1227	glEnd;
1228
1229	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1230	}	1223	}
1231		1224
1232	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1233	}	1226	}
…		…
1394		1387
1395	sub border {	1388	sub border {
1396	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
1397	}	1390	}
1398		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
1399	sub size_request {	1401	sub size_request {
1400	my ($self) = @_;	1402	my ($self) = @_;
1401		1403
1402	$self->{title_widget}->size_request	1404	$self->{title_widget}->size_request
1403	if $self->{title_widget};	1405	if $self->{title_widget};
…		…
1575		1577
1576	#############################################################################	1578	#############################################################################
1577		1579
1578	package CFPlus::UI::Table;	1580	package CFPlus::UI::Table;
1579		1581
1580	our @ISA = CFPlus::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1581		1583
1582	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1583		1585
1584	use CFPlus::OpenGL;	1586	use CFPlus::OpenGL;
1585		1587
1586	sub new {	1588	sub new {
1587	my $class = shift;	1589	my $class = shift;
1588		1590
1589	$class->SUPER::new (	1591	$class->SUPER::new (
1590	children => [],
1591	col_expand => [],	1592	col_expand => [],
1592	row_expand => [],	1593	row_expand => [],
1593	@_,	1594	@_,
1594	)	1595	)
1595	}	1596	}
1596		1597
1597	sub children {
1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1599	}
1600
1601	# TODO: store row/col info in child widget and use standard add/del
1602	sub add {	1598	sub add {
1603	my $self = shift;	1599	my ($self, @widgets) = @_;
1604		1600
1605	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#	1601	for my $child (@widgets) {
1606	$self->add_at (@_);	1602	$child->{c_rowspan} \|\|= 1;
		1603	$child->{c_colspan} \|\|= 1;
		1604	}
		1605
		1606	$self->SUPER::add (@widgets);
1607	}	1607	}
1608		1608
1609	sub add_at {	1609	sub add_at {
1610	my $self = shift;	1610	my $self = shift;
1611		1611
		1612	my @widgets;
		1613
1612	while (@_) {	1614	while (@_) {
1613	my ($col, $row, $child) = splice @_, 0, 3, ();	1615	my ($col, $row, $child) = splice @_, 0, 3, ();
1614		1616
1615	$child->set_parent ($self);	1617	$child->{c_row} = $row;
1616	$self->{children}[$row][$col] = $child;	1618	$child->{c_col} = $col;
1617	}
1618		1619
1619	$self->{force_realloc} = 1;	1620	push @widgets, $child;
1620	$self->{force_size_alloc} = 1;	1621	}
1621	$self->realloc;
1622	}
1623		1622
1624	sub remove {	1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1625	my ($self, $child) = @_;	1627	my ($self) = @_;
1626		1628
1627	for (@{ $self->{children} }) {	1629	my (@w, @h);
1628	for (@{ $_ \|\| [] }) {	1630
1629	$_ = 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];
1630	}	1641	}
1631	}	1642	}
1632	}
1633		1643
1634	# TODO: move to container class maybe? send children a signal on removal?	1644	# second pass, rows
1635	sub clear {	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1636	my ($self) = @_;
1637
1638	my @children = $self->children;
1639	delete $self->{children};
1640
1641	for (@children) {
1642	delete $_->{parent};
1643	$_->hide;
1644	}
1645
1646	$self->realloc;
1647	}
1648
1649	sub get_wh {
1650	my ($self) = @_;
1651
1652	my (@w, @h);
1653
1654	for my $y (0 .. $#{$self->{children}}) {
1655	my $row = $self->{children}[$y]
1656	or next;
1657
1658	for my $x (0 .. $#$row) {
1659	my $widget = $row->[$x]
1660	or next;
1661	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1662		1647
1663	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1664	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1665	}	1652	}
1666	}	1653	}
1667		1654
1668	(\@w, \@h)	1655	(\@w, \@h)
1669	}	1656	}
…		…
1685	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1686		1673
1687	my $req_w = (sum @$ws) \|\| 1;	1674	my $req_w = (sum @$ws) \|\| 1;
1688	my $req_h = (sum @$hs) \|\| 1;	1675	my $req_h = (sum @$hs) \|\| 1;
1689		1676
1690	# TODO: nicer code	1677	# now linearly scale the rows/columns to the allocated size
1691	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1692	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1693	my $col_expand = (sum @col_expand) \|\| 1;	1680	my $col_expand = (sum @col_expand) \|\| 1;
1694		1681
1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1702		1689
1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704		1691
1705	CFPlus::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1706		1693
1707	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1708		1696
1709	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1710	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)};
1711	or next;
1712		1699
1713	my $x = 0;	1700	$widget->configure (
1714	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1715		1703	);
1716	for my $c (0 .. $#$row) {
1717	my $col_w = $ws->[$c];
1718
1719	if (my $widget = $row->[$c]) {
1720	$widget->configure ($x, $y, $col_w, $row_h);
1721	}
1722
1723	$x += $col_w;
1724	}
1725
1726	$y += $row_h;
1727	}	1704	}
1728		1705
1729	1	1706	1
1730	}	1707	}
1731		1708
1732	sub find_widget {
1733	my ($self, $x, $y) = @_;
1734
1735	$x -= $self->{x};
1736	$y -= $self->{y};
1737
1738	my $res;
1739
1740	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1741	$res = $_->find_widget ($x, $y)
1742	and return $res;
1743	}
1744
1745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1746	}
1747
1748	sub _draw {
1749	my ($self) = @_;
1750
1751	for (grep $_, @{$self->{children}}) {
1752	$_->draw for grep $_, @$_;
1753	}
1754	}
1755
1756	#############################################################################	1709	#############################################################################
1757		1710
1758	package CFPlus::UI::Fixed;	1711	package CFPlus::UI::Fixed;
1759		1712
1760	use List::Util qw(min max);	1713	use List::Util qw(min max);
1761		1714
1762	our @ISA = CFPlus::UI::Container::;	1715	our @ISA = CFPlus::UI::Container::;
1763		1716
1764	sub add {
1765	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768	$self->SUPER::add ($child);
1769	}
1770
1771	sub _scale($$$) {	1717	sub _scale($$$) {
1772	my ($mode, $val, $max) = @_;	1718	my ($rel, $val, $max) = @_;
1773		1719
1774	$mode eq "abs" ? $val	1720	$rel ? $val * $max : $val
1775	: $mode eq "rel" ? $val * $max
1776	: 0
1777	}	1721	}
1778		1722
1779	sub size_request {	1723	sub size_request {
1780	my ($self) = @_;	1724	my ($self) = @_;
1781		1725
1782	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783		1727
1784	# determine overall size by querying abs widgets	1728	# determine overall size by querying abs widgets
1785	for my $child ($self->visible_children) {	1729	for my $child ($self->visible_children) {
1786	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};
1787		1733
1788	if ($pos eq "abs") {
1789	$w = _scale $size, $w, $child->{req_w};
1790	$h = _scale $size, $h, $child->{req_h};
1791
1792	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1793	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1794	}	1736	}
1795	}	1737	}
1796		1738
1797	my $W = $x2 - $x1;	1739	my $W = $x2 - $x1;
1798	my $H = $y2 - $y1;	1740	my $H = $y2 - $y1;
1799		1741
1800	# now layout remaining widgets	1742	# now layout remaining widgets
1801	for my $child ($self->visible_children) {	1743	for my $child ($self->visible_children) {
1802	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;
1803		1747
1804	if ($pos ne "abs") {
1805	$x = _scale $pos, $x, $W;
1806	$y = _scale $pos, $x, $H;
1807	$w = _scale $size, $w, $child->{req_w};
1808	$h = _scale $size, $h, $child->{req_h};
1809
1810	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1811	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1812	}	1750	}
1813	}	1751	}
1814		1752
1815	my $W = $x2 - $x1;	1753	my $W = $x2 - $x1;
1816	my $H = $y2 - $y1;	1754	my $H = $y2 - $y1;
…		…
1820		1758
1821	sub invoke_size_allocate {	1759	sub invoke_size_allocate {
1822	my ($self, $W, $H) = @_;	1760	my ($self, $W, $H) = @_;
1823		1761
1824	for my $child ($self->visible_children) {	1762	for my $child ($self->visible_children) {
1825	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;
1826		1765
1827	$x = _scale $pos, $x, $W;	1766	$x += $child->{c_halign} * $child->{req_w};
1828	$y = _scale $pos, $x, $H;	1767	$y += $child->{c_valign} * $child->{req_h};
1829	$w = _scale $size, $w, $child->{req_w};
1830	$h = _scale $size, $h, $child->{req_h};
1831		1768
1832	$child->configure ($x, $y, $w, $h);	1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1833	}	1770	}
1834		1771
1835	1	1772	1
1836	}	1773	}
1837		1774
…		…
1841		1778
1842	our @ISA = CFPlus::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1843		1780
1844	sub size_request {	1781	sub size_request {
1845	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1846		1785
1847	$self->{vertical}	1786	$self->{vertical}
1848	? (	1787	? (
1849	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1850	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1851	)	1790	)
1852	: (	1791	: (
1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1855	)	1794	)
1856	}	1795	}
1857		1796
1858	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1859	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1983		1922
1984	delete $self->{ox};	1923	delete $self->{ox};
1985	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1986	}	1925	}
1987		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1988	sub set_text {	1933	sub set_text {
1989	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1990		1935
1991	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1992	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
…		…
2015		1960
2016	sub size_request {	1961	sub size_request {
2017	my ($self) = @_;	1962	my ($self) = @_;
2018		1963
2019	$self->{size_req} \|\|= do {	1964	$self->{size_req} \|\|= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
2020	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
2021	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1968	$self->{layout}->set_width ($self->{max_w} \|\| $max_w \|\| -1);
2022	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
2023	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2024	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2025		1972
2026	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
…		…
2098	: ($self->{w} - $size->[0]) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
2099		2046
2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2102	: ($self->{h} - $size->[1]) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2103	};	2052	};
2104		2053
2105	my $w = List::Util::min $self->{w} + 4, $size->[0];	2054	# unless ($self->{list}) {
2106	my $h = List::Util::min $self->{h} + 2, $size->[1];	2055	# $self->{list} = CFPlus::OpenGL::glGenList;
2107		2056	# CFPlus::OpenGL::glNewList $self->{list};
2108	$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;
2109	}	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	#}
2110		2073
2111	#############################################################################	2074	#############################################################################
2112		2075
2113	package CFPlus::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
2114		2077
…		…
2120	my $class = shift;	2083	my $class = shift;
2121		2084
2122	$class->SUPER::new (	2085	$class->SUPER::new (
2123	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
2124	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
2125	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
2126	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
2127	can_hover => 1,	2092	can_hover => 1,
2128	can_focus => 1,	2093	can_focus => 1,
2129	valign => 0,	2094	valign => 0,
2130	can_events => 1,	2095	can_events => 1,
2131	ellipsise => 0,	2096	ellipsise => 0,
…		…
2271	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
2272	}	2237	}
2273		2238
2274	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
2275	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2276	glBegin GL_QUADS;
2277	glVertex 0 , 0;
2278	glVertex 0 , $self->{h};
2279	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
2280	glVertex $self->{w}, 0;
2281	glEnd;
2282	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
2283		2243
2284	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
2285		2245
2286	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
2288		2248
2289	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
2290	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
2291	utf8::encode $text;	2251	utf8::encode $text;
2292		2252
2293	@$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);
2294	}	2254	}
2295		2255
		2256	glColor_premultiply @{$self->{active_fg}};
2296	glBegin GL_LINES;	2257	glBegin GL_LINES;
2297	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};
2298	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;
2299	glEnd;	2274	glEnd;
2300	}	2275	}
2301	}	2276	}
2302		2277
2303	#############################################################################	2278	#############################################################################
…		…
2390	1	2365	1
2391	}	2366	}
2392		2367
2393	#############################################################################	2368	#############################################################################
2394		2369
		2370	package CFPlus::UI::ButtonBin;
		2371
		2372	our @ISA = CFPlus::UI::Bin::;
		2373
		2374	use CFPlus::OpenGL;
		2375
		2376	my @tex =
		2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2378	qw(b1_button_inactive.png b1_button_active.png);
		2379
		2380	sub new {
		2381	my $class = shift;
		2382
		2383	$class->SUPER::new (
		2384	can_hover => 1,
		2385	align => 0,
		2386	valign => 0,
		2387	can_events => 1,
		2388	@_
		2389	)
		2390	}
		2391
		2392	sub invoke_button_up {
		2393	my ($self, $ev, $x, $y) = @_;
		2394
		2395	$self->emit ("activate")
		2396	if $x >= 0 && $x < $self->{w}
		2397	&& $y >= 0 && $y < $self->{h};
		2398
		2399	1
		2400	}
		2401
		2402	sub _draw {
		2403	my ($self) = @_;
		2404
		2405	glEnable GL_TEXTURE_2D;
		2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2407	glColor 0, 0, 0, 1;
		2408
		2409	my $tex = $tex[$GRAB == $self];
		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
2395	package CFPlus::UI::Button;	2419	package CFPlus::UI::Button;
2396		2420
2397	our @ISA = CFPlus::UI::Label::;	2421	our @ISA = CFPlus::UI::Label::;
2398		2422
2399	use CFPlus::OpenGL;	2423	use CFPlus::OpenGL;
…		…
2503	sub _draw {	2527	sub _draw {
2504	my ($self) = @_;	2528	my ($self) = @_;
2505		2529
2506	$self->SUPER::_draw;	2530	$self->SUPER::_draw;
2507		2531
2508	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2509		2533
2510	my ($w, $h) = @$self{qw(w h)};	2534	my ($w, $h) = @$self{qw(w h)};
2511		2535
2512	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;
2513		2537
…		…
2533	sub new {	2557	sub new {
2534	my $class = shift;	2558	my $class = shift;
2535		2559
2536	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
2537	can_events => 0,	2561	can_events => 0,
		2562	scale => 1,
2538	@_,	2563	@_,
2539	);	2564	);
2540		2565
2541	$self->{path} \|\| $self->{tex}	2566	$self->{path} \|\| $self->{tex}
2542	or Carp::croak "'path' or 'tex' attributes required";	2567	or Carp::croak "'path' or 'tex' attributes required";
…		…
2567	}	2592	}
2568		2593
2569	sub size_request {	2594	sub size_request {
2570	my ($self) = @_;	2595	my ($self) = @_;
2571		2596
2572	($self->{tex}{w}, $self->{tex}{h})	2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2573	}	2598	}
2574		2599
2575	sub _draw {	2600	sub _draw {
2576	my ($self) = @_;	2601	my ($self) = @_;
2577		2602
…		…
2587	}	2612	}
2588		2613
2589	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591		2616
2592	$tex->draw_quad (0, 0, $w, $h);	2617	$tex->draw_quad_alpha (0, 0, $w, $h);
2593		2618
2594	glDisable GL_TEXTURE_2D;	2619	glDisable GL_TEXTURE_2D;
2595	}	2620	}
2596		2621
2597	#############################################################################	2622	#############################################################################
…		…
2616	align => 0,	2641	align => 0,
2617	valign => 0,	2642	valign => 0,
2618	can_events => 1,	2643	can_events => 1,
2619	@_	2644	@_
2620	);	2645	);
		2646	}
		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
2621	}	2652	}
2622		2653
2623	sub invoke_button_up {	2654	sub invoke_button_up {
2624	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2625		2656
…		…
2765	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2766	}	2797	}
2767		2798
2768	#############################################################################	2799	#############################################################################
2769		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
2770	package CFPlus::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2771		2940
2772	our @ISA = CFPlus::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2773		2942
2774	sub new {	2943	sub new {
…		…
2899		3068
2900	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2901		3070
2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2903		3072
2904	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2905	}	3076	}
2906		3077
2907	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2908	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2909		3080
…		…
2929		3100
2930	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931		3102
2932	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933		3104
2934	! ! $delta	3105	1
2935	}	3106	}
2936		3107
2937	sub update {	3108	sub update {
2938	my ($self) = @_;	3109	my ($self) = @_;
2939		3110
…		…
3070	}	3241	}
3071		3242
3072	sub size_request {	3243	sub size_request {
3073	my ($self) = @_;	3244	my ($self) = @_;
3074		3245
3075	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
3076		3247
3077	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
3078	$self->SUPER::size_request	3249	$self->SUPER::size_request
3079	}	3250	}
3080		3251
…		…
3269		3440
3270	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
3271	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
3272		3443
3273	$layout->render ($para->{indent}, $y - $y0);	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
3274		3446
3275	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
3276	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
3277		3449
3278	for (@w) {	3450	for (@w) {
…		…
3400	}	3572	}
3401		3573
3402	sub set_tooltip_from {	3574	sub set_tooltip_from {
3403	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
3404		3576
3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406	if $widget->{tooltip} =~ /^#(.*)$/;
3407
3408	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 =~ /^#(.*)$/;
3409		3582
3410	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
3411	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
3412	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3413	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
3414	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
3415	}	3588	}
3416		3589
3417	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
3418	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
3419		3592
3420	$self->add (new CFPlus::UI::Label	3593	$self->add (new CFPlus::UI::Label
3421	markup => $tooltip,	3594	markup => $tip,
3422	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
3423	fontsize => 0.8,	3596	fontsize => 0.8,
3424	style => 1, # FLAG_INVERSE	3597	style => 1, # FLAG_INVERSE
3425	ellipsise => 0,	3598	ellipsise => 0,
3426	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	3599	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
3464	}	3637	}
3465		3638
3466	sub _draw {	3639	sub _draw {
3467	my ($self) = @_;	3640	my ($self) = @_;
3468		3641
3469	glTranslate 0.375, 0.375;
3470
3471	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
3472		3643
3473	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
3474	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
3475	glVertex 0 , 0;
3476	glVertex 0 , $h;
3477	glVertex $w, $h;
3478	glVertex $w, 0;
3479	glEnd;
3480		3646
3481	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
3482	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
3483	glVertex 0 , 0;
3484	glVertex 0 , $h;
3485	glVertex $w, $h;
3486	glVertex $w, 0;
3487	glEnd;
3488		3649
3489	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
3490		3651
3491	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
3492	}	3653	}
3493		3654
3494	#############################################################################	3655	#############################################################################
…		…
3512		3673
3513	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
3514	CFPlus::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
3515		3676
3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3518	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
3519	parked => 1,	3680	parked => 1,
3520	cb => sub {	3681	cb => sub {
3521	return unless $::CONN && $widget;	3682	return unless $::CONN;
3522		3683
		3684	my $w = $widget
		3685	or return;
		3686
3523	++$widget->{frame};	3687	++$w->{frame};
3524	$widget->update_face;	3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
3525	$widget->update;	3691	$w->update;
3526
3527	$widget->update_timer;	3692	$w->update_timer;
3528	},	3693	},
3529	);	3694	);
3530		3695
3531	$self->update_face;	3696	$self->update_face;
3532	$self->update_timer;	3697	$self->update_timer;
…		…
3553	}	3718	}
3554		3719
3555	sub update_face {	3720	sub update_face {
3556	my ($self) = @_;	3721	my ($self) = @_;
3557		3722
3558	return unless $::CONN;
3559
3560	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561	if ($anim && @$anim) {
3562	delete $self->{wait_face};
3563	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3564	}
3565	}
3566	}
3567
3568	sub size_request {
3569	my ($self) = @_;
3570
3571	if ($::CONN) {	3723	if ($::CONN) {
3572	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3573	if (my $tex = $::CONN->{texture}[$faceid]) {	3725	if ($anim && @$anim) {
3574	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});	3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3575	} else {	3727	delete $self->{face_change_cb};
3576	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {	3728
3577	$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	}
3578	});	3733	}
3579	}	3734	}
3580	}	3735	}
3581	}	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	}
3582		3755
3583	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)	3756	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3584	}	3757	}
3585		3758
3586	sub update {	3759	sub update {
…		…
3600	}	3773	}
3601		3774
3602	sub _draw {	3775	sub _draw {
3603	my ($self) = @_;	3776	my ($self) = @_;
3604		3777
3605	return unless $::CONN;
3606
3607	$self->SUPER::_draw;	3778	$self->SUPER::_draw;
3608		3779
3609	my $faceid = $::CONN->{faceid}[$self->{face}]	3780	if (my $tex = $self->{tex}) {
3610	or return;
3611
3612	my $tex = $::CONN->{texture}[$faceid];
3613
3614	if ($tex) {
3615	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3617	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3618	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3619	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3671	children => [	3837	children => [
3672	(new CFPlus::UI::Label markup => $left, expand => 1),	3838	(new CFPlus::UI::Label markup => $left, expand => 1),
3673	(new CFPlus::UI::Label markup => $right, align => +1),	3839	(new CFPlus::UI::Label markup => $right, align => +1),
3674	],	3840	],
3675	;	3841	;
3676		3842
3677	} else {	3843	} else {
3678	$widget = new CFPlus::UI::Label	3844	$widget = new CFPlus::UI::Label
3679	can_hover => 1,	3845	can_hover => 1,
3680	can_events => 1,	3846	can_events => 1,
3681	markup => $widget,	3847	markup => $widget,
…		…
3806		3972
3807	#############################################################################	3973	#############################################################################
3808		3974
3809	package CFPlus::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3810		3976
		3977	use CFPlus::OpenGL;
		3978
3811	our @ISA = CFPlus::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3812		3980
3813	sub new {	3981	sub new {
3814	my $class = shift;	3982	my $class = shift;
3815		3983
3816	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3817	buttonbar => (new CFPlus::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3819	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3820	@_,	3989	@_,
3821	);	3990	);
3822		3991
3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3824	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
3825		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
3826	$self	4029	$self
3827	}	4030	}
3828		4031
3829	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 {
3830	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3831		4051
3832	CFPlus::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3833		4054
3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3835	markup => $title,
3836	tooltip => $tooltip,
3837	on_activate => sub { $self->set_current_page ($widget) },
3838	);
3839
3840	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
3841	}	4056	}
3842		4057
3843	sub get_current_page {	4058	sub get_current_page {
3844	my ($self) = @_;	4059	my ($self) = @_;
3845		4060
…		…
3849	sub set_current_page {	4064	sub set_current_page {
3850	my ($self, $page) = @_;	4065	my ($self, $page) = @_;
3851		4066
3852	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3853	$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	}
3854	}	4089	}
3855		4090
3856	#############################################################################	4091	#############################################################################
3857		4092
3858	package CFPlus::UI::Selector;	4093	package CFPlus::UI::Selector;
…		…
4128	}	4363	}
4129		4364
4130	sub update {	4365	sub update {
4131	my ($self) = @_;	4366	my ($self) = @_;
4132		4367
4133	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
4134	}	4369	}
4135		4370
4136	sub add {	4371	sub add {
4137	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
4138		4373
…		…
4175	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
4176	$_->()	4411	$_->()
4177	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
4178	}	4413	}
4179		4414
4180	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
4181	my %queue;	4416	my %queue;
4182	my @queue;	4417	my @queue;
4183	my $widget;	4418	my $widget;
4184		4419
4185	outer:	4420	outer:
…		…
4232	}	4467	}
4233	}	4468	}
4234		4469
4235	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
4236	}	4471	}
4237	}
4238		4472
4239	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
4240	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
4241	values %$size_alloc;	4475	values %$size_alloc;
4242		4476
4243	while () {	4477	while () {
4244	my $widget = pop @queue \|\| last;	4478	my $widget = pop @queue \|\| last;
4245		4479
4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4247		4481
4248	$w = 0 if $w < 0;
4249	$h = 0 if $h < 0;
4250
4251	$w = max $widget->{min_w}, $w;	4482	$w = max $widget->{min_w}, $w;
4252	$h = max $widget->{min_h}, $h;	4483	$h = max $widget->{min_h}, $h;
4253		4484
4254	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256		4487
4257	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259		4490
4260	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
4261	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
4262		4493
4263	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}) {
4264	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
4265	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
4266		4497
4267	$widget->{w} = $w;	4498	$widget->{w} = $w;
4268	$widget->{h} = $h;	4499	$widget->{h} = $h;
4269		4500
4270	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
4271	}	4503	}
4272	}	4504	}
4273	}	4505	}
4274		4506
4275	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC vs. Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC