[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.273 by root, Sat Jun 3 02:32:35 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	#############################################################################
…		…
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	815	$self->SUPER::update;
794	}	816	}
795		817
796	sub size_allocate {	818	sub size_allocate {
797	my ($self, $w, $h, $changed) = @_;	819	my ($self, $w, $h) = @_;
798		820
799	$self->SUPER::size_allocate ($w, $h, $changed);	821	$self->SUPER::size_allocate ($w, $h);
800	$self->update	822	$self->update;
801	if $changed;
802	}	823	}
803		824
804	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
805	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
806	}	829	}
807		830
808	sub render_child {	831	sub render_child {
809	my ($self) = @_;	832	my ($self) = @_;
810		833
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
814		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
815	$self->_render;	845	$self->_render;
816	};	846	};
817	}	847	}
818		848
819	sub _draw {	849	sub _draw {
820	my ($self) = @_;	850	my ($self) = @_;
821		851
822	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
823		853
824	my $tex = $self->{texture}	854	my $tex = $self->{texture}
825	or return;	855	or return;
826		856
827	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
850	}	880	}
851		881
852	sub size_request {	882	sub size_request {
853	my ($self) = @_;	883	my ($self) = @_;
854		884
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		886
857	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
859		889
860	($w, $h)	890	($w, $h)
861	}	891	}
862		892
863	sub size_allocate {	893	sub size_allocate {
864	my ($self, $w, $h, $changed) = @_;	894	my ($self, $w, $h) = @_;
865		895
		896	my $child = $self->child;
		897
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		900
869	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
870	$self->update;	902	$self->update;
871	}	903	}
872		904
…		…
908	}	940	}
909		941
910	sub _render {	942	sub _render {
911	my ($self) = @_;	943	my ($self) = @_;
912		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		949
915	$self->SUPER::_render;	950	$self->SUPER::_render;
916	}	951	}
917		952
…		…
920	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
921		956
922	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
923		958
924	sub new {	959	sub new {
925	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
926		963
927	my $self;	964	my $self;
928		965
929	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
930	vertical => 1,	967	vertical => 1,
…		…
935	;	972	;
936		973
937	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
939	slider => $slider,	976	slider => $slider,
940	@_,	977	%arg,
941	);	978	);
942		979
943	$self->{vp}->add ($self->{scrolled});
944	$self->add ($self->{vp});
945	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
946		982
947	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
948	}	990	}
949		991
950	sub update {	992	sub update {
951	my ($self) = @_;	993	my ($self) = @_;
952		994
…		…
956	my $child = $self->{vp}->child;	998	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	999	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1000	}
959		1001
960	sub size_allocate {	1002	sub size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1003	my ($self, $w, $h) = @_;
962		1004
963	$self->SUPER::size_allocate ($w, $h, $changed);	1005	$self->SUPER::size_allocate ($w, $h);
964		1006
965	my $child = $self->{vp}->child;	1007	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1009	}
968		1010
…		…
1024	my @border =	1066	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	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);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1069
1028	sub new {	1070	sub new {
1029	my $class = shift;	1071	my ($class, %arg) = @_;
		1072
		1073	my $title = delete $arg{title};
1030		1074
1031	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1078	border => 0.6,
1035	can_events => 1,	1079	can_events => 1,
1036	min_w => 16,	1080	min_w => 16,
1037	min_h => 16,	1081	min_h => 16,
1038	@_	1082	%arg,
1039	);	1083	);
1040		1084
1041	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
1042	align => 0,	1086	align => 0,
1043	valign => 1,	1087	valign => 1,
1044	text => $self->{title},	1088	text => $title,
1045	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
1046		1091
1047	$self	1092	$self
		1093	}
		1094
		1095	sub add {
		1096	my ($self, @widgets) = @_;
		1097
		1098	$self->SUPER::add (@widgets);
		1099	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048	}	1100	}
1049		1101
1050	sub border {	1102	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
1052	}	1104	}
1053		1105
1054	sub size_request {	1106	sub size_request {
1055	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
1056		1111
1057	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
1058		1113
1059	(	1114	(
1060	$w + $self->border * 2,	1115	$w + $self->border * 2,
1061	$h + $self->border * 2,	1116	$h + $self->border * 2,
1062	)	1117	)
1063	}	1118	}
1064		1119
1065	sub size_allocate {	1120	sub size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1121	my ($self, $w, $h) = @_;
1067		1122
1068	return unless $changed;	1123	if ($self->{title}) {
		1124	$self->{title}{w} = $w;
		1125	$self->{title}{h} = $h;
		1126	$self->{title}->size_allocate ($w, $h);
		1127	}
1069		1128
		1129	my $border = $self->border;
		1130
1070	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
1072		1133
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);	1134	$self->child->configure ($border, $border, $w, $h);
1077	}	1135	}
1078		1136
1079	sub button_down {	1137	sub button_down {
1080	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1081		1139
…		…
1115		1173
1116	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1117		1175
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1119	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1120	}	1182	1
1121	}	1183	}
1122		1184
1123	sub button_up {	1185	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1125		1187
1126	delete $self->{motion};	1188	!!delete $self->{motion}
1127	}	1189	}
1128		1190
1129	sub mouse_motion {	1191	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1131		1193
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1133	}	1197	}
1134		1198
1135	sub _draw {	1199	sub _draw {
1136	my ($self) = @_;	1200	my ($self) = @_;
1137		1201
		1202	my $child = $self->{children}[0];
		1203
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1206
1141	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1209
1144	my $border = $self->border;	1210	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1226	}
1161		1227
1162	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1163		1229
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1167	}	1236	}
1168		1237
1169	#############################################################################	1238	#############################################################################
1170		1239
1171	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1314	(sum @$hs),
1246	)	1315	)
1247	}	1316	}
1248		1317
1249	sub size_allocate {	1318	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1319	my ($self, $w, $h) = @_;
1251		1320
1252	my ($ws, $hs) = $self->get_wh;	1321	my ($ws, $hs) = $self->get_wh;
1253		1322
1254	my $req_w = (sum @$ws) \|\| 1;	1323	my $req_w = (sum @$ws) \|\| 1;
1255	my $req_h = (sum @$hs) \|\| 1;	1324	my $req_h = (sum @$hs) \|\| 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1403	)
1335	}	1404	}
1336		1405
1337	sub size_allocate {	1406	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1407	my ($self, $w, $h) = @_;
1339		1408
1340	my $space = $self->{vertical} ? $h : $w;	1409	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1410	my $children = $self->{children};
1342		1411
1343	my @req;	1412	my @req;
…		…
1517		1586
1518	($w, $h)	1587	($w, $h)
1519	}	1588	}
1520		1589
1521	sub size_allocate {	1590	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1591	my ($self, $w, $h) = @_;
		1592
		1593	delete $self->{ox};
1523		1594
1524	delete $self->{texture}	1595	delete $self->{texture}
1525	if $changed;	1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1597	}
1527		1598
1528	sub set_fontsize {	1599	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1530		1601
…		…
1545	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1620
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1551		1623
		1624	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1555		1628
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1632	};
1562		1633
1563	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1636
…		…
1660	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1733	$self->_emit ('escape');
1663	} elsif ($uni) {	1734	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1665	}	1738	}
1666		1739
1667	$self->_set_text ($text);	1740	$self->_set_text ($text);
1668		1741
1669	$self->realloc;	1742	$self->realloc;
		1743
		1744	1
1670	}	1745	}
1671		1746
1672	sub focus_in {	1747	sub focus_in {
1673	my ($self) = @_;	1748	my ($self) = @_;
1674		1749
…		…
1689	utf8::encode $text;	1764	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1691		1766
1692	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1693	$self->update;	1768	$self->update;
		1769
		1770	1
1694	}	1771	}
1695		1772
1696	sub mouse_motion {	1773	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1776
		1777	0
1699	}	1778	}
1700		1779
1701	sub _draw {	1780	sub _draw {
1702	my ($self) = @_;	1781	my ($self) = @_;
1703		1782
…		…
1780	} else {	1859	} else {
1781	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1782	}	1861	}
1783		1862
1784	} else {	1863	} else {
1785	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1786	}	1867	1
1787
1788	}	1868	}
1789		1869
1790	#############################################################################	1870	#############################################################################
1791		1871
1792	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1822		1902
1823	$self->emit ("activate")	1903	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1826	}	1908	}
1827		1909
1828	sub _draw {	1910	sub _draw {
1829	my ($self) = @_;	1911	my ($self) = @_;
1830		1912
…		…
1884		1966
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1889	}	1975	1
1890	}	1976	}
1891		1977
1892	sub _draw {	1978	sub _draw {
1893	my ($self) = @_;	1979	my ($self) = @_;
1894		1980
…		…
2232		2318
2233	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2234		2320
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2322
2237	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2238	}	2324	}
2239		2325
2240	sub mouse_motion {	2326	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2242		2328
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2333
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2335
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2251	}	2341	1
2252	}	2342	}
2253		2343
2254	sub update {	2344	sub update {
2255	my ($self) = @_;	2345	my ($self) = @_;
2256		2346
…		…
2382	$self->{fontsize} = $fontsize;	2472	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2473	$self->reflow;
2384	}	2474	}
2385		2475
2386	sub size_allocate {	2476	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2477	my ($self, $w, $h) = @_;
2388		2478
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2479	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2480
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2481	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2483	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2484
…		…
2619	}	2707	}
2620		2708
2621	sub set_tooltip_from {	2709	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2623		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2624	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2722	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2724	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2726	ellipsise => 0,
2630	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2727	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2638		2735
2639	($w + 4, $h + 4)	2736	($w + 4, $h + 4)
2640	}	2737	}
2641		2738
2642	sub size_allocate {	2739	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2740	my ($self, $w, $h) = @_;
2644		2741
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2743	}
2649		2744
2650	sub visibility_change {	2745	sub visibility_change {
2651	my ($self, $visible) = @_;	2746	my ($self, $visible) = @_;
2652		2747
…		…
2773	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2774	}	2869	}
2775		2870
2776	#############################################################################	2871	#############################################################################
2777		2872
2778	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2779		2874
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2781		2876
2782	sub new {	2877	# 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		2878
2818	#############################################################################	2879	#############################################################################
2819		2880
2820	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2821		2882
…		…
2871	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2872		2933
2873	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2876	}	2939	}
2877		2940
2878	sub button_up {	2941	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2880		2943
…		…
2882	undef $GRAB;	2945	undef $GRAB;
2883	$self->hide;	2946	$self->hide;
2884		2947
2885	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
		2954	1
		2955	}
		2956
		2957	#############################################################################
		2958
		2959	package CFClient::UI::Multiplexer;
		2960
		2961	our @ISA = CFClient::UI::Container::;
		2962
		2963	sub new {
		2964	my $class = shift;
		2965
		2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
2887	}	3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3063	}
2889		3064
2890	#############################################################################	3065	#############################################################################
2891		3066
2892	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2998	}	3173	}
2999		3174
3000	#############################################################################	3175	#############################################################################
3001		3176
		3177	package CFClient::UI::Inventory;
		3178
		3179	our @ISA = CFClient::UI::ScrolledWindow::;
		3180
		3181	sub new {
		3182	my $class = shift;
		3183
		3184	my $self = $class->SUPER::new (
		3185	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3186	@_,
		3187	);
		3188
		3189	$self
		3190	}
		3191
		3192	sub set_items {
		3193	my ($self, $items) = @_;
		3194
		3195	$self->{child}->clear;
		3196	return unless $items;
		3197
		3198	my @items = sort {
		3199	($a->{type} <=> $b->{type})
		3200	or ($a->{name} cmp $b->{name})
		3201	} @$items;
		3202
		3203	$self->{real_items} = \@items;
		3204
		3205	my $row = 0;
		3206	for my $item (@items) {
		3207	CFClient::Item::update_widgets $item;
		3208
		3209	$self->{child}->add (0, $row, $item->{face_widget});
		3210	$self->{child}->add (1, $row, $item->{desc_widget});
		3211	$self->{child}->add (2, $row, $item->{weight_widget});
		3212
		3213	$row++;
		3214	}
		3215	}
		3216
		3217	#############################################################################
		3218
		3219	package CFClient::UI::BindEditor;
		3220
		3221	our @ISA = CFClient::UI::FancyFrame::;
		3222
		3223	sub new {
		3224	my $class = shift;
		3225
		3226	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3227
		3228	$self->add (my $vb = new CFClient::UI::VBox);
		3229
		3230
		3231	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3232	text => "start recording",
		3233	tooltip => "Start/Stops recording of actions."
		3234	."All subsequent actions after the recording started will be captured."
		3235	."The actions are displayed after the record was stopped."
		3236	."To bind the action you have to click on the 'Bind' button",
		3237	on_activate => sub {
		3238	unless ($self->{recording}) {
		3239	$self->start;
		3240	} else {
		3241	$self->stop;
		3242	}
		3243	});
		3244
		3245	$vb->add (new CFClient::UI::Label text => "Actions:");
		3246	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3251	$hb->add (new CFClient::UI::Button
		3252	text => "bind",
		3253	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3254	on_activate => sub {
		3255	$self->ask_for_bind;
		3256	});
		3257
		3258	$vb->add (my $hb = new CFClient::UI::HBox);
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "ok",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor and saves the binding",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->commit;
		3266	});
		3267
		3268	$hb->add (new CFClient::UI::Button
		3269	text => "cancel",
		3270	expand => 1,
		3271	tooltip => "This closes the binding editor without saving",
		3272	on_activate => sub {
		3273	$self->hide;
		3274	$self->{binding_cancel}->()
		3275	if $self->{binding_cancel};
		3276	});
		3277
		3278	$self->update_binding_widgets;
		3279
		3280	$self
		3281	}
		3282
		3283	sub commit {
		3284	my ($self) = @_;
		3285	my ($mod, $sym, $cmds) = $self->get_binding;
		3286	if ($sym != 0 && @$cmds > 0) {
		3287	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3288	."'. Don't forget 'Save Config'!");
		3289	$self->{binding_change}->($mod, $sym, $cmds)
		3290	if $self->{binding_change};
		3291	} else {
		3292	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3293	$self->{binding_cancel}->()
		3294	if $self->{binding_cancel};
		3295	}
		3296	}
		3297
		3298	sub start {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("stop recording");
		3302	$self->{recording} = 1;
		3303	$self->clear_command_list;
		3304	$::CONN->start_record if $::CONN;
		3305	}
		3306
		3307	sub stop {
		3308	my ($self) = @_;
		3309
		3310	$self->{rec_btn}->set_text ("start recording");
		3311	$self->{recording} = 0;
		3312
		3313	my $rec;
		3314	$rec = $::CONN->stop_record if $::CONN;
		3315	return unless ref $rec eq 'ARRAY';
		3316	$self->set_command_list ($rec);
		3317	}
		3318
		3319
		3320	sub ask_for_bind_and_commit {
		3321	my ($self) = @_;
		3322	$self->ask_for_bind (1);
		3323	}
		3324
		3325	sub ask_for_bind {
		3326	my ($self, $commit) = @_;
		3327
		3328	CFClient::Binder::open_binding_dialog (sub {
		3329	my ($mod, $sym) = @_;
		3330	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3331	$self->update_binding_widgets;
		3332	$self->commit if $commit;
		3333	});
		3334	}
		3335
		3336	# $mod and $sym are the modifiers and key symbol
		3337	# $cmds is a array ref of strings (the commands)
		3338	# $cb is the callback that is executed on OK
		3339	# $ccb is the callback that is executed on CANCEL and
		3340	# when the binding was unsuccessful on OK
		3341	sub set_binding {
		3342	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3343
		3344	$self->clear_command_list;
		3345	$self->{recording} = 0;
		3346	$self->{rec_btn}->set_text ("start recording");
		3347
		3348	$self->{binding} = [$mod, $sym];
		3349	$self->{commands} = $cmds;
		3350
		3351	$self->{binding_change} = $cb;
		3352	$self->{binding_cancel} = $ccb;
		3353
		3354	$self->update_binding_widgets;
		3355	}
		3356
		3357	# this is a shortcut method that asks for a binding
		3358	# and then just binds it.
		3359	sub do_quick_binding {
		3360	my ($self, $cmds) = @_;
		3361	$self->set_binding (undef, undef, $cmds, sub {
		3362	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3363	});
		3364	$self->ask_for_bind (1);
		3365	}
		3366
		3367	sub update_binding_widgets {
		3368	my ($self) = @_;
		3369	my ($mod, $sym, $cmds) = $self->get_binding;
		3370	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3371	$self->set_command_list ($cmds);
		3372	}
		3373
		3374	sub get_binding {
		3375	my ($self) = @_;
		3376	return (
		3377	$self->{binding}->[0],
		3378	$self->{binding}->[1],
		3379	[ grep { defined $_ } @{$self->{commands}} ]
		3380	);
		3381	}
		3382
		3383	sub clear_command_list {
		3384	my ($self) = @_;
		3385	$self->{cmdbox}->clear ();
		3386	}
		3387
		3388	sub set_command_list {
		3389	my ($self, $cmds) = @_;
		3390
		3391	$self->{cmdbox}->clear ();
		3392	$self->{commands} = $cmds;
		3393
		3394	my $idx = 0;
		3395
		3396	for (@$cmds) {
		3397	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3398
		3399	my $i = $idx;
		3400	$hb->add (new CFClient::UI::Label text => $_);
		3401	$hb->add (new CFClient::UI::Button
		3402	text => "delete",
		3403	tooltip => "Deletes the action from the record",
		3404	on_activate => sub {
		3405	$self->{cmdbox}->remove ($hb);
		3406	$cmds->[$i] = undef;
		3407	});
		3408
		3409
		3410	$idx++
		3411	}
		3412	}
		3413
		3414	#############################################################################
		3415
		3416	package CFClient::UI::SpellList;
		3417
		3418	our @ISA = CFClient::UI::Table::;
		3419
		3420	sub new {
		3421	my $class = shift;
		3422
		3423	my $self = $class->SUPER::new (
		3424	binding => [],
		3425	commands => [],
		3426	@_,
		3427	)
		3428	}
		3429
		3430	# XXX: Do sorting? Argl...
		3431	sub add_spell {
		3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
		3434
		3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3436	face => $spell->{face},
		3437	can_hover => 1,
		3438	can_events => 1,
		3439	tooltip => $spell->{message});
		3440
		3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3442	text => $spell->{name},
		3443	can_hover => 1,
		3444	can_events => 1,
		3445	tooltip => $spell->{message},
		3446	expand => 1);
		3447
		3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3450	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3451	expand => 1);
		3452
		3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3454	text => "bind to key",
		3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3456	}
		3457
		3458	sub rebuild_spell_list {
		3459	my ($self) = @_;
		3460	$self->{tbl_idx} = 0;
		3461	$self->add_spell ($_) for values %{$self->{spells}};
		3462	}
		3463
		3464	sub remove_spell {
		3465	my ($self, $spell) = @_;
		3466	delete $self->{spells}->{$spell->{name}};
		3467	$self->rebuild_spell_list;
		3468	}
		3469
		3470	#############################################################################
		3471
3002	package CFClient::UI::Root;	3472	package CFClient::UI::Root;
3003		3473
3004	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFClient::UI::Container::;
3005		3475
3006	use CFClient::OpenGL;	3476	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3486	Scalar::Util::weaken ($self->{root} = $self);
3017		3487
3018	$self	3488	$self
3019	}	3489	}
3020		3490
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 {	3491	sub size_request {
3038	my ($self) = @_;	3492	my ($self) = @_;
3039		3493
3040	($self->{w}, $self->{h})	3494	($self->{w}, $self->{h})
3041	}	3495	}
…		…
3053		3507
3054	int $coord + 0.5	3508	int $coord + 0.5
3055	}	3509	}
3056		3510
3057	sub size_allocate {	3511	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3512	my ($self, $w, $h) = @_;
3059		3513
3060	for my $child ($self->children) {	3514	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3515	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3516
3063	$X = $child->{force_x} if exists $child->{force_x};	3517	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3585	$_->()
3132	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3133	}	3587	}
3134		3588
3135	if ($self->{realloc}) {	3589	if ($self->{realloc}) {
		3590	my %queue;
3136	my @queue;	3591	my @queue;
		3592	my $widget;
3137		3593
		3594	outer:
3138	while () {	3595	while () {
3139	if ($self->{realloc}) {	3596	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3597	for $widget (values %$realloc) {
		3598	$widget->{visible} or next; # do not resize invisible widgets
3141		3599
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3144	}	3604	}
3145		3605
		3606	while () {
		3607	@queue or last outer;
		3608
3146	my $widget = pop @queue \|\| last;	3609	$widget = pop @{ $queue[-1] \|\| [] }
		3610	and last;
		3611
		3612	pop @queue;
		3613	}
3147		3614
3148	$widget->{visible} or last; # do not resize invisible widgets	3615	delete $queue{$widget+0};
3149		3616
3150	my ($w, $h) = $widget->size_request;	3617	my ($w, $h) = $widget->size_request;
3151		3618
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3619	$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;	3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3621
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3622	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3623	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3624
		3625	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3626	\|\| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3160		3629
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3630	$self->{size_alloc}{$widget+0} = $widget;
3162		3631
3163	push @queue, $widget->{parent}	3632	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3633	$self->{realloc}{$parent+0} = $parent
		3634	unless $queue{$parent+0};
		3635
		3636	$parent->{force_size_alloc} = 1;
		3637	$self->{size_alloc}{$parent+0} = $parent;
		3638	}
		3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3165	}	3642	}
3166	}	3643	}
3167		3644
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3647	values %$size_alloc;
3171		3648
3172	while () {	3649	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3650	my $widget = pop @queue \|\| last;
3174		3651
3175	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3652	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3177		3653
3178	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3180		3656
3181	$w = int $w + 0.5;	3657	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3658	$h = int $h + 0.5;
3183		3659
3184	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3660	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3661	$widget->{old_w} = $widget->{w};
		3662	$widget->{old_h} = $widget->{h};
3185		3663
3186	$widget->{w} = $w;	3664	$widget->{w} = $w;
3187	$widget->{h} = $h;	3665	$widget->{h} = $h;
3188		3666
3189	$widget->emit (size_allocate => $w, $h, $changed);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3190	}	3669	}
3191	}	3670	}
3192		3671
3193	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3194	$_->()	3673	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3196	}	3675	}
		3676
3197		3677
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3201		3681
…		…
3203	glLoadIdentity;	3683	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3686	glLoadIdentity;
3207		3687
		3688	{
		3689	package CFClient::UI::Base;
		3690
		3691	($draw_x, $draw_y, $draw_w, $draw_h) =
		3692	(0, 0, $self->{w}, $self->{h});
		3693	}
		3694
3208	$self->_draw;	3695	$self->_draw;
3209	}	3696	}
3210		3697
3211	#############################################################################	3698	#############################################################################
3212		3699

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.273 by root, Sat Jun 3 02:32:35 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.273 by root, Sat Jun 3 02:32:35 2006 UTC