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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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	delete $self->{max_w}; $self->{max_w} = $w if $w;
373	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $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	is_toplevel => 1,
1032	can_events => 1,	1082	can_events => 1,
1033	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
1034	);	1086	);
1035		1087
1036	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1037	align => 0,	1089	align => 0,
1038	valign => 1,	1090	valign => 1,
1039	text => $self->{title},	1091	text => $title,
1040	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1041		1094
1042	$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};
1043	}	1103	}
1044		1104
1045	sub border {	1105	sub border {
1046	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1047	}	1107	}
1048		1108
1049	sub size_request {	1109	sub size_request {
1050	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1051		1114
1052	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1053		1116
1054	(	1117	(
1055	$w + $self->border * 2,	1118	$w + $self->border * 2,
1056	$h + $self->border * 2,	1119	$h + $self->border * 2,
1057	)	1120	)
1058	}	1121	}
1059		1122
1060	sub size_allocate {	1123	sub size_allocate {
1061	my ($self, $w, $h, $changed) = @_;	1124	my ($self, $w, $h) = @_;
1062		1125
1063	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	}
1064		1131
		1132	my $border = $self->border;
		1133
1065	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1066	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1067		1136
1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069	if $self->{title};
1070
1071	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1072	}	1138	}
1073		1139
1074	sub button_down {	1140	sub button_down {
1075	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1076		1142
…		…
1095	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1096		1162
1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100	$self->realloc;	1167	$self->realloc;
1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102	};	1168	};
1103		1169
1104	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1109	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1110		1176
1111	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1112		1178
1113	$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});
1114	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1115	}	1187	1
1116	}	1188	}
1117		1189
1118	sub button_up {	1190	sub button_up {
1119	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1120		1192
1121	delete $self->{motion};	1193	!!delete $self->{motion}
1122	}	1194	}
1123		1195
1124	sub mouse_motion {	1196	sub mouse_motion {
1125	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1126		1198
1127	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1128	}	1202	}
1129		1203
1130	sub _draw {	1204	sub _draw {
1131	my ($self) = @_;	1205	my ($self) = @_;
1132		1206
		1207	my $child = $self->{children}[0];
		1208
1133	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1134	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1135		1211
1136	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138		1214
1139	my $border = $self->border;	1215	my $border = $self->border;
…		…
1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155	}	1231	}
1156		1232
1157	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1158		1234
1159	$self->{title}->draw if $self->{title};
1160
1161	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1162	}	1241	}
1163		1242
1164	#############################################################################	1243	#############################################################################
1165		1244
1166	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1240	(sum @$hs),	1319	(sum @$hs),
1241	)	1320	)
1242	}	1321	}
1243		1322
1244	sub size_allocate {	1323	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1324	my ($self, $w, $h) = @_;
1246		1325
1247	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1248		1327
1249	my $req_w = (sum @$ws) || 1;	1328	my $req_w = (sum @$ws) || 1;
1250	my $req_h = (sum @$hs) || 1;	1329	my $req_h = (sum @$hs) || 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1408	)
1330	}	1409	}
1331		1410
1332	sub size_allocate {	1411	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1412	my ($self, $w, $h) = @_;
1334		1413
1335	my $space = $self->{vertical} ? $h : $w;	1414	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1415	my $children = $self->{children};
1337		1416
1338	my @req;	1417	my @req;
…		…
1421	ellipsise => 3, # end	1500	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1423	fontsize => 1,	1502	fontsize => 1,
1424	align => -1,	1503	align => -1,
1425	valign => -1,	1504	valign => -1,
1426	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1427	can_events => 0,	1507	can_events => 0,
1428	%arg	1508	%arg
1429	);	1509	);
1430		1510
1431	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1507		1587
1508	$w = List::Util::max $w, $w2;	1588	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1589	$h = List::Util::max $h, $h2;
1510	}	1590	}
1511		1591
1512	(	1592	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1593	}
1517		1594
1518	sub size_allocate {	1595	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1596	my ($self, $w, $h) = @_;
		1597
		1598	delete $self->{ox};
1520		1599
1521	delete $self->{texture}	1600	delete $self->{texture}
1522	if $changed;	1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1602	}
1524		1603
1525	sub set_fontsize {	1604	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1605	my ($self, $fontsize) = @_;
1527		1606
…		…
1542	$self->{layout}->set_width ($self->{w});	1621	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1622	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1625
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1626	new_from_layout CFClient::Texture $self->{layout}
		1627	};
1548		1628
		1629	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1632	: ($self->{w} - $tex->{w}) * 0.5);
1552		1633
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1636	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1637	};
1559		1638
1560	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1641
		1642	glColor_premultiply @{$self->{fg}}
1563	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1564	glColor @{$self->{fg}};	1644
1565	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566	} else {
1567	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568	}
1569		1646
1570	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1571	}	1648	}
1572		1649
1573	#############################################################################	1650	#############################################################################
…		…
1600		1677
1601	delete $self->{cur_h};	1678	delete $self->{cur_h};
1602		1679
1603	return if $self->{text} eq $text;	1680	return if $self->{text} eq $text;
1604		1681
1605	delete $self->{texture};
1606
1607	$self->{last_activity} = $::NOW;	1682	$self->{last_activity} = $::NOW;
1608	$self->{text} = $text;	1683	$self->{text} = $text;
1609		1684
1610	$text =~ s/./*/g if $self->{hidden};	1685	$text =~ s/./*/g if $self->{hidden};
1611	$self->{layout}->set_text ("$text ");	1686	$self->{layout}->set_text ("$text ");
1612		1687
1613	$self->_emit (changed => $self->{text});	1688	$self->_emit (changed => $self->{text});
		1689	$self->update;
1614	}	1690	}
1615		1691
1616	sub set_text {	1692	sub set_text {
1617	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1618		1694
…		…
1657	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1735	$self->_emit ('escape');
1660	} elsif ($uni) {	1736	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1662	}	1740	}
1663		1741
1664	$self->_set_text ($text);	1742	$self->_set_text ($text);
1665		1743
1666	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1667	}	1747	}
1668		1748
1669	sub focus_in {	1749	sub focus_in {
1670	my ($self) = @_;	1750	my ($self) = @_;
1671		1751
…		…
1686	utf8::encode $text;	1766	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1688		1768
1689	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1690	$self->update;	1770	$self->update;
		1771
		1772	1
1691	}	1773	}
1692		1774
1693	sub mouse_motion {	1775	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1695	# 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
1696	}	1780	}
1697		1781
1698	sub _draw {	1782	sub _draw {
1699	my ($self) = @_;	1783	my ($self) = @_;
1700		1784
1701	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1702		1786
1703	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1704	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1705	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1706	} else {	1790	} else {
1707	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1708	}	1792	}
1709		1793
1710	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1711	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1713	glVertex 0 , 0;	1797	glVertex 0 , 0;
1714	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1715	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1716	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1777	} else {	1861	} else {
1778	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1779	}	1863	}
1780		1864
1781	} else {	1865	} else {
1782	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1783	}	1869	1
1784
1785	}	1870	}
1786		1871
1787	#############################################################################	1872	#############################################################################
1788		1873
1789	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1798		1883
1799	sub new {	1884	sub new {
1800	my $class = shift;	1885	my $class = shift;
1801		1886
1802	$class->SUPER::new (	1887	$class->SUPER::new (
1803	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1804	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1806	can_hover => 1,	1892	can_hover => 1,
1807	align => 0,	1893	align => 0,
1808	valign => 0,	1894	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1818		1904
1819	$self->emit ("activate")	1905	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1822	}	1910	}
1823		1911
1824	sub _draw {	1912	sub _draw {
1825	my ($self) = @_;	1913	my ($self) = @_;
1826		1914
1827	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829	if ($GRAB == $self) {
1830	$self->{fg} = $self->{active_fg};
1831	}
1832		1916
1833	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1834	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1836		1920
…		…
1855		1939
1856	sub new {	1940	sub new {
1857	my $class = shift;	1941	my $class = shift;
1858		1942
1859	$class->SUPER::new (	1943	$class->SUPER::new (
1860	padding => 2,	1944	padding_x => 2,
		1945	padding_y => 2,
1861	fg => [1, 1, 1],	1946	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1947	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1948	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1949	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1950	state => 0,
…		…
1869	}	1954	}
1870		1955
1871	sub size_request {	1956	sub size_request {
1872	my ($self) = @_;	1957	my ($self) = @_;
1873		1958
1874	($self->{padding} * 2 + 6) x 2	1959	(6) x 2
1875	}	1960	}
1876		1961
1877	sub button_down {	1962	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1963	my ($self, $ev, $x, $y) = @_;
1879		1964
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1967	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1968	$self->_emit (changed => $self->{state});
		1969	} else {
		1970	return 0
		1971	}
		1972
1884	}	1973	1
1885	}	1974	}
1886		1975
1887	sub _draw {	1976	sub _draw {
1888	my ($self) = @_;	1977	my ($self) = @_;
1889		1978
1890	$self->SUPER::_draw;	1979	$self->SUPER::_draw;
1891		1980
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1981	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1982
1894	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;
1895		1986
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1987	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1988
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1989	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1990
…		…
2054		2145
2055	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2056	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2057		2148
2058	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2059	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;
2060	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2154
2063	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2064	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2164	fg => [1, 1, 1],	2256	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2257	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2258	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2259	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2260	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2261	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2262	min_h => $::WIDTH / 80,
2171	vertical => 0,	2263	vertical => 0,
2172	can_hover => 1,	2264	can_hover => 1,
2173	inner_pad => 0.02,	2265	inner_pad => 0.02,
2174	@_	2266	@_
2175	);	2267	);
…		…
2215	}	2307	}
2216		2308
2217	sub size_request {	2309	sub size_request {
2218	my ($self) = @_;	2310	my ($self) = @_;
2219		2311
2220	my $w = $self->{req_w};	2312	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2313	}
2225		2314
2226	sub button_down {	2315	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2316	my ($self, $ev, $x, $y) = @_;
2228		2317
2229	$self->SUPER::button_down ($ev, $x, $y);	2318	$self->SUPER::button_down ($ev, $x, $y);
2230		2319
2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232		2321
2233	$self->mouse_motion ($ev, $x, $y);	2322	$self->mouse_motion ($ev, $x, $y)
2234	}	2323	}
2235		2324
2236	sub mouse_motion {	2325	sub mouse_motion {
2237	my ($self, $ev, $x, $y) = @_;	2326	my ($self, $ev, $x, $y) = @_;
2238		2327
…		…
2242	my (undef, $lo, $hi, $page) = @{$self->{range}};	2331	my (undef, $lo, $hi, $page) = @{$self->{range}};
2243		2332
2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2333	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245		2334
2246	$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
2247	}	2340	1
2248	}	2341	}
2249		2342
2250	sub update {	2343	sub update {
2251	my ($self) = @_;	2344	my ($self) = @_;
2252		2345
2253	$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}) {
2254	$self->set_value ($self->{range}[0]);	2354	$self->set_value ($self->{range}[0]);
2255		2355
2256	my ($value, $lo, $hi, $page) = @{$self->{range}};	2356	my ($value, $lo, $hi, $page) = @{$self->{range}};
2257	my $range = ($hi - $page - $lo) || 1e-100;	2357	my $range = ($hi - $page - $lo) || 1e-100;
2258		2358
…		…
2264	$value = ($value - $lo) / $range;	2364	$value = ($value - $lo) / $range;
2265	$value = $value * $self->{scale} + $self->{offset};	2365	$value = $value * $self->{scale} + $self->{offset};
2266		2366
2267	$self->{knob_x} = $value - $knob_w * 0.5;	2367	$self->{knob_x} = $value - $knob_w * 0.5;
2268	$self->{knob_w} = $knob_w;	2368	$self->{knob_w} = $knob_w;
2269	});	2369	}
2270
2271	$self->SUPER::update;
2272	}
2273
2274	sub _draw {
2275	my ($self) = @_;
2276		2370
2277	$self->SUPER::_draw ();	2371	$self->SUPER::_draw ();
2278		2372
2279	glScale $self->{w}, $self->{h};	2373	glScale $self->{w}, $self->{h};
2280		2374
…		…
2378	$self->{fontsize} = $fontsize;	2472	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2473	$self->reflow;
2380	}	2474	}
2381		2475
2382	sub size_allocate {	2476	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2477	my ($self, $w, $h) = @_;
2384		2478
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2479	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2480
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2481	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2483	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2484
…		…
2476		2568
2477	delete $self->{texture};	2569	delete $self->{texture};
2478	}	2570	}
2479		2571
2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2482	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2483		2575
2484	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2485		2577
2486	my $y0 = $top;	2578	my $y0 = $top;
…		…
2521	sub _draw {	2613	sub _draw {
2522	my ($self) = @_;	2614	my ($self) = @_;
2523		2615
2524	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2527	$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});
2528	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2529		2621
2530	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2531		2623
2532	}	2624	}
…		…
2615	}	2707	}
2616		2708
2617	sub set_tooltip_from {	2709	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2619		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
2620	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2722	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2724	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2726	ellipsise => 0,
2626	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2634		2735
2635	($w + 4, $h + 4)	2736	($w + 4, $h + 4)
2636	}	2737	}
2637		2738
2638	sub size_allocate {	2739	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2740	my ($self, $w, $h) = @_;
2640		2741
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
2644	}	2743	}
2645		2744
2646	sub visibility_change {	2745	sub visibility_change {
2647	my ($self, $visible) = @_;	2746	my ($self, $visible) = @_;
2648		2747
…		…
2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753		2852
2754	if ($tex) {	2853	if ($tex) {
2755	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2760	}	2859	}
2761	}	2860	}
2762		2861
…		…
2769	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2770	}	2869	}
2771		2870
2772	#############################################################################	2871	#############################################################################
2773		2872
2774	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2775		2874
2776	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2777		2876
2778	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813		2878
2814	#############################################################################	2879	#############################################################################
2815		2880
2816	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2817		2882
…		…
2858	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2924	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2861		2926
2862	$self->show;	2927	$self->show;
2863	$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);
2864	}	2929	}
2865		2930
2866	sub mouse_motion {	2931	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2868		2933
2869	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2870	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2872	}	2939	}
2873		2940
2874	sub button_up {	2941	sub button_up {
2875	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2876		2943
…		…
2878	undef $GRAB;	2945	undef $GRAB;
2879	$self->hide;	2946	$self->hide;
2880		2947
2881	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2882	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
2883	}	2954	1
2884	}	2955	}
2885		2956
2886	#############################################################################	2957	#############################################################################
2887		2958
2888	package CFClient::UI::Statusbox;	2959	package CFClient::UI::Multiplexer;
2889		2960
2890	our @ISA = CFClient::UI::VBox::;	2961	our @ISA = CFClient::UI::Container::;
2891		2962
2892	sub new {	2963	sub new {
2893	my $class = shift;	2964	my $class = shift;
2894		2965
2895	$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 (
2896	fontsize => 0.8,	3075	fontsize => 0.8,
2897	@_,	3076	@_,
2898	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
		3082	$this->reorder;
		3083	$this->update;
		3084	});
		3085
		3086	$self
2899	}	3087	}
2900		3088
2901	sub reorder {	3089	sub reorder {
2902	my ($self) = @_;	3090	my ($self) = @_;
2903	my $NOW = time;	3091	my $NOW = Time::HiRes::time;
2904		3092
2905	while (my ($k, $v) = each %{ $self->{item} }) {	3093	while (my ($k, $v) = each %{ $self->{item} }) {
2906	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907	}	3095	}
2908		3096
…		…
2910		3098
2911	my @items = sort {	3099	my @items = sort {
2912	$a->{pri} <=> $b->{pri}	3100	$a->{pri} <=> $b->{pri}
2913	or $b->{id} <=> $a->{id}	3101	or $b->{id} <=> $a->{id}
2914	} values %{ $self->{item} };	3102	} values %{ $self->{item} };
		3103
		3104	$self->{timer}->interval (1);
2915		3105
2916	my $count = 10 + 1;	3106	my $count = 10 + 1;
2917	for my $item (@items) {	3107	for my $item (@items) {
2918	last unless --$count;	3108	last unless --$count;
2919		3109
…		…
2934	tooltip_font => $::FONT_PROP,	3124	tooltip_font => $::FONT_PROP,
2935	tooltip_width => 0.67,	3125	tooltip_width => 0.67,
2936	fontsize => $item->{fontsize} || $self->{fontsize},	3126	fontsize => $item->{fontsize} || $self->{fontsize},
2937	max_w => $::WIDTH * 0.44,	3127	max_w => $::WIDTH * 0.44,
2938	fg => $item->{fg},	3128	fg => $item->{fg},
		3129	orig_alpha => $item->{fg}[3] || 1,
2939	can_events => 1,	3130	can_events => 1,
2940	can_hover => 1	3131	can_hover => 1
2941	};	3132	};
		3133
		3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
		3136	if ($diff < 1) {
		3137	$item->{label}{max_h} = $item->{label}{req_h} * $diff;
		3138	$item->{label}->realloc;
		3139	}
		3140	$item->{label}->update;
		3141	$self->{timer}->interval (1/30);
		3142	}
2942	}	3143	}
2943		3144
2944	$self->clear;	3145	$self->clear;
2945	$self->SUPER::add (reverse @widgets);	3146	$self->SUPER::add (reverse @widgets);
2946	}	3147	}
…		…
2951	$text =~ s/^\s+//;	3152	$text =~ s/^\s+//;
2952	$text =~ s/\s+$//;	3153	$text =~ s/\s+$//;
2953		3154
2954	return unless $text;	3155	return unless $text;
2955		3156
2956	my $timeout = time + ((delete $arg{timeout}) || 60);	3157	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957		3158
2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3159	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959		3160
2960	if (my $item = $self->{item}{$group}) {	3161	if (my $item = $self->{item}{$group}) {
2961	if ($item->{text} eq $text) {	3162	if ($item->{text} eq $text) {
…		…
2991		3192
2992	$self->reorder;	3193	$self->reorder;
2993	$self->SUPER::reconfigure;	3194	$self->SUPER::reconfigure;
2994	}	3195	}
2995		3196
		3197	sub DESTROY {
		3198	my ($self) = @_;
		3199
		3200	$self->{timer}->cancel;
		3201
		3202	$self->SUPER::DESTROY;
		3203	}
		3204
2996	#############################################################################	3205	#############################################################################
2997		3206
		3207	package CFClient::UI::Inventory;
		3208
		3209	our @ISA = CFClient::UI::ScrolledWindow::;
		3210
		3211	sub new {
		3212	my $class = shift;
		3213
		3214	my $self = $class->SUPER::new (
		3215	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3216	@_,
		3217	);
		3218
		3219	$self
		3220	}
		3221
		3222	sub set_items {
		3223	my ($self, $items) = @_;
		3224
		3225	$self->{child}->clear;
		3226	return unless $items;
		3227
		3228	my @items = sort {
		3229	($a->{type} <=> $b->{type})
		3230	or ($a->{name} cmp $b->{name})
		3231	} @$items;
		3232
		3233	$self->{real_items} = \@items;
		3234
		3235	my $row = 0;
		3236	for my $item (@items) {
		3237	CFClient::Item::update_widgets $item;
		3238
		3239	$self->{child}->add (0, $row, $item->{face_widget});
		3240	$self->{child}->add (1, $row, $item->{desc_widget});
		3241	$self->{child}->add (2, $row, $item->{weight_widget});
		3242
		3243	$row++;
		3244	}
		3245	}
		3246
		3247	#############################################################################
		3248
		3249	package CFClient::UI::BindEditor;
		3250
		3251	our @ISA = CFClient::UI::FancyFrame::;
		3252
		3253	sub new {
		3254	my $class = shift;
		3255
		3256	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3257
		3258	$self->add (my $vb = new CFClient::UI::VBox);
		3259
		3260
		3261	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3262	text => "start recording",
		3263	tooltip => "Start/Stops recording of actions."
		3264	."All subsequent actions after the recording started will be captured."
		3265	."The actions are displayed after the record was stopped."
		3266	."To bind the action you have to click on the 'Bind' button",
		3267	on_activate => sub {
		3268	unless ($self->{recording}) {
		3269	$self->start;
		3270	} else {
		3271	$self->stop;
		3272	}
		3273	});
		3274
		3275	$vb->add (new CFClient::UI::Label text => "Actions:");
		3276	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3277
		3278	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3279	$vb->add (my $hb = new CFClient::UI::HBox);
		3280	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3281	$hb->add (new CFClient::UI::Button
		3282	text => "bind",
		3283	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3284	on_activate => sub {
		3285	$self->ask_for_bind;
		3286	});
		3287
		3288	$vb->add (my $hb = new CFClient::UI::HBox);
		3289	$hb->add (new CFClient::UI::Button
		3290	text => "ok",
		3291	expand => 1,
		3292	tooltip => "This closes the binding editor and saves the binding",
		3293	on_activate => sub {
		3294	$self->hide;
		3295	$self->commit;
		3296	});
		3297
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "cancel",
		3300	expand => 1,
		3301	tooltip => "This closes the binding editor without saving",
		3302	on_activate => sub {
		3303	$self->hide;
		3304	$self->{binding_cancel}->()
		3305	if $self->{binding_cancel};
		3306	});
		3307
		3308	$self->update_binding_widgets;
		3309
		3310	$self
		3311	}
		3312
		3313	sub commit {
		3314	my ($self) = @_;
		3315	my ($mod, $sym, $cmds) = $self->get_binding;
		3316	if ($sym != 0 && @$cmds > 0) {
		3317	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3318	."'. Don't forget 'Save Config'!");
		3319	$self->{binding_change}->($mod, $sym, $cmds)
		3320	if $self->{binding_change};
		3321	} else {
		3322	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3323	$self->{binding_cancel}->()
		3324	if $self->{binding_cancel};
		3325	}
		3326	}
		3327
		3328	sub start {
		3329	my ($self) = @_;
		3330
		3331	$self->{rec_btn}->set_text ("stop recording");
		3332	$self->{recording} = 1;
		3333	$self->clear_command_list;
		3334	$::CONN->start_record if $::CONN;
		3335	}
		3336
		3337	sub stop {
		3338	my ($self) = @_;
		3339
		3340	$self->{rec_btn}->set_text ("start recording");
		3341	$self->{recording} = 0;
		3342
		3343	my $rec;
		3344	$rec = $::CONN->stop_record if $::CONN;
		3345	return unless ref $rec eq 'ARRAY';
		3346	$self->set_command_list ($rec);
		3347	}
		3348
		3349
		3350	sub ask_for_bind_and_commit {
		3351	my ($self) = @_;
		3352	$self->ask_for_bind (1);
		3353	}
		3354
		3355	sub ask_for_bind {
		3356	my ($self, $commit) = @_;
		3357
		3358	CFClient::Binder::open_binding_dialog (sub {
		3359	my ($mod, $sym) = @_;
		3360	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3361	$self->update_binding_widgets;
		3362	$self->commit if $commit;
		3363	});
		3364	}
		3365
		3366	# $mod and $sym are the modifiers and key symbol
		3367	# $cmds is a array ref of strings (the commands)
		3368	# $cb is the callback that is executed on OK
		3369	# $ccb is the callback that is executed on CANCEL and
		3370	# when the binding was unsuccessful on OK
		3371	sub set_binding {
		3372	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3373
		3374	$self->clear_command_list;
		3375	$self->{recording} = 0;
		3376	$self->{rec_btn}->set_text ("start recording");
		3377
		3378	$self->{binding} = [$mod, $sym];
		3379	$self->{commands} = $cmds;
		3380
		3381	$self->{binding_change} = $cb;
		3382	$self->{binding_cancel} = $ccb;
		3383
		3384	$self->update_binding_widgets;
		3385	}
		3386
		3387	# this is a shortcut method that asks for a binding
		3388	# and then just binds it.
		3389	sub do_quick_binding {
		3390	my ($self, $cmds) = @_;
		3391	$self->set_binding (undef, undef, $cmds, sub {
		3392	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3393	});
		3394	$self->ask_for_bind (1);
		3395	}
		3396
		3397	sub update_binding_widgets {
		3398	my ($self) = @_;
		3399	my ($mod, $sym, $cmds) = $self->get_binding;
		3400	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3401	$self->set_command_list ($cmds);
		3402	}
		3403
		3404	sub get_binding {
		3405	my ($self) = @_;
		3406	return (
		3407	$self->{binding}->[0],
		3408	$self->{binding}->[1],
		3409	[ grep { defined $_ } @{$self->{commands}} ]
		3410	);
		3411	}
		3412
		3413	sub clear_command_list {
		3414	my ($self) = @_;
		3415	$self->{cmdbox}->clear ();
		3416	}
		3417
		3418	sub set_command_list {
		3419	my ($self, $cmds) = @_;
		3420
		3421	$self->{cmdbox}->clear ();
		3422	$self->{commands} = $cmds;
		3423
		3424	my $idx = 0;
		3425
		3426	for (@$cmds) {
		3427	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3428
		3429	my $i = $idx;
		3430	$hb->add (new CFClient::UI::Label text => $_);
		3431	$hb->add (new CFClient::UI::Button
		3432	text => "delete",
		3433	tooltip => "Deletes the action from the record",
		3434	on_activate => sub {
		3435	$self->{cmdbox}->remove ($hb);
		3436	$cmds->[$i] = undef;
		3437	});
		3438
		3439
		3440	$idx++
		3441	}
		3442	}
		3443
		3444	#############################################################################
		3445
		3446	package CFClient::UI::SpellList;
		3447
		3448	our @ISA = CFClient::UI::Table::;
		3449
		3450	sub new {
		3451	my $class = shift;
		3452
		3453	my $self = $class->SUPER::new (
		3454	binding => [],
		3455	commands => [],
		3456	@_,
		3457	)
		3458	}
		3459
		3460	# XXX: Do sorting? Argl...
		3461	sub add_spell {
		3462	my ($self, $spell) = @_;
		3463	$self->{spells}->{$spell->{name}} = $spell;
		3464
		3465	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3466	face => $spell->{face},
		3467	can_hover => 1,
		3468	can_events => 1,
		3469	tooltip => $spell->{message});
		3470
		3471	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3472	text => $spell->{name},
		3473	can_hover => 1,
		3474	can_events => 1,
		3475	tooltip => $spell->{message},
		3476	expand => 1);
		3477
		3478	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3479	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3480	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3481	expand => 1);
		3482
		3483	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3484	text => "bind to key",
		3485	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3486	}
		3487
		3488	sub rebuild_spell_list {
		3489	my ($self) = @_;
		3490	$self->{tbl_idx} = 0;
		3491	$self->add_spell ($_) for values %{$self->{spells}};
		3492	}
		3493
		3494	sub remove_spell {
		3495	my ($self, $spell) = @_;
		3496	delete $self->{spells}->{$spell->{name}};
		3497	$self->rebuild_spell_list;
		3498	}
		3499
		3500	#############################################################################
		3501
2998	package CFClient::UI::Root;	3502	package CFClient::UI::Root;
2999		3503
3000	our @ISA = CFClient::UI::Container::;	3504	our @ISA = CFClient::UI::Container::;
		3505
		3506	use List::Util qw(min max);
3001		3507
3002	use CFClient::OpenGL;	3508	use CFClient::OpenGL;
3003		3509
3004	sub new {	3510	sub new {
3005	my $class = shift;	3511	my $class = shift;
…		…
3012	Scalar::Util::weaken ($self->{root} = $self);	3518	Scalar::Util::weaken ($self->{root} = $self);
3013		3519
3014	$self	3520	$self
3015	}	3521	}
3016		3522
3017	sub configure {
3018	my ($self, $x, $y, $w, $h) = @_;
3019
3020	$self->{w} = $w;
3021	$self->{h} = $h;
3022	}
3023
3024	sub reconfigure {
3025	my ($self) = @_;
3026
3027	$self->SUPER::reconfigure;
3028
3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3030	if $self->{w};
3031	}
3032
3033	sub size_request {	3523	sub size_request {
3034	my ($self) = @_;	3524	my ($self) = @_;
3035		3525
3036	($self->{w}, $self->{h})	3526	($self->{w}, $self->{h})
3037	}	3527	}
…		…
3049		3539
3050	int $coord + 0.5	3540	int $coord + 0.5
3051	}	3541	}
3052		3542
3053	sub size_allocate {	3543	sub size_allocate {
3054	my ($self, $w, $h, $changed) = @_;	3544	my ($self, $w, $h) = @_;
3055		3545
3056	for my $child ($self->children) {	3546	for my $child ($self->children) {
3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3547	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058		3548
3059	$X = $child->{force_x} if exists $child->{force_x};	3549	$X = $child->{force_x} if exists $child->{force_x};
…		…
3127	$_->()	3617	$_->()
3128	for values %{delete $self->{refresh_hook}};	3618	for values %{delete $self->{refresh_hook}};
3129	}	3619	}
3130		3620
3131	if ($self->{realloc}) {	3621	if ($self->{realloc}) {
		3622	my %queue;
3132	my @queue;	3623	my @queue;
		3624	my $widget;
3133		3625
		3626	outer:
3134	while () {	3627	while () {
3135	if ($self->{realloc}) {	3628	if (my $realloc = delete $self->{realloc}) {
3136	#TODO use array-of-depth approach	3629	for $widget (values %$realloc) {
		3630	$widget->{visible} or next; # do not resize invisible widgets
3137		3631
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3632	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{realloc}};	3633
		3634	push @{ $queue[$widget->{visible}] }, $widget;
		3635	}
3140	}	3636	}
3141		3637
		3638	while () {
		3639	@queue or last outer;
		3640
		3641	$widget = pop @{ $queue[-1] || [] }
		3642	and last;
		3643
		3644	pop @queue;
		3645	}
		3646
		3647	delete $queue{$widget+0};
		3648
		3649	my ($w, $h) = $widget->size_request;
		3650
		3651	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3652	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3653
		3654	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3655	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3656
		3657	$w = $widget->{force_w} if exists $widget->{force_w};
		3658	$h = $widget->{force_h} if exists $widget->{force_h};
		3659
		3660	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3661	|| delete $widget->{force_realloc}) {
		3662	$widget->{req_w} = $w;
		3663	$widget->{req_h} = $h;
		3664
		3665	$self->{size_alloc}{$widget+0} = $widget;
		3666
		3667	if (my $parent = $widget->{parent}) {
		3668	$self->{realloc}{$parent+0} = $parent
		3669	unless $queue{$parent+0};
		3670
		3671	$parent->{force_size_alloc} = 1;
		3672	$self->{size_alloc}{$parent+0} = $parent;
		3673	}
		3674	}
		3675
		3676	delete $self->{realloc}{$widget+0};
		3677	}
		3678	}
		3679
		3680	while (my $size_alloc = delete $self->{size_alloc}) {
		3681	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3682	values %$size_alloc;
		3683
		3684	while () {
3142	my $widget = pop @queue || last;	3685	my $widget = pop @queue || last;
3143		3686
3144	$widget->{visible} or last; # do not resize invisible widgets	3687	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147	? @$widget{qw(force_w force_h)}
3148	: $widget->size_request;
3149
3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152	$w = $min_size if $w < $min_size;
3153	$h = $min_size if $h < $min_size;
3154
3155	$widget->{req_w} = $w;
3156	$widget->{req_h} = $h;
3157
3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160	push @queue, $widget->{parent}
3161	if $widget->{parent};
3162	}
3163	}
3164
3165	while (my $size_alloc = delete $self->{size_alloc}) {
3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167	values %$size_alloc;
3168
3169	while () {
3170	my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172	$w = $widget->{w} || $widget->{req_w} unless defined $w;
3173	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3174		3688
3175	$w = 0 if $w < 0;	3689	$w = 0 if $w < 0;
3176	$h = 0 if $h < 0;	3690	$h = 0 if $h < 0;
3177		3691
3178	$w = int $w + 0.5;	3692	$w = int $w + 0.5;
3179	$h = int $h + 0.5;	3693	$h = int $h + 0.5;
3180		3694
3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3695	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3696	$widget->{old_w} = $widget->{w};
		3697	$widget->{old_h} = $widget->{h};
3182		3698
3183	$widget->{w} = $w;	3699	$widget->{w} = $w;
3184	$widget->{h} = $h;	3700	$widget->{h} = $h;
3185		3701
3186	$widget->emit (size_allocate => $w, $h, $changed);	3702	$widget->emit (size_allocate => $w, $h);
		3703	}
3187	}	3704	}
3188	}	3705	}
3189		3706
3190	while ($self->{post_alloc_hook}) {	3707	while ($self->{post_alloc_hook}) {
3191	$_->()	3708	$_->()
3192	for values %{delete $self->{post_alloc_hook}};	3709	for values %{delete $self->{post_alloc_hook}};
3193	}	3710	}
		3711
3194		3712
3195	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3713	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3714	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197	glClear GL_COLOR_BUFFER_BIT;	3715	glClear GL_COLOR_BUFFER_BIT;
3198		3716
…		…
3200	glLoadIdentity;	3718	glLoadIdentity;
3201	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3719	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202	glMatrixMode GL_MODELVIEW;	3720	glMatrixMode GL_MODELVIEW;
3203	glLoadIdentity;	3721	glLoadIdentity;
3204		3722
		3723	{
		3724	package CFClient::UI::Base;
		3725
		3726	($draw_x, $draw_y, $draw_w, $draw_h) =
		3727	(0, 0, $self->{w}, $self->{h});
		3728	}
		3729
3205	$self->_draw;	3730	$self->_draw;
3206	}	3731	}
3207		3732
3208	#############################################################################	3733	#############################################################################
3209		3734

Diff Legend

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