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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 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 10.2, 0.80.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;
…		…
1467		1538
1468	delete $self->{texture};	1539	delete $self->{texture};
1469	$self->SUPER::update;	1540	$self->SUPER::update;
1470	}	1541	}
1471		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	$self->SUPER::realloc;
		1548	}
		1549
1472	sub set_text {	1550	sub set_text {
1473	my ($self, $text) = @_;	1551	my ($self, $text) = @_;
1474		1552
1475	return if $self->{text} eq "T$text";	1553	return if $self->{text} eq "T$text";
1476	$self->{text} = "T$text";	1554	$self->{text} = "T$text";
1477		1555
1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479	$self->{layout}->set_text ($text);	1557	$self->{layout}->set_text ($text);
		1558	delete $self->{req_h};
1480		1559
1481	$self->realloc;	1560	$self->realloc;
1482	$self->update;	1561	$self->update;
1483	}	1562	}
1484		1563
…		…
1490		1569
1491	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1570	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1492		1571
1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494	$self->{layout}->set_markup ($markup);	1573	$self->{layout}->set_markup ($markup);
		1574	delete $self->{req_h};
1495		1575
1496	$self->realloc;	1576	$self->realloc;
1497	$self->update;	1577	$self->update;
1498	}	1578	}
1499		1579
1500	sub size_request {	1580	sub size_request {
1501	my ($self) = @_;	1581	my ($self) = @_;
1502		1582
		1583	if (exists $self->{req_h}) {
		1584	@$self{qw(req_w req_h)}
		1585	} else {
1503	$self->{layout}->set_font ($self->{font}) if $self->{font};	1586	$self->{layout}->set_font ($self->{font}) if $self->{font};
1504	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1587	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1505	$self->{layout}->set_ellipsise ($self->{ellipsise});	1588	$self->{layout}->set_ellipsise ($self->{ellipsise});
1506	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508		1591
1509	my ($w, $h) = $self->{layout}->size;	1592	my ($w, $h) = $self->{layout}->size;
1510		1593
1511	if (exists $self->{template}) {	1594	if (exists $self->{template}) {
1512	$self->{template}->set_font ($self->{font}) if $self->{font};	1595	$self->{template}->set_font ($self->{font}) if $self->{font};
1513	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514		1597
1515	my ($w2, $h2) = $self->{template}->size;	1598	my ($w2, $h2) = $self->{template}->size;
1516		1599
1517	$w = List::Util::max $w, $w2;	1600	$w = List::Util::max $w, $w2;
1518	$h = List::Util::max $h, $h2;	1601	$h = List::Util::max $h, $h2;
1519	}	1602	}
1520		1603
1521	($w, $h)	1604	($w, $h)
		1605	}
1522	}	1606	}
1523		1607
1524	sub size_allocate {	1608	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1609	my ($self, $w, $h) = @_;
1526		1610
		1611	delete $self->{ox};
		1612
1527	delete $self->{texture}	1613	delete $self->{texture}
1528	;#d#	1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1615	}
1530		1616
1531	sub set_fontsize {	1617	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1618	my ($self, $fontsize) = @_;
1533		1619
…		…
1548	$self->{layout}->set_width ($self->{w});	1634	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1635	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1638
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1639	new_from_layout CFClient::Texture $self->{layout}
		1640	};
1554		1641
		1642	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1645	: ($self->{w} - $tex->{w}) * 0.5);
1558		1646
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1649	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1650	};
1565		1651
1566	glEnable GL_TEXTURE_2D;	1652	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1654
		1655	glColor_premultiply @{$self->{fg}}
1569	if ($tex->{format} == GL_ALPHA) {	1656	if $tex->{format} == GL_ALPHA;
1570	glColor @{$self->{fg}};	1657
1571	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572	} else {
1573	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574	}
1575		1659
1576	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1577	}	1661	}
1578		1662
1579	#############################################################################	1663	#############################################################################
…		…
1606		1690
1607	delete $self->{cur_h};	1691	delete $self->{cur_h};
1608		1692
1609	return if $self->{text} eq $text;	1693	return if $self->{text} eq $text;
1610		1694
1611	delete $self->{texture};
1612
1613	$self->{last_activity} = $::NOW;	1695	$self->{last_activity} = $::NOW;
1614	$self->{text} = $text;	1696	$self->{text} = $text;
1615		1697
1616	$text =~ s/./*/g if $self->{hidden};	1698	$text =~ s/./*/g if $self->{hidden};
1617	$self->{layout}->set_text ("$text ");	1699	$self->{layout}->set_text ("$text ");
		1700	delete $self->{req_h};
1618		1701
1619	$self->_emit (changed => $self->{text});	1702	$self->_emit (changed => $self->{text});
		1703
		1704	$self->realloc;
		1705	$self->update;
1620	}	1706	}
1621		1707
1622	sub set_text {	1708	sub set_text {
1623	my ($self, $text) = @_;	1709	my ($self, $text) = @_;
1624		1710
1625	$self->{cursor} = length $text;	1711	$self->{cursor} = length $text;
1626	$self->_set_text ($text);	1712	$self->_set_text ($text);
1627
1628	$self->realloc;
1629	}	1713	}
1630		1714
1631	sub get_text {	1715	sub get_text {
1632	$_[0]{text}	1716	$_[0]{text}
1633	}	1717	}
…		…
1663	$self->{cursor} = length $text;	1747	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1748	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1749	$self->_emit ('escape');
1666	} elsif ($uni) {	1750	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1751	substr $text, $self->{cursor}++, 0, chr $uni;
		1752	} else {
		1753	return 0;
1668	}	1754	}
1669		1755
1670	$self->_set_text ($text);	1756	$self->_set_text ($text);
1671		1757
1672	$self->realloc;	1758	$self->realloc;
		1759
		1760	1
1673	}	1761	}
1674		1762
1675	sub focus_in {	1763	sub focus_in {
1676	my ($self) = @_;	1764	my ($self) = @_;
1677		1765
…		…
1692	utf8::encode $text;	1780	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1781	$self->{cursor} = length substr $text, 0, $idx;
1694		1782
1695	$self->_set_text ($self->{text});	1783	$self->_set_text ($self->{text});
1696	$self->update;	1784	$self->update;
		1785
		1786	1
1697	}	1787	}
1698		1788
1699	sub mouse_motion {	1789	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1790	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1792
		1793	0
1702	}	1794	}
1703		1795
1704	sub _draw {	1796	sub _draw {
1705	my ($self) = @_;	1797	my ($self) = @_;
1706		1798
1707	local $self->{fg} = $self->{fg};	1799	local $self->{fg} = $self->{fg};
1708		1800
1709	if ($FOCUS == $self) {	1801	if ($FOCUS == $self) {
1710	glColor @{$self->{active_bg}};	1802	glColor_premultiply @{$self->{active_bg}};
1711	$self->{fg} = $self->{active_fg};	1803	$self->{fg} = $self->{active_fg};
1712	} else {	1804	} else {
1713	glColor @{$self->{bg}};	1805	glColor_premultiply @{$self->{bg}};
1714	}	1806	}
1715		1807
1716	glEnable GL_BLEND;	1808	glEnable GL_BLEND;
1717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1809	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718	glBegin GL_QUADS;	1810	glBegin GL_QUADS;
1719	glVertex 0 , 0;	1811	glVertex 0 , 0;
1720	glVertex 0 , $self->{h};	1812	glVertex 0 , $self->{h};
1721	glVertex $self->{w}, $self->{h};	1813	glVertex $self->{w}, $self->{h};
1722	glVertex $self->{w}, 0;	1814	glVertex $self->{w}, 0;
…		…
1783	} else {	1875	} else {
1784	$self->set_text ($self->{history_saveback});	1876	$self->set_text ($self->{history_saveback});
1785	}	1877	}
1786		1878
1787	} else {	1879	} else {
1788	$self->SUPER::key_down ($ev);	1880	return $self->SUPER::key_down ($ev)
		1881	}
		1882
1789	}	1883	1
1790
1791	}	1884	}
1792		1885
1793	#############################################################################	1886	#############################################################################
1794		1887
1795	package CFClient::UI::Button;	1888	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1917	my ($self, $ev, $x, $y) = @_;
1825		1918
1826	$self->emit ("activate")	1919	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1920	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1921	&& $y >= 0 && $y < $self->{h};
		1922
		1923	1
1829	}	1924	}
1830		1925
1831	sub _draw {	1926	sub _draw {
1832	my ($self) = @_;	1927	my ($self) = @_;
1833		1928
1834	local $self->{fg} = $self->{fg};	1929	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836	if ($GRAB == $self) {
1837	$self->{fg} = $self->{active_fg};
1838	}
1839		1930
1840	glEnable GL_TEXTURE_2D;	1931	glEnable GL_TEXTURE_2D;
1841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842	glColor 0, 0, 0, 1;	1933	glColor 0, 0, 0, 1;
1843		1934
…		…
1887		1978
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1981	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1982	$self->_emit (changed => $self->{state});
		1983	} else {
		1984	return 0
		1985	}
		1986
1892	}	1987	1
1893	}	1988	}
1894		1989
1895	sub _draw {	1990	sub _draw {
1896	my ($self) = @_;	1991	my ($self) = @_;
1897		1992
…		…
2064		2159
2065	my $h1 = $self->{h} * (1 - $ycut1);	2160	my $h1 = $self->{h} * (1 - $ycut1);
2066	my $h2 = $self->{h} * (1 - $ycut2);	2161	my $h2 = $self->{h} * (1 - $ycut2);
2067		2162
2068	glEnable GL_BLEND;	2163	glEnable GL_BLEND;
2069	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2166	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072		2168
2073	glBindTexture GL_TEXTURE_2D, $t1->{name};	2169	glBindTexture GL_TEXTURE_2D, $t1->{name};
2074	glBegin GL_QUADS;	2170	glBegin GL_QUADS;
…		…
2235		2331
2236	$self->SUPER::button_down ($ev, $x, $y);	2332	$self->SUPER::button_down ($ev, $x, $y);
2237		2333
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2335
2240	$self->mouse_motion ($ev, $x, $y);	2336	$self->mouse_motion ($ev, $x, $y)
2241	}	2337	}
2242		2338
2243	sub mouse_motion {	2339	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2340	my ($self, $ev, $x, $y) = @_;
2245		2341
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2345	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2346
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2347	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2348
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2349	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2350	} else {
		2351	return 0;
		2352	}
		2353
2254	}	2354	1
2255	}	2355	}
2256		2356
2257	sub update {	2357	sub update {
2258	my ($self) = @_;	2358	my ($self) = @_;
2259		2359
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2360	delete $self->{knob_w};
		2361	$self->SUPER::update;
		2362	}
		2363
		2364	sub _draw {
		2365	my ($self) = @_;
		2366
		2367	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2368	$self->set_value ($self->{range}[0]);
2262		2369
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2370	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) \|\| 1e-100;	2371	my $range = ($hi - $page - $lo) \|\| 1e-100;
2265		2372
…		…
2271	$value = ($value - $lo) / $range;	2378	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2379	$value = $value * $self->{scale} + $self->{offset};
2273		2380
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2381	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2382	$self->{knob_w} = $knob_w;
2276	});	2383	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2384
2284	$self->SUPER::_draw ();	2385	$self->SUPER::_draw ();
2285		2386
2286	glScale $self->{w}, $self->{h};	2387	glScale $self->{w}, $self->{h};
2287		2388
…		…
2481		2582
2482	delete $self->{texture};	2583	delete $self->{texture};
2483	}	2584	}
2484		2585
2485	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2586	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2486	glClearColor 0.5, 0.5, 0.5, 0;	2587	glClearColor 0, 0, 0, 0;
2487	glClear GL_COLOR_BUFFER_BIT;	2588	glClear GL_COLOR_BUFFER_BIT;
2488		2589
2489	my $top = int $self->{children}[1]{range}[0];	2590	my $top = int $self->{children}[1]{range}[0];
2490		2591
2491	my $y0 = $top;	2592	my $y0 = $top;
…		…
2526	sub _draw {	2627	sub _draw {
2527	my ($self) = @_;	2628	my ($self) = @_;
2528		2629
2529	glEnable GL_TEXTURE_2D;	2630	glEnable GL_TEXTURE_2D;
2530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2631	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531	glColor 1, 1, 1, 1;	2632	glColor 0, 0, 0, 1;
2532	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533	glDisable GL_TEXTURE_2D;	2634	glDisable GL_TEXTURE_2D;
2534		2635
2535	$self->{children}[1]->draw;	2636	$self->{children}[1]->draw;
2536		2637
2537	}	2638	}
…		…
2764	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2765		2866
2766	if ($tex) {	2867	if ($tex) {
2767	glEnable GL_TEXTURE_2D;	2868	glEnable GL_TEXTURE_2D;
2768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769	glColor 1, 1, 1, 1;	2870	glColor 0, 0, 0, 1;
2770	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771	glDisable GL_TEXTURE_2D;	2872	glDisable GL_TEXTURE_2D;
2772	}	2873	}
2773	}	2874	}
2774		2875
…		…
2778	$self->{timer}->cancel	2879	$self->{timer}->cancel
2779	if $self->{timer};	2880	if $self->{timer};
2780		2881
2781	$self->SUPER::DESTROY;	2882	$self->SUPER::DESTROY;
2782	}	2883	}
		2884
		2885	#############################################################################
		2886
		2887	package CFClient::UI::Buttonbar;
		2888
		2889	our @ISA = CFClient::UI::HBox::;
		2890
		2891	# TODO: should actualyl wrap buttons and other goodies.
2783		2892
2784	#############################################################################	2893	#############################################################################
2785		2894
2786	package CFClient::UI::Menu;	2895	package CFClient::UI::Menu;
2787		2896
…		…
2837	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2838		2947
2839	# TODO: should use vbox->find_widget or so	2948	# TODO: should use vbox->find_widget or so
2840	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841	$self->{hover} = $self->{item}{$HOVER};	2950	$self->{hover} = $self->{item}{$HOVER};
		2951
		2952	0
2842	}	2953	}
2843		2954
2844	sub button_up {	2955	sub button_up {
2845	my ($self, $ev, $x, $y) = @_;	2956	my ($self, $ev, $x, $y) = @_;
2846		2957
…		…
2848	undef $GRAB;	2959	undef $GRAB;
2849	$self->hide;	2960	$self->hide;
2850		2961
2851	$self->_emit ("popdown");	2962	$self->_emit ("popdown");
2852	$self->{hover}[1]->() if $self->{hover};	2963	$self->{hover}[1]->() if $self->{hover};
		2964	} else {
		2965	return 0
		2966	}
		2967
2853	}	2968	1
2854	}	2969	}
2855		2970
2856	#############################################################################	2971	#############################################################################
2857		2972
2858	package CFClient::UI::Statusbox;	2973	package CFClient::UI::Multiplexer;
2859		2974
2860	our @ISA = CFClient::UI::VBox::;	2975	our @ISA = CFClient::UI::Container::;
2861		2976
2862	sub new {	2977	sub new {
2863	my $class = shift;	2978	my $class = shift;
2864		2979
2865	$class->SUPER::new (	2980	my $self = $class->SUPER::new (
		2981	@_,
		2982	);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986
		2987	$self
		2988	}
		2989
		2990	sub add {
		2991	my ($self, @widgets) = @_;
		2992
		2993	$self->SUPER::add (@widgets);
		2994
		2995	$self->{current} = $self->{children}[0]
		2996	if @{ $self->{children} };
		2997	}
		2998
		2999	sub set_current_page {
		3000	my ($self, $page_or_widget) = @_;
		3001
		3002	my $widget = ref $page_or_widget
		3003	? $page_or_widget
		3004	: $self->{children}[$page_or_widget];
		3005
		3006	$self->{current} = $widget;
		3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3008
		3009	$self->_emit (page_changed => $self->{current});
		3010
		3011	$self->realloc;
		3012	}
		3013
		3014	sub visible_children {
		3015	$_[0]{current}
		3016	}
		3017
		3018	sub size_request {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->size_request
		3022	}
		3023
		3024	sub size_allocate {
		3025	my ($self, $w, $h) = @_;
		3026
		3027	$self->{current}->configure (0, 0, $w, $h);
		3028	}
		3029
		3030	sub _draw {
		3031	my ($self) = @_;
		3032
		3033	$self->{current}->draw;
		3034	}
		3035
		3036	#############################################################################
		3037
		3038	package CFClient::UI::Notebook;
		3039
		3040	our @ISA = CFClient::UI::VBox::;
		3041
		3042	sub new {
		3043	my $class = shift;
		3044
		3045	my $self = $class->SUPER::new (
		3046	buttonbar => (new CFClient::UI::Buttonbar),
		3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3048	# filter => # will be put between multiplexer and $self
		3049	@_,
		3050	);
		3051
		3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3053	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3054
		3055	$self
		3056	}
		3057
		3058	sub add {
		3059	my ($self, $title, $widget, $tooltip) = @_;
		3060
		3061	Scalar::Util::weaken $self;
		3062
		3063	$self->{buttonbar}->add (new CFClient::UI::Button
		3064	markup => $title,
		3065	tooltip => $tooltip,
		3066	on_activate => sub { $self->set_current_page ($widget) },
		3067	);
		3068
		3069	$self->{multiplexer}->add ($widget);
		3070	}
		3071
		3072	sub set_current_page {
		3073	my ($self, $page) = @_;
		3074
		3075	$self->{multiplexer}->set_current_page ($page);
		3076	$self->_emit (page_changed => $self->{multiplexer}{current});
		3077	}
		3078
		3079	#############################################################################
		3080
		3081	package CFClient::UI::Statusbox;
		3082
		3083	our @ISA = CFClient::UI::VBox::;
		3084
		3085	sub new {
		3086	my $class = shift;
		3087
		3088	my $self = $class->SUPER::new (
2866	fontsize => 0.8,	3089	fontsize => 0.8,
2867	@_,	3090	@_,
2868	)	3091	);
		3092
		3093	Scalar::Util::weaken (my $this = $self);
		3094
		3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3096
		3097	$self
2869	}	3098	}
2870		3099
2871	sub reorder {	3100	sub reorder {
2872	my ($self) = @_;	3101	my ($self) = @_;
2873	my $NOW = time;	3102	my $NOW = Time::HiRes::time;
		3103
		3104	# freeze display when hovering over any label
		3105	return if $CFClient::UI::TOOLTIP->{owner}
		3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3107	values %{ $self->{item} };
2874		3108
2875	while (my ($k, $v) = each %{ $self->{item} }) {	3109	while (my ($k, $v) = each %{ $self->{item} }) {
2876	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877	}	3111	}
2878		3112
…		…
2881	my @items = sort {	3115	my @items = sort {
2882	$a->{pri} <=> $b->{pri}	3116	$a->{pri} <=> $b->{pri}
2883	or $b->{id} <=> $a->{id}	3117	or $b->{id} <=> $a->{id}
2884	} values %{ $self->{item} };	3118	} values %{ $self->{item} };
2885		3119
		3120	$self->{timer}->interval (1);
		3121
2886	my $count = 10 + 1;	3122	my $count = 10 + 1;
2887	for my $item (@items) {	3123	for my $item (@items) {
2888	last unless --$count;	3124	last unless --$count;
2889		3125
2890	push @widgets, $item->{label} \|\|= do {	3126	my $label = $item->{label} \|\|= do {
2891	# TODO: doesn't handle markup well (read as: at all)	3127	# TODO: doesn't handle markup well (read as: at all)
2892	my $short = $item->{count} > 1	3128	my $short = $item->{count} > 1
2893	? "<b>$item->{count} ×</b> $item->{text}"	3129	? "<b>$item->{count} ×</b> $item->{text}"
2894	: $item->{text};	3130	: $item->{text};
2895		3131
…		…
2903	tooltip => $item->{tooltip},	3139	tooltip => $item->{tooltip},
2904	tooltip_font => $::FONT_PROP,	3140	tooltip_font => $::FONT_PROP,
2905	tooltip_width => 0.67,	3141	tooltip_width => 0.67,
2906	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3142	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2907	max_w => $::WIDTH * 0.44,	3143	max_w => $::WIDTH * 0.44,
2908	fg => $item->{fg},	3144	fg => [@{ $item->{fg} }],
2909	can_events => 1,	3145	can_events => 1,
2910	can_hover => 1	3146	can_hover => 1
2911	};	3147	};
		3148
		3149	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3150	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3151	$label->update;
		3152	$label->set_max_size (undef, $label->{req_h} * $diff)
		3153	if $diff < 1;
		3154	$self->{timer}->interval (1/30);
		3155	} else {
		3156	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3157	}
		3158
		3159	push @widgets, $label;
2912	}	3160	}
2913		3161
2914	$self->clear;	3162	$self->clear;
2915	$self->SUPER::add (reverse @widgets);	3163	$self->SUPER::add (reverse @widgets);
2916	}	3164	}
…		…
2921	$text =~ s/^\s+//;	3169	$text =~ s/^\s+//;
2922	$text =~ s/\s+$//;	3170	$text =~ s/\s+$//;
2923		3171
2924	return unless $text;	3172	return unless $text;
2925		3173
2926	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3174	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
2927		3175
2928	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3176	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929		3177
2930	if (my $item = $self->{item}{$group}) {	3178	if (my $item = $self->{item}{$group}) {
2931	if ($item->{text} eq $text) {	3179	if ($item->{text} eq $text) {
…		…
2961		3209
2962	$self->reorder;	3210	$self->reorder;
2963	$self->SUPER::reconfigure;	3211	$self->SUPER::reconfigure;
2964	}	3212	}
2965		3213
		3214	sub DESTROY {
		3215	my ($self) = @_;
		3216
		3217	$self->{timer}->cancel;
		3218
		3219	$self->SUPER::DESTROY;
		3220	}
		3221
2966	#############################################################################	3222	#############################################################################
2967		3223
2968	package CFClient::UI::Inventory;	3224	package CFClient::UI::Inventory;
2969		3225
2970	our @ISA = CFClient::UI::ScrolledWindow::;	3226	our @ISA = CFClient::UI::ScrolledWindow::;
2971		3227
2972	sub new {	3228	sub new {
2973	my $class = shift;	3229	my $class = shift;
2974		3230
2975	my $self = $class->SUPER::new (	3231	my $self = $class->SUPER::new (
2976	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3232	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977	@_,	3233	@_,
2978	);	3234	);
2979		3235
2980	$self	3236	$self
2981	}	3237	}
2982		3238
2983	sub set_items {	3239	sub set_items {
2984	my ($self, $items) = @_;	3240	my ($self, $items) = @_;
2985		3241
2986	$self->{scrolled}->clear;	3242	$self->{child}->clear;
2987	return unless $items;	3243	return unless $items;
2988		3244
2989	my @items = sort {	3245	my @items = sort {
2990	($a->{type} <=> $b->{type})	3246	($a->{type} <=> $b->{type})
2991	or ($a->{name} cmp $b->{name})	3247	or ($a->{name} cmp $b->{name})
…		…
2995		3251
2996	my $row = 0;	3252	my $row = 0;
2997	for my $item (@items) {	3253	for my $item (@items) {
2998	CFClient::Item::update_widgets $item;	3254	CFClient::Item::update_widgets $item;
2999		3255
3000	$self->{scrolled}->add (0, $row, $item->{face_widget});	3256	$self->{child}->add (0, $row, $item->{face_widget});
3001	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3257	$self->{child}->add (1, $row, $item->{desc_widget});
3002	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3258	$self->{child}->add (2, $row, $item->{weight_widget});
3003		3259
3004	$row++;	3260	$row++;
3005	}	3261	}
3006	}	3262	}
3007		3263
…		…
3105	$rec = $::CONN->stop_record if $::CONN;	3361	$rec = $::CONN->stop_record if $::CONN;
3106	return unless ref $rec eq 'ARRAY';	3362	return unless ref $rec eq 'ARRAY';
3107	$self->set_command_list ($rec);	3363	$self->set_command_list ($rec);
3108	}	3364	}
3109		3365
3110	# if $commit is true, the binding will be set after the user entered a key combo	3366
		3367	sub ask_for_bind_and_commit {
		3368	my ($self) = @_;
		3369	$self->ask_for_bind (1);
		3370	}
		3371
3111	sub ask_for_bind {	3372	sub ask_for_bind {
3112	my ($self, $commit) = @_;	3373	my ($self, $commit) = @_;
3113		3374
3114	CFClient::Binder::open_binding_dialog (sub {	3375	CFClient::Binder::open_binding_dialog (sub {
3115	my ($mod, $sym) = @_;	3376	my ($mod, $sym) = @_;
…		…
3199		3460
3200	#############################################################################	3461	#############################################################################
3201		3462
3202	package CFClient::UI::SpellList;	3463	package CFClient::UI::SpellList;
3203		3464
3204	our @ISA = CFClient::UI::FancyFrame::;	3465	our @ISA = CFClient::UI::Table::;
3205		3466
3206	sub new {	3467	sub new {
3207	my $class = shift;	3468	my $class = shift;
3208		3469
3209	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3470	my $self = $class->SUPER::new (
3210		3471	binding => [],
3211	$self->add (new CFClient::UI::ScrolledWindow	3472	commands => [],
3212	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3473	@_,
3213		3474	)
3214	$self;
3215	}	3475	}
3216		3476
3217	# XXX: Do sorting? Argl...	3477	# XXX: Do sorting? Argl...
3218	sub add_spell {	3478	sub add_spell {
3219	my ($self, $spell) = @_;	3479	my ($self, $spell) = @_;
3220	$self->{spells}->{$spell->{name}} = $spell;	3480	$self->{spells}->{$spell->{name}} = $spell;
3221		3481
3222	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223	face => $spell->{face},	3483	face => $spell->{face},
3224	can_hover => 1,	3484	can_hover => 1,
3225	can_events => 1,	3485	can_events => 1,
3226	tooltip => $spell->{message});	3486	tooltip => $spell->{message});
3227		3487
3228	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229	text => $spell->{name},	3489	text => $spell->{name},
3230	can_hover => 1,	3490	can_hover => 1,
3231	can_events => 1,	3491	can_events => 1,
3232	tooltip => $spell->{message},	3492	tooltip => $spell->{message},
3233	expand => 1);	3493	expand => 1);
3234		3494
3235	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3497	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3238	expand => 1);	3498	expand => 1);
3239		3499
3240	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241	text => "bind to key",	3501	text => "bind to key",
3242	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243	}	3503	}
3244		3504
3245	sub rebuild_spell_list {	3505	sub rebuild_spell_list {
…		…
3258		3518
3259	package CFClient::UI::Root;	3519	package CFClient::UI::Root;
3260		3520
3261	our @ISA = CFClient::UI::Container::;	3521	our @ISA = CFClient::UI::Container::;
3262		3522
		3523	use List::Util qw(min max);
		3524
3263	use CFClient::OpenGL;	3525	use CFClient::OpenGL;
3264		3526
3265	sub new {	3527	sub new {
3266	my $class = shift;	3528	my $class = shift;
3267		3529
…		…
3372	$_->()	3634	$_->()
3373	for values %{delete $self->{refresh_hook}};	3635	for values %{delete $self->{refresh_hook}};
3374	}	3636	}
3375		3637
3376	if ($self->{realloc}) {	3638	if ($self->{realloc}) {
		3639	my %queue;
3377	my @queue;	3640	my @queue;
		3641	my $widget;
3378		3642
		3643	outer:
3379	while () {	3644	while () {
3380	if ($self->{realloc}) {	3645	if (my $realloc = delete $self->{realloc}) {
3381	#TODO use array-of-depth approach	3646	for $widget (values %$realloc) {
		3647	$widget->{visible} or next; # do not resize invisible widgets
3382		3648
3383	use sort 'stable';	3649	$queue{$widget+0}++ and next; # duplicates are common
3384		3650
3385	@queue = sort { $a->{visible} <=> $b->{visible} }	3651	push @{ $queue[$widget->{visible}] }, $widget;
3386	@queue, values %{delete $self->{realloc}};	3652	}
3387	}	3653	}
3388		3654
		3655	while () {
		3656	@queue or last outer;
		3657
3389	my $widget = pop @queue \|\| last;	3658	$widget = pop @{ $queue[-1] \|\| [] }
		3659	and last;
		3660
		3661	pop @queue;
		3662	}
3390		3663
3391	$widget->{visible} or last; # do not resize invisible widgets	3664	delete $queue{$widget+0};
3392		3665
3393	my ($w, $h) = $widget->size_request;	3666	my ($w, $h) = $widget->size_request;
3394		3667
3395	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3668	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3669	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3670
		3671	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3672	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397		3673
3398	$w = $widget->{force_w} if exists $widget->{force_w};	3674	$w = $widget->{force_w} if exists $widget->{force_w};
3399	$h = $widget->{force_h} if exists $widget->{force_h};	3675	$h = $widget->{force_h} if exists $widget->{force_h};
3400		3676
3401	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3677	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
…		…
3404	$widget->{req_h} = $h;	3680	$widget->{req_h} = $h;
3405		3681
3406	$self->{size_alloc}{$widget+0} = $widget;	3682	$self->{size_alloc}{$widget+0} = $widget;
3407		3683
3408	if (my $parent = $widget->{parent}) {	3684	if (my $parent = $widget->{parent}) {
3409	$self->{realloc}{$parent+0} = $parent;	3685	$self->{realloc}{$parent+0} = $parent
3410	#unshift @queue, $parent;	3686	unless $queue{$parent+0};
		3687
3411	$parent->{force_size_alloc} = 1;	3688	$parent->{force_size_alloc} = 1;
3412	$self->{size_alloc}{$parent+0} = $parent;	3689	$self->{size_alloc}{$parent+0} = $parent;
3413	}	3690	}
3414	}	3691	}
3415		3692
…		…
3431		3708
3432	$w = int $w + 0.5;	3709	$w = int $w + 0.5;
3433	$h = int $h + 0.5;	3710	$h = int $h + 0.5;
3434		3711
3435	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	3712	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3713	$widget->{old_w} = $widget->{w};
		3714	$widget->{old_h} = $widget->{h};
		3715
3436	$widget->{w} = $w;	3716	$widget->{w} = $w;
3437	$widget->{h} = $h;	3717	$widget->{h} = $h;
3438		3718
3439	$widget->emit (size_allocate => $w, $h);	3719	$widget->emit (size_allocate => $w, $h);
3440	}	3720	}
…		…
3455	glLoadIdentity;	3735	glLoadIdentity;
3456	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457	glMatrixMode GL_MODELVIEW;	3737	glMatrixMode GL_MODELVIEW;
3458	glLoadIdentity;	3738	glLoadIdentity;
3459		3739
		3740	{
		3741	package CFClient::UI::Base;
		3742
		3743	($draw_x, $draw_y, $draw_w, $draw_h) =
		3744	(0, 0, $self->{w}, $self->{h});
		3745	}
		3746
3460	$self->_draw;	3747	$self->_draw;
3461	}	3748	}
3462		3749
3463	#############################################################################	3750	#############################################################################
3464		3751

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC vs. Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC