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

Diff Legend

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