ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 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
364	}	373	}
365		374
366	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
367	}	381	}
368		382
369	sub set_max_size {	383	sub set_max_size {
370	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
371		385
…		…
430		444
431	$::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
432	unless $FOCUS;	446	unless $FOCUS;
433	}	447	}
434		448
435	sub mouse_motion { }	449	sub mouse_motion { 0 }
436	sub button_up { }	450	sub button_up { 0 }
437	sub key_down { }	451	sub key_down { 0 }
438	sub key_up { }	452	sub key_up { 0 }
439		453
440	sub button_down {	454	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
442		456
443	$self->focus_in;	457	$self->focus_in;
444	}
445		458
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
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		461
452	sub find_widget {	462	sub find_widget {
453	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
454		464
455	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
463		473
464	sub set_parent {	474	sub set_parent {
465	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
466		476
467	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
470	}	479	}
471		480
472	sub connect {	481	sub connect {
473	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
494		503
495	sub realloc {	504	sub realloc {
496	my ($self) = @_;	505	my ($self) = @_;
497		506
498	if ($self->{visible}) {	507	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
500		509
501	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	511	$self->{root}->update;
503	} else {	512	} else {
504	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
505	}	515	}
506	}	516	}
507		517
508	sub update {	518	sub update {
509	my ($self) = @_;	519	my ($self) = @_;
…		…
517		527
518	$self->realloc;	528	$self->realloc;
519	$self->update;	529	$self->update;
520	}	530	}
521		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
522	sub draw {	536	sub draw {
523	my ($self) = @_;	537	my ($self) = @_;
524		538
525	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);
526		550
527	glPushMatrix;	551	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	553	$self->_draw;
530	glPopMatrix;	554	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
543	glEnd;	567	glEnd;
544	glDisable GL_BLEND;	568	glDisable GL_BLEND;
545	}	569	}
546		570
547	if ($ENV{CFPLUS_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	572	glPushMatrix;
549	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
644	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
645		669
646	sub new {	670	sub new {
647	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
648		672
649	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
650		674
651	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
652	children => [],	676	children => [],
653	can_events => 0,	677	can_events => 0,
654	%arg,	678	%arg,
655	);	679	);
		680
656	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
657		683
658	$self	684	$self
659	}	685	}
660		686
661	sub add {	687	sub add {
…		…
709	$x -= $self->{x};	735	$x -= $self->{x};
710	$y -= $self->{y};	736	$y -= $self->{y};
711		737
712	my $res;	738	my $res;
713		739
714	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
716	and return $res;	742	and return $res;
717	}	743	}
718		744
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
761	sub size_request {	787	sub size_request {
762	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
763	}	789	}
764		790
765	sub size_allocate {	791	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
767		793
768	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	795	}
770		796
771	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
772		800
773	package CFClient::UI::Window;	801	package CFClient::UI::Window;
774		802
775	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
776		804
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	817	$self->SUPER::update;
790	}	818	}
791		819
792	sub size_allocate {	820	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
794		822
795	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
796	$self->update	824	$self->update;
797	if $changed;
798	}	825	}
799		826
800	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
801	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
802	}	831	}
803		832
804	sub render_child {	833	sub render_child {
805	my ($self) = @_;	834	my ($self) = @_;
806		835
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
810		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
811	$self->_render;	847	$self->_render;
812	};	848	};
813	}	849	}
814		850
815	sub _draw {	851	sub _draw {
816	my ($self) = @_;	852	my ($self) = @_;
817		853
818	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
819		855
820	my $tex = $self->{texture}	856	my $tex = $self->{texture}
821	or return;	857	or return;
822		858
823	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
846	}	882	}
847		883
848	sub size_request {	884	sub size_request {
849	my ($self) = @_;	885	my ($self) = @_;
850		886
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		888
853	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
855		891
856	($w, $h)	892	($w, $h)
857	}	893	}
858		894
859	sub size_allocate {	895	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
861		897
		898	my $child = $self->child;
		899
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		902
865	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
866	$self->update;	904	$self->update;
867	}	905	}
868		906
…		…
904	}	942	}
905		943
906	sub _render {	944	sub _render {
907	my ($self) = @_;	945	my ($self) = @_;
908		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		951
911	$self->SUPER::_render;	952	$self->SUPER::_render;
912	}	953	}
913		954
…		…
916	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
917		958
918	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
919		960
920	sub new {	961	sub new {
921	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
922		965
923	my $self;	966	my $self;
924		967
925	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
926	vertical => 1,	969	vertical => 1,
…		…
931	;	974	;
932		975
933	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
934	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
935	slider => $slider,	978	slider => $slider,
936	@_,	979	%arg,
937	);	980	);
938		981
939	$self->{vp}->add ($self->{scrolled});
940	$self->add ($self->{vp});
941	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
942		984
943	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
944	}	992	}
945		993
946	sub update {	994	sub update {
947	my ($self) = @_;	995	my ($self) = @_;
948		996
…		…
952	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
953	$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]);
954	}	1002	}
955		1003
956	sub size_allocate {	1004	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
958		1006
959	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
960		1008
961	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1011	}
964		1012
…		…
1020	my @border =	1068	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	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);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1071
1024	sub new {	1072	sub new {
1025	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1026		1076
1027	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1080	border => 0.6,
1031	can_events => 1,	1081	can_events => 1,
1032	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1033	);	1085	);
1034		1086
1035	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1088	align => 0,
1037	valign => 1,	1089	valign => 1,
1038	text => $self->{title},	1090	text => $title,
1039	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1040		1093
1041	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1102	}
1043		1103
1044	sub border {	1104	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1046	}	1106	}
1047		1107
1048	sub size_request {	1108	sub size_request {
1049	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1050		1113
1051	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1052		1115
1053	(	1116	(
1054	$w + $self->border * 2,	1117	$w + $self->border * 2,
1055	$h + $self->border * 2,	1118	$h + $self->border * 2,
1056	)	1119	)
1057	}	1120	}
1058		1121
1059	sub size_allocate {	1122	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1061		1124
1062	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1063		1130
		1131	my $border = $self->border;
		1132
1064	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1066		1135
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);	1136	$self->child->configure ($border, $border, $w, $h);
1071	}	1137	}
1072		1138
1073	sub button_down {	1139	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1075		1141
…		…
1109		1175
1110	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1111		1177
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1113	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1114	}	1184	1
1115	}	1185	}
1116		1186
1117	sub button_up {	1187	sub button_up {
1118	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1119		1189
1120	delete $self->{motion};	1190	!!delete $self->{motion}
1121	}	1191	}
1122		1192
1123	sub mouse_motion {	1193	sub mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1125		1195
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1127	}	1199	}
1128		1200
1129	sub _draw {	1201	sub _draw {
1130	my ($self) = @_;	1202	my ($self) = @_;
1131		1203
		1204	my $child = $self->{children}[0];
		1205
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1208
1135	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1211
1138	my $border = $self->border;	1212	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1228	}
1155		1229
1156	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1157		1231
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1161	}	1238	}
1162		1239
1163	#############################################################################	1240	#############################################################################
1164		1241
1165	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1316	(sum @$hs),
1240	)	1317	)
1241	}	1318	}
1242		1319
1243	sub size_allocate {	1320	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1321	my ($self, $w, $h) = @_;
1245		1322
1246	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1247		1324
1248	my $req_w = (sum @$ws) || 1;	1325	my $req_w = (sum @$ws) || 1;
1249	my $req_h = (sum @$hs) || 1;	1326	my $req_h = (sum @$hs) || 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1405	)
1329	}	1406	}
1330		1407
1331	sub size_allocate {	1408	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1409	my ($self, $w, $h) = @_;
1333		1410
1334	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1412	my $children = $self->{children};
1336		1413
1337	my @req;	1414	my @req;
…		…
1420	ellipsise => 3, # end	1497	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1422	fontsize => 1,	1499	fontsize => 1,
1423	align => -1,	1500	align => -1,
1424	valign => -1,	1501	valign => -1,
1425	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1426	can_events => 0,	1504	can_events => 0,
1427	%arg	1505	%arg
1428	);	1506	);
1429		1507
1430	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1506		1584
1507	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1509	}	1587	}
1510		1588
1511	(	1589	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1590	}
1516		1591
1517	sub size_allocate {	1592	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1593	my ($self, $w, $h) = @_;
		1594
		1595	delete $self->{ox};
1519		1596
1520	delete $self->{texture}	1597	delete $self->{texture}
1521	if $changed;	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1599	}
1523		1600
1524	sub set_fontsize {	1601	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1526		1603
…		…
1541	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1622
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1547		1625
		1626	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1551		1630
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1634	};
1558		1635
1559	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1638
…		…
1599		1676
1600	delete $self->{cur_h};	1677	delete $self->{cur_h};
1601		1678
1602	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1603		1680
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1682	$self->{text} = $text;
1608		1683
1609	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1611		1686
1612	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1613	}	1689	}
1614		1690
1615	sub set_text {	1691	sub set_text {
1616	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1617		1693
…		…
1656	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1734	$self->_emit ('escape');
1659	} elsif ($uni) {	1735	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1661	}	1739	}
1662		1740
1663	$self->_set_text ($text);	1741	$self->_set_text ($text);
1664		1742
1665	$self->realloc;	1743	$self->realloc;
		1744
		1745	1
1666	}	1746	}
1667		1747
1668	sub focus_in {	1748	sub focus_in {
1669	my ($self) = @_;	1749	my ($self) = @_;
1670		1750
…		…
1685	utf8::encode $text;	1765	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1687		1767
1688	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1689	$self->update;	1769	$self->update;
		1770
		1771	1
1690	}	1772	}
1691		1773
1692	sub mouse_motion {	1774	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1695	}	1779	}
1696		1780
1697	sub _draw {	1781	sub _draw {
1698	my ($self) = @_;	1782	my ($self) = @_;
1699		1783
…		…
1776	} else {	1860	} else {
1777	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1778	}	1862	}
1779		1863
1780	} else {	1864	} else {
1781	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1782	}	1868	1
1783
1784	}	1869	}
1785		1870
1786	#############################################################################	1871	#############################################################################
1787		1872
1788	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1797		1882
1798	sub new {	1883	sub new {
1799	my $class = shift;	1884	my $class = shift;
1800		1885
1801	$class->SUPER::new (	1886	$class->SUPER::new (
1802	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1803	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1805	can_hover => 1,	1891	can_hover => 1,
1806	align => 0,	1892	align => 0,
1807	valign => 0,	1893	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1817		1903
1818	$self->emit ("activate")	1904	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1821	}	1909	}
1822		1910
1823	sub _draw {	1911	sub _draw {
1824	my ($self) = @_;	1912	my ($self) = @_;
1825		1913
…		…
1854		1942
1855	sub new {	1943	sub new {
1856	my $class = shift;	1944	my $class = shift;
1857		1945
1858	$class->SUPER::new (	1946	$class->SUPER::new (
1859	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1860	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1953	state => 0,
…		…
1868	}	1957	}
1869		1958
1870	sub size_request {	1959	sub size_request {
1871	my ($self) = @_;	1960	my ($self) = @_;
1872		1961
1873	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1874	}	1963	}
1875		1964
1876	sub button_down {	1965	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1878		1967
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1883	}	1976	1
1884	}	1977	}
1885		1978
1886	sub _draw {	1979	sub _draw {
1887	my ($self) = @_;	1980	my ($self) = @_;
1888		1981
1889	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1890		1983
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1985
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1989
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1991
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1993
…		…
2224		2319
2225	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2226		2321
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2323
2229	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2230	}	2325	}
2231		2326
2232	sub mouse_motion {	2327	sub mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2234		2329
…		…
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2334
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2336
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2243	}	2342	1
2244	}	2343	}
2245		2344
2246	sub update {	2345	sub update {
2247	my ($self) = @_;	2346	my ($self) = @_;
2248		2347
2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2250	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2251		2357
2252	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2253	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2254		2360
…		…
2260	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2261	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2262		2368
2263	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2264	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2265	});	2371	}
2266
2267	$self->SUPER::update;
2268	}
2269
2270	sub _draw {
2271	my ($self) = @_;
2272		2372
2273	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2274		2374
2275	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2276		2376
…		…
2374	$self->{fontsize} = $fontsize;	2474	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2475	$self->reflow;
2376	}	2476	}
2377		2477
2378	sub size_allocate {	2478	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2479	my ($self, $w, $h) = @_;
2380		2480
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2481	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2482
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2483	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2485	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2486
…		…
2611	}	2709	}
2612		2710
2613	sub set_tooltip_from {	2711	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2615		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2616	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2724	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2726	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2728	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2630		2737
2631	($w + 4, $h + 4)	2738	($w + 4, $h + 4)
2632	}	2739	}
2633		2740
2634	sub size_allocate {	2741	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2742	my ($self, $w, $h) = @_;
2636		2743
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2745	}
2641		2746
2642	sub visibility_change {	2747	sub visibility_change {
2643	my ($self, $visible) = @_;	2748	my ($self, $visible) = @_;
2644		2749
…		…
2765	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2766	}	2871	}
2767		2872
2768	#############################################################################	2873	#############################################################################
2769		2874
2770	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2771		2876
2772	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2773		2878
2774	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
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		2880
2810	#############################################################################	2881	#############################################################################
2811		2882
2812	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2813		2884
…		…
2854	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2926	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2857		2928
2858	$self->show;	2929	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2931	}
2861		2932
2862	sub mouse_motion {	2933	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2864		2935
2865	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2868	}	2941	}
2869		2942
2870	sub button_up {	2943	sub button_up {
2871	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2872		2945
…		…
2874	undef $GRAB;	2947	undef $GRAB;
2875	$self->hide;	2948	$self->hide;
2876		2949
2877	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2879	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2880	}	3065	}
2881		3066
2882	#############################################################################	3067	#############################################################################
2883		3068
2884	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2989	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2990	}	3175	}
2991		3176
2992	#############################################################################	3177	#############################################################################
2993		3178
		3179	package CFClient::UI::Inventory;
		3180
		3181	our @ISA = CFClient::UI::ScrolledWindow::;
		3182
		3183	sub new {
		3184	my $class = shift;
		3185
		3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
2994	package CFClient::UI::Root;	3474	package CFClient::UI::Root;
2995		3475
2996	our @ISA = CFClient::UI::Container::;	3476	our @ISA = CFClient::UI::Container::;
2997		3477
2998	use CFClient::OpenGL;	3478	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3488	Scalar::Util::weaken ($self->{root} = $self);
3009		3489
3010	$self	3490	$self
3011	}	3491	}
3012		3492
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 {	3493	sub size_request {
3030	my ($self) = @_;	3494	my ($self) = @_;
3031		3495
3032	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
3033	}	3497	}
…		…
3045		3509
3046	int $coord + 0.5	3510	int $coord + 0.5
3047	}	3511	}
3048		3512
3049	sub size_allocate {	3513	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3514	my ($self, $w, $h) = @_;
3051		3515
3052	for my $child ($self->children) {	3516	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3518
3055	$X = $child->{force_x} if exists $child->{force_x};	3519	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3587	$_->()
3124	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3125	}	3589	}
3126		3590
3127	if ($self->{realloc}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3128	my @queue;	3593	my @queue;
		3594	my $widget;
3129		3595
		3596	outer:
3130	while () {	3597	while () {
3131	if ($self->{realloc}) {	3598	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3133		3601
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3136	}	3606	}
3137		3607
		3608	while () {
		3609	@queue or last outer;
		3610
3138	my $widget = pop @queue || last;	3611	$widget = pop @{ $queue[-1] || [] }
		3612	and last;
		3613
		3614	pop @queue;
		3615	}
3139		3616
3140	$widget->{visible} or last; # do not resize invisible widgets	3617	delete $queue{$widget+0};
3141		3618
3142	my ($w, $h) = $widget->size_request;	3619	my ($w, $h) = $widget->size_request;
3143		3620
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;	3621	$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;	3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3623
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3624	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3625	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3154		3631
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3632	$self->{size_alloc}{$widget+0} = $widget;
3156		3633
3157	push @queue, $widget->{parent}	3634	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
		3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3159	}	3644	}
3160	}	3645	}
3161		3646
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3649	values %$size_alloc;
3165		3650
3166	while () {	3651	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3652	my $widget = pop @queue || last;
3168		3653
3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3171		3655
3172	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3174		3658
3175	$w = int $w + 0.5;	3659	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3660	$h = int $h + 0.5;
3177		3661
3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
3179		3665
3180	$widget->{w} = $w;	3666	$widget->{w} = $w;
3181	$widget->{h} = $h;	3667	$widget->{h} = $h;
3182		3668
3183	$widget->emit (size_allocate => $w, $h, $changed);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3184	}	3671	}
3185	}	3672	}
3186		3673
3187	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3188	$_->()	3675	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3190	}	3677	}
		3678
3191		3679
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3195		3683
…		…
3197	glLoadIdentity;	3685	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3688	glLoadIdentity;
3201		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3202	$self->_draw;	3697	$self->_draw;
3203	}	3698	}
3204		3699
3205	#############################################################################	3700	#############################################################################
3206		3701

Diff Legend

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