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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

…		…
40		40
41	$LAYOUT = $layout;	41	$LAYOUT = $layout;
42	}	42	}
43		43
44	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
45	if (!$GRAB) {	47	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;	51	$TOOLTIP->hide;
51		52
52	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
53		54
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		178
178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184		185
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		188
188	}	189	}
189	}	190	}
190		191
191	reconfigure_widgets;	192	reconfigure_widgets;
…		…
219	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
220	}	221	}
221	}	222	}
222		223
223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228		229
229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231		232
232	$self->show if $layout->{show};	233	$self->show if $layout->{show};
…		…
355	$self->{x} = $x;	356	$self->{x} = $x;
356	$self->{y} = $y;	357	$self->{y} = $y;
357	$self->update;	358	$self->update;
358	}	359	}
359		360
360	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361	return unless $self->{visible};	362	return unless $self->{visible};
362		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
364	}	368	}
365	}	369	}
366		370
367	sub size_allocate {	371	sub size_allocate {
368	# nothing to be done	372	# nothing to be done
369	}	373	}
370		374
371	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
372	}	381	}
373		382
374	sub set_max_size {	383	sub set_max_size {
375	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
376		385
…		…
435		444
436	$::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
437	unless $FOCUS;	446	unless $FOCUS;
438	}	447	}
439		448
440	sub mouse_motion { }	449	sub mouse_motion { 0 }
441	sub button_up { }	450	sub button_up { 0 }
442	sub key_down { }	451	sub key_down { 0 }
443	sub key_up { }	452	sub key_up { 0 }
444		453
445	sub button_down {	454	sub button_down {
446	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
447		456
448	$self->focus_in;	457	$self->focus_in;
449	}
450		458
451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456		461
457	sub find_widget {	462	sub find_widget {
458	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
459		464
460	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
498		503
499	sub realloc {	504	sub realloc {
500	my ($self) = @_;	505	my ($self) = @_;
501		506
502	if ($self->{visible}) {	507	if ($self->{visible}) {
503	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
504		509
505	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
506	$self->{root}->update;	511	$self->{root}->update;
507	} else {	512	} else {
508	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
509	}	515	}
510	}	516	}
511		517
512	sub update {	518	sub update {
513	my ($self) = @_;	519	my ($self) = @_;
…		…
521		527
522	$self->realloc;	528	$self->realloc;
523	$self->update;	529	$self->update;
524	}	530	}
525		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
526	sub draw {	536	sub draw {
527	my ($self) = @_;	537	my ($self) = @_;
528		538
529	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);
530		550
531	glPushMatrix;	551	glPushMatrix;
532	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
533	$self->_draw;	553	$self->_draw;
534	glPopMatrix;	554	glPopMatrix;
…		…
546	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
547	glEnd;	567	glEnd;
548	glDisable GL_BLEND;	568	glDisable GL_BLEND;
549	}	569	}
550		570
551	if ($ENV{CFPLUS_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
552	glPushMatrix;	572	glPushMatrix;
553	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
555	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
556	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
648	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
649		669
650	sub new {	670	sub new {
651	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
652		672
653	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
654		674
655	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
656	children => [],	676	children => [],
657	can_events => 0,	677	can_events => 0,
658	%arg,	678	%arg,
659	);	679	);
		680
660	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
661		683
662	$self	684	$self
663	}	685	}
664		686
665	sub add {	687	sub add {
…		…
713	$x -= $self->{x};	735	$x -= $self->{x};
714	$y -= $self->{y};	736	$y -= $self->{y};
715		737
716	my $res;	738	my $res;
717		739
718	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
719	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
720	and return $res;	742	and return $res;
721	}	743	}
722		744
723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
765	sub size_request {	787	sub size_request {
766	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
767	}	789	}
768		790
769	sub size_allocate {	791	sub size_allocate {
770	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
771		793
772	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
773	}	795	}
774		796
775	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
776		800
777	package CFClient::UI::Window;	801	package CFClient::UI::Window;
778		802
779	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
780		804
…		…
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	817	$self->SUPER::update;
794	}	818	}
795		819
796	sub size_allocate {	820	sub size_allocate {
797	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
798		822
799	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
800	$self->update	824	$self->update;
801	if $changed;
802	}	825	}
803		826
804	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
805	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
806	}	831	}
807		832
808	sub render_child {	833	sub render_child {
809	my ($self) = @_;	834	my ($self) = @_;
810		835
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
814		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
815	$self->_render;	847	$self->_render;
816	};	848	};
817	}	849	}
818		850
819	sub _draw {	851	sub _draw {
820	my ($self) = @_;	852	my ($self) = @_;
821		853
822	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
823		855
824	my $tex = $self->{texture}	856	my $tex = $self->{texture}
825	or return;	857	or return;
826		858
827	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
850	}	882	}
851		883
852	sub size_request {	884	sub size_request {
853	my ($self) = @_;	885	my ($self) = @_;
854		886
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		888
857	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
859		891
860	($w, $h)	892	($w, $h)
861	}	893	}
862		894
863	sub size_allocate {	895	sub size_allocate {
864	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
865		897
		898	my $child = $self->child;
		899
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		902
869	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
870	$self->update;	904	$self->update;
871	}	905	}
872		906
…		…
908	}	942	}
909		943
910	sub _render {	944	sub _render {
911	my ($self) = @_;	945	my ($self) = @_;
912		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		951
915	$self->SUPER::_render;	952	$self->SUPER::_render;
916	}	953	}
917		954
…		…
920	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
921		958
922	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
923		960
924	sub new {	961	sub new {
925	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
926		965
927	my $self;	966	my $self;
928		967
929	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
930	vertical => 1,	969	vertical => 1,
…		…
935	;	974	;
936		975
937	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
939	slider => $slider,	978	slider => $slider,
940	@_,	979	%arg,
941	);	980	);
942		981
943	$self->{vp}->add ($self->{scrolled});
944	$self->add ($self->{vp});
945	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
946		984
947	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
948	}	992	}
949		993
950	sub update {	994	sub update {
951	my ($self) = @_;	995	my ($self) = @_;
952		996
…		…
956	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
957	$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]);
958	}	1002	}
959		1003
960	sub size_allocate {	1004	sub size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
962		1006
963	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
964		1008
965	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1011	}
968		1012
…		…
1024	my @border =	1068	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1071
1028	sub new {	1072	sub new {
1029	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1030		1076
1031	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1080	border => 0.6,
1035	can_events => 1,	1081	can_events => 1,
1036	min_w => 16,	1082	min_w => 16,
1037	min_h => 16,	1083	min_h => 16,
1038	@_	1084	%arg,
1039	);	1085	);
1040		1086
1041	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1042	align => 0,	1088	align => 0,
1043	valign => 1,	1089	valign => 1,
1044	text => $self->{title},	1090	text => $title,
1045	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1046		1093
1047	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048	}	1102	}
1049		1103
1050	sub border {	1104	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1052	}	1106	}
1053		1107
1054	sub size_request {	1108	sub size_request {
1055	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1056		1113
1057	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1058		1115
1059	(	1116	(
1060	$w + $self->border * 2,	1117	$w + $self->border * 2,
1061	$h + $self->border * 2,	1118	$h + $self->border * 2,
1062	)	1119	)
1063	}	1120	}
1064		1121
1065	sub size_allocate {	1122	sub size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1067		1124
1068	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1069		1130
		1131	my $border = $self->border;
		1132
1070	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1072		1135
1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074	if $self->{title};
1075
1076	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1077	}	1137	}
1078		1138
1079	sub button_down {	1139	sub button_down {
1080	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1081		1141
…		…
1115		1175
1116	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1117		1177
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1119	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1120	}	1184	1
1121	}	1185	}
1122		1186
1123	sub button_up {	1187	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1125		1189
1126	delete $self->{motion};	1190	!!delete $self->{motion}
1127	}	1191	}
1128		1192
1129	sub mouse_motion {	1193	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1131		1195
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1133	}	1199	}
1134		1200
1135	sub _draw {	1201	sub _draw {
1136	my ($self) = @_;	1202	my ($self) = @_;
1137		1203
		1204	my $child = $self->{children}[0];
		1205
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1208
1141	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1211
1144	my $border = $self->border;	1212	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1228	}
1161		1229
1162	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1163		1231
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1167	}	1238	}
1168		1239
1169	#############################################################################	1240	#############################################################################
1170		1241
1171	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1316	(sum @$hs),
1246	)	1317	)
1247	}	1318	}
1248		1319
1249	sub size_allocate {	1320	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1321	my ($self, $w, $h) = @_;
1251		1322
1252	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1253		1324
1254	my $req_w = (sum @$ws) || 1;	1325	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1326	my $req_h = (sum @$hs) || 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1405	)
1335	}	1406	}
1336		1407
1337	sub size_allocate {	1408	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1409	my ($self, $w, $h) = @_;
1339		1410
1340	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1412	my $children = $self->{children};
1342		1413
1343	my @req;	1414	my @req;
…		…
1517		1588
1518	($w, $h)	1589	($w, $h)
1519	}	1590	}
1520		1591
1521	sub size_allocate {	1592	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1593	my ($self, $w, $h) = @_;
		1594
		1595	delete $self->{ox};
1523		1596
1524	delete $self->{texture}	1597	delete $self->{texture}
1525	if $changed;	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1599	}
1527		1600
1528	sub set_fontsize {	1601	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1530		1603
…		…
1545	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1622
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1551		1625
		1626	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1555		1630
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1634	};
1562		1635
1563	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1638
…		…
1603		1676
1604	delete $self->{cur_h};	1677	delete $self->{cur_h};
1605		1678
1606	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1607		1680
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	1682	$self->{text} = $text;
1612		1683
1613	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1615		1686
1616	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1617	}	1689	}
1618		1690
1619	sub set_text {	1691	sub set_text {
1620	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1621		1693
…		…
1660	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1734	$self->_emit ('escape');
1663	} elsif ($uni) {	1735	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1665	}	1739	}
1666		1740
1667	$self->_set_text ($text);	1741	$self->_set_text ($text);
1668		1742
1669	$self->realloc;	1743	$self->realloc;
		1744
		1745	1
1670	}	1746	}
1671		1747
1672	sub focus_in {	1748	sub focus_in {
1673	my ($self) = @_;	1749	my ($self) = @_;
1674		1750
…		…
1689	utf8::encode $text;	1765	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1691		1767
1692	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1693	$self->update;	1769	$self->update;
		1770
		1771	1
1694	}	1772	}
1695		1773
1696	sub mouse_motion {	1774	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1699	}	1779	}
1700		1780
1701	sub _draw {	1781	sub _draw {
1702	my ($self) = @_;	1782	my ($self) = @_;
1703		1783
…		…
1780	} else {	1860	} else {
1781	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1782	}	1862	}
1783		1863
1784	} else {	1864	} else {
1785	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1786	}	1868	1
1787
1788	}	1869	}
1789		1870
1790	#############################################################################	1871	#############################################################################
1791		1872
1792	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1822		1903
1823	$self->emit ("activate")	1904	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1826	}	1909	}
1827		1910
1828	sub _draw {	1911	sub _draw {
1829	my ($self) = @_;	1912	my ($self) = @_;
1830		1913
…		…
1884		1967
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1889	}	1976	1
1890	}	1977	}
1891		1978
1892	sub _draw {	1979	sub _draw {
1893	my ($self) = @_;	1980	my ($self) = @_;
1894		1981
…		…
2232		2319
2233	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2234		2321
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2323
2237	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2238	}	2325	}
2239		2326
2240	sub mouse_motion {	2327	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2242		2329
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2334
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2336
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2251	}	2342	1
2252	}	2343	}
2253		2344
2254	sub update {	2345	sub update {
2255	my ($self) = @_;	2346	my ($self) = @_;
2256		2347
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2259		2357
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2262		2360
…		…
2268	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2270		2368
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2273	});	2371	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2372
2281	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2282		2374
2283	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2284		2376
…		…
2382	$self->{fontsize} = $fontsize;	2474	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2475	$self->reflow;
2384	}	2476	}
2385		2477
2386	sub size_allocate {	2478	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2479	my ($self, $w, $h) = @_;
2388		2480
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2481	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2482
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2483	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2485	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2486
…		…
2619	}	2709	}
2620		2710
2621	sub set_tooltip_from {	2711	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2623		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2624	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2724	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2726	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2728	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2638		2737
2639	($w + 4, $h + 4)	2738	($w + 4, $h + 4)
2640	}	2739	}
2641		2740
2642	sub size_allocate {	2741	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2742	my ($self, $w, $h) = @_;
2644		2743
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2745	}
2649		2746
2650	sub visibility_change {	2747	sub visibility_change {
2651	my ($self, $visible) = @_;	2748	my ($self, $visible) = @_;
2652		2749
…		…
2773	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2774	}	2871	}
2775		2872
2776	#############################################################################	2873	#############################################################################
2777		2874
2778	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2779		2876
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2781		2878
2782	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2783	my $class = shift;
2784
2785	my $self = $class->SUPER::new (
2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787	@_,
2788	);
2789
2790	$self
2791	}
2792
2793	sub set_items {
2794	my ($self, $items) = @_;
2795
2796	$self->{scrolled}->clear;
2797	return unless $items;
2798
2799	my @items = sort {
2800	($a->{type} <=> $b->{type})
2801	or ($a->{name} cmp $b->{name})
2802	} @$items;
2803
2804	$self->{real_items} = \@items;
2805
2806	my $row = 0;
2807	for my $item (@items) {
2808	CFClient::Item::update_widgets $item;
2809
2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814	$row++;
2815	}
2816	}
2817		2880
2818	#############################################################################	2881	#############################################################################
2819		2882
2820	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2821		2884
…		…
2871	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2872		2935
2873	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2876	}	2941	}
2877		2942
2878	sub button_up {	2943	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2880		2945
…		…
2882	undef $GRAB;	2947	undef $GRAB;
2883	$self->hide;	2948	$self->hide;
2884		2949
2885	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2887	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3065	}
2889		3066
2890	#############################################################################	3067	#############################################################################
2891		3068
2892	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2998	}	3175	}
2999		3176
3000	#############################################################################	3177	#############################################################################
3001		3178
		3179	package CFClient::UI::Inventory;
		3180
		3181	our @ISA = CFClient::UI::ScrolledWindow::;
		3182
		3183	sub new {
		3184	my $class = shift;
		3185
		3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
3002	package CFClient::UI::Root;	3474	package CFClient::UI::Root;
3003		3475
3004	our @ISA = CFClient::UI::Container::;	3476	our @ISA = CFClient::UI::Container::;
3005		3477
3006	use CFClient::OpenGL;	3478	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3488	Scalar::Util::weaken ($self->{root} = $self);
3017		3489
3018	$self	3490	$self
3019	}	3491	}
3020		3492
3021	sub configure {
3022	my ($self, $x, $y, $w, $h) = @_;
3023
3024	$self->{w} = $w;
3025	$self->{h} = $h;
3026	}
3027
3028	sub reconfigure {
3029	my ($self) = @_;
3030
3031	$self->SUPER::reconfigure;
3032
3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3034	if $self->{w};
3035	}
3036
3037	sub size_request {	3493	sub size_request {
3038	my ($self) = @_;	3494	my ($self) = @_;
3039		3495
3040	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
3041	}	3497	}
…		…
3053		3509
3054	int $coord + 0.5	3510	int $coord + 0.5
3055	}	3511	}
3056		3512
3057	sub size_allocate {	3513	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3514	my ($self, $w, $h) = @_;
3059		3515
3060	for my $child ($self->children) {	3516	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3518
3063	$X = $child->{force_x} if exists $child->{force_x};	3519	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3587	$_->()
3132	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3133	}	3589	}
3134		3590
3135	if ($self->{realloc}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3136	my @queue;	3593	my @queue;
		3594	my $widget;
3137		3595
		3596	outer:
3138	while () {	3597	while () {
3139	if ($self->{realloc}) {	3598	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3141		3601
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3144	}	3606	}
3145		3607
		3608	while () {
		3609	@queue or last outer;
		3610
3146	my $widget = pop @queue || last;	3611	$widget = pop @{ $queue[-1] || [] }
		3612	and last;
		3613
		3614	pop @queue;
		3615	}
3147		3616
3148	$widget->{visible} or last; # do not resize invisible widgets	3617	delete $queue{$widget+0};
3149		3618
3150	my ($w, $h) = $widget->size_request;	3619	my ($w, $h) = $widget->size_request;
3151		3620
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3623
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3624	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3625	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3160		3631
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3632	$self->{size_alloc}{$widget+0} = $widget;
3162		3633
3163	push @queue, $widget->{parent}	3634	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
		3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3165	}	3644	}
3166	}	3645	}
3167		3646
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3649	values %$size_alloc;
3171		3650
3172	while () {	3651	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3652	my $widget = pop @queue || last;
3174		3653
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		3655
3178	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3180		3658
3181	$w = int $w + 0.5;	3659	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3660	$h = int $h + 0.5;
3183		3661
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
3185		3665
3186	$widget->{w} = $w;	3666	$widget->{w} = $w;
3187	$widget->{h} = $h;	3667	$widget->{h} = $h;
3188		3668
3189	$widget->emit (size_allocate => $w, $h, $changed);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3190	}	3671	}
3191	}	3672	}
3192		3673
3193	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3194	$_->()	3675	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3196	}	3677	}
		3678
3197		3679
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3201		3683
…		…
3203	glLoadIdentity;	3685	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3688	glLoadIdentity;
3207		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3208	$self->_draw;	3697	$self->_draw;
3209	}	3698	}
3210		3699
3211	#############################################################################	3700	#############################################################################
3212		3701

Diff Legend

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