[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
167	sub rescale_widgets {	171	sub rescale_widgets {
168	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
169		173
170	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		178
175	$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.]+$/;
176	$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};
177	$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};
178	$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.]+$/;
179	$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};
180	$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};
181		185
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w \|\| $self->{h} != $h) {	361	if ($self->{alloc_w} != $w \|\| $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
…		…
430		439
431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432	unless $FOCUS;	441	unless $FOCUS;
433	}	442	}
434		443
435	sub mouse_motion { }	444	sub mouse_motion { 0 }
436	sub button_up { }	445	sub button_up { 0 }
437	sub key_down { }	446	sub key_down { 0 }
438	sub key_up { }	447	sub key_up { 0 }
439		448
440	sub button_down {	449	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
442		451
443	$self->focus_in;	452	$self->focus_in;
444	}
445		453
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451		456
452	sub find_widget {	457	sub find_widget {
453	my ($self, $x, $y) = @_;	458	my ($self, $x, $y) = @_;
454		459
455	return () unless $self->{can_events};	460	return () unless $self->{can_events};
…		…
463		468
464	sub set_parent {	469	sub set_parent {
465	my ($self, $parent) = @_;	470	my ($self, $parent) = @_;
466		471
467	Scalar::Util::weaken ($self->{parent} = $parent);	472	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	473	$self->set_visible if $parent->{visible};
470	}	474	}
471		475
472	sub connect {	476	sub connect {
473	my ($self, $signal, $cb) = @_;	477	my ($self, $signal, $cb) = @_;
…		…
494		498
495	sub realloc {	499	sub realloc {
496	my ($self) = @_;	500	my ($self) = @_;
497		501
498	if ($self->{visible}) {	502	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	503	return if $self->{root}{realloc}{$self+0};
500		504
501	$self->{root}{realloc}{$self} = $self;	505	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	506	$self->{root}->update;
503	} else {	507	} else {
504	delete $self->{req_w};	508	delete $self->{req_w};
		509	delete $self->{req_h};
505	}	510	}
506	}	511	}
507		512
508	sub update {	513	sub update {
509	my ($self) = @_;	514	my ($self) = @_;
…		…
517		522
518	$self->realloc;	523	$self->realloc;
519	$self->update;	524	$self->update;
520	}	525	}
521		526
		527	# using global variables seems a bit hacky, but passing through all drawing
		528	# functions seems pointless.
		529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		530
522	sub draw {	531	sub draw {
523	my ($self) = @_;	532	my ($self) = @_;
524		533
525	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
		535
		536	# update screen rectangle
		537	local $draw_x = $draw_x + $self->{x};
		538	local $draw_y = $draw_y + $self->{y};
		539	local $draw_w = $draw_x + $self->{w};
		540	local $draw_h = $draw_y + $self->{h};
		541
		542	# skip widgets that are entirely outside the drawing area
		543	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
		544	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
526		545
527	glPushMatrix;	546	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	548	$self->_draw;
530	glPopMatrix;	549	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
543	glEnd;	562	glEnd;
544	glDisable GL_BLEND;	563	glDisable GL_BLEND;
545	}	564	}
546		565
547	if ($ENV{CFPLUS_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	567	glPushMatrix;
549	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
761	sub size_request {	780	sub size_request {
762	$_[0]{children}[0]->size_request	781	$_[0]{children}[0]->size_request
763	}	782	}
764		783
765	sub size_allocate {	784	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	785	my ($self, $w, $h) = @_;
767		786
768	$self->{children}[0]->configure (0, 0, $w, $h);	787	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	788	}
770		789
771	#############################################################################	790	#############################################################################
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	807	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	808	$self->SUPER::update;
790	}	809	}
791		810
792	sub size_allocate {	811	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	812	my ($self, $w, $h) = @_;
794		813
795	$self->SUPER::size_allocate ($w, $h, $changed);	814	$self->SUPER::size_allocate ($w, $h);
796	$self->update	815	$self->update;
797	if $changed;
798	}	816	}
799		817
800	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
801	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
802	}	822	}
803		823
804	sub render_child {	824	sub render_child {
805	my ($self) = @_;	825	my ($self) = @_;
806		826
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	827	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
810		830
		831	{
		832	package CFClient::UI::Base;
		833
		834	($draw_x, $draw_y, $draw_w, $draw_h) =
		835	(0, 0, $self->{w}, $self->{h});
		836	}
		837
811	$self->_render;	838	$self->_render;
812	};	839	};
813	}	840	}
814		841
815	sub _draw {	842	sub _draw {
816	my ($self) = @_;	843	my ($self) = @_;
817		844
818	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
819		846
820	my $tex = $self->{texture}	847	my $tex = $self->{texture}
821	or return;	848	or return;
822		849
823	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
846	}	873	}
847		874
848	sub size_request {	875	sub size_request {
849	my ($self) = @_;	876	my ($self) = @_;
850		877
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		879
853	$w = 10 if $self->{scroll_x};	880	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	881	$h = 10 if $self->{scroll_y};
855		882
856	($w, $h)	883	($w, $h)
857	}	884	}
858		885
859	sub size_allocate {	886	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	887	my ($self, $w, $h) = @_;
861		888
		889	my $child = $self->child;
		890
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		893
865	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
866	$self->update;	895	$self->update;
867	}	896	}
868		897
…		…
903	}	932	}
904	}	933	}
905		934
906	sub _render {	935	sub _render {
907	my ($self) = @_;	936	my ($self) = @_;
		937
		938	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		939	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
908		940
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		942
911	$self->SUPER::_render;	943	$self->SUPER::_render;
912	}	944	}
…		…
952	my $child = $self->{vp}->child;	984	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	985	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	986	}
955		987
956	sub size_allocate {	988	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	989	my ($self, $w, $h) = @_;
958		990
959	$self->SUPER::size_allocate ($w, $h, $changed);	991	$self->SUPER::size_allocate ($w, $h);
960		992
961	my $child = $self->{vp}->child;	993	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	994	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	995	}
964		996
…		…
1020	my @border =	1052	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1054	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1055
1024	sub new {	1056	sub new {
1025	my $class = shift;	1057	my ($class, %arg) = @_;
		1058
		1059	my $title = delete $arg{title};
1026		1060
1027	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1064	border => 0.6,
1031	can_events => 1,	1065	can_events => 1,
1032	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
1033	);	1069	);
1034		1070
1035	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1072	align => 0,
1037	valign => 1,	1073	valign => 1,
1038	text => $self->{title},	1074	text => $title,
1039	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1040		1077
1041	$self	1078	$self
		1079	}
		1080
		1081	sub add {
		1082	my ($self, @widgets) = @_;
		1083
		1084	$self->SUPER::add (@widgets);
		1085	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1086	}
1043		1087
1044	sub border {	1088	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1046	}	1090	}
1047		1091
1048	sub size_request {	1092	sub size_request {
1049	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1050		1097
1051	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1052		1099
1053	(	1100	(
1054	$w + $self->border * 2,	1101	$w + $self->border * 2,
1055	$h + $self->border * 2,	1102	$h + $self->border * 2,
1056	)	1103	)
1057	}	1104	}
1058		1105
1059	sub size_allocate {	1106	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1107	my ($self, $w, $h) = @_;
1061		1108
1062	return unless $changed;	1109	if ($self->{title}) {
		1110	$self->{title}{w} = $w;
		1111	$self->{title}{h} = $h;
		1112	$self->{title}->size_allocate ($w, $h);
		1113	}
1063		1114
		1115	my $border = $self->border;
		1116
1064	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1066		1119
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1071	}	1121	}
1072		1122
1073	sub button_down {	1123	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1075		1125
…		…
1109		1159
1110	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1111		1161
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1113	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1114	}	1168	1
1115	}	1169	}
1116		1170
1117	sub button_up {	1171	sub button_up {
1118	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1119		1173
1120	delete $self->{motion};	1174	!!delete $self->{motion}
1121	}	1175	}
1122		1176
1123	sub mouse_motion {	1177	sub mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1125		1179
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1127	}	1183	}
1128		1184
1129	sub _draw {	1185	sub _draw {
1130	my ($self) = @_;	1186	my ($self) = @_;
1131		1187
		1188	my $child = $self->{children}[0];
		1189
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1192
1135	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1195
1138	my $border = $self->border;	1196	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1212	}
1155		1213
1156	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1157		1215
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1161	}	1222	}
1162		1223
1163	#############################################################################	1224	#############################################################################
1164		1225
1165	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1300	(sum @$hs),
1240	)	1301	)
1241	}	1302	}
1242		1303
1243	sub size_allocate {	1304	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1305	my ($self, $w, $h) = @_;
1245		1306
1246	my ($ws, $hs) = $self->get_wh;	1307	my ($ws, $hs) = $self->get_wh;
1247		1308
1248	my $req_w = (sum @$ws) \|\| 1;	1309	my $req_w = (sum @$ws) \|\| 1;
1249	my $req_h = (sum @$hs) \|\| 1;	1310	my $req_h = (sum @$hs) \|\| 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1388	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1389	)
1329	}	1390	}
1330		1391
1331	sub size_allocate {	1392	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1393	my ($self, $w, $h) = @_;
1333		1394
1334	my $space = $self->{vertical} ? $h : $w;	1395	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1396	my $children = $self->{children};
1336		1397
1337	my @req;	1398	my @req;
…		…
1420	ellipsise => 3, # end	1481	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1422	fontsize => 1,	1483	fontsize => 1,
1423	align => -1,	1484	align => -1,
1424	valign => -1,	1485	valign => -1,
1425	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1426	can_events => 0,	1488	can_events => 0,
1427	%arg	1489	%arg
1428	);	1490	);
1429		1491
1430	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1506		1568
1507	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1509	}	1571	}
1510		1572
1511	(	1573	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1574	}
1516		1575
1517	sub size_allocate {	1576	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1577	my ($self, $w, $h) = @_;
		1578
		1579	delete $self->{ox};
1519		1580
1520	delete $self->{texture}	1581	delete $self->{texture}
1521	if $changed;	1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1583	}
1523		1584
1524	sub set_fontsize {	1585	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1526		1587
…		…
1541	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1606
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1547		1609
		1610	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1551		1614
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1618	};
1558		1619
1559	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1622
…		…
1656	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1719	$self->_emit ('escape');
1659	} elsif ($uni) {	1720	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1661	}	1724	}
1662		1725
1663	$self->_set_text ($text);	1726	$self->_set_text ($text);
1664		1727
1665	$self->realloc;	1728	$self->realloc;
		1729
		1730	1
1666	}	1731	}
1667		1732
1668	sub focus_in {	1733	sub focus_in {
1669	my ($self) = @_;	1734	my ($self) = @_;
1670		1735
…		…
1685	utf8::encode $text;	1750	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1687		1752
1688	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1689	$self->update;	1754	$self->update;
		1755
		1756	1
1690	}	1757	}
1691		1758
1692	sub mouse_motion {	1759	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1761	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1762
		1763	0
1695	}	1764	}
1696		1765
1697	sub _draw {	1766	sub _draw {
1698	my ($self) = @_;	1767	my ($self) = @_;
1699		1768
…		…
1776	} else {	1845	} else {
1777	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1778	}	1847	}
1779		1848
1780	} else {	1849	} else {
1781	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1782	}	1853	1
1783
1784	}	1854	}
1785		1855
1786	#############################################################################	1856	#############################################################################
1787		1857
1788	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1797		1867
1798	sub new {	1868	sub new {
1799	my $class = shift;	1869	my $class = shift;
1800		1870
1801	$class->SUPER::new (	1871	$class->SUPER::new (
1802	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1803	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1805	can_hover => 1,	1876	can_hover => 1,
1806	align => 0,	1877	align => 0,
1807	valign => 0,	1878	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1817		1888
1818	$self->emit ("activate")	1889	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1821	}	1894	}
1822		1895
1823	sub _draw {	1896	sub _draw {
1824	my ($self) = @_;	1897	my ($self) = @_;
1825		1898
…		…
1854		1927
1855	sub new {	1928	sub new {
1856	my $class = shift;	1929	my $class = shift;
1857		1930
1858	$class->SUPER::new (	1931	$class->SUPER::new (
1859	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1860	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1938	state => 0,
…		…
1868	}	1942	}
1869		1943
1870	sub size_request {	1944	sub size_request {
1871	my ($self) = @_;	1945	my ($self) = @_;
1872		1946
1873	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1874	}	1948	}
1875		1949
1876	sub button_down {	1950	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1878		1952
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1883	}	1961	1
1884	}	1962	}
1885		1963
1886	sub _draw {	1964	sub _draw {
1887	my ($self) = @_;	1965	my ($self) = @_;
1888		1966
1889	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1890		1968
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1970
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1971	my ($w, $h) = @$self{qw(w h)};
		1972
		1973	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1974
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1976
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1978
…		…
2224		2304
2225	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2226		2306
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2308
2229	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2230	}	2310	}
2231		2311
2232	sub mouse_motion {	2312	sub mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2234		2314
…		…
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2319
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2321
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2322	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2323	} else {
		2324	return 0;
		2325	}
		2326
2243	}	2327	1
2244	}	2328	}
2245		2329
2246	sub update {	2330	sub update {
2247	my ($self) = @_;	2331	my ($self) = @_;
2248		2332
…		…
2374	$self->{fontsize} = $fontsize;	2458	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2459	$self->reflow;
2376	}	2460	}
2377		2461
2378	sub size_allocate {	2462	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2463	my ($self, $w, $h) = @_;
2380		2464
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2465	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2466
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2467	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2468	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2469	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2470
…		…
2611	}	2693	}
2612		2694
2613	sub set_tooltip_from {	2695	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2615		2697
		2698	my $tooltip = $widget->{tooltip};
		2699
		2700	if ($ENV{CFPLUS_DEBUG} & 2) {
		2701	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2702	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2703	. "req $widget->{req_w} $widget->{req_h}\n"
		2704	. "visible $widget->{visible}";
		2705	}
		2706
2616	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2708	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2710	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2712	ellipsise => 0,
2622	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2713	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2630		2721
2631	($w + 4, $h + 4)	2722	($w + 4, $h + 4)
2632	}	2723	}
2633		2724
2634	sub size_allocate {	2725	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2726	my ($self, $w, $h) = @_;
2636		2727
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2728	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2729	}
2641		2730
2642	sub visibility_change {	2731	sub visibility_change {
2643	my ($self, $visible) = @_;	2732	my ($self, $visible) = @_;
2644		2733
…		…
2765	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2766	}	2855	}
2767		2856
2768	#############################################################################	2857	#############################################################################
2769		2858
2770	package CFClient::UI::Inventory;
2771
2772	our @ISA = CFClient::UI::ScrolledWindow::;
2773
2774	sub new {
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806	$row++;
2807	}
2808	}
2809
2810	#############################################################################
2811
2812	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2813		2860
2814	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2815		2862
2816	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2854	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2902	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2857		2904
2858	$self->show;	2905	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2906	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2907	}
2861		2908
2862	sub mouse_motion {	2909	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2864		2911
2865	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2868	}	2917	}
2869		2918
2870	sub button_up {	2919	sub button_up {
2871	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2872		2921
…		…
2874	undef $GRAB;	2923	undef $GRAB;
2875	$self->hide;	2924	$self->hide;
2876		2925
2877	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2879	}	2932	1
2880	}	2933	}
2881		2934
2882	#############################################################################	2935	#############################################################################
2883		2936
2884	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2989	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2990	}	3043	}
2991		3044
2992	#############################################################################	3045	#############################################################################
2993		3046
		3047	package CFClient::UI::Inventory;
		3048
		3049	our @ISA = CFClient::UI::ScrolledWindow::;
		3050
		3051	sub new {
		3052	my $class = shift;
		3053
		3054	my $self = $class->SUPER::new (
		3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3056	@_,
		3057	);
		3058
		3059	$self
		3060	}
		3061
		3062	sub set_items {
		3063	my ($self, $items) = @_;
		3064
		3065	$self->{scrolled}->clear;
		3066	return unless $items;
		3067
		3068	my @items = sort {
		3069	($a->{type} <=> $b->{type})
		3070	or ($a->{name} cmp $b->{name})
		3071	} @$items;
		3072
		3073	$self->{real_items} = \@items;
		3074
		3075	my $row = 0;
		3076	for my $item (@items) {
		3077	CFClient::Item::update_widgets $item;
		3078
		3079	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3082
		3083	$row++;
		3084	}
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::BindEditor;
		3090
		3091	our @ISA = CFClient::UI::FancyFrame::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3097
		3098	$self->add (my $vb = new CFClient::UI::VBox);
		3099
		3100
		3101	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3102	text => "start recording",
		3103	tooltip => "Start/Stops recording of actions."
		3104	."All subsequent actions after the recording started will be captured."
		3105	."The actions are displayed after the record was stopped."
		3106	."To bind the action you have to click on the 'Bind' button",
		3107	on_activate => sub {
		3108	unless ($self->{recording}) {
		3109	$self->start;
		3110	} else {
		3111	$self->stop;
		3112	}
		3113	});
		3114
		3115	$vb->add (new CFClient::UI::Label text => "Actions:");
		3116	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3117
		3118	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3119	$vb->add (my $hb = new CFClient::UI::HBox);
		3120	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3121	$hb->add (new CFClient::UI::Button
		3122	text => "bind",
		3123	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3124	on_activate => sub {
		3125	$self->ask_for_bind;
		3126	});
		3127
		3128	$vb->add (my $hb = new CFClient::UI::HBox);
		3129	$hb->add (new CFClient::UI::Button
		3130	text => "ok",
		3131	expand => 1,
		3132	tooltip => "This closes the binding editor and saves the binding",
		3133	on_activate => sub {
		3134	$self->hide;
		3135	$self->commit;
		3136	});
		3137
		3138	$hb->add (new CFClient::UI::Button
		3139	text => "cancel",
		3140	expand => 1,
		3141	tooltip => "This closes the binding editor without saving",
		3142	on_activate => sub {
		3143	$self->hide;
		3144	$self->{binding_cancel}->()
		3145	if $self->{binding_cancel};
		3146	});
		3147
		3148	$self->update_binding_widgets;
		3149
		3150	$self
		3151	}
		3152
		3153	sub commit {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	if ($sym != 0 && @$cmds > 0) {
		3157	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3158	."'. Don't forget 'Save Config'!");
		3159	$self->{binding_change}->($mod, $sym, $cmds)
		3160	if $self->{binding_change};
		3161	} else {
		3162	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3163	$self->{binding_cancel}->()
		3164	if $self->{binding_cancel};
		3165	}
		3166	}
		3167
		3168	sub start {
		3169	my ($self) = @_;
		3170
		3171	$self->{rec_btn}->set_text ("stop recording");
		3172	$self->{recording} = 1;
		3173	$self->clear_command_list;
		3174	$::CONN->start_record if $::CONN;
		3175	}
		3176
		3177	sub stop {
		3178	my ($self) = @_;
		3179
		3180	$self->{rec_btn}->set_text ("start recording");
		3181	$self->{recording} = 0;
		3182
		3183	my $rec;
		3184	$rec = $::CONN->stop_record if $::CONN;
		3185	return unless ref $rec eq 'ARRAY';
		3186	$self->set_command_list ($rec);
		3187	}
		3188
		3189
		3190	sub ask_for_bind_and_commit {
		3191	my ($self) = @_;
		3192	$self->ask_for_bind (1);
		3193	}
		3194
		3195	sub ask_for_bind {
		3196	my ($self, $commit) = @_;
		3197
		3198	CFClient::Binder::open_binding_dialog (sub {
		3199	my ($mod, $sym) = @_;
		3200	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3201	$self->update_binding_widgets;
		3202	$self->commit if $commit;
		3203	});
		3204	}
		3205
		3206	# $mod and $sym are the modifiers and key symbol
		3207	# $cmds is a array ref of strings (the commands)
		3208	# $cb is the callback that is executed on OK
		3209	# $ccb is the callback that is executed on CANCEL and
		3210	# when the binding was unsuccessful on OK
		3211	sub set_binding {
		3212	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3213
		3214	$self->clear_command_list;
		3215	$self->{recording} = 0;
		3216	$self->{rec_btn}->set_text ("start recording");
		3217
		3218	$self->{binding} = [$mod, $sym];
		3219	$self->{commands} = $cmds;
		3220
		3221	$self->{binding_change} = $cb;
		3222	$self->{binding_cancel} = $ccb;
		3223
		3224	$self->update_binding_widgets;
		3225	}
		3226
		3227	# this is a shortcut method that asks for a binding
		3228	# and then just binds it.
		3229	sub do_quick_binding {
		3230	my ($self, $cmds) = @_;
		3231	$self->set_binding (undef, undef, $cmds, sub {
		3232	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3233	});
		3234	$self->ask_for_bind (1);
		3235	}
		3236
		3237	sub update_binding_widgets {
		3238	my ($self) = @_;
		3239	my ($mod, $sym, $cmds) = $self->get_binding;
		3240	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3241	$self->set_command_list ($cmds);
		3242	}
		3243
		3244	sub get_binding {
		3245	my ($self) = @_;
		3246	return (
		3247	$self->{binding}->[0],
		3248	$self->{binding}->[1],
		3249	[ grep { defined $_ } @{$self->{commands}} ]
		3250	);
		3251	}
		3252
		3253	sub clear_command_list {
		3254	my ($self) = @_;
		3255	$self->{cmdbox}->clear ();
		3256	}
		3257
		3258	sub set_command_list {
		3259	my ($self, $cmds) = @_;
		3260
		3261	$self->{cmdbox}->clear ();
		3262	$self->{commands} = $cmds;
		3263
		3264	my $idx = 0;
		3265
		3266	for (@$cmds) {
		3267	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3268
		3269	my $i = $idx;
		3270	$hb->add (new CFClient::UI::Label text => $_);
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "delete",
		3273	tooltip => "Deletes the action from the record",
		3274	on_activate => sub {
		3275	$self->{cmdbox}->remove ($hb);
		3276	$cmds->[$i] = undef;
		3277	});
		3278
		3279
		3280	$idx++
		3281	}
		3282	}
		3283
		3284	#############################################################################
		3285
		3286	package CFClient::UI::SpellList;
		3287
		3288	our @ISA = CFClient::UI::FancyFrame::;
		3289
		3290	sub new {
		3291	my $class = shift;
		3292
		3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3294
		3295	$self->add (new CFClient::UI::ScrolledWindow
		3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3297
		3298	$self;
		3299	}
		3300
		3301	# XXX: Do sorting? Argl...
		3302	sub add_spell {
		3303	my ($self, $spell) = @_;
		3304	$self->{spells}->{$spell->{name}} = $spell;
		3305
		3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3307	face => $spell->{face},
		3308	can_hover => 1,
		3309	can_events => 1,
		3310	tooltip => $spell->{message});
		3311
		3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3313	text => $spell->{name},
		3314	can_hover => 1,
		3315	can_events => 1,
		3316	tooltip => $spell->{message},
		3317	expand => 1);
		3318
		3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3321	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3322	expand => 1);
		3323
		3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3325	text => "bind to key",
		3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3327	}
		3328
		3329	sub rebuild_spell_list {
		3330	my ($self) = @_;
		3331	$self->{tbl_idx} = 0;
		3332	$self->add_spell ($_) for values %{$self->{spells}};
		3333	}
		3334
		3335	sub remove_spell {
		3336	my ($self, $spell) = @_;
		3337	delete $self->{spells}->{$spell->{name}};
		3338	$self->rebuild_spell_list;
		3339	}
		3340
		3341	#############################################################################
		3342
2994	package CFClient::UI::Root;	3343	package CFClient::UI::Root;
2995		3344
2996	our @ISA = CFClient::UI::Container::;	3345	our @ISA = CFClient::UI::Container::;
2997		3346
2998	use CFClient::OpenGL;	3347	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3357	Scalar::Util::weaken ($self->{root} = $self);
3009		3358
3010	$self	3359	$self
3011	}	3360	}
3012		3361
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3362	sub size_request {
3030	my ($self) = @_;	3363	my ($self) = @_;
3031		3364
3032	($self->{w}, $self->{h})	3365	($self->{w}, $self->{h})
3033	}	3366	}
…		…
3045		3378
3046	int $coord + 0.5	3379	int $coord + 0.5
3047	}	3380	}
3048		3381
3049	sub size_allocate {	3382	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3383	my ($self, $w, $h) = @_;
3051		3384
3052	for my $child ($self->children) {	3385	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3386	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3387
3055	$X = $child->{force_x} if exists $child->{force_x};	3388	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3456	$_->()
3124	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3125	}	3458	}
3126		3459
3127	if ($self->{realloc}) {	3460	if ($self->{realloc}) {
		3461	my %queue;
3128	my @queue;	3462	my @queue;
		3463	my $widget;
3129		3464
		3465	outer:
3130	while () {	3466	while () {
3131	if ($self->{realloc}) {	3467	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3468	for $widget (values %$realloc) {
		3469	$widget->{visible} or next; # do not resize invisible widgets
3133		3470
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3471	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3136	}	3475	}
3137		3476
		3477	while () {
		3478	@queue or last outer;
		3479
3138	my $widget = pop @queue \|\| last;	3480	$widget = pop @{ $queue[-1] \|\| [] }
		3481	and last;
		3482
		3483	pop @queue;
		3484	}
3139		3485
3140	$widget->{visible} or last; # do not resize invisible widgets	3486	delete $queue{$widget+0};
3141		3487
3142	my ($w, $h) = $widget->size_request;	3488	my ($w, $h) = $widget->size_request;
3143		3489
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} \|\| $widget->{is_toplevel} * 16, $w;	3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h} \|\| $widget->{is_toplevel} * 16, $h;	3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3492
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3493	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3494	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3495
		3496	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3497	\|\| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3154		3500
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3501	$self->{size_alloc}{$widget+0} = $widget;
3156		3502
3157	push @queue, $widget->{parent}	3503	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w \|\| $self->{h} != $h) && $widget->{parent};	3504	$self->{realloc}{$parent+0} = $parent
		3505	unless $queue{$parent+0};
		3506
		3507	$parent->{force_size_alloc} = 1;
		3508	$self->{size_alloc}{$parent+0} = $parent;
		3509	}
		3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3159	}	3513	}
3160	}	3514	}
3161		3515
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3518	values %$size_alloc;
3165		3519
3166	while () {	3520	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3521	my $widget = pop @queue \|\| last;
3168		3522
3169	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;	3523	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3171		3524
3172	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3174		3527
3175	$w = int $w + 0.5;	3528	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3529	$h = int $h + 0.5;
3177		3530
3178	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3531	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3532	$widget->{old_w} = $widget->{w};
		3533	$widget->{old_h} = $widget->{h};
3179		3534
3180	$widget->{w} = $w;	3535	$widget->{w} = $w;
3181	$widget->{h} = $h;	3536	$widget->{h} = $h;
3182		3537
3183	$widget->emit (size_allocate => $w, $h, $changed);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3184	}	3540	}
3185	}	3541	}
3186		3542
3187	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3188	$_->()	3544	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3190	}	3546	}
		3547
3191		3548
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3195		3552
…		…
3197	glLoadIdentity;	3554	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3557	glLoadIdentity;
3201		3558
		3559	{
		3560	package CFClient::UI::Base;
		3561
		3562	($draw_x, $draw_y, $draw_w, $draw_h) =
		3563	(0, 0, $self->{w}, $self->{h});
		3564	}
		3565
3202	$self->_draw;	3566	$self->_draw;
3203	}	3567	}
3204		3568
3205	#############################################################################	3569	#############################################################################
3206		3570

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs. Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC