[ViewVC] Diff of: 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.275 by root, Sat Jun 3 22:50:48 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
…		…
1660	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1735	$self->_emit ('escape');
1663	} elsif ($uni) {	1736	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1665	}	1740	}
1666		1741
1667	$self->_set_text ($text);	1742	$self->_set_text ($text);
1668		1743
1669	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1670	}	1747	}
1671		1748
1672	sub focus_in {	1749	sub focus_in {
1673	my ($self) = @_;	1750	my ($self) = @_;
1674		1751
…		…
1689	utf8::encode $text;	1766	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1691		1768
1692	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1693	$self->update;	1770	$self->update;
		1771
		1772	1
1694	}	1773	}
1695		1774
1696	sub mouse_motion {	1775	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1699	}	1780	}
1700		1781
1701	sub _draw {	1782	sub _draw {
1702	my ($self) = @_;	1783	my ($self) = @_;
1703		1784
…		…
1780	} else {	1861	} else {
1781	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1782	}	1863	}
1783		1864
1784	} else {	1865	} else {
1785	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1786	}	1869	1
1787
1788	}	1870	}
1789		1871
1790	#############################################################################	1872	#############################################################################
1791		1873
1792	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1822		1904
1823	$self->emit ("activate")	1905	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1826	}	1910	}
1827		1911
1828	sub _draw {	1912	sub _draw {
1829	my ($self) = @_;	1913	my ($self) = @_;
1830		1914
…		…
1884		1968
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1889	}	1977	1
1890	}	1978	}
1891		1979
1892	sub _draw {	1980	sub _draw {
1893	my ($self) = @_;	1981	my ($self) = @_;
1894		1982
…		…
2232		2320
2233	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2234		2322
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2324
2237	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2238	}	2326	}
2239		2327
2240	sub mouse_motion {	2328	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2242		2330
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2335
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2337
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2251	}	2343	1
2252	}	2344	}
2253		2345
2254	sub update {	2346	sub update {
2255	my ($self) = @_;	2347	my ($self) = @_;
2256		2348
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2259		2358
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) \|\| 1e-100;	2360	my $range = ($hi - $page - $lo) \|\| 1e-100;
2262		2361
…		…
2268	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2270		2369
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2273	});	2372	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2373
2281	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2282		2375
2283	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2284		2377
…		…
2382	$self->{fontsize} = $fontsize;	2475	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2476	$self->reflow;
2384	}	2477	}
2385		2478
2386	sub size_allocate {	2479	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2480	my ($self, $w, $h) = @_;
2388		2481
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2482	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2483
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2484	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2485	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2486	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2487
…		…
2619	}	2710	}
2620		2711
2621	sub set_tooltip_from {	2712	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2623		2714
		2715	my $tooltip = $widget->{tooltip};
		2716
		2717	if ($ENV{CFPLUS_DEBUG} & 2) {
		2718	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2719	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2720	. "req $widget->{req_w} $widget->{req_h}\n"
		2721	. "visible $widget->{visible}";
		2722	}
		2723
2624	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2725	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2727	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2729	ellipsise => 0,
2630	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2730	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2638		2738
2639	($w + 4, $h + 4)	2739	($w + 4, $h + 4)
2640	}	2740	}
2641		2741
2642	sub size_allocate {	2742	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2743	my ($self, $w, $h) = @_;
2644		2744
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2745	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2746	}
2649		2747
2650	sub visibility_change {	2748	sub visibility_change {
2651	my ($self, $visible) = @_;	2749	my ($self, $visible) = @_;
2652		2750
…		…
2773	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2774	}	2872	}
2775		2873
2776	#############################################################################	2874	#############################################################################
2777		2875
2778	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2779		2877
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2781		2879
2782	sub new {	2880	# 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		2881
2818	#############################################################################	2882	#############################################################################
2819		2883
2820	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2821		2885
…		…
2871	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2872		2936
2873	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2876	}	2942	}
2877		2943
2878	sub button_up {	2944	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2880		2946
…		…
2882	undef $GRAB;	2948	undef $GRAB;
2883	$self->hide;	2949	$self->hide;
2884		2950
2885	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2887	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3066	}
2889		3067
2890	#############################################################################	3068	#############################################################################
2891		3069
2892	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2998	}	3176	}
2999		3177
3000	#############################################################################	3178	#############################################################################
3001		3179
		3180	package CFClient::UI::Inventory;
		3181
		3182	our @ISA = CFClient::UI::ScrolledWindow::;
		3183
		3184	sub new {
		3185	my $class = shift;
		3186
		3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
3002	package CFClient::UI::Root;	3475	package CFClient::UI::Root;
3003		3476
3004	our @ISA = CFClient::UI::Container::;	3477	our @ISA = CFClient::UI::Container::;
3005		3478
3006	use CFClient::OpenGL;	3479	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3489	Scalar::Util::weaken ($self->{root} = $self);
3017		3490
3018	$self	3491	$self
3019	}	3492	}
3020		3493
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 {	3494	sub size_request {
3038	my ($self) = @_;	3495	my ($self) = @_;
3039		3496
3040	($self->{w}, $self->{h})	3497	($self->{w}, $self->{h})
3041	}	3498	}
…		…
3053		3510
3054	int $coord + 0.5	3511	int $coord + 0.5
3055	}	3512	}
3056		3513
3057	sub size_allocate {	3514	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3515	my ($self, $w, $h) = @_;
3059		3516
3060	for my $child ($self->children) {	3517	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3519
3063	$X = $child->{force_x} if exists $child->{force_x};	3520	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3588	$_->()
3132	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3133	}	3590	}
3134		3591
3135	if ($self->{realloc}) {	3592	if ($self->{realloc}) {
		3593	my %queue;
3136	my @queue;	3594	my @queue;
		3595	my $widget;
3137		3596
		3597	outer:
3138	while () {	3598	while () {
3139	if ($self->{realloc}) {	3599	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
3141		3602
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3603	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
3144	}	3607	}
3145		3608
		3609	while () {
		3610	@queue or last outer;
		3611
3146	my $widget = pop @queue \|\| last;	3612	$widget = pop @{ $queue[-1] \|\| [] }
		3613	and last;
		3614
		3615	pop @queue;
		3616	}
3147		3617
3148	$widget->{visible} or last; # do not resize invisible widgets	3618	delete $queue{$widget+0};
3149		3619
3150	my ($w, $h) = $widget->size_request;	3620	my ($w, $h) = $widget->size_request;
3151		3621
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3622	$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;	3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3624
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3625	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3626	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3627
		3628	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3629	\|\| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3630	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3160		3632
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3633	$self->{size_alloc}{$widget+0} = $widget;
3162		3634
3163	push @queue, $widget->{parent}	3635	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
		3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
3165	}	3645	}
3166	}	3646	}
3167		3647
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3648	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3650	values %$size_alloc;
3171		3651
3172	while () {	3652	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3653	my $widget = pop @queue \|\| last;
3174		3654
3175	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3177		3656
3178	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3180		3659
3181	$w = int $w + 0.5;	3660	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3661	$h = int $h + 0.5;
3183		3662
3184	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3663	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
3185		3666
3186	$widget->{w} = $w;	3667	$widget->{w} = $w;
3187	$widget->{h} = $h;	3668	$widget->{h} = $h;
3188		3669
3189	$widget->emit (size_allocate => $w, $h, $changed);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3190	}	3672	}
3191	}	3673	}
3192		3674
3193	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3194	$_->()	3676	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3196	}	3678	}
		3679
3197		3680
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3201		3684
…		…
3203	glLoadIdentity;	3686	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3689	glLoadIdentity;
3207		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
3208	$self->_draw;	3698	$self->_draw;
3209	}	3699	}
3210		3700
3211	#############################################################################	3701	#############################################################################
3212		3702

Diff Legend

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

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.275 by root, Sat Jun 3 22:50:48 2006 UTC

Diff Legend

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.275 by root, Sat Jun 3 22:50:48 2006 UTC