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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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	is_toplevel => 1,
1032	can_events => 1,	1063	can_events => 1,
1033	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
1034	);	1067	);
1035		1068
1036	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
1037	align => 0,	1070	align => 0,
1038	valign => 1,	1071	valign => 1,
1039	text => $self->{title},	1072	text => $title,
1040	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1041		1075
1042	$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};
1043	}	1084	}
1044		1085
1045	sub border {	1086	sub border {
1046	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1047	}	1088	}
1048		1089
1049	sub size_request {	1090	sub size_request {
1050	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1051		1095
1052	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1053		1097
1054	(	1098	(
1055	$w + $self->border * 2,	1099	$w + $self->border * 2,
1056	$h + $self->border * 2,	1100	$h + $self->border * 2,
1057	)	1101	)
1058	}	1102	}
1059		1103
1060	sub size_allocate {	1104	sub size_allocate {
1061	my ($self, $w, $h, $changed) = @_;	1105	my ($self, $w, $h) = @_;
1062		1106
1063	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	}
1064		1112
		1113	my $border = $self->border;
		1114
1065	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1066	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1067		1117
1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069	if $self->{title};
1070
1071	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1072	}	1119	}
1073		1120
1074	sub button_down {	1121	sub button_down {
1075	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1076		1123
…		…
1128	}	1175	}
1129		1176
1130	sub _draw {	1177	sub _draw {
1131	my ($self) = @_;	1178	my ($self) = @_;
1132		1179
		1180	my $child = $self->{children}[0];
		1181
1133	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1134	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1135		1184
1136	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138		1187
1139	my $border = $self->border;	1188	my $border = $self->border;
…		…
1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155	}	1204	}
1156		1205
1157	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1158		1207
1159	$self->{title}->draw if $self->{title};
1160
1161	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1162	}	1214	}
1163		1215
1164	#############################################################################	1216	#############################################################################
1165		1217
1166	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1240	(sum @$hs),	1292	(sum @$hs),
1241	)	1293	)
1242	}	1294	}
1243		1295
1244	sub size_allocate {	1296	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1297	my ($self, $w, $h) = @_;
1246		1298
1247	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1248		1300
1249	my $req_w = (sum @$ws) \|\| 1;	1301	my $req_w = (sum @$ws) \|\| 1;
1250	my $req_h = (sum @$hs) \|\| 1;	1302	my $req_h = (sum @$hs) \|\| 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1381	)
1330	}	1382	}
1331		1383
1332	sub size_allocate {	1384	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1385	my ($self, $w, $h) = @_;
1334		1386
1335	my $space = $self->{vertical} ? $h : $w;	1387	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1388	my $children = $self->{children};
1337		1389
1338	my @req;	1390	my @req;
…		…
1421	ellipsise => 3, # end	1473	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1423	fontsize => 1,	1475	fontsize => 1,
1424	align => -1,	1476	align => -1,
1425	valign => -1,	1477	valign => -1,
1426	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1427	can_events => 0,	1480	can_events => 0,
1428	%arg	1481	%arg
1429	);	1482	);
1430		1483
1431	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1507		1560
1508	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1510	}	1563	}
1511		1564
1512	(	1565	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1566	}
1517		1567
1518	sub size_allocate {	1568	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1569	my ($self, $w, $h) = @_;
		1570
		1571	delete $self->{ox};
1520		1572
1521	delete $self->{texture}	1573	delete $self->{texture}
1522	if $changed;	1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1575	}
1524		1576
1525	sub set_fontsize {	1577	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1527		1579
…		…
1542	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1598
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1548		1601
		1602	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1552		1606
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1610	};
1559		1611
1560	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1614
…		…
1798		1850
1799	sub new {	1851	sub new {
1800	my $class = shift;	1852	my $class = shift;
1801		1853
1802	$class->SUPER::new (	1854	$class->SUPER::new (
1803	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1804	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1806	can_hover => 1,	1859	can_hover => 1,
1807	align => 0,	1860	align => 0,
1808	valign => 0,	1861	valign => 0,
…		…
1855		1908
1856	sub new {	1909	sub new {
1857	my $class = shift;	1910	my $class = shift;
1858		1911
1859	$class->SUPER::new (	1912	$class->SUPER::new (
1860	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1861	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1919	state => 0,
…		…
1869	}	1923	}
1870		1924
1871	sub size_request {	1925	sub size_request {
1872	my ($self) = @_;	1926	my ($self) = @_;
1873		1927
1874	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1875	}	1929	}
1876		1930
1877	sub button_down {	1931	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1879		1933
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1884	}	1938	}
1885	}	1939	}
1886		1940
1887	sub _draw {	1941	sub _draw {
1888	my ($self) = @_;	1942	my ($self) = @_;
1889		1943
1890	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1891		1945
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1947
1894	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;
1895		1951
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1953
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1955
…		…
2164	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2171	vertical => 0,	2227	vertical => 0,
2172	can_hover => 1,	2228	can_hover => 1,
2173	inner_pad => 0.02,	2229	inner_pad => 0.02,
2174	@_	2230	@_
2175	);	2231	);
…		…
2215	}	2271	}
2216		2272
2217	sub size_request {	2273	sub size_request {
2218	my ($self) = @_;	2274	my ($self) = @_;
2219		2275
2220	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2277	}
2225		2278
2226	sub button_down {	2279	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2228		2281
…		…
2378	$self->{fontsize} = $fontsize;	2431	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2432	$self->reflow;
2380	}	2433	}
2381		2434
2382	sub size_allocate {	2435	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2436	my ($self, $w, $h) = @_;
2384		2437
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2438	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2439
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2440	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2442	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2443
…		…
2615	}	2666	}
2616		2667
2617	sub set_tooltip_from {	2668	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2619		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
2620	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2681	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2683	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2685	ellipsise => 0,
2626	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2686	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2634		2694
2635	($w + 4, $h + 4)	2695	($w + 4, $h + 4)
2636	}	2696	}
2637		2697
2638	sub size_allocate {	2698	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2699	my ($self, $w, $h) = @_;
2640		2700
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
2644	}	2702	}
2645		2703
2646	sub visibility_change {	2704	sub visibility_change {
2647	my ($self, $visible) = @_;	2705	my ($self, $visible) = @_;
2648		2706
…		…
2769	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2770	}	2828	}
2771		2829
2772	#############################################################################	2830	#############################################################################
2773		2831
2774	package CFClient::UI::Inventory;
2775
2776	our @ISA = CFClient::UI::ScrolledWindow::;
2777
2778	sub new {
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813
2814	#############################################################################
2815
2816	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2817		2833
2818	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2819		2835
2820	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2858	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2875	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2861		2877
2862	$self->show;	2878	$self->show;
2863	$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);
2864	}	2880	}
2865		2881
2866	sub mouse_motion {	2882	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2868		2884
…		…
2993	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2994	}	3010	}
2995		3011
2996	#############################################################################	3012	#############################################################################
2997		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
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
		3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3180
		3181	$self->clear_command_list;
		3182	$self->{recording} = 0;
		3183	$self->{rec_btn}->set_text ("start recording");
		3184
		3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
		3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
		3203
		3204	sub update_binding_widgets {
		3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
2998	package CFClient::UI::Root;	3310	package CFClient::UI::Root;
2999		3311
3000	our @ISA = CFClient::UI::Container::;	3312	our @ISA = CFClient::UI::Container::;
3001		3313
3002	use CFClient::OpenGL;	3314	use CFClient::OpenGL;
…		…
3012	Scalar::Util::weaken ($self->{root} = $self);	3324	Scalar::Util::weaken ($self->{root} = $self);
3013		3325
3014	$self	3326	$self
3015	}	3327	}
3016		3328
3017	sub configure {
3018	my ($self, $x, $y, $w, $h) = @_;
3019
3020	$self->{w} = $w;
3021	$self->{h} = $h;
3022	}
3023
3024	sub reconfigure {
3025	my ($self) = @_;
3026
3027	$self->SUPER::reconfigure;
3028
3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3030	if $self->{w};
3031	}
3032
3033	sub size_request {	3329	sub size_request {
3034	my ($self) = @_;	3330	my ($self) = @_;
3035		3331
3036	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
3037	}	3333	}
…		…
3049		3345
3050	int $coord + 0.5	3346	int $coord + 0.5
3051	}	3347	}
3052		3348
3053	sub size_allocate {	3349	sub size_allocate {
3054	my ($self, $w, $h, $changed) = @_;	3350	my ($self, $w, $h) = @_;
3055		3351
3056	for my $child ($self->children) {	3352	for my $child ($self->children) {
3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058		3354
3059	$X = $child->{force_x} if exists $child->{force_x};	3355	$X = $child->{force_x} if exists $child->{force_x};
…		…
3127	$_->()	3423	$_->()
3128	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3129	}	3425	}
3130		3426
3131	if ($self->{realloc}) {	3427	if ($self->{realloc}) {
		3428	my %queue;
3132	my @queue;	3429	my @queue;
		3430	my $widget;
3133		3431
		3432	outer:
3134	while () {	3433	while () {
3135	if ($self->{realloc}) {	3434	if (my $realloc = delete $self->{realloc}) {
3136	#TODO use array-of-depth approach	3435	for $widget (values %$realloc) {
		3436	$widget->{visible} or next; # do not resize invisible widgets
3137		3437
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3438	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{realloc}};	3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3140	}	3442	}
3141		3443
		3444	while () {
		3445	@queue or last outer;
		3446
		3447	$widget = pop @{ $queue[-1] \|\| [] }
		3448	and last;
		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3464	\|\| delete $widget->{force_realloc}) {
		3465	$widget->{req_w} = $w;
		3466	$widget->{req_h} = $h;
		3467
		3468	$self->{size_alloc}{$widget+0} = $widget;
		3469
		3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
		3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
		3480	}
		3481	}
		3482
		3483	while (my $size_alloc = delete $self->{size_alloc}) {
		3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3485	values %$size_alloc;
		3486
		3487	while () {
3142	my $widget = pop @queue \|\| last;	3488	my $widget = pop @queue \|\| last;
3143		3489
3144	$widget->{visible} or last; # do not resize invisible widgets	3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147	? @$widget{qw(force_w force_h)}
3148	: $widget->size_request;
3149
3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152	$w = $min_size if $w < $min_size;
3153	$h = $min_size if $h < $min_size;
3154
3155	$widget->{req_w} = $w;
3156	$widget->{req_h} = $h;
3157
3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160	push @queue, $widget->{parent}
3161	if $widget->{parent};
3162	}
3163	}
3164
3165	while (my $size_alloc = delete $self->{size_alloc}) {
3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167	values %$size_alloc;
3168
3169	while () {
3170	my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;
3173	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3174		3491
3175	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3176	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3177		3494
3178	$w = int $w + 0.5;	3495	$w = int $w + 0.5;
3179	$h = int $h + 0.5;	3496	$h = int $h + 0.5;
3180		3497
3181	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3498	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
3182		3501
3183	$widget->{w} = $w;	3502	$widget->{w} = $w;
3184	$widget->{h} = $h;	3503	$widget->{h} = $h;
3185		3504
3186	$widget->emit (size_allocate => $w, $h, $changed);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3187	}	3507	}
3188	}	3508	}
3189		3509
3190	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3191	$_->()	3511	$_->()
3192	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3193	}	3513	}
		3514
3194		3515
3195	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3198		3519
…		…
3200	glLoadIdentity;	3521	glLoadIdentity;
3201	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3203	glLoadIdentity;	3524	glLoadIdentity;
3204		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3205	$self->_draw;	3533	$self->_draw;
3206	}	3534	}
3207		3535
3208	#############################################################################	3536	#############################################################################
3209		3537

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs. Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC