ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
167	sub rescale_widgets {	171	sub rescale_widgets {
168	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
169		173
170	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		178
175	$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.]+$/;
176	$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};
177	$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};
178	$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.]+$/;
179	$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};
180	$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};
181		185
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
364	}	373	}
365		374
366	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
367	}	381	}
368		382
369	sub set_max_size {	383	sub set_max_size {
370	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
371		385
…		…
430		444
431	$::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
432	unless $FOCUS;	446	unless $FOCUS;
433	}	447	}
434		448
435	sub mouse_motion { }	449	sub mouse_motion { 0 }
436	sub button_up { }	450	sub button_up { 0 }
437	sub key_down { }	451	sub key_down { 0 }
438	sub key_up { }	452	sub key_up { 0 }
439		453
440	sub button_down {	454	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
442		456
443	$self->focus_in;	457	$self->focus_in;
444	}
445		458
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451		461
452	sub find_widget {	462	sub find_widget {
453	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
454		464
455	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
463		473
464	sub set_parent {	474	sub set_parent {
465	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
466		476
467	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
470	}	479	}
471		480
472	sub connect {	481	sub connect {
473	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
494		503
495	sub realloc {	504	sub realloc {
496	my ($self) = @_;	505	my ($self) = @_;
497		506
498	if ($self->{visible}) {	507	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
500		509
501	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	511	$self->{root}->update;
503	} else {	512	} else {
504	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
505	}	515	}
506	}	516	}
507		517
508	sub update {	518	sub update {
509	my ($self) = @_;	519	my ($self) = @_;
…		…
517		527
518	$self->realloc;	528	$self->realloc;
519	$self->update;	529	$self->update;
520	}	530	}
521		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
522	sub draw {	536	sub draw {
523	my ($self) = @_;	537	my ($self) = @_;
524		538
525	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);
526		550
527	glPushMatrix;	551	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	553	$self->_draw;
530	glPopMatrix;	554	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
543	glEnd;	567	glEnd;
544	glDisable GL_BLEND;	568	glDisable GL_BLEND;
545	}	569	}
546		570
547	if ($ENV{CFPLUS_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	572	glPushMatrix;
549	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
644	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
645		669
646	sub new {	670	sub new {
647	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
648		672
649	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
650		674
651	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
652	children => [],	676	children => [],
653	can_events => 0,	677	can_events => 0,
654	%arg,	678	%arg,
655	);	679	);
		680
656	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
657		683
658	$self	684	$self
659	}	685	}
660		686
661	sub add {	687	sub add {
…		…
709	$x -= $self->{x};	735	$x -= $self->{x};
710	$y -= $self->{y};	736	$y -= $self->{y};
711		737
712	my $res;	738	my $res;
713		739
714	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
716	and return $res;	742	and return $res;
717	}	743	}
718		744
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
761	sub size_request {	787	sub size_request {
762	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
763	}	789	}
764		790
765	sub size_allocate {	791	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
767		793
768	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	795	}
770		796
771	#############################################################################	797	#############################################################################
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	815	$self->SUPER::update;
790	}	816	}
791		817
792	sub size_allocate {	818	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	819	my ($self, $w, $h) = @_;
794		820
795	$self->SUPER::size_allocate ($w, $h, $changed);	821	$self->SUPER::size_allocate ($w, $h);
796	$self->update	822	$self->update;
797	if $changed;
798	}	823	}
799		824
800	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
801	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
802	}	829	}
803		830
804	sub render_child {	831	sub render_child {
805	my ($self) = @_;	832	my ($self) = @_;
806		833
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
810		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
811	$self->_render;	845	$self->_render;
812	};	846	};
813	}	847	}
814		848
815	sub _draw {	849	sub _draw {
816	my ($self) = @_;	850	my ($self) = @_;
817		851
818	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
819		853
820	my $tex = $self->{texture}	854	my $tex = $self->{texture}
821	or return;	855	or return;
822		856
823	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
846	}	880	}
847		881
848	sub size_request {	882	sub size_request {
849	my ($self) = @_;	883	my ($self) = @_;
850		884
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		886
853	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
855		889
856	($w, $h)	890	($w, $h)
857	}	891	}
858		892
859	sub size_allocate {	893	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	894	my ($self, $w, $h) = @_;
861		895
		896	my $child = $self->child;
		897
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		900
865	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
866	$self->update;	902	$self->update;
867	}	903	}
868		904
…		…
903	}	939	}
904	}	940	}
905		941
906	sub _render {	942	sub _render {
907	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
908		947
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		949
911	$self->SUPER::_render;	950	$self->SUPER::_render;
912	}	951	}
…		…
952	my $child = $self->{vp}->child;	991	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	993	}
955		994
956	sub size_allocate {	995	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	996	my ($self, $w, $h) = @_;
958		997
959	$self->SUPER::size_allocate ($w, $h, $changed);	998	$self->SUPER::size_allocate ($w, $h);
960		999
961	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1002	}
964		1003
…		…
1020	my @border =	1059	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1062
1024	sub new {	1063	sub new {
1025	my $class = shift;	1064	my ($class, %arg) = @_;
		1065
		1066	my $title = delete $arg{title};
1026		1067
1027	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1071	border => 0.6,
1031	can_events => 1,	1072	can_events => 1,
1032	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
1033	);	1076	);
1034		1077
1035	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1079	align => 0,
1037	valign => 1,	1080	valign => 1,
1038	text => $self->{title},	1081	text => $title,
1039	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1040		1084
1041	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1093	}
1043		1094
1044	sub border {	1095	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1046	}	1097	}
1047		1098
1048	sub size_request {	1099	sub size_request {
1049	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1050		1104
1051	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1052		1106
1053	(	1107	(
1054	$w + $self->border * 2,	1108	$w + $self->border * 2,
1055	$h + $self->border * 2,	1109	$h + $self->border * 2,
1056	)	1110	)
1057	}	1111	}
1058		1112
1059	sub size_allocate {	1113	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1114	my ($self, $w, $h) = @_;
1061		1115
1062	return unless $changed;	1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
1063		1121
		1122	my $border = $self->border;
		1123
1064	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1066		1126
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1071	}	1128	}
1072		1129
1073	sub button_down {	1130	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1075		1132
…		…
1109		1166
1110	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1111		1168
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1113	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1114	}	1175	1
1115	}	1176	}
1116		1177
1117	sub button_up {	1178	sub button_up {
1118	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1119		1180
1120	delete $self->{motion};	1181	!!delete $self->{motion}
1121	}	1182	}
1122		1183
1123	sub mouse_motion {	1184	sub mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1125		1186
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1127	}	1190	}
1128		1191
1129	sub _draw {	1192	sub _draw {
1130	my ($self) = @_;	1193	my ($self) = @_;
1131		1194
		1195	my $child = $self->{children}[0];
		1196
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1199
1135	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1202
1138	my $border = $self->border;	1203	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1219	}
1155		1220
1156	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1157		1222
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1161	}	1229	}
1162		1230
1163	#############################################################################	1231	#############################################################################
1164		1232
1165	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1307	(sum @$hs),
1240	)	1308	)
1241	}	1309	}
1242		1310
1243	sub size_allocate {	1311	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1312	my ($self, $w, $h) = @_;
1245		1313
1246	my ($ws, $hs) = $self->get_wh;	1314	my ($ws, $hs) = $self->get_wh;
1247		1315
1248	my $req_w = (sum @$ws) || 1;	1316	my $req_w = (sum @$ws) || 1;
1249	my $req_h = (sum @$hs) || 1;	1317	my $req_h = (sum @$hs) || 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1396	)
1329	}	1397	}
1330		1398
1331	sub size_allocate {	1399	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1400	my ($self, $w, $h) = @_;
1333		1401
1334	my $space = $self->{vertical} ? $h : $w;	1402	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1403	my $children = $self->{children};
1336		1404
1337	my @req;	1405	my @req;
…		…
1420	ellipsise => 3, # end	1488	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1422	fontsize => 1,	1490	fontsize => 1,
1423	align => -1,	1491	align => -1,
1424	valign => -1,	1492	valign => -1,
1425	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1426	can_events => 0,	1495	can_events => 0,
1427	%arg	1496	%arg
1428	);	1497	);
1429		1498
1430	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1506		1575
1507	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1509	}	1578	}
1510		1579
1511	(	1580	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1581	}
1516		1582
1517	sub size_allocate {	1583	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1584	my ($self, $w, $h) = @_;
		1585
		1586	delete $self->{ox};
1519		1587
1520	delete $self->{texture}	1588	delete $self->{texture}
1521	if $changed;	1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1590	}
1523		1591
1524	sub set_fontsize {	1592	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1526		1594
…		…
1541	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1613
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1547		1616
		1617	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1551		1621
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1625	};
1558		1626
1559	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1629
…		…
1656	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1726	$self->_emit ('escape');
1659	} elsif ($uni) {	1727	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1661	}	1731	}
1662		1732
1663	$self->_set_text ($text);	1733	$self->_set_text ($text);
1664		1734
1665	$self->realloc;	1735	$self->realloc;
		1736
		1737	1
1666	}	1738	}
1667		1739
1668	sub focus_in {	1740	sub focus_in {
1669	my ($self) = @_;	1741	my ($self) = @_;
1670		1742
…		…
1685	utf8::encode $text;	1757	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1687		1759
1688	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1689	$self->update;	1761	$self->update;
		1762
		1763	1
1690	}	1764	}
1691		1765
1692	sub mouse_motion {	1766	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1695	}	1771	}
1696		1772
1697	sub _draw {	1773	sub _draw {
1698	my ($self) = @_;	1774	my ($self) = @_;
1699		1775
…		…
1776	} else {	1852	} else {
1777	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1778	}	1854	}
1779		1855
1780	} else {	1856	} else {
1781	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1782	}	1860	1
1783
1784	}	1861	}
1785		1862
1786	#############################################################################	1863	#############################################################################
1787		1864
1788	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1797		1874
1798	sub new {	1875	sub new {
1799	my $class = shift;	1876	my $class = shift;
1800		1877
1801	$class->SUPER::new (	1878	$class->SUPER::new (
1802	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1803	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1805	can_hover => 1,	1883	can_hover => 1,
1806	align => 0,	1884	align => 0,
1807	valign => 0,	1885	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1817		1895
1818	$self->emit ("activate")	1896	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1821	}	1901	}
1822		1902
1823	sub _draw {	1903	sub _draw {
1824	my ($self) = @_;	1904	my ($self) = @_;
1825		1905
…		…
1854		1934
1855	sub new {	1935	sub new {
1856	my $class = shift;	1936	my $class = shift;
1857		1937
1858	$class->SUPER::new (	1938	$class->SUPER::new (
1859	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1860	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1945	state => 0,
…		…
1868	}	1949	}
1869		1950
1870	sub size_request {	1951	sub size_request {
1871	my ($self) = @_;	1952	my ($self) = @_;
1872		1953
1873	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1874	}	1955	}
1875		1956
1876	sub button_down {	1957	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1878		1959
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1883	}	1968	1
1884	}	1969	}
1885		1970
1886	sub _draw {	1971	sub _draw {
1887	my ($self) = @_;	1972	my ($self) = @_;
1888		1973
1889	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1890		1975
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1977
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1981
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1983
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1985
…		…
2224		2311
2225	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2226		2313
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2315
2229	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2230	}	2317	}
2231		2318
2232	sub mouse_motion {	2319	sub mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2234		2321
…		…
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2326
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2328
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2243	}	2334	1
2244	}	2335	}
2245		2336
2246	sub update {	2337	sub update {
2247	my ($self) = @_;	2338	my ($self) = @_;
2248		2339
…		…
2374	$self->{fontsize} = $fontsize;	2465	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2466	$self->reflow;
2376	}	2467	}
2377		2468
2378	sub size_allocate {	2469	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2470	my ($self, $w, $h) = @_;
2380		2471
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2472	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2473
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2474	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2475	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2476	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2477
…		…
2611	}	2700	}
2612		2701
2613	sub set_tooltip_from {	2702	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2615		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2616	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2715	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2717	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2719	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2630		2728
2631	($w + 4, $h + 4)	2729	($w + 4, $h + 4)
2632	}	2730	}
2633		2731
2634	sub size_allocate {	2732	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2733	my ($self, $w, $h) = @_;
2636		2734
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2736	}
2641		2737
2642	sub visibility_change {	2738	sub visibility_change {
2643	my ($self, $visible) = @_;	2739	my ($self, $visible) = @_;
2644		2740
…		…
2765	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2766	}	2862	}
2767		2863
2768	#############################################################################	2864	#############################################################################
2769		2865
2770	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2771		2867
2772	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2773		2869
2774	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806	$row++;
2807	}
2808	}
2809		2871
2810	#############################################################################	2872	#############################################################################
2811		2873
2812	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2813		2875
…		…
2854	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2917	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2857		2919
2858	$self->show;	2920	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2922	}
2861		2923
2862	sub mouse_motion {	2924	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2864		2926
2865	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2868	}	2932	}
2869		2933
2870	sub button_up {	2934	sub button_up {
2871	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2872		2936
…		…
2874	undef $GRAB;	2938	undef $GRAB;
2875	$self->hide;	2939	$self->hide;
2876		2940
2877	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2879	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2880	}	3054	}
2881		3055
2882	#############################################################################	3056	#############################################################################
2883		3057
2884	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2989	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2990	}	3164	}
2991		3165
2992	#############################################################################	3166	#############################################################################
2993		3167
		3168	package CFClient::UI::Inventory;
		3169
		3170	our @ISA = CFClient::UI::ScrolledWindow::;
		3171
		3172	sub new {
		3173	my $class = shift;
		3174
		3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
2994	package CFClient::UI::Root;	3464	package CFClient::UI::Root;
2995		3465
2996	our @ISA = CFClient::UI::Container::;	3466	our @ISA = CFClient::UI::Container::;
2997		3467
2998	use CFClient::OpenGL;	3468	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3478	Scalar::Util::weaken ($self->{root} = $self);
3009		3479
3010	$self	3480	$self
3011	}	3481	}
3012		3482
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3483	sub size_request {
3030	my ($self) = @_;	3484	my ($self) = @_;
3031		3485
3032	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
3033	}	3487	}
…		…
3045		3499
3046	int $coord + 0.5	3500	int $coord + 0.5
3047	}	3501	}
3048		3502
3049	sub size_allocate {	3503	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3504	my ($self, $w, $h) = @_;
3051		3505
3052	for my $child ($self->children) {	3506	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3508
3055	$X = $child->{force_x} if exists $child->{force_x};	3509	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3577	$_->()
3124	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3125	}	3579	}
3126		3580
3127	if ($self->{realloc}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3128	my @queue;	3583	my @queue;
		3584	my $widget;
3129		3585
		3586	outer:
3130	while () {	3587	while () {
3131	if ($self->{realloc}) {	3588	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3133		3591
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3136	}	3596	}
3137		3597
		3598	while () {
		3599	@queue or last outer;
		3600
3138	my $widget = pop @queue || last;	3601	$widget = pop @{ $queue[-1] || [] }
		3602	and last;
		3603
		3604	pop @queue;
		3605	}
3139		3606
3140	$widget->{visible} or last; # do not resize invisible widgets	3607	delete $queue{$widget+0};
3141		3608
3142	my ($w, $h) = $widget->size_request;	3609	my ($w, $h) = $widget->size_request;
3143		3610
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;	3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;	3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3613
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3614	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3615	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3154		3621
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3622	$self->{size_alloc}{$widget+0} = $widget;
3156		3623
3157	push @queue, $widget->{parent}	3624	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
		3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3159	}	3634	}
3160	}	3635	}
3161		3636
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3639	values %$size_alloc;
3165		3640
3166	while () {	3641	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3642	my $widget = pop @queue || last;
3168		3643
3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3171		3645
3172	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3174		3648
3175	$w = int $w + 0.5;	3649	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3650	$h = int $h + 0.5;
3177		3651
3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
3179		3655
3180	$widget->{w} = $w;	3656	$widget->{w} = $w;
3181	$widget->{h} = $h;	3657	$widget->{h} = $h;
3182		3658
3183	$widget->emit (size_allocate => $w, $h, $changed);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3184	}	3661	}
3185	}	3662	}
3186		3663
3187	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3188	$_->()	3665	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3190	}	3667	}
		3668
3191		3669
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3195		3673
…		…
3197	glLoadIdentity;	3675	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3678	glLoadIdentity;
3201		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3202	$self->_draw;	3687	$self->_draw;
3203	}	3688	}
3204		3689
3205	#############################################################################	3690	#############################################################################
3206		3691

Diff Legend

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