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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
167	sub rescale_widgets {	171	sub rescale_widgets {
168	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
169		173
170	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		178
175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181		185
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w \|\| $self->{h} != $h) {	361	if ($self->{alloc_w} != $w \|\| $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
…		…
441	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
442		451
443	$self->focus_in;	452	$self->focus_in;
444	}	453	}
445		454
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452	sub find_widget {	455	sub find_widget {
453	my ($self, $x, $y) = @_;	456	my ($self, $x, $y) = @_;
454		457
455	return () unless $self->{can_events};	458	return () unless $self->{can_events};
456		459
…		…
463		466
464	sub set_parent {	467	sub set_parent {
465	my ($self, $parent) = @_;	468	my ($self, $parent) = @_;
466		469
467	Scalar::Util::weaken ($self->{parent} = $parent);	470	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	471	$self->set_visible if $parent->{visible};
470	}	472	}
471		473
472	sub connect {	474	sub connect {
473	my ($self, $signal, $cb) = @_;	475	my ($self, $signal, $cb) = @_;
…		…
494		496
495	sub realloc {	497	sub realloc {
496	my ($self) = @_;	498	my ($self) = @_;
497		499
498	if ($self->{visible}) {	500	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	501	return if $self->{root}{realloc}{$self+0};
500		502
501	$self->{root}{realloc}{$self} = $self;	503	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	504	$self->{root}->update;
503	} else {	505	} else {
504	delete $self->{req_w};	506	delete $self->{req_w};
		507	delete $self->{req_h};
505	}	508	}
506	}	509	}
507		510
508	sub update {	511	sub update {
509	my ($self) = @_;	512	my ($self) = @_;
…		…
517		520
518	$self->realloc;	521	$self->realloc;
519	$self->update;	522	$self->update;
520	}	523	}
521		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		528
522	sub draw {	529	sub draw {
523	my ($self) = @_;	530	my ($self) = @_;
524		531
525	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		542	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
526		543
527	glPushMatrix;	544	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	546	$self->_draw;
530	glPopMatrix;	547	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
543	glEnd;	560	glEnd;
544	glDisable GL_BLEND;	561	glDisable GL_BLEND;
545	}	562	}
546		563
547	if ($ENV{CFPLUS_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	565	glPushMatrix;
549	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
761	sub size_request {	778	sub size_request {
762	$_[0]{children}[0]->size_request	779	$_[0]{children}[0]->size_request
763	}	780	}
764		781
765	sub size_allocate {	782	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	783	my ($self, $w, $h) = @_;
767		784
768	$self->{children}[0]->configure (0, 0, $w, $h);	785	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	786	}
770		787
771	#############################################################################	788	#############################################################################
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	805	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	806	$self->SUPER::update;
790	}	807	}
791		808
792	sub size_allocate {	809	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	810	my ($self, $w, $h) = @_;
794		811
795	$self->SUPER::size_allocate ($w, $h, $changed);	812	$self->SUPER::size_allocate ($w, $h);
796	$self->update	813	$self->update;
797	if $changed;
798	}	814	}
799		815
800	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
801	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
802	}	820	}
803		821
804	sub render_child {	822	sub render_child {
805	my ($self) = @_;	823	my ($self) = @_;
806		824
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
810		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
811	$self->_render;	836	$self->_render;
812	};	837	};
813	}	838	}
814		839
815	sub _draw {	840	sub _draw {
816	my ($self) = @_;	841	my ($self) = @_;
817		842
818	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
819		844
820	my $tex = $self->{texture}	845	my $tex = $self->{texture}
821	or return;	846	or return;
822		847
823	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
846	}	871	}
847		872
848	sub size_request {	873	sub size_request {
849	my ($self) = @_;	874	my ($self) = @_;
850		875
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		877
853	$w = 10 if $self->{scroll_x};	878	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	879	$h = 10 if $self->{scroll_y};
855		880
856	($w, $h)	881	($w, $h)
857	}	882	}
858		883
859	sub size_allocate {	884	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	885	my ($self, $w, $h) = @_;
861		886
		887	my $child = $self->child;
		888
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		891
865	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
866	$self->update;	893	$self->update;
867	}	894	}
868		895
…		…
903	}	930	}
904	}	931	}
905		932
906	sub _render {	933	sub _render {
907	my ($self) = @_;	934	my ($self) = @_;
		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
908		938
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		940
911	$self->SUPER::_render;	941	$self->SUPER::_render;
912	}	942	}
…		…
952	my $child = $self->{vp}->child;	982	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	984	}
955		985
956	sub size_allocate {	986	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	987	my ($self, $w, $h) = @_;
958		988
959	$self->SUPER::size_allocate ($w, $h, $changed);	989	$self->SUPER::size_allocate ($w, $h);
960		990
961	my $child = $self->{vp}->child;	991	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	993	}
964		994
…		…
1020	my @border =	1050	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1053
1024	sub new {	1054	sub new {
1025	my $class = shift;	1055	my ($class, %arg) = @_;
		1056
		1057	my $title = delete $arg{title};
1026		1058
1027	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1062	border => 0.6,
1031	can_events => 1,	1063	can_events => 1,
1032	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
1033	);	1067	);
1034		1068
1035	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1070	align => 0,
1037	valign => 1,	1071	valign => 1,
1038	text => $self->{title},	1072	text => $title,
1039	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1040		1075
1041	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1084	}
1043		1085
1044	sub border {	1086	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1046	}	1088	}
1047		1089
1048	sub size_request {	1090	sub size_request {
1049	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1050		1095
1051	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1052		1097
1053	(	1098	(
1054	$w + $self->border * 2,	1099	$w + $self->border * 2,
1055	$h + $self->border * 2,	1100	$h + $self->border * 2,
1056	)	1101	)
1057	}	1102	}
1058		1103
1059	sub size_allocate {	1104	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1105	my ($self, $w, $h) = @_;
1061		1106
1062	return unless $changed;	1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
1063		1112
		1113	my $border = $self->border;
		1114
1064	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1066		1117
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1071	}	1119	}
1072		1120
1073	sub button_down {	1121	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1075		1123
…		…
1127	}	1175	}
1128		1176
1129	sub _draw {	1177	sub _draw {
1130	my ($self) = @_;	1178	my ($self) = @_;
1131		1179
		1180	my $child = $self->{children}[0];
		1181
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1184
1135	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1187
1138	my $border = $self->border;	1188	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1204	}
1155		1205
1156	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1157		1207
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1161	}	1214	}
1162		1215
1163	#############################################################################	1216	#############################################################################
1164		1217
1165	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1292	(sum @$hs),
1240	)	1293	)
1241	}	1294	}
1242		1295
1243	sub size_allocate {	1296	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1297	my ($self, $w, $h) = @_;
1245		1298
1246	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1247		1300
1248	my $req_w = (sum @$ws) \|\| 1;	1301	my $req_w = (sum @$ws) \|\| 1;
1249	my $req_h = (sum @$hs) \|\| 1;	1302	my $req_h = (sum @$hs) \|\| 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1381	)
1329	}	1382	}
1330		1383
1331	sub size_allocate {	1384	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1385	my ($self, $w, $h) = @_;
1333		1386
1334	my $space = $self->{vertical} ? $h : $w;	1387	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1388	my $children = $self->{children};
1336		1389
1337	my @req;	1390	my @req;
…		…
1420	ellipsise => 3, # end	1473	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1422	fontsize => 1,	1475	fontsize => 1,
1423	align => -1,	1476	align => -1,
1424	valign => -1,	1477	valign => -1,
1425	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1426	can_events => 0,	1480	can_events => 0,
1427	%arg	1481	%arg
1428	);	1482	);
1429		1483
1430	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1506		1560
1507	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1509	}	1563	}
1510		1564
1511	(	1565	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1566	}
1516		1567
1517	sub size_allocate {	1568	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1569	my ($self, $w, $h) = @_;
		1570
		1571	delete $self->{ox};
1519		1572
1520	delete $self->{texture}	1573	delete $self->{texture}
1521	if $changed;	1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1575	}
1523		1576
1524	sub set_fontsize {	1577	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1526		1579
…		…
1541	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1598
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1547		1601
		1602	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1551		1606
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1610	};
1558		1611
1559	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1614
…		…
1797		1850
1798	sub new {	1851	sub new {
1799	my $class = shift;	1852	my $class = shift;
1800		1853
1801	$class->SUPER::new (	1854	$class->SUPER::new (
1802	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1803	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1805	can_hover => 1,	1859	can_hover => 1,
1806	align => 0,	1860	align => 0,
1807	valign => 0,	1861	valign => 0,
…		…
1854		1908
1855	sub new {	1909	sub new {
1856	my $class = shift;	1910	my $class = shift;
1857		1911
1858	$class->SUPER::new (	1912	$class->SUPER::new (
1859	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1860	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1919	state => 0,
…		…
1868	}	1923	}
1869		1924
1870	sub size_request {	1925	sub size_request {
1871	my ($self) = @_;	1926	my ($self) = @_;
1872		1927
1873	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1874	}	1929	}
1875		1930
1876	sub button_down {	1931	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1878		1933
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1883	}	1938	}
1884	}	1939	}
1885		1940
1886	sub _draw {	1941	sub _draw {
1887	my ($self) = @_;	1942	my ($self) = @_;
1888		1943
1889	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1890		1945
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1947
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1951
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1953
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1955
…		…
2374	$self->{fontsize} = $fontsize;	2431	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2432	$self->reflow;
2376	}	2433	}
2377		2434
2378	sub size_allocate {	2435	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2436	my ($self, $w, $h) = @_;
2380		2437
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2438	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2439
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2440	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2442	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2443
…		…
2611	}	2666	}
2612		2667
2613	sub set_tooltip_from {	2668	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2615		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2616	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2681	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2683	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2685	ellipsise => 0,
2622	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2686	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2630		2694
2631	($w + 4, $h + 4)	2695	($w + 4, $h + 4)
2632	}	2696	}
2633		2697
2634	sub size_allocate {	2698	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2699	my ($self, $w, $h) = @_;
2636		2700
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2702	}
2641		2703
2642	sub visibility_change {	2704	sub visibility_change {
2643	my ($self, $visible) = @_;	2705	my ($self, $visible) = @_;
2644		2706
…		…
2765	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2766	}	2828	}
2767		2829
2768	#############################################################################	2830	#############################################################################
2769		2831
2770	package CFClient::UI::Inventory;
2771
2772	our @ISA = CFClient::UI::ScrolledWindow::;
2773
2774	sub new {
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806	$row++;
2807	}
2808	}
2809
2810	#############################################################################
2811
2812	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2813		2833
2814	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2815		2835
2816	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2854	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2875	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2857		2877
2858	$self->show;	2878	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2880	}
2861		2881
2862	sub mouse_motion {	2882	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2864		2884
…		…
2989	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2990	}	3010	}
2991		3011
2992	#############################################################################	3012	#############################################################################
2993		3013
		3014	package CFClient::UI::Inventory;
		3015
		3016	our @ISA = CFClient::UI::ScrolledWindow::;
		3017
		3018	sub new {
		3019	my $class = shift;
		3020
		3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3023	@_,
		3024	);
		3025
		3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156	# if $commit is true, the binding will be set after the user entered a key combo
		3157	sub ask_for_bind {
		3158	my ($self, $commit) = @_;
		3159
		3160	CFClient::Binder::open_binding_dialog (sub {
		3161	my ($mod, $sym) = @_;
		3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3163	$self->update_binding_widgets;
		3164	$self->commit if $commit;
		3165	});
		3166	}
		3167
		3168	# $mod and $sym are the modifiers and key symbol
		3169	# $cmds is a array ref of strings (the commands)
		3170	# $cb is the callback that is executed on OK
		3171	# $ccb is the callback that is executed on CANCEL and
		3172	# when the binding was unsuccessful on OK
		3173	sub set_binding {
		3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3175
		3176	$self->clear_command_list;
		3177	$self->{recording} = 0;
		3178	$self->{rec_btn}->set_text ("start recording");
		3179
		3180	$self->{binding} = [$mod, $sym];
		3181	$self->{commands} = $cmds;
		3182
		3183	$self->{binding_change} = $cb;
		3184	$self->{binding_cancel} = $ccb;
		3185
		3186	$self->update_binding_widgets;
		3187	}
		3188
		3189	# this is a shortcut method that asks for a binding
		3190	# and then just binds it.
		3191	sub do_quick_binding {
		3192	my ($self, $cmds) = @_;
		3193	$self->set_binding (undef, undef, $cmds, sub {
		3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3195	});
		3196	$self->ask_for_bind (1);
		3197	}
		3198
		3199	sub update_binding_widgets {
		3200	my ($self) = @_;
		3201	my ($mod, $sym, $cmds) = $self->get_binding;
		3202	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3203	$self->set_command_list ($cmds);
		3204	}
		3205
		3206	sub get_binding {
		3207	my ($self) = @_;
		3208	return (
		3209	$self->{binding}->[0],
		3210	$self->{binding}->[1],
		3211	[ grep { defined $_ } @{$self->{commands}} ]
		3212	);
		3213	}
		3214
		3215	sub clear_command_list {
		3216	my ($self) = @_;
		3217	$self->{cmdbox}->clear ();
		3218	}
		3219
		3220	sub set_command_list {
		3221	my ($self, $cmds) = @_;
		3222
		3223	$self->{cmdbox}->clear ();
		3224	$self->{commands} = $cmds;
		3225
		3226	my $idx = 0;
		3227
		3228	for (@$cmds) {
		3229	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3230
		3231	my $i = $idx;
		3232	$hb->add (new CFClient::UI::Label text => $_);
		3233	$hb->add (new CFClient::UI::Button
		3234	text => "delete",
		3235	tooltip => "Deletes the action from the record",
		3236	on_activate => sub {
		3237	$self->{cmdbox}->remove ($hb);
		3238	$cmds->[$i] = undef;
		3239	});
		3240
		3241
		3242	$idx++
		3243	}
		3244	}
		3245
		3246	#############################################################################
		3247
		3248	package CFClient::UI::SpellList;
		3249
		3250	our @ISA = CFClient::UI::FancyFrame::;
		3251
		3252	sub new {
		3253	my $class = shift;
		3254
		3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3256
		3257	$self->add (new CFClient::UI::ScrolledWindow
		3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3259
		3260	$self;
		3261	}
		3262
		3263	# XXX: Do sorting? Argl...
		3264	sub add_spell {
		3265	my ($self, $spell) = @_;
		3266	$self->{spells}->{$spell->{name}} = $spell;
		3267
		3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3269	face => $spell->{face},
		3270	can_hover => 1,
		3271	can_events => 1,
		3272	tooltip => $spell->{message});
		3273
		3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3275	text => $spell->{name},
		3276	can_hover => 1,
		3277	can_events => 1,
		3278	tooltip => $spell->{message},
		3279	expand => 1);
		3280
		3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3283	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3287	text => "bind to key",
		3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3289	}
		3290
		3291	sub rebuild_spell_list {
		3292	my ($self) = @_;
		3293	$self->{tbl_idx} = 0;
		3294	$self->add_spell ($_) for values %{$self->{spells}};
		3295	}
		3296
		3297	sub remove_spell {
		3298	my ($self, $spell) = @_;
		3299	delete $self->{spells}->{$spell->{name}};
		3300	$self->rebuild_spell_list;
		3301	}
		3302
		3303	#############################################################################
		3304
2994	package CFClient::UI::Root;	3305	package CFClient::UI::Root;
2995		3306
2996	our @ISA = CFClient::UI::Container::;	3307	our @ISA = CFClient::UI::Container::;
2997		3308
2998	use CFClient::OpenGL;	3309	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3319	Scalar::Util::weaken ($self->{root} = $self);
3009		3320
3010	$self	3321	$self
3011	}	3322	}
3012		3323
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3324	sub size_request {
3030	my ($self) = @_;	3325	my ($self) = @_;
3031		3326
3032	($self->{w}, $self->{h})	3327	($self->{w}, $self->{h})
3033	}	3328	}
…		…
3045		3340
3046	int $coord + 0.5	3341	int $coord + 0.5
3047	}	3342	}
3048		3343
3049	sub size_allocate {	3344	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3345	my ($self, $w, $h) = @_;
3051		3346
3052	for my $child ($self->children) {	3347	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3348	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3349
3055	$X = $child->{force_x} if exists $child->{force_x};	3350	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3418	$_->()
3124	for values %{delete $self->{refresh_hook}};	3419	for values %{delete $self->{refresh_hook}};
3125	}	3420	}
3126		3421
3127	if ($self->{realloc}) {	3422	if ($self->{realloc}) {
		3423	my %queue;
3128	my @queue;	3424	my @queue;
		3425	my $widget;
3129		3426
		3427	outer:
3130	while () {	3428	while () {
3131	if ($self->{realloc}) {	3429	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3430	for $widget (values %$realloc) {
		3431	$widget->{visible} or next; # do not resize invisible widgets
3133		3432
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3433	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3434
		3435	push @{ $queue[$widget->{visible}] }, $widget;
		3436	}
3136	}	3437	}
3137		3438
		3439	while () {
		3440	@queue or last outer;
		3441
3138	my $widget = pop @queue \|\| last;	3442	$widget = pop @{ $queue[-1] \|\| [] }
		3443	and last;
		3444
		3445	pop @queue;
		3446	}
3139		3447
3140	$widget->{visible} or last; # do not resize invisible widgets	3448	delete $queue{$widget+0};
3141		3449
3142	my ($w, $h) = $widget->size_request;	3450	my ($w, $h) = $widget->size_request;
3143		3451
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} \|\| $widget->{is_toplevel} * 16, $w;	3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h} \|\| $widget->{is_toplevel} * 16, $h;	3453	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3454
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3455	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3456	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3457
		3458	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3459	\|\| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3460	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3461	$widget->{req_h} = $h;
3154		3462
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3463	$self->{size_alloc}{$widget+0} = $widget;
3156		3464
3157	push @queue, $widget->{parent}	3465	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3466	$self->{realloc}{$parent+0} = $parent
		3467	unless $queue{$parent+0};
		3468
		3469	$parent->{force_size_alloc} = 1;
		3470	$self->{size_alloc}{$parent+0} = $parent;
		3471	}
		3472	}
		3473
		3474	delete $self->{realloc}{$widget+0};
3159	}	3475	}
3160	}	3476	}
3161		3477
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3478	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3479	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3480	values %$size_alloc;
3165		3481
3166	while () {	3482	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3483	my $widget = pop @queue \|\| last;
3168		3484
3169	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3485	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3171		3486
3172	$w = 0 if $w < 0;	3487	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3488	$h = 0 if $h < 0;
3174		3489
3175	$w = int $w + 0.5;	3490	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3491	$h = int $h + 0.5;
3177		3492
3178	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3493	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3494	$widget->{old_w} = $widget->{w};
		3495	$widget->{old_h} = $widget->{h};
3179		3496
3180	$widget->{w} = $w;	3497	$widget->{w} = $w;
3181	$widget->{h} = $h;	3498	$widget->{h} = $h;
3182		3499
3183	$widget->emit (size_allocate => $w, $h, $changed);	3500	$widget->emit (size_allocate => $w, $h);
		3501	}
3184	}	3502	}
3185	}	3503	}
3186		3504
3187	while ($self->{post_alloc_hook}) {	3505	while ($self->{post_alloc_hook}) {
3188	$_->()	3506	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3507	for values %{delete $self->{post_alloc_hook}};
3190	}	3508	}
		3509
3191		3510
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3513	glClear GL_COLOR_BUFFER_BIT;
3195		3514
…		…
3197	glLoadIdentity;	3516	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3518	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3519	glLoadIdentity;
3201		3520
		3521	{
		3522	package CFClient::UI::Base;
		3523
		3524	($draw_x, $draw_y, $draw_w, $draw_h) =
		3525	(0, 0, $self->{w}, $self->{h});
		3526	}
		3527
3202	$self->_draw;	3528	$self->_draw;
3203	}	3529	}
3204		3530
3205	#############################################################################	3531	#############################################################################
3206		3532

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs. Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC