ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

…		…
40		40
41	$LAYOUT = $layout;	41	$LAYOUT = $layout;
42	}	42	}
43		43
44	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
45	if (!$GRAB) {	47	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;	51	$TOOLTIP->hide;
51		52
52	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
53		54
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		178
178	$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.]+$/;
179	$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};
180	$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};
181	$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.]+$/;
182	$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};
183	$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};
184		185
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		188
188	}	189	}
189	}	190	}
190		191
191	reconfigure_widgets;	192	reconfigure_widgets;
…		…
370	sub size_allocate {	371	sub size_allocate {
371	# nothing to be done	372	# nothing to be done
372	}	373	}
373		374
374	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
375	}	381	}
376		382
377	sub set_max_size {	383	sub set_max_size {
378	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
379		385
380	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
381	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
382	}	390	}
383		391
384	sub set_tooltip {	392	sub set_tooltip {
385	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
386		394
…		…
438		446
439	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440	unless $FOCUS;	448	unless $FOCUS;
441	}	449	}
442		450
443	sub mouse_motion { }	451	sub mouse_motion { 0 }
444	sub button_up { }	452	sub button_up { 0 }
445	sub key_down { }	453	sub key_down { 0 }
446	sub key_up { }	454	sub key_up { 0 }
447		455
448	sub button_down {	456	sub button_down {
449	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
450		458
451	$self->focus_in;	459	$self->focus_in;
452	}
453		460
454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
456	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459		463
460	sub find_widget {	464	sub find_widget {
461	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
462		466
463	return () unless $self->{can_events};	467	return () unless $self->{can_events};
…		…
525		529
526	$self->realloc;	530	$self->realloc;
527	$self->update;	531	$self->update;
528	}	532	}
529		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		537
530	sub draw {	538	sub draw {
531	my ($self) = @_;	539	my ($self) = @_;
532		540
533	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534		552
535	glPushMatrix;	553	glPushMatrix;
536	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
537	$self->_draw;
538	glPopMatrix;
539		555
540	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
541	my ($x, $y) = @$self{qw(x y)};
542
543	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544	glEnable GL_BLEND;	558	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546	glBegin GL_QUADS;	560	glBegin GL_QUADS;
547	glVertex $x , $y;	561	glVertex 0 , 0;
548	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
549	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
550	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
551	glEnd;	565	glEnd;
552	glDisable GL_BLEND;	566	glDisable GL_BLEND;
553	}	567	}
554		568
555	if ($ENV{CFPLUS_DEBUG} & 1) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
556	glPushMatrix;	570	glPushMatrix;
557	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
559	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
560	glVertex 0 , 0;	574	glVertex 0 , 0;
561	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
562	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
563	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
564	glEnd;	578	glEnd;
565	glPopMatrix;	579	glPopMatrix;
566	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
568	}	585	}
569		586
570	sub _draw {	587	sub _draw {
571	my ($self) = @_;	588	my ($self) = @_;
572		589
…		…
610		627
611	if ($color && (@$color < 4 || $color->[3])) {	628	if ($color && (@$color < 4 || $color->[3])) {
612	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
613		630
614	glEnable GL_BLEND;	631	glEnable GL_BLEND;
615	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glColor @$color;	633	glColor_premultiply @$color;
617		634
618	glBegin GL_QUADS;	635	glBegin GL_QUADS;
619	glVertex 0 , 0;	636	glVertex 0 , 0;
620	glVertex 0 , $h;	637	glVertex 0 , $h;
621	glVertex $w, $h;	638	glVertex $w, $h;
…		…
652	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
653		670
654	sub new {	671	sub new {
655	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
656		673
657	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
658		675
659	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
660	children => [],	677	children => [],
661	can_events => 0,	678	can_events => 0,
662	%arg,	679	%arg,
663	);	680	);
		681
664	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
665		684
666	$self	685	$self
667	}	686	}
668		687
669	sub add {	688	sub add {
…		…
717	$x -= $self->{x};	736	$x -= $self->{x};
718	$y -= $self->{y};	737	$y -= $self->{y};
719		738
720	my $res;	739	my $res;
721		740
722	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
724	and return $res;	743	and return $res;
725	}	744	}
726		745
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	796	}
778		797
779	#############################################################################	798	#############################################################################
780		799
		800	# back-buffered drawing area
		801
781	package CFClient::UI::Window;	802	package CFClient::UI::Window;
782		803
783	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
784		805
785	use CFClient::OpenGL;	806	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	824	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	825	$self->update;
805	}	826	}
806		827
807	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
808	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
809	}	832	}
810		833
811	sub render_child {	834	sub render_child {
812	my ($self) = @_;	835	my ($self) = @_;
813		836
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
817		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
818	$self->_render;	848	$self->_render;
819	};	849	};
820	}	850	}
821		851
822	sub _draw {	852	sub _draw {
823	my ($self) = @_;	853	my ($self) = @_;
824		854
825	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
826		856
827	my $tex = $self->{texture}	857	my $tex = $self->{texture}
828	or return;	858	or return;
829		859
830	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
833		863
834	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835		865
836	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
837	}	867	}
…		…
913	}	943	}
914		944
915	sub _render {	945	sub _render {
916	my ($self) = @_;	946	my ($self) = @_;
917		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		952
920	$self->SUPER::_render;	953	$self->SUPER::_render;
921	}	954	}
922		955
…		…
925	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
926		959
927	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
928		961
929	sub new {	962	sub new {
930	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
931		966
932	my $self;	967	my $self;
933		968
934	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
935	vertical => 1,	970	vertical => 1,
…		…
940	;	975	;
941		976
942	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	979	slider => $slider,
945	@_,	980	%arg,
946	);	981	);
947		982
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
951		985
952	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
953	}	993	}
954		994
955	sub update {	995	sub update {
956	my ($self) = @_;	996	my ($self) = @_;
957		997
…		…
996		1036
997	if ($self->{bg}) {	1037	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
999		1039
1000	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
1003		1043
1004	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1045	glVertex 0 , 0;
1006	glVertex 0 , $h;	1046	glVertex 0 , $h;
1007	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1029	my @border =	1069	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1072
1033	sub new {	1073	sub new {
1034	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1035		1077
1036	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1081	border => 0.6,
1040	can_events => 1,	1082	can_events => 1,
1041	min_w => 16,	1083	min_w => 16,
1042	min_h => 16,	1084	min_h => 16,
1043	@_	1085	%arg,
1044	);	1086	);
1045		1087
1046	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1047	align => 0,	1089	align => 0,
1048	valign => 1,	1090	valign => 1,
1049	text => $self->{title},	1091	text => $title,
1050	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1051		1094
1052	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053	}	1103	}
1054		1104
1055	sub border {	1105	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1057	}	1107	}
1058		1108
1059	sub size_request {	1109	sub size_request {
1060	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1061		1114
1062	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1063		1116
1064	(	1117	(
1065	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
1068	}	1121	}
1069		1122
1070	sub size_allocate {	1123	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
1072		1125
		1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
		1131
		1132	my $border = $self->border;
		1133
1073	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1075		1136
1076	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077	if $self->{title};
1078
1079	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1080	}	1138	}
1081		1139
1082	sub button_down {	1140	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1084		1142
…		…
1103	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1104		1162
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1167	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1168	};
1111		1169
1112	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1118		1176
1119	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1120		1178
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1123	}	1187	1
1124	}	1188	}
1125		1189
1126	sub button_up {	1190	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1128		1192
1129	delete $self->{motion};	1193	!!delete $self->{motion}
1130	}	1194	}
1131		1195
1132	sub mouse_motion {	1196	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1134		1198
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1136	}	1202	}
1137		1203
1138	sub _draw {	1204	sub _draw {
1139	my ($self) = @_;	1205	my ($self) = @_;
1140		1206
		1207	my $child = $self->{children}[0];
		1208
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1211
1144	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1214
1147	my $border = $self->border;	1215	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1231	}
1164		1232
1165	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1166		1234
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1170	}	1241	}
1171		1242
1172	#############################################################################	1243	#############################################################################
1173		1244
1174	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1522	}	1593	}
1523		1594
1524	sub size_allocate {	1595	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1596	my ($self, $w, $h) = @_;
1526		1597
		1598	delete $self->{ox};
		1599
1527	delete $self->{texture}	1600	delete $self->{texture}
1528	;#d#	1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1602	}
1530		1603
1531	sub set_fontsize {	1604	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1605	my ($self, $fontsize) = @_;
1533		1606
…		…
1548	$self->{layout}->set_width ($self->{w});	1621	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1622	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1625
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1626	new_from_layout CFClient::Texture $self->{layout}
		1627	};
1554		1628
		1629	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1632	: ($self->{w} - $tex->{w}) * 0.5);
1558		1633
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1636	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1637	};
1565		1638
1566	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1641
		1642	glColor_premultiply @{$self->{fg}}
1569	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1570	glColor @{$self->{fg}};	1644
1571	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572	} else {
1573	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574	}
1575		1646
1576	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1577	}	1648	}
1578		1649
1579	#############################################################################	1650	#############################################################################
…		…
1606		1677
1607	delete $self->{cur_h};	1678	delete $self->{cur_h};
1608		1679
1609	return if $self->{text} eq $text;	1680	return if $self->{text} eq $text;
1610		1681
1611	delete $self->{texture};
1612
1613	$self->{last_activity} = $::NOW;	1682	$self->{last_activity} = $::NOW;
1614	$self->{text} = $text;	1683	$self->{text} = $text;
1615		1684
1616	$text =~ s/./*/g if $self->{hidden};	1685	$text =~ s/./*/g if $self->{hidden};
1617	$self->{layout}->set_text ("$text ");	1686	$self->{layout}->set_text ("$text ");
1618		1687
1619	$self->_emit (changed => $self->{text});	1688	$self->_emit (changed => $self->{text});
		1689	$self->update;
1620	}	1690	}
1621		1691
1622	sub set_text {	1692	sub set_text {
1623	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1624		1694
…		…
1663	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1735	$self->_emit ('escape');
1666	} elsif ($uni) {	1736	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1668	}	1740	}
1669		1741
1670	$self->_set_text ($text);	1742	$self->_set_text ($text);
1671		1743
1672	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1673	}	1747	}
1674		1748
1675	sub focus_in {	1749	sub focus_in {
1676	my ($self) = @_;	1750	my ($self) = @_;
1677		1751
…		…
1692	utf8::encode $text;	1766	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1694		1768
1695	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1696	$self->update;	1770	$self->update;
		1771
		1772	1
1697	}	1773	}
1698		1774
1699	sub mouse_motion {	1775	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1702	}	1780	}
1703		1781
1704	sub _draw {	1782	sub _draw {
1705	my ($self) = @_;	1783	my ($self) = @_;
1706		1784
1707	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1708		1786
1709	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1710	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1711	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1712	} else {	1790	} else {
1713	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1714	}	1792	}
1715		1793
1716	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1719	glVertex 0 , 0;	1797	glVertex 0 , 0;
1720	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1721	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1722	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1783	} else {	1861	} else {
1784	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1785	}	1863	}
1786		1864
1787	} else {	1865	} else {
1788	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1789	}	1869	1
1790
1791	}	1870	}
1792		1871
1793	#############################################################################	1872	#############################################################################
1794		1873
1795	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1825		1904
1826	$self->emit ("activate")	1905	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1829	}	1910	}
1830		1911
1831	sub _draw {	1912	sub _draw {
1832	my ($self) = @_;	1913	my ($self) = @_;
1833		1914
1834	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836	if ($GRAB == $self) {
1837	$self->{fg} = $self->{active_fg};
1838	}
1839		1916
1840	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1843		1920
…		…
1887		1964
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1967	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1968	$self->_emit (changed => $self->{state});
		1969	} else {
		1970	return 0
		1971	}
		1972
1892	}	1973	1
1893	}	1974	}
1894		1975
1895	sub _draw {	1976	sub _draw {
1896	my ($self) = @_;	1977	my ($self) = @_;
1897		1978
…		…
2064		2145
2065	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2066	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2067		2148
2068	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2069	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2150	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2151	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072		2154
2073	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2074	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2235		2317
2236	$self->SUPER::button_down ($ev, $x, $y);	2318	$self->SUPER::button_down ($ev, $x, $y);
2237		2319
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2321
2240	$self->mouse_motion ($ev, $x, $y);	2322	$self->mouse_motion ($ev, $x, $y)
2241	}	2323	}
2242		2324
2243	sub mouse_motion {	2325	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2326	my ($self, $ev, $x, $y) = @_;
2245		2327
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2331	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2332
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2333	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2334
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2335	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2336	} else {
		2337	return 0;
		2338	}
		2339
2254	}	2340	1
2255	}	2341	}
2256		2342
2257	sub update {	2343	sub update {
2258	my ($self) = @_;	2344	my ($self) = @_;
2259		2345
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2346	delete $self->{knob_w};
		2347	$self->SUPER::update;
		2348	}
		2349
		2350	sub _draw {
		2351	my ($self) = @_;
		2352
		2353	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2354	$self->set_value ($self->{range}[0]);
2262		2355
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2356	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) || 1e-100;	2357	my $range = ($hi - $page - $lo) || 1e-100;
2265		2358
…		…
2271	$value = ($value - $lo) / $range;	2364	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2365	$value = $value * $self->{scale} + $self->{offset};
2273		2366
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2367	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2368	$self->{knob_w} = $knob_w;
2276	});	2369	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2370
2284	$self->SUPER::_draw ();	2371	$self->SUPER::_draw ();
2285		2372
2286	glScale $self->{w}, $self->{h};	2373	glScale $self->{w}, $self->{h};
2287		2374
…		…
2481		2568
2482	delete $self->{texture};	2569	delete $self->{texture};
2483	}	2570	}
2484		2571
2485	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2487	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2488		2575
2489	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2490		2577
2491	my $y0 = $top;	2578	my $y0 = $top;
…		…
2526	sub _draw {	2613	sub _draw {
2527	my ($self) = @_;	2614	my ($self) = @_;
2528		2615
2529	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2532	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2619	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2534		2621
2535	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2536		2623
2537	}	2624	}
…		…
2764	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765		2852
2766	if ($tex) {	2853	if ($tex) {
2767	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2770	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2772	}	2859	}
2773	}	2860	}
2774		2861
…		…
2781	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2782	}	2869	}
2783		2870
2784	#############################################################################	2871	#############################################################################
2785		2872
2786	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2787		2874
2788	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2789		2876
2790	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2791	my $class = shift;
2792
2793	my $self = $class->SUPER::new (
2794	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2795	@_,
2796	);
2797
2798	$self
2799	}
2800
2801	sub set_items {
2802	my ($self, $items) = @_;
2803
2804	$self->{scrolled}->clear;
2805	return unless $items;
2806
2807	my @items = sort {
2808	($a->{type} <=> $b->{type})
2809	or ($a->{name} cmp $b->{name})
2810	} @$items;
2811
2812	$self->{real_items} = \@items;
2813
2814	my $row = 0;
2815	for my $item (@items) {
2816	CFClient::Item::update_widgets $item;
2817
2818	$self->{scrolled}->add (0, $row, $item->{face_widget});
2819	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2820	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2821
2822	$row++;
2823	}
2824	}
2825		2878
2826	#############################################################################	2879	#############################################################################
2827		2880
2828	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2829		2882
…		…
2879	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2880		2933
2881	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2882	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2884	}	2939	}
2885		2940
2886	sub button_up {	2941	sub button_up {
2887	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2888		2943
…		…
2890	undef $GRAB;	2945	undef $GRAB;
2891	$self->hide;	2946	$self->hide;
2892		2947
2893	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2894	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
2895	}	2954	1
2896	}	2955	}
2897		2956
2898	#############################################################################	2957	#############################################################################
2899		2958
2900	package CFClient::UI::Statusbox;	2959	package CFClient::UI::Multiplexer;
2901		2960
2902	our @ISA = CFClient::UI::VBox::;	2961	our @ISA = CFClient::UI::Container::;
2903		2962
2904	sub new {	2963	sub new {
2905	my $class = shift;	2964	my $class = shift;
2906		2965
2907	$class->SUPER::new (	2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
		3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
		3063	}
		3064
		3065	#############################################################################
		3066
		3067	package CFClient::UI::Statusbox;
		3068
		3069	our @ISA = CFClient::UI::VBox::;
		3070
		3071	sub new {
		3072	my $class = shift;
		3073
		3074	my $self = $class->SUPER::new (
2908	fontsize => 0.8,	3075	fontsize => 0.8,
2909	@_,	3076	@_,
2910	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3082
		3083	$self
2911	}	3084	}
2912		3085
2913	sub reorder {	3086	sub reorder {
2914	my ($self) = @_;	3087	my ($self) = @_;
2915	my $NOW = time;	3088	my $NOW = Time::HiRes::time;
		3089
		3090	# freeze display when hovering over any label
		3091	return if $CFClient::UI::TOOLTIP->{owner}
		3092	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3093	values %{ $self->{item} };
2916		3094
2917	while (my ($k, $v) = each %{ $self->{item} }) {	3095	while (my ($k, $v) = each %{ $self->{item} }) {
2918	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3096	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2919	}	3097	}
2920		3098
…		…
2923	my @items = sort {	3101	my @items = sort {
2924	$a->{pri} <=> $b->{pri}	3102	$a->{pri} <=> $b->{pri}
2925	or $b->{id} <=> $a->{id}	3103	or $b->{id} <=> $a->{id}
2926	} values %{ $self->{item} };	3104	} values %{ $self->{item} };
2927		3105
		3106	$self->{timer}->interval (1);
		3107
2928	my $count = 10 + 1;	3108	my $count = 10 + 1;
2929	for my $item (@items) {	3109	for my $item (@items) {
2930	last unless --$count;	3110	last unless --$count;
2931		3111
2932	push @widgets, $item->{label} ||= do {	3112	my $label = $item->{label} ||= do {
2933	# TODO: doesn't handle markup well (read as: at all)	3113	# TODO: doesn't handle markup well (read as: at all)
2934	my $short = $item->{count} > 1	3114	my $short = $item->{count} > 1
2935	? "<b>$item->{count} ×</b> $item->{text}"	3115	? "<b>$item->{count} ×</b> $item->{text}"
2936	: $item->{text};	3116	: $item->{text};
2937		3117
…		…
2945	tooltip => $item->{tooltip},	3125	tooltip => $item->{tooltip},
2946	tooltip_font => $::FONT_PROP,	3126	tooltip_font => $::FONT_PROP,
2947	tooltip_width => 0.67,	3127	tooltip_width => 0.67,
2948	fontsize => $item->{fontsize} || $self->{fontsize},	3128	fontsize => $item->{fontsize} || $self->{fontsize},
2949	max_w => $::WIDTH * 0.44,	3129	max_w => $::WIDTH * 0.44,
2950	fg => $item->{fg},	3130	fg => [@{ $item->{fg} }],
2951	can_events => 1,	3131	can_events => 1,
2952	can_hover => 1	3132	can_hover => 1
2953	};	3133	};
		3134
		3135	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3136	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3137	$label->update;
		3138	$label->set_max_size (undef, $label->{req_h} * $diff)
		3139	if $diff < 1;
		3140	$self->{timer}->interval (1/30);
		3141	} else {
		3142	$label->{fg}[3] = $item->{fg}[3] || 1;
		3143	}
		3144
		3145	push @widgets, $label;
2954	}	3146	}
2955		3147
2956	$self->clear;	3148	$self->clear;
2957	$self->SUPER::add (reverse @widgets);	3149	$self->SUPER::add (reverse @widgets);
2958	}	3150	}
…		…
2963	$text =~ s/^\s+//;	3155	$text =~ s/^\s+//;
2964	$text =~ s/\s+$//;	3156	$text =~ s/\s+$//;
2965		3157
2966	return unless $text;	3158	return unless $text;
2967		3159
2968	my $timeout = time + ((delete $arg{timeout}) || 60);	3160	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2969		3161
2970	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3162	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2971		3163
2972	if (my $item = $self->{item}{$group}) {	3164	if (my $item = $self->{item}{$group}) {
2973	if ($item->{text} eq $text) {	3165	if ($item->{text} eq $text) {
…		…
3003		3195
3004	$self->reorder;	3196	$self->reorder;
3005	$self->SUPER::reconfigure;	3197	$self->SUPER::reconfigure;
3006	}	3198	}
3007		3199
		3200	sub DESTROY {
		3201	my ($self) = @_;
		3202
		3203	$self->{timer}->cancel;
		3204
		3205	$self->SUPER::DESTROY;
		3206	}
		3207
3008	#############################################################################	3208	#############################################################################
3009		3209
3010	package CFClient::UI::Root;	3210	package CFClient::UI::Inventory;
3011		3211
3012	our @ISA = CFClient::UI::Container::;	3212	our @ISA = CFClient::UI::ScrolledWindow::;
3013
3014	use CFClient::OpenGL;
3015		3213
3016	sub new {	3214	sub new {
3017	my $class = shift;	3215	my $class = shift;
3018		3216
3019	my $self = $class->SUPER::new (	3217	my $self = $class->SUPER::new (
3020	visible => 1,	3218	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3021	@_,	3219	@_,
3022	);	3220	);
3023		3221
3024	Scalar::Util::weaken ($self->{root} = $self);
3025
3026	$self	3222	$self
3027	}	3223	}
3028		3224
3029	sub size_request {	3225	sub set_items {
3030	my ($self) = @_;
3031
3032	($self->{w}, $self->{h})
3033	}
3034
3035	sub _to_pixel {
3036	my ($coord, $size, $max) = @_;
3037
3038	$coord =
3039	$coord eq "center" ? ($max - $size) * 0.5
3040	: $coord eq "max" ? $max
3041	: $coord;
3042
3043	$coord = 0 if $coord < 0;
3044	$coord = $max - $size if $coord > $max - $size;
3045
3046	int $coord + 0.5
3047	}
3048
3049	sub size_allocate {
3050	my ($self, $w, $h) = @_;
3051
3052	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054
3055	$X = $child->{force_x} if exists $child->{force_x};
3056	$Y = $child->{force_y} if exists $child->{force_y};
3057
3058	$X = _to_pixel $X, $W, $self->{w};
3059	$Y = _to_pixel $Y, $H, $self->{h};
3060
3061	$child->configure ($X, $Y, $W, $H);
3062	}
3063	}
3064
3065	sub coord2local {
3066	my ($self, $x, $y) = @_;
3067
3068	($x, $y)
3069	}
3070
3071	sub coord2global {
3072	my ($self, $x, $y) = @_;
3073
3074	($x, $y)
3075	}
3076
3077	sub update {
3078	my ($self) = @_;
3079
3080	$::WANT_REFRESH++;
3081	}
3082
3083	sub add {
3084	my ($self, @children) = @_;
3085
3086	$_->{is_toplevel} = 1
3087	for @children;
3088
3089	$self->SUPER::add (@children);
3090	}
3091
3092	sub remove {
3093	my ($self, @children) = @_;
3094
3095	$self->SUPER::remove (@children);
3096
3097	delete $self->{is_toplevel}
3098	for @children;
3099
3100	while (@children) {
3101	my $w = pop @children;
3102	push @children, $w->children;
3103	$w->set_invisible;
3104	}
3105	}
3106
3107	sub on_refresh {
3108	my ($self, $id, $cb) = @_;
3109
3110	$self->{refresh_hook}{$id} = $cb;
3111	}
3112
3113	sub on_post_alloc {
3114	my ($self, $id, $cb) = @_;
3115
3116	$self->{post_alloc_hook}{$id} = $cb;
3117	}
3118
3119	sub draw {
3120	my ($self) = @_;
3121
3122	while ($self->{refresh_hook}) {
3123	$_->()
3124	for values %{delete $self->{refresh_hook}};
3125	}
3126
3127	if ($self->{realloc}) {
3128	my @queue;
3129
3130	while () {
3131	if ($self->{realloc}) {
3132	#TODO use array-of-depth approach
3133
3134	use sort 'stable';
3135
3136	@queue = sort { $a->{visible} <=> $b->{visible} }
3137	@queue, values %{delete $self->{realloc}};
3138	}
3139
3140	my $widget = pop @queue || last;
3141
3142	$widget->{visible} or last; # do not resize invisible widgets
3143
3144	my ($w, $h) = $widget->size_request;
3145
3146	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};
3151
3152	if ($widget->{req_w} != $w || $widget->{req_h} != $h
3153	|| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;
3156
3157	$self->{size_alloc}{$widget+0} = $widget;
3158
3159	if (my $parent = $widget->{parent}) {
3160	$self->{realloc}{$parent+0} = $parent;
3161	#unshift @queue, $parent;
3162	$parent->{force_size_alloc} = 1;
3163	$self->{size_alloc}{$parent+0} = $parent;
3164	}
3165	}
3166
3167	delete $self->{realloc}{$widget+0};
3168	}
3169	}
3170
3171	while (my $size_alloc = delete $self->{size_alloc}) {
3172	my @queue = sort { $b->{visible} <=> $a->{visible} }
3173	values %$size_alloc;
3174
3175	while () {
3176	my $widget = pop @queue || last;
3177
3178	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3179
3180	$w = 0 if $w < 0;
3181	$h = 0 if $h < 0;
3182
3183	$w = int $w + 0.5;
3184	$h = int $h + 0.5;
3185
3186	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3187	$widget->{w} = $w;
3188	$widget->{h} = $h;
3189
3190	$widget->emit (size_allocate => $w, $h);
3191	}
3192	}
3193	}
3194
3195	while ($self->{post_alloc_hook}) {
3196	$_->()
3197	for values %{delete $self->{post_alloc_hook}};
3198	}
3199
3200
3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203	glClear GL_COLOR_BUFFER_BIT;
3204
3205	glMatrixMode GL_PROJECTION;
3206	glLoadIdentity;
3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208	glMatrixMode GL_MODELVIEW;
3209	glLoadIdentity;
3210
3211	$self->_draw;
3212	}
3213
3214	#############################################################################
3215
3216	package CFClient::UI::SpellList;
3217
3218	our @ISA = CFClient::UI::FancyFrame::;
3219
3220	sub new {
3221	my $class = shift;
3222
3223	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225	$self->add (new CFClient::UI::ScrolledWindow
3226	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228	$self;
3229	}
3230
3231	# XXX: Do sorting? Argl...
3232	sub add_spell {
3233	my ($self, $spell) = @_;	3226	my ($self, $items) = @_;
3234	$self->{spells}->{$spell->{name}} = $spell;
3235		3227
3236	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3228	$self->{child}->clear;
3237	face => $spell->{face},	3229	return unless $items;
3238	can_hover => 1,
3239	can_events => 1,
3240	tooltip => $spell->{message});
3241		3230
3242	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3231	my @items = sort {
3243	text => $spell->{name},	3232	($a->{type} <=> $b->{type})
3244	can_hover => 1,	3233	or ($a->{name} cmp $b->{name})
3245	can_events => 1,	3234	} @$items;
3246	tooltip => $spell->{message},
3247	expand => 1);
3248		3235
3249	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3236	$self->{real_items} = \@items;
3250	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252	expand => 1);
3253		3237
3254	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3238	my $row = 0;
3255	text => "bind to key",	3239	for my $item (@items) {
3256	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3240	CFClient::Item::update_widgets $item;
3257	}
3258		3241
3259	sub rebuild_spell_list {	3242	$self->{child}->add (0, $row, $item->{face_widget});
3260	my ($self) = @_;	3243	$self->{child}->add (1, $row, $item->{desc_widget});
3261	$self->{tbl_idx} = 0;	3244	$self->{child}->add (2, $row, $item->{weight_widget});
3262	$self->add_spell ($_) for values %{$self->{spells}};
3263	}
3264		3245
3265	sub remove_spell {	3246	$row++;
3266	my ($self, $spell) = @_;	3247	}
3267	delete $self->{spells}->{$spell->{name}};
3268	$self->rebuild_spell_list;
3269	}	3248	}
3270		3249
3271	#############################################################################	3250	#############################################################################
3272		3251
3273	package CFClient::UI::BindEditor;	3252	package CFClient::UI::BindEditor;
…		…
3368	$rec = $::CONN->stop_record if $::CONN;	3347	$rec = $::CONN->stop_record if $::CONN;
3369	return unless ref $rec eq 'ARRAY';	3348	return unless ref $rec eq 'ARRAY';
3370	$self->set_command_list ($rec);	3349	$self->set_command_list ($rec);
3371	}	3350	}
3372		3351
3373	# if $commit is true, the binding will be set after the user entered a key combo	3352
		3353	sub ask_for_bind_and_commit {
		3354	my ($self) = @_;
		3355	$self->ask_for_bind (1);
		3356	}
		3357
3374	sub ask_for_bind {	3358	sub ask_for_bind {
3375	my ($self, $commit) = @_;	3359	my ($self, $commit) = @_;
3376		3360
3377	CFClient::Binder::open_binding_dialog (sub {	3361	CFClient::Binder::open_binding_dialog (sub {
3378	my ($mod, $sym) = @_;	3362	my ($mod, $sym) = @_;
…		…
3460	}	3444	}
3461	}	3445	}
3462		3446
3463	#############################################################################	3447	#############################################################################
3464		3448
		3449	package CFClient::UI::SpellList;
		3450
		3451	our @ISA = CFClient::UI::Table::;
		3452
		3453	sub new {
		3454	my $class = shift;
		3455
		3456	my $self = $class->SUPER::new (
		3457	binding => [],
		3458	commands => [],
		3459	@_,
		3460	)
		3461	}
		3462
		3463	# XXX: Do sorting? Argl...
		3464	sub add_spell {
		3465	my ($self, $spell) = @_;
		3466	$self->{spells}->{$spell->{name}} = $spell;
		3467
		3468	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3469	face => $spell->{face},
		3470	can_hover => 1,
		3471	can_events => 1,
		3472	tooltip => $spell->{message});
		3473
		3474	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3475	text => $spell->{name},
		3476	can_hover => 1,
		3477	can_events => 1,
		3478	tooltip => $spell->{message},
		3479	expand => 1);
		3480
		3481	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3482	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3483	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3484	expand => 1);
		3485
		3486	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3487	text => "bind to key",
		3488	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3489	}
		3490
		3491	sub rebuild_spell_list {
		3492	my ($self) = @_;
		3493	$self->{tbl_idx} = 0;
		3494	$self->add_spell ($_) for values %{$self->{spells}};
		3495	}
		3496
		3497	sub remove_spell {
		3498	my ($self, $spell) = @_;
		3499	delete $self->{spells}->{$spell->{name}};
		3500	$self->rebuild_spell_list;
		3501	}
		3502
		3503	#############################################################################
		3504
		3505	package CFClient::UI::Root;
		3506
		3507	our @ISA = CFClient::UI::Container::;
		3508
		3509	use List::Util qw(min max);
		3510
		3511	use CFClient::OpenGL;
		3512
		3513	sub new {
		3514	my $class = shift;
		3515
		3516	my $self = $class->SUPER::new (
		3517	visible => 1,
		3518	@_,
		3519	);
		3520
		3521	Scalar::Util::weaken ($self->{root} = $self);
		3522
		3523	$self
		3524	}
		3525
		3526	sub size_request {
		3527	my ($self) = @_;
		3528
		3529	($self->{w}, $self->{h})
		3530	}
		3531
		3532	sub _to_pixel {
		3533	my ($coord, $size, $max) = @_;
		3534
		3535	$coord =
		3536	$coord eq "center" ? ($max - $size) * 0.5
		3537	: $coord eq "max" ? $max
		3538	: $coord;
		3539
		3540	$coord = 0 if $coord < 0;
		3541	$coord = $max - $size if $coord > $max - $size;
		3542
		3543	int $coord + 0.5
		3544	}
		3545
		3546	sub size_allocate {
		3547	my ($self, $w, $h) = @_;
		3548
		3549	for my $child ($self->children) {
		3550	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		3551
		3552	$X = $child->{force_x} if exists $child->{force_x};
		3553	$Y = $child->{force_y} if exists $child->{force_y};
		3554
		3555	$X = _to_pixel $X, $W, $self->{w};
		3556	$Y = _to_pixel $Y, $H, $self->{h};
		3557
		3558	$child->configure ($X, $Y, $W, $H);
		3559	}
		3560	}
		3561
		3562	sub coord2local {
		3563	my ($self, $x, $y) = @_;
		3564
		3565	($x, $y)
		3566	}
		3567
		3568	sub coord2global {
		3569	my ($self, $x, $y) = @_;
		3570
		3571	($x, $y)
		3572	}
		3573
		3574	sub update {
		3575	my ($self) = @_;
		3576
		3577	$::WANT_REFRESH++;
		3578	}
		3579
		3580	sub add {
		3581	my ($self, @children) = @_;
		3582
		3583	$_->{is_toplevel} = 1
		3584	for @children;
		3585
		3586	$self->SUPER::add (@children);
		3587	}
		3588
		3589	sub remove {
		3590	my ($self, @children) = @_;
		3591
		3592	$self->SUPER::remove (@children);
		3593
		3594	delete $self->{is_toplevel}
		3595	for @children;
		3596
		3597	while (@children) {
		3598	my $w = pop @children;
		3599	push @children, $w->children;
		3600	$w->set_invisible;
		3601	}
		3602	}
		3603
		3604	sub on_refresh {
		3605	my ($self, $id, $cb) = @_;
		3606
		3607	$self->{refresh_hook}{$id} = $cb;
		3608	}
		3609
		3610	sub on_post_alloc {
		3611	my ($self, $id, $cb) = @_;
		3612
		3613	$self->{post_alloc_hook}{$id} = $cb;
		3614	}
		3615
		3616	sub draw {
		3617	my ($self) = @_;
		3618
		3619	while ($self->{refresh_hook}) {
		3620	$_->()
		3621	for values %{delete $self->{refresh_hook}};
		3622	}
		3623
		3624	if ($self->{realloc}) {
		3625	my %queue;
		3626	my @queue;
		3627	my $widget;
		3628
		3629	outer:
		3630	while () {
		3631	if (my $realloc = delete $self->{realloc}) {
		3632	for $widget (values %$realloc) {
		3633	$widget->{visible} or next; # do not resize invisible widgets
		3634
		3635	$queue{$widget+0}++ and next; # duplicates are common
		3636
		3637	push @{ $queue[$widget->{visible}] }, $widget;
		3638	}
		3639	}
		3640
		3641	while () {
		3642	@queue or last outer;
		3643
		3644	$widget = pop @{ $queue[-1] || [] }
		3645	and last;
		3646
		3647	pop @queue;
		3648	}
		3649
		3650	delete $queue{$widget+0};
		3651
		3652	my ($w, $h) = $widget->size_request;
		3653
		3654	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3655	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3656
		3657	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3658	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3659
		3660	$w = $widget->{force_w} if exists $widget->{force_w};
		3661	$h = $widget->{force_h} if exists $widget->{force_h};
		3662
		3663	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3664	|| delete $widget->{force_realloc}) {
		3665	$widget->{req_w} = $w;
		3666	$widget->{req_h} = $h;
		3667
		3668	$self->{size_alloc}{$widget+0} = $widget;
		3669
		3670	if (my $parent = $widget->{parent}) {
		3671	$self->{realloc}{$parent+0} = $parent
		3672	unless $queue{$parent+0};
		3673
		3674	$parent->{force_size_alloc} = 1;
		3675	$self->{size_alloc}{$parent+0} = $parent;
		3676	}
		3677	}
		3678
		3679	delete $self->{realloc}{$widget+0};
		3680	}
		3681	}
		3682
		3683	while (my $size_alloc = delete $self->{size_alloc}) {
		3684	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3685	values %$size_alloc;
		3686
		3687	while () {
		3688	my $widget = pop @queue || last;
		3689
		3690	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		3691
		3692	$w = 0 if $w < 0;
		3693	$h = 0 if $h < 0;
		3694
		3695	$w = int $w + 0.5;
		3696	$h = int $h + 0.5;
		3697
		3698	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3699	$widget->{old_w} = $widget->{w};
		3700	$widget->{old_h} = $widget->{h};
		3701
		3702	$widget->{w} = $w;
		3703	$widget->{h} = $h;
		3704
		3705	$widget->emit (size_allocate => $w, $h);
		3706	}
		3707	}
		3708	}
		3709
		3710	while ($self->{post_alloc_hook}) {
		3711	$_->()
		3712	for values %{delete $self->{post_alloc_hook}};
		3713	}
		3714
		3715
		3716	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		3717	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		3718	glClear GL_COLOR_BUFFER_BIT;
		3719
		3720	glMatrixMode GL_PROJECTION;
		3721	glLoadIdentity;
		3722	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
		3723	glMatrixMode GL_MODELVIEW;
		3724	glLoadIdentity;
		3725
		3726	{
		3727	package CFClient::UI::Base;
		3728
		3729	($draw_x, $draw_y, $draw_w, $draw_h) =
		3730	(0, 0, $self->{w}, $self->{h});
		3731	}
		3732
		3733	$self->_draw;
		3734	}
		3735
		3736	#############################################################################
		3737
3465	package CFClient::UI;	3738	package CFClient::UI;
3466		3739
3467	$ROOT = new CFClient::UI::Root;	3740	$ROOT = new CFClient::UI::Root;
3468	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	3741	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3469		3742

Diff Legend

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