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.167 by elmex, Mon Apr 24 08:44:23 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;
…		…
503		561
504	$self	562	$self
505	}	563	}
506		564
507	sub add {	565	sub add {
508	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
509		567
510	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
511		570
512	use sort 'stable';	571	use sort 'stable';
513		572
514	$self->{children} = [	573	$self->{children} = [
515	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
516	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
517	];	576	];
518		577
519	$child->check_size;	578	$self->check_size (1);
		579	$self->update;
		580	}
		581
		582	sub children {
		583	@{ $_[0]{children} }
520	}	584	}
521		585
522	sub remove {	586	sub remove {
523	my ($self, $child) = @_;	587	my ($self, $child) = @_;
524		588
…		…
539		603
540	for (@$children) {	604	for (@$children) {
541	delete $_->{parent};	605	delete $_->{parent};
542	$_->hide;	606	$_->hide;
543	}	607	}
		608
		609	$self->check_size;
		610	$self->update;
544	}	611	}
545		612
546	sub find_widget {	613	sub find_widget {
547	my ($self, $x, $y) = @_;	614	my ($self, $x, $y) = @_;
548		615
…		…
623	}	690	}
624		691
625	sub update {	692	sub update {
626	my ($self) = @_;	693	my ($self) = @_;
627		694
628	# we want to do this delayed...	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
629	$self->render_chld;
630	$self->SUPER::update;	696	$self->SUPER::update;
631	}
632
633	sub render_chld {
634	my ($self) = @_;
635
636	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637	glClearColor 0, 0, 0, 1;
638	glClear GL_COLOR_BUFFER_BIT;
639	$self->child->draw;
640	};
641	}	697	}
642		698
643	sub size_allocate {	699	sub size_allocate {
644	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
645		701
646	$self->child->configure (0, 0, $w, $h);	702	$self->SUPER::size_allocate ($w, $h);
		703	$self->update;
		704	}
647		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
648	$self->render_chld;	717	$self->_render;
		718	};
649	}	719	}
650		720
651	sub _draw {	721	sub _draw {
652	my ($self) = @_;	722	my ($self) = @_;
653		723
654	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
655		725
656	my $tex = $self->{texture}	726	my $tex = $self->{texture}
657	or return;	727	or return;
658		728
659	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
662	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;
663		732
664	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665		734
666	glDisable GL_BLEND;
667	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
668	}	736	}
669		737
670	#############################################################################	738	#############################################################################
671		739
672	package CFClient::UI::ViewPort;	740	package CFClient::UI::ViewPort;
673		741
674	our @ISA = CFClient::UI::Window::;	742	our @ISA = CFClient::UI::Window::;
675		743
676	sub new { die }
677
678	sub size_request {	744	sub size_request {
679	my ($self) = @_;	745	my ($self) = @_;
680		746
681	@$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)};
682	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683		748
684	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
685	}	750	}
686		751
687	sub _draw {	752	sub size_allocate {
688	my ($self) = @_;	753	my ($self, $w, $h) = @_;
689		754
690	$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;
691	}	759	}
692		760
		761	sub set_offset {
		762	my ($self, $x, $y) = @_;
693		763
694	#############################################################################	764	$self->{view_x} = int $x;
		765	$self->{view_y} = int $y;
695		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
696	package CFClient::UI::Frame;	808	package CFClient::UI::ScrolledWindow;
697		809
698	our @ISA = CFClient::UI::Bin::;	810	our @ISA = CFClient::UI::HBox::;
699
700	use CFClient::OpenGL;
701		811
702	sub new {	812	sub new {
703	my $class = shift;	813	my $class = shift;
704		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
705	my $self = $class->SUPER::new (	825	$self = $class->SUPER::new (
706	bg => [1, 1, 1, 1],	826	vp => (new CFClient::UI::ViewPort expand => 1),
707	border_bg => [1, 1, 1, 1],	827	slider => $slider,
708	border => 0.8,
709	@_	828	@_,
710	);	829	);
711		830
		831	$self->{vp}->add ($self->{scrolled});
		832	$self->add ($self->{vp});
		833	$self->add ($self->{slider});
		834
712	$self	835	$self
713	}	836	}
714		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
715	sub _draw {	858	sub _draw {
716	my ($self) = @_;	859	my ($self) = @_;
717		860
718	my ($w, $h) = ($self->{w}, $self->{h});	861	if ($self->{bg}) {
		862	my ($w, $h) = @$self{qw(w h)};
719		863
720	glEnable GL_BLEND;	864	glEnable GL_BLEND;
721	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	865	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722	glEnable GL_TEXTURE_2D;	866	glColor @{ $self->{bg} };
723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724		867
725	# glBegin GL_QUADS;	868	glBegin GL_QUADS;
726	# glColor 0, 0, 0, 0;
727	# glVertex 0 , 0;	869	glVertex 0 , 0;
728	# glVertex 0 , $h;	870	glVertex 0 , $h;
729	# glVertex $w, $h;	871	glVertex $w, $h;
730	# glVertex $w, 0;	872	glVertex $w, 0;
731	# glEnd;	873	glEnd;
732		874
733
734	$self->child->draw;
735	glDisable GL_BLEND;	875	glDisable GL_BLEND;
736	glDisable GL_TEXTURE_2D;	876	}
		877
		878	$self->SUPER::_draw;
737	}	879	}
738		880
739	#############################################################################	881	#############################################################################
740		882
741	package CFClient::UI::FancyFrame;	883	package CFClient::UI::FancyFrame;
…		…
754	# TODO: user_x, user_y, overwrite moveto?	896	# TODO: user_x, user_y, overwrite moveto?
755		897
756	my $self = $class->SUPER::new (	898	my $self = $class->SUPER::new (
757	bg => [1, 1, 1, 1],	899	bg => [1, 1, 1, 1],
758	border_bg => [1, 1, 1, 1],	900	border_bg => [1, 1, 1, 1],
759	border => 0.8,	901	border => 0.6,
		902	toplevel => 1,
760	can_events => 1,	903	can_events => 1,
761	@_	904	@_
762	);	905	);
763		906
764	$self->{title} &&= new CFClient::UI::Label	907	$self->{title} &&= new CFClient::UI::Label
765	align => 0,	908	align => 0,
766	valign => 1,	909	valign => 1,
767	text => $self->{title},	910	text => $self->{title},
768	fontsize => 1;	911	fontsize => $self->{border};
769		912
770	$self	913	$self
771	}	914	}
772		915
773	sub border {	916	sub border {
…		…
789	my ($self, $w, $h) = @_;	932	my ($self, $w, $h) = @_;
790		933
791	$h -= List::Util::max 0, $self->border * 2;	934	$h -= List::Util::max 0, $self->border * 2;
792	$w -= List::Util::max 0, $self->border * 2;	935	$w -= List::Util::max 0, $self->border * 2;
793		936
794	$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)
795	if $self->{title};	938	if $self->{title};
796		939
797	$self->child->configure ($self->border, $self->border, $w, $h);	940	$self->child->configure ($self->border, $self->border, $w, $h);
798	}	941	}
799		942
800	sub button_down {	943	sub button_down {
801	my ($self, $ev, $x, $y) = @_;	944	my ($self, $ev, $x, $y) = @_;
802		945
		946	my ($w, $h) = @$self{qw(w h)};
803	my $border = $self->border;	947	my $border = $self->border;
804		948
805	if ($x < $self->{w} && $x >= $self->{w} - $border	949	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806	&& $y < $self->{h} && $y >= $self->{h} - $border) {	950	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807		951
		952	if ($lr & $td) {
		953	my ($wx, $wy) = ($self->{x}, $self->{y});
808	my ($ox, $oy) = ($ev->{x}, $ev->{y});	954	my ($ox, $oy) = ($ev->{x}, $ev->{y});
809	my ($bw, $bh) = ($self->{w}, $self->{h});	955	my ($bw, $bh) = ($self->{w}, $self->{h});
810		956
		957	my $mx = $x < $border;
		958	my $my = $y < $border;
		959
811	$self->{motion} = sub {	960	$self->{motion} = sub {
812	my ($ev, $x, $y) = @_;	961	my ($ev, $x, $y) = @_;
813		962
814	($x, $y) = ($ev->{x}, $ev->{y});	963	my $dx = $ev->{x} - $ox;
		964	my $dy = $ev->{y} - $oy;
815		965
816	$self->{user_w} = $bw + $x - $ox;	966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817	$self->{user_h} = $bh + $y - $oy;	967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
818	$self->check_size;	969	$self->check_size;
819	};	970	};
820		971
821	} elsif ($x >= 0 && $x < $self->{w}	972	} elsif ($lr ^ $td) {
822	&& $y >= 0 && $y < $border) {
823
824	my ($ox, $oy) = ($ev->{x}, $ev->{y});	973	my ($ox, $oy) = ($ev->{x}, $ev->{y});
825	my ($bx, $by) = ($self->{x}, $self->{y});	974	my ($bx, $by) = ($self->{x}, $self->{y});
826		975
827	$self->{motion} = sub {	976	$self->{motion} = sub {
828	my ($ev, $x, $y) = @_;	977	my ($ev, $x, $y) = @_;
…		…
851	my ($self) = @_;	1000	my ($self) = @_;
852		1001
853	my ($w, $h ) = ($self->{w}, $self->{h});	1002	my ($w, $h ) = ($self->{w}, $self->{h});
854	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1003	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855		1004
856	glEnable GL_BLEND;
857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858	glEnable GL_TEXTURE_2D;	1005	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860		1007
861	my $border = $self->border;	1008	my $border = $self->border;
862		1009
863	glColor @{ $self->{border_bg} };	1010	glColor @{ $self->{border_bg} };
864	$tex[1]->draw_quad (0, 0, $w, $border);	1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
865	$tex[3]->draw_quad (0, $border, $border, $ch);	1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868		1015
		1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869	my $bg = $tex[0];	1017	my $bg = $tex[0];
870		1018
871	# TODO: repeat texture not scale	1019	# TODO: repeat texture not scale
872	my $rep_x = $cw / $bg->{w};	1020	my $rep_x = $cw / $bg->{w};
873	my $rep_y = $ch / $bg->{h};	1021	my $rep_y = $ch / $bg->{h};
874		1022
875	glColor @{ $self->{bg} };	1023	glColor @{ $self->{bg} };
876		1024
877	$bg->{s} = $rep_x;	1025	$bg->{s} = $rep_x;
878	$bg->{t} = $rep_y;	1026	$bg->{t} = $rep_y;
879	$bg->{wrap_mode} = 1;	1027	$bg->{wrap_mode} = 1;
880	$bg->draw_quad ($border, $border, $cw, $ch);	1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1029	}
881		1030
882	glDisable GL_TEXTURE_2D;	1031	glDisable GL_TEXTURE_2D;
883	glDisable GL_BLEND;
884		1032
885	$self->{title}->draw if $self->{title};	1033	$self->{title}->draw if $self->{title};
		1034
886	$self->child->draw;	1035	$self->child->draw;
887	}	1036	}
888		1037
889	#############################################################################	1038	#############################################################################
890		1039
…		…
912	$self->{children}[$y][$x] = $child;	1061	$self->{children}[$y][$x] = $child;
913		1062
914	$child->check_size;	1063	$child->check_size;
915	}	1064	}
916		1065
		1066	sub children {
		1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1068	}
		1069
917	# 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?
918	sub clear {	1071	sub clear {
919	my ($self) = @_;	1072	my ($self) = @_;
920		1073
921	my $children = delete $self->{children};	1074	my @children = $self->children;
		1075	delete $self->{children};
922		1076
923	for (grep $_, map @$_, grep $_, @$children) {	1077	for (@children) {
924	delete $_->{parent};	1078	delete $_->{parent};
925	$_->hide;	1079	$_->hide;
926	}	1080	}
927		1081
928	$self->update;	1082	$self->update;
…		…
1109	}	1263	}
1110		1264
1111	sub size_allocate {	1265	sub size_allocate {
1112	my ($self, $w, $h) = @_;	1266	my ($self, $w, $h) = @_;
1113		1267
		1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1269
1114	my $children = $self->{children};	1270	my $children = $self->{children};
1115		1271
1116	my @h = map $_->{req_h}, @$children;	1272	my @h = map $_->{req_h}, @$children;
1117		1273
1118	my $req_h = List::Util::sum @h;	1274	my $req_h = List::Util::sum @h;
…		…
1147		1303
1148	#############################################################################	1304	#############################################################################
1149		1305
1150	package CFClient::UI::Label;	1306	package CFClient::UI::Label;
1151		1307
1152	our @ISA = CFClient::UI::Base::;	1308	our @ISA = CFClient::UI::DrawBG::;
1153		1309
1154	use CFClient::OpenGL;	1310	use CFClient::OpenGL;
1155		1311
1156	sub new {	1312	sub new {
1157	my ($class, %arg) = @_;	1313	my ($class, %arg) = @_;
1158		1314
1159	my $self = $class->SUPER::new (	1315	my $self = $class->SUPER::new (
1160	fg => [1, 1, 1],	1316	fg => [1, 1, 1],
		1317	#bg => none
		1318	#active_bg => none
1161	#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),
1162	fontsize => 1,	1325	fontsize => 1,
1163	text => "",
1164	align => -1,	1326	align => -1,
1165	valign => -1,	1327	valign => -1,
1166	padding => 2,	1328	padding => 2,
1167	layout => new CFClient::Layout,
1168	can_events => 0,	1329	can_events => 0,
1169	%arg	1330	%arg
1170	);	1331	);
1171		1332
1172	if (exists $self->{template}) {	1333	if (exists $self->{template}) {
1173	my $layout = new CFClient::Layout;	1334	my $layout = new CFClient::Layout;
1174	$layout->set_text (delete $self->{template});	1335	$layout->set_text (delete $self->{template});
1175	$self->{template} = $layout;	1336	$self->{template} = $layout;
1176	}	1337	}
1177		1338
1178	$self->set_text (delete $self->{text}) if exists $self->{text};	1339	if (exists $self->{markup}) {
1179	$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	}
1180		1344
1181	$self	1345	$self
1182	}	1346	}
1183		1347
1184	sub escape {	1348	sub escape($) {
1185	local $_ = $_[1];	1349	local $_ = $_[0];
1186		1350
1187	s/&/&amp;/g;	1351	s/&/&amp;/g;
1188	s/>/&gt;/g;	1352	s/>/&gt;/g;
1189	s/</&lt;/g;	1353	s/</&lt;/g;
1190		1354
1191	$_[1]	1355	$_
		1356	}
		1357
		1358	sub update {
		1359	my ($self) = @_;
		1360
		1361	delete $self->{texture};
		1362	$self->SUPER::update;
1192	}	1363	}
1193		1364
1194	sub set_text {	1365	sub set_text {
1195	my ($self, $text) = @_;	1366	my ($self, $text) = @_;
1196		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;
1197	$self->{layout}->set_text ($text);	1372	$self->{layout}->set_text ($text);
1198		1373
1199	delete $self->{texture};	1374	$self->update;
1200	$self->check_size;	1375	$self->check_size;
1201	$self->update;
1202	}	1376	}
1203		1377
1204	sub set_markup {	1378	sub set_markup {
1205	my ($self, $markup) = @_;	1379	my ($self, $markup) = @_;
1206		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;
1207	$self->{layout}->set_markup ($markup);	1387	$self->{layout}->set_markup ($markup);
1208		1388
1209	delete $self->{texture};	1389	$self->update;
1210	$self->check_size;	1390	$self->check_size;
1211	$self->update;
1212	}	1391	}
1213		1392
1214	sub size_request {	1393	sub size_request {
1215	my ($self) = @_;	1394	my ($self) = @_;
1216		1395
1217	$self->{layout}->set_font ($self->{font}) if $self->{font};	1396	$self->{layout}->set_font ($self->{font}) if $self->{font};
1218	$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});
1219	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220		1401
1221	my ($w, $h) = $self->{layout}->size;	1402	my ($w, $h) = $self->{layout}->size;
1222		1403
1223	if (exists $self->{template}) {	1404	if (exists $self->{template}) {
…		…
1245	sub set_fontsize {	1426	sub set_fontsize {
1246	my ($self, $fontsize) = @_;	1427	my ($self, $fontsize) = @_;
1247		1428
1248	$self->{fontsize} = $fontsize;	1429	$self->{fontsize} = $fontsize;
1249	delete $self->{texture};	1430	delete $self->{texture};
		1431
		1432	$self->update;
1250	$self->check_size;	1433	$self->check_size;
1251	$self->update;
1252	}	1434	}
1253		1435
1254	sub _draw {	1436	sub _draw {
1255	my ($self) = @_;	1437	my ($self) = @_;
1256		1438
		1439	$self->SUPER::_draw; # draw background, if applicable
		1440
1257	my $tex = $self->{texture} ||= do {	1441	my $tex = $self->{texture} ||= do {
		1442	$self->{layout}->set_foreground (@{$self->{fg}});
1258	$self->{layout}->set_font ($self->{font}) if $self->{font};	1443	$self->{layout}->set_font ($self->{font}) if $self->{font};
1259	$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});
1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1448
1261	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
1262	};	1460	};
1263		1461
1264	glEnable GL_BLEND;
1265	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266	glEnable GL_TEXTURE_2D;	1462	glEnable GL_TEXTURE_2D;
1267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268		1464
		1465	if ($tex->{format} == GL_ALPHA) {
1269	glColor @{$self->{fg}};	1466	glColor @{$self->{fg}};
1270
1271	$self->{ox} = int (
1272	$self->{align} < 0 ? $self->{padding}
1273	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274	: ($self->{w} - $tex->{w}) * 0.5
1275	);
1276
1277	$self->{oy} = int (
1278	$self->{valign} < 0 ? $self->{padding}
1279	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280	: ($self->{h} - $tex->{h}) * 0.5
1281	);
1282
1283	$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	}
1284		1471
1285	glDisable GL_TEXTURE_2D;	1472	glDisable GL_TEXTURE_2D;
1286	glDisable GL_BLEND;
1287	}	1473	}
1288		1474
1289	#############################################################################	1475	#############################################################################
1290		1476
1291	package CFClient::UI::EntryBase;	1477	package CFClient::UI::EntryBase;
…		…
1304	active_fg => [0, 0, 0],	1490	active_fg => [0, 0, 0],
1305	can_hover => 1,	1491	can_hover => 1,
1306	can_focus => 1,	1492	can_focus => 1,
1307	valign => 0,	1493	valign => 0,
1308	can_events => 1,	1494	can_events => 1,
		1495	#text => ...
1309	@_	1496	@_
1310	)	1497	)
1311	}	1498	}
1312		1499
1313	sub _set_text {	1500	sub _set_text {
…		…
1324		1511
1325	$text =~ s/./*/g if $self->{hidden};	1512	$text =~ s/./*/g if $self->{hidden};
1326	$self->{layout}->set_text ("$text ");	1513	$self->{layout}->set_text ("$text ");
1327		1514
1328	$self->emit (changed => $self->{text});	1515	$self->emit (changed => $self->{text});
1329	}
1330
1331	sub get_text {
1332	$_[0]{text}
1333	}
1334
1335	sub size_request {
1336	my ($self) = @_;
1337
1338	my ($w, $h) = $self->SUPER::size_request;
1339
1340	($w + 1, $h) # add 1 for cursor
1341	}
1342
1343	sub size_allocate {
1344	my ($self, $w, $h) = @_;
1345
1346	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347	}	1516	}
1348		1517
1349	sub set_text {	1518	sub set_text {
1350	my ($self, $text) = @_;	1519	my ($self, $text) = @_;
1351		1520
1352	$self->{cursor} = length $text;	1521	$self->{cursor} = length $text;
1353	$self->_set_text ($text);	1522	$self->_set_text ($text);
1354	$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
1355	}	1543	}
1356		1544
1357	sub key_down {	1545	sub key_down {
1358	my ($self, $ev) = @_;	1546	my ($self, $ev) = @_;
1359		1547
…		…
1361	my $sym = $ev->{sym};	1549	my $sym = $ev->{sym};
1362	my $uni = $ev->{unicode};	1550	my $uni = $ev->{unicode};
1363		1551
1364	my $text = $self->get_text;	1552	my $text = $self->get_text;
1365		1553
1366	if ($sym == 8) {	1554	if ($uni == 8) {
1367	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1555	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368	} elsif ($sym == 127) {	1556	} elsif ($uni == 127) {
1369	substr $text, $self->{cursor}, 1, "";	1557	substr $text, $self->{cursor}, 1, "";
1370	} elsif ($sym == CFClient::SDLK_LEFT) {	1558	} elsif ($sym == CFClient::SDLK_LEFT) {
1371	--$self->{cursor} if $self->{cursor};	1559	--$self->{cursor} if $self->{cursor};
1372	} elsif ($sym == CFClient::SDLK_RIGHT) {	1560	} elsif ($sym == CFClient::SDLK_RIGHT) {
1373	++$self->{cursor} if $self->{cursor} < length $self->{text};	1561	++$self->{cursor} if $self->{cursor} < length $self->{text};
1374	} elsif ($sym == CFClient::SDLK_HOME) {	1562	} elsif ($sym == CFClient::SDLK_HOME) {
1375	$self->{cursor} = 0;	1563	$self->{cursor} = 0;
1376	} elsif ($sym == CFClient::SDLK_END) {	1564	} elsif ($sym == CFClient::SDLK_END) {
1377	$self->{cursor} = length $text;	1565	$self->{cursor} = length $text;
1378	} elsif ($sym == 27) {	1566	} elsif ($uni == 27) {
1379	$self->emit ('escape');	1567	$self->emit ('escape');
1380	} elsif ($uni) {	1568	} elsif ($uni) {
1381	substr $text, $self->{cursor}++, 0, chr $uni;	1569	substr $text, $self->{cursor}++, 0, chr $uni;
1382	}	1570	}
1383		1571
1384	$self->_set_text ($text);	1572	$self->_set_text ($text);
1385	$self->update;	1573	$self->update;
		1574	$self->check_size;
1386	}	1575	}
1387		1576
1388	sub focus_in {	1577	sub focus_in {
1389	my ($self) = @_;	1578	my ($self) = @_;
1390		1579
…		…
1469		1658
1470	if ($sym == 13) {	1659	if ($sym == 13) {
1471	unshift @{$self->{history}},	1660	unshift @{$self->{history}},
1472	my $txt = $self->get_text;	1661	my $txt = $self->get_text;
1473	$self->{history_pointer} = -1;	1662	$self->{history_pointer} = -1;
		1663	$self->{history_saveback} = '';
1474	$self->emit (activate => $txt);	1664	$self->emit (activate => $txt);
1475	$self->update;	1665	$self->update;
1476		1666
1477	} elsif ($sym == CFClient::SDLK_UP) {	1667	} elsif ($sym == CFClient::SDLK_UP) {
1478	if ($self->{history_pointer} < 0) {	1668	if ($self->{history_pointer} < 0) {
1479	$self->{history_saveback} = $self->get_text;	1669	$self->{history_saveback} = $self->get_text;
1480	}	1670	}
		1671	if (@{$self->{history} || []} > 0) {
1481	$self->{history_pointer}++;	1672	$self->{history_pointer}++;
1482	if ($self->{history_pointer} >= @{$self->{history}}) {	1673	if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483	$self->{history_pointer} = @{$self->{history}} - 1;	1674	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1675	}
		1676	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1484	}	1677	}
1485	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1486		1678
1487	} elsif ($sym == CFClient::SDLK_DOWN) {	1679	} elsif ($sym == CFClient::SDLK_DOWN) {
1488	$self->{history_pointer}--;	1680	$self->{history_pointer}--;
1489	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1681	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490		1682
…		…
1516	my $class = shift;	1708	my $class = shift;
1517		1709
1518	$class->SUPER::new (	1710	$class->SUPER::new (
1519	padding => 4,	1711	padding => 4,
1520	fg => [1, 1, 1],	1712	fg => [1, 1, 1],
1521	bg => [1, 1, 1, 0.2],
1522	active_fg => [0, 0, 1],	1713	active_fg => [0, 0, 1],
1523	can_hover => 1,	1714	can_hover => 1,
1524	align => 0,	1715	align => 0,
1525	valign => 0,	1716	valign => 0,
1526	can_events => 1,	1717	can_events => 1,
…		…
1544		1735
1545	if ($GRAB == $self) {	1736	if ($GRAB == $self) {
1546	$self->{fg} = $self->{active_fg};	1737	$self->{fg} = $self->{active_fg};
1547	}	1738	}
1548		1739
1549	glEnable GL_BLEND;
1550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551	glEnable GL_TEXTURE_2D;	1740	glEnable GL_TEXTURE_2D;
1552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553	glColor 0, 0, 0, 1;	1742	glColor 0, 0, 0, 1;
1554		1743
1555	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1744	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556		1745
1557	glDisable GL_TEXTURE_2D;	1746	glDisable GL_TEXTURE_2D;
1558	glDisable GL_BLEND;
1559		1747
1560	$self->SUPER::_draw;	1748	$self->SUPER::_draw;
1561	}	1749	}
1562		1750
1563	#############################################################################	1751	#############################################################################
…		…
1577		1765
1578	$class->SUPER::new (	1766	$class->SUPER::new (
1579	padding => 2,	1767	padding => 2,
1580	fg => [1, 1, 1],	1768	fg => [1, 1, 1],
1581	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],
1582	state => 0,	1772	state => 0,
1583	can_hover => 1,	1773	can_hover => 1,
1584	@_	1774	@_
1585	)	1775	)
1586	}	1776	}
…		…
1610		1800
1611	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;
1612		1802
1613	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614		1804
1615	glEnable GL_BLEND;	1805	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1806
1616	glEnable GL_TEXTURE_2D;	1807	glEnable GL_TEXTURE_2D;
1617	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619	my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621	$tex->draw_quad (0, 0, $s, $s);	1808	$tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623	glDisable GL_TEXTURE_2D;	1809	glDisable GL_TEXTURE_2D;
1624	glDisable GL_BLEND;
1625	}	1810	}
1626		1811
1627	#############################################################################	1812	#############################################################################
1628		1813
1629	package CFClient::UI::Image;	1814	package CFClient::UI::Image;
…		…
1672	glTranslate 0, -$self->{w}, 0;	1857	glTranslate 0, -$self->{w}, 0;
1673		1858
1674	($w, $h) = ($h, $w);	1859	($w, $h) = ($h, $w);
1675	}	1860	}
1676		1861
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1862	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681		1864
1682	$tex->draw_quad (0, 0, $w, $h);	1865	$tex->draw_quad_alpha (0, 0, $w, $h);
1683		1866
1684	glDisable GL_BLEND;
1685	glDisable GL_TEXTURE_2D;	1867	glDisable GL_TEXTURE_2D;
1686	}	1868	}
1687		1869
1688	#############################################################################	1870	#############################################################################
1689		1871
…		…
1737	}	1919	}
1738		1920
1739	sub set_max {	1921	sub set_max {
1740	my ($self, $max) = @_;	1922	my ($self, $max) = @_;
1741		1923
		1924	return if $self->{max_val} == $max;
		1925
1742	$self->{max_val} = $max;	1926	$self->{max_val} = $max;
		1927	$self->update;
1743	}	1928	}
1744		1929
1745	sub set_value {	1930	sub set_value {
1746	my ($self, $val, $max) = @_;	1931	my ($self, $val, $max) = @_;
1747		1932
1748	$self->set_max ($max)	1933	$self->set_max ($max)
1749	if defined $max;	1934	if defined $max;
1750		1935
1751	$max = $self->{max_val};	1936	return if $self->{val} == $val;
		1937
1752	$self->{val} = $val;	1938	$self->{val} = $val;
1753
1754	$self->update;	1939	$self->update;
1755	}	1940	}
1756		1941
1757	sub _draw {	1942	sub _draw {
1758	my ($self) = @_;	1943	my ($self) = @_;
…		…
1821		2006
1822	sub new {	2007	sub new {
1823	my ($class, %arg) = @_;	2008	my ($class, %arg) = @_;
1824		2009
1825	my $self = $class->SUPER::new (	2010	my $self = $class->SUPER::new (
1826	tooltip => $arg{type},	2011	tooltip => $arg{type},
1827	can_hover => 1,	2012	can_hover => 1,
		2013	can_events => 1,
1828	%arg,	2014	%arg,
1829	);	2015	);
1830		2016
1831	$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");
1832	$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);
…		…
1840		2026
1841	$self->{value}->set_fontsize ($fsize);	2027	$self->{value}->set_fontsize ($fsize);
1842	$self->{max} ->set_fontsize ($fsize);	2028	$self->{max} ->set_fontsize ($fsize);
1843	}	2029	}
1844		2030
		2031	sub set_max {
		2032	my ($self, $max) = @_;
		2033
		2034	$self->{gauge}->set_max ($max);
		2035	$self->{max}->set_text ($max);
		2036	}
		2037
1845	sub set_value {	2038	sub set_value {
1846	my ($self, $val, $max) = @_;	2039	my ($self, $val, $max) = @_;
1847		2040
1848	$self->set_max ($max)	2041	$self->set_max ($max)
1849	if defined $max;	2042	if defined $max;
1850		2043
1851	$self->{gauge}->set_value ($val, $max);	2044	$self->{gauge}->set_value ($val, $max);
1852	$self->{value}->set_text ($val);	2045	$self->{value}->set_text ($val);
1853	}
1854
1855	sub set_max {
1856	my ($self, $max) = @_;
1857
1858	$self->{gauge}->set_max ($max);
1859	$self->{max}->set_text ($max);
1860	}	2046	}
1861		2047
1862	#############################################################################	2048	#############################################################################
1863		2049
1864	package CFClient::UI::Slider;	2050	package CFClient::UI::Slider;
…		…
1874	qw(s1_slider.png s1_slider_bg.png);	2060	qw(s1_slider.png s1_slider_bg.png);
1875		2061
1876	sub new {	2062	sub new {
1877	my $class = shift;	2063	my $class = shift;
1878		2064
1879	# range [value, low, high, page]	2065	# range [value, low, high, page, unit]
1880		2066
1881	# TODO: 0-width page	2067	# TODO: 0-width page
1882	# TODO: req_w/h are wrong with vertical	2068	# TODO: req_w/h are wrong with vertical
1883	# TODO: calculations are off	2069	# TODO: calculations are off
1884	my $self = $class->SUPER::new (	2070	my $self = $class->SUPER::new (
1885	fg => [1, 1, 1],	2071	fg => [1, 1, 1],
1886	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],
1887	range => [0, 0, 100, 10],	2075	range => [0, 0, 100, 10, 0],
1888	req_w => 20,	2076	req_w => $::WIDTH / 80,
1889	req_h => 20,	2077	req_h => $::WIDTH / 80,
1890	vertical => 0,	2078	vertical => 0,
1891	can_hover => 1,	2079	can_hover => 1,
1892	inner_pad => 5,	2080	inner_pad => 0.02,
1893	@_	2081	@_
1894	);	2082	);
1895		2083
		2084	$self->set_value ($self->{range}[0]);
		2085	$self->update;
		2086
1896	$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	}
1897	}	2119	}
1898		2120
1899	sub size_request {	2121	sub size_request {
1900	my ($self) = @_;	2122	my ($self) = @_;
1901		2123
…		…
1907		2129
1908	sub button_down {	2130	sub button_down {
1909	my ($self, $ev, $x, $y) = @_;	2131	my ($self, $ev, $x, $y) = @_;
1910		2132
1911	$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
1912	$self->mouse_motion ($ev, $x, $y);	2137	$self->mouse_motion ($ev, $x, $y);
1913	}	2138	}
1914		2139
1915	sub mouse_motion {	2140	sub mouse_motion {
1916	my ($self, $ev, $x, $y) = @_;	2141	my ($self, $ev, $x, $y) = @_;
1917		2142
1918	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
1919	my ($value, $lo, $hi, $page) = @{$self->{range}};	2160	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2161	my $range = ($hi - $page - $lo) || 1e-100;
1920		2162
1921	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2163	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922		2164
1923	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2165	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2166	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925		2167
1926	$x -= $inner_pad_px; # substract the padding	2168	$value = ($value - $lo) / $range;
1927	$x = $x * ($hi - $lo) / $inner_w + $lo;	2169	$value = $value * $self->{scale} + $self->{offset};
1928	$x = $lo if $x < $lo;
1929	$x = $hi - $page if $x > $hi - $page;
1930	$self->{range}[0] = $x;
1931		2170
1932	$self->emit (changed => $x);	2171	$self->{knob_x} = $value - $knob_w * 0.5;
1933	$self->update;	2172	$self->{knob_w} = $knob_w;
1934	}	2173	});
1935	}
1936		2174
1937	# the inner_* stuff is for generating a padding for the slider handle,	2175	$self->SUPER::update;
1938	# so that the handle doesn't leave the texture. This calculation isn't 100%
1939	# correct propably, but it does the job for now
1940	sub _calc_inner_pad_px {
1941	my ($self, $w) = @_;
1942	($w / 100) * $self->{inner_pad} # % to pixels
1943	}	2176	}
1944		2177
1945	sub _draw {	2178	sub _draw {
1946	my ($self) = @_;	2179	my ($self) = @_;
1947		2180
1948	$self->SUPER::_draw ();	2181	$self->SUPER::_draw ();
1949		2182
1950	my ($w, $h) = @$self{qw(w h)};	2183	glScale $self->{w}, $self->{h};
1951		2184
1952	if ($self->{vertical}) {	2185	if ($self->{vertical}) {
1953	# draw a vertical slider like a rotated horizontal slider	2186	# draw a vertical slider like a rotated horizontal slider
1954		2187
		2188	glTranslate 1, 0, 0;
1955	glRotate 90, 0, 0, 1;	2189	glRotate 90, 0, 0, 1;
1956	glTranslate 0, -$self->{w}, 0;
1957
1958	($w, $h) = ($h, $w);
1959	}	2190	}
1960		2191
1961	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2192	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2193	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963		2194
1964	my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966	$hi = $value + 1 if $lo == $hi;
1967
1968	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971	$page = int $page * $inner_w / ($hi - $lo);
1972	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974	$w -= $page;
1975	$page &= ~1;
1976	glTranslate $page * 0.5, 0, 0;
1977	$page ||= 2;
1978
1979	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982	glEnable GL_BLEND;
1983	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984	glEnable GL_TEXTURE_2D;	2195	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2196	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986		2197
1987	# draw background	2198	# draw background
1988	$tex[1]->draw_quad (0, 0, $w, $h);	2199	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989		2200
1990	# draw handle	2201	# draw handle
1991	$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);
1992		2203
1993	glDisable GL_BLEND;
1994	glDisable GL_TEXTURE_2D;	2204	glDisable GL_TEXTURE_2D;
1995	}	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 (@_) }
1996		2247
1997	#############################################################################	2248	#############################################################################
1998		2249
1999	package CFClient::UI::TextView;	2250	package CFClient::UI::TextView;
2000		2251
…		…
2009	fontsize => 1,	2260	fontsize => 1,
2010	can_events => 0,	2261	can_events => 0,
2011	#font => default_font	2262	#font => default_font
2012	@_,	2263	@_,
2013		2264
2014	layout => (new CFClient::Layout),	2265	layout => (new CFClient::Layout 1),
2015	par => [],	2266	par => [],
2016	height => 0,	2267	height => 0,
2017	children => [	2268	children => [
2018	(new CFClient::UI::Empty expand => 1),	2269	(new CFClient::UI::Empty expand => 1),
2019	(new CFClient::UI::Slider vertical => 1),	2270	(new CFClient::UI::Slider vertical => 1),
2020	],	2271	],
2021	);	2272	);
2022		2273
2023	$self->{children}[1]->connect (changed => sub {	2274	$self->{children}[1]->connect (changed => sub { $self->update });
2024	$self->update;
2025	});
2026		2275
2027	$self	2276	$self
2028	}	2277	}
2029		2278
2030	sub set_fontsize {	2279	sub set_fontsize {
2031	my ($self, $fontsize) = @_;	2280	my ($self, $fontsize) = @_;
2032		2281
2033	$self->{fontsize} = $fontsize;	2282	$self->{fontsize} = $fontsize;
2034	$self->reflow;	2283	$self->reflow;
2035	}
2036
2037	sub text_height {
2038	my ($self, $text) = @_;
2039
2040	my $layout = $self->{layout};
2041
2042	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043	$layout->set_width ($self->{w});
2044	$layout->set_text ($text);
2045
2046	($layout->size)[1]
2047	}
2048
2049	sub reflow {
2050	my ($self) = @_;
2051
2052	$self->{need_reflow}++;
2053	$self->update;
2054	}	2284	}
2055		2285
2056	sub size_allocate {	2286	sub size_allocate {
2057	my ($self, $w, $h) = @_;	2287	my ($self, $w, $h) = @_;
2058		2288
…		…
2063	$self->{layout}->set_width ($self->{children}[0]{w});	2293	$self->{layout}->set_width ($self->{children}[0]{w});
2064		2294
2065	$self->reflow;	2295	$self->reflow;
2066	}	2296	}
2067		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
2068	sub add_paragraph {	2332	sub add_paragraph {
2069	my ($self, $color, $text) = @_;	2333	my ($self, $color, $text, $indent) = @_;
2070		2334
2071	#TODO: intelligently "reformat" paragraph	2335	for my $line (split /\n/, $text) {
2072
2073	my $height = $self->text_height ($text);	2336	my $height = $self->text_height ($line);
2074
2075	$self->{height} += $height;	2337	$self->{height} += $height;
2076
2077	push @{$self->{par}}, [$height, $color, $text];	2338	push @{$self->{par}}, [$height, $color, $indent, $line];
		2339	}
2078		2340
2079	$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]);
2080	$self->{children}[1]->update;
2081	}	2342	}
2082		2343
2083	sub update {	2344	sub update {
2084	my ($self) = @_;	2345	my ($self) = @_;
2085		2346
…		…
2087		2348
2088	return unless $self->{h} > 0;	2349	return unless $self->{h} > 0;
2089		2350
2090	delete $self->{texture};	2351	delete $self->{texture};
2091		2352
2092	$ROOT->on_refresh ($self, sub {	2353	$ROOT->on_post_alloc ($self, sub {
2093	if (delete $self->{need_reflow}) {	2354	if (delete $self->{need_reflow}) {
2094	my $height = 0;	2355	my $height = 0;
2095		2356
2096	$height += $_->[0] = $self->text_height ($_->[2])	2357	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2097	for @{$self->{par}};	2358	for @{$self->{par}};
2098		2359
2099	$self->{height} = $height;	2360	$self->{height} = $height;
2100		2361
2101	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2362	$self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);
2102		2363
2103	delete $self->{texture};	2364	delete $self->{texture};
2104	}	2365	}
2105		2366
2106	$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 {
2107	glClearColor 0, 0, 0, 1;	2368	glClearColor 0.5, 0.5, 0.5, 0;
2108	glClear GL_COLOR_BUFFER_BIT;	2369	glClear GL_COLOR_BUFFER_BIT;
2109
2110	glEnable GL_BLEND;
2111	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112	glEnable GL_TEXTURE_2D;
2113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114		2370
2115	my $top = int $self->{children}[1]{range}[0];	2371	my $top = int $self->{children}[1]{range}[0];
2116		2372
2117	my $y0 = $top;	2373	my $y0 = $top;
2118	my $y1 = $top + $self->{h};	2374	my $y1 = $top + $self->{h};
…		…
2121		2377
2122	my $layout = $self->{layout};	2378	my $layout = $self->{layout};
2123		2379
2124	$layout->set_font ($self->{font}) if $self->{font};	2380	$layout->set_font ($self->{font}) if $self->{font};
2125		2381
		2382	glEnable GL_BLEND;
		2383	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2384
2126	for my $par (@{$self->{par}}) {	2385	for my $par (@{$self->{par}}) {
2127	my $h = $par->[0];	2386	my $h = $par->[0];
2128		2387
2129	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]);
2130	$layout->set_text ($par->[2]);	2391	$layout->set_markup ($par->[3]);
2131		2392
2132	glColor @{ $par->[1] };	2393	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133	my ($W, $H) = $layout->size;	2394
2134	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;
2135	}	2397	}
2136		2398
2137	$y += $h;	2399	$y += $h;
2138	}	2400	}
2139		2401
2140	glDisable GL_TEXTURE_2D;
2141	glDisable GL_BLEND;	2402	glDisable GL_BLEND;
2142	};	2403	};
2143	});	2404	});
2144	}	2405	}
2145		2406
2146	sub _draw {	2407	sub _draw {
2147	my ($self) = @_;	2408	my ($self) = @_;
2148		2409
2149	if ($self->{texture}) {
2150	glEnable GL_TEXTURE_2D;	2410	glEnable GL_TEXTURE_2D;
2151	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;
2152	$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});
2153	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2154	}
2155		2415
2156	$self->{children}[1]->draw;	2416	$self->{children}[1]->draw;
2157		2417
2158	}	2418	}
2159		2419
…		…
2253	@_,	2513	@_,
2254	can_events => 0,	2514	can_events => 0,
2255	)	2515	)
2256	}	2516	}
2257		2517
2258	sub set_markup {	2518	sub set_tooltip_from {
2259	my ($self, $text) = @_;	2519	my ($self, $widget) = @_;
2260		2520
2261	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2521	$self->add (new CFClient::UI::Label
2262	$self->{label}->set_markup ($text);	2522	markup => $widget->{tooltip},
2263	$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	);
2264	}	2529	}
2265		2530
2266	sub size_request {	2531	sub size_request {
2267	my ($self) = @_;	2532	my ($self) = @_;
2268
2269	$self->child->set_max_size ($::WIDTH * 0.3);
2270		2533
2271	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2534	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272		2535
2273	($w + 4, $h + 4)	2536	($w + 4, $h + 4)
2274	}	2537	}
…		…
2280	}	2543	}
2281		2544
2282	sub _draw {	2545	sub _draw {
2283	my ($self) = @_;	2546	my ($self) = @_;
2284		2547
2285	glPushMatrix;
2286	glTranslate 0.375, 0.375;	2548	glTranslate 0.375, 0.375;
2287		2549
2288	my ($w, $h) = @$self{qw(w h)};	2550	my ($w, $h) = @$self{qw(w h)};
2289		2551
2290	glColor 1, 0.8, 0.4;	2552	glColor 1, 0.8, 0.4;
…		…
2301	glVertex 0 , $h;	2563	glVertex 0 , $h;
2302	glVertex $w, $h;	2564	glVertex $w, $h;
2303	glVertex $w, 0;	2565	glVertex $w, 0;
2304	glEnd;	2566	glEnd;
2305		2567
2306	glPopMatrix;	2568	glTranslate 2 - 0.375, 2 - 0.375;
2307
2308	glTranslate 2, 2;
2309	$self->SUPER::_draw;	2569	$self->SUPER::_draw;
2310	}	2570	}
2311		2571
2312	#############################################################################	2572	#############################################################################
2313		2573
…		…
2318	use CFClient::OpenGL;	2578	use CFClient::OpenGL;
2319		2579
2320	sub new {	2580	sub new {
2321	my $class = shift;	2581	my $class = shift;
2322		2582
2323	$class->SUPER::new (	2583	my $self = $class->SUPER::new (
2324	aspect => 1,	2584	aspect => 1,
2325	@_,	2585	@_,
2326	)	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
2327	}	2603	}
2328		2604
2329	sub size_request {	2605	sub size_request {
2330	(32, 8)	2606	(32, 8)
2331	}	2607	}
2332		2608
		2609	sub update {
		2610	my ($self) = @_;
		2611
		2612	return unless $self->{visible};
		2613
		2614	$self->SUPER::update;
		2615	}
		2616
2333	sub draw {	2617	sub _draw {
2334	my ($self) = @_;	2618	my ($self) = @_;
2335		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
2336	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2631	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337		2632
2338	if ($tex) {	2633	if ($tex) {
2339	glEnable GL_BLEND;
2340	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2342	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343	glColor 1, 1, 1, 1;	2636	glColor 1, 1, 1, 1;
2344	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2637	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345	glDisable GL_TEXTURE_2D;	2638	glDisable GL_TEXTURE_2D;
2346	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	@_,
2347	}	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;
2348	}	2992	}
2349		2993
2350	#############################################################################	2994	#############################################################################
2351		2995
2352	package CFClient::UI::Root;	2996	package CFClient::UI::Root;
2353		2997
2354	our @ISA = CFClient::UI::Container::;	2998	our @ISA = CFClient::UI::Container::;
2355		2999
2356	use CFClient::OpenGL;	3000	use CFClient::OpenGL;
2357		3001
2358	sub check_size {	3002	sub new {
2359	my ($self) = @_;	3003	my $class = shift;
2360		3004
2361	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3005	$class->SUPER::new (
2362	}	3006	@_,
2363		3007	)
2364	sub size_request {
2365	($::WIDTH, $::HEIGHT)
2366	}	3008	}
2367		3009
2368	sub configure {	3010	sub configure {
2369	my ($self, $x, $y, $w, $h) = @_;	3011	my ($self, $x, $y, $w, $h) = @_;
2370		3012
2371	$self->SUPER::configure ($x, $y, $w, $h);	3013	$self->{w} = $w;
		3014	$self->{h} = $h;
		3015	}
2372		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
2373	for my $child (@{$self->{children}}) {	3039	for my $child ($self->children) {
2374	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)};
2375		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
2376	$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;
2377	$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
2378	$child->configure ($X, $Y, $W,$H);	3051	$child->configure ($X, $Y, $W, $H);
2379	}	3052	}
2380	}	3053	}
2381		3054
2382	sub _topleft {	3055	sub coord2local {
2383	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2384		3057
2385	($x, $y)	3058	($x, $y)
2386	}	3059	}
2387		3060
		3061	sub coord2global {
		3062	my ($self, $x, $y) = @_;
		3063
		3064	($x, $y)
		3065	}
		3066
2388	sub update {	3067	sub update {
2389	my ($self) = @_;	3068	my ($self) = @_;
2390		3069
2391	$self->check_size;	3070	$self->check_size;
2392	::refresh ();	3071	$::WANT_REFRESH++;
2393	}	3072	}
2394		3073
2395	sub add {	3074	sub add {
2396	my ($self, $child) = @_;	3075	my ($self, @children) = @_;
2397		3076
		3077	for my $child (@children) {
		3078	$child->{toplevel} = 1;
		3079
2398	# integerize window positions	3080	# integerise window positions
2399	$child->{x} = int $child->{x};	3081	$child->{x} = int $child->{x};
2400	$child->{y} = int $child->{y};	3082	$child->{y} = int $child->{y};
		3083	}
2401		3084
2402	$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	}
2403	}	3104	}
2404		3105
2405	sub on_refresh {	3106	sub on_refresh {
2406	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2407		3108
2408	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2409	}	3110	}
2410		3111
		3112	sub on_post_alloc {
		3113	my ($self, $id, $cb) = @_;
		3114
		3115	$self->{post_alloc_hook}{$id} = $cb;
		3116	}
		3117
2411	sub draw {	3118	sub draw {
2412	my ($self) = @_;	3119	my ($self) = @_;
2413		3120
2414	while (my $rcb = delete $self->{refresh_hook}) {	3121	while ($self->{refresh_hook}) {
2415	$_->() 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}};
2416	}	3174	}
2417		3175
2418	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3176	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3177	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420	glClear GL_COLOR_BUFFER_BIT;	3178	glClear GL_COLOR_BUFFER_BIT;
2421		3179
2422	glMatrixMode GL_PROJECTION;	3180	glMatrixMode GL_PROJECTION;
2423	glLoadIdentity;	3181	glLoadIdentity;
2424	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425	glMatrixMode GL_MODELVIEW;	3183	glMatrixMode GL_MODELVIEW;
2426	glLoadIdentity;	3184	glLoadIdentity;
2427		3185
2428	$self->_draw;	3186	$self->_draw;
2429	}	3187	}
…		…
2431	#############################################################################	3189	#############################################################################
2432		3190
2433	package CFClient::UI;	3191	package CFClient::UI;
2434		3192
2435	$ROOT = new CFClient::UI::Root;	3193	$ROOT = new CFClient::UI::Root;
2436	$TOOLTIP = new CFClient::UI::Tooltip;	3194	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437		3195
2438	1	3196	1
2439		3197

Diff Legend

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