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

Diff Legend

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