[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.268 by root, Thu Jun 1 05:04:41 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
…		…
1027	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1060	border => 0.6,
1031	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
1032	@_	1064	@_
1033	);	1065	);
1034		1066
1035	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
1036	align => 0,	1068	align => 0,
…		…
1055	$h + $self->border * 2,	1087	$h + $self->border * 2,
1056	)	1088	)
1057	}	1089	}
1058		1090
1059	sub size_allocate {	1091	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1092	my ($self, $w, $h) = @_;
1061
1062	return unless $changed;
1063		1093
1064	$h -= List::Util::max 0, $self->border * 2;	1094	$h -= List::Util::max 0, $self->border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1095	$w -= List::Util::max 0, $self->border * 2;
1066		1096
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1097	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
1239	(sum @$hs),	1269	(sum @$hs),
1240	)	1270	)
1241	}	1271	}
1242		1272
1243	sub size_allocate {	1273	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1274	my ($self, $w, $h) = @_;
1245		1275
1246	my ($ws, $hs) = $self->get_wh;	1276	my ($ws, $hs) = $self->get_wh;
1247		1277
1248	my $req_w = (sum @$ws) \|\| 1;	1278	my $req_w = (sum @$ws) \|\| 1;
1249	my $req_h = (sum @$hs) \|\| 1;	1279	my $req_h = (sum @$hs) \|\| 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1358	)
1329	}	1359	}
1330		1360
1331	sub size_allocate {	1361	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1362	my ($self, $w, $h) = @_;
1333		1363
1334	my $space = $self->{vertical} ? $h : $w;	1364	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1365	my $children = $self->{children};
1336		1366
1337	my @req;	1367	my @req;
…		…
1420	ellipsise => 3, # end	1450	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1422	fontsize => 1,	1452	fontsize => 1,
1423	align => -1,	1453	align => -1,
1424	valign => -1,	1454	valign => -1,
1425	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1426	can_events => 0,	1457	can_events => 0,
1427	%arg	1458	%arg
1428	);	1459	);
1429		1460
1430	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1506		1537
1507	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1509	}	1540	}
1510		1541
1511	(	1542	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1543	}
1516		1544
1517	sub size_allocate {	1545	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1546	my ($self, $w, $h) = @_;
1519		1547
1520	delete $self->{texture}	1548	delete $self->{texture}
1521	if $changed;	1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1550	}
1523		1551
1524	sub set_fontsize {	1552	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1526		1554
…		…
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1573
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1547		1575
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1551		1579
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1555		1583
1556	$tex	1584	$tex
1557	};	1585	};
1558		1586
…		…
1797		1825
1798	sub new {	1826	sub new {
1799	my $class = shift;	1827	my $class = shift;
1800		1828
1801	$class->SUPER::new (	1829	$class->SUPER::new (
1802	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1803	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1805	can_hover => 1,	1834	can_hover => 1,
1806	align => 0,	1835	align => 0,
1807	valign => 0,	1836	valign => 0,
…		…
1854		1883
1855	sub new {	1884	sub new {
1856	my $class = shift;	1885	my $class = shift;
1857		1886
1858	$class->SUPER::new (	1887	$class->SUPER::new (
1859	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1860	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1894	state => 0,
…		…
1868	}	1898	}
1869		1899
1870	sub size_request {	1900	sub size_request {
1871	my ($self) = @_;	1901	my ($self) = @_;
1872		1902
1873	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1874	}	1904	}
1875		1905
1876	sub button_down {	1906	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1878		1908
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1883	}	1913	}
1884	}	1914	}
1885		1915
1886	sub _draw {	1916	sub _draw {
1887	my ($self) = @_;	1917	my ($self) = @_;
1888		1918
1889	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1890		1920
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1922
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1926
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1928
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1930
…		…
2374	$self->{fontsize} = $fontsize;	2406	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2407	$self->reflow;
2376	}	2408	}
2377		2409
2378	sub size_allocate {	2410	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2411	my ($self, $w, $h) = @_;
2380		2412
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2413	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2414
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2415	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2416	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2417	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2418
…		…
2611	}	2641	}
2612		2642
2613	sub set_tooltip_from {	2643	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2615		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2616	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2656	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2658	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2660	ellipsise => 0,
2622	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2661	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2630		2669
2631	($w + 4, $h + 4)	2670	($w + 4, $h + 4)
2632	}	2671	}
2633		2672
2634	sub size_allocate {	2673	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2674	my ($self, $w, $h) = @_;
2636		2675
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2677	}
2641		2678
2642	sub visibility_change {	2679	sub visibility_change {
2643	my ($self, $visible) = @_;	2680	my ($self, $visible) = @_;
2644		2681
…		…
2765	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2766	}	2803	}
2767		2804
2768	#############################################################################	2805	#############################################################################
2769		2806
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;	2807	package CFClient::UI::Menu;
2813		2808
2814	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2815		2810
2816	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2854	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2850	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2857		2852
2858	$self->show;	2853	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2855	}
2861		2856
2862	sub mouse_motion {	2857	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2864		2859
…		…
2989	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2990	}	2985	}
2991		2986
2992	#############################################################################	2987	#############################################################################
2993		2988
		2989	package CFClient::UI::Inventory;
		2990
		2991	our @ISA = CFClient::UI::ScrolledWindow::;
		2992
		2993	sub new {
		2994	my $class = shift;
		2995
		2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2998	@_,
		2999	);
		3000
		3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
		3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3150
		3151	$self->clear_command_list;
		3152	$self->{recording} = 0;
		3153	$self->{rec_btn}->set_text ("start recording");
		3154
		3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
		3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
		3173
		3174	sub update_binding_widgets {
		3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
2994	package CFClient::UI::Root;	3280	package CFClient::UI::Root;
2995		3281
2996	our @ISA = CFClient::UI::Container::;	3282	our @ISA = CFClient::UI::Container::;
2997		3283
2998	use CFClient::OpenGL;	3284	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3294	Scalar::Util::weaken ($self->{root} = $self);
3009		3295
3010	$self	3296	$self
3011	}	3297	}
3012		3298
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 {	3299	sub size_request {
3030	my ($self) = @_;	3300	my ($self) = @_;
3031		3301
3032	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
3033	}	3303	}
…		…
3045		3315
3046	int $coord + 0.5	3316	int $coord + 0.5
3047	}	3317	}
3048		3318
3049	sub size_allocate {	3319	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3320	my ($self, $w, $h) = @_;
3051		3321
3052	for my $child ($self->children) {	3322	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3324
3055	$X = $child->{force_x} if exists $child->{force_x};	3325	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3393	$_->()
3124	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3125	}	3395	}
3126		3396
3127	if ($self->{realloc}) {	3397	if ($self->{realloc}) {
		3398	my %queue;
3128	my @queue;	3399	my @queue;
		3400	my $widget;
3129		3401
		3402	outer:
3130	while () {	3403	while () {
3131	if ($self->{realloc}) {	3404	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3405	for $widget (values %$realloc) {
		3406	$widget->{visible} or next; # do not resize invisible widgets
3133		3407
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3408	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3136	}	3412	}
3137		3413
		3414	while () {
		3415	@queue or last outer;
		3416
3138	my $widget = pop @queue \|\| last;	3417	$widget = pop @{ $queue[-1] \|\| [] }
		3418	and last;
		3419
		3420	pop @queue;
		3421	}
3139		3422
3140	$widget->{visible} or last; # do not resize invisible widgets	3423	delete $queue{$widget+0};
3141		3424
3142	my ($w, $h) = $widget->size_request;	3425	my ($w, $h) = $widget->size_request;
3143		3426
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} \|\| $widget->{is_toplevel} * 16, $w;	3427	$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;	3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3429
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3430	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3431	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3432
		3433	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3434	\|\| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3154		3437
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3438	$self->{size_alloc}{$widget+0} = $widget;
3156		3439
3157	push @queue, $widget->{parent}	3440	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
		3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3159	}	3450	}
3160	}	3451	}
3161		3452
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3455	values %$size_alloc;
3165		3456
3166	while () {	3457	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3458	my $widget = pop @queue \|\| last;
3168		3459
3169	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3171		3461
3172	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3174		3464
3175	$w = int $w + 0.5;	3465	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3466	$h = int $h + 0.5;
3177		3467
3178	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3468	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
3179		3471
3180	$widget->{w} = $w;	3472	$widget->{w} = $w;
3181	$widget->{h} = $h;	3473	$widget->{h} = $h;
3182		3474
3183	$widget->emit (size_allocate => $w, $h, $changed);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3184	}	3477	}
3185	}	3478	}
3186		3479
3187	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3188	$_->()	3481	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3190	}	3483	}
		3484
3191		3485
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3195		3489
…		…
3197	glLoadIdentity;	3491	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3494	glLoadIdentity;
3201		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3202	$self->_draw;	3503	$self->_draw;
3203	}	3504	}
3204		3505
3205	#############################################################################	3506	#############################################################################
3206		3507

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.268 by root, Thu Jun 1 05:04:41 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.268 by root, Thu Jun 1 05:04:41 2006 UTC