[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.279 by root, Mon Jun 5 00:17:47 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
…		…
438		444
439	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440	unless $FOCUS;	446	unless $FOCUS;
441	}	447	}
442		448
443	sub mouse_motion { }	449	sub mouse_motion { 0 }
444	sub button_up { }	450	sub button_up { 0 }
445	sub key_down { }	451	sub key_down { 0 }
446	sub key_up { }	452	sub key_up { 0 }
447		453
448	sub button_down {	454	sub button_down {
449	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
450		456
451	$self->focus_in;	457	$self->focus_in;
452	}
453		458
454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
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		461
460	sub find_widget {	462	sub find_widget {
461	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
462		464
463	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
525		527
526	$self->realloc;	528	$self->realloc;
527	$self->update;	529	$self->update;
528	}	530	}
529		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
530	sub draw {	536	sub draw {
531	my ($self) = @_;	537	my ($self) = @_;
532		538
533	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
534		550
535	glPushMatrix;	551	glPushMatrix;
536	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
537	$self->_draw;
538	glPopMatrix;
539		553
540	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
541	my ($x, $y) = @$self{qw(x y)};
542
543	glColor 1, 0.8, 0.5, 0.2;	555	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
544	glEnable GL_BLEND;	556	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546	glBegin GL_QUADS;	558	glBegin GL_QUADS;
547	glVertex $x , $y;	559	glVertex 0 , 0;
548	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
549	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
550	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
551	glEnd;	563	glEnd;
552	glDisable GL_BLEND;	564	glDisable GL_BLEND;
553	}	565	}
554		566
555	if ($ENV{CFPLUS_DEBUG} & 1) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
556	glPushMatrix;	568	glPushMatrix;
557	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
559	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
560	glVertex 0 , 0;	572	glVertex 0 , 0;
561	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
562	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
563	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
564	glEnd;	576	glEnd;
565	glPopMatrix;	577	glPopMatrix;
566	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
568	}	583	}
569		584
570	sub _draw {	585	sub _draw {
571	my ($self) = @_;	586	my ($self) = @_;
572		587
…		…
610		625
611	if ($color && (@$color < 4 \|\| $color->[3])) {	626	if ($color && (@$color < 4 \|\| $color->[3])) {
612	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
613		628
614	glEnable GL_BLEND;	629	glEnable GL_BLEND;
615	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glColor @$color;	631	glColor_premultiply @$color;
617		632
618	glBegin GL_QUADS;	633	glBegin GL_QUADS;
619	glVertex 0 , 0;	634	glVertex 0 , 0;
620	glVertex 0 , $h;	635	glVertex 0 , $h;
621	glVertex $w, $h;	636	glVertex $w, $h;
…		…
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
653		668
654	sub new {	669	sub new {
655	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
656		671
657	my $children = delete $arg{children} \|\| [];	672	my $children = delete $arg{children};
658		673
659	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
660	children => [],	675	children => [],
661	can_events => 0,	676	can_events => 0,
662	%arg,	677	%arg,
663	);	678	);
		679
664	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
665		682
666	$self	683	$self
667	}	684	}
668		685
669	sub add {	686	sub add {
…		…
717	$x -= $self->{x};	734	$x -= $self->{x};
718	$y -= $self->{y};	735	$y -= $self->{y};
719		736
720	my $res;	737	my $res;
721		738
722	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
723	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
724	and return $res;	741	and return $res;
725	}	742	}
726		743
727	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
776	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
777	}	794	}
778		795
779	#############################################################################	796	#############################################################################
780		797
		798	# back-buffered drawing area
		799
781	package CFClient::UI::Window;	800	package CFClient::UI::Window;
782		801
783	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
784		803
785	use CFClient::OpenGL;	804	use CFClient::OpenGL;
…		…
803	$self->SUPER::size_allocate ($w, $h);	822	$self->SUPER::size_allocate ($w, $h);
804	$self->update;	823	$self->update;
805	}	824	}
806		825
807	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
808	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
809	}	830	}
810		831
811	sub render_child {	832	sub render_child {
812	my ($self) = @_;	833	my ($self) = @_;
813		834
814	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
816	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
817		838
		839	{
		840	package CFClient::UI::Base;
		841
		842	($draw_x, $draw_y, $draw_w, $draw_h) =
		843	(0, 0, $self->{w}, $self->{h});
		844	}
		845
818	$self->_render;	846	$self->_render;
819	};	847	};
820	}	848	}
821		849
822	sub _draw {	850	sub _draw {
823	my ($self) = @_;	851	my ($self) = @_;
824		852
825	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
826		854
827	my $tex = $self->{texture}	855	my $tex = $self->{texture}
828	or return;	856	or return;
829		857
830	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832	glColor 1, 1, 1, 1;	860	glColor 0, 0, 0, 1;
833		861
834	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835		863
836	glDisable GL_TEXTURE_2D;	864	glDisable GL_TEXTURE_2D;
837	}	865	}
…		…
913	}	941	}
914		942
915	sub _render {	943	sub _render {
916	my ($self) = @_;	944	my ($self) = @_;
917		945
		946	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		947	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		948
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	949	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		950
920	$self->SUPER::_render;	951	$self->SUPER::_render;
921	}	952	}
922		953
…		…
925	package CFClient::UI::ScrolledWindow;	956	package CFClient::UI::ScrolledWindow;
926		957
927	our @ISA = CFClient::UI::HBox::;	958	our @ISA = CFClient::UI::HBox::;
928		959
929	sub new {	960	sub new {
930	my $class = shift;	961	my ($class, %arg) = @_;
		962
		963	my $child = delete $arg{child};
931		964
932	my $self;	965	my $self;
933		966
934	my $slider = new CFClient::UI::Slider	967	my $slider = new CFClient::UI::Slider
935	vertical => 1,	968	vertical => 1,
…		…
940	;	973	;
941		974
942	$self = $class->SUPER::new (	975	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	976	vp => (new CFClient::UI::ViewPort expand => 1),
944	slider => $slider,	977	slider => $slider,
945	@_,	978	%arg,
946	);	979	);
947		980
948	$self->{vp}->add ($self->{scrolled});
949	$self->add ($self->{vp});
950	$self->add ($self->{slider});	981	$self->SUPER::add ($self->{vp}, $self->{slider});
		982	$self->add ($child) if $child;
951		983
952	$self	984	$self
		985	}
		986
		987	sub add {
		988	my ($self, $widget) = @_;
		989
		990	$self->{vp}->add ($self->{child} = $widget);
953	}	991	}
954		992
955	sub update {	993	sub update {
956	my ($self) = @_;	994	my ($self) = @_;
957		995
…		…
996		1034
997	if ($self->{bg}) {	1035	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1036	my ($w, $h) = @$self{qw(w h)};
999		1037
1000	glEnable GL_BLEND;	1038	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1039	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1040	glColor_premultiply @{ $self->{bg} };
1003		1041
1004	glBegin GL_QUADS;	1042	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1043	glVertex 0 , 0;
1006	glVertex 0 , $h;	1044	glVertex 0 , $h;
1007	glVertex $w, $h;	1045	glVertex $w, $h;
…		…
1029	my @border =	1067	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1068	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);	1069	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1070
1033	sub new {	1071	sub new {
1034	my $class = shift;	1072	my ($class, %arg) = @_;
		1073
		1074	my $title = delete $arg{title};
1035		1075
1036	my $self = $class->SUPER::new (	1076	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1077	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1078	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1079	border => 0.6,
1040	can_events => 1,	1080	can_events => 1,
1041	min_w => 16,	1081	min_w => 16,
1042	min_h => 16,	1082	min_h => 16,
1043	@_	1083	%arg,
1044	);	1084	);
1045		1085
1046	$self->{title} &&= new CFClient::UI::Label	1086	$self->{title} = new CFClient::UI::Label
1047	align => 0,	1087	align => 0,
1048	valign => 1,	1088	valign => 1,
1049	text => $self->{title},	1089	text => $title,
1050	fontsize => $self->{border};	1090	fontsize => $self->{border}
		1091	if defined $title;
1051		1092
1052	$self	1093	$self
		1094	}
		1095
		1096	sub add {
		1097	my ($self, @widgets) = @_;
		1098
		1099	$self->SUPER::add (@widgets);
		1100	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053	}	1101	}
1054		1102
1055	sub border {	1103	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1104	int $_[0]{border} * $::FONTSIZE
1057	}	1105	}
1058		1106
1059	sub size_request {	1107	sub size_request {
1060	my ($self) = @_;	1108	my ($self) = @_;
		1109
		1110	$self->{title}->size_request
		1111	if $self->{title};
1061		1112
1062	my ($w, $h) = $self->SUPER::size_request;	1113	my ($w, $h) = $self->SUPER::size_request;
1063		1114
1064	(	1115	(
1065	$w + $self->border * 2,	1116	$w + $self->border * 2,
…		…
1068	}	1119	}
1069		1120
1070	sub size_allocate {	1121	sub size_allocate {
1071	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1072		1123
		1124	if ($self->{title}) {
		1125	$self->{title}{w} = $w;
		1126	$self->{title}{h} = $h;
		1127	$self->{title}->size_allocate ($w, $h);
		1128	}
		1129
		1130	my $border = $self->border;
		1131
1073	$h -= List::Util::max 0, $self->border * 2;	1132	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1133	$w -= List::Util::max 0, $border * 2;
1075		1134
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);	1135	$self->child->configure ($border, $border, $w, $h);
1080	}	1136	}
1081		1137
1082	sub button_down {	1138	sub button_down {
1083	my ($self, $ev, $x, $y) = @_;	1139	my ($self, $ev, $x, $y) = @_;
1084		1140
…		…
1103	my $dy = $ev->{y} - $oy;	1159	my $dy = $ev->{y} - $oy;
1104		1160
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1161	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1162	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1163
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1165	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1166	};
1111		1167
1112	} elsif ($lr ^ $td) {	1168	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1169	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1170	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1173	my ($ev, $x, $y) = @_;
1118		1174
1119	($x, $y) = ($ev->{x}, $ev->{y});	1175	($x, $y) = ($ev->{x}, $ev->{y});
1120		1176
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1177	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1178	# HACK: the next line is required to enforce placement
		1179	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122	};	1180	};
		1181	} else {
		1182	return 0;
		1183	}
		1184
1123	}	1185	1
1124	}	1186	}
1125		1187
1126	sub button_up {	1188	sub button_up {
1127	my ($self, $ev, $x, $y) = @_;	1189	my ($self, $ev, $x, $y) = @_;
1128		1190
1129	delete $self->{motion};	1191	!!delete $self->{motion}
1130	}	1192	}
1131		1193
1132	sub mouse_motion {	1194	sub mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1195	my ($self, $ev, $x, $y) = @_;
1134		1196
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1197	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1198
		1199	!!$self->{motion}
1136	}	1200	}
1137		1201
1138	sub _draw {	1202	sub _draw {
1139	my ($self) = @_;	1203	my ($self) = @_;
1140		1204
		1205	my $child = $self->{children}[0];
		1206
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1207	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1208	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1209
1144	glEnable GL_TEXTURE_2D;	1210	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1212
1147	my $border = $self->border;	1213	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1228	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1229	}
1164		1230
1165	glDisable GL_TEXTURE_2D;	1231	glDisable GL_TEXTURE_2D;
1166		1232
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1233	$child->draw;
		1234
		1235	if ($self->{title}) {
		1236	glTranslate 0, $border - $self->{h};
		1237	$self->{title}->_draw;
		1238	}
1170	}	1239	}
1171		1240
1172	#############################################################################	1241	#############################################################################
1173		1242
1174	package CFClient::UI::Table;	1243	package CFClient::UI::Table;
…		…
1522	}	1591	}
1523		1592
1524	sub size_allocate {	1593	sub size_allocate {
1525	my ($self, $w, $h) = @_;	1594	my ($self, $w, $h) = @_;
1526		1595
		1596	delete $self->{ox};
		1597
1527	delete $self->{texture}	1598	delete $self->{texture}
1528	;#d#	1599	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529	}	1600	}
1530		1601
1531	sub set_fontsize {	1602	sub set_fontsize {
1532	my ($self, $fontsize) = @_;	1603	my ($self, $fontsize) = @_;
1533		1604
…		…
1548	$self->{layout}->set_width ($self->{w});	1619	$self->{layout}->set_width ($self->{w});
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1620	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1621	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1622	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1623
1553	my $tex = new_from_layout CFClient::Texture $self->{layout};	1624	new_from_layout CFClient::Texture $self->{layout}
		1625	};
1554		1626
		1627	unless (exists $self->{ox}) {
1555	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1628	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1629	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557	: ($self->{w} - $tex->{w}) * 0.5);	1630	: ($self->{w} - $tex->{w}) * 0.5);
1558		1631
1559	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1632	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1633	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561	: ($self->{h} - $tex->{h}) * 0.5);	1634	: ($self->{h} - $tex->{h}) * 0.5);
1562
1563	$tex
1564	};	1635	};
1565		1636
1566	glEnable GL_TEXTURE_2D;	1637	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1638	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568		1639
		1640	glColor_premultiply @{$self->{fg}}
1569	if ($tex->{format} == GL_ALPHA) {	1641	if $tex->{format} == GL_ALPHA;
1570	glColor @{$self->{fg}};	1642
1571	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572	} else {
1573	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574	}
1575		1644
1576	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1577	}	1646	}
1578		1647
1579	#############################################################################	1648	#############################################################################
…		…
1606		1675
1607	delete $self->{cur_h};	1676	delete $self->{cur_h};
1608		1677
1609	return if $self->{text} eq $text;	1678	return if $self->{text} eq $text;
1610		1679
1611	delete $self->{texture};
1612
1613	$self->{last_activity} = $::NOW;	1680	$self->{last_activity} = $::NOW;
1614	$self->{text} = $text;	1681	$self->{text} = $text;
1615		1682
1616	$text =~ s/./*/g if $self->{hidden};	1683	$text =~ s/./*/g if $self->{hidden};
1617	$self->{layout}->set_text ("$text ");	1684	$self->{layout}->set_text ("$text ");
1618		1685
1619	$self->_emit (changed => $self->{text});	1686	$self->_emit (changed => $self->{text});
		1687	$self->update;
1620	}	1688	}
1621		1689
1622	sub set_text {	1690	sub set_text {
1623	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1624		1692
…		…
1663	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1664	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1665	$self->_emit ('escape');	1733	$self->_emit ('escape');
1666	} elsif ($uni) {	1734	} elsif ($uni) {
1667	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1668	}	1738	}
1669		1739
1670	$self->_set_text ($text);	1740	$self->_set_text ($text);
1671		1741
1672	$self->realloc;	1742	$self->realloc;
		1743
		1744	1
1673	}	1745	}
1674		1746
1675	sub focus_in {	1747	sub focus_in {
1676	my ($self) = @_;	1748	my ($self) = @_;
1677		1749
…		…
1692	utf8::encode $text;	1764	utf8::encode $text;
1693	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1694		1766
1695	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1696	$self->update;	1768	$self->update;
		1769
		1770	1
1697	}	1771	}
1698		1772
1699	sub mouse_motion {	1773	sub mouse_motion {
1700	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1701	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1776
		1777	0
1702	}	1778	}
1703		1779
1704	sub _draw {	1780	sub _draw {
1705	my ($self) = @_;	1781	my ($self) = @_;
1706		1782
1707	local $self->{fg} = $self->{fg};	1783	local $self->{fg} = $self->{fg};
1708		1784
1709	if ($FOCUS == $self) {	1785	if ($FOCUS == $self) {
1710	glColor @{$self->{active_bg}};	1786	glColor_premultiply @{$self->{active_bg}};
1711	$self->{fg} = $self->{active_fg};	1787	$self->{fg} = $self->{active_fg};
1712	} else {	1788	} else {
1713	glColor @{$self->{bg}};	1789	glColor_premultiply @{$self->{bg}};
1714	}	1790	}
1715		1791
1716	glEnable GL_BLEND;	1792	glEnable GL_BLEND;
1717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1793	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718	glBegin GL_QUADS;	1794	glBegin GL_QUADS;
1719	glVertex 0 , 0;	1795	glVertex 0 , 0;
1720	glVertex 0 , $self->{h};	1796	glVertex 0 , $self->{h};
1721	glVertex $self->{w}, $self->{h};	1797	glVertex $self->{w}, $self->{h};
1722	glVertex $self->{w}, 0;	1798	glVertex $self->{w}, 0;
…		…
1783	} else {	1859	} else {
1784	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1785	}	1861	}
1786		1862
1787	} else {	1863	} else {
1788	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1789	}	1867	1
1790
1791	}	1868	}
1792		1869
1793	#############################################################################	1870	#############################################################################
1794		1871
1795	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1824	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1825		1902
1826	$self->emit ("activate")	1903	$self->emit ("activate")
1827	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1828	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1829	}	1908	}
1830		1909
1831	sub _draw {	1910	sub _draw {
1832	my ($self) = @_;	1911	my ($self) = @_;
1833		1912
1834	local $self->{fg} = $self->{fg};	1913	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836	if ($GRAB == $self) {
1837	$self->{fg} = $self->{active_fg};
1838	}
1839		1914
1840	glEnable GL_TEXTURE_2D;	1915	glEnable GL_TEXTURE_2D;
1841	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842	glColor 0, 0, 0, 1;	1917	glColor 0, 0, 0, 1;
1843		1918
…		…
1887		1962
1888	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1963	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1964	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890	$self->{state} = !$self->{state};	1965	$self->{state} = !$self->{state};
1891	$self->_emit (changed => $self->{state});	1966	$self->_emit (changed => $self->{state});
		1967	} else {
		1968	return 0
		1969	}
		1970
1892	}	1971	1
1893	}	1972	}
1894		1973
1895	sub _draw {	1974	sub _draw {
1896	my ($self) = @_;	1975	my ($self) = @_;
1897		1976
…		…
2064		2143
2065	my $h1 = $self->{h} * (1 - $ycut1);	2144	my $h1 = $self->{h} * (1 - $ycut1);
2066	my $h2 = $self->{h} * (1 - $ycut2);	2145	my $h2 = $self->{h} * (1 - $ycut2);
2067		2146
2068	glEnable GL_BLEND;	2147	glEnable GL_BLEND;
2069	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2148	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2149	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2150	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072		2152
2073	glBindTexture GL_TEXTURE_2D, $t1->{name};	2153	glBindTexture GL_TEXTURE_2D, $t1->{name};
2074	glBegin GL_QUADS;	2154	glBegin GL_QUADS;
…		…
2235		2315
2236	$self->SUPER::button_down ($ev, $x, $y);	2316	$self->SUPER::button_down ($ev, $x, $y);
2237		2317
2238	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2318	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239		2319
2240	$self->mouse_motion ($ev, $x, $y);	2320	$self->mouse_motion ($ev, $x, $y)
2241	}	2321	}
2242		2322
2243	sub mouse_motion {	2323	sub mouse_motion {
2244	my ($self, $ev, $x, $y) = @_;	2324	my ($self, $ev, $x, $y) = @_;
2245		2325
…		…
2249	my (undef, $lo, $hi, $page) = @{$self->{range}};	2329	my (undef, $lo, $hi, $page) = @{$self->{range}};
2250		2330
2251	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2331	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252		2332
2253	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2333	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2334	} else {
		2335	return 0;
		2336	}
		2337
2254	}	2338	1
2255	}	2339	}
2256		2340
2257	sub update {	2341	sub update {
2258	my ($self) = @_;	2342	my ($self) = @_;
2259		2343
2260	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2344	delete $self->{knob_w};
		2345	$self->SUPER::update;
		2346	}
		2347
		2348	sub _draw {
		2349	my ($self) = @_;
		2350
		2351	unless ($self->{knob_w}) {
2261	$self->set_value ($self->{range}[0]);	2352	$self->set_value ($self->{range}[0]);
2262		2353
2263	my ($value, $lo, $hi, $page) = @{$self->{range}};	2354	my ($value, $lo, $hi, $page) = @{$self->{range}};
2264	my $range = ($hi - $page - $lo) \|\| 1e-100;	2355	my $range = ($hi - $page - $lo) \|\| 1e-100;
2265		2356
…		…
2271	$value = ($value - $lo) / $range;	2362	$value = ($value - $lo) / $range;
2272	$value = $value * $self->{scale} + $self->{offset};	2363	$value = $value * $self->{scale} + $self->{offset};
2273		2364
2274	$self->{knob_x} = $value - $knob_w * 0.5;	2365	$self->{knob_x} = $value - $knob_w * 0.5;
2275	$self->{knob_w} = $knob_w;	2366	$self->{knob_w} = $knob_w;
2276	});	2367	}
2277
2278	$self->SUPER::update;
2279	}
2280
2281	sub _draw {
2282	my ($self) = @_;
2283		2368
2284	$self->SUPER::_draw ();	2369	$self->SUPER::_draw ();
2285		2370
2286	glScale $self->{w}, $self->{h};	2371	glScale $self->{w}, $self->{h};
2287		2372
…		…
2481		2566
2482	delete $self->{texture};	2567	delete $self->{texture};
2483	}	2568	}
2484		2569
2485	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2570	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2486	glClearColor 0.5, 0.5, 0.5, 0;	2571	glClearColor 0, 0, 0, 0;
2487	glClear GL_COLOR_BUFFER_BIT;	2572	glClear GL_COLOR_BUFFER_BIT;
2488		2573
2489	my $top = int $self->{children}[1]{range}[0];	2574	my $top = int $self->{children}[1]{range}[0];
2490		2575
2491	my $y0 = $top;	2576	my $y0 = $top;
…		…
2526	sub _draw {	2611	sub _draw {
2527	my ($self) = @_;	2612	my ($self) = @_;
2528		2613
2529	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531	glColor 1, 1, 1, 1;	2616	glColor 0, 0, 0, 1;
2532	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2617	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533	glDisable GL_TEXTURE_2D;	2618	glDisable GL_TEXTURE_2D;
2534		2619
2535	$self->{children}[1]->draw;	2620	$self->{children}[1]->draw;
2536		2621
2537	}	2622	}
…		…
2764	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2849	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2765		2850
2766	if ($tex) {	2851	if ($tex) {
2767	glEnable GL_TEXTURE_2D;	2852	glEnable GL_TEXTURE_2D;
2768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769	glColor 1, 1, 1, 1;	2854	glColor 0, 0, 0, 1;
2770	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2855	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771	glDisable GL_TEXTURE_2D;	2856	glDisable GL_TEXTURE_2D;
2772	}	2857	}
2773	}	2858	}
2774		2859
…		…
2778	$self->{timer}->cancel	2863	$self->{timer}->cancel
2779	if $self->{timer};	2864	if $self->{timer};
2780		2865
2781	$self->SUPER::DESTROY;	2866	$self->SUPER::DESTROY;
2782	}	2867	}
		2868
		2869	#############################################################################
		2870
		2871	package CFClient::UI::Buttonbar;
		2872
		2873	our @ISA = CFClient::UI::HBox::;
		2874
		2875	# TODO: should actualyl wrap buttons and other goodies.
2783		2876
2784	#############################################################################	2877	#############################################################################
2785		2878
2786	package CFClient::UI::Menu;	2879	package CFClient::UI::Menu;
2787		2880
…		…
2837	my ($self, $ev, $x, $y) = @_;	2930	my ($self, $ev, $x, $y) = @_;
2838		2931
2839	# TODO: should use vbox->find_widget or so	2932	# TODO: should use vbox->find_widget or so
2840	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2933	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841	$self->{hover} = $self->{item}{$HOVER};	2934	$self->{hover} = $self->{item}{$HOVER};
		2935
		2936	0
2842	}	2937	}
2843		2938
2844	sub button_up {	2939	sub button_up {
2845	my ($self, $ev, $x, $y) = @_;	2940	my ($self, $ev, $x, $y) = @_;
2846		2941
…		…
2848	undef $GRAB;	2943	undef $GRAB;
2849	$self->hide;	2944	$self->hide;
2850		2945
2851	$self->_emit ("popdown");	2946	$self->_emit ("popdown");
2852	$self->{hover}[1]->() if $self->{hover};	2947	$self->{hover}[1]->() if $self->{hover};
		2948	} else {
		2949	return 0
		2950	}
		2951
		2952	1
		2953	}
		2954
		2955	#############################################################################
		2956
		2957	package CFClient::UI::Multiplexer;
		2958
		2959	our @ISA = CFClient::UI::Container::;
		2960
		2961	sub new {
		2962	my $class = shift;
		2963
		2964	my $self = $class->SUPER::new (
		2965	@_,
		2966	);
		2967
		2968	$self->{current} = $self->{children}[0]
		2969	if @{ $self->{children} };
		2970
		2971	$self
		2972	}
		2973
		2974	sub add {
		2975	my ($self, @widgets) = @_;
		2976
		2977	$self->SUPER::add (@widgets);
		2978
		2979	$self->{current} = $self->{children}[0]
		2980	if @{ $self->{children} };
		2981	}
		2982
		2983	sub set_current_page {
		2984	my ($self, $page_or_widget) = @_;
		2985
		2986	my $widget = ref $page_or_widget
		2987	? $page_or_widget
		2988	: $self->{children}[$page_or_widget];
		2989
		2990	$self->{current} = $widget;
		2991	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2992
		2993	$self->_emit (page_changed => $self->{current});
		2994
		2995	$self->realloc;
		2996	}
		2997
		2998	sub visible_children {
		2999	$_[0]{current}
		3000	}
		3001
		3002	sub size_request {
		3003	my ($self) = @_;
		3004
		3005	$self->{current}->size_request
		3006	}
		3007
		3008	sub size_allocate {
		3009	my ($self, $w, $h) = @_;
		3010
		3011	$self->{current}->configure (0, 0, $w, $h);
		3012	}
		3013
		3014	sub _draw {
		3015	my ($self) = @_;
		3016
		3017	$self->{current}->draw;
		3018	}
		3019
		3020	#############################################################################
		3021
		3022	package CFClient::UI::Notebook;
		3023
		3024	our @ISA = CFClient::UI::VBox::;
		3025
		3026	sub new {
		3027	my $class = shift;
		3028
		3029	my $self = $class->SUPER::new (
		3030	buttonbar => (new CFClient::UI::Buttonbar),
		3031	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3032	# filter => # will be put between multiplexer and $self
		3033	@_,
		3034	);
2853	}	3035
		3036	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3037	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3038
		3039	$self
		3040	}
		3041
		3042	sub add {
		3043	my ($self, $title, $widget, $tooltip) = @_;
		3044
		3045	Scalar::Util::weaken $self;
		3046
		3047	$self->{buttonbar}->add (new CFClient::UI::Button
		3048	markup => $title,
		3049	tooltip => $tooltip,
		3050	on_activate => sub { $self->set_current_page ($widget) },
		3051	);
		3052
		3053	$self->{multiplexer}->add ($widget);
		3054	}
		3055
		3056	sub set_current_page {
		3057	my ($self, $page) = @_;
		3058
		3059	$self->{multiplexer}->set_current_page ($page);
		3060	$self->_emit (page_changed => $self->{multiplexer}{current});
2854	}	3061	}
2855		3062
2856	#############################################################################	3063	#############################################################################
2857		3064
2858	package CFClient::UI::Statusbox;	3065	package CFClient::UI::Statusbox;
…		…
2971		3178
2972	sub new {	3179	sub new {
2973	my $class = shift;	3180	my $class = shift;
2974		3181
2975	my $self = $class->SUPER::new (	3182	my $self = $class->SUPER::new (
2976	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3183	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977	@_,	3184	@_,
2978	);	3185	);
2979		3186
2980	$self	3187	$self
2981	}	3188	}
2982		3189
2983	sub set_items {	3190	sub set_items {
2984	my ($self, $items) = @_;	3191	my ($self, $items) = @_;
2985		3192
2986	$self->{scrolled}->clear;	3193	$self->{child}->clear;
2987	return unless $items;	3194	return unless $items;
2988		3195
2989	my @items = sort {	3196	my @items = sort {
2990	($a->{type} <=> $b->{type})	3197	($a->{type} <=> $b->{type})
2991	or ($a->{name} cmp $b->{name})	3198	or ($a->{name} cmp $b->{name})
…		…
2995		3202
2996	my $row = 0;	3203	my $row = 0;
2997	for my $item (@items) {	3204	for my $item (@items) {
2998	CFClient::Item::update_widgets $item;	3205	CFClient::Item::update_widgets $item;
2999		3206
3000	$self->{scrolled}->add (0, $row, $item->{face_widget});	3207	$self->{child}->add (0, $row, $item->{face_widget});
3001	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3208	$self->{child}->add (1, $row, $item->{desc_widget});
3002	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3209	$self->{child}->add (2, $row, $item->{weight_widget});
3003		3210
3004	$row++;	3211	$row++;
3005	}	3212	}
3006	}	3213	}
3007		3214
…		…
3105	$rec = $::CONN->stop_record if $::CONN;	3312	$rec = $::CONN->stop_record if $::CONN;
3106	return unless ref $rec eq 'ARRAY';	3313	return unless ref $rec eq 'ARRAY';
3107	$self->set_command_list ($rec);	3314	$self->set_command_list ($rec);
3108	}	3315	}
3109		3316
3110	# if $commit is true, the binding will be set after the user entered a key combo	3317
		3318	sub ask_for_bind_and_commit {
		3319	my ($self) = @_;
		3320	$self->ask_for_bind (1);
		3321	}
		3322
3111	sub ask_for_bind {	3323	sub ask_for_bind {
3112	my ($self, $commit) = @_;	3324	my ($self, $commit) = @_;
3113		3325
3114	CFClient::Binder::open_binding_dialog (sub {	3326	CFClient::Binder::open_binding_dialog (sub {
3115	my ($mod, $sym) = @_;	3327	my ($mod, $sym) = @_;
…		…
3199		3411
3200	#############################################################################	3412	#############################################################################
3201		3413
3202	package CFClient::UI::SpellList;	3414	package CFClient::UI::SpellList;
3203		3415
3204	our @ISA = CFClient::UI::FancyFrame::;	3416	our @ISA = CFClient::UI::Table::;
3205		3417
3206	sub new {	3418	sub new {
3207	my $class = shift;	3419	my $class = shift;
3208		3420
3209	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3421	my $self = $class->SUPER::new (
3210		3422	binding => [],
3211	$self->add (new CFClient::UI::ScrolledWindow	3423	commands => [],
3212	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3424	@_,
3213		3425	)
3214	$self;
3215	}	3426	}
3216		3427
3217	# XXX: Do sorting? Argl...	3428	# XXX: Do sorting? Argl...
3218	sub add_spell {	3429	sub add_spell {
3219	my ($self, $spell) = @_;	3430	my ($self, $spell) = @_;
3220	$self->{spells}->{$spell->{name}} = $spell;	3431	$self->{spells}->{$spell->{name}} = $spell;
3221		3432
3222	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3433	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223	face => $spell->{face},	3434	face => $spell->{face},
3224	can_hover => 1,	3435	can_hover => 1,
3225	can_events => 1,	3436	can_events => 1,
3226	tooltip => $spell->{message});	3437	tooltip => $spell->{message});
3227		3438
3228	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3439	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229	text => $spell->{name},	3440	text => $spell->{name},
3230	can_hover => 1,	3441	can_hover => 1,
3231	can_events => 1,	3442	can_events => 1,
3232	tooltip => $spell->{message},	3443	tooltip => $spell->{message},
3233	expand => 1);	3444	expand => 1);
3234		3445
3235	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3446	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3447	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3448	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3238	expand => 1);	3449	expand => 1);
3239		3450
3240	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3451	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241	text => "bind to key",	3452	text => "bind to key",
3242	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3453	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243	}	3454	}
3244		3455
3245	sub rebuild_spell_list {	3456	sub rebuild_spell_list {
…		…
3372	$_->()	3583	$_->()
3373	for values %{delete $self->{refresh_hook}};	3584	for values %{delete $self->{refresh_hook}};
3374	}	3585	}
3375		3586
3376	if ($self->{realloc}) {	3587	if ($self->{realloc}) {
		3588	my %queue;
3377	my @queue;	3589	my @queue;
		3590	my $widget;
3378		3591
		3592	outer:
3379	while () {	3593	while () {
3380	if ($self->{realloc}) {	3594	if (my $realloc = delete $self->{realloc}) {
3381	#TODO use array-of-depth approach	3595	for $widget (values %$realloc) {
		3596	$widget->{visible} or next; # do not resize invisible widgets
3382		3597
3383	use sort 'stable';	3598	$queue{$widget+0}++ and next; # duplicates are common
3384		3599
3385	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	push @{ $queue[$widget->{visible}] }, $widget;
3386	@queue, values %{delete $self->{realloc}};	3601	}
3387	}	3602	}
3388		3603
		3604	while () {
		3605	@queue or last outer;
		3606
3389	my $widget = pop @queue \|\| last;	3607	$widget = pop @{ $queue[-1] \|\| [] }
		3608	and last;
		3609
		3610	pop @queue;
		3611	}
3390		3612
3391	$widget->{visible} or last; # do not resize invisible widgets	3613	delete $queue{$widget+0};
3392		3614
3393	my ($w, $h) = $widget->size_request;	3615	my ($w, $h) = $widget->size_request;
3394		3616
3395	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3617	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3618	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
…		…
3404	$widget->{req_h} = $h;	3626	$widget->{req_h} = $h;
3405		3627
3406	$self->{size_alloc}{$widget+0} = $widget;	3628	$self->{size_alloc}{$widget+0} = $widget;
3407		3629
3408	if (my $parent = $widget->{parent}) {	3630	if (my $parent = $widget->{parent}) {
3409	$self->{realloc}{$parent+0} = $parent;	3631	$self->{realloc}{$parent+0} = $parent
3410	#unshift @queue, $parent;	3632	unless $queue{$parent+0};
		3633
3411	$parent->{force_size_alloc} = 1;	3634	$parent->{force_size_alloc} = 1;
3412	$self->{size_alloc}{$parent+0} = $parent;	3635	$self->{size_alloc}{$parent+0} = $parent;
3413	}	3636	}
3414	}	3637	}
3415		3638
…		…
3431		3654
3432	$w = int $w + 0.5;	3655	$w = int $w + 0.5;
3433	$h = int $h + 0.5;	3656	$h = int $h + 0.5;
3434		3657
3435	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	3658	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3659	$widget->{old_w} = $widget->{w};
		3660	$widget->{old_h} = $widget->{h};
		3661
3436	$widget->{w} = $w;	3662	$widget->{w} = $w;
3437	$widget->{h} = $h;	3663	$widget->{h} = $h;
3438		3664
3439	$widget->emit (size_allocate => $w, $h);	3665	$widget->emit (size_allocate => $w, $h);
3440	}	3666	}
…		…
3455	glLoadIdentity;	3681	glLoadIdentity;
3456	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3682	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457	glMatrixMode GL_MODELVIEW;	3683	glMatrixMode GL_MODELVIEW;
3458	glLoadIdentity;	3684	glLoadIdentity;
3459		3685
		3686	{
		3687	package CFClient::UI::Base;
		3688
		3689	($draw_x, $draw_y, $draw_w, $draw_h) =
		3690	(0, 0, $self->{w}, $self->{h});
		3691	}
		3692
3460	$self->_draw;	3693	$self->_draw;
3461	}	3694	}
3462		3695
3463	#############################################################################	3696	#############################################################################
3464		3697

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.279 by root, Mon Jun 5 00:17:47 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.279 by root, Mon Jun 5 00:17:47 2006 UTC