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.165 by root, Mon Apr 24 08:22:22 2006 UTC vs.
Revision 1.227 by root, Wed May 24 03:29:20 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	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
122		133
123	for (@$vals) {	134	for (@$vals) {
124	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
125	$rem += $_ - $i;	136	$rem += $_ - $i;
126	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
127	}	169	}
128	}	170	}
129		171
130	#############################################################################	172	#############################################################################
131		173
…		…
150	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
152	}	194	}
153	}	195	}
154		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
155	$self	199	$self
156	}	200	}
157		201
158	sub destroy {	202	sub destroy {
159	my ($self) = @_;	203	my ($self) = @_;
…		…
162	%$self = ();	206	%$self = ();
163	}	207	}
164		208
165	sub show {	209	sub show {
166	my ($self) = @_;	210	my ($self) = @_;
167
168	return if $self->{parent};	211	return if $self->{parent};
169		212
170	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
171	}	227	}
172		228
173	sub hide {	229	sub hide {
174	my ($self) = @_;	230	my ($self) = @_;
175		231
…		…
224	$self->{y} = $y;	280	$self->{y} = $y;
225	$self->update;	281	$self->update;
226	}	282	}
227		283
228	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	286	}
235	}	287	}
236		288
237	sub size_allocate {	289	sub size_allocate {
238	# nothing to be done	290	# nothing to be done
239	}	291	}
240		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
		300	sub children {
		301	}
		302
241	sub set_max_size {	303	sub set_max_size {
242	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
243		305
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	308	}
247		309
248	# return top left coordinates	310	sub set_tooltip {
249	sub _topleft {
250	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
251		312
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	313	$self->{tooltip} = $tooltip;
		314
		315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
253	}	319	}
254		320
255	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
256	sub coord2local {	322	sub coord2local {
257	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
258		324
259	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260	($x - $X, $y - $Y)
261	}	326	}
262		327
263	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
264	sub coord2global {	329	sub coord2global {
265	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
266		331
267	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268	($x + $X, $y + $Y)
269	}	333	}
270		334
271	sub focus_in {	335	sub focus_in {
272	my ($self) = @_;	336	my ($self) = @_;
273		337
…		…
345	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
346	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
347	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
348	glEnd;	412	glEnd;
349	glPopMatrix;	413	glPopMatrix;
350	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351	}	415	}
352	}	416	}
353		417
354	sub _draw {	418	sub _draw {
355	my ($self) = @_;	419	my ($self) = @_;
…		…
371		435
372	sub set_parent {	436	sub set_parent {
373	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
374		438
375	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
376	}	446	}
377		447
378	sub check_size {	448	sub check_size {
379	my ($self) = @_;	449	my ($self, $forced) = @_;
380		450
381	$self->{parent}	451	$self->{force_alloc} = 1 if $forced;
382	or return 1;	452	$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	}	453	}
403		454
404	sub update {	455	sub update {
405	my ($self) = @_;	456	my ($self) = @_;
406		457
…		…
421	}	472	}
422		473
423	sub DESTROY {	474	sub DESTROY {
424	my ($self) = @_;	475	my ($self) = @_;
425		476
		477	delete $WIDGET{$self+0};
426	#$self->deactivate;	478	#$self->deactivate;
427	}	479	}
428		480
429	#############################################################################	481	#############################################################################
430		482
…		…
439	my $class = shift;	491	my $class = shift;
440		492
441	# range [value, low, high, page]	493	# range [value, low, high, page]
442		494
443	$class->SUPER::new (	495	$class->SUPER::new (
444	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
445	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
446	@_	498	@_
447	)	499	)
448	}	500	}
449		501
450	sub _draw {	502	sub _draw {
451	my ($self) = @_;	503	my ($self) = @_;
452		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
453	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
454		511
455	glEnable GL_BLEND;	512	glEnable GL_BLEND;
456	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
458		515
459	glBegin GL_QUADS;	516	glBegin GL_QUADS;
460	glVertex 0 , 0;	517	glVertex 0 , 0;
461	glVertex 0 , $h;	518	glVertex 0 , $h;
462	glVertex $w, $h;	519	glVertex $w, $h;
463	glVertex $w, 0;	520	glVertex $w, 0;
464	glEnd;	521	glEnd;
465		522
466	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
467	}	525	}
468		526
469	#############################################################################	527	#############################################################################
470		528
471	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
492	sub new {	550	sub new {
493	my ($class, %arg) = @_;	551	my ($class, %arg) = @_;
494		552
495	my $children = delete $arg{children} || [];	553	my $children = delete $arg{children} || [];
496		554
497	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	555	my $self = $class->SUPER::new (
		556	children => [],
		557	can_events => 0,
		558	%arg,
		559	);
498	$self->add ($_) for @$children;	560	$self->add ($_) for @$children;
499		561
500	$self	562	$self
501	}	563	}
502		564
503	sub add {	565	sub add {
504	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
505		567
506	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
507		570
508	use sort 'stable';	571	use sort 'stable';
509		572
510	$self->{children} = [	573	$self->{children} = [
511	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
512	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
513	];	576	];
514		577
515	$child->check_size;	578	$self->check_size (1);
		579	$self->update;
		580	}
		581
		582	sub children {
		583	@{ $_[0]{children} }
516	}	584	}
517		585
518	sub remove {	586	sub remove {
519	my ($self, $child) = @_;	587	my ($self, $child) = @_;
520		588
…		…
535		603
536	for (@$children) {	604	for (@$children) {
537	delete $_->{parent};	605	delete $_->{parent};
538	$_->hide;	606	$_->hide;
539	}	607	}
		608
		609	$self->check_size;
		610	$self->update;
540	}	611	}
541		612
542	sub find_widget {	613	sub find_widget {
543	my ($self, $x, $y) = @_;	614	my ($self, $x, $y) = @_;
544		615
…		…
619	}	690	}
620		691
621	sub update {	692	sub update {
622	my ($self) = @_;	693	my ($self) = @_;
623		694
624	# we want to do this delayed...	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
625	$self->render_chld;
626	$self->SUPER::update;	696	$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	}	697	}
638		698
639	sub size_allocate {	699	sub size_allocate {
640	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
641		701
642	$self->child->configure (0, 0, $w, $h);	702	$self->SUPER::size_allocate ($w, $h);
		703	$self->update;
		704	}
643		705
		706	sub _render {
		707	$_[0]{children}[0]->draw;
		708	}
		709
		710	sub render_child {
		711	my ($self) = @_;
		712
		713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		714	glClearColor 0, 0, 0, 0;
		715	glClear GL_COLOR_BUFFER_BIT;
		716
644	$self->render_chld;	717	$self->_render;
		718	};
645	}	719	}
646		720
647	sub _draw {	721	sub _draw {
648	my ($self) = @_;	722	my ($self) = @_;
649		723
650	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
651		725
652	my $tex = $self->{texture}	726	my $tex = $self->{texture}
653	or return;	727	or return;
654		728
655	glEnable GL_BLEND;
656	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		731	glColor 1, 1, 1, 1;
659		732
660	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661		734
662	glDisable GL_BLEND;
663	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
664	}	736	}
665		737
666	#############################################################################	738	#############################################################################
667		739
668	package CFClient::UI::ViewPort;	740	package CFClient::UI::ViewPort;
669		741
670	our @ISA = CFClient::UI::Window::;	742	our @ISA = CFClient::UI::Window::;
671		743
672	sub new { die }
673
674	sub size_request {	744	sub size_request {
675	my ($self) = @_;	745	my ($self) = @_;
676		746
677	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$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)});
679		748
680	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
681	}	750	}
682		751
683	sub _draw {	752	sub size_allocate {
684	my ($self) = @_;	753	my ($self, $w, $h) = @_;
685		754
686	$self->{children}[1]->draw;	755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
		758	$self->update;
687	}	759	}
688		760
		761	sub set_offset {
		762	my ($self, $x, $y) = @_;
689		763
690	#############################################################################	764	$self->{view_x} = int $x;
		765	$self->{view_y} = int $y;
691		766
		767	$self->update;
		768	}
		769
		770	# hmm, this does not work for topleft of $self... but we should not ask for that
		771	sub coord2local {
		772	my ($self, $x, $y) = @_;
		773
		774	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		775	}
		776
		777	sub coord2global {
		778	my ($self, $x, $y) = @_;
		779
		780	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		781	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		782
		783	$self->SUPER::coord2global ($x, $y)
		784	}
		785
		786	sub find_widget {
		787	my ($self, $x, $y) = @_;
		788
		789	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		790	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		791	) {
		792	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		793	} else {
		794	$self->CFClient::UI::Base::find_widget ($x, $y)
		795	}
		796	}
		797
		798	sub _render {
		799	my ($self) = @_;
		800
		801	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		802
		803	$self->SUPER::_render;
		804	}
		805
		806	#############################################################################
		807
692	package CFClient::UI::Frame;	808	package CFClient::UI::ScrolledWindow;
693		809
694	our @ISA = CFClient::UI::Bin::;	810	our @ISA = CFClient::UI::HBox::;
695
696	use CFClient::OpenGL;
697		811
698	sub new {	812	sub new {
699	my $class = shift;	813	my $class = shift;
700		814
		815	my $self;
		816
		817	my $slider = new CFClient::UI::Slider
		818	vertical => 1,
		819	range => [0, 0, 1, 0.01], # HACK fix
		820	connect_changed => sub {
		821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		822	},
		823	;
		824
701	my $self = $class->SUPER::new (	825	$self = $class->SUPER::new (
702	bg => [1, 1, 1, 1],	826	vp => (new CFClient::UI::ViewPort expand => 1),
703	border_bg => [1, 1, 1, 1],	827	slider => $slider,
704	border => 0.8,
705	@_	828	@_,
706	);	829	);
707		830
		831	$self->{vp}->add ($self->{scrolled});
		832	$self->add ($self->{vp});
		833	$self->add ($self->{slider});
		834
708	$self	835	$self
709	}	836	}
710		837
		838	#TODO# update range on size_allocate depending on child
		839	# update viewport offset on scroll
		840
		841	#############################################################################
		842
		843	package CFClient::UI::Frame;
		844
		845	our @ISA = CFClient::UI::Bin::;
		846
		847	use CFClient::OpenGL;
		848
		849	sub new {
		850	my $class = shift;
		851
		852	$class->SUPER::new (
		853	bg => undef,
		854	@_,
		855	)
		856	}
		857
711	sub _draw {	858	sub _draw {
712	my ($self) = @_;	859	my ($self) = @_;
713		860
714	my ($w, $h) = ($self->{w}, $self->{h});	861	if ($self->{bg}) {
		862	my ($w, $h) = @$self{qw(w h)};
715		863
716	glEnable GL_BLEND;	864	glEnable GL_BLEND;
717	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	865	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718	glEnable GL_TEXTURE_2D;	866	glColor @{ $self->{bg} };
719	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720		867
721	# glBegin GL_QUADS;	868	glBegin GL_QUADS;
722	# glColor 0, 0, 0, 0;
723	# glVertex 0 , 0;	869	glVertex 0 , 0;
724	# glVertex 0 , $h;	870	glVertex 0 , $h;
725	# glVertex $w, $h;	871	glVertex $w, $h;
726	# glVertex $w, 0;	872	glVertex $w, 0;
727	# glEnd;	873	glEnd;
728		874
729
730	$self->child->draw;
731	glDisable GL_BLEND;	875	glDisable GL_BLEND;
732	glDisable GL_TEXTURE_2D;	876	}
		877
		878	$self->SUPER::_draw;
733	}	879	}
734		880
735	#############################################################################	881	#############################################################################
736		882
737	package CFClient::UI::FancyFrame;	883	package CFClient::UI::FancyFrame;
…		…
750	# TODO: user_x, user_y, overwrite moveto?	896	# TODO: user_x, user_y, overwrite moveto?
751		897
752	my $self = $class->SUPER::new (	898	my $self = $class->SUPER::new (
753	bg => [1, 1, 1, 1],	899	bg => [1, 1, 1, 1],
754	border_bg => [1, 1, 1, 1],	900	border_bg => [1, 1, 1, 1],
755	border => 0.8,	901	border => 0.6,
		902	toplevel => 1,
		903	can_events => 1,
756	@_	904	@_
757	);	905	);
758		906
759	$self->{title} &&= new CFClient::UI::Label	907	$self->{title} &&= new CFClient::UI::Label
760	align => 0,	908	align => 0,
761	valign => 1,	909	valign => 1,
762	text => $self->{title},	910	text => $self->{title},
763	fontsize => 1;	911	fontsize => $self->{border};
764		912
765	$self	913	$self
766	}	914	}
767		915
768	sub border {	916	sub border {
…		…
784	my ($self, $w, $h) = @_;	932	my ($self, $w, $h) = @_;
785		933
786	$h -= List::Util::max 0, $self->border * 2;	934	$h -= List::Util::max 0, $self->border * 2;
787	$w -= List::Util::max 0, $self->border * 2;	935	$w -= List::Util::max 0, $self->border * 2;
788		936
789	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
790	if $self->{title};	938	if $self->{title};
791		939
792	$self->child->configure ($self->border, $self->border, $w, $h);	940	$self->child->configure ($self->border, $self->border, $w, $h);
793	}	941	}
794		942
795	sub button_down {	943	sub button_down {
796	my ($self, $ev, $x, $y) = @_;	944	my ($self, $ev, $x, $y) = @_;
797		945
		946	my ($w, $h) = @$self{qw(w h)};
798	my $border = $self->border;	947	my $border = $self->border;
799		948
800	if ($x < $self->{w} && $x >= $self->{w} - $border	949	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801	&& $y < $self->{h} && $y >= $self->{h} - $border) {	950	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802		951
		952	if ($lr & $td) {
		953	my ($wx, $wy) = ($self->{x}, $self->{y});
803	my ($ox, $oy) = ($ev->{x}, $ev->{y});	954	my ($ox, $oy) = ($ev->{x}, $ev->{y});
804	my ($bw, $bh) = ($self->{w}, $self->{h});	955	my ($bw, $bh) = ($self->{w}, $self->{h});
805		956
		957	my $mx = $x < $border;
		958	my $my = $y < $border;
		959
806	$self->{motion} = sub {	960	$self->{motion} = sub {
807	my ($ev, $x, $y) = @_;	961	my ($ev, $x, $y) = @_;
808		962
809	($x, $y) = ($ev->{x}, $ev->{y});	963	my $dx = $ev->{x} - $ox;
		964	my $dy = $ev->{y} - $oy;
810		965
811	$self->{user_w} = $bw + $x - $ox;	966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
812	$self->{user_h} = $bh + $y - $oy;	967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
813	$self->check_size;	969	$self->check_size;
814	};	970	};
815		971
816	} elsif ($x >= 0 && $x < $self->{w}	972	} elsif ($lr ^ $td) {
817	&& $y >= 0 && $y < $border) {
818
819	my ($ox, $oy) = ($ev->{x}, $ev->{y});	973	my ($ox, $oy) = ($ev->{x}, $ev->{y});
820	my ($bx, $by) = ($self->{x}, $self->{y});	974	my ($bx, $by) = ($self->{x}, $self->{y});
821		975
822	$self->{motion} = sub {	976	$self->{motion} = sub {
823	my ($ev, $x, $y) = @_;	977	my ($ev, $x, $y) = @_;
…		…
846	my ($self) = @_;	1000	my ($self) = @_;
847		1001
848	my ($w, $h ) = ($self->{w}, $self->{h});	1002	my ($w, $h ) = ($self->{w}, $self->{h});
849	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1003	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
850		1004
851	glEnable GL_BLEND;
852	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853	glEnable GL_TEXTURE_2D;	1005	glEnable GL_TEXTURE_2D;
854	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
855		1007
856	my $border = $self->border;	1008	my $border = $self->border;
857		1009
858	glColor @{ $self->{border_bg} };	1010	glColor @{ $self->{border_bg} };
859	$tex[1]->draw_quad (0, 0, $w, $border);	1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
860	$tex[3]->draw_quad (0, $border, $border, $ch);	1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
861	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
862	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
863		1015
		1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
864	my $bg = $tex[0];	1017	my $bg = $tex[0];
865		1018
866	# TODO: repeat texture not scale	1019	# TODO: repeat texture not scale
867	my $rep_x = $cw / $bg->{w};	1020	my $rep_x = $cw / $bg->{w};
868	my $rep_y = $ch / $bg->{h};	1021	my $rep_y = $ch / $bg->{h};
869		1022
870	glColor @{ $self->{bg} };	1023	glColor @{ $self->{bg} };
871		1024
872	$bg->{s} = $rep_x;	1025	$bg->{s} = $rep_x;
873	$bg->{t} = $rep_y;	1026	$bg->{t} = $rep_y;
874	$bg->{wrap_mode} = 1;	1027	$bg->{wrap_mode} = 1;
875	$bg->draw_quad ($border, $border, $cw, $ch);	1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1029	}
876		1030
877	glDisable GL_TEXTURE_2D;	1031	glDisable GL_TEXTURE_2D;
878	glDisable GL_BLEND;
879		1032
880	$self->{title}->draw if $self->{title};	1033	$self->{title}->draw if $self->{title};
		1034
881	$self->child->draw;	1035	$self->child->draw;
882	}	1036	}
883		1037
884	#############################################################################	1038	#############################################################################
885		1039
…		…
907	$self->{children}[$y][$x] = $child;	1061	$self->{children}[$y][$x] = $child;
908		1062
909	$child->check_size;	1063	$child->check_size;
910	}	1064	}
911		1065
		1066	sub children {
		1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1068	}
		1069
912	# TODO: move to container class maybe? send childs a signal on removal?	1070	# TODO: move to container class maybe? send childs a signal on removal?
913	sub clear {	1071	sub clear {
914	my ($self) = @_;	1072	my ($self) = @_;
915		1073
916	my $children = delete $self->{children};	1074	my @children = $self->children;
		1075	delete $self->{children};
917		1076
918	for (grep $_, map @$_, grep $_, @$children) {	1077	for (@children) {
919	delete $_->{parent};	1078	delete $_->{parent};
920	$_->hide;	1079	$_->hide;
921	}	1080	}
922		1081
923	$self->update;	1082	$self->update;
…		…
1104	}	1263	}
1105		1264
1106	sub size_allocate {	1265	sub size_allocate {
1107	my ($self, $w, $h) = @_;	1266	my ($self, $w, $h) = @_;
1108		1267
		1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1269
1109	my $children = $self->{children};	1270	my $children = $self->{children};
1110		1271
1111	my @h = map $_->{req_h}, @$children;	1272	my @h = map $_->{req_h}, @$children;
1112		1273
1113	my $req_h = List::Util::sum @h;	1274	my $req_h = List::Util::sum @h;
…		…
1142		1303
1143	#############################################################################	1304	#############################################################################
1144		1305
1145	package CFClient::UI::Label;	1306	package CFClient::UI::Label;
1146		1307
1147	our @ISA = CFClient::UI::Base::;	1308	our @ISA = CFClient::UI::DrawBG::;
1148		1309
1149	use CFClient::OpenGL;	1310	use CFClient::OpenGL;
1150		1311
1151	sub new {	1312	sub new {
1152	my ($class, %arg) = @_;	1313	my ($class, %arg) = @_;
1153		1314
1154	my $self = $class->SUPER::new (	1315	my $self = $class->SUPER::new (
1155	fg => [1, 1, 1],	1316	fg => [1, 1, 1],
		1317	#bg => none
		1318	#active_bg => none
1156	#font => default_font	1319	#font => default_font
		1320	#text => initial text
		1321	#markup => initial narkup
		1322	#max_w => maximum pixel width
		1323	ellipsise => 3, # end
		1324	layout => (new CFClient::Layout),
1157	fontsize => 1,	1325	fontsize => 1,
1158	text => "",
1159	align => -1,	1326	align => -1,
1160	valign => -1,	1327	valign => -1,
1161	padding => 2,	1328	padding => 2,
1162	layout => new CFClient::Layout,
1163	can_events => 0,	1329	can_events => 0,
1164	%arg	1330	%arg
1165	);	1331	);
1166		1332
1167	if (exists $self->{template}) {	1333	if (exists $self->{template}) {
1168	my $layout = new CFClient::Layout;	1334	my $layout = new CFClient::Layout;
1169	$layout->set_text (delete $self->{template});	1335	$layout->set_text (delete $self->{template});
1170	$self->{template} = $layout;	1336	$self->{template} = $layout;
1171	}	1337	}
1172		1338
1173	$self->set_text (delete $self->{text}) if exists $self->{text};	1339	if (exists $self->{markup}) {
1174	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1340	$self->set_markup (delete $self->{markup});
		1341	} else {
		1342	$self->set_text (delete $self->{text});
		1343	}
1175		1344
1176	$self	1345	$self
1177	}	1346	}
1178		1347
1179	sub escape {	1348	sub escape($) {
1180	local $_ = $_[1];	1349	local $_ = $_[0];
1181		1350
1182	s/&/&amp;/g;	1351	s/&/&amp;/g;
1183	s/>/&gt;/g;	1352	s/>/&gt;/g;
1184	s/</&lt;/g;	1353	s/</&lt;/g;
1185		1354
1186	$_[1]	1355	$_
		1356	}
		1357
		1358	sub update {
		1359	my ($self) = @_;
		1360
		1361	delete $self->{texture};
		1362	$self->SUPER::update;
1187	}	1363	}
1188		1364
1189	sub set_text {	1365	sub set_text {
1190	my ($self, $text) = @_;	1366	my ($self, $text) = @_;
1191		1367
		1368	return if $self->{text} eq "T$text";
		1369	$self->{text} = "T$text";
		1370
		1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1192	$self->{layout}->set_text ($text);	1372	$self->{layout}->set_text ($text);
1193		1373
1194	delete $self->{texture};	1374	$self->update;
1195	$self->check_size;	1375	$self->check_size;
1196	$self->update;
1197	}	1376	}
1198		1377
1199	sub set_markup {	1378	sub set_markup {
1200	my ($self, $markup) = @_;	1379	my ($self, $markup) = @_;
1201		1380
		1381	return if $self->{text} eq "M$markup";
		1382	$self->{text} = "M$markup";
		1383
		1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1385
		1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1202	$self->{layout}->set_markup ($markup);	1387	$self->{layout}->set_markup ($markup);
1203		1388
1204	delete $self->{texture};	1389	$self->update;
1205	$self->check_size;	1390	$self->check_size;
1206	$self->update;
1207	}	1391	}
1208		1392
1209	sub size_request {	1393	sub size_request {
1210	my ($self) = @_;	1394	my ($self) = @_;
1211		1395
1212	$self->{layout}->set_font ($self->{font}) if $self->{font};	1396	$self->{layout}->set_font ($self->{font}) if $self->{font};
1213	$self->{layout}->set_width ($self->{max_w} || -1);	1397	$self->{layout}->set_width ($self->{max_w} || -1);
		1398	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1399	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1214	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1215		1401
1216	my ($w, $h) = $self->{layout}->size;	1402	my ($w, $h) = $self->{layout}->size;
1217		1403
1218	if (exists $self->{template}) {	1404	if (exists $self->{template}) {
…		…
1240	sub set_fontsize {	1426	sub set_fontsize {
1241	my ($self, $fontsize) = @_;	1427	my ($self, $fontsize) = @_;
1242		1428
1243	$self->{fontsize} = $fontsize;	1429	$self->{fontsize} = $fontsize;
1244	delete $self->{texture};	1430	delete $self->{texture};
		1431
		1432	$self->update;
1245	$self->check_size;	1433	$self->check_size;
1246	$self->update;
1247	}	1434	}
1248		1435
1249	sub _draw {	1436	sub _draw {
1250	my ($self) = @_;	1437	my ($self) = @_;
1251		1438
		1439	$self->SUPER::_draw; # draw background, if applicable
		1440
1252	my $tex = $self->{texture} ||= do {	1441	my $tex = $self->{texture} ||= do {
		1442	$self->{layout}->set_foreground (@{$self->{fg}});
1253	$self->{layout}->set_font ($self->{font}) if $self->{font};	1443	$self->{layout}->set_font ($self->{font}) if $self->{font};
1254	$self->{layout}->set_width ($self->{w});	1444	$self->{layout}->set_width ($self->{w});
		1445	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1255	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1448
1256	new_from_layout CFClient::Texture $self->{layout}	1449	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1450
		1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1453	: ($self->{w} - $tex->{w}) * 0.5);
		1454
		1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1457	: ($self->{h} - $tex->{h}) * 0.5);
		1458
		1459	$tex
1257	};	1460	};
1258		1461
1259	glEnable GL_BLEND;
1260	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1261	glEnable GL_TEXTURE_2D;	1462	glEnable GL_TEXTURE_2D;
1262	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1263		1464
		1465	if ($tex->{format} == GL_ALPHA) {
1264	glColor @{$self->{fg}};	1466	glColor @{$self->{fg}};
1265
1266	$self->{ox} = int (
1267	$self->{align} < 0 ? $self->{padding}
1268	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1269	: ($self->{w} - $tex->{w}) * 0.5
1270	);
1271
1272	$self->{oy} = int (
1273	$self->{valign} < 0 ? $self->{padding}
1274	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1275	: ($self->{h} - $tex->{h}) * 0.5
1276	);
1277
1278	$tex->draw_quad ($self->{ox}, $self->{oy});	1467	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1468	} else {
		1469	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1470	}
1279		1471
1280	glDisable GL_TEXTURE_2D;	1472	glDisable GL_TEXTURE_2D;
1281	glDisable GL_BLEND;
1282	}	1473	}
1283		1474
1284	#############################################################################	1475	#############################################################################
1285		1476
1286	package CFClient::UI::EntryBase;	1477	package CFClient::UI::EntryBase;
…		…
1299	active_fg => [0, 0, 0],	1490	active_fg => [0, 0, 0],
1300	can_hover => 1,	1491	can_hover => 1,
1301	can_focus => 1,	1492	can_focus => 1,
1302	valign => 0,	1493	valign => 0,
1303	can_events => 1,	1494	can_events => 1,
		1495	#text => ...
1304	@_	1496	@_
1305	)	1497	)
1306	}	1498	}
1307		1499
1308	sub _set_text {	1500	sub _set_text {
…		…
1319		1511
1320	$text =~ s/./*/g if $self->{hidden};	1512	$text =~ s/./*/g if $self->{hidden};
1321	$self->{layout}->set_text ("$text ");	1513	$self->{layout}->set_text ("$text ");
1322		1514
1323	$self->emit (changed => $self->{text});	1515	$self->emit (changed => $self->{text});
1324	}
1325
1326	sub get_text {
1327	$_[0]{text}
1328	}
1329
1330	sub size_request {
1331	my ($self) = @_;
1332
1333	my ($w, $h) = $self->SUPER::size_request;
1334
1335	($w + 1, $h) # add 1 for cursor
1336	}
1337
1338	sub size_allocate {
1339	my ($self, $w, $h) = @_;
1340
1341	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1342	}	1516	}
1343		1517
1344	sub set_text {	1518	sub set_text {
1345	my ($self, $text) = @_;	1519	my ($self, $text) = @_;
1346		1520
1347	$self->{cursor} = length $text;	1521	$self->{cursor} = length $text;
1348	$self->_set_text ($text);	1522	$self->_set_text ($text);
1349	$self->update;	1523	$self->update;
		1524	$self->check_size;
		1525	}
		1526
		1527	sub get_text {
		1528	$_[0]{text}
		1529	}
		1530
		1531	sub size_request {
		1532	my ($self) = @_;
		1533
		1534	my ($w, $h) = $self->SUPER::size_request;
		1535
		1536	($w + 1, $h) # add 1 for cursor
		1537	}
		1538
		1539	sub size_allocate {
		1540	my ($self, $w, $h) = @_;
		1541
		1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350	}	1543	}
1351		1544
1352	sub key_down {	1545	sub key_down {
1353	my ($self, $ev) = @_;	1546	my ($self, $ev) = @_;
1354		1547
…		…
1356	my $sym = $ev->{sym};	1549	my $sym = $ev->{sym};
1357	my $uni = $ev->{unicode};	1550	my $uni = $ev->{unicode};
1358		1551
1359	my $text = $self->get_text;	1552	my $text = $self->get_text;
1360		1553
1361	if ($sym == 8) {	1554	if ($uni == 8) {
1362	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1555	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1363	} elsif ($sym == 127) {	1556	} elsif ($uni == 127) {
1364	substr $text, $self->{cursor}, 1, "";	1557	substr $text, $self->{cursor}, 1, "";
1365	} elsif ($sym == CFClient::SDLK_LEFT) {	1558	} elsif ($sym == CFClient::SDLK_LEFT) {
1366	--$self->{cursor} if $self->{cursor};	1559	--$self->{cursor} if $self->{cursor};
1367	} elsif ($sym == CFClient::SDLK_RIGHT) {	1560	} elsif ($sym == CFClient::SDLK_RIGHT) {
1368	++$self->{cursor} if $self->{cursor} < length $self->{text};	1561	++$self->{cursor} if $self->{cursor} < length $self->{text};
1369	} elsif ($sym == CFClient::SDLK_HOME) {	1562	} elsif ($sym == CFClient::SDLK_HOME) {
1370	$self->{cursor} = 0;	1563	$self->{cursor} = 0;
1371	} elsif ($sym == CFClient::SDLK_END) {	1564	} elsif ($sym == CFClient::SDLK_END) {
1372	$self->{cursor} = length $text;	1565	$self->{cursor} = length $text;
1373	} elsif ($sym == 27) {	1566	} elsif ($uni == 27) {
1374	$self->emit ('escape');	1567	$self->emit ('escape');
1375	} elsif ($uni) {	1568	} elsif ($uni) {
1376	substr $text, $self->{cursor}++, 0, chr $uni;	1569	substr $text, $self->{cursor}++, 0, chr $uni;
1377	}	1570	}
1378		1571
1379	$self->_set_text ($text);	1572	$self->_set_text ($text);
1380	$self->update;	1573	$self->update;
		1574	$self->check_size;
1381	}	1575	}
1382		1576
1383	sub focus_in {	1577	sub focus_in {
1384	my ($self) = @_;	1578	my ($self) = @_;
1385		1579
…		…
1461	my ($self, $ev) = @_;	1655	my ($self, $ev) = @_;
1462		1656
1463	my $sym = $ev->{sym};	1657	my $sym = $ev->{sym};
1464		1658
1465	if ($sym == 13) {	1659	if ($sym == 13) {
		1660	unshift @{$self->{history}},
		1661	my $txt = $self->get_text;
		1662	$self->{history_pointer} = -1;
		1663	$self->{history_saveback} = '';
1466	$self->emit (activate => $self->get_text);	1664	$self->emit (activate => $txt);
1467	$self->update;	1665	$self->update;
		1666
		1667	} elsif ($sym == CFClient::SDLK_UP) {
		1668	if ($self->{history_pointer} < 0) {
		1669	$self->{history_saveback} = $self->get_text;
		1670	}
		1671	if (@{$self->{history} || []} > 0) {
		1672	$self->{history_pointer}++;
		1673	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1674	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1675	}
		1676	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1677	}
		1678
		1679	} elsif ($sym == CFClient::SDLK_DOWN) {
		1680	$self->{history_pointer}--;
		1681	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1682
		1683	if ($self->{history_pointer} >= 0) {
		1684	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1685	} else {
		1686	$self->set_text ($self->{history_saveback});
		1687	}
1468		1688
1469	} else {	1689	} else {
1470	$self->SUPER::key_down ($ev);	1690	$self->SUPER::key_down ($ev);
1471	}	1691	}
1472		1692
…		…
1488	my $class = shift;	1708	my $class = shift;
1489		1709
1490	$class->SUPER::new (	1710	$class->SUPER::new (
1491	padding => 4,	1711	padding => 4,
1492	fg => [1, 1, 1],	1712	fg => [1, 1, 1],
1493	bg => [1, 1, 1, 0.2],
1494	active_fg => [0, 0, 1],	1713	active_fg => [0, 0, 1],
1495	can_hover => 1,	1714	can_hover => 1,
1496	align => 0,	1715	align => 0,
1497	valign => 0,	1716	valign => 0,
1498	can_events => 1,	1717	can_events => 1,
…		…
1516		1735
1517	if ($GRAB == $self) {	1736	if ($GRAB == $self) {
1518	$self->{fg} = $self->{active_fg};	1737	$self->{fg} = $self->{active_fg};
1519	}	1738	}
1520		1739
1521	glEnable GL_BLEND;
1522	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1523	glEnable GL_TEXTURE_2D;	1740	glEnable GL_TEXTURE_2D;
1524	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1525	glColor 0, 0, 0, 1;	1742	glColor 0, 0, 0, 1;
1526		1743
1527	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1744	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1528		1745
1529	glDisable GL_TEXTURE_2D;	1746	glDisable GL_TEXTURE_2D;
1530	glDisable GL_BLEND;
1531		1747
1532	$self->SUPER::_draw;	1748	$self->SUPER::_draw;
1533	}	1749	}
1534		1750
1535	#############################################################################	1751	#############################################################################
…		…
1549		1765
1550	$class->SUPER::new (	1766	$class->SUPER::new (
1551	padding => 2,	1767	padding => 2,
1552	fg => [1, 1, 1],	1768	fg => [1, 1, 1],
1553	active_fg => [1, 1, 0],	1769	active_fg => [1, 1, 0],
		1770	bg => [0, 0, 0, 0.2],
		1771	active_bg => [1, 1, 1, 0.5],
1554	state => 0,	1772	state => 0,
1555	can_hover => 1,	1773	can_hover => 1,
1556	@_	1774	@_
1557	)	1775	)
1558	}	1776	}
…		…
1582		1800
1583	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1584		1802
1585	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1586		1804
1587	glEnable GL_BLEND;	1805	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1806
1588	glEnable GL_TEXTURE_2D;	1807	glEnable GL_TEXTURE_2D;
1589	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590
1591	my $tex = $self->{state} ? $tex[1] : $tex[0];
1592
1593	$tex->draw_quad (0, 0, $s, $s);	1808	$tex->draw_quad_alpha (0, 0, $s, $s);
1594
1595	glDisable GL_TEXTURE_2D;	1809	glDisable GL_TEXTURE_2D;
1596	glDisable GL_BLEND;
1597	}	1810	}
1598		1811
1599	#############################################################################	1812	#############################################################################
1600		1813
1601	package CFClient::UI::Image;	1814	package CFClient::UI::Image;
…		…
1644	glTranslate 0, -$self->{w}, 0;	1857	glTranslate 0, -$self->{w}, 0;
1645		1858
1646	($w, $h) = ($h, $w);	1859	($w, $h) = ($h, $w);
1647	}	1860	}
1648		1861
1649	glEnable GL_BLEND;
1650	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651	glEnable GL_TEXTURE_2D;	1862	glEnable GL_TEXTURE_2D;
1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653		1864
1654	$tex->draw_quad (0, 0, $w, $h);	1865	$tex->draw_quad_alpha (0, 0, $w, $h);
1655		1866
1656	glDisable GL_BLEND;
1657	glDisable GL_TEXTURE_2D;	1867	glDisable GL_TEXTURE_2D;
1658	}	1868	}
1659		1869
1660	#############################################################################	1870	#############################################################################
1661		1871
…		…
1709	}	1919	}
1710		1920
1711	sub set_max {	1921	sub set_max {
1712	my ($self, $max) = @_;	1922	my ($self, $max) = @_;
1713		1923
		1924	return if $self->{max_val} == $max;
		1925
1714	$self->{max_val} = $max;	1926	$self->{max_val} = $max;
		1927	$self->update;
1715	}	1928	}
1716		1929
1717	sub set_value {	1930	sub set_value {
1718	my ($self, $val, $max) = @_;	1931	my ($self, $val, $max) = @_;
1719		1932
1720	$self->set_max ($max)	1933	$self->set_max ($max)
1721	if defined $max;	1934	if defined $max;
1722		1935
1723	$max = $self->{max_val};	1936	return if $self->{val} == $val;
		1937
1724	$self->{val} = $val;	1938	$self->{val} = $val;
1725
1726	$self->update;	1939	$self->update;
1727	}	1940	}
1728		1941
1729	sub _draw {	1942	sub _draw {
1730	my ($self) = @_;	1943	my ($self) = @_;
…		…
1793		2006
1794	sub new {	2007	sub new {
1795	my ($class, %arg) = @_;	2008	my ($class, %arg) = @_;
1796		2009
1797	my $self = $class->SUPER::new (	2010	my $self = $class->SUPER::new (
1798	tooltip => $arg{type},	2011	tooltip => $arg{type},
1799	can_hover => 1,	2012	can_hover => 1,
		2013	can_events => 1,
1800	%arg,	2014	%arg,
1801	);	2015	);
1802		2016
1803	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2017	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1804	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2018	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1812		2026
1813	$self->{value}->set_fontsize ($fsize);	2027	$self->{value}->set_fontsize ($fsize);
1814	$self->{max} ->set_fontsize ($fsize);	2028	$self->{max} ->set_fontsize ($fsize);
1815	}	2029	}
1816		2030
		2031	sub set_max {
		2032	my ($self, $max) = @_;
		2033
		2034	$self->{gauge}->set_max ($max);
		2035	$self->{max}->set_text ($max);
		2036	}
		2037
1817	sub set_value {	2038	sub set_value {
1818	my ($self, $val, $max) = @_;	2039	my ($self, $val, $max) = @_;
1819		2040
1820	$self->set_max ($max)	2041	$self->set_max ($max)
1821	if defined $max;	2042	if defined $max;
1822		2043
1823	$self->{gauge}->set_value ($val, $max);	2044	$self->{gauge}->set_value ($val, $max);
1824	$self->{value}->set_text ($val);	2045	$self->{value}->set_text ($val);
1825	}
1826
1827	sub set_max {
1828	my ($self, $max) = @_;
1829
1830	$self->{gauge}->set_max ($max);
1831	$self->{max}->set_text ($max);
1832	}	2046	}
1833		2047
1834	#############################################################################	2048	#############################################################################
1835		2049
1836	package CFClient::UI::Slider;	2050	package CFClient::UI::Slider;
…		…
1846	qw(s1_slider.png s1_slider_bg.png);	2060	qw(s1_slider.png s1_slider_bg.png);
1847		2061
1848	sub new {	2062	sub new {
1849	my $class = shift;	2063	my $class = shift;
1850		2064
1851	# range [value, low, high, page]	2065	# range [value, low, high, page, unit]
1852		2066
1853	# TODO: 0-width page	2067	# TODO: 0-width page
1854	# TODO: req_w/h are wrong with vertical	2068	# TODO: req_w/h are wrong with vertical
1855	# TODO: calculations are off	2069	# TODO: calculations are off
1856	my $self = $class->SUPER::new (	2070	my $self = $class->SUPER::new (
1857	fg => [1, 1, 1],	2071	fg => [1, 1, 1],
1858	active_fg => [0, 0, 0],	2072	active_fg => [0, 0, 0],
		2073	bg => [0, 0, 0, 0.2],
		2074	active_bg => [1, 1, 1, 0.5],
1859	range => [0, 0, 100, 10],	2075	range => [0, 0, 100, 10, 0],
1860	req_w => 20,	2076	req_w => $::WIDTH / 80,
1861	req_h => 20,	2077	req_h => $::WIDTH / 80,
1862	vertical => 0,	2078	vertical => 0,
1863	can_hover => 1,	2079	can_hover => 1,
1864	inner_pad => 5,	2080	inner_pad => 0.02,
1865	@_	2081	@_
1866	);	2082	);
1867		2083
		2084	$self->set_value ($self->{range}[0]);
		2085	$self->update;
		2086
1868	$self	2087	$self
		2088	}
		2089
		2090	sub set_range {
		2091	my ($self, $range) = @_;
		2092
		2093	$self->{range} = $range;
		2094
		2095	$self->update;
		2096	}
		2097
		2098	sub set_value {
		2099	my ($self, $value) = @_;
		2100
		2101	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2102
		2103	$hi = $lo + 1 if $hi <= $lo;
		2104
		2105	$page = $hi - $lo if $page > $hi - $lo;
		2106
		2107	$value = $lo if $value < $lo;
		2108	$value = $hi - $page if $value > $hi - $page;
		2109
		2110	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2111	if $unit;
		2112
		2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2114
		2115	if ($value != $old_value) {
		2116	$self->emit (changed => $value);
		2117	$self->update;
		2118	}
1869	}	2119	}
1870		2120
1871	sub size_request {	2121	sub size_request {
1872	my ($self) = @_;	2122	my ($self) = @_;
1873		2123
…		…
1879		2129
1880	sub button_down {	2130	sub button_down {
1881	my ($self, $ev, $x, $y) = @_;	2131	my ($self, $ev, $x, $y) = @_;
1882		2132
1883	$self->SUPER::button_down ($ev, $x, $y);	2133	$self->SUPER::button_down ($ev, $x, $y);
		2134
		2135	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2136
1884	$self->mouse_motion ($ev, $x, $y);	2137	$self->mouse_motion ($ev, $x, $y);
1885	}	2138	}
1886		2139
1887	sub mouse_motion {	2140	sub mouse_motion {
1888	my ($self, $ev, $x, $y) = @_;	2141	my ($self, $ev, $x, $y) = @_;
1889		2142
1890	if ($GRAB == $self) {	2143	if ($GRAB == $self) {
		2144	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2145
		2146	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2147
		2148	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2149
		2150	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2151	}
		2152	}
		2153
		2154	sub update {
		2155	my ($self) = @_;
		2156
		2157	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2158	$self->set_value ($self->{range}[0]);
		2159
1891	my ($value, $lo, $hi, $page) = @{$self->{range}};	2160	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2161	my $range = ($hi - $page - $lo) || 1e-100;
1892		2162
1893	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2163	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1894		2164
1895	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2165	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1896	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2166	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1897		2167
1898	$x -= $inner_pad_px; # substract the padding	2168	$value = ($value - $lo) / $range;
1899	$x = $x * ($hi - $lo) / $inner_w + $lo;	2169	$value = $value * $self->{scale} + $self->{offset};
1900	$x = $lo if $x < $lo;
1901	$x = $hi - $page if $x > $hi - $page;
1902	$self->{range}[0] = $x;
1903		2170
1904	$self->emit (changed => $x);	2171	$self->{knob_x} = $value - $knob_w * 0.5;
1905	$self->update;	2172	$self->{knob_w} = $knob_w;
1906	}	2173	});
1907	}
1908		2174
1909	# the inner_* stuff is for generating a padding for the slider handle,	2175	$self->SUPER::update;
1910	# so that the handle doesn't leave the texture. This calculation isn't 100%
1911	# correct propably, but it does the job for now
1912	sub _calc_inner_pad_px {
1913	my ($self, $w) = @_;
1914	($w / 100) * $self->{inner_pad} # % to pixels
1915	}	2176	}
1916		2177
1917	sub _draw {	2178	sub _draw {
1918	my ($self) = @_;	2179	my ($self) = @_;
1919		2180
1920	$self->SUPER::_draw ();	2181	$self->SUPER::_draw ();
1921		2182
1922	my ($w, $h) = @$self{qw(w h)};	2183	glScale $self->{w}, $self->{h};
1923		2184
1924	if ($self->{vertical}) {	2185	if ($self->{vertical}) {
1925	# draw a vertical slider like a rotated horizontal slider	2186	# draw a vertical slider like a rotated horizontal slider
1926		2187
		2188	glTranslate 1, 0, 0;
1927	glRotate 90, 0, 0, 1;	2189	glRotate 90, 0, 0, 1;
1928	glTranslate 0, -$self->{w}, 0;
1929
1930	($w, $h) = ($h, $w);
1931	}	2190	}
1932		2191
1933	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2192	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1934	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2193	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1935		2194
1936	my ($value, $lo, $hi, $page) = @{$self->{range}};
1937
1938	$hi = $value + 1 if $lo == $hi;
1939
1940	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1941	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1942
1943	$page = int $page * $inner_w / ($hi - $lo);
1944	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1945
1946	$w -= $page;
1947	$page &= ~1;
1948	glTranslate $page * 0.5, 0, 0;
1949	$page ||= 2;
1950
1951	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1952	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1953
1954	glEnable GL_BLEND;
1955	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1956	glEnable GL_TEXTURE_2D;	2195	glEnable GL_TEXTURE_2D;
1957	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2196	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1958		2197
1959	# draw background	2198	# draw background
1960	$tex[1]->draw_quad (0, 0, $w, $h);	2199	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1961		2200
1962	# draw handle	2201	# draw handle
1963	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2202	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1964		2203
1965	glDisable GL_BLEND;
1966	glDisable GL_TEXTURE_2D;	2204	glDisable GL_TEXTURE_2D;
1967	}	2205	}
		2206
		2207	#############################################################################
		2208
		2209	package CFClient::UI::ValSlider;
		2210
		2211	our @ISA = CFClient::UI::HBox::;
		2212
		2213	sub new {
		2214	my ($class, %arg) = @_;
		2215
		2216	my $range = delete $arg{range};
		2217
		2218	my $self = $class->SUPER::new (
		2219	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2220	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2221	to_value => sub { shift },
		2222	from_value => sub { shift },
		2223	%arg,
		2224	);
		2225
		2226	$self->{slider}->connect (changed => sub {
		2227	my ($self, $value) = @_;
		2228	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2229	$self->{parent}->emit (changed => $value);
		2230	});
		2231
		2232	# $self->{entry}->connect (changed => sub {
		2233	# my ($self, $value) = @_;
		2234	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2235	# $self->{parent}->emit (changed => $value);
		2236	# });
		2237
		2238	$self->add ($self->{slider}, $self->{entry});
		2239
		2240	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2241
		2242	$self
		2243	}
		2244
		2245	sub set_range { shift->{slider}->set_range (@_) }
		2246	sub set_value { shift->{slider}->set_value (@_) }
1968		2247
1969	#############################################################################	2248	#############################################################################
1970		2249
1971	package CFClient::UI::TextView;	2250	package CFClient::UI::TextView;
1972		2251
…		…
1981	fontsize => 1,	2260	fontsize => 1,
1982	can_events => 0,	2261	can_events => 0,
1983	#font => default_font	2262	#font => default_font
1984	@_,	2263	@_,
1985		2264
1986	layout => (new CFClient::Layout),	2265	layout => (new CFClient::Layout 1),
1987	par => [],	2266	par => [],
1988	height => 0,	2267	height => 0,
1989	children => [	2268	children => [
1990	(new CFClient::UI::Empty expand => 1),	2269	(new CFClient::UI::Empty expand => 1),
1991	(new CFClient::UI::Slider vertical => 1),	2270	(new CFClient::UI::Slider vertical => 1),
1992	],	2271	],
1993	);	2272	);
1994		2273
1995	$self->{children}[1]->connect (changed => sub {	2274	$self->{children}[1]->connect (changed => sub { $self->update });
1996	$self->update;
1997	});
1998		2275
1999	$self	2276	$self
2000	}	2277	}
2001		2278
2002	sub set_fontsize {	2279	sub set_fontsize {
2003	my ($self, $fontsize) = @_;	2280	my ($self, $fontsize) = @_;
2004		2281
2005	$self->{fontsize} = $fontsize;	2282	$self->{fontsize} = $fontsize;
2006	$self->reflow;	2283	$self->reflow;
2007	}
2008
2009	sub text_height {
2010	my ($self, $text) = @_;
2011
2012	my $layout = $self->{layout};
2013
2014	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015	$layout->set_width ($self->{w});
2016	$layout->set_text ($text);
2017
2018	($layout->size)[1]
2019	}
2020
2021	sub reflow {
2022	my ($self) = @_;
2023
2024	$self->{need_reflow}++;
2025	$self->update;
2026	}	2284	}
2027		2285
2028	sub size_allocate {	2286	sub size_allocate {
2029	my ($self, $w, $h) = @_;	2287	my ($self, $w, $h) = @_;
2030		2288
…		…
2035	$self->{layout}->set_width ($self->{children}[0]{w});	2293	$self->{layout}->set_width ($self->{children}[0]{w});
2036		2294
2037	$self->reflow;	2295	$self->reflow;
2038	}	2296	}
2039		2297
		2298	sub text_height {
		2299	my ($self, $text, $indent) = @_;
		2300
		2301	my $layout = $self->{layout};
		2302
		2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2304	$layout->set_width ($self->{children}[0]{w} - $indent);
		2305	$layout->set_markup ($text);
		2306
		2307	($layout->size)[1]
		2308	}
		2309
		2310	sub reflow {
		2311	my ($self) = @_;
		2312
		2313	$self->{need_reflow}++;
		2314	$self->update;
		2315	}
		2316
		2317	sub set_offset {
		2318	my ($self, $offset) = @_;
		2319
		2320	# todo: base offset on lines or so, not on pixels
		2321	$self->{children}[1]->set_value ($offset);
		2322	}
		2323
		2324	sub clear {
		2325	my ($self) = @_;
		2326
		2327	$self->{par} = [];
		2328	$self->{height} = 0;
		2329	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2330	}
		2331
2040	sub add_paragraph {	2332	sub add_paragraph {
2041	my ($self, $color, $text) = @_;	2333	my ($self, $color, $text, $indent) = @_;
2042		2334
2043	#TODO: intelligently "reformat" paragraph	2335	for my $line (split /\n/, $text) {
2044
2045	my $height = $self->text_height ($text);	2336	my $height = $self->text_height ($line);
2046
2047	$self->{height} += $height;	2337	$self->{height} += $height;
2048
2049	push @{$self->{par}}, [$height, $color, $text];	2338	push @{$self->{par}}, [$height, $color, $indent, $line];
		2339	}
2050		2340
2051	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2341	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2052	$self->{children}[1]->update;
2053	}	2342	}
2054		2343
2055	sub update {	2344	sub update {
2056	my ($self) = @_;	2345	my ($self) = @_;
2057		2346
…		…
2059		2348
2060	return unless $self->{h} > 0;	2349	return unless $self->{h} > 0;
2061		2350
2062	delete $self->{texture};	2351	delete $self->{texture};
2063		2352
2064	$ROOT->on_refresh ($self, sub {	2353	$ROOT->on_post_alloc ($self, sub {
2065	if (delete $self->{need_reflow}) {	2354	if (delete $self->{need_reflow}) {
2066	my $height = 0;	2355	my $height = 0;
2067		2356
2068	$height += $_->[0] = $self->text_height ($_->[2])	2357	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2069	for @{$self->{par}};	2358	for @{$self->{par}};
2070		2359
2071	$self->{height} = $height;	2360	$self->{height} = $height;
2072		2361
2073	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2362	$self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);
2074		2363
2075	delete $self->{texture};	2364	delete $self->{texture};
2076	}	2365	}
2077		2366
2078	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2367	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2079	glClearColor 0, 0, 0, 1;	2368	glClearColor 0.5, 0.5, 0.5, 0;
2080	glClear GL_COLOR_BUFFER_BIT;	2369	glClear GL_COLOR_BUFFER_BIT;
2081
2082	glEnable GL_BLEND;
2083	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2084	glEnable GL_TEXTURE_2D;
2085	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2086		2370
2087	my $top = int $self->{children}[1]{range}[0];	2371	my $top = int $self->{children}[1]{range}[0];
2088		2372
2089	my $y0 = $top;	2373	my $y0 = $top;
2090	my $y1 = $top + $self->{h};	2374	my $y1 = $top + $self->{h};
…		…
2093		2377
2094	my $layout = $self->{layout};	2378	my $layout = $self->{layout};
2095		2379
2096	$layout->set_font ($self->{font}) if $self->{font};	2380	$layout->set_font ($self->{font}) if $self->{font};
2097		2381
		2382	glEnable GL_BLEND;
		2383	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2384
2098	for my $par (@{$self->{par}}) {	2385	for my $par (@{$self->{par}}) {
2099	my $h = $par->[0];	2386	my $h = $par->[0];
2100		2387
2101	if ($y0 < $y + $h && $y < $y1) {	2388	if ($y0 < $y + $h && $y < $y1) {
		2389	$layout->set_foreground (@{ $par->[1] });
		2390	$layout->set_width ($self->{w} - $par->[2]);
2102	$layout->set_text ($par->[2]);	2391	$layout->set_markup ($par->[3]);
2103		2392
2104	glColor @{ $par->[1] };	2393	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2105	my ($W, $H) = $layout->size;	2394
2106	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2395	glRasterPos $par->[2], $y - $y0;
		2396	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2107	}	2397	}
2108		2398
2109	$y += $h;	2399	$y += $h;
2110	}	2400	}
2111		2401
2112	glDisable GL_TEXTURE_2D;
2113	glDisable GL_BLEND;	2402	glDisable GL_BLEND;
2114	};	2403	};
2115	});	2404	});
2116	}	2405	}
2117		2406
2118	sub _draw {	2407	sub _draw {
2119	my ($self) = @_;	2408	my ($self) = @_;
2120		2409
2121	if ($self->{texture}) {
2122	glEnable GL_TEXTURE_2D;	2410	glEnable GL_TEXTURE_2D;
2123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2411	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2412	glColor 1, 1, 1, 1;
2124	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2413	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2125	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2126	}
2127		2415
2128	$self->{children}[1]->draw;	2416	$self->{children}[1]->draw;
2129		2417
2130	}	2418	}
2131		2419
…		…
2225	@_,	2513	@_,
2226	can_events => 0,	2514	can_events => 0,
2227	)	2515	)
2228	}	2516	}
2229		2517
2230	sub set_markup {	2518	sub set_tooltip_from {
2231	my ($self, $text) = @_;	2519	my ($self, $widget) = @_;
2232		2520
2233	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2521	$self->add (new CFClient::UI::Label
2234	$self->{label}->set_markup ($text);	2522	markup => $widget->{tooltip},
2235	$self->add ($self->{label});	2523	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2524	fontsize => 0.8,
		2525	fg => [0, 0, 0, 1],
		2526	ellipsise => 0,
		2527	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2528	);
2236	}	2529	}
2237		2530
2238	sub size_request {	2531	sub size_request {
2239	my ($self) = @_;	2532	my ($self) = @_;
2240
2241	$self->child->set_max_size ($::WIDTH * 0.3);
2242		2533
2243	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2534	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244		2535
2245	($w + 4, $h + 4)	2536	($w + 4, $h + 4)
2246	}	2537	}
…		…
2252	}	2543	}
2253		2544
2254	sub _draw {	2545	sub _draw {
2255	my ($self) = @_;	2546	my ($self) = @_;
2256		2547
2257	glPushMatrix;
2258	glTranslate 0.375, 0.375;	2548	glTranslate 0.375, 0.375;
2259		2549
2260	my ($w, $h) = @$self{qw(w h)};	2550	my ($w, $h) = @$self{qw(w h)};
2261		2551
2262	glColor 1, 0.8, 0.4;	2552	glColor 1, 0.8, 0.4;
…		…
2273	glVertex 0 , $h;	2563	glVertex 0 , $h;
2274	glVertex $w, $h;	2564	glVertex $w, $h;
2275	glVertex $w, 0;	2565	glVertex $w, 0;
2276	glEnd;	2566	glEnd;
2277		2567
2278	glPopMatrix;	2568	glTranslate 2 - 0.375, 2 - 0.375;
2279
2280	glTranslate 2, 2;
2281	$self->SUPER::_draw;	2569	$self->SUPER::_draw;
2282	}	2570	}
2283		2571
2284	#############################################################################	2572	#############################################################################
2285		2573
…		…
2290	use CFClient::OpenGL;	2578	use CFClient::OpenGL;
2291		2579
2292	sub new {	2580	sub new {
2293	my $class = shift;	2581	my $class = shift;
2294		2582
2295	$class->SUPER::new (	2583	my $self = $class->SUPER::new (
2296	aspect => 1,	2584	aspect => 1,
2297	@_,	2585	@_,
2298	)	2586	);
		2587
		2588	if ($self->{anim} && $self->{animspeed}) {
		2589	Scalar::Util::weaken (my $widget = $self);
		2590
		2591	$self->{timer} = Event->timer (
		2592	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2593	hard => 1,
		2594	interval => $self->{animspeed},
		2595	cb => sub {
		2596	++$widget->{frame};
		2597	$widget->update;
		2598	},
		2599	);
		2600	}
		2601
		2602	$self
2299	}	2603	}
2300		2604
2301	sub size_request {	2605	sub size_request {
2302	(32, 8)	2606	(32, 8)
2303	}	2607	}
2304		2608
		2609	sub update {
		2610	my ($self) = @_;
		2611
		2612	return unless $self->{visible};
		2613
		2614	$self->SUPER::update;
		2615	}
		2616
2305	sub draw {	2617	sub _draw {
2306	my ($self) = @_;	2618	my ($self) = @_;
2307		2619
		2620	return unless $::CONN;
		2621
		2622	my $face;
		2623
		2624	if ($self->{frame}) {
		2625	my $anim = $::CONN->{anim}[$self->{anim}];
		2626
		2627	$face = $anim->[ $self->{frame} % @$anim ]
		2628	if $anim && @$anim;
		2629	}
		2630
2308	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2631	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2309		2632
2310	if ($tex) {	2633	if ($tex) {
2311	glEnable GL_BLEND;
2312	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2314	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315	glColor 1, 1, 1, 1;	2636	glColor 1, 1, 1, 1;
2316	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2637	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2317	glDisable GL_TEXTURE_2D;	2638	glDisable GL_TEXTURE_2D;
2318	glDisable GL_BLEND;	2639	}
		2640	}
		2641
		2642	sub DESTROY {
		2643	my ($self) = @_;
		2644
		2645	$self->{timer}->cancel
		2646	if $self->{timer};
		2647
		2648	$self->SUPER::DESTROY;
		2649	}
		2650
		2651	#############################################################################
		2652
		2653	package CFClient::UI::InventoryItem;
		2654
		2655	our @ISA = CFClient::UI::HBox::;
		2656
		2657	sub _item_to_desc {
		2658	my ($item) = @_;
		2659
		2660	my $desc =
		2661	$item->{nrof} < 2
		2662	? $item->{name}
		2663	: "$item->{nrof} × $item->{name_pl}";
		2664
		2665	$item->{flags} & Crossfire::Protocol::F_OPEN
		2666	and $desc .= " (open)";
		2667	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2668	and $desc .= " (applied)";
		2669	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2670	and $desc .= " (unpaid)";
		2671	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2672	and $desc .= " (magic)";
		2673	$item->{flags} & Crossfire::Protocol::F_CURSED
		2674	and $desc .= " (cursed)";
		2675	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2676	and $desc .= " (damned)";
		2677	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2678	and $desc .= " *";
		2679
		2680	$desc
		2681	}
		2682
		2683	sub new {
		2684	my $class = shift;
		2685
		2686	my %args = @_;
		2687
		2688	my $item = delete $args{item};
		2689
		2690	my $desc = _item_to_desc ($item);
		2691
		2692	my $self = $class->SUPER::new (
		2693	can_hover => 1,
		2694	can_events => 1,
		2695	tooltip => ((CFClient::UI::Label::escape $desc)
		2696	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
		2697	connect_button_down => sub {
		2698	my ($self, $ev, $x, $y) = @_;
		2699
		2700	# todo: maybe put examine on 1? but should just be a tooltip :(
		2701	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2702	my $targ = $::CONN->{player}{tag};
		2703
		2704	if ($item->{container} == $::CONN->{player}{tag}) {
		2705	$targ = $main::OPENCONT;
		2706	}
		2707
		2708	$::CONN->send ("move $targ $item->{tag} 0");
		2709	} elsif ($ev->{button} == 1) {
		2710	$::CONN->send ("examine $item->{tag}");
		2711	} elsif ($ev->{button} == 2) {
		2712	$::CONN->send ("apply $item->{tag}");
		2713	} elsif ($ev->{button} == 3) {
		2714	my @menu_items = (
		2715	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2716	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2717	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2718	(
		2719	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2720	? (
		2721	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2722	)
		2723	: (
		2724	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2725	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2726	)
		2727	),
		2728	);
		2729
		2730	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2731	}
		2732
		2733	1
		2734	},
		2735	%args
		2736	);
		2737
		2738
		2739	$self->add (new CFClient::UI::Face
		2740	can_events => 0,
		2741	face => $item->{face},
		2742	anim => $item->{anim},
		2743	animspeed => $item->{animspeed},
		2744	);
		2745
		2746	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2747
		2748	$self->{item} = $item;
		2749
		2750	$self->update_item;
		2751
		2752	$self
		2753	}
		2754
		2755	sub update_item {
		2756	my ($self) = @_;
		2757
		2758	my $desc = _item_to_desc ($self->{item});
		2759
		2760	$self->{name_lbl}->set_text ($desc);
		2761	}
		2762
		2763	#############################################################################
		2764
		2765	package CFClient::UI::Inventory;
		2766
		2767	our @ISA = CFClient::UI::ScrolledWindow::;
		2768
		2769	sub new {
		2770	my $class = shift;
		2771
		2772	my $self = $class->SUPER::new (
		2773	scrolled => (new CFClient::UI::Table),
		2774	@_,
		2775	);
		2776
		2777	$self
		2778	}
		2779
		2780	sub set_items {
		2781	my ($self, $items) = @_;
		2782
		2783	$self->{scrolled}->clear;
		2784	return unless $items;
		2785
		2786	my @items = sort {
		2787	($a->{type} <=> $b->{type})
		2788	or ($a->{name} cmp $b->{name})
		2789	} @$items;
		2790
		2791	$self->{real_items} = \@items;
		2792
		2793	for my $item (@items) {
		2794	$item->{item} = $item;
		2795	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2796	$item->update_item ();
		2797	}
		2798
		2799	my $i = 0;
		2800	for (@items) {
		2801	$self->{scrolled}->add (0, $i, $_);
		2802	my $nrof = $_->{item}->{nrof} || 1;
		2803	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2804	}
		2805
		2806	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2807	}
		2808
		2809	sub size_request {
		2810	my ($self) = @_;
		2811	($self->{req_w}, $self->{req_h});
		2812	}
		2813
		2814	#############################################################################
		2815
		2816	package CFClient::UI::Menu;
		2817
		2818	our @ISA = CFClient::UI::FancyFrame::;
		2819
		2820	use CFClient::OpenGL;
		2821
		2822	sub new {
		2823	my $class = shift;
		2824
		2825	my $self = $class->SUPER::new (
		2826	items => [],
		2827	z => 100,
		2828	@_,
		2829	);
		2830
		2831	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2832
		2833	for my $item (@{ $self->{items} }) {
		2834	my ($widget, $cb) = @$item;
		2835
		2836	# handle various types of items, only text for now
		2837	if (!ref $widget) {
		2838	$widget = new CFClient::UI::Label
		2839	can_hover => 1,
		2840	can_events => 1,
		2841	text => $widget;
		2842	}
		2843
		2844	$self->{item}{$widget} = $item;
		2845
		2846	$self->{vbox}->add ($widget);
		2847	}
		2848
		2849	$self
		2850	}
		2851
		2852	# popup given the event (must be a mouse button down event currently)
		2853	sub popup {
		2854	my ($self, $ev) = @_;
		2855
		2856	$self->emit ("popdown");
		2857
		2858	# maybe save $GRAB? must be careful about events...
		2859	$GRAB = $self;
		2860	$self->{button} = $ev->{button};
		2861
		2862	$self->show;
		2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2864	}
		2865
		2866	sub mouse_motion {
		2867	my ($self, $ev, $x, $y) = @_;
		2868
		2869	# TODO: should use vbox->find_widget or so
		2870	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2871	$self->{hover} = $self->{item}{$HOVER};
		2872	}
		2873
		2874	sub button_up {
		2875	my ($self, $ev, $x, $y) = @_;
		2876
		2877	if ($ev->{button} == $self->{button}) {
		2878	undef $GRAB;
		2879	$self->hide;
		2880
		2881	$self->emit ("popdown");
		2882	$self->{hover}[1]->() if $self->{hover};
		2883	}
		2884	}
		2885
		2886	#############################################################################
		2887
		2888	package CFClient::UI::Statusbox;
		2889
		2890	our @ISA = CFClient::UI::VBox::;
		2891
		2892	sub new {
		2893	my $class = shift;
		2894
		2895	$class->SUPER::new (
		2896	fontsize => 0.8,
		2897	@_,
2319	}	2898	)
		2899	}
		2900
		2901	sub reorder {
		2902	my ($self) = @_;
		2903	my $NOW = time;
		2904
		2905	while (my ($k, $v) = each %{ $self->{item} }) {
		2906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2907	}
		2908
		2909	my @widgets;
		2910
		2911	my @items = sort {
		2912	$a->{pri} <=> $b->{pri}
		2913	or $b->{id} <=> $a->{id}
		2914	} values %{ $self->{item} };
		2915
		2916	my $count = 10 + 1;
		2917	for my $item (@items) {
		2918	last unless --$count;
		2919
		2920	push @widgets, $item->{label} ||= do {
		2921	# TODO: doesn't handle markup well (read as: at all)
		2922	my $short = $item->{count} > 1
		2923	? "<b>$item->{count} ×</b> $item->{text}"
		2924	: $item->{text};
		2925
		2926	for ($short) {
		2927	s/^\s+//;
		2928	s/\s+/ /g;
		2929	}
		2930
		2931	new CFClient::UI::Label
		2932	markup => $short,
		2933	tooltip => $item->{tooltip},
		2934	tooltip_font => $::FONT_PROP,
		2935	tooltip_width => 0.67,
		2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
		2938	fg => $item->{fg},
		2939	can_events => 1,
		2940	can_hover => 1
		2941	};
		2942	}
		2943
		2944	$self->clear;
		2945	$self->SUPER::add (reverse @widgets);
		2946	}
		2947
		2948	sub add {
		2949	my ($self, $text, %arg) = @_;
		2950
		2951	$text =~ s/^\s+//;
		2952	$text =~ s/\s+$//;
		2953
		2954	my $timeout = time + ((delete $arg{timeout}) || 60);
		2955
		2956	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2957
		2958	if (my $item = $self->{item}{$group}) {
		2959	if ($item->{text} eq $text) {
		2960	$item->{count}++;
		2961	} else {
		2962	$item->{count} = 1;
		2963	$item->{text} = $item->{tooltip} = $text;
		2964	}
		2965	$item->{id} = ++$self->{id};
		2966	$item->{timeout} = $timeout;
		2967	delete $item->{label};
		2968	} else {
		2969	$self->{item}{$group} = {
		2970	id => ++$self->{id},
		2971	text => $text,
		2972	timeout => $timeout,
		2973	tooltip => $text,
		2974	fg => [0.8, 0.8, 0.8, 0.8],
		2975	pri => 0,
		2976	count => 1,
		2977	%arg,
		2978	};
		2979	}
		2980
		2981	$self->reorder;
		2982	}
		2983
		2984	sub reconfigure {
		2985	my ($self) = @_;
		2986
		2987	delete $_->{label}
		2988	for values %{ $self->{item} || {} };
		2989
		2990	$self->reorder;
		2991	$self->SUPER::reconfigure;
2320	}	2992	}
2321		2993
2322	#############################################################################	2994	#############################################################################
2323		2995
2324	package CFClient::UI::Root;	2996	package CFClient::UI::Root;
2325		2997
2326	our @ISA = CFClient::UI::Container::;	2998	our @ISA = CFClient::UI::Container::;
2327		2999
2328	use CFClient::OpenGL;	3000	use CFClient::OpenGL;
2329		3001
2330	sub check_size {	3002	sub new {
2331	my ($self) = @_;	3003	my $class = shift;
2332		3004
2333	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3005	$class->SUPER::new (
2334	}	3006	@_,
2335		3007	)
2336	sub size_request {
2337	($::WIDTH, $::HEIGHT)
2338	}	3008	}
2339		3009
2340	sub configure {	3010	sub configure {
2341	my ($self, $x, $y, $w, $h) = @_;	3011	my ($self, $x, $y, $w, $h) = @_;
2342		3012
2343	$self->SUPER::configure ($x, $y, $w, $h);	3013	$self->{w} = $w;
		3014	$self->{h} = $h;
		3015	}
2344		3016
		3017	sub check_size {
		3018	my ($self) = @_;
		3019
		3020	$self->size_allocate ($self->{w}, $self->{h})
		3021	if $self->{w};
		3022	}
		3023
		3024	sub size_request {
		3025	my ($self) = @_;
		3026
		3027	($self->{w}, $self->{h})
		3028	}
		3029
		3030	sub size_allocate {
		3031	my ($self, $w, $h) = @_;
		3032
		3033	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		3034	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		3035
		3036	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		3037	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		3038
2345	for my $child (@{$self->{children}}) {	3039	for my $child ($self->children) {
2346	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3040	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2347		3041
		3042	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3043	if exists $child->{req_x};
		3044
		3045	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3046	if exists $child->{req_y};
		3047
2348	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2349	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3050
2350	$child->configure ($X, $Y, $W,$H);	3051	$child->configure ($X, $Y, $W, $H);
2351	}	3052	}
2352	}	3053	}
2353		3054
2354	sub _topleft {	3055	sub coord2local {
2355	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2356		3057
2357	($x, $y)	3058	($x, $y)
2358	}	3059	}
2359		3060
		3061	sub coord2global {
		3062	my ($self, $x, $y) = @_;
		3063
		3064	($x, $y)
		3065	}
		3066
2360	sub update {	3067	sub update {
2361	my ($self) = @_;	3068	my ($self) = @_;
2362		3069
2363	$self->check_size;	3070	$self->check_size;
2364	::refresh ();	3071	$::WANT_REFRESH++;
2365	}	3072	}
2366		3073
2367	sub add {	3074	sub add {
2368	my ($self, $child) = @_;	3075	my ($self, @children) = @_;
2369		3076
		3077	for my $child (@children) {
		3078	$child->{toplevel} = 1;
		3079
2370	# integerize window positions	3080	# integerise window positions
2371	$child->{x} = int $child->{x};	3081	$child->{x} = int $child->{x};
2372	$child->{y} = int $child->{y};	3082	$child->{y} = int $child->{y};
		3083	}
2373		3084
2374	$self->SUPER::add ($child);	3085	$self->SUPER::add (@children);
		3086
		3087	while (@children) {
		3088	my $w = pop @children;
		3089	push @children, $w->children;
		3090	$w->{visible} = 1;
		3091	}
		3092	}
		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	delete $w->{visible};
		3103	}
2375	}	3104	}
2376		3105
2377	sub on_refresh {	3106	sub on_refresh {
2378	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2379		3108
2380	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2381	}	3110	}
2382		3111
		3112	sub on_post_alloc {
		3113	my ($self, $id, $cb) = @_;
		3114
		3115	$self->{post_alloc_hook}{$id} = $cb;
		3116	}
		3117
2383	sub draw {	3118	sub draw {
2384	my ($self) = @_;	3119	my ($self) = @_;
2385		3120
2386	while (my $rcb = delete $self->{refresh_hook}) {	3121	while ($self->{refresh_hook}) {
2387	$_->() for values %$rcb;	3122	$_->()
		3123	for values %{delete $self->{refresh_hook}};
		3124	}
		3125
		3126	if ($self->{check_size}) {
		3127	my @queue = ([], []);
		3128
		3129	for (;;) {
		3130	if ($self->{check_size}) {
		3131	# heuristic: check containers last
		3132	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3133	for values %{delete $self->{check_size}}
		3134	}
		3135
		3136	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3137
		3138	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3139	? @$widget{qw(user_w user_h)}
		3140	: $widget->size_request;
		3141
		3142	if (delete $widget->{force_alloc}
		3143	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3144	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3145
		3146	$widget->{req_w} = $w;
		3147	$widget->{req_h} = $h;
		3148
		3149	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3150
		3151	$widget->{parent}->check_size
		3152	if $widget->{parent};
		3153	}
		3154	}
		3155	}
		3156
		3157	while ($self->{size_alloc}) {
		3158	for (values %{delete $self->{size_alloc}}) {
		3159	my ($widget, $w, $h) = @$_;
		3160
		3161	$w = 0 if $w < 0;
		3162	$h = 0 if $h < 0;
		3163
		3164	$widget->{w} = $w;
		3165	$widget->{h} = $h;
		3166	$widget->size_allocate ($w, $h);
		3167	$widget->emit (size_allocate => $w, $h);
		3168	}
		3169	}
		3170
		3171	while ($self->{post_alloc_hook}) {
		3172	$_->()
		3173	for values %{delete $self->{post_alloc_hook}};
2388	}	3174	}
2389		3175
2390	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3176	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3177	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392	glClear GL_COLOR_BUFFER_BIT;	3178	glClear GL_COLOR_BUFFER_BIT;
2393		3179
2394	glMatrixMode GL_PROJECTION;	3180	glMatrixMode GL_PROJECTION;
2395	glLoadIdentity;	3181	glLoadIdentity;
2396	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2397	glMatrixMode GL_MODELVIEW;	3183	glMatrixMode GL_MODELVIEW;
2398	glLoadIdentity;	3184	glLoadIdentity;
2399		3185
2400	$self->_draw;	3186	$self->_draw;
2401	}	3187	}
…		…
2403	#############################################################################	3189	#############################################################################
2404		3190
2405	package CFClient::UI;	3191	package CFClient::UI;
2406		3192
2407	$ROOT = new CFClient::UI::Root;	3193	$ROOT = new CFClient::UI::Root;
2408	$TOOLTIP = new CFClient::UI::Tooltip;	3194	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2409		3195
2410	1	3196	1
2411		3197

Diff Legend

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