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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178		178
179	$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.]+$/;
180	$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};
181	$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};
182	$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.]+$/;
183	$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};
184	$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};
185		185
186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188		188
189	}	189	}
190	}	190	}
191		191
192	reconfigure_widgets;	192	reconfigure_widgets;
…		…
371	sub size_allocate {	371	sub size_allocate {
372	# nothing to be done	372	# nothing to be done
373	}	373	}
374		374
375	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
376	}	381	}
377		382
378	sub set_max_size {	383	sub set_max_size {
379	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
380		385
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	delete $self->{max_w}; $self->{max_w} = $w if $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $h;
		388
		389	$self->realloc;
383	}	390	}
384		391
385	sub set_tooltip {	392	sub set_tooltip {
386	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
387		394
…		…
439		446
440	$::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
441	unless $FOCUS;	448	unless $FOCUS;
442	}	449	}
443		450
444	sub mouse_motion { }	451	sub mouse_motion { 0 }
445	sub button_up { }	452	sub button_up { 0 }
446	sub key_down { }	453	sub key_down { 0 }
447	sub key_up { }	454	sub key_up { 0 }
448		455
449	sub button_down {	456	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
451		458
452	$self->focus_in;	459	$self->focus_in;
		460
		461	0
453	}	462	}
454		463
455	sub find_widget {	464	sub find_widget {
456	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
457		466
…		…
529	sub draw {	538	sub draw {
530	my ($self) = @_;	539	my ($self) = @_;
531		540
532	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
533		542
		543	# update screen rectangle
534	local $draw_x = $draw_x + $self->{x};	544	local $draw_x = $draw_x + $self->{x};
535	local $draw_y = $draw_y + $self->{y};	545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
536		548
537	return if $draw_x + $self->{w} < 0;	549	# skip widgets that are entirely outside the drawing area
538	return if $draw_x >= $draw_w;	550	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
539	return if $draw_y + $self->{h} < 0;	551	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
540	return if $draw_y >= $draw_h;
541		552
542	glPushMatrix;	553	glPushMatrix;
543	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
544	$self->_draw;
545	glPopMatrix;
546		555
547	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
548	my ($x, $y) = @$self{qw(x y)};
549
550	glColor 1, 0.8, 0.5, 0.2;	557	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
551	glEnable GL_BLEND;	558	glEnable GL_BLEND;
552	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553	glBegin GL_QUADS;	560	glBegin GL_QUADS;
554	glVertex $x , $y;	561	glVertex 0 , 0;
555	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
556	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
557	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
558	glEnd;	565	glEnd;
559	glDisable GL_BLEND;	566	glDisable GL_BLEND;
560	}	567	}
561		568
562	if ($ENV{CFPLUS_DEBUG} & 1) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
563	glPushMatrix;	570	glPushMatrix;
564	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
566	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
567	glVertex 0 , 0;	574	glVertex 0 , 0;
568	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
571	glEnd;	578	glEnd;
572	glPopMatrix;	579	glPopMatrix;
573	#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;
574	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
575	}	585	}
576		586
577	sub _draw {	587	sub _draw {
578	my ($self) = @_;	588	my ($self) = @_;
579		589
…		…
617		627
618	if ($color && (@$color < 4 \|\| $color->[3])) {	628	if ($color && (@$color < 4 \|\| $color->[3])) {
619	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
620		630
621	glEnable GL_BLEND;	631	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glColor @$color;	633	glColor_premultiply @$color;
624		634
625	glBegin GL_QUADS;	635	glBegin GL_QUADS;
626	glVertex 0 , 0;	636	glVertex 0 , 0;
627	glVertex 0 , $h;	637	glVertex 0 , $h;
628	glVertex $w, $h;	638	glVertex $w, $h;
…		…
659	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
660		670
661	sub new {	671	sub new {
662	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
663		673
664	my $children = delete $arg{children} \|\| [];	674	my $children = delete $arg{children};
665		675
666	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
667	children => [],	677	children => [],
668	can_events => 0,	678	can_events => 0,
669	%arg,	679	%arg,
670	);	680	);
		681
671	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
672		684
673	$self	685	$self
674	}	686	}
675		687
676	sub add {	688	sub add {
…		…
724	$x -= $self->{x};	736	$x -= $self->{x};
725	$y -= $self->{y};	737	$y -= $self->{y};
726		738
727	my $res;	739	my $res;
728		740
729	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
730	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
731	and return $res;	743	and return $res;
732	}	744	}
733		745
734	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
783	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
784	}	796	}
785		797
786	#############################################################################	798	#############################################################################
787		799
		800	# back-buffered drawing area
		801
788	package CFClient::UI::Window;	802	package CFClient::UI::Window;
789		803
790	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
791		805
792	use CFClient::OpenGL;	806	use CFClient::OpenGL;
…		…
843	my $tex = $self->{texture}	857	my $tex = $self->{texture}
844	or return;	858	or return;
845		859
846	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
849		863
850	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851		865
852	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
853	}	867	}
…		…
944	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
945		959
946	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
947		961
948	sub new {	962	sub new {
949	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
950		966
951	my $self;	967	my $self;
952		968
953	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
954	vertical => 1,	970	vertical => 1,
…		…
959	;	975	;
960		976
961	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
962	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
963	slider => $slider,	979	slider => $slider,
964	@_,	980	%arg,
965	);	981	);
966		982
967	$self->{vp}->add ($self->{scrolled});
968	$self->add ($self->{vp});
969	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
970		985
971	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
972	}	993	}
973		994
974	sub update {	995	sub update {
975	my ($self) = @_;	996	my ($self) = @_;
976		997
…		…
1015		1036
1016	if ($self->{bg}) {	1037	if ($self->{bg}) {
1017	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
1018		1039
1019	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
1020	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
1022		1043
1023	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
1024	glVertex 0 , 0;	1045	glVertex 0 , 0;
1025	glVertex 0 , $h;	1046	glVertex 0 , $h;
1026	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1048	my @border =	1069	my @border =
1049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050	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);
1051		1072
1052	sub new {	1073	sub new {
1053	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1054		1077
1055	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1056	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1057	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1058	border => 0.6,	1081	border => 0.6,
1059	can_events => 1,	1082	can_events => 1,
1060	min_w => 16,	1083	min_w => 16,
1061	min_h => 16,	1084	min_h => 16,
1062	@_	1085	%arg,
1063	);	1086	);
1064		1087
1065	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1066	align => 0,	1089	align => 0,
1067	valign => 1,	1090	valign => 1,
1068	text => $self->{title},	1091	text => $title,
1069	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1070		1094
1071	$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};
1072	}	1103	}
1073		1104
1074	sub border {	1105	sub border {
1075	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1076	}	1107	}
1077		1108
1078	sub size_request {	1109	sub size_request {
1079	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1080		1114
1081	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1082		1116
1083	(	1117	(
1084	$w + $self->border * 2,	1118	$w + $self->border * 2,
…		…
1087	}	1121	}
1088		1122
1089	sub size_allocate {	1123	sub size_allocate {
1090	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
1091		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
1092	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1093	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1094		1136
1095	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096	if $self->{title};
1097
1098	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1099	}	1138	}
1100		1139
1101	sub button_down {	1140	sub button_down {
1102	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1103		1142
…		…
1122	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1123		1162
1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127	$self->realloc;	1167	$self->realloc;
1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	};	1168	};
1130		1169
1131	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1136	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1137		1176
1138	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1139		1178
1140	$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});
1141	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1142	}	1187	1
1143	}	1188	}
1144		1189
1145	sub button_up {	1190	sub button_up {
1146	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1147		1192
1148	delete $self->{motion};	1193	!!delete $self->{motion}
1149	}	1194	}
1150		1195
1151	sub mouse_motion {	1196	sub mouse_motion {
1152	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1153		1198
1154	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1155	}	1202	}
1156		1203
1157	sub _draw {	1204	sub _draw {
1158	my ($self) = @_;	1205	my ($self) = @_;
1159		1206
		1207	my $child = $self->{children}[0];
		1208
1160	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1161	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1162		1211
1163	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165		1214
1166	my $border = $self->border;	1215	my $border = $self->border;
…		…
1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182	}	1231	}
1183		1232
1184	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1185		1234
1186	$self->{title}->draw if $self->{title};
1187
1188	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1189	}	1241	}
1190		1242
1191	#############################################################################	1243	#############################################################################
1192		1244
1193	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1541	}	1593	}
1542		1594
1543	sub size_allocate {	1595	sub size_allocate {
1544	my ($self, $w, $h) = @_;	1596	my ($self, $w, $h) = @_;
1545		1597
		1598	delete $self->{ox};
		1599
1546	delete $self->{texture}	1600	delete $self->{texture}
1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1548	}	1602	}
1549		1603
1550	sub set_fontsize {	1604	sub set_fontsize {
…		…
1567	$self->{layout}->set_width ($self->{w});	1621	$self->{layout}->set_width ($self->{w});
1568	$self->{layout}->set_ellipsise ($self->{ellipsise});	1622	$self->{layout}->set_ellipsise ($self->{ellipsise});
1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571		1625
1572	my $tex = new_from_layout CFClient::Texture $self->{layout};	1626	new_from_layout CFClient::Texture $self->{layout}
		1627	};
1573		1628
		1629	unless (exists $self->{ox}) {
1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576	: ($self->{w} - $tex->{w}) * 0.5);	1632	: ($self->{w} - $tex->{w}) * 0.5);
1577		1633
1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580	: ($self->{h} - $tex->{h}) * 0.5);	1636	: ($self->{h} - $tex->{h}) * 0.5);
1581
1582	$tex
1583	};	1637	};
1584		1638
1585	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1586	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587		1641
		1642	glColor_premultiply @{$self->{fg}}
1588	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1589	glColor @{$self->{fg}};	1644
1590	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591	} else {
1592	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593	}
1594		1646
1595	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1596	}	1648	}
1597		1649
1598	#############################################################################	1650	#############################################################################
…		…
1625		1677
1626	delete $self->{cur_h};	1678	delete $self->{cur_h};
1627		1679
1628	return if $self->{text} eq $text;	1680	return if $self->{text} eq $text;
1629		1681
1630	delete $self->{texture};
1631
1632	$self->{last_activity} = $::NOW;	1682	$self->{last_activity} = $::NOW;
1633	$self->{text} = $text;	1683	$self->{text} = $text;
1634		1684
1635	$text =~ s/./*/g if $self->{hidden};	1685	$text =~ s/./*/g if $self->{hidden};
1636	$self->{layout}->set_text ("$text ");	1686	$self->{layout}->set_text ("$text ");
1637		1687
1638	$self->_emit (changed => $self->{text});	1688	$self->_emit (changed => $self->{text});
		1689	$self->update;
1639	}	1690	}
1640		1691
1641	sub set_text {	1692	sub set_text {
1642	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1643		1694
…		…
1682	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1683	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1684	$self->_emit ('escape');	1735	$self->_emit ('escape');
1685	} elsif ($uni) {	1736	} elsif ($uni) {
1686	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1687	}	1740	}
1688		1741
1689	$self->_set_text ($text);	1742	$self->_set_text ($text);
1690		1743
1691	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1692	}	1747	}
1693		1748
1694	sub focus_in {	1749	sub focus_in {
1695	my ($self) = @_;	1750	my ($self) = @_;
1696		1751
…		…
1711	utf8::encode $text;	1766	utf8::encode $text;
1712	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1713		1768
1714	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1715	$self->update;	1770	$self->update;
		1771
		1772	1
1716	}	1773	}
1717		1774
1718	sub mouse_motion {	1775	sub mouse_motion {
1719	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1720	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1721	}	1780	}
1722		1781
1723	sub _draw {	1782	sub _draw {
1724	my ($self) = @_;	1783	my ($self) = @_;
1725		1784
1726	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1727		1786
1728	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1729	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1730	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1731	} else {	1790	} else {
1732	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1733	}	1792	}
1734		1793
1735	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1736	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1738	glVertex 0 , 0;	1797	glVertex 0 , 0;
1739	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1740	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1741	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1802	} else {	1861	} else {
1803	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1804	}	1863	}
1805		1864
1806	} else {	1865	} else {
1807	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1808	}	1869	1
1809
1810	}	1870	}
1811		1871
1812	#############################################################################	1872	#############################################################################
1813		1873
1814	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1843	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1844		1904
1845	$self->emit ("activate")	1905	$self->emit ("activate")
1846	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1847	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1848	}	1910	}
1849		1911
1850	sub _draw {	1912	sub _draw {
1851	my ($self) = @_;	1913	my ($self) = @_;
1852		1914
1853	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855	if ($GRAB == $self) {
1856	$self->{fg} = $self->{active_fg};
1857	}
1858		1916
1859	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1862		1920
…		…
1906		1964
1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909	$self->{state} = !$self->{state};	1967	$self->{state} = !$self->{state};
1910	$self->_emit (changed => $self->{state});	1968	$self->_emit (changed => $self->{state});
		1969	} else {
		1970	return 0
		1971	}
		1972
1911	}	1973	1
1912	}	1974	}
1913		1975
1914	sub _draw {	1976	sub _draw {
1915	my ($self) = @_;	1977	my ($self) = @_;
1916		1978
…		…
2083		2145
2084	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2085	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2086		2148
2087	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2088	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2150	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2151	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2090	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091		2154
2092	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2093	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2254		2317
2255	$self->SUPER::button_down ($ev, $x, $y);	2318	$self->SUPER::button_down ($ev, $x, $y);
2256		2319
2257	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258		2321
2259	$self->mouse_motion ($ev, $x, $y);	2322	$self->mouse_motion ($ev, $x, $y)
2260	}	2323	}
2261		2324
2262	sub mouse_motion {	2325	sub mouse_motion {
2263	my ($self, $ev, $x, $y) = @_;	2326	my ($self, $ev, $x, $y) = @_;
2264		2327
…		…
2268	my (undef, $lo, $hi, $page) = @{$self->{range}};	2331	my (undef, $lo, $hi, $page) = @{$self->{range}};
2269		2332
2270	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2333	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271		2334
2272	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2335	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2336	} else {
		2337	return 0;
		2338	}
		2339
2273	}	2340	1
2274	}	2341	}
2275		2342
2276	sub update {	2343	sub update {
2277	my ($self) = @_;	2344	my ($self) = @_;
2278		2345
2279	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2346	delete $self->{knob_w};
		2347	$self->SUPER::update;
		2348	}
		2349
		2350	sub _draw {
		2351	my ($self) = @_;
		2352
		2353	unless ($self->{knob_w}) {
2280	$self->set_value ($self->{range}[0]);	2354	$self->set_value ($self->{range}[0]);
2281		2355
2282	my ($value, $lo, $hi, $page) = @{$self->{range}};	2356	my ($value, $lo, $hi, $page) = @{$self->{range}};
2283	my $range = ($hi - $page - $lo) \|\| 1e-100;	2357	my $range = ($hi - $page - $lo) \|\| 1e-100;
2284		2358
…		…
2290	$value = ($value - $lo) / $range;	2364	$value = ($value - $lo) / $range;
2291	$value = $value * $self->{scale} + $self->{offset};	2365	$value = $value * $self->{scale} + $self->{offset};
2292		2366
2293	$self->{knob_x} = $value - $knob_w * 0.5;	2367	$self->{knob_x} = $value - $knob_w * 0.5;
2294	$self->{knob_w} = $knob_w;	2368	$self->{knob_w} = $knob_w;
2295	});	2369	}
2296
2297	$self->SUPER::update;
2298	}
2299
2300	sub _draw {
2301	my ($self) = @_;
2302		2370
2303	$self->SUPER::_draw ();	2371	$self->SUPER::_draw ();
2304		2372
2305	glScale $self->{w}, $self->{h};	2373	glScale $self->{w}, $self->{h};
2306		2374
…		…
2500		2568
2501	delete $self->{texture};	2569	delete $self->{texture};
2502	}	2570	}
2503		2571
2504	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2505	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2506	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2507		2575
2508	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2509		2577
2510	my $y0 = $top;	2578	my $y0 = $top;
…		…
2545	sub _draw {	2613	sub _draw {
2546	my ($self) = @_;	2614	my ($self) = @_;
2547		2615
2548	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2549	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2551	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2619	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2553		2621
2554	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2555		2623
2556	}	2624	}
…		…
2783	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2784		2852
2785	if ($tex) {	2853	if ($tex) {
2786	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2789	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2791	}	2859	}
2792	}	2860	}
2793		2861
…		…
2797	$self->{timer}->cancel	2865	$self->{timer}->cancel
2798	if $self->{timer};	2866	if $self->{timer};
2799		2867
2800	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2801	}	2869	}
		2870
		2871	#############################################################################
		2872
		2873	package CFClient::UI::Buttonbar;
		2874
		2875	our @ISA = CFClient::UI::HBox::;
		2876
		2877	# TODO: should actualyl wrap buttons and other goodies.
2802		2878
2803	#############################################################################	2879	#############################################################################
2804		2880
2805	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2806		2882
…		…
2856	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2857		2933
2858	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2859	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2861	}	2939	}
2862		2940
2863	sub button_up {	2941	sub button_up {
2864	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2865		2943
…		…
2867	undef $GRAB;	2945	undef $GRAB;
2868	$self->hide;	2946	$self->hide;
2869		2947
2870	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2871	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
2872	}	2954	1
2873	}	2955	}
2874		2956
2875	#############################################################################	2957	#############################################################################
2876		2958
2877	package CFClient::UI::Statusbox;	2959	package CFClient::UI::Multiplexer;
2878		2960
2879	our @ISA = CFClient::UI::VBox::;	2961	our @ISA = CFClient::UI::Container::;
2880		2962
2881	sub new {	2963	sub new {
2882	my $class = shift;	2964	my $class = shift;
2883		2965
2884	$class->SUPER::new (	2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
		3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
		3063	}
		3064
		3065	#############################################################################
		3066
		3067	package CFClient::UI::Statusbox;
		3068
		3069	our @ISA = CFClient::UI::VBox::;
		3070
		3071	sub new {
		3072	my $class = shift;
		3073
		3074	my $self = $class->SUPER::new (
2885	fontsize => 0.8,	3075	fontsize => 0.8,
2886	@_,	3076	@_,
2887	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
		3082	$this->reorder;
		3083	$this->update;
		3084	});
		3085
		3086	$self
2888	}	3087	}
2889		3088
2890	sub reorder {	3089	sub reorder {
2891	my ($self) = @_;	3090	my ($self) = @_;
2892	my $NOW = time;	3091	my $NOW = Time::HiRes::time;
2893		3092
2894	while (my ($k, $v) = each %{ $self->{item} }) {	3093	while (my ($k, $v) = each %{ $self->{item} }) {
2895	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896	}	3095	}
2897		3096
…		…
2899		3098
2900	my @items = sort {	3099	my @items = sort {
2901	$a->{pri} <=> $b->{pri}	3100	$a->{pri} <=> $b->{pri}
2902	or $b->{id} <=> $a->{id}	3101	or $b->{id} <=> $a->{id}
2903	} values %{ $self->{item} };	3102	} values %{ $self->{item} };
		3103
		3104	$self->{timer}->interval (1);
2904		3105
2905	my $count = 10 + 1;	3106	my $count = 10 + 1;
2906	for my $item (@items) {	3107	for my $item (@items) {
2907	last unless --$count;	3108	last unless --$count;
2908		3109
…		…
2923	tooltip_font => $::FONT_PROP,	3124	tooltip_font => $::FONT_PROP,
2924	tooltip_width => 0.67,	3125	tooltip_width => 0.67,
2925	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3126	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2926	max_w => $::WIDTH * 0.44,	3127	max_w => $::WIDTH * 0.44,
2927	fg => $item->{fg},	3128	fg => $item->{fg},
		3129	orig_alpha => $item->{fg}[3] \|\| 1,
2928	can_events => 1,	3130	can_events => 1,
2929	can_hover => 1	3131	can_hover => 1
2930	};	3132	};
		3133
		3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
		3136	if ($diff < 1) {
		3137	$item->{label}{max_h} = $item->{label}{req_h} * $diff;
		3138	$item->{label}->realloc;
		3139	}
		3140	$item->{label}->update;
		3141	$self->{timer}->interval (1/30);
		3142	}
2931	}	3143	}
2932		3144
2933	$self->clear;	3145	$self->clear;
2934	$self->SUPER::add (reverse @widgets);	3146	$self->SUPER::add (reverse @widgets);
2935	}	3147	}
…		…
2940	$text =~ s/^\s+//;	3152	$text =~ s/^\s+//;
2941	$text =~ s/\s+$//;	3153	$text =~ s/\s+$//;
2942		3154
2943	return unless $text;	3155	return unless $text;
2944		3156
2945	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3157	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
2946		3158
2947	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3159	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948		3160
2949	if (my $item = $self->{item}{$group}) {	3161	if (my $item = $self->{item}{$group}) {
2950	if ($item->{text} eq $text) {	3162	if ($item->{text} eq $text) {
…		…
2980		3192
2981	$self->reorder;	3193	$self->reorder;
2982	$self->SUPER::reconfigure;	3194	$self->SUPER::reconfigure;
2983	}	3195	}
2984		3196
		3197	sub DESTROY {
		3198	my ($self) = @_;
		3199
		3200	$self->{timer}->cancel;
		3201
		3202	$self->SUPER::DESTROY;
		3203	}
		3204
2985	#############################################################################	3205	#############################################################################
2986		3206
2987	package CFClient::UI::Inventory;	3207	package CFClient::UI::Inventory;
2988		3208
2989	our @ISA = CFClient::UI::ScrolledWindow::;	3209	our @ISA = CFClient::UI::ScrolledWindow::;
2990		3210
2991	sub new {	3211	sub new {
2992	my $class = shift;	3212	my $class = shift;
2993		3213
2994	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3215	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996	@_,	3216	@_,
2997	);	3217	);
2998		3218
2999	$self	3219	$self
3000	}	3220	}
3001		3221
3002	sub set_items {	3222	sub set_items {
3003	my ($self, $items) = @_;	3223	my ($self, $items) = @_;
3004		3224
3005	$self->{scrolled}->clear;	3225	$self->{child}->clear;
3006	return unless $items;	3226	return unless $items;
3007		3227
3008	my @items = sort {	3228	my @items = sort {
3009	($a->{type} <=> $b->{type})	3229	($a->{type} <=> $b->{type})
3010	or ($a->{name} cmp $b->{name})	3230	or ($a->{name} cmp $b->{name})
…		…
3014		3234
3015	my $row = 0;	3235	my $row = 0;
3016	for my $item (@items) {	3236	for my $item (@items) {
3017	CFClient::Item::update_widgets $item;	3237	CFClient::Item::update_widgets $item;
3018		3238
3019	$self->{scrolled}->add (0, $row, $item->{face_widget});	3239	$self->{child}->add (0, $row, $item->{face_widget});
3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3240	$self->{child}->add (1, $row, $item->{desc_widget});
3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3241	$self->{child}->add (2, $row, $item->{weight_widget});
3022		3242
3023	$row++;	3243	$row++;
3024	}	3244	}
3025	}	3245	}
3026		3246
…		…
3124	$rec = $::CONN->stop_record if $::CONN;	3344	$rec = $::CONN->stop_record if $::CONN;
3125	return unless ref $rec eq 'ARRAY';	3345	return unless ref $rec eq 'ARRAY';
3126	$self->set_command_list ($rec);	3346	$self->set_command_list ($rec);
3127	}	3347	}
3128		3348
3129	# if $commit is true, the binding will be set after the user entered a key combo	3349
		3350	sub ask_for_bind_and_commit {
		3351	my ($self) = @_;
		3352	$self->ask_for_bind (1);
		3353	}
		3354
3130	sub ask_for_bind {	3355	sub ask_for_bind {
3131	my ($self, $commit) = @_;	3356	my ($self, $commit) = @_;
3132		3357
3133	CFClient::Binder::open_binding_dialog (sub {	3358	CFClient::Binder::open_binding_dialog (sub {
3134	my ($mod, $sym) = @_;	3359	my ($mod, $sym) = @_;
…		…
3218		3443
3219	#############################################################################	3444	#############################################################################
3220		3445
3221	package CFClient::UI::SpellList;	3446	package CFClient::UI::SpellList;
3222		3447
3223	our @ISA = CFClient::UI::FancyFrame::;	3448	our @ISA = CFClient::UI::Table::;
3224		3449
3225	sub new {	3450	sub new {
3226	my $class = shift;	3451	my $class = shift;
3227		3452
3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3453	my $self = $class->SUPER::new (
3229		3454	binding => [],
3230	$self->add (new CFClient::UI::ScrolledWindow	3455	commands => [],
3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3456	@_,
3232		3457	)
3233	$self;
3234	}	3458	}
3235		3459
3236	# XXX: Do sorting? Argl...	3460	# XXX: Do sorting? Argl...
3237	sub add_spell {	3461	sub add_spell {
3238	my ($self, $spell) = @_;	3462	my ($self, $spell) = @_;
3239	$self->{spells}->{$spell->{name}} = $spell;	3463	$self->{spells}->{$spell->{name}} = $spell;
3240		3464
3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3465	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242	face => $spell->{face},	3466	face => $spell->{face},
3243	can_hover => 1,	3467	can_hover => 1,
3244	can_events => 1,	3468	can_events => 1,
3245	tooltip => $spell->{message});	3469	tooltip => $spell->{message});
3246		3470
3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3471	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248	text => $spell->{name},	3472	text => $spell->{name},
3249	can_hover => 1,	3473	can_hover => 1,
3250	can_events => 1,	3474	can_events => 1,
3251	tooltip => $spell->{message},	3475	tooltip => $spell->{message},
3252	expand => 1);	3476	expand => 1);
3253		3477
3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3478	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3479	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3480	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3257	expand => 1);	3481	expand => 1);
3258		3482
3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3483	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260	text => "bind to key",	3484	text => "bind to key",
3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3485	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262	}	3486	}
3263		3487
3264	sub rebuild_spell_list {	3488	sub rebuild_spell_list {
…		…
3276	#############################################################################	3500	#############################################################################
3277		3501
3278	package CFClient::UI::Root;	3502	package CFClient::UI::Root;
3279		3503
3280	our @ISA = CFClient::UI::Container::;	3504	our @ISA = CFClient::UI::Container::;
		3505
		3506	use List::Util qw(min max);
3281		3507
3282	use CFClient::OpenGL;	3508	use CFClient::OpenGL;
3283		3509
3284	sub new {	3510	sub new {
3285	my $class = shift;	3511	my $class = shift;
…		…
3420		3646
3421	delete $queue{$widget+0};	3647	delete $queue{$widget+0};
3422		3648
3423	my ($w, $h) = $widget->size_request;	3649	my ($w, $h) = $widget->size_request;
3424		3650
3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3651	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3652	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3653
		3654	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3655	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427		3656
3428	$w = $widget->{force_w} if exists $widget->{force_w};	3657	$w = $widget->{force_w} if exists $widget->{force_w};
3429	$h = $widget->{force_h} if exists $widget->{force_h};	3658	$h = $widget->{force_h} if exists $widget->{force_h};
3430		3659
3431	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3660	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC vs. Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC