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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		38	}
		39
		40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
31	}	43	}
32		44
33	return;	45	return;
34	}	46	}
35	}	47	}
…		…
125	$rem += $_ - $i;	137	$rem += $_ - $i;
126	$_ = $i;	138	$_ = $i;
127	}	139	}
128	}	140	}
129		141
		142	# call when resolution changes etc.
		143	sub rescale_widgets {
		144	my ($sx, $sy) = @_;
		145
		146	for my $widget (values %WIDGET) {
		147	if ($widget->{toplevel}) {
		148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		156	}
		157
		158	$widget->reconfigure;
		159	}
		160	}
		161
130	#############################################################################	162	#############################################################################
131		163
132	package CFClient::UI::Base;	164	package CFClient::UI::Base;
133		165
134	use strict;	166	use strict;
…		…
137		169
138	sub new {	170	sub new {
139	my $class = shift;	171	my $class = shift;
140		172
141	my $self = bless {	173	my $self = bless {
142	x => 0,	174	x => 0,
143	y => 0,	175	y => 0,
144	z => 0,	176	z => 0,
145	can_events => 1,	177	can_events => 1,
146	@_	178	@_
147	}, $class;	179	}, $class;
148		180
149	for (keys %$self) {	181	for (keys %$self) {
150	if (/^connect_(.*)$/) {	182	if (/^connect_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	183	$self->connect ($1 => delete $self->{$_});
152	}	184	}
153	}	185	}
154		186
		187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		188
155	$self	189	$self
156	}	190	}
157		191
158	sub destroy {	192	sub destroy {
159	my ($self) = @_;	193	my ($self) = @_;
…		…
165	sub show {	199	sub show {
166	my ($self) = @_;	200	my ($self) = @_;
167		201
168	return if $self->{parent};	202	return if $self->{parent};
169		203
		204	$self->{toplevel} = 1;
170	$CFClient::UI::ROOT->add ($self);	205	$CFClient::UI::ROOT->add ($self);
171	}	206	}
172		207
173	sub hide {	208	sub hide {
174	my ($self) = @_;	209	my ($self) = @_;
…		…
224	$self->{y} = $y;	259	$self->{y} = $y;
225	$self->update;	260	$self->update;
226	}	261	}
227		262
228	if ($self->{w} != $w || $self->{h} != $h) {	263	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	264	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	265	}
235	}	266	}
236		267
237	sub size_allocate {	268	sub size_allocate {
238	# nothing to be done	269	# nothing to be done
239	}	270	}
240		271
		272	sub reconfigure {
		273	my ($self) = @_;
		274
		275	$self->check_size (1);
		276	$self->update;
		277	}
		278
		279	sub children {
		280	}
		281
241	sub set_max_size {	282	sub set_max_size {
242	my ($self, $w, $h) = @_;	283	my ($self, $w, $h) = @_;
243		284
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	285	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	286	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}
247
248	# return top left coordinates
249	sub _topleft {
250	my ($self, $x, $y) = @_;
251
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253	}	287	}
254		288
255	# translate global coordinates to local coordinate system	289	# translate global coordinates to local coordinate system
256	sub coord2local {	290	sub coord2local {
257	my ($self, $x, $y) = @_;	291	my ($self, $x, $y) = @_;
258		292
259	my ($X, $Y) = $self->_topleft;	293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260	($x - $X, $y - $Y)
261	}	294	}
262		295
263	# translate local coordinates to global coordinate system	296	# translate local coordinates to global coordinate system
264	sub coord2global {	297	sub coord2global {
265	my ($self, $x, $y) = @_;	298	my ($self, $x, $y) = @_;
266		299
267	my ($X, $Y) = $self->_topleft;	300	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268	($x + $X, $y + $Y)
269	}	301	}
270		302
271	sub focus_in {	303	sub focus_in {
272	my ($self) = @_;	304	my ($self) = @_;
273		305
…		…
371		403
372	sub set_parent {	404	sub set_parent {
373	my ($self, $parent) = @_;	405	my ($self, $parent) = @_;
374		406
375	Scalar::Util::weaken ($self->{parent} = $parent);	407	Scalar::Util::weaken ($self->{parent} = $parent);
		408
		409	# TODO: req_w _does_change after ->reconfigure
		410	$self->check_size
		411	unless exists $self->{req_w};
376	}	412	}
377		413
378	sub check_size {	414	sub check_size {
379	my ($self) = @_;	415	my ($self, $forced) = @_;
380		416
381	$self->{parent}	417	$self->{force_alloc} = 1 if $forced;
382	or return 1;	418	$CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384	my ($w, $h) = $self->{user_w} && $self->{user_h}
385	? @$self{qw(user_w user_h)}
386	: $self->size_request;
387
388	if ($w != $self->{req_w} || $h != $self->{req_h}) {
389	$self->{req_w} = $w;
390	$self->{req_h} = $h;
391
392	$self->{parent}->check_size
393	or $self->size_allocate (
394	(List::Util::max $self->{w}, $w),
395	(List::Util::max $self->{h}, $h),
396	);
397
398	1
399	} else {
400	0
401	}
402	}	419	}
403		420
404	sub update {	421	sub update {
405	my ($self) = @_;	422	my ($self) = @_;
406		423
…		…
421	}	438	}
422		439
423	sub DESTROY {	440	sub DESTROY {
424	my ($self) = @_;	441	my ($self) = @_;
425		442
		443	delete $WIDGET{$self+0};
426	#$self->deactivate;	444	#$self->deactivate;
427	}	445	}
428		446
429	#############################################################################	447	#############################################################################
430		448
…		…
492	sub new {	510	sub new {
493	my ($class, %arg) = @_;	511	my ($class, %arg) = @_;
494		512
495	my $children = delete $arg{children} || [];	513	my $children = delete $arg{children} || [];
496		514
497	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	515	my $self = $class->SUPER::new (
		516	children => [],
		517	can_events => 0,
		518	%arg,
		519	);
498	$self->add ($_) for @$children;	520	$self->add ($_) for @$children;
499		521
500	$self	522	$self
501	}	523	}
502		524
503	sub add {	525	sub add {
504	my ($self, $child) = @_;	526	my ($self, @widgets) = @_;
505		527
506	$child->set_parent ($self);	528	$_->set_parent ($self)
		529	for @widgets;
507		530
508	use sort 'stable';	531	use sort 'stable';
509		532
510	$self->{children} = [	533	$self->{children} = [
511	sort { $a->{z} <=> $b->{z} }	534	sort { $a->{z} <=> $b->{z} }
512	@{$self->{children}}, $child	535	@{$self->{children}}, @widgets
513	];	536	];
514		537
515	$child->check_size;	538	$self->check_size (1);
		539	$self->update;
		540	}
		541
		542	sub children {
		543	@{ $_[0]{children} }
516	}	544	}
517		545
518	sub remove {	546	sub remove {
519	my ($self, $child) = @_;	547	my ($self, $child) = @_;
520		548
…		…
535		563
536	for (@$children) {	564	for (@$children) {
537	delete $_->{parent};	565	delete $_->{parent};
538	$_->hide;	566	$_->hide;
539	}	567	}
		568
		569	$self->check_size;
		570	$self->update;
540	}	571	}
541		572
542	sub find_widget {	573	sub find_widget {
543	my ($self, $x, $y) = @_;	574	my ($self, $x, $y) = @_;
544		575
…		…
619	}	650	}
620		651
621	sub update {	652	sub update {
622	my ($self) = @_;	653	my ($self) = @_;
623		654
624	# we want to do this delayed...	655	$ROOT->on_post_alloc ($self => sub { $self->render_child });
625	$self->render_chld;
626	$self->SUPER::update;	656	$self->SUPER::update;
627	}
628
629	sub render_chld {
630	my ($self) = @_;
631
632	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633	glClearColor 0, 0, 0, 1;
634	glClear GL_COLOR_BUFFER_BIT;
635	$self->child->draw;
636	};
637	}	657	}
638		658
639	sub size_allocate {	659	sub size_allocate {
640	my ($self, $w, $h) = @_;	660	my ($self, $w, $h) = @_;
641		661
642	$self->child->configure (0, 0, $w, $h);	662	$self->SUPER::size_allocate ($w, $h);
		663	$self->update;
		664	}
643		665
		666	sub _render {
		667	$_[0]{children}[0]->draw;
		668	}
		669
		670	sub render_child {
		671	my ($self) = @_;
		672
		673	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		674	glClearColor 0, 0, 0, 0;
		675	glClear GL_COLOR_BUFFER_BIT;
		676
644	$self->render_chld;	677	$self->_render;
		678	# glColorMask 1, 1, 1, 0;
		679	# glEnable GL_BLEND;
		680	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		681	# glRasterPos 0, 0;
		682	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		683	# glDisable GL_BLEND;
		684	# glColorMask 1, 1, 1, 1;
		685	};
645	}	686	}
646		687
647	sub _draw {	688	sub _draw {
648	my ($self) = @_;	689	my ($self) = @_;
649		690
650	my ($w, $h) = ($self->w, $self->h);	691	my ($w, $h) = ($self->w, $self->h);
651		692
652	my $tex = $self->{texture}	693	my $tex = $self->{texture}
653	or return;	694	or return;
654		695
655	glEnable GL_BLEND;
656	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657	glEnable GL_TEXTURE_2D;	696	glEnable GL_TEXTURE_2D;
658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		698	glColor 0, 0, 0, 1;
659		699
660	$tex->draw_quad (0, 0, $w, $h);	700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661		701
662	glDisable GL_BLEND;
663	glDisable GL_TEXTURE_2D;	702	glDisable GL_TEXTURE_2D;
664	}	703	}
665		704
666	#############################################################################	705	#############################################################################
667		706
668	package CFClient::UI::ViewPort;	707	package CFClient::UI::ViewPort;
669		708
670	our @ISA = CFClient::UI::Window::;	709	our @ISA = CFClient::UI::Window::;
671		710
672	sub new { die }
673
674	sub size_request {	711	sub size_request {
675	my ($self) = @_;	712	my ($self) = @_;
676		713
677	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	714	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	715	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
679		716
680	@$self{qw(child_w child_h)}	717	@$self{qw(child_w child_h)}
681	}	718	}
682		719
683	sub _draw {	720	sub size_allocate {
684	my ($self) = @_;	721	my ($self, $w, $h) = @_;
685		722
686	$self->{children}[1]->draw;	723	$self->update;
687	}	724	}
688		725
		726	sub set_offset {
		727	my ($self, $x, $y) = @_;
689		728
690	#############################################################################	729	$self->{view_x} = int $x;
		730	$self->{view_y} = int $y;
691		731
		732	$self->update;
		733	}
		734
		735	# hmm, this does not work for topleft of $self... but we should not ask for that
		736	sub coord2local {
		737	my ($self, $x, $y) = @_;
		738
		739	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		740	}
		741
		742	sub coord2global {
		743	my ($self, $x, $y) = @_;
		744
		745	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		746	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		747
		748	$self->SUPER::coord2global ($x, $y)
		749	}
		750
		751	sub find_widget {
		752	my ($self, $x, $y) = @_;
		753
		754	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		755	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		756	) {
		757	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		758	} else {
		759	$self->CFClient::UI::Base::find_widget ($x, $y)
		760	}
		761	}
		762
		763	sub _render {
		764	my ($self) = @_;
		765
		766	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		767
		768	$self->SUPER::_render;
		769	}
		770
		771	#############################################################################
		772
692	package CFClient::UI::Frame;	773	package CFClient::UI::ScrolledWindow;
693		774
694	our @ISA = CFClient::UI::Bin::;	775	our @ISA = CFClient::UI::HBox::;
695
696	use CFClient::OpenGL;
697		776
698	sub new {	777	sub new {
699	my $class = shift;	778	my $class = shift;
700		779
		780	my $self;
		781
		782	my $slider = new CFClient::UI::Slider
		783	vertical => 1,
		784	range => [0, 0, 1, 0.01], # HACK fix
		785	connect_changed => sub {
		786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		787	},
		788	;
		789
701	my $self = $class->SUPER::new (	790	$self = $class->SUPER::new (
702	bg => [1, 1, 1, 1],	791	vp => (new CFClient::UI::ViewPort),
703	border_bg => [1, 1, 1, 1],	792	slider => $slider,
704	border => 0.8,
705	@_	793	@_,
706	);	794	);
707		795
		796	$self->{vp}->add ($self->{scrolled});
		797	$self->add ($self->{vp});
		798	$self->add ($self->{slider});
		799
708	$self	800	$self
709	}	801	}
710		802
		803	#TODO# update range on size_allocate depending on child
		804	# update viewport offset on scroll
		805
		806	#############################################################################
		807
		808	package CFClient::UI::Frame;
		809
		810	our @ISA = CFClient::UI::Bin::;
		811
		812	use CFClient::OpenGL;
		813
		814	sub new {
		815	my $class = shift;
		816
		817	$class->SUPER::new (
		818	bg => undef,
		819	@_,
		820	)
		821	}
		822
711	sub _draw {	823	sub _draw {
712	my ($self) = @_;	824	my ($self) = @_;
713		825
714	my ($w, $h) = ($self->{w}, $self->{h});	826	if ($self->{bg}) {
		827	my ($w, $h) = @$self{qw(w h)};
715		828
716	glEnable GL_BLEND;	829	glEnable GL_BLEND;
717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718	glEnable GL_TEXTURE_2D;	831	glColor @{ $self->{bg} };
719	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720		832
721	# glBegin GL_QUADS;	833	glBegin GL_QUADS;
722	# glColor 0, 0, 0, 0;
723	# glVertex 0 , 0;	834	glVertex 0 , 0;
724	# glVertex 0 , $h;	835	glVertex 0 , $h;
725	# glVertex $w, $h;	836	glVertex $w, $h;
726	# glVertex $w, 0;	837	glVertex $w, 0;
727	# glEnd;	838	glEnd;
728		839
729
730	$self->child->draw;
731	glDisable GL_BLEND;	840	glDisable GL_BLEND;
732	glDisable GL_TEXTURE_2D;	841	}
		842
		843	$self->SUPER::_draw;
733	}	844	}
734		845
735	#############################################################################	846	#############################################################################
736		847
737	package CFClient::UI::FancyFrame;	848	package CFClient::UI::FancyFrame;
…		…
748	my $class = shift;	859	my $class = shift;
749		860
750	# TODO: user_x, user_y, overwrite moveto?	861	# TODO: user_x, user_y, overwrite moveto?
751		862
752	my $self = $class->SUPER::new (	863	my $self = $class->SUPER::new (
753	bg => [1, 1, 1, 1],	864	bg => [1, 1, 1, 1],
754	border_bg => [1, 1, 1, 1],	865	border_bg => [1, 1, 1, 1],
755	border => 0.8,	866	border => 0.6,
		867	toplevel => 1,
756	can_events => 1,	868	can_events => 1,
757	@_	869	@_
758	);	870	);
759		871
760	$self->{title} &&= new CFClient::UI::Label	872	$self->{title} &&= new CFClient::UI::Label
761	align => 0,	873	align => 0,
762	valign => 1,	874	valign => 1,
763	text => $self->{title},	875	text => $self->{title},
764	fontsize => 1;	876	fontsize => $self->{border};
765		877
766	$self	878	$self
767	}	879	}
768		880
769	sub border {	881	sub border {
…		…
794	}	906	}
795		907
796	sub button_down {	908	sub button_down {
797	my ($self, $ev, $x, $y) = @_;	909	my ($self, $ev, $x, $y) = @_;
798		910
		911	my ($w, $h) = @$self{qw(w h)};
799	my $border = $self->border;	912	my $border = $self->border;
800		913
801	if ($x < $self->{w} && $x >= $self->{w} - $border	914	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802	&& $y < $self->{h} && $y >= $self->{h} - $border) {	915	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803		916
		917	if ($lr & $td) {
		918	my ($wx, $wy) = ($self->{x}, $self->{y});
804	my ($ox, $oy) = ($ev->{x}, $ev->{y});	919	my ($ox, $oy) = ($ev->{x}, $ev->{y});
805	my ($bw, $bh) = ($self->{w}, $self->{h});	920	my ($bw, $bh) = ($self->{w}, $self->{h});
806		921
		922	my $mx = $x < $border;
		923	my $my = $y < $border;
		924
807	$self->{motion} = sub {	925	$self->{motion} = sub {
808	my ($ev, $x, $y) = @_;	926	my ($ev, $x, $y) = @_;
809		927
810	($x, $y) = ($ev->{x}, $ev->{y});	928	my $dx = $ev->{x} - $ox;
		929	my $dy = $ev->{y} - $oy;
811		930
812	$self->{user_w} = $bw + $x - $ox;	931	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813	$self->{user_h} = $bh + $y - $oy;	932	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		933	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
814	$self->check_size;	934	$self->check_size;
815	};	935	};
816		936
817	} elsif ($x >= 0 && $x < $self->{w}	937	} elsif ($lr ^ $td) {
818	&& $y >= 0 && $y < $border) {
819
820	my ($ox, $oy) = ($ev->{x}, $ev->{y});	938	my ($ox, $oy) = ($ev->{x}, $ev->{y});
821	my ($bx, $by) = ($self->{x}, $self->{y});	939	my ($bx, $by) = ($self->{x}, $self->{y});
822		940
823	$self->{motion} = sub {	941	$self->{motion} = sub {
824	my ($ev, $x, $y) = @_;	942	my ($ev, $x, $y) = @_;
…		…
847	my ($self) = @_;	965	my ($self) = @_;
848		966
849	my ($w, $h ) = ($self->{w}, $self->{h});	967	my ($w, $h ) = ($self->{w}, $self->{h});
850	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	968	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851		969
852	glEnable GL_BLEND;
853	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854	glEnable GL_TEXTURE_2D;	970	glEnable GL_TEXTURE_2D;
855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	971	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856		972
857	my $border = $self->border;	973	my $border = $self->border;
858		974
859	glColor @{ $self->{border_bg} };	975	glColor @{ $self->{border_bg} };
860	$tex[1]->draw_quad (0, 0, $w, $border);	976	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
861	$tex[3]->draw_quad (0, $border, $border, $ch);	977	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	978	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863	$tex[4]->draw_quad (0, $h - $border, $w, $border);	979	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864		980
		981	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865	my $bg = $tex[0];	982	my $bg = $tex[0];
866		983
867	# TODO: repeat texture not scale	984	# TODO: repeat texture not scale
868	my $rep_x = $cw / $bg->{w};	985	my $rep_x = $cw / $bg->{w};
869	my $rep_y = $ch / $bg->{h};	986	my $rep_y = $ch / $bg->{h};
870		987
871	glColor @{ $self->{bg} };	988	glColor @{ $self->{bg} };
872		989
873	$bg->{s} = $rep_x;	990	$bg->{s} = $rep_x;
874	$bg->{t} = $rep_y;	991	$bg->{t} = $rep_y;
875	$bg->{wrap_mode} = 1;	992	$bg->{wrap_mode} = 1;
876	$bg->draw_quad ($border, $border, $cw, $ch);	993	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		994	}
877		995
878	glDisable GL_TEXTURE_2D;	996	glDisable GL_TEXTURE_2D;
879	glDisable GL_BLEND;
880		997
881	$self->{title}->draw if $self->{title};	998	$self->{title}->draw if $self->{title};
		999
882	$self->child->draw;	1000	$self->child->draw;
883	}	1001	}
884		1002
885	#############################################################################	1003	#############################################################################
886		1004
…		…
908	$self->{children}[$y][$x] = $child;	1026	$self->{children}[$y][$x] = $child;
909		1027
910	$child->check_size;	1028	$child->check_size;
911	}	1029	}
912		1030
		1031	sub children {
		1032	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1033	}
		1034
913	# TODO: move to container class maybe? send childs a signal on removal?	1035	# TODO: move to container class maybe? send childs a signal on removal?
914	sub clear {	1036	sub clear {
915	my ($self) = @_;	1037	my ($self) = @_;
916		1038
917	my $children = delete $self->{children};	1039	my @children = $self->children;
		1040	delete $self->{children};
918		1041
919	for (grep $_, map @$_, grep $_, @$children) {	1042	for (@children) {
920	delete $_->{parent};	1043	delete $_->{parent};
921	$_->hide;	1044	$_->hide;
922	}	1045	}
923		1046
924	$self->update;	1047	$self->update;
…		…
1105	}	1228	}
1106		1229
1107	sub size_allocate {	1230	sub size_allocate {
1108	my ($self, $w, $h) = @_;	1231	my ($self, $w, $h) = @_;
1109		1232
		1233	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1234
1110	my $children = $self->{children};	1235	my $children = $self->{children};
1111		1236
1112	my @h = map $_->{req_h}, @$children;	1237	my @h = map $_->{req_h}, @$children;
1113		1238
1114	my $req_h = List::Util::sum @h;	1239	my $req_h = List::Util::sum @h;
…		…
1151		1276
1152	sub new {	1277	sub new {
1153	my ($class, %arg) = @_;	1278	my ($class, %arg) = @_;
1154		1279
1155	my $self = $class->SUPER::new (	1280	my $self = $class->SUPER::new (
1156	fg => [1, 1, 1],	1281	fg => [1, 1, 1],
1157	#font => default_font	1282	#font => default_font
		1283	#text => initial text
		1284	#markup => initial narkup
		1285	layout => (new CFClient::Layout),
1158	fontsize => 1,	1286	fontsize => 1,
1159	text => "",
1160	align => -1,	1287	align => -1,
1161	valign => -1,	1288	valign => -1,
1162	padding => 2,	1289	padding => 2,
1163	layout => new CFClient::Layout,
1164	can_events => 0,	1290	can_events => 0,
1165	%arg	1291	%arg
1166	);	1292	);
1167		1293
1168	if (exists $self->{template}) {	1294	if (exists $self->{template}) {
1169	my $layout = new CFClient::Layout;	1295	my $layout = new CFClient::Layout;
1170	$layout->set_text (delete $self->{template});	1296	$layout->set_text (delete $self->{template});
1171	$self->{template} = $layout;	1297	$self->{template} = $layout;
1172	}	1298	}
1173		1299
1174	$self->set_text (delete $self->{text}) if exists $self->{text};	1300	if (exists $self->{markup}) {
1175	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1301	$self->set_markup (delete $self->{markup});
		1302	} else {
		1303	$self->set_text (delete $self->{text});
		1304	}
1176		1305
1177	$self	1306	$self
1178	}	1307	}
1179		1308
1180	sub escape {	1309	sub escape {
…		…
1185	s/</&lt;/g;	1314	s/</&lt;/g;
1186		1315
1187	$_[1]	1316	$_[1]
1188	}	1317	}
1189		1318
		1319	sub update {
		1320	my ($self) = @_;
		1321
		1322	delete $self->{texture};
		1323	$self->SUPER::update;
		1324	}
		1325
1190	sub set_text {	1326	sub set_text {
1191	my ($self, $text) = @_;	1327	my ($self, $text) = @_;
1192		1328
		1329	return if $self->{text} eq "T$text";
		1330	$self->{text} = "T$text";
		1331
		1332	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1193	$self->{layout}->set_text ($text);	1333	$self->{layout}->set_text ($text);
1194		1334
1195	delete $self->{texture};	1335	$self->update;
1196	$self->check_size;	1336	$self->check_size;
1197	$self->update;
1198	}	1337	}
1199		1338
1200	sub set_markup {	1339	sub set_markup {
1201	my ($self, $markup) = @_;	1340	my ($self, $markup) = @_;
1202		1341
		1342	return if $self->{text} eq "M$markup";
		1343	$self->{text} = "M$markup";
		1344
		1345	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1346
		1347	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1203	$self->{layout}->set_markup ($markup);	1348	$self->{layout}->set_markup ($markup);
1204		1349
1205	delete $self->{texture};	1350	$self->update;
1206	$self->check_size;	1351	$self->check_size;
1207	$self->update;
1208	}	1352	}
1209		1353
1210	sub size_request {	1354	sub size_request {
1211	my ($self) = @_;	1355	my ($self) = @_;
1212		1356
…		…
1241	sub set_fontsize {	1385	sub set_fontsize {
1242	my ($self, $fontsize) = @_;	1386	my ($self, $fontsize) = @_;
1243		1387
1244	$self->{fontsize} = $fontsize;	1388	$self->{fontsize} = $fontsize;
1245	delete $self->{texture};	1389	delete $self->{texture};
		1390
		1391	$self->update;
1246	$self->check_size;	1392	$self->check_size;
1247	$self->update;
1248	}	1393	}
1249		1394
1250	sub _draw {	1395	sub _draw {
1251	my ($self) = @_;	1396	my ($self) = @_;
1252		1397
1253	my $tex = $self->{texture} ||= do {	1398	my $tex = $self->{texture} ||= do {
		1399	$self->{layout}->set_foreground (@{$self->{fg}});
1254	$self->{layout}->set_font ($self->{font}) if $self->{font};	1400	$self->{layout}->set_font ($self->{font}) if $self->{font};
1255	$self->{layout}->set_width ($self->{w});	1401	$self->{layout}->set_width ($self->{w});
1256	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1403
1257	new_from_layout CFClient::Texture $self->{layout}	1404	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1405
		1406	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1407	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1408	: ($self->{w} - $tex->{w}) * 0.5;
		1409
		1410	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1411	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1412	: ($self->{h} - $tex->{h}) * 0.5;
		1413
		1414	$tex
1258	};	1415	};
1259		1416
1260	glEnable GL_BLEND;
1261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262	glEnable GL_TEXTURE_2D;	1417	glEnable GL_TEXTURE_2D;
1263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1418	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264		1419
		1420	if ($tex->{format} == GL_ALPHA) {
1265	glColor @{$self->{fg}};	1421	glColor @{$self->{fg}};
1266
1267	$self->{ox} = int (
1268	$self->{align} < 0 ? $self->{padding}
1269	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270	: ($self->{w} - $tex->{w}) * 0.5
1271	);
1272
1273	$self->{oy} = int (
1274	$self->{valign} < 0 ? $self->{padding}
1275	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276	: ($self->{h} - $tex->{h}) * 0.5
1277	);
1278
1279	$tex->draw_quad ($self->{ox}, $self->{oy});	1422	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1423	} else {
		1424	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1425	}
1280		1426
1281	glDisable GL_TEXTURE_2D;	1427	glDisable GL_TEXTURE_2D;
1282	glDisable GL_BLEND;
1283	}	1428	}
1284		1429
1285	#############################################################################	1430	#############################################################################
1286		1431
1287	package CFClient::UI::EntryBase;	1432	package CFClient::UI::EntryBase;
…		…
1292		1437
1293	sub new {	1438	sub new {
1294	my $class = shift;	1439	my $class = shift;
1295		1440
1296	$class->SUPER::new (	1441	$class->SUPER::new (
1297	fg => [1, 1, 1],	1442	fg => [1, 1, 1],
1298	bg => [0, 0, 0, 0.2],	1443	bg => [0, 0, 0, 0.2],
1299	active_bg => [1, 1, 1, 0.5],	1444	active_bg => [1, 1, 1, 0.5],
1300	active_fg => [0, 0, 0],	1445	active_fg => [0, 0, 0],
1301	can_hover => 1,	1446	can_hover => 1,
1302	can_focus => 1,	1447	can_focus => 1,
1303	valign => 0,	1448	valign => 0,
1304	can_events => 1,	1449	can_events => 1,
1305	@_	1450	@_
1306	)	1451	)
1307	}	1452	}
1308		1453
…		…
1322	$self->{layout}->set_text ("$text ");	1467	$self->{layout}->set_text ("$text ");
1323		1468
1324	$self->emit (changed => $self->{text});	1469	$self->emit (changed => $self->{text});
1325	}	1470	}
1326		1471
		1472	sub set_text {
		1473	my ($self, $text) = @_;
		1474
		1475	$self->{cursor} = length $text;
		1476	$self->_set_text ($text);
		1477	$self->check_size;
		1478	$self->update;
		1479	}
		1480
1327	sub get_text {	1481	sub get_text {
1328	$_[0]{text}	1482	$_[0]{text}
1329	}	1483	}
1330		1484
1331	sub size_request {	1485	sub size_request {
…		…
1338		1492
1339	sub size_allocate {	1493	sub size_allocate {
1340	my ($self, $w, $h) = @_;	1494	my ($self, $w, $h) = @_;
1341		1495
1342	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1496	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343	}
1344
1345	sub set_text {
1346	my ($self, $text) = @_;
1347
1348	$self->{cursor} = length $text;
1349	$self->_set_text ($text);
1350	$self->update;
1351	}	1497	}
1352		1498
1353	sub key_down {	1499	sub key_down {
1354	my ($self, $ev) = @_;	1500	my ($self, $ev) = @_;
1355		1501
…		…
1357	my $sym = $ev->{sym};	1503	my $sym = $ev->{sym};
1358	my $uni = $ev->{unicode};	1504	my $uni = $ev->{unicode};
1359		1505
1360	my $text = $self->get_text;	1506	my $text = $self->get_text;
1361		1507
1362	if ($sym == 8) {	1508	if ($uni == 8) {
1363	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364	} elsif ($sym == 127) {	1510	} elsif ($uni == 127) {
1365	substr $text, $self->{cursor}, 1, "";	1511	substr $text, $self->{cursor}, 1, "";
1366	} elsif ($sym == CFClient::SDLK_LEFT) {	1512	} elsif ($sym == CFClient::SDLK_LEFT) {
1367	--$self->{cursor} if $self->{cursor};	1513	--$self->{cursor} if $self->{cursor};
1368	} elsif ($sym == CFClient::SDLK_RIGHT) {	1514	} elsif ($sym == CFClient::SDLK_RIGHT) {
1369	++$self->{cursor} if $self->{cursor} < length $self->{text};	1515	++$self->{cursor} if $self->{cursor} < length $self->{text};
1370	} elsif ($sym == CFClient::SDLK_HOME) {	1516	} elsif ($sym == CFClient::SDLK_HOME) {
1371	$self->{cursor} = 0;	1517	$self->{cursor} = 0;
1372	} elsif ($sym == CFClient::SDLK_END) {	1518	} elsif ($sym == CFClient::SDLK_END) {
1373	$self->{cursor} = length $text;	1519	$self->{cursor} = length $text;
1374	} elsif ($sym == 27) {	1520	} elsif ($uni == 27) {
1375	$self->emit ('escape');	1521	$self->emit ('escape');
1376	} elsif ($uni) {	1522	} elsif ($uni) {
1377	substr $text, $self->{cursor}++, 0, chr $uni;	1523	substr $text, $self->{cursor}++, 0, chr $uni;
1378	}	1524	}
1379		1525
…		…
1462	my ($self, $ev) = @_;	1608	my ($self, $ev) = @_;
1463		1609
1464	my $sym = $ev->{sym};	1610	my $sym = $ev->{sym};
1465		1611
1466	if ($sym == 13) {	1612	if ($sym == 13) {
		1613	unshift @{$self->{history}},
		1614	my $txt = $self->get_text;
		1615	$self->{history_pointer} = -1;
		1616	$self->{history_saveback} = '';
1467	$self->emit (activate => $self->get_text);	1617	$self->emit (activate => $txt);
1468	$self->update;	1618	$self->update;
		1619
		1620	} elsif ($sym == CFClient::SDLK_UP) {
		1621	if ($self->{history_pointer} < 0) {
		1622	$self->{history_saveback} = $self->get_text;
		1623	}
		1624	if (@{$self->{history} || []} > 0) {
		1625	$self->{history_pointer}++;
		1626	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1627	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1628	}
		1629	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1630	}
		1631
		1632	} elsif ($sym == CFClient::SDLK_DOWN) {
		1633	$self->{history_pointer}--;
		1634	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1635
		1636	if ($self->{history_pointer} >= 0) {
		1637	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1638	} else {
		1639	$self->set_text ($self->{history_saveback});
		1640	}
1469		1641
1470	} else {	1642	} else {
1471	$self->SUPER::key_down ($ev);	1643	$self->SUPER::key_down ($ev);
1472	}	1644	}
1473		1645
…		…
1487		1659
1488	sub new {	1660	sub new {
1489	my $class = shift;	1661	my $class = shift;
1490		1662
1491	$class->SUPER::new (	1663	$class->SUPER::new (
1492	padding => 4,	1664	padding => 4,
1493	fg => [1, 1, 1],	1665	fg => [1, 1, 1],
1494	bg => [1, 1, 1, 0.2],	1666	bg => [1, 1, 1, 0.2],
1495	active_fg => [0, 0, 1],	1667	active_fg => [0, 0, 1],
1496	can_hover => 1,	1668	can_hover => 1,
1497	align => 0,	1669	align => 0,
1498	valign => 0,	1670	valign => 0,
1499	can_events => 1,	1671	can_events => 1,
1500	@_	1672	@_
1501	)	1673	)
1502	}	1674	}
1503		1675
…		…
1517		1689
1518	if ($GRAB == $self) {	1690	if ($GRAB == $self) {
1519	$self->{fg} = $self->{active_fg};	1691	$self->{fg} = $self->{active_fg};
1520	}	1692	}
1521		1693
1522	glEnable GL_BLEND;
1523	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524	glEnable GL_TEXTURE_2D;	1694	glEnable GL_TEXTURE_2D;
1525	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526	glColor 0, 0, 0, 1;	1696	glColor 0, 0, 0, 1;
1527		1697
1528	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1698	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529		1699
1530	glDisable GL_TEXTURE_2D;	1700	glDisable GL_TEXTURE_2D;
1531	glDisable GL_BLEND;
1532		1701
1533	$self->SUPER::_draw;	1702	$self->SUPER::_draw;
1534	}	1703	}
1535		1704
1536	#############################################################################	1705	#############################################################################
…		…
1583		1752
1584	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1753	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1585		1754
1586	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1755	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587		1756
1588	glEnable GL_BLEND;	1757	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1758
1589	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1590	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592	my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594	$tex->draw_quad (0, 0, $s, $s);	1760	$tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596	glDisable GL_TEXTURE_2D;	1761	glDisable GL_TEXTURE_2D;
1597	glDisable GL_BLEND;
1598	}	1762	}
1599		1763
1600	#############################################################################	1764	#############################################################################
1601		1765
1602	package CFClient::UI::Image;	1766	package CFClient::UI::Image;
…		…
1645	glTranslate 0, -$self->{w}, 0;	1809	glTranslate 0, -$self->{w}, 0;
1646		1810
1647	($w, $h) = ($h, $w);	1811	($w, $h) = ($h, $w);
1648	}	1812	}
1649		1813
1650	glEnable GL_BLEND;
1651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652	glEnable GL_TEXTURE_2D;	1814	glEnable GL_TEXTURE_2D;
1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654		1816
1655	$tex->draw_quad (0, 0, $w, $h);	1817	$tex->draw_quad_alpha (0, 0, $w, $h);
1656		1818
1657	glDisable GL_BLEND;
1658	glDisable GL_TEXTURE_2D;	1819	glDisable GL_TEXTURE_2D;
1659	}	1820	}
1660		1821
1661	#############################################################################	1822	#############################################################################
1662		1823
…		…
1710	}	1871	}
1711		1872
1712	sub set_max {	1873	sub set_max {
1713	my ($self, $max) = @_;	1874	my ($self, $max) = @_;
1714		1875
		1876	return if $self->{max_val} == $max;
		1877
1715	$self->{max_val} = $max;	1878	$self->{max_val} = $max;
		1879	$self->update;
1716	}	1880	}
1717		1881
1718	sub set_value {	1882	sub set_value {
1719	my ($self, $val, $max) = @_;	1883	my ($self, $val, $max) = @_;
1720		1884
1721	$self->set_max ($max)	1885	$self->set_max ($max)
1722	if defined $max;	1886	if defined $max;
1723		1887
1724	$max = $self->{max_val};	1888	return if $self->{val} == $val;
		1889
1725	$self->{val} = $val;	1890	$self->{val} = $val;
1726
1727	$self->update;	1891	$self->update;
1728	}	1892	}
1729		1893
1730	sub _draw {	1894	sub _draw {
1731	my ($self) = @_;	1895	my ($self) = @_;
…		…
1794		1958
1795	sub new {	1959	sub new {
1796	my ($class, %arg) = @_;	1960	my ($class, %arg) = @_;
1797		1961
1798	my $self = $class->SUPER::new (	1962	my $self = $class->SUPER::new (
1799	tooltip => $arg{type},	1963	tooltip => $arg{type},
		1964	can_hover => 1,
1800	can_events => 1,	1965	can_events => 1,
1801	can_hover => 1,
1802	%arg,	1966	%arg,
1803	);	1967	);
1804		1968
1805	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1969	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	1970	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1814		1978
1815	$self->{value}->set_fontsize ($fsize);	1979	$self->{value}->set_fontsize ($fsize);
1816	$self->{max} ->set_fontsize ($fsize);	1980	$self->{max} ->set_fontsize ($fsize);
1817	}	1981	}
1818		1982
		1983	sub set_max {
		1984	my ($self, $max) = @_;
		1985
		1986	$self->{gauge}->set_max ($max);
		1987	$self->{max}->set_text ($max);
		1988	}
		1989
1819	sub set_value {	1990	sub set_value {
1820	my ($self, $val, $max) = @_;	1991	my ($self, $val, $max) = @_;
1821		1992
1822	$self->set_max ($max)	1993	$self->set_max ($max)
1823	if defined $max;	1994	if defined $max;
1824		1995
1825	$self->{gauge}->set_value ($val, $max);	1996	$self->{gauge}->set_value ($val, $max);
1826	$self->{value}->set_text ($val);	1997	$self->{value}->set_text ($val);
1827	}
1828
1829	sub set_max {
1830	my ($self, $max) = @_;
1831
1832	$self->{gauge}->set_max ($max);
1833	$self->{max}->set_text ($max);
1834	}	1998	}
1835		1999
1836	#############################################################################	2000	#############################################################################
1837		2001
1838	package CFClient::UI::Slider;	2002	package CFClient::UI::Slider;
…		…
1857	# TODO: calculations are off	2021	# TODO: calculations are off
1858	my $self = $class->SUPER::new (	2022	my $self = $class->SUPER::new (
1859	fg => [1, 1, 1],	2023	fg => [1, 1, 1],
1860	active_fg => [0, 0, 0],	2024	active_fg => [0, 0, 0],
1861	range => [0, 0, 100, 10],	2025	range => [0, 0, 100, 10],
1862	req_w => 20,	2026	req_w => $::WIDTH / 80,
1863	req_h => 20,	2027	req_h => $::WIDTH / 80,
1864	vertical => 0,	2028	vertical => 0,
1865	can_hover => 1,	2029	can_hover => 1,
1866	inner_pad => 5,	2030	inner_pad => 5,
1867	@_	2031	@_
1868	);	2032	);
…		…
1951	$page ||= 2;	2115	$page ||= 2;
1952		2116
1953	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1954	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1955		2119
1956	glEnable GL_BLEND;
1957	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1958	glEnable GL_TEXTURE_2D;	2120	glEnable GL_TEXTURE_2D;
1959	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1960		2122
1961	# draw background	2123	# draw background
1962	$tex[1]->draw_quad (0, 0, $w, $h);	2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1963		2125
1964	# draw handle	2126	# draw handle
1965	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2127	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1966		2128
1967	glDisable GL_BLEND;
1968	glDisable GL_TEXTURE_2D;	2129	glDisable GL_TEXTURE_2D;
1969	}	2130	}
1970		2131
1971	#############################################################################	2132	#############################################################################
1972		2133
…		…
1978		2139
1979	sub new {	2140	sub new {
1980	my $class = shift;	2141	my $class = shift;
1981		2142
1982	my $self = $class->SUPER::new (	2143	my $self = $class->SUPER::new (
1983	fontsize => 1,	2144	fontsize => 1,
		2145	can_events => 0,
1984	#font => default_font	2146	#font => default_font
1985	@_,	2147	@_,
1986		2148
1987	layout => (new CFClient::Layout),	2149	layout => (new CFClient::Layout 1),
1988	par => [],	2150	par => [],
1989	height => 0,	2151	height => 0,
1990	children => [	2152	children => [
1991	(new CFClient::UI::Empty expand => 1),	2153	(new CFClient::UI::Empty expand => 1),
1992	(new CFClient::UI::Slider vertical => 1),	2154	(new CFClient::UI::Slider vertical => 1),
1993	],	2155	],
1994	);	2156	);
1995		2157
1996	$self->{children}[1]->connect (changed => sub {	2158	$self->{children}[1]->connect (changed => sub { $self->update });
1997	$self->update;
1998	});
1999		2159
2000	$self	2160	$self
2001	}	2161	}
2002		2162
2003	sub set_fontsize {	2163	sub set_fontsize {
…		…
2011	my ($self, $text) = @_;	2171	my ($self, $text) = @_;
2012		2172
2013	my $layout = $self->{layout};	2173	my $layout = $self->{layout};
2014		2174
2015	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016	$layout->set_width ($self->{w});	2176	$layout->set_width ($self->{children}[0]{w});
2017	$layout->set_text ($text);	2177	$layout->set_markup ($text);
2018		2178
2019	($layout->size)[1]	2179	($layout->size)[1]
2020	}	2180	}
2021		2181
2022	sub reflow {	2182	sub reflow {
…		…
2060		2220
2061	return unless $self->{h} > 0;	2221	return unless $self->{h} > 0;
2062		2222
2063	delete $self->{texture};	2223	delete $self->{texture};
2064		2224
2065	$ROOT->on_refresh ($self, sub {	2225	$ROOT->on_post_alloc ($self, sub {
2066	if (delete $self->{need_reflow}) {	2226	if (delete $self->{need_reflow}) {
2067	my $height = 0;	2227	my $height = 0;
2068		2228
2069	$height += $_->[0] = $self->text_height ($_->[2])	2229	$height += $_->[0] = $self->text_height ($_->[2])
2070	for @{$self->{par}};	2230	for @{$self->{par}};
…		…
2074	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2234	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075		2235
2076	delete $self->{texture};	2236	delete $self->{texture};
2077	}	2237	}
2078		2238
2079	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2239	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080	glClearColor 0, 0, 0, 1;	2240	glClearColor 0, 0, 0, 0;
2081	glClear GL_COLOR_BUFFER_BIT;	2241	glClear GL_COLOR_BUFFER_BIT;
2082		2242
2083	glEnable GL_BLEND;
2084	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085	glEnable GL_TEXTURE_2D;	2243	glEnable GL_TEXTURE_2D;
2086	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087		2245
2088	my $top = int $self->{children}[1]{range}[0];	2246	my $top = int $self->{children}[1]{range}[0];
2089		2247
…		…
2098		2256
2099	for my $par (@{$self->{par}}) {	2257	for my $par (@{$self->{par}}) {
2100	my $h = $par->[0];	2258	my $h = $par->[0];
2101		2259
2102	if ($y0 < $y + $h && $y < $y1) {	2260	if ($y0 < $y + $h && $y < $y1) {
		2261	$layout->set_foreground (@{ $par->[1] });
2103	$layout->set_text ($par->[2]);	2262	$layout->set_markup ($par->[2]);
2104		2263
2105	glColor @{ $par->[1] };
2106	my ($W, $H) = $layout->size;	2264	my ($W, $H) = $layout->size;
2107	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2265	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2108	}	2266	}
2109		2267
2110	$y += $h;	2268	$y += $h;
2111	}	2269	}
2112		2270
2113	glDisable GL_TEXTURE_2D;	2271	glDisable GL_TEXTURE_2D;
2114	glDisable GL_BLEND;
2115	};	2272	};
2116	});	2273	});
2117	}	2274	}
2118		2275
2119	sub _draw {	2276	sub _draw {
2120	my ($self) = @_;	2277	my ($self) = @_;
2121		2278
2122	if ($self->{texture}) {
2123	glEnable GL_TEXTURE_2D;	2279	glEnable GL_TEXTURE_2D;
2124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2281	glColor 1, 1, 1, 1;
		2282	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126	glDisable GL_TEXTURE_2D;	2283	glDisable GL_TEXTURE_2D;
2127	}
2128		2284
2129	$self->{children}[1]->draw;	2285	$self->{children}[1]->draw;
2130		2286
2131	}	2287	}
2132		2288
…		…
2180		2336
2181	sub new {	2337	sub new {
2182	my $class = shift;	2338	my $class = shift;
2183		2339
2184	my $self = $class->SUPER::new (	2340	my $self = $class->SUPER::new (
2185	state => 0,	2341	state => 0,
2186	connect_activate => \&toggle_flopper,	2342	connect_activate => \&toggle_flopper,
2187	can_events => 1,
2188	@_	2343	@_
2189	);	2344	);
2190		2345
2191	if ($self->{state}) {	2346	if ($self->{state}) {
2192	$self->{state} = 0;	2347	$self->{state} = 0;
…		…
2227	@_,	2382	@_,
2228	can_events => 0,	2383	can_events => 0,
2229	)	2384	)
2230	}	2385	}
2231		2386
2232	sub set_markup {	2387	sub set_tooltip_from {
2233	my ($self, $text) = @_;	2388	my ($self, $widget) = @_;
2234		2389
2235	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2390	$self->add (new CFClient::UI::Label
2236	$self->{label}->set_markup ($text);	2391	markup => $widget->{tooltip},
2237	$self->add ($self->{label});	2392	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2393	fontsize => 0.8,
		2394	fg => [0, 0, 0, 1],
		2395	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2396	);
2238	}	2397	}
2239		2398
2240	sub size_request {	2399	sub size_request {
2241	my ($self) = @_;	2400	my ($self) = @_;
2242
2243	$self->child->set_max_size ($::WIDTH * 0.3);
2244		2401
2245	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2402	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246		2403
2247	($w + 4, $h + 4)	2404	($w + 4, $h + 4)
2248	}	2405	}
…		…
2254	}	2411	}
2255		2412
2256	sub _draw {	2413	sub _draw {
2257	my ($self) = @_;	2414	my ($self) = @_;
2258		2415
2259	glPushMatrix;
2260	glTranslate 0.375, 0.375;	2416	glTranslate 0.375, 0.375;
2261		2417
2262	my ($w, $h) = @$self{qw(w h)};	2418	my ($w, $h) = @$self{qw(w h)};
2263		2419
2264	glColor 1, 0.8, 0.4;	2420	glColor 1, 0.8, 0.4;
…		…
2275	glVertex 0 , $h;	2431	glVertex 0 , $h;
2276	glVertex $w, $h;	2432	glVertex $w, $h;
2277	glVertex $w, 0;	2433	glVertex $w, 0;
2278	glEnd;	2434	glEnd;
2279		2435
2280	glPopMatrix;	2436	glTranslate 2 - 0.375, 2 - 0.375;
2281
2282	glTranslate 2, 2;
2283	$self->SUPER::_draw;	2437	$self->SUPER::_draw;
2284	}	2438	}
2285		2439
2286	#############################################################################	2440	#############################################################################
2287		2441
…		…
2302		2456
2303	sub size_request {	2457	sub size_request {
2304	(32, 8)	2458	(32, 8)
2305	}	2459	}
2306		2460
2307	sub draw {	2461	sub _draw {
2308	my ($self) = @_;	2462	my ($self) = @_;
2309		2463
		2464	return unless $::CONN;#d# manage and cache textures differently
2310	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311		2466
		2467	# TODO animation
2312	if ($tex) {	2468	if ($tex) {
2313	glEnable GL_BLEND;
2314	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315	glEnable GL_TEXTURE_2D;	2469	glEnable GL_TEXTURE_2D;
2316	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317	glColor 1, 1, 1, 1;	2471	glColor 1, 1, 1, 1;
2318	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2319	glDisable GL_TEXTURE_2D;	2473	glDisable GL_TEXTURE_2D;
2320	glDisable GL_BLEND;
2321	}	2474	}
		2475	}
		2476
		2477	#############################################################################
		2478
		2479	package CFClient::UI::InventoryItem;
		2480
		2481	our @ISA = CFClient::UI::HBox::;
		2482
		2483	sub new {
		2484	my $class = shift;
		2485
		2486	my %args = @_;
		2487
		2488	my $item = delete $args{item};
		2489
		2490	my $desc = $item->{nrof} < 2
		2491	? $item->{name}
		2492	: "$item->{nrof} $item->{name_pl}";
		2493
		2494
		2495	my $self = $class->SUPER::new (
		2496	can_hover => 1,
		2497	can_events => 1,
		2498	tooltip => (CFClient::UI::Label->escape ($desc)
		2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2500	connect_button_down => sub {
		2501	my ($self, $ev, $x, $y) = @_;
		2502
		2503	# todo: maybe put examine on 1? but should just be a tooltip :(
		2504	if ($ev->{button} == 1) {
		2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2506	} elsif ($ev->{button} == 2) {
		2507	$::CONN->send ("apply $item->{tag}");
		2508	} elsif ($ev->{button} == 3) {
		2509	CFClient::UI::Menu->new (
		2510	items => [
		2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2512	[
		2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2514	sub { $::CONN->send ("lock $item->{tag}") },
		2515	],
		2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2519	],
		2520	)->popup ($ev);
		2521	}
		2522
		2523	1
		2524	},
		2525	%args
		2526	);
		2527
		2528	$self->add (new CFClient::UI::Face
		2529	can_events => 0,
		2530	face => $item->{face},
		2531	anim => $item->{anim},
		2532	animspeed => $item->{animspeed},
		2533	);
		2534
		2535	$self->add (new CFClient::UI::Label
		2536	can_events => 0,
		2537	text => $desc,
		2538	);
		2539
		2540	$self
		2541	}
		2542
		2543	#############################################################################
		2544
		2545	package CFClient::UI::Inventory;
		2546
		2547	our @ISA = CFClient::UI::ScrolledWindow::;
		2548
		2549	sub new {
		2550	my $class = shift;
		2551
		2552	my $self = $class->SUPER::new (
		2553	scrolled => (new CFClient::UI::VBox),
		2554	@_,
		2555	);
		2556
		2557	$self
		2558	}
		2559
		2560	sub set_items {
		2561	my ($self, $items) = @_;
		2562
		2563	$self->{scrolled}->clear;
		2564	return unless $items;
		2565
		2566	my @items = sort {
		2567	($a->{type} <=> $b->{type})
		2568	or ($a->{name} cmp $b->{name})
		2569	} @$items;
		2570
		2571	$self->{real_items} = \@items;
		2572
		2573	for my $item (@items) {
		2574	my $desc = $item->{nrof} < 2
		2575	? $item->{name}
		2576	: "$item->{nrof} $item->{name_pl}";
		2577
		2578	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2579	}
		2580
		2581	$self->{scrolled}->add (@items);
		2582
		2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2584	}
		2585
		2586	sub size_request {
		2587	my ($self) = @_;
		2588	($self->{req_w}, $self->{req_h});
		2589	}
		2590
		2591	#############################################################################
		2592
		2593	package CFClient::UI::Menu;
		2594
		2595	our @ISA = CFClient::UI::FancyFrame::;
		2596
		2597	use CFClient::OpenGL;
		2598
		2599	sub new {
		2600	my $class = shift;
		2601
		2602	my $self = $class->SUPER::new (
		2603	items => [],
		2604	z => 100,
		2605	@_,
		2606	);
		2607
		2608	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2609
		2610	for my $item (@{ $self->{items} }) {
		2611	my ($widget, $cb) = @$item;
		2612
		2613	# handle various types of items, only text for now
		2614	if (!ref $widget) {
		2615	$widget = new CFClient::UI::Label
		2616	can_hover => 1,
		2617	can_events => 1,
		2618	text => $widget;
		2619	}
		2620
		2621	$self->{item}{$widget} = $item;
		2622
		2623	$self->{vbox}->add ($widget);
		2624	}
		2625
		2626	$self
		2627	}
		2628
		2629	# popup given the event (must be a mouse button down event currently)
		2630	sub popup {
		2631	my ($self, $ev) = @_;
		2632
		2633	$self->emit ("popdown");
		2634
		2635	# maybe save $GRAB? must be careful about events...
		2636	$GRAB = $self;
		2637	$self->{button} = $ev->{button};
		2638
		2639	$self->show;
		2640	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2641	}
		2642
		2643	sub mouse_motion {
		2644	my ($self, $ev, $x, $y) = @_;
		2645
		2646	# TODO: should use vbox->find_widget or so
		2647	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2648	$self->{hover} = $self->{item}{$HOVER};
		2649	}
		2650
		2651	sub button_up {
		2652	my ($self, $ev, $x, $y) = @_;
		2653
		2654	if ($ev->{button} == $self->{button}) {
		2655	undef $GRAB;
		2656	$self->hide;
		2657
		2658	$self->emit ("popdown");
		2659	$self->{hover}[1]->() if $self->{hover};
		2660	}
		2661	}
		2662
		2663	#############################################################################
		2664
		2665	package CFClient::UI::Statusbox;
		2666
		2667	our @ISA = CFClient::UI::VBox::;
		2668
		2669	sub reorder {
		2670	my ($self) = @_;
		2671	my $NOW = time;
		2672
		2673	while (my ($k, $v) = each %{ $self->{item} }) {
		2674	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2675	}
		2676
		2677	my @widgets;
		2678
		2679	my @items = sort {
		2680	$a->{pri} <=> $b->{pri}
		2681	or $b->{id} <=> $a->{id}
		2682	} values %{ $self->{item} };
		2683
		2684	my $count = 10 + 1;
		2685	for my $item (@items) {
		2686	last unless --$count;
		2687
		2688	push @widgets, $item->{label} ||= do {
		2689	# TODO: doesn't handle markup well (read as: at all)
		2690	my $short = $item->{count} > 1
		2691	? "<b>$item->{count} ×</b> $item->{text}"
		2692	: $item->{text};
		2693
		2694	for ($short) {
		2695	s/^\s+//;
		2696	s/\012.*/…/s;
		2697	my $len = int 40 / $item->{fontsize};
		2698	substr $_, $len, length, "…" if $len < length;
		2699	}
		2700
		2701	new CFClient::UI::Label
		2702	markup => $short,
		2703	tooltip => $item->{tooltip},
		2704	tooltip_font => $::FONT_PROP,
		2705	tooltip_width => 0.67,
		2706	fontsize => $item->{fontsize},
		2707	color => $item->{color},
		2708	can_events => 1,
		2709	can_hover => 1
		2710	};
		2711	}
		2712
		2713	$self->clear;
		2714	$self->SUPER::add (reverse @widgets);
		2715	}
		2716
		2717	sub add {
		2718	my ($self, $text, %arg) = @_;
		2719
		2720	$text =~ s/^\s+//;
		2721	$text =~ s/\s+$//;
		2722
		2723	my $timeout = time + ((delete $arg{timeout}) || 60);
		2724
		2725	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2726
		2727	if (my $item = $self->{item}{$group}) {
		2728	if ($item->{text} eq $text) {
		2729	$item->{count}++;
		2730	} else {
		2731	$item->{count} = 1;
		2732	$item->{text} = $item->{tooltip} = $text;
		2733	}
		2734	$item->{id} = ++$self->{id};
		2735	$item->{timeout} = $timeout;
		2736	delete $item->{label};
		2737	} else {
		2738	$self->{item}{$group} = {
		2739	id => ++$self->{id},
		2740	text => $text,
		2741	timeout => $timeout,
		2742	tooltip => $text,
		2743	fontsize => 0.8,
		2744	color => [0.8, 0.8, 0.8, 0.8],
		2745	pri => 0,
		2746	count => 1,
		2747	%arg,
		2748	};
		2749	}
		2750
		2751	$self->reorder;
2322	}	2752	}
2323		2753
2324	#############################################################################	2754	#############################################################################
2325		2755
2326	package CFClient::UI::Root;	2756	package CFClient::UI::Root;
2327		2757
2328	our @ISA = CFClient::UI::Container::;	2758	our @ISA = CFClient::UI::Container::;
2329		2759
2330	use CFClient::OpenGL;	2760	use CFClient::OpenGL;
2331		2761
2332	sub check_size {	2762	sub new {
2333	my ($self) = @_;	2763	my $class = shift;
2334		2764
2335	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2765	$class->SUPER::new (
2336	}	2766	@_,
2337		2767	)
2338	sub size_request {
2339	($::WIDTH, $::HEIGHT)
2340	}	2768	}
2341		2769
2342	sub configure {	2770	sub configure {
2343	my ($self, $x, $y, $w, $h) = @_;	2771	my ($self, $x, $y, $w, $h) = @_;
2344		2772
2345	$self->SUPER::configure ($x, $y, $w, $h);	2773	$self->{w} = $w;
		2774	$self->{h} = $h;
		2775	}
2346		2776
		2777	sub check_size {
		2778	my ($self) = @_;
		2779
		2780	$self->size_allocate ($self->{w}, $self->{h})
		2781	if $self->{w};
		2782	}
		2783
		2784	sub size_request {
		2785	my ($self) = @_;
		2786
		2787	($self->{w}, $self->{h})
		2788	}
		2789
		2790	sub size_allocate {
		2791	my ($self, $w, $h) = @_;
		2792
		2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2795
		2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2797	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2798
2347	for my $child (@{$self->{children}}) {	2799	for my $child ($self->children) {
2348	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2800	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2349		2801
2350	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2351	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2352	$child->configure ($X, $Y, $W,$H);	2804	$child->configure ($X, $Y, $W, $H);
2353	}	2805	}
2354	}	2806	}
2355		2807
2356	sub _topleft {	2808	sub coord2local {
2357	my ($self, $x, $y) = @_;	2809	my ($self, $x, $y) = @_;
2358		2810
2359	($x, $y)	2811	($x, $y)
2360	}	2812	}
2361		2813
		2814	sub coord2global {
		2815	my ($self, $x, $y) = @_;
		2816
		2817	($x, $y)
		2818	}
		2819
2362	sub update {	2820	sub update {
2363	my ($self) = @_;	2821	my ($self) = @_;
2364		2822
2365	$self->check_size;	2823	$self->check_size;
2366	::refresh ();	2824	$::WANT_REFRESH++;
2367	}	2825	}
2368		2826
2369	sub add {	2827	sub add {
2370	my ($self, $child) = @_;	2828	my ($self, $child) = @_;
2371		2829
2372	# integerize window positions	2830	# integerise window positions
2373	$child->{x} = int $child->{x};	2831	$child->{x} = int $child->{x};
2374	$child->{y} = int $child->{y};	2832	$child->{y} = int $child->{y};
2375		2833
2376	$self->SUPER::add ($child);	2834	$self->SUPER::add ($child);
2377	}	2835	}
…		…
2380	my ($self, $id, $cb) = @_;	2838	my ($self, $id, $cb) = @_;
2381		2839
2382	$self->{refresh_hook}{$id} = $cb;	2840	$self->{refresh_hook}{$id} = $cb;
2383	}	2841	}
2384		2842
		2843	sub on_post_alloc {
		2844	my ($self, $id, $cb) = @_;
		2845
		2846	$self->{post_alloc_hook}{$id} = $cb;
		2847	}
		2848
2385	sub draw {	2849	sub draw {
2386	my ($self) = @_;	2850	my ($self) = @_;
2387		2851
2388	while (my $rcb = delete $self->{refresh_hook}) {	2852	while ($self->{refresh_hook}) {
2389	$_->() for values %$rcb;	2853	$_->()
		2854	for values %{delete $self->{refresh_hook}};
		2855	}
		2856
		2857	if ($self->{check_size}) {
		2858	my @queue = ([], []);
		2859
		2860	for (;;) {
		2861	if ($self->{check_size}) {
		2862	# heuristic: check containers last
		2863	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2864	for values %{delete $self->{check_size}}
		2865	}
		2866
		2867	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2868
		2869	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2870	? @$widget{qw(user_w user_h)}
		2871	: $widget->size_request;
		2872
		2873	if (delete $widget->{force_alloc}
		2874	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2875	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2876
		2877	$widget->{req_w} = $w;
		2878	$widget->{req_h} = $h;
		2879
		2880	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2881
		2882	$widget->{parent}->check_size
		2883	if $widget->{parent};
		2884	}
		2885	}
		2886	}
		2887
		2888	while ($self->{size_alloc}) {
		2889	for (values %{delete $self->{size_alloc}}) {
		2890	my ($widget, $w, $h) = @$_;
		2891
		2892	$w = 0 if $w < 0;
		2893	$h = 0 if $h < 0;
		2894
		2895	$widget->{w} = $w;
		2896	$widget->{h} = $h;
		2897	$widget->size_allocate ($w, $h);
		2898	$widget->emit (size_allocate => $w, $h);
		2899	}
		2900	}
		2901
		2902	while ($self->{post_alloc_hook}) {
		2903	$_->()
		2904	for values %{delete $self->{post_alloc_hook}};
2390	}	2905	}
2391		2906
2392	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2907	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2393	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2394	glClear GL_COLOR_BUFFER_BIT;	2909	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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