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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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	delete $self->{max_w}; $self->{max_w} = $w if $w;
381	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $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}
		1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528	}	1602	}
1529		1603
1530	sub set_fontsize {	1604	sub set_fontsize {
1531	my ($self, $fontsize) = @_;	1605	my ($self, $fontsize) = @_;
1532		1606
…		…
1547	$self->{layout}->set_width ($self->{w});	1621	$self->{layout}->set_width ($self->{w});
1548	$self->{layout}->set_ellipsise ($self->{ellipsise});	1622	$self->{layout}->set_ellipsise ($self->{ellipsise});
1549	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551		1625
1552	my $tex = new_from_layout CFClient::Texture $self->{layout};	1626	new_from_layout CFClient::Texture $self->{layout}
		1627	};
1553		1628
		1629	unless (exists $self->{ox}) {
1554	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556	: ($self->{w} - $tex->{w}) * 0.5);	1632	: ($self->{w} - $tex->{w}) * 0.5);
1557		1633
1558	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560	: ($self->{h} - $tex->{h}) * 0.5);	1636	: ($self->{h} - $tex->{h}) * 0.5);
1561
1562	$tex
1563	};	1637	};
1564		1638
1565	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1641
		1642	glColor_premultiply @{$self->{fg}}
1568	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1569	glColor @{$self->{fg}};	1644
1570	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571	} else {
1572	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573	}
1574		1646
1575	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1576	}	1648	}
1577		1649
1578	#############################################################################	1650	#############################################################################
…		…
1605		1677
1606	delete $self->{cur_h};	1678	delete $self->{cur_h};
1607		1679
1608	return if $self->{text} eq $text;	1680	return if $self->{text} eq $text;
1609		1681
1610	delete $self->{texture};
1611
1612	$self->{last_activity} = $::NOW;	1682	$self->{last_activity} = $::NOW;
1613	$self->{text} = $text;	1683	$self->{text} = $text;
1614		1684
1615	$text =~ s/./*/g if $self->{hidden};	1685	$text =~ s/./*/g if $self->{hidden};
1616	$self->{layout}->set_text ("$text ");	1686	$self->{layout}->set_text ("$text ");
1617		1687
1618	$self->_emit (changed => $self->{text});	1688	$self->_emit (changed => $self->{text});
		1689	$self->update;
1619	}	1690	}
1620		1691
1621	sub set_text {	1692	sub set_text {
1622	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1623		1694
…		…
1662	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1663	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1664	$self->_emit ('escape');	1735	$self->_emit ('escape');
1665	} elsif ($uni) {	1736	} elsif ($uni) {
1666	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1667	}	1740	}
1668		1741
1669	$self->_set_text ($text);	1742	$self->_set_text ($text);
1670		1743
1671	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1672	}	1747	}
1673		1748
1674	sub focus_in {	1749	sub focus_in {
1675	my ($self) = @_;	1750	my ($self) = @_;
1676		1751
…		…
1691	utf8::encode $text;	1766	utf8::encode $text;
1692	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1693		1768
1694	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1695	$self->update;	1770	$self->update;
		1771
		1772	1
1696	}	1773	}
1697		1774
1698	sub mouse_motion {	1775	sub mouse_motion {
1699	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1700	# 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
1701	}	1780	}
1702		1781
1703	sub _draw {	1782	sub _draw {
1704	my ($self) = @_;	1783	my ($self) = @_;
1705		1784
1706	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1707		1786
1708	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1709	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1710	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1711	} else {	1790	} else {
1712	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1713	}	1792	}
1714		1793
1715	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1716	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1718	glVertex 0 , 0;	1797	glVertex 0 , 0;
1719	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1720	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1721	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1782	} else {	1861	} else {
1783	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1784	}	1863	}
1785		1864
1786	} else {	1865	} else {
1787	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1788	}	1869	1
1789
1790	}	1870	}
1791		1871
1792	#############################################################################	1872	#############################################################################
1793		1873
1794	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1823	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1824		1904
1825	$self->emit ("activate")	1905	$self->emit ("activate")
1826	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1827	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1828	}	1910	}
1829		1911
1830	sub _draw {	1912	sub _draw {
1831	my ($self) = @_;	1913	my ($self) = @_;
1832		1914
1833	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835	if ($GRAB == $self) {
1836	$self->{fg} = $self->{active_fg};
1837	}
1838		1916
1839	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1842		1920
…		…
1886		1964
1887	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889	$self->{state} = !$self->{state};	1967	$self->{state} = !$self->{state};
1890	$self->_emit (changed => $self->{state});	1968	$self->_emit (changed => $self->{state});
		1969	} else {
		1970	return 0
		1971	}
		1972
1891	}	1973	1
1892	}	1974	}
1893		1975
1894	sub _draw {	1976	sub _draw {
1895	my ($self) = @_;	1977	my ($self) = @_;
1896		1978
…		…
2063		2145
2064	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2065	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2066		2148
2067	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2068	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;
2069	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071		2154
2072	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2073	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2234		2317
2235	$self->SUPER::button_down ($ev, $x, $y);	2318	$self->SUPER::button_down ($ev, $x, $y);
2236		2319
2237	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238		2321
2239	$self->mouse_motion ($ev, $x, $y);	2322	$self->mouse_motion ($ev, $x, $y)
2240	}	2323	}
2241		2324
2242	sub mouse_motion {	2325	sub mouse_motion {
2243	my ($self, $ev, $x, $y) = @_;	2326	my ($self, $ev, $x, $y) = @_;
2244		2327
…		…
2248	my (undef, $lo, $hi, $page) = @{$self->{range}};	2331	my (undef, $lo, $hi, $page) = @{$self->{range}};
2249		2332
2250	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2333	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251		2334
2252	$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
2253	}	2340	1
2254	}	2341	}
2255		2342
2256	sub update {	2343	sub update {
2257	my ($self) = @_;	2344	my ($self) = @_;
2258		2345
2259	$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}) {
2260	$self->set_value ($self->{range}[0]);	2354	$self->set_value ($self->{range}[0]);
2261		2355
2262	my ($value, $lo, $hi, $page) = @{$self->{range}};	2356	my ($value, $lo, $hi, $page) = @{$self->{range}};
2263	my $range = ($hi - $page - $lo) || 1e-100;	2357	my $range = ($hi - $page - $lo) || 1e-100;
2264		2358
…		…
2270	$value = ($value - $lo) / $range;	2364	$value = ($value - $lo) / $range;
2271	$value = $value * $self->{scale} + $self->{offset};	2365	$value = $value * $self->{scale} + $self->{offset};
2272		2366
2273	$self->{knob_x} = $value - $knob_w * 0.5;	2367	$self->{knob_x} = $value - $knob_w * 0.5;
2274	$self->{knob_w} = $knob_w;	2368	$self->{knob_w} = $knob_w;
2275	});	2369	}
2276
2277	$self->SUPER::update;
2278	}
2279
2280	sub _draw {
2281	my ($self) = @_;
2282		2370
2283	$self->SUPER::_draw ();	2371	$self->SUPER::_draw ();
2284		2372
2285	glScale $self->{w}, $self->{h};	2373	glScale $self->{w}, $self->{h};
2286		2374
…		…
2480		2568
2481	delete $self->{texture};	2569	delete $self->{texture};
2482	}	2570	}
2483		2571
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2487		2575
2488	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2489		2577
2490	my $y0 = $top;	2578	my $y0 = $top;
…		…
2525	sub _draw {	2613	sub _draw {
2526	my ($self) = @_;	2614	my ($self) = @_;
2527		2615
2528	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2531	$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});
2532	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2533		2621
2534	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2535		2623
2536	}	2624	}
…		…
2763	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764		2852
2765	if ($tex) {	2853	if ($tex) {
2766	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2771	}	2859	}
2772	}	2860	}
2773		2861
…		…
2780	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2781	}	2869	}
2782		2870
2783	#############################################################################	2871	#############################################################################
2784		2872
2785	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2786		2874
2787	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2788		2876
2789	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2790	my $class = shift;
2791
2792	my $self = $class->SUPER::new (
2793	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794	@_,
2795	);
2796
2797	$self
2798	}
2799
2800	sub set_items {
2801	my ($self, $items) = @_;
2802
2803	$self->{scrolled}->clear;
2804	return unless $items;
2805
2806	my @items = sort {
2807	($a->{type} <=> $b->{type})
2808	or ($a->{name} cmp $b->{name})
2809	} @$items;
2810
2811	$self->{real_items} = \@items;
2812
2813	my $row = 0;
2814	for my $item (@items) {
2815	CFClient::Item::update_widgets $item;
2816
2817	$self->{scrolled}->add (0, $row, $item->{face_widget});
2818	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2819	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821	$row++;
2822	}
2823	}
2824		2878
2825	#############################################################################	2879	#############################################################################
2826		2880
2827	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2828		2882
…		…
2878	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2879		2933
2880	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2881	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2883	}	2939	}
2884		2940
2885	sub button_up {	2941	sub button_up {
2886	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2887		2943
…		…
2889	undef $GRAB;	2945	undef $GRAB;
2890	$self->hide;	2946	$self->hide;
2891		2947
2892	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2893	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
2894	}	2954	1
2895	}	2955	}
2896		2956
2897	#############################################################################	2957	#############################################################################
2898		2958
2899	package CFClient::UI::Statusbox;	2959	package CFClient::UI::Multiplexer;
2900		2960
2901	our @ISA = CFClient::UI::VBox::;	2961	our @ISA = CFClient::UI::Container::;
2902		2962
2903	sub new {	2963	sub new {
2904	my $class = shift;	2964	my $class = shift;
2905		2965
2906	$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 (
2907	fontsize => 0.8,	3075	fontsize => 0.8,
2908	@_,	3076	@_,
2909	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
		3082	$this->reorder;
		3083	$this->update;
		3084	});
		3085
		3086	$self
2910	}	3087	}
2911		3088
2912	sub reorder {	3089	sub reorder {
2913	my ($self) = @_;	3090	my ($self) = @_;
2914	my $NOW = time;	3091	my $NOW = Time::HiRes::time;
2915		3092
2916	while (my ($k, $v) = each %{ $self->{item} }) {	3093	while (my ($k, $v) = each %{ $self->{item} }) {
2917	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918	}	3095	}
2919		3096
…		…
2921		3098
2922	my @items = sort {	3099	my @items = sort {
2923	$a->{pri} <=> $b->{pri}	3100	$a->{pri} <=> $b->{pri}
2924	or $b->{id} <=> $a->{id}	3101	or $b->{id} <=> $a->{id}
2925	} values %{ $self->{item} };	3102	} values %{ $self->{item} };
		3103
		3104	$self->{timer}->interval (1);
2926		3105
2927	my $count = 10 + 1;	3106	my $count = 10 + 1;
2928	for my $item (@items) {	3107	for my $item (@items) {
2929	last unless --$count;	3108	last unless --$count;
2930		3109
…		…
2945	tooltip_font => $::FONT_PROP,	3124	tooltip_font => $::FONT_PROP,
2946	tooltip_width => 0.67,	3125	tooltip_width => 0.67,
2947	fontsize => $item->{fontsize} || $self->{fontsize},	3126	fontsize => $item->{fontsize} || $self->{fontsize},
2948	max_w => $::WIDTH * 0.44,	3127	max_w => $::WIDTH * 0.44,
2949	fg => $item->{fg},	3128	fg => $item->{fg},
		3129	orig_alpha => $item->{fg}[3] || 1,
2950	can_events => 1,	3130	can_events => 1,
2951	can_hover => 1	3131	can_hover => 1
2952	};	3132	};
		3133
		3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
		3136	if ($diff < 1) {
		3137	$item->{label}{max_h} = $item->{label}{req_h} * $diff;
		3138	$item->{label}->realloc;
		3139	}
		3140	$item->{label}->update;
		3141	$self->{timer}->interval (1/30);
		3142	}
2953	}	3143	}
2954		3144
2955	$self->clear;	3145	$self->clear;
2956	$self->SUPER::add (reverse @widgets);	3146	$self->SUPER::add (reverse @widgets);
2957	}	3147	}
…		…
2962	$text =~ s/^\s+//;	3152	$text =~ s/^\s+//;
2963	$text =~ s/\s+$//;	3153	$text =~ s/\s+$//;
2964		3154
2965	return unless $text;	3155	return unless $text;
2966		3156
2967	my $timeout = time + ((delete $arg{timeout}) || 60);	3157	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968		3158
2969	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3159	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970		3160
2971	if (my $item = $self->{item}{$group}) {	3161	if (my $item = $self->{item}{$group}) {
2972	if ($item->{text} eq $text) {	3162	if ($item->{text} eq $text) {
…		…
3002		3192
3003	$self->reorder;	3193	$self->reorder;
3004	$self->SUPER::reconfigure;	3194	$self->SUPER::reconfigure;
3005	}	3195	}
3006		3196
		3197	sub DESTROY {
		3198	my ($self) = @_;
		3199
		3200	$self->{timer}->cancel;
		3201
		3202	$self->SUPER::DESTROY;
		3203	}
		3204
3007	#############################################################################	3205	#############################################################################
3008		3206
3009	package CFClient::UI::Root;	3207	package CFClient::UI::Inventory;
3010		3208
3011	our @ISA = CFClient::UI::Container::;	3209	our @ISA = CFClient::UI::ScrolledWindow::;
3012
3013	use CFClient::OpenGL;
3014		3210
3015	sub new {	3211	sub new {
3016	my $class = shift;	3212	my $class = shift;
3017		3213
3018	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
3019	visible => 1,	3215	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3020	@_,	3216	@_,
3021	);	3217	);
3022		3218
3023	Scalar::Util::weaken ($self->{root} = $self);
3024
3025	$self	3219	$self
3026	}	3220	}
3027		3221
3028	sub size_request {	3222	sub set_items {
3029	my ($self) = @_;	3223	my ($self, $items) = @_;
3030		3224
3031	($self->{w}, $self->{h})	3225	$self->{child}->clear;
3032	}	3226	return unless $items;
3033		3227
3034	sub _to_pixel {	3228	my @items = sort {
3035	my ($coord, $size, $max) = @_;	3229	($a->{type} <=> $b->{type})
		3230	or ($a->{name} cmp $b->{name})
		3231	} @$items;
3036		3232
3037	$coord =	3233	$self->{real_items} = \@items;
3038	$coord eq "center" ? ($max - $size) * 0.5
3039	: $coord eq "max" ? $max
3040	: $coord;
3041		3234
3042	$coord = 0 if $coord < 0;	3235	my $row = 0;
3043	$coord = $max - $size if $coord > $max - $size;	3236	for my $item (@items) {
		3237	CFClient::Item::update_widgets $item;
3044		3238
3045	int $coord + 0.5	3239	$self->{child}->add (0, $row, $item->{face_widget});
3046	}	3240	$self->{child}->add (1, $row, $item->{desc_widget});
		3241	$self->{child}->add (2, $row, $item->{weight_widget});
3047		3242
3048	sub size_allocate {	3243	$row++;
3049	my ($self, $w, $h) = @_;
3050
3051	for my $child ($self->children) {
3052	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053
3054	$X = $child->{force_x} if exists $child->{force_x};
3055	$Y = $child->{force_y} if exists $child->{force_y};
3056
3057	$X = _to_pixel $X, $W, $self->{w};
3058	$Y = _to_pixel $Y, $H, $self->{h};
3059
3060	$child->configure ($X, $Y, $W, $H);
3061	}	3244	}
3062	}
3063
3064	sub coord2local {
3065	my ($self, $x, $y) = @_;
3066
3067	($x, $y)
3068	}
3069
3070	sub coord2global {
3071	my ($self, $x, $y) = @_;
3072
3073	($x, $y)
3074	}
3075
3076	sub update {
3077	my ($self) = @_;
3078
3079	$::WANT_REFRESH++;
3080	}
3081
3082	sub add {
3083	my ($self, @children) = @_;
3084
3085	$_->{is_toplevel} = 1
3086	for @children;
3087
3088	$self->SUPER::add (@children);
3089	}
3090
3091	sub remove {
3092	my ($self, @children) = @_;
3093
3094	$self->SUPER::remove (@children);
3095
3096	delete $self->{is_toplevel}
3097	for @children;
3098
3099	while (@children) {
3100	my $w = pop @children;
3101	push @children, $w->children;
3102	$w->set_invisible;
3103	}
3104	}
3105
3106	sub on_refresh {
3107	my ($self, $id, $cb) = @_;
3108
3109	$self->{refresh_hook}{$id} = $cb;
3110	}
3111
3112	sub on_post_alloc {
3113	my ($self, $id, $cb) = @_;
3114
3115	$self->{post_alloc_hook}{$id} = $cb;
3116	}
3117
3118	sub draw {
3119	my ($self) = @_;
3120
3121	while ($self->{refresh_hook}) {
3122	$_->()
3123	for values %{delete $self->{refresh_hook}};
3124	}
3125
3126	if ($self->{realloc}) {
3127	my @queue;
3128
3129	while () {
3130	if ($self->{realloc}) {
3131	#TODO use array-of-depth approach
3132
3133	use sort 'stable';
3134
3135	@queue = sort { $a->{visible} <=> $b->{visible} }
3136	@queue, values %{delete $self->{realloc}};
3137	}
3138
3139	my $widget = pop @queue || last;
3140
3141	$widget->{visible} or last; # do not resize invisible widgets
3142
3143	my ($w, $h) = $widget->size_request;
3144
3145	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148	$w = $widget->{force_w} if exists $widget->{force_w};
3149	$h = $widget->{force_h} if exists $widget->{force_h};
3150
3151	if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152	|| delete $widget->{force_realloc}) {
3153	$widget->{req_w} = $w;
3154	$widget->{req_h} = $h;
3155
3156	$self->{size_alloc}{$widget+0} = $widget;
3157
3158	if (my $parent = $widget->{parent}) {
3159	$self->{realloc}{$parent+0} = $parent;
3160	#unshift @queue, $parent;
3161	$parent->{force_size_alloc} = 1;
3162	$self->{size_alloc}{$parent+0} = $parent;
3163	}
3164	}
3165
3166	delete $self->{realloc}{$widget+0};
3167	}
3168	}
3169
3170	while (my $size_alloc = delete $self->{size_alloc}) {
3171	my @queue = sort { $b->{visible} <=> $a->{visible} }
3172	values %$size_alloc;
3173
3174	while () {
3175	my $widget = pop @queue || last;
3176
3177	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179	$w = 0 if $w < 0;
3180	$h = 0 if $h < 0;
3181
3182	$w = int $w + 0.5;
3183	$h = int $h + 0.5;
3184
3185	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186	$widget->{w} = $w;
3187	$widget->{h} = $h;
3188
3189	$widget->emit (size_allocate => $w, $h);
3190	}
3191	}
3192	}
3193
3194	while ($self->{post_alloc_hook}) {
3195	$_->()
3196	for values %{delete $self->{post_alloc_hook}};
3197	}
3198
3199
3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202	glClear GL_COLOR_BUFFER_BIT;
3203
3204	glMatrixMode GL_PROJECTION;
3205	glLoadIdentity;
3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207	glMatrixMode GL_MODELVIEW;
3208	glLoadIdentity;
3209
3210	$self->_draw;
3211	}	3245	}
3212		3246
3213	#############################################################################	3247	#############################################################################
3214		3248
3215	package CFClient::UI::BindEditor;	3249	package CFClient::UI::BindEditor;
…		…
3310	$rec = $::CONN->stop_record if $::CONN;	3344	$rec = $::CONN->stop_record if $::CONN;
3311	return unless ref $rec eq 'ARRAY';	3345	return unless ref $rec eq 'ARRAY';
3312	$self->set_command_list ($rec);	3346	$self->set_command_list ($rec);
3313	}	3347	}
3314		3348
		3349
		3350	sub ask_for_bind_and_commit {
		3351	my ($self) = @_;
		3352	$self->ask_for_bind (1);
		3353	}
		3354
3315	sub ask_for_bind {	3355	sub ask_for_bind {
3316	my ($self, $commit) = @_;	3356	my ($self, $commit) = @_;
3317		3357
3318	CFClient::Binder::open_binding_dialog (sub {	3358	CFClient::Binder::open_binding_dialog (sub {
3319	my ($mod, $sym) = @_;	3359	my ($mod, $sym) = @_;
…		…
3321	$self->update_binding_widgets;	3361	$self->update_binding_widgets;
3322	$self->commit if $commit;	3362	$self->commit if $commit;
3323	});	3363	});
3324	}	3364	}
3325		3365
		3366	# $mod and $sym are the modifiers and key symbol
		3367	# $cmds is a array ref of strings (the commands)
		3368	# $cb is the callback that is executed on OK
		3369	# $ccb is the callback that is executed on CANCEL and
		3370	# when the binding was unsuccessful on OK
3326	sub set_binding {	3371	sub set_binding {
3327	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;	3372	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328		3373
3329	$self->clear_command_list;	3374	$self->clear_command_list;
3330	$self->{recording} = 0;	3375	$self->{recording} = 0;
…		…
3335		3380
3336	$self->{binding_change} = $cb;	3381	$self->{binding_change} = $cb;
3337	$self->{binding_cancel} = $ccb;	3382	$self->{binding_cancel} = $ccb;
3338		3383
3339	$self->update_binding_widgets;	3384	$self->update_binding_widgets;
		3385	}
		3386
		3387	# this is a shortcut method that asks for a binding
		3388	# and then just binds it.
		3389	sub do_quick_binding {
		3390	my ($self, $cmds) = @_;
		3391	$self->set_binding (undef, undef, $cmds, sub {
		3392	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3393	});
		3394	$self->ask_for_bind (1);
3340	}	3395	}
3341		3396
3342	sub update_binding_widgets {	3397	sub update_binding_widgets {
3343	my ($self) = @_;	3398	my ($self) = @_;
3344	my ($mod, $sym, $cmds) = $self->get_binding;	3399	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3370		3425
3371	for (@$cmds) {	3426	for (@$cmds) {
3372	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);	3427	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373		3428
3374	my $i = $idx;	3429	my $i = $idx;
		3430	$hb->add (new CFClient::UI::Label text => $_);
3375	$hb->add (new CFClient::UI::Button	3431	$hb->add (new CFClient::UI::Button
3376	text => "delete",	3432	text => "delete",
3377	tooltip => "Deletes the action from the record",	3433	tooltip => "Deletes the action from the record",
3378	on_activate => sub {	3434	on_activate => sub {
3379	$self->{cmdbox}->remove ($hb);	3435	$self->{cmdbox}->remove ($hb);
3380	$cmds->[$i] = undef;	3436	$cmds->[$i] = undef;
3381	});	3437	});
3382		3438
3383	$hb->add (new CFClient::UI::Label text => $_);
3384		3439
3385	$idx++	3440	$idx++
3386	}	3441	}
3387	}	3442	}
3388		3443
		3444	#############################################################################
		3445
		3446	package CFClient::UI::SpellList;
		3447
		3448	our @ISA = CFClient::UI::Table::;
		3449
		3450	sub new {
		3451	my $class = shift;
		3452
		3453	my $self = $class->SUPER::new (
		3454	binding => [],
		3455	commands => [],
		3456	@_,
		3457	)
		3458	}
		3459
		3460	# XXX: Do sorting? Argl...
		3461	sub add_spell {
		3462	my ($self, $spell) = @_;
		3463	$self->{spells}->{$spell->{name}} = $spell;
		3464
		3465	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3466	face => $spell->{face},
		3467	can_hover => 1,
		3468	can_events => 1,
		3469	tooltip => $spell->{message});
		3470
		3471	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3472	text => $spell->{name},
		3473	can_hover => 1,
		3474	can_events => 1,
		3475	tooltip => $spell->{message},
		3476	expand => 1);
		3477
		3478	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3479	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3480	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3481	expand => 1);
		3482
		3483	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3484	text => "bind to key",
		3485	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3486	}
		3487
		3488	sub rebuild_spell_list {
		3489	my ($self) = @_;
		3490	$self->{tbl_idx} = 0;
		3491	$self->add_spell ($_) for values %{$self->{spells}};
		3492	}
		3493
		3494	sub remove_spell {
		3495	my ($self, $spell) = @_;
		3496	delete $self->{spells}->{$spell->{name}};
		3497	$self->rebuild_spell_list;
		3498	}
		3499
		3500	#############################################################################
		3501
		3502	package CFClient::UI::Root;
		3503
		3504	our @ISA = CFClient::UI::Container::;
		3505
		3506	use List::Util qw(min max);
		3507
		3508	use CFClient::OpenGL;
		3509
		3510	sub new {
		3511	my $class = shift;
		3512
		3513	my $self = $class->SUPER::new (
		3514	visible => 1,
		3515	@_,
		3516	);
		3517
		3518	Scalar::Util::weaken ($self->{root} = $self);
		3519
		3520	$self
		3521	}
		3522
		3523	sub size_request {
		3524	my ($self) = @_;
		3525
		3526	($self->{w}, $self->{h})
		3527	}
		3528
		3529	sub _to_pixel {
		3530	my ($coord, $size, $max) = @_;
		3531
		3532	$coord =
		3533	$coord eq "center" ? ($max - $size) * 0.5
		3534	: $coord eq "max" ? $max
		3535	: $coord;
		3536
		3537	$coord = 0 if $coord < 0;
		3538	$coord = $max - $size if $coord > $max - $size;
		3539
		3540	int $coord + 0.5
		3541	}
		3542
		3543	sub size_allocate {
		3544	my ($self, $w, $h) = @_;
		3545
		3546	for my $child ($self->children) {
		3547	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		3548
		3549	$X = $child->{force_x} if exists $child->{force_x};
		3550	$Y = $child->{force_y} if exists $child->{force_y};
		3551
		3552	$X = _to_pixel $X, $W, $self->{w};
		3553	$Y = _to_pixel $Y, $H, $self->{h};
		3554
		3555	$child->configure ($X, $Y, $W, $H);
		3556	}
		3557	}
		3558
		3559	sub coord2local {
		3560	my ($self, $x, $y) = @_;
		3561
		3562	($x, $y)
		3563	}
		3564
		3565	sub coord2global {
		3566	my ($self, $x, $y) = @_;
		3567
		3568	($x, $y)
		3569	}
		3570
		3571	sub update {
		3572	my ($self) = @_;
		3573
		3574	$::WANT_REFRESH++;
		3575	}
		3576
		3577	sub add {
		3578	my ($self, @children) = @_;
		3579
		3580	$_->{is_toplevel} = 1
		3581	for @children;
		3582
		3583	$self->SUPER::add (@children);
		3584	}
		3585
		3586	sub remove {
		3587	my ($self, @children) = @_;
		3588
		3589	$self->SUPER::remove (@children);
		3590
		3591	delete $self->{is_toplevel}
		3592	for @children;
		3593
		3594	while (@children) {
		3595	my $w = pop @children;
		3596	push @children, $w->children;
		3597	$w->set_invisible;
		3598	}
		3599	}
		3600
		3601	sub on_refresh {
		3602	my ($self, $id, $cb) = @_;
		3603
		3604	$self->{refresh_hook}{$id} = $cb;
		3605	}
		3606
		3607	sub on_post_alloc {
		3608	my ($self, $id, $cb) = @_;
		3609
		3610	$self->{post_alloc_hook}{$id} = $cb;
		3611	}
		3612
		3613	sub draw {
		3614	my ($self) = @_;
		3615
		3616	while ($self->{refresh_hook}) {
		3617	$_->()
		3618	for values %{delete $self->{refresh_hook}};
		3619	}
		3620
		3621	if ($self->{realloc}) {
		3622	my %queue;
		3623	my @queue;
		3624	my $widget;
		3625
		3626	outer:
		3627	while () {
		3628	if (my $realloc = delete $self->{realloc}) {
		3629	for $widget (values %$realloc) {
		3630	$widget->{visible} or next; # do not resize invisible widgets
		3631
		3632	$queue{$widget+0}++ and next; # duplicates are common
		3633
		3634	push @{ $queue[$widget->{visible}] }, $widget;
		3635	}
		3636	}
		3637
		3638	while () {
		3639	@queue or last outer;
		3640
		3641	$widget = pop @{ $queue[-1] || [] }
		3642	and last;
		3643
		3644	pop @queue;
		3645	}
		3646
		3647	delete $queue{$widget+0};
		3648
		3649	my ($w, $h) = $widget->size_request;
		3650
		3651	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3652	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3653
		3654	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3655	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3656
		3657	$w = $widget->{force_w} if exists $widget->{force_w};
		3658	$h = $widget->{force_h} if exists $widget->{force_h};
		3659
		3660	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3661	|| delete $widget->{force_realloc}) {
		3662	$widget->{req_w} = $w;
		3663	$widget->{req_h} = $h;
		3664
		3665	$self->{size_alloc}{$widget+0} = $widget;
		3666
		3667	if (my $parent = $widget->{parent}) {
		3668	$self->{realloc}{$parent+0} = $parent
		3669	unless $queue{$parent+0};
		3670
		3671	$parent->{force_size_alloc} = 1;
		3672	$self->{size_alloc}{$parent+0} = $parent;
		3673	}
		3674	}
		3675
		3676	delete $self->{realloc}{$widget+0};
		3677	}
		3678	}
		3679
		3680	while (my $size_alloc = delete $self->{size_alloc}) {
		3681	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3682	values %$size_alloc;
		3683
		3684	while () {
		3685	my $widget = pop @queue || last;
		3686
		3687	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		3688
		3689	$w = 0 if $w < 0;
		3690	$h = 0 if $h < 0;
		3691
		3692	$w = int $w + 0.5;
		3693	$h = int $h + 0.5;
		3694
		3695	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3696	$widget->{old_w} = $widget->{w};
		3697	$widget->{old_h} = $widget->{h};
		3698
		3699	$widget->{w} = $w;
		3700	$widget->{h} = $h;
		3701
		3702	$widget->emit (size_allocate => $w, $h);
		3703	}
		3704	}
		3705	}
		3706
		3707	while ($self->{post_alloc_hook}) {
		3708	$_->()
		3709	for values %{delete $self->{post_alloc_hook}};
		3710	}
		3711
		3712
		3713	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		3714	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		3715	glClear GL_COLOR_BUFFER_BIT;
		3716
		3717	glMatrixMode GL_PROJECTION;
		3718	glLoadIdentity;
		3719	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
		3720	glMatrixMode GL_MODELVIEW;
		3721	glLoadIdentity;
		3722
		3723	{
		3724	package CFClient::UI::Base;
		3725
		3726	($draw_x, $draw_y, $draw_w, $draw_h) =
		3727	(0, 0, $self->{w}, $self->{h});
		3728	}
		3729
		3730	$self->_draw;
		3731	}
3389		3732
3390	#############################################################################	3733	#############################################################################
3391		3734
3392	package CFClient::UI;	3735	package CFClient::UI;
3393		3736

Diff Legend

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