[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.267 by root, Thu Jun 1 04:10:29 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
…		…
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	local $draw_x = $draw_x + $self->{x};
		535	local $draw_y = $draw_y + $self->{y};
		536
		537	return if $draw_x + $self->{w} < 0;
		538	return if $draw_x >= $draw_w;
		539	return if $draw_y + $self->{h} < 0;
		540	return if $draw_y >= $draw_h;
526		541
527	glPushMatrix;	542	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	543	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	544	$self->_draw;
530	glPopMatrix;	545	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	557	glVertex $x , $y + $self->{h};
543	glEnd;	558	glEnd;
544	glDisable GL_BLEND;	559	glDisable GL_BLEND;
545	}	560	}
546		561
547	if ($ENV{CFPLUS_DEBUG}) {	562	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	563	glPushMatrix;
549	glColor 1, 1, 0, 1;	564	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	566	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	567	glVertex 0 , 0;
…		…
761	sub size_request {	776	sub size_request {
762	$_[0]{children}[0]->size_request	777	$_[0]{children}[0]->size_request
763	}	778	}
764		779
765	sub size_allocate {	780	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	781	my ($self, $w, $h) = @_;
767		782
768	$self->{children}[0]->configure (0, 0, $w, $h);	783	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	784	}
770		785
771	#############################################################################	786	#############################################################################
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	803	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	804	$self->SUPER::update;
790	}	805	}
791		806
792	sub size_allocate {	807	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	808	my ($self, $w, $h) = @_;
794		809
795	$self->SUPER::size_allocate ($w, $h, $changed);	810	$self->SUPER::size_allocate ($w, $h);
796	$self->update	811	$self->update;
797	if $changed;
798	}	812	}
799		813
800	sub _render {	814	sub _render {
		815	my ($self) = @_;
		816
801	$_[0]{children}[0]->draw;	817	$self->{children}[0]->draw;
802	}	818	}
803		819
804	sub render_child {	820	sub render_child {
805	my ($self) = @_;	821	my ($self) = @_;
806		822
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	823	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	824	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	825	glClear GL_COLOR_BUFFER_BIT;
810		826
		827	{
		828	package CFClient::UI::Base;
		829
		830	($draw_x, $draw_y, $draw_w, $draw_h) =
		831	(0, 0, $self->{w}, $self->{h});
		832	}
		833
811	$self->_render;	834	$self->_render;
812	};	835	};
813	}	836	}
814		837
815	sub _draw {	838	sub _draw {
816	my ($self) = @_;	839	my ($self) = @_;
817		840
818	my ($w, $h) = ($self->w, $self->h);	841	my ($w, $h) = @$self{qw(w h)};
819		842
820	my $tex = $self->{texture}	843	my $tex = $self->{texture}
821	or return;	844	or return;
822		845
823	glEnable GL_TEXTURE_2D;	846	glEnable GL_TEXTURE_2D;
…		…
846	}	869	}
847		870
848	sub size_request {	871	sub size_request {
849	my ($self) = @_;	872	my ($self) = @_;
850		873
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	874	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		875
853	$w = 10 if $self->{scroll_x};	876	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	877	$h = 10 if $self->{scroll_y};
855		878
856	($w, $h)	879	($w, $h)
857	}	880	}
858		881
859	sub size_allocate {	882	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	883	my ($self, $w, $h) = @_;
861		884
		885	my $child = $self->child;
		886
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		889
865	$self->child->configure (0, 0, $w, $h);	890	$self->child->configure (0, 0, $w, $h);
866	$self->update;	891	$self->update;
867	}	892	}
868		893
…		…
903	}	928	}
904	}	929	}
905		930
906	sub _render {	931	sub _render {
907	my ($self) = @_;	932	my ($self) = @_;
		933
		934	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		935	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
908		936
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		938
911	$self->SUPER::_render;	939	$self->SUPER::_render;
912	}	940	}
…		…
952	my $child = $self->{vp}->child;	980	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	981	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	982	}
955		983
956	sub size_allocate {	984	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	985	my ($self, $w, $h) = @_;
958		986
959	$self->SUPER::size_allocate ($w, $h, $changed);	987	$self->SUPER::size_allocate ($w, $h);
960		988
961	my $child = $self->{vp}->child;	989	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	990	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	991	}
964		992
…		…
1026		1054
1027	my $self = $class->SUPER::new (	1055	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1056	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1057	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1058	border => 0.6,
1031	is_toplevel => 1,
1032	can_events => 1,	1059	can_events => 1,
		1060	min_w => 16,
		1061	min_h => 16,
1033	@_	1062	@_
1034	);	1063	);
1035		1064
1036	$self->{title} &&= new CFClient::UI::Label	1065	$self->{title} &&= new CFClient::UI::Label
1037	align => 0,	1066	align => 0,
…		…
1056	$h + $self->border * 2,	1085	$h + $self->border * 2,
1057	)	1086	)
1058	}	1087	}
1059		1088
1060	sub size_allocate {	1089	sub size_allocate {
1061	my ($self, $w, $h, $changed) = @_;	1090	my ($self, $w, $h) = @_;
1062
1063	return unless $changed;
1064		1091
1065	$h -= List::Util::max 0, $self->border * 2;	1092	$h -= List::Util::max 0, $self->border * 2;
1066	$w -= List::Util::max 0, $self->border * 2;	1093	$w -= List::Util::max 0, $self->border * 2;
1067		1094
1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1095	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
1240	(sum @$hs),	1267	(sum @$hs),
1241	)	1268	)
1242	}	1269	}
1243		1270
1244	sub size_allocate {	1271	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1272	my ($self, $w, $h) = @_;
1246		1273
1247	my ($ws, $hs) = $self->get_wh;	1274	my ($ws, $hs) = $self->get_wh;
1248		1275
1249	my $req_w = (sum @$ws) \|\| 1;	1276	my $req_w = (sum @$ws) \|\| 1;
1250	my $req_h = (sum @$hs) \|\| 1;	1277	my $req_h = (sum @$hs) \|\| 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1356	)
1330	}	1357	}
1331		1358
1332	sub size_allocate {	1359	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1360	my ($self, $w, $h) = @_;
1334		1361
1335	my $space = $self->{vertical} ? $h : $w;	1362	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1363	my $children = $self->{children};
1337		1364
1338	my @req;	1365	my @req;
…		…
1421	ellipsise => 3, # end	1448	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1423	fontsize => 1,	1450	fontsize => 1,
1424	align => -1,	1451	align => -1,
1425	valign => -1,	1452	valign => -1,
1426	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1427	can_events => 0,	1455	can_events => 0,
1428	%arg	1456	%arg
1429	);	1457	);
1430		1458
1431	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1507		1535
1508	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1510	}	1538	}
1511		1539
1512	(	1540	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1541	}
1517		1542
1518	sub size_allocate {	1543	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1544	my ($self, $w, $h) = @_;
1520		1545
1521	delete $self->{texture}	1546	delete $self->{texture}
1522	if $changed;	1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1548	}
1524		1549
1525	sub set_fontsize {	1550	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1527		1552
…		…
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1571
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1548		1573
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1552		1577
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1556		1581
1557	$tex	1582	$tex
1558	};	1583	};
1559		1584
…		…
1798		1823
1799	sub new {	1824	sub new {
1800	my $class = shift;	1825	my $class = shift;
1801		1826
1802	$class->SUPER::new (	1827	$class->SUPER::new (
1803	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1804	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1806	can_hover => 1,	1832	can_hover => 1,
1807	align => 0,	1833	align => 0,
1808	valign => 0,	1834	valign => 0,
…		…
1855		1881
1856	sub new {	1882	sub new {
1857	my $class = shift;	1883	my $class = shift;
1858		1884
1859	$class->SUPER::new (	1885	$class->SUPER::new (
1860	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1861	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1892	state => 0,
…		…
1869	}	1896	}
1870		1897
1871	sub size_request {	1898	sub size_request {
1872	my ($self) = @_;	1899	my ($self) = @_;
1873		1900
1874	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1875	}	1902	}
1876		1903
1877	sub button_down {	1904	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1879		1906
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1884	}	1911	}
1885	}	1912	}
1886		1913
1887	sub _draw {	1914	sub _draw {
1888	my ($self) = @_;	1915	my ($self) = @_;
1889		1916
1890	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1891		1918
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1920
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1921	my ($w, $h) = @$self{qw(w h)};
		1922
		1923	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1924
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1926
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1928
…		…
2164	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2171	vertical => 0,	2200	vertical => 0,
2172	can_hover => 1,	2201	can_hover => 1,
2173	inner_pad => 0.02,	2202	inner_pad => 0.02,
2174	@_	2203	@_
2175	);	2204	);
…		…
2215	}	2244	}
2216		2245
2217	sub size_request {	2246	sub size_request {
2218	my ($self) = @_;	2247	my ($self) = @_;
2219		2248
2220	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2250	}
2225		2251
2226	sub button_down {	2252	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2228		2254
…		…
2378	$self->{fontsize} = $fontsize;	2404	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2405	$self->reflow;
2380	}	2406	}
2381		2407
2382	sub size_allocate {	2408	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2409	my ($self, $w, $h) = @_;
2384		2410
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2411	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2412
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2413	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2415	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2416
…		…
2615	}	2639	}
2616		2640
2617	sub set_tooltip_from {	2641	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2619		2643
		2644	my $tooltip = $widget->{tooltip};
		2645
		2646	if ($ENV{CFPLUS_DEBUG} & 2) {
		2647	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2648	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2649	. "req $widget->{req_w} $widget->{req_h}\n"
		2650	. "visible $widget->{visible}";
		2651	}
		2652
2620	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2654	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2656	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2658	ellipsise => 0,
2626	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2659	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2634		2667
2635	($w + 4, $h + 4)	2668	($w + 4, $h + 4)
2636	}	2669	}
2637		2670
2638	sub size_allocate {	2671	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2672	my ($self, $w, $h) = @_;
2640		2673
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2674	$self->SUPER::size_allocate ($w - 4, $h - 4);
2644	}	2675	}
2645		2676
2646	sub visibility_change {	2677	sub visibility_change {
2647	my ($self, $visible) = @_;	2678	my ($self, $visible) = @_;
2648		2679
…		…
2769	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2770	}	2801	}
2771		2802
2772	#############################################################################	2803	#############################################################################
2773		2804
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;	2805	package CFClient::UI::Menu;
2817		2806
2818	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2819		2808
2820	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2858	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2848	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2861		2850
2862	$self->show;	2851	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2852	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2853	}
2865		2854
2866	sub mouse_motion {	2855	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2868		2857
…		…
2993	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
2994	}	2983	}
2995		2984
2996	#############################################################################	2985	#############################################################################
2997		2986
		2987	package CFClient::UI::Inventory;
		2988
		2989	our @ISA = CFClient::UI::ScrolledWindow::;
		2990
		2991	sub new {
		2992	my $class = shift;
		2993
		2994	my $self = $class->SUPER::new (
		2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2996	@_,
		2997	);
		2998
		2999	$self
		3000	}
		3001
		3002	sub set_items {
		3003	my ($self, $items) = @_;
		3004
		3005	$self->{scrolled}->clear;
		3006	return unless $items;
		3007
		3008	my @items = sort {
		3009	($a->{type} <=> $b->{type})
		3010	or ($a->{name} cmp $b->{name})
		3011	} @$items;
		3012
		3013	$self->{real_items} = \@items;
		3014
		3015	my $row = 0;
		3016	for my $item (@items) {
		3017	CFClient::Item::update_widgets $item;
		3018
		3019	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3022
		3023	$row++;
		3024	}
		3025	}
		3026
		3027	#############################################################################
		3028
		3029	package CFClient::UI::BindEditor;
		3030
		3031	our @ISA = CFClient::UI::FancyFrame::;
		3032
		3033	sub new {
		3034	my $class = shift;
		3035
		3036	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3037
		3038	$self->add (my $vb = new CFClient::UI::VBox);
		3039
		3040
		3041	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3042	text => "start recording",
		3043	tooltip => "Start/Stops recording of actions."
		3044	."All subsequent actions after the recording started will be captured."
		3045	."The actions are displayed after the record was stopped."
		3046	."To bind the action you have to click on the 'Bind' button",
		3047	on_activate => sub {
		3048	unless ($self->{recording}) {
		3049	$self->start;
		3050	} else {
		3051	$self->stop;
		3052	}
		3053	});
		3054
		3055	$vb->add (new CFClient::UI::Label text => "Actions:");
		3056	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3057
		3058	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3059	$vb->add (my $hb = new CFClient::UI::HBox);
		3060	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3061	$hb->add (new CFClient::UI::Button
		3062	text => "bind",
		3063	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3064	on_activate => sub {
		3065	$self->ask_for_bind;
		3066	});
		3067
		3068	$vb->add (my $hb = new CFClient::UI::HBox);
		3069	$hb->add (new CFClient::UI::Button
		3070	text => "ok",
		3071	expand => 1,
		3072	tooltip => "This closes the binding editor and saves the binding",
		3073	on_activate => sub {
		3074	$self->hide;
		3075	$self->commit;
		3076	});
		3077
		3078	$hb->add (new CFClient::UI::Button
		3079	text => "cancel",
		3080	expand => 1,
		3081	tooltip => "This closes the binding editor without saving",
		3082	on_activate => sub {
		3083	$self->hide;
		3084	$self->{binding_cancel}->()
		3085	if $self->{binding_cancel};
		3086	});
		3087
		3088	$self->update_binding_widgets;
		3089
		3090	$self
		3091	}
		3092
		3093	sub commit {
		3094	my ($self) = @_;
		3095	my ($mod, $sym, $cmds) = $self->get_binding;
		3096	if ($sym != 0 && @$cmds > 0) {
		3097	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3098	."'. Don't forget 'Save Config'!");
		3099	$self->{binding_change}->($mod, $sym, $cmds)
		3100	if $self->{binding_change};
		3101	} else {
		3102	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3103	$self->{binding_cancel}->()
		3104	if $self->{binding_cancel};
		3105	}
		3106	}
		3107
		3108	sub start {
		3109	my ($self) = @_;
		3110
		3111	$self->{rec_btn}->set_text ("stop recording");
		3112	$self->{recording} = 1;
		3113	$self->clear_command_list;
		3114	$::CONN->start_record if $::CONN;
		3115	}
		3116
		3117	sub stop {
		3118	my ($self) = @_;
		3119
		3120	$self->{rec_btn}->set_text ("start recording");
		3121	$self->{recording} = 0;
		3122
		3123	my $rec;
		3124	$rec = $::CONN->stop_record if $::CONN;
		3125	return unless ref $rec eq 'ARRAY';
		3126	$self->set_command_list ($rec);
		3127	}
		3128
		3129	# if $commit is true, the binding will be set after the user entered a key combo
		3130	sub ask_for_bind {
		3131	my ($self, $commit) = @_;
		3132
		3133	CFClient::Binder::open_binding_dialog (sub {
		3134	my ($mod, $sym) = @_;
		3135	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3136	$self->update_binding_widgets;
		3137	$self->commit if $commit;
		3138	});
		3139	}
		3140
		3141	# $mod and $sym are the modifiers and key symbol
		3142	# $cmds is a array ref of strings (the commands)
		3143	# $cb is the callback that is executed on OK
		3144	# $ccb is the callback that is executed on CANCEL and
		3145	# when the binding was unsuccessful on OK
		3146	sub set_binding {
		3147	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3148
		3149	$self->clear_command_list;
		3150	$self->{recording} = 0;
		3151	$self->{rec_btn}->set_text ("start recording");
		3152
		3153	$self->{binding} = [$mod, $sym];
		3154	$self->{commands} = $cmds;
		3155
		3156	$self->{binding_change} = $cb;
		3157	$self->{binding_cancel} = $ccb;
		3158
		3159	$self->update_binding_widgets;
		3160	}
		3161
		3162	# this is a shortcut method that asks for a binding
		3163	# and then just binds it.
		3164	sub do_quick_binding {
		3165	my ($self, $cmds) = @_;
		3166	$self->set_binding (undef, undef, $cmds, sub {
		3167	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3168	});
		3169	$self->ask_for_bind (1);
		3170	}
		3171
		3172	sub update_binding_widgets {
		3173	my ($self) = @_;
		3174	my ($mod, $sym, $cmds) = $self->get_binding;
		3175	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3176	$self->set_command_list ($cmds);
		3177	}
		3178
		3179	sub get_binding {
		3180	my ($self) = @_;
		3181	return (
		3182	$self->{binding}->[0],
		3183	$self->{binding}->[1],
		3184	[ grep { defined $_ } @{$self->{commands}} ]
		3185	);
		3186	}
		3187
		3188	sub clear_command_list {
		3189	my ($self) = @_;
		3190	$self->{cmdbox}->clear ();
		3191	}
		3192
		3193	sub set_command_list {
		3194	my ($self, $cmds) = @_;
		3195
		3196	$self->{cmdbox}->clear ();
		3197	$self->{commands} = $cmds;
		3198
		3199	my $idx = 0;
		3200
		3201	for (@$cmds) {
		3202	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3203
		3204	my $i = $idx;
		3205	$hb->add (new CFClient::UI::Label text => $_);
		3206	$hb->add (new CFClient::UI::Button
		3207	text => "delete",
		3208	tooltip => "Deletes the action from the record",
		3209	on_activate => sub {
		3210	$self->{cmdbox}->remove ($hb);
		3211	$cmds->[$i] = undef;
		3212	});
		3213
		3214
		3215	$idx++
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::SpellList;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (new CFClient::UI::ScrolledWindow
		3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3232
		3233	$self;
		3234	}
		3235
		3236	# XXX: Do sorting? Argl...
		3237	sub add_spell {
		3238	my ($self, $spell) = @_;
		3239	$self->{spells}->{$spell->{name}} = $spell;
		3240
		3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3242	face => $spell->{face},
		3243	can_hover => 1,
		3244	can_events => 1,
		3245	tooltip => $spell->{message});
		3246
		3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3248	text => $spell->{name},
		3249	can_hover => 1,
		3250	can_events => 1,
		3251	tooltip => $spell->{message},
		3252	expand => 1);
		3253
		3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3256	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3257	expand => 1);
		3258
		3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3260	text => "bind to key",
		3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3262	}
		3263
		3264	sub rebuild_spell_list {
		3265	my ($self) = @_;
		3266	$self->{tbl_idx} = 0;
		3267	$self->add_spell ($_) for values %{$self->{spells}};
		3268	}
		3269
		3270	sub remove_spell {
		3271	my ($self, $spell) = @_;
		3272	delete $self->{spells}->{$spell->{name}};
		3273	$self->rebuild_spell_list;
		3274	}
		3275
		3276	#############################################################################
		3277
2998	package CFClient::UI::Root;	3278	package CFClient::UI::Root;
2999		3279
3000	our @ISA = CFClient::UI::Container::;	3280	our @ISA = CFClient::UI::Container::;
3001		3281
3002	use CFClient::OpenGL;	3282	use CFClient::OpenGL;
…		…
3012	Scalar::Util::weaken ($self->{root} = $self);	3292	Scalar::Util::weaken ($self->{root} = $self);
3013		3293
3014	$self	3294	$self
3015	}	3295	}
3016		3296
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 {	3297	sub size_request {
3034	my ($self) = @_;	3298	my ($self) = @_;
3035		3299
3036	($self->{w}, $self->{h})	3300	($self->{w}, $self->{h})
3037	}	3301	}
…		…
3049		3313
3050	int $coord + 0.5	3314	int $coord + 0.5
3051	}	3315	}
3052		3316
3053	sub size_allocate {	3317	sub size_allocate {
3054	my ($self, $w, $h, $changed) = @_;	3318	my ($self, $w, $h) = @_;
3055		3319
3056	for my $child ($self->children) {	3320	for my $child ($self->children) {
3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3321	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058		3322
3059	$X = $child->{force_x} if exists $child->{force_x};	3323	$X = $child->{force_x} if exists $child->{force_x};
…		…
3127	$_->()	3391	$_->()
3128	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3129	}	3393	}
3130		3394
3131	if ($self->{realloc}) {	3395	if ($self->{realloc}) {
		3396	my %queue;
3132	my @queue;	3397	my @queue;
		3398	my $widget;
3133		3399
		3400	outer:
3134	while () {	3401	while () {
3135	if ($self->{realloc}) {	3402	if (my $realloc = delete $self->{realloc}) {
3136	#TODO use array-of-depth approach	3403	for $widget (values %$realloc) {
		3404	$widget->{visible} or next; # do not resize invisible widgets
3137		3405
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3406	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{realloc}};	3407
		3408	push @{ $queue[$widget->{visible}] }, $widget;
		3409	}
3140	}	3410	}
3141		3411
		3412	while () {
		3413	@queue or last outer;
		3414
		3415	$widget = pop @{ $queue[-1] \|\| [] }
		3416	and last;
		3417
		3418	pop @queue;
		3419	}
		3420
		3421	delete $queue{$widget+0};
		3422
		3423	my ($w, $h) = $widget->size_request;
		3424
		3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3427
		3428	$w = $widget->{force_w} if exists $widget->{force_w};
		3429	$h = $widget->{force_h} if exists $widget->{force_h};
		3430
		3431	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3432	\|\| delete $widget->{force_realloc}) {
		3433	$widget->{req_w} = $w;
		3434	$widget->{req_h} = $h;
		3435
		3436	$self->{size_alloc}{$widget+0} = $widget;
		3437
		3438	if (my $parent = $widget->{parent}) {
		3439	$self->{realloc}{$parent+0} = $parent
		3440	unless $queue{$parent+0};
		3441
		3442	$parent->{force_size_alloc} = 1;
		3443	$self->{size_alloc}{$parent+0} = $parent;
		3444	}
		3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
		3448	}
		3449	}
		3450
		3451	while (my $size_alloc = delete $self->{size_alloc}) {
		3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3453	values %$size_alloc;
		3454
		3455	while () {
3142	my $widget = pop @queue \|\| last;	3456	my $widget = pop @queue \|\| last;
3143		3457
3144	$widget->{visible} or last; # do not resize invisible widgets	3458	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		3459
3175	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3176	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3177		3462
3178	$w = int $w + 0.5;	3463	$w = int $w + 0.5;
3179	$h = int $h + 0.5;	3464	$h = int $h + 0.5;
3180		3465
3181	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3466	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3467	$widget->{old_w} = $widget->{w};
		3468	$widget->{old_h} = $widget->{h};
3182		3469
3183	$widget->{w} = $w;	3470	$widget->{w} = $w;
3184	$widget->{h} = $h;	3471	$widget->{h} = $h;
3185		3472
3186	$widget->emit (size_allocate => $w, $h, $changed);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3187	}	3475	}
3188	}	3476	}
3189		3477
3190	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3191	$_->()	3479	$_->()
3192	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3193	}	3481	}
		3482
3194		3483
3195	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3198		3487
…		…
3200	glLoadIdentity;	3489	glLoadIdentity;
3201	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3203	glLoadIdentity;	3492	glLoadIdentity;
3204		3493
		3494	{
		3495	package CFClient::UI::Base;
		3496
		3497	($draw_x, $draw_y, $draw_w, $draw_h) =
		3498	(0, 0, $self->{w}, $self->{h});
		3499	}
		3500
3205	$self->_draw;	3501	$self->_draw;
3206	}	3502	}
3207		3503
3208	#############################################################################	3504	#############################################################################
3209		3505

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.267 by root, Thu Jun 1 04:10:29 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.267 by root, Thu Jun 1 04:10:29 2006 UTC