[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.272 by root, Sat Jun 3 01:47:14 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
…		…
907	}	939	}
908	}	940	}
909		941
910	sub _render {	942	sub _render {
911	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
912		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	}
…		…
956	my $child = $self->{vp}->child;	991	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	993	}
959		994
960	sub size_allocate {	995	sub size_allocate {
961	my ($self, $w, $h, $changed) = @_;	996	my ($self, $w, $h) = @_;
962		997
963	$self->SUPER::size_allocate ($w, $h, $changed);	998	$self->SUPER::size_allocate ($w, $h);
964		999
965	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
966	$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]);
967	}	1002	}
968		1003
…		…
1024	my @border =	1059	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	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);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1062
1028	sub new {	1063	sub new {
1029	my $class = shift;	1064	my ($class, %arg) = @_;
		1065
		1066	my $title = delete $arg{title};
1030		1067
1031	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1071	border => 0.6,
1035	can_events => 1,	1072	can_events => 1,
1036	min_w => 16,	1073	min_w => 16,
1037	min_h => 16,	1074	min_h => 16,
1038	@_	1075	%arg,
1039	);	1076	);
1040		1077
1041	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1042	align => 0,	1079	align => 0,
1043	valign => 1,	1080	valign => 1,
1044	text => $self->{title},	1081	text => $title,
1045	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1046		1084
1047	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048	}	1093	}
1049		1094
1050	sub border {	1095	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1052	}	1097	}
1053		1098
1054	sub size_request {	1099	sub size_request {
1055	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1056		1104
1057	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1058		1106
1059	(	1107	(
1060	$w + $self->border * 2,	1108	$w + $self->border * 2,
1061	$h + $self->border * 2,	1109	$h + $self->border * 2,
1062	)	1110	)
1063	}	1111	}
1064		1112
1065	sub size_allocate {	1113	sub size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1114	my ($self, $w, $h) = @_;
1067		1115
1068	return unless $changed;	1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
1069		1121
		1122	my $border = $self->border;
		1123
1070	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1072		1126
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);	1127	$self->child->configure ($border, $border, $w, $h);
1077	}	1128	}
1078		1129
1079	sub button_down {	1130	sub button_down {
1080	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1081		1132
…		…
1115		1166
1116	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1117		1168
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1119	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1120	}	1175	1
1121	}	1176	}
1122		1177
1123	sub button_up {	1178	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1125		1180
1126	delete $self->{motion};	1181	!!delete $self->{motion}
1127	}	1182	}
1128		1183
1129	sub mouse_motion {	1184	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1131		1186
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1133	}	1190	}
1134		1191
1135	sub _draw {	1192	sub _draw {
1136	my ($self) = @_;	1193	my ($self) = @_;
1137		1194
		1195	my $child = $self->{children}[0];
		1196
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1199
1141	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1202
1144	my $border = $self->border;	1203	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1219	}
1161		1220
1162	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1163		1222
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1167	}	1229	}
1168		1230
1169	#############################################################################	1231	#############################################################################
1170		1232
1171	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1307	(sum @$hs),
1246	)	1308	)
1247	}	1309	}
1248		1310
1249	sub size_allocate {	1311	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1312	my ($self, $w, $h) = @_;
1251		1313
1252	my ($ws, $hs) = $self->get_wh;	1314	my ($ws, $hs) = $self->get_wh;
1253		1315
1254	my $req_w = (sum @$ws) \|\| 1;	1316	my $req_w = (sum @$ws) \|\| 1;
1255	my $req_h = (sum @$hs) \|\| 1;	1317	my $req_h = (sum @$hs) \|\| 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1396	)
1335	}	1397	}
1336		1398
1337	sub size_allocate {	1399	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1400	my ($self, $w, $h) = @_;
1339		1401
1340	my $space = $self->{vertical} ? $h : $w;	1402	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1403	my $children = $self->{children};
1342		1404
1343	my @req;	1405	my @req;
…		…
1517		1579
1518	($w, $h)	1580	($w, $h)
1519	}	1581	}
1520		1582
1521	sub size_allocate {	1583	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1584	my ($self, $w, $h) = @_;
		1585
		1586	delete $self->{ox};
1523		1587
1524	delete $self->{texture}	1588	delete $self->{texture}
1525	if $changed;	1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1590	}
1527		1591
1528	sub set_fontsize {	1592	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1530		1594
…		…
1545	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1613
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1551		1616
		1617	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1555		1621
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1625	};
1562		1626
1563	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1629
…		…
1660	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1726	$self->_emit ('escape');
1663	} elsif ($uni) {	1727	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1665	}	1731	}
1666		1732
1667	$self->_set_text ($text);	1733	$self->_set_text ($text);
1668		1734
1669	$self->realloc;	1735	$self->realloc;
		1736
		1737	1
1670	}	1738	}
1671		1739
1672	sub focus_in {	1740	sub focus_in {
1673	my ($self) = @_;	1741	my ($self) = @_;
1674		1742
…		…
1689	utf8::encode $text;	1757	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1691		1759
1692	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1693	$self->update;	1761	$self->update;
		1762
		1763	1
1694	}	1764	}
1695		1765
1696	sub mouse_motion {	1766	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1699	}	1771	}
1700		1772
1701	sub _draw {	1773	sub _draw {
1702	my ($self) = @_;	1774	my ($self) = @_;
1703		1775
…		…
1780	} else {	1852	} else {
1781	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1782	}	1854	}
1783		1855
1784	} else {	1856	} else {
1785	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1786	}	1860	1
1787
1788	}	1861	}
1789		1862
1790	#############################################################################	1863	#############################################################################
1791		1864
1792	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1822		1895
1823	$self->emit ("activate")	1896	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1826	}	1901	}
1827		1902
1828	sub _draw {	1903	sub _draw {
1829	my ($self) = @_;	1904	my ($self) = @_;
1830		1905
…		…
1884		1959
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1889	}	1968	1
1890	}	1969	}
1891		1970
1892	sub _draw {	1971	sub _draw {
1893	my ($self) = @_;	1972	my ($self) = @_;
1894		1973
…		…
2232		2311
2233	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2234		2313
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2315
2237	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2238	}	2317	}
2239		2318
2240	sub mouse_motion {	2319	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2242		2321
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2326
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2328
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2251	}	2334	1
2252	}	2335	}
2253		2336
2254	sub update {	2337	sub update {
2255	my ($self) = @_;	2338	my ($self) = @_;
2256		2339
…		…
2382	$self->{fontsize} = $fontsize;	2465	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2466	$self->reflow;
2384	}	2467	}
2385		2468
2386	sub size_allocate {	2469	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2470	my ($self, $w, $h) = @_;
2388		2471
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2472	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2473
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2474	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2475	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2476	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2477
…		…
2619	}	2700	}
2620		2701
2621	sub set_tooltip_from {	2702	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2623		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2624	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2715	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2717	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2719	ellipsise => 0,
2630	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2720	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2638		2728
2639	($w + 4, $h + 4)	2729	($w + 4, $h + 4)
2640	}	2730	}
2641		2731
2642	sub size_allocate {	2732	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2733	my ($self, $w, $h) = @_;
2644		2734
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2736	}
2649		2737
2650	sub visibility_change {	2738	sub visibility_change {
2651	my ($self, $visible) = @_;	2739	my ($self, $visible) = @_;
2652		2740
…		…
2773	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2774	}	2862	}
2775		2863
2776	#############################################################################	2864	#############################################################################
2777		2865
2778	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2779		2867
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2781		2869
2782	sub new {	2870	# 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		2871
2818	#############################################################################	2872	#############################################################################
2819		2873
2820	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2821		2875
…		…
2871	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2872		2926
2873	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2876	}	2932	}
2877		2933
2878	sub button_up {	2934	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2880		2936
…		…
2882	undef $GRAB;	2938	undef $GRAB;
2883	$self->hide;	2939	$self->hide;
2884		2940
2885	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2887	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3054	}
2889		3055
2890	#############################################################################	3056	#############################################################################
2891		3057
2892	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2998	}	3164	}
2999		3165
3000	#############################################################################	3166	#############################################################################
3001		3167
		3168	package CFClient::UI::Inventory;
		3169
		3170	our @ISA = CFClient::UI::ScrolledWindow::;
		3171
		3172	sub new {
		3173	my $class = shift;
		3174
		3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
3002	package CFClient::UI::Root;	3464	package CFClient::UI::Root;
3003		3465
3004	our @ISA = CFClient::UI::Container::;	3466	our @ISA = CFClient::UI::Container::;
3005		3467
3006	use CFClient::OpenGL;	3468	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3478	Scalar::Util::weaken ($self->{root} = $self);
3017		3479
3018	$self	3480	$self
3019	}	3481	}
3020		3482
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 {	3483	sub size_request {
3038	my ($self) = @_;	3484	my ($self) = @_;
3039		3485
3040	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
3041	}	3487	}
…		…
3053		3499
3054	int $coord + 0.5	3500	int $coord + 0.5
3055	}	3501	}
3056		3502
3057	sub size_allocate {	3503	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3504	my ($self, $w, $h) = @_;
3059		3505
3060	for my $child ($self->children) {	3506	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3508
3063	$X = $child->{force_x} if exists $child->{force_x};	3509	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3577	$_->()
3132	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3133	}	3579	}
3134		3580
3135	if ($self->{realloc}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3136	my @queue;	3583	my @queue;
		3584	my $widget;
3137		3585
		3586	outer:
3138	while () {	3587	while () {
3139	if ($self->{realloc}) {	3588	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3141		3591
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3144	}	3596	}
3145		3597
		3598	while () {
		3599	@queue or last outer;
		3600
3146	my $widget = pop @queue \|\| last;	3601	$widget = pop @{ $queue[-1] \|\| [] }
		3602	and last;
		3603
		3604	pop @queue;
		3605	}
3147		3606
3148	$widget->{visible} or last; # do not resize invisible widgets	3607	delete $queue{$widget+0};
3149		3608
3150	my ($w, $h) = $widget->size_request;	3609	my ($w, $h) = $widget->size_request;
3151		3610
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3611	$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;	3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3613
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3614	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3615	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3616
		3617	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3618	\|\| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3160		3621
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3622	$self->{size_alloc}{$widget+0} = $widget;
3162		3623
3163	push @queue, $widget->{parent}	3624	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
		3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3165	}	3634	}
3166	}	3635	}
3167		3636
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3639	values %$size_alloc;
3171		3640
3172	while () {	3641	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3642	my $widget = pop @queue \|\| last;
3174		3643
3175	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3177		3645
3178	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3180		3648
3181	$w = int $w + 0.5;	3649	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3650	$h = int $h + 0.5;
3183		3651
3184	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3652	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
3185		3655
3186	$widget->{w} = $w;	3656	$widget->{w} = $w;
3187	$widget->{h} = $h;	3657	$widget->{h} = $h;
3188		3658
3189	$widget->emit (size_allocate => $w, $h, $changed);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3190	}	3661	}
3191	}	3662	}
3192		3663
3193	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3194	$_->()	3665	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3196	}	3667	}
		3668
3197		3669
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3201		3673
…		…
3203	glLoadIdentity;	3675	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3678	glLoadIdentity;
3207		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3208	$self->_draw;	3687	$self->_draw;
3209	}	3688	}
3210		3689
3211	#############################################################################	3690	#############################################################################
3212		3691

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.272 by root, Sat Jun 3 01:47:14 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.272 by root, Sat Jun 3 01:47:14 2006 UTC