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.277 by root, Sun Jun 4 00:21:52 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
…		…
1100	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1101		1161
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1164
		1165	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1166	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1167	};
1108		1168
1109	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
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);
		1179	# HACK: the next line is required to enforce placement
		1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1120	}	1186	1
1121	}	1187	}
1122		1188
1123	sub button_up {	1189	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1125		1191
1126	delete $self->{motion};	1192	!!delete $self->{motion}
1127	}	1193	}
1128		1194
1129	sub mouse_motion {	1195	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1131		1197
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1133	}	1201	}
1134		1202
1135	sub _draw {	1203	sub _draw {
1136	my ($self) = @_;	1204	my ($self) = @_;
1137		1205
		1206	my $child = $self->{children}[0];
		1207
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1210
1141	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1213
1144	my $border = $self->border;	1214	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1230	}
1161		1231
1162	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1163		1233
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1167	}	1240	}
1168		1241
1169	#############################################################################	1242	#############################################################################
1170		1243
1171	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1318	(sum @$hs),
1246	)	1319	)
1247	}	1320	}
1248		1321
1249	sub size_allocate {	1322	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1323	my ($self, $w, $h) = @_;
1251		1324
1252	my ($ws, $hs) = $self->get_wh;	1325	my ($ws, $hs) = $self->get_wh;
1253		1326
1254	my $req_w = (sum @$ws) || 1;	1327	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1328	my $req_h = (sum @$hs) || 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1407	)
1335	}	1408	}
1336		1409
1337	sub size_allocate {	1410	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1411	my ($self, $w, $h) = @_;
1339		1412
1340	my $space = $self->{vertical} ? $h : $w;	1413	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1414	my $children = $self->{children};
1342		1415
1343	my @req;	1416	my @req;
…		…
1517		1590
1518	($w, $h)	1591	($w, $h)
1519	}	1592	}
1520		1593
1521	sub size_allocate {	1594	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1595	my ($self, $w, $h) = @_;
		1596
		1597	delete $self->{ox};
1523		1598
1524	delete $self->{texture}	1599	delete $self->{texture}
1525	if $changed;	1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1601	}
1527		1602
1528	sub set_fontsize {	1603	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1530		1605
…		…
1545	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1624
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1551		1627
		1628	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1555		1632
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1636	};
1562		1637
1563	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1640
…		…
1603		1678
1604	delete $self->{cur_h};	1679	delete $self->{cur_h};
1605		1680
1606	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1607		1682
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	1684	$self->{text} = $text;
1612		1685
1613	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1615		1688
1616	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1617	}	1691	}
1618		1692
1619	sub set_text {	1693	sub set_text {
1620	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1621		1695
…		…
1660	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1736	$self->_emit ('escape');
1663	} elsif ($uni) {	1737	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1665	}	1741	}
1666		1742
1667	$self->_set_text ($text);	1743	$self->_set_text ($text);
1668		1744
1669	$self->realloc;	1745	$self->realloc;
		1746
		1747	1
1670	}	1748	}
1671		1749
1672	sub focus_in {	1750	sub focus_in {
1673	my ($self) = @_;	1751	my ($self) = @_;
1674		1752
…		…
1689	utf8::encode $text;	1767	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1691		1769
1692	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1693	$self->update;	1771	$self->update;
		1772
		1773	1
1694	}	1774	}
1695		1775
1696	sub mouse_motion {	1776	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1699	}	1781	}
1700		1782
1701	sub _draw {	1783	sub _draw {
1702	my ($self) = @_;	1784	my ($self) = @_;
1703		1785
…		…
1780	} else {	1862	} else {
1781	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1782	}	1864	}
1783		1865
1784	} else {	1866	} else {
1785	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1786	}	1870	1
1787
1788	}	1871	}
1789		1872
1790	#############################################################################	1873	#############################################################################
1791		1874
1792	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1822		1905
1823	$self->emit ("activate")	1906	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1826	}	1911	}
1827		1912
1828	sub _draw {	1913	sub _draw {
1829	my ($self) = @_;	1914	my ($self) = @_;
1830		1915
…		…
1884		1969
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1889	}	1978	1
1890	}	1979	}
1891		1980
1892	sub _draw {	1981	sub _draw {
1893	my ($self) = @_;	1982	my ($self) = @_;
1894		1983
…		…
2232		2321
2233	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2234		2323
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2325
2237	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2238	}	2327	}
2239		2328
2240	sub mouse_motion {	2329	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2242		2331
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2336
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2338
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2251	}	2344	1
2252	}	2345	}
2253		2346
2254	sub update {	2347	sub update {
2255	my ($self) = @_;	2348	my ($self) = @_;
2256		2349
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2259		2359
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2262		2362
…		…
2268	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2270		2370
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2273	});	2373	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2374
2281	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2282		2376
2283	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2284		2378
…		…
2382	$self->{fontsize} = $fontsize;	2476	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2477	$self->reflow;
2384	}	2478	}
2385		2479
2386	sub size_allocate {	2480	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2481	my ($self, $w, $h) = @_;
2388		2482
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2483	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2484
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2485	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2486	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2487	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2488
…		…
2619	}	2711	}
2620		2712
2621	sub set_tooltip_from {	2713	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2623		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2624	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2726	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2728	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2730	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2638		2739
2639	($w + 4, $h + 4)	2740	($w + 4, $h + 4)
2640	}	2741	}
2641		2742
2642	sub size_allocate {	2743	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2744	my ($self, $w, $h) = @_;
2644		2745
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2747	}
2649		2748
2650	sub visibility_change {	2749	sub visibility_change {
2651	my ($self, $visible) = @_;	2750	my ($self, $visible) = @_;
2652		2751
…		…
2773	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2774	}	2873	}
2775		2874
2776	#############################################################################	2875	#############################################################################
2777		2876
2778	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2779		2878
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2781		2880
2782	sub new {	2881	# 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		2882
2818	#############################################################################	2883	#############################################################################
2819		2884
2820	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2821		2886
…		…
2871	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2872		2937
2873	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2876	}	2943	}
2877		2944
2878	sub button_up {	2945	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2880		2947
…		…
2882	undef $GRAB;	2949	undef $GRAB;
2883	$self->hide;	2950	$self->hide;
2884		2951
2885	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2887	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3067	}
2889		3068
2890	#############################################################################	3069	#############################################################################
2891		3070
2892	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2998	}	3177	}
2999		3178
3000	#############################################################################	3179	#############################################################################
3001		3180
		3181	package CFClient::UI::Inventory;
		3182
		3183	our @ISA = CFClient::UI::ScrolledWindow::;
		3184
		3185	sub new {
		3186	my $class = shift;
		3187
		3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
		3430	@_,
		3431	)
		3432	}
		3433
		3434	# XXX: Do sorting? Argl...
		3435	sub add_spell {
		3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
		3438
		3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
3002	package CFClient::UI::Root;	3476	package CFClient::UI::Root;
3003		3477
3004	our @ISA = CFClient::UI::Container::;	3478	our @ISA = CFClient::UI::Container::;
3005		3479
3006	use CFClient::OpenGL;	3480	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3490	Scalar::Util::weaken ($self->{root} = $self);
3017		3491
3018	$self	3492	$self
3019	}	3493	}
3020		3494
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 {	3495	sub size_request {
3038	my ($self) = @_;	3496	my ($self) = @_;
3039		3497
3040	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
3041	}	3499	}
…		…
3053		3511
3054	int $coord + 0.5	3512	int $coord + 0.5
3055	}	3513	}
3056		3514
3057	sub size_allocate {	3515	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3516	my ($self, $w, $h) = @_;
3059		3517
3060	for my $child ($self->children) {	3518	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3520
3063	$X = $child->{force_x} if exists $child->{force_x};	3521	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3589	$_->()
3132	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3133	}	3591	}
3134		3592
3135	if ($self->{realloc}) {	3593	if ($self->{realloc}) {
		3594	my %queue;
3136	my @queue;	3595	my @queue;
		3596	my $widget;
3137		3597
		3598	outer:
3138	while () {	3599	while () {
3139	if ($self->{realloc}) {	3600	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3601	for $widget (values %$realloc) {
		3602	$widget->{visible} or next; # do not resize invisible widgets
3141		3603
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3604	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3144	}	3608	}
3145		3609
		3610	while () {
		3611	@queue or last outer;
		3612
3146	my $widget = pop @queue || last;	3613	$widget = pop @{ $queue[-1] || [] }
		3614	and last;
		3615
		3616	pop @queue;
		3617	}
3147		3618
3148	$widget->{visible} or last; # do not resize invisible widgets	3619	delete $queue{$widget+0};
3149		3620
3150	my ($w, $h) = $widget->size_request;	3621	my ($w, $h) = $widget->size_request;
3151		3622
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3623	$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;	3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3625
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3626	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3627	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3631	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3632	$widget->{req_h} = $h;
3160		3633
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3634	$self->{size_alloc}{$widget+0} = $widget;
3162		3635
3163	push @queue, $widget->{parent}	3636	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
		3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
3165	}	3646	}
3166	}	3647	}
3167		3648
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3649	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3651	values %$size_alloc;
3171		3652
3172	while () {	3653	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3654	my $widget = pop @queue || last;
3174		3655
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		3657
3178	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3180		3660
3181	$w = int $w + 0.5;	3661	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3662	$h = int $h + 0.5;
3183		3663
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
3185		3667
3186	$widget->{w} = $w;	3668	$widget->{w} = $w;
3187	$widget->{h} = $h;	3669	$widget->{h} = $h;
3188		3670
3189	$widget->emit (size_allocate => $w, $h, $changed);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3190	}	3673	}
3191	}	3674	}
3192		3675
3193	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3194	$_->()	3677	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3196	}	3679	}
		3680
3197		3681
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3201		3685
…		…
3203	glLoadIdentity;	3687	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3690	glLoadIdentity;
3207		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3208	$self->_draw;	3699	$self->_draw;
3209	}	3700	}
3210		3701
3211	#############################################################################	3702	#############################################################################
3212		3703

Diff Legend

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