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.223 by elmex, Tue May 23 18:10:51 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)});	748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
683		749
684	@$self{qw(child_w child_h)}	750	@$self{qw(child_w child_h)}
685	}	751	}
686		752
687	sub _draw {	753	sub size_allocate {
688	my ($self) = @_;	754	my ($self, $w, $h) = @_;
689		755
690	$self->{children}[1]->draw;	756	$self->update;
691	}	757	}
692		758
		759	sub set_offset {
		760	my ($self, $x, $y) = @_;
		761
		762	$self->{view_x} = int $x;
		763	$self->{view_y} = int $y;
		764
		765	$self->update;
		766	}
		767
		768	# hmm, this does not work for topleft of $self... but we should not ask for that
		769	sub coord2local {
		770	my ($self, $x, $y) = @_;
		771
		772	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		773	}
		774
		775	sub coord2global {
		776	my ($self, $x, $y) = @_;
		777
		778	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		779	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		780
		781	$self->SUPER::coord2global ($x, $y)
		782	}
		783
		784	sub find_widget {
		785	my ($self, $x, $y) = @_;
		786
		787	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		788	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		789	) {
		790	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		791	} else {
		792	$self->CFClient::UI::Base::find_widget ($x, $y)
		793	}
		794	}
		795
		796	sub _render {
		797	my ($self) = @_;
		798
		799	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		800
		801	$self->SUPER::_render;
		802	}
693		803
694	#############################################################################	804	#############################################################################
695		805
696	package CFClient::UI::Frame;	806	package CFClient::UI::ScrolledWindow;
697		807
698	our @ISA = CFClient::UI::Bin::;	808	our @ISA = CFClient::UI::HBox::;
699
700	use CFClient::OpenGL;
701		809
702	sub new {	810	sub new {
703	my $class = shift;	811	my $class = shift;
704		812
		813	my $self;
		814
		815	my $slider = new CFClient::UI::Slider
		816	vertical => 1,
		817	range => [0, 0, 1, 0.01], # HACK fix
		818	connect_changed => sub {
		819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		820	},
		821	;
		822
705	my $self = $class->SUPER::new (	823	$self = $class->SUPER::new (
706	bg => [1, 1, 1, 1],	824	vp => (new CFClient::UI::ViewPort expand => 1),
707	border_bg => [1, 1, 1, 1],	825	slider => $slider,
708	border => 0.8,
709	@_	826	@_,
710	);	827	);
711		828
		829	$self->{vp}->add ($self->{scrolled});
		830	$self->add ($self->{vp});
		831	$self->add ($self->{slider});
		832
712	$self	833	$self
713	}	834	}
714		835
		836	#TODO# update range on size_allocate depending on child
		837	# update viewport offset on scroll
		838
		839	#############################################################################
		840
		841	package CFClient::UI::Frame;
		842
		843	our @ISA = CFClient::UI::Bin::;
		844
		845	use CFClient::OpenGL;
		846
		847	sub new {
		848	my $class = shift;
		849
		850	$class->SUPER::new (
		851	bg => undef,
		852	@_,
		853	)
		854	}
		855
715	sub _draw {	856	sub _draw {
716	my ($self) = @_;	857	my ($self) = @_;
717		858
718	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
719		861
720	glEnable GL_BLEND;	862	glEnable GL_BLEND;
721	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724		865
725	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
726	# glColor 0, 0, 0, 0;
727	# glVertex 0 , 0;	867	glVertex 0 , 0;
728	# glVertex 0 , $h;	868	glVertex 0 , $h;
729	# glVertex $w, $h;	869	glVertex $w, $h;
730	# glVertex $w, 0;	870	glVertex $w, 0;
731	# glEnd;	871	glEnd;
732		872
733
734	$self->child->draw;
735	glDisable GL_BLEND;	873	glDisable GL_BLEND;
736	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
737	}	877	}
738		878
739	#############################################################################	879	#############################################################################
740		880
741	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
754	# TODO: user_x, user_y, overwrite moveto?	894	# TODO: user_x, user_y, overwrite moveto?
755		895
756	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
757	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
758	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
759	border => 0.8,	899	border => 0.6,
		900	toplevel => 1,
760	can_events => 1,	901	can_events => 1,
761	@_	902	@_
762	);	903	);
763		904
764	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
765	align => 0,	906	align => 0,
766	valign => 1,	907	valign => 1,
767	text => $self->{title},	908	text => $self->{title},
768	fontsize => 1;	909	fontsize => $self->{border};
769		910
770	$self	911	$self
771	}	912	}
772		913
773	sub border {	914	sub border {
…		…
789	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
790		931
791	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
792	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
793		934
794	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
795	if $self->{title};	936	if $self->{title};
796		937
797	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
798	}	939	}
799		940
800	sub button_down {	941	sub button_down {
801	my ($self, $ev, $x, $y) = @_;	942	my ($self, $ev, $x, $y) = @_;
802		943
		944	my ($w, $h) = @$self{qw(w h)};
803	my $border = $self->border;	945	my $border = $self->border;
804		946
805	if ($x < $self->{w} && $x >= $self->{w} - $border	947	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806	&& $y < $self->{h} && $y >= $self->{h} - $border) {	948	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807		949
		950	if ($lr & $td) {
		951	my ($wx, $wy) = ($self->{x}, $self->{y});
808	my ($ox, $oy) = ($ev->{x}, $ev->{y});	952	my ($ox, $oy) = ($ev->{x}, $ev->{y});
809	my ($bw, $bh) = ($self->{w}, $self->{h});	953	my ($bw, $bh) = ($self->{w}, $self->{h});
810		954
		955	my $mx = $x < $border;
		956	my $my = $y < $border;
		957
811	$self->{motion} = sub {	958	$self->{motion} = sub {
812	my ($ev, $x, $y) = @_;	959	my ($ev, $x, $y) = @_;
813		960
814	($x, $y) = ($ev->{x}, $ev->{y});	961	my $dx = $ev->{x} - $ox;
		962	my $dy = $ev->{y} - $oy;
815		963
816	$self->{user_w} = $bw + $x - $ox;	964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817	$self->{user_h} = $bh + $y - $oy;	965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
818	$self->check_size;	967	$self->check_size;
819	};	968	};
820		969
821	} elsif ($x >= 0 && $x < $self->{w}	970	} elsif ($lr ^ $td) {
822	&& $y >= 0 && $y < $border) {
823
824	my ($ox, $oy) = ($ev->{x}, $ev->{y});	971	my ($ox, $oy) = ($ev->{x}, $ev->{y});
825	my ($bx, $by) = ($self->{x}, $self->{y});	972	my ($bx, $by) = ($self->{x}, $self->{y});
826		973
827	$self->{motion} = sub {	974	$self->{motion} = sub {
828	my ($ev, $x, $y) = @_;	975	my ($ev, $x, $y) = @_;
…		…
851	my ($self) = @_;	998	my ($self) = @_;
852		999
853	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
854	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855		1002
856	glEnable GL_BLEND;
857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860		1005
861	my $border = $self->border;	1006	my $border = $self->border;
862		1007
863	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
864	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
865	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868		1013
		1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869	my $bg = $tex[0];	1015	my $bg = $tex[0];
870		1016
871	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
872	my $rep_x = $cw / $bg->{w};	1018	my $rep_x = $cw / $bg->{w};
873	my $rep_y = $ch / $bg->{h};	1019	my $rep_y = $ch / $bg->{h};
874		1020
875	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
876		1022
877	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
878	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
879	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
880	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
881		1028
882	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
883	glDisable GL_BLEND;
884		1030
885	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
		1032
886	$self->child->draw;	1033	$self->child->draw;
887	}	1034	}
888		1035
889	#############################################################################	1036	#############################################################################
890		1037
…		…
912	$self->{children}[$y][$x] = $child;	1059	$self->{children}[$y][$x] = $child;
913		1060
914	$child->check_size;	1061	$child->check_size;
915	}	1062	}
916		1063
		1064	sub children {
		1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1066	}
		1067
917	# TODO: move to container class maybe? send childs a signal on removal?	1068	# TODO: move to container class maybe? send childs a signal on removal?
918	sub clear {	1069	sub clear {
919	my ($self) = @_;	1070	my ($self) = @_;
920		1071
921	my $children = delete $self->{children};	1072	my @children = $self->children;
		1073	delete $self->{children};
922		1074
923	for (grep $_, map @$_, grep $_, @$children) {	1075	for (@children) {
924	delete $_->{parent};	1076	delete $_->{parent};
925	$_->hide;	1077	$_->hide;
926	}	1078	}
927		1079
928	$self->update;	1080	$self->update;
…		…
1109	}	1261	}
1110		1262
1111	sub size_allocate {	1263	sub size_allocate {
1112	my ($self, $w, $h) = @_;	1264	my ($self, $w, $h) = @_;
1113		1265
		1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1267
1114	my $children = $self->{children};	1268	my $children = $self->{children};
1115		1269
1116	my @h = map $_->{req_h}, @$children;	1270	my @h = map $_->{req_h}, @$children;
1117		1271
1118	my $req_h = List::Util::sum @h;	1272	my $req_h = List::Util::sum @h;
…		…
1147		1301
1148	#############################################################################	1302	#############################################################################
1149		1303
1150	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1151		1305
1152	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1153		1307
1154	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1155		1309
1156	sub new {	1310	sub new {
1157	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1158		1312
1159	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1160	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1161	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1162	fontsize => 1,	1323	fontsize => 1,
1163	text => "",
1164	align => -1,	1324	align => -1,
1165	valign => -1,	1325	valign => -1,
1166	padding => 2,	1326	padding => 2,
1167	layout => new CFClient::Layout,
1168	can_events => 0,	1327	can_events => 0,
1169	%arg	1328	%arg
1170	);	1329	);
1171		1330
1172	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1173	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1174	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1175	$self->{template} = $layout;	1334	$self->{template} = $layout;
1176	}	1335	}
1177		1336
1178	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1179	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1180		1342
1181	$self	1343	$self
1182	}	1344	}
1183		1345
1184	sub escape {	1346	sub escape($) {
1185	local $_ = $_[1];	1347	local $_ = $_[0];
1186		1348
1187	s/&/&amp;/g;	1349	s/&/&amp;/g;
1188	s/>/&gt;/g;	1350	s/>/&gt;/g;
1189	s/</&lt;/g;	1351	s/</&lt;/g;
1190		1352
1191	$_[1]	1353	$_
		1354	}
		1355
		1356	sub update {
		1357	my ($self) = @_;
		1358
		1359	delete $self->{texture};
		1360	$self->SUPER::update;
1192	}	1361	}
1193		1362
1194	sub set_text {	1363	sub set_text {
1195	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1196		1365
		1366	return if $self->{text} eq "T$text";
		1367	$self->{text} = "T$text";
		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1198		1371
1199	delete $self->{texture};	1372	$self->update;
1200	$self->check_size;	1373	$self->check_size;
1201	$self->update;
1202	}	1374	}
1203		1375
1204	sub set_markup {	1376	sub set_markup {
1205	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1206		1378
		1379	return if $self->{text} eq "M$markup";
		1380	$self->{text} = "M$markup";
		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1208		1386
1209	delete $self->{texture};	1387	$self->update;
1210	$self->check_size;	1388	$self->check_size;
1211	$self->update;
1212	}	1389	}
1213		1390
1214	sub size_request {	1391	sub size_request {
1215	my ($self) = @_;	1392	my ($self) = @_;
1216		1393
1217	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1218	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220		1399
1221	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1222		1401
1223	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1245	sub set_fontsize {	1424	sub set_fontsize {
1246	my ($self, $fontsize) = @_;	1425	my ($self, $fontsize) = @_;
1247		1426
1248	$self->{fontsize} = $fontsize;	1427	$self->{fontsize} = $fontsize;
1249	delete $self->{texture};	1428	delete $self->{texture};
		1429
		1430	$self->update;
1250	$self->check_size;	1431	$self->check_size;
1251	$self->update;
1252	}	1432	}
1253		1433
1254	sub _draw {	1434	sub _draw {
1255	my ($self) = @_;	1435	my ($self) = @_;
1256		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1257	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1258	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1259	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1261	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1262	};	1458	};
1263		1459
1264	glEnable GL_BLEND;
1265	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1269	glColor @{$self->{fg}};	1464	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});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1284		1469
1285	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1286	glDisable GL_BLEND;
1287	}	1471	}
1288		1472
1289	#############################################################################	1473	#############################################################################
1290		1474
1291	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1326	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1327		1511
1328	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1329	}	1513	}
1330		1514
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	}
1348
1349	sub set_text {	1515	sub set_text {
1350	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1351		1517
1352	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1353	$self->_set_text ($text);	1519	$self->_set_text ($text);
1354	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1355	}	1540	}
1356		1541
1357	sub key_down {	1542	sub key_down {
1358	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1359		1544
…		…
1361	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1362	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1363		1548
1364	my $text = $self->get_text;	1549	my $text = $self->get_text;
1365		1550
1366	if ($sym == 8) {	1551	if ($uni == 8) {
1367	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1369	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1370	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1371	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1372	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1373	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1374	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1375	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1376	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1377	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1378	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1379	$self->emit ('escape');	1564	$self->emit ('escape');
1380	} elsif ($uni) {	1565	} elsif ($uni) {
1381	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1382	}	1567	}
1383		1568
1384	$self->_set_text ($text);	1569	$self->_set_text ($text);
1385	$self->update;	1570	$self->update;
		1571	$self->check_size;
1386	}	1572	}
1387		1573
1388	sub focus_in {	1574	sub focus_in {
1389	my ($self) = @_;	1575	my ($self) = @_;
1390		1576
…		…
1469		1655
1470	if ($sym == 13) {	1656	if ($sym == 13) {
1471	unshift @{$self->{history}},	1657	unshift @{$self->{history}},
1472	my $txt = $self->get_text;	1658	my $txt = $self->get_text;
1473	$self->{history_pointer} = -1;	1659	$self->{history_pointer} = -1;
		1660	$self->{history_saveback} = '';
1474	$self->emit (activate => $txt);	1661	$self->emit (activate => $txt);
1475	$self->update;	1662	$self->update;
1476		1663
1477	} elsif ($sym == CFClient::SDLK_UP) {	1664	} elsif ($sym == CFClient::SDLK_UP) {
1478	if ($self->{history_pointer} < 0) {	1665	if ($self->{history_pointer} < 0) {
1479	$self->{history_saveback} = $self->get_text;	1666	$self->{history_saveback} = $self->get_text;
1480	}	1667	}
		1668	if (@{$self->{history} || []} > 0) {
1481	$self->{history_pointer}++;	1669	$self->{history_pointer}++;
1482	if ($self->{history_pointer} >= @{$self->{history}}) {	1670	if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483	$self->{history_pointer} = @{$self->{history}} - 1;	1671	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1672	}
		1673	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1484	}	1674	}
1485	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1486		1675
1487	} elsif ($sym == CFClient::SDLK_DOWN) {	1676	} elsif ($sym == CFClient::SDLK_DOWN) {
1488	$self->{history_pointer}--;	1677	$self->{history_pointer}--;
1489	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1678	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490		1679
…		…
1516	my $class = shift;	1705	my $class = shift;
1517		1706
1518	$class->SUPER::new (	1707	$class->SUPER::new (
1519	padding => 4,	1708	padding => 4,
1520	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1521	bg => [1, 1, 1, 0.2],
1522	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1523	can_hover => 1,	1711	can_hover => 1,
1524	align => 0,	1712	align => 0,
1525	valign => 0,	1713	valign => 0,
1526	can_events => 1,	1714	can_events => 1,
…		…
1544		1732
1545	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1546	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1547	}	1735	}
1548		1736
1549	glEnable GL_BLEND;
1550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1554		1740
1555	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556		1742
1557	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1558	glDisable GL_BLEND;
1559		1744
1560	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1561	}	1746	}
1562		1747
1563	#############################################################################	1748	#############################################################################
…		…
1577		1762
1578	$class->SUPER::new (	1763	$class->SUPER::new (
1579	padding => 2,	1764	padding => 2,
1580	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1581	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1582	state => 0,	1769	state => 0,
1583	can_hover => 1,	1770	can_hover => 1,
1584	@_	1771	@_
1585	)	1772	)
1586	}	1773	}
…		…
1610		1797
1611	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612		1799
1613	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614		1801
1615	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1616	glEnable GL_TEXTURE_2D;	1804	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);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1624	glDisable GL_BLEND;
1625	}	1807	}
1626		1808
1627	#############################################################################	1809	#############################################################################
1628		1810
1629	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1672	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1673		1855
1674	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1675	}	1857	}
1676		1858
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681		1861
1682	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1683		1863
1684	glDisable GL_BLEND;
1685	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1686	}	1865	}
1687		1866
1688	#############################################################################	1867	#############################################################################
1689		1868
…		…
1737	}	1916	}
1738		1917
1739	sub set_max {	1918	sub set_max {
1740	my ($self, $max) = @_;	1919	my ($self, $max) = @_;
1741		1920
		1921	return if $self->{max_val} == $max;
		1922
1742	$self->{max_val} = $max;	1923	$self->{max_val} = $max;
		1924	$self->update;
1743	}	1925	}
1744		1926
1745	sub set_value {	1927	sub set_value {
1746	my ($self, $val, $max) = @_;	1928	my ($self, $val, $max) = @_;
1747		1929
1748	$self->set_max ($max)	1930	$self->set_max ($max)
1749	if defined $max;	1931	if defined $max;
1750		1932
1751	$max = $self->{max_val};	1933	return if $self->{val} == $val;
		1934
1752	$self->{val} = $val;	1935	$self->{val} = $val;
1753
1754	$self->update;	1936	$self->update;
1755	}	1937	}
1756		1938
1757	sub _draw {	1939	sub _draw {
1758	my ($self) = @_;	1940	my ($self) = @_;
…		…
1821		2003
1822	sub new {	2004	sub new {
1823	my ($class, %arg) = @_;	2005	my ($class, %arg) = @_;
1824		2006
1825	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1826	tooltip => $arg{type},	2008	tooltip => $arg{type},
1827	can_hover => 1,	2009	can_hover => 1,
		2010	can_events => 1,
1828	%arg,	2011	%arg,
1829	);	2012	);
1830		2013
1831	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2014	$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);	2015	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1840		2023
1841	$self->{value}->set_fontsize ($fsize);	2024	$self->{value}->set_fontsize ($fsize);
1842	$self->{max} ->set_fontsize ($fsize);	2025	$self->{max} ->set_fontsize ($fsize);
1843	}	2026	}
1844		2027
		2028	sub set_max {
		2029	my ($self, $max) = @_;
		2030
		2031	$self->{gauge}->set_max ($max);
		2032	$self->{max}->set_text ($max);
		2033	}
		2034
1845	sub set_value {	2035	sub set_value {
1846	my ($self, $val, $max) = @_;	2036	my ($self, $val, $max) = @_;
1847		2037
1848	$self->set_max ($max)	2038	$self->set_max ($max)
1849	if defined $max;	2039	if defined $max;
1850		2040
1851	$self->{gauge}->set_value ($val, $max);	2041	$self->{gauge}->set_value ($val, $max);
1852	$self->{value}->set_text ($val);	2042	$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	}	2043	}
1861		2044
1862	#############################################################################	2045	#############################################################################
1863		2046
1864	package CFClient::UI::Slider;	2047	package CFClient::UI::Slider;
…		…
1874	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
1875		2058
1876	sub new {	2059	sub new {
1877	my $class = shift;	2060	my $class = shift;
1878		2061
1879	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
1880		2063
1881	# TODO: 0-width page	2064	# TODO: 0-width page
1882	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
1883	# TODO: calculations are off	2066	# TODO: calculations are off
1884	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
1885	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
1886	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
1887	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
1888	req_w => 20,	2073	req_w => $::WIDTH / 80,
1889	req_h => 20,	2074	req_h => $::WIDTH / 80,
1890	vertical => 0,	2075	vertical => 0,
1891	can_hover => 1,	2076	can_hover => 1,
1892	inner_pad => 5,	2077	inner_pad => 0.02,
1893	@_	2078	@_
1894	);	2079	);
1895		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
1896	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
1897	}	2108	}
1898		2109
1899	sub size_request {	2110	sub size_request {
1900	my ($self) = @_;	2111	my ($self) = @_;
1901		2112
…		…
1914		2125
1915	sub mouse_motion {	2126	sub mouse_motion {
1916	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
1917		2128
1918	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
1919	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
1920		2147
1921	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
1922		2149
1923	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1924	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925		2151
1926	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1927	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$value = $self->{scale} * ($value - $lo);
1928	$x = $lo if $x < $lo;
1929	$x = $hi - $page if $x > $hi - $page;
1930	$self->{range}[0] = $x;
1931		2154
1932	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
1933	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
1934	}	2162	});
1935	}
1936		2163
1937	# the inner_* stuff is for generating a padding for the slider handle,	2164	$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	}	2165	}
1944		2166
1945	sub _draw {	2167	sub _draw {
1946	my ($self) = @_;	2168	my ($self) = @_;
1947		2169
1948	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
1949		2171
1950	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
1951		2173
1952	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
1953	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
1954		2176
		2177	glTranslate 1, 0, 0;
1955	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
1956	glTranslate 0, -$self->{w}, 0;
1957
1958	($w, $h) = ($h, $w);
1959	}	2179	}
1960		2180
1961	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963		2183
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;	2184	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986		2186
1987	# draw background	2187	# draw background
1988	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989		2189
1990	# draw handle	2190	# draw handle
1991	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992		2192
1993	glDisable GL_BLEND;
1994	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
1995	}	2194	}
1996		2195
1997	#############################################################################	2196	#############################################################################
1998		2197
…		…
2009	fontsize => 1,	2208	fontsize => 1,
2010	can_events => 0,	2209	can_events => 0,
2011	#font => default_font	2210	#font => default_font
2012	@_,	2211	@_,
2013		2212
2014	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2015	par => [],	2214	par => [],
2016	height => 0,	2215	height => 0,
2017	children => [	2216	children => [
2018	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2019	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
2020	],	2219	],
2021	);	2220	);
2022		2221
2023	$self->{children}[1]->connect (changed => sub {	2222	$self->{children}[1]->connect (changed => sub { $self->update });
2024	$self->update;
2025	});
2026		2223
2027	$self	2224	$self
2028	}	2225	}
2029		2226
2030	sub set_fontsize {	2227	sub set_fontsize {
2031	my ($self, $fontsize) = @_;	2228	my ($self, $fontsize) = @_;
2032		2229
2033	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2034	$self->reflow;	2231	$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	}	2232	}
2055		2233
2056	sub size_allocate {	2234	sub size_allocate {
2057	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2058		2236
…		…
2063	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2064		2242
2065	$self->reflow;	2243	$self->reflow;
2066	}	2244	}
2067		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2068	sub add_paragraph {	2265	sub add_paragraph {
2069	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2070		2267
2071	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2072		2269
		2270	for my $line (split /\n/, $text) {
2073	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2074
2075	$self->{height} += $height;	2272	$self->{height} += $height;
2076
2077	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2078		2275
2079	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2080	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2081	}	2278	}
2082		2279
…		…
2087		2284
2088	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2089		2286
2090	delete $self->{texture};	2287	delete $self->{texture};
2091		2288
2092	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2093	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2094	my $height = 0;	2291	my $height = 0;
2095		2292
2096	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2097	for @{$self->{par}};	2294	for @{$self->{par}};
2098		2295
2099	$self->{height} = $height;	2296	$self->{height} = $height;
2100		2297
2101	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2102		2300
2103	delete $self->{texture};	2301	delete $self->{texture};
2104	}	2302	}
2105		2303
2106	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2107	glClearColor 0, 0, 0, 1;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2108	glClear GL_COLOR_BUFFER_BIT;	2306	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		2307
2115	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2116		2309
2117	my $y0 = $top;	2310	my $y0 = $top;
2118	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2121		2314
2122	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2123		2316
2124	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2125		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2126	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2127	my $h = $par->[0];	2323	my $h = $par->[0];
2128		2324
2129	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2130	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2131		2329
2132	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133	my ($W, $H) = $layout->size;	2331
2134	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2135	}	2334	}
2136		2335
2137	$y += $h;	2336	$y += $h;
2138	}	2337	}
2139		2338
2140	glDisable GL_TEXTURE_2D;
2141	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2142	};	2340	};
2143	});	2341	});
2144	}	2342	}
2145		2343
2146	sub _draw {	2344	sub _draw {
2147	my ($self) = @_;	2345	my ($self) = @_;
2148		2346
2149	if ($self->{texture}) {
2150	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2349	glColor 1, 1, 1, 1;
2152	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2154	}
2155		2352
2156	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2157		2354
2158	}	2355	}
2159		2356
…		…
2253	@_,	2450	@_,
2254	can_events => 0,	2451	can_events => 0,
2255	)	2452	)
2256	}	2453	}
2257		2454
2258	sub set_markup {	2455	sub set_tooltip_from {
2259	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2260		2457
2261	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2262	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2263	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2264	}	2466	}
2265		2467
2266	sub size_request {	2468	sub size_request {
2267	my ($self) = @_;	2469	my ($self) = @_;
2268
2269	$self->child->set_max_size ($::WIDTH * 0.3);
2270		2470
2271	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272		2472
2273	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2274	}	2474	}
…		…
2280	}	2480	}
2281		2481
2282	sub _draw {	2482	sub _draw {
2283	my ($self) = @_;	2483	my ($self) = @_;
2284		2484
2285	glPushMatrix;
2286	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2287		2486
2288	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2289		2488
2290	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2301	glVertex 0 , $h;	2500	glVertex 0 , $h;
2302	glVertex $w, $h;	2501	glVertex $w, $h;
2303	glVertex $w, 0;	2502	glVertex $w, 0;
2304	glEnd;	2503	glEnd;
2305		2504
2306	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2307
2308	glTranslate 2, 2;
2309	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2310	}	2507	}
2311		2508
2312	#############################################################################	2509	#############################################################################
2313		2510
…		…
2318	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2319		2516
2320	sub new {	2517	sub new {
2321	my $class = shift;	2518	my $class = shift;
2322		2519
2323	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2324	aspect => 1,	2521	aspect => 1,
2325	@_,	2522	@_,
2326	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2327	}	2540	}
2328		2541
2329	sub size_request {	2542	sub size_request {
2330	(32, 8)	2543	(32, 8)
2331	}	2544	}
2332		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2333	sub draw {	2554	sub _draw {
2334	my ($self) = @_;	2555	my ($self) = @_;
2335		2556
		2557	return unless $::CONN;#d# manage and cache textures differently
		2558
		2559	my $face;
		2560
		2561	if ($self->{frame}) {
		2562	my $anim = $::CONN->{anim}[$self->{anim}];
		2563
		2564	$face = $anim->[ $self->{frame} % @$anim ]
		2565	if $anim && @$anim;
		2566	}
		2567
2336	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2568	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337		2569
2338	if ($tex) {	2570	if ($tex) {
2339	glEnable GL_BLEND;
2340	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
2342	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343	glColor 1, 1, 1, 1;	2573	glColor 1, 1, 1, 1;
2344	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2574	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345	glDisable GL_TEXTURE_2D;	2575	glDisable GL_TEXTURE_2D;
2346	glDisable GL_BLEND;
2347	}	2576	}
		2577	}
		2578
		2579	sub DESTROY {
		2580	my ($self) = @_;
		2581
		2582	$self->{timer}->cancel
		2583	if $self->{timer};
		2584
		2585	$self->SUPER::DESTROY;
2348	}	2586	}
2349		2587
2350	#############################################################################	2588	#############################################################################
2351		2589
		2590	package CFClient::UI::InventoryItem;
		2591
		2592	our @ISA = CFClient::UI::HBox::;
		2593
		2594	sub _item_to_desc {
		2595	my ($item) = @_;
		2596
		2597	my $desc =
		2598	$item->{nrof} < 2
		2599	? $item->{name}
		2600	: "$item->{nrof} × $item->{name_pl}";
		2601
		2602	$item->{flags} & Crossfire::Protocol::F_OPEN
		2603	and $desc .= " (open)";
		2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2605	and $desc .= " (applied)";
		2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2607	and $desc .= " (unpaid)";
		2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2609	and $desc .= " (magic)";
		2610	$item->{flags} & Crossfire::Protocol::F_CURSED
		2611	and $desc .= " (cursed)";
		2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2613	and $desc .= " (damned)";
		2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2615	and $desc .= " *";
		2616
		2617	$desc
		2618	}
		2619
		2620	sub new {
		2621	my $class = shift;
		2622
		2623	my %args = @_;
		2624
		2625	my $item = delete $args{item};
		2626
		2627	my $desc = _item_to_desc ($item);
		2628
		2629	my $self = $class->SUPER::new (
		2630	can_hover => 1,
		2631	can_events => 1,
		2632	tooltip => ((CFClient::UI::Label::escape $desc)
		2633	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2634	connect_button_down => sub {
		2635	my ($self, $ev, $x, $y) = @_;
		2636
		2637	# todo: maybe put examine on 1? but should just be a tooltip :(
		2638	if ($ev->{button} == 1) {
		2639	my $targ = $::CONN->{player}{tag};
		2640
		2641	if ($item->{container} == $::CONN->{player}{tag}) {
		2642	$targ = $main::OPENCONT;
		2643	}
		2644
		2645	$::CONN->send ("move $targ $item->{tag} 0");
		2646	} elsif ($ev->{button} == 2) {
		2647	$::CONN->send ("apply $item->{tag}");
		2648	} elsif ($ev->{button} == 3) {
		2649	my @menu_items = (
		2650	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2651	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2652	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2653	(
		2654	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2655	? (
		2656	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2657	)
		2658	: (
		2659	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2660	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2661	)
		2662	),
		2663	);
		2664
		2665	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2666	}
		2667
		2668	1
		2669	},
		2670	%args
		2671	);
		2672
		2673
		2674	$self->add (new CFClient::UI::Face
		2675	can_events => 0,
		2676	face => $item->{face},
		2677	anim => $item->{anim},
		2678	animspeed => $item->{animspeed},
		2679	);
		2680
		2681	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2682
		2683	$self->{item} = $item;
		2684
		2685	$self->update_item;
		2686
		2687	$self
		2688	}
		2689
		2690	sub update_item {
		2691	my ($self) = @_;
		2692
		2693	my $desc = _item_to_desc ($self->{item});
		2694
		2695	$self->{name_lbl}->set_text ($desc);
		2696	}
		2697
		2698	#############################################################################
		2699
		2700	package CFClient::UI::Inventory;
		2701
		2702	our @ISA = CFClient::UI::ScrolledWindow::;
		2703
		2704	sub new {
		2705	my $class = shift;
		2706
		2707	my $self = $class->SUPER::new (
		2708	scrolled => (new CFClient::UI::VBox),
		2709	@_,
		2710	);
		2711
		2712	$self
		2713	}
		2714
		2715	sub set_items {
		2716	my ($self, $items) = @_;
		2717
		2718	$self->{scrolled}->clear;
		2719	return unless $items;
		2720
		2721	my @items = sort {
		2722	($a->{type} <=> $b->{type})
		2723	or ($a->{name} cmp $b->{name})
		2724	} @$items;
		2725
		2726	$self->{real_items} = \@items;
		2727
		2728	for my $item (@items) {
		2729	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2730	$item->update_item ();
		2731	}
		2732
		2733	$self->{scrolled}->add (@items);
		2734
		2735	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2736	}
		2737
		2738	sub size_request {
		2739	my ($self) = @_;
		2740	($self->{req_w}, $self->{req_h});
		2741	}
		2742
		2743	#############################################################################
		2744
		2745	package CFClient::UI::Menu;
		2746
		2747	our @ISA = CFClient::UI::FancyFrame::;
		2748
		2749	use CFClient::OpenGL;
		2750
		2751	sub new {
		2752	my $class = shift;
		2753
		2754	my $self = $class->SUPER::new (
		2755	items => [],
		2756	z => 100,
		2757	@_,
		2758	);
		2759
		2760	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2761
		2762	for my $item (@{ $self->{items} }) {
		2763	my ($widget, $cb) = @$item;
		2764
		2765	# handle various types of items, only text for now
		2766	if (!ref $widget) {
		2767	$widget = new CFClient::UI::Label
		2768	can_hover => 1,
		2769	can_events => 1,
		2770	text => $widget;
		2771	}
		2772
		2773	$self->{item}{$widget} = $item;
		2774
		2775	$self->{vbox}->add ($widget);
		2776	}
		2777
		2778	$self
		2779	}
		2780
		2781	# popup given the event (must be a mouse button down event currently)
		2782	sub popup {
		2783	my ($self, $ev) = @_;
		2784
		2785	$self->emit ("popdown");
		2786
		2787	# maybe save $GRAB? must be careful about events...
		2788	$GRAB = $self;
		2789	$self->{button} = $ev->{button};
		2790
		2791	$self->show;
		2792	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2793	}
		2794
		2795	sub mouse_motion {
		2796	my ($self, $ev, $x, $y) = @_;
		2797
		2798	# TODO: should use vbox->find_widget or so
		2799	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2800	$self->{hover} = $self->{item}{$HOVER};
		2801	}
		2802
		2803	sub button_up {
		2804	my ($self, $ev, $x, $y) = @_;
		2805
		2806	if ($ev->{button} == $self->{button}) {
		2807	undef $GRAB;
		2808	$self->hide;
		2809
		2810	$self->emit ("popdown");
		2811	$self->{hover}[1]->() if $self->{hover};
		2812	}
		2813	}
		2814
		2815	#############################################################################
		2816
		2817	package CFClient::UI::Statusbox;
		2818
		2819	our @ISA = CFClient::UI::VBox::;
		2820
		2821	sub new {
		2822	my $class = shift;
		2823
		2824	$class->SUPER::new (
		2825	fontsize => 0.8,
		2826	@_,
		2827	)
		2828	}
		2829
		2830	sub reorder {
		2831	my ($self) = @_;
		2832	my $NOW = time;
		2833
		2834	while (my ($k, $v) = each %{ $self->{item} }) {
		2835	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2836	}
		2837
		2838	my @widgets;
		2839
		2840	my @items = sort {
		2841	$a->{pri} <=> $b->{pri}
		2842	or $b->{id} <=> $a->{id}
		2843	} values %{ $self->{item} };
		2844
		2845	my $count = 10 + 1;
		2846	for my $item (@items) {
		2847	last unless --$count;
		2848
		2849	push @widgets, $item->{label} ||= do {
		2850	# TODO: doesn't handle markup well (read as: at all)
		2851	my $short = $item->{count} > 1
		2852	? "<b>$item->{count} ×</b> $item->{text}"
		2853	: $item->{text};
		2854
		2855	for ($short) {
		2856	s/^\s+//;
		2857	s/\s+/ /g;
		2858	}
		2859
		2860	new CFClient::UI::Label
		2861	markup => $short,
		2862	tooltip => $item->{tooltip},
		2863	tooltip_font => $::FONT_PROP,
		2864	tooltip_width => 0.67,
		2865	fontsize => $item->{fontsize} || $self->{fontsize},
		2866	max_w => $::WIDTH * 0.44,
		2867	fg => $item->{fg},
		2868	can_events => 1,
		2869	can_hover => 1
		2870	};
		2871	}
		2872
		2873	$self->clear;
		2874	$self->SUPER::add (reverse @widgets);
		2875	}
		2876
		2877	sub add {
		2878	my ($self, $text, %arg) = @_;
		2879
		2880	$text =~ s/^\s+//;
		2881	$text =~ s/\s+$//;
		2882
		2883	my $timeout = time + ((delete $arg{timeout}) || 60);
		2884
		2885	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2886
		2887	if (my $item = $self->{item}{$group}) {
		2888	if ($item->{text} eq $text) {
		2889	$item->{count}++;
		2890	} else {
		2891	$item->{count} = 1;
		2892	$item->{text} = $item->{tooltip} = $text;
		2893	}
		2894	$item->{id} = ++$self->{id};
		2895	$item->{timeout} = $timeout;
		2896	delete $item->{label};
		2897	} else {
		2898	$self->{item}{$group} = {
		2899	id => ++$self->{id},
		2900	text => $text,
		2901	timeout => $timeout,
		2902	tooltip => $text,
		2903	fg => [0.8, 0.8, 0.8, 0.8],
		2904	pri => 0,
		2905	count => 1,
		2906	%arg,
		2907	};
		2908	}
		2909
		2910	$self->reorder;
		2911	}
		2912
		2913	sub reconfigure {
		2914	my ($self) = @_;
		2915
		2916	delete $_->{label}
		2917	for values %{ $self->{item} || {} };
		2918
		2919	$self->reorder;
		2920	$self->SUPER::reconfigure;
		2921	}
		2922
		2923	#############################################################################
		2924
2352	package CFClient::UI::Root;	2925	package CFClient::UI::Root;
2353		2926
2354	our @ISA = CFClient::UI::Container::;	2927	our @ISA = CFClient::UI::Container::;
2355		2928
2356	use CFClient::OpenGL;	2929	use CFClient::OpenGL;
2357		2930
2358	sub check_size {	2931	sub new {
2359	my ($self) = @_;	2932	my $class = shift;
2360		2933
2361	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2934	$class->SUPER::new (
2362	}	2935	@_,
2363		2936	)
2364	sub size_request {
2365	($::WIDTH, $::HEIGHT)
2366	}	2937	}
2367		2938
2368	sub configure {	2939	sub configure {
2369	my ($self, $x, $y, $w, $h) = @_;	2940	my ($self, $x, $y, $w, $h) = @_;
2370		2941
2371	$self->SUPER::configure ($x, $y, $w, $h);	2942	$self->{w} = $w;
		2943	$self->{h} = $h;
		2944	}
2372		2945
		2946	sub check_size {
		2947	my ($self) = @_;
		2948
		2949	$self->size_allocate ($self->{w}, $self->{h})
		2950	if $self->{w};
		2951	}
		2952
		2953	sub size_request {
		2954	my ($self) = @_;
		2955
		2956	($self->{w}, $self->{h})
		2957	}
		2958
		2959	sub size_allocate {
		2960	my ($self, $w, $h) = @_;
		2961
		2962	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2963	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2964
		2965	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2966	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2967
2373	for my $child (@{$self->{children}}) {	2968	for my $child ($self->children) {
2374	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2969	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375		2970
		2971	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2972	if exists $child->{req_x};
		2973
		2974	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2975	if exists $child->{req_y};
		2976
2376	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2977	$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;	2978	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2979
2378	$child->configure ($X, $Y, $W,$H);	2980	$child->configure ($X, $Y, $W, $H);
2379	}	2981	}
2380	}	2982	}
2381		2983
2382	sub _topleft {	2984	sub coord2local {
2383	my ($self, $x, $y) = @_;	2985	my ($self, $x, $y) = @_;
2384		2986
2385	($x, $y)	2987	($x, $y)
2386	}	2988	}
2387		2989
		2990	sub coord2global {
		2991	my ($self, $x, $y) = @_;
		2992
		2993	($x, $y)
		2994	}
		2995
2388	sub update {	2996	sub update {
2389	my ($self) = @_;	2997	my ($self) = @_;
2390		2998
2391	$self->check_size;	2999	$self->check_size;
2392	::refresh ();	3000	$::WANT_REFRESH++;
2393	}	3001	}
2394		3002
2395	sub add {	3003	sub add {
2396	my ($self, $child) = @_;	3004	my ($self, @children) = @_;
2397		3005
		3006	for my $child (@children) {
		3007	$child->{toplevel} = 1;
		3008
2398	# integerize window positions	3009	# integerise window positions
2399	$child->{x} = int $child->{x};	3010	$child->{x} = int $child->{x};
2400	$child->{y} = int $child->{y};	3011	$child->{y} = int $child->{y};
		3012	}
2401		3013
2402	$self->SUPER::add ($child);	3014	$self->SUPER::add (@children);
		3015
		3016	while (@children) {
		3017	my $w = pop @children;
		3018	push @children, $w->children;
		3019	$w->{visible} = 1;
		3020	}
		3021	}
		3022
		3023	sub remove {
		3024	my ($self, @children) = @_;
		3025
		3026	$self->SUPER::remove (@children);
		3027
		3028	while (@children) {
		3029	my $w = pop @children;
		3030	push @children, $w->children;
		3031	delete $w->{visible};
		3032	}
2403	}	3033	}
2404		3034
2405	sub on_refresh {	3035	sub on_refresh {
2406	my ($self, $id, $cb) = @_;	3036	my ($self, $id, $cb) = @_;
2407		3037
2408	$self->{refresh_hook}{$id} = $cb;	3038	$self->{refresh_hook}{$id} = $cb;
2409	}	3039	}
2410		3040
		3041	sub on_post_alloc {
		3042	my ($self, $id, $cb) = @_;
		3043
		3044	$self->{post_alloc_hook}{$id} = $cb;
		3045	}
		3046
2411	sub draw {	3047	sub draw {
2412	my ($self) = @_;	3048	my ($self) = @_;
2413		3049
2414	while (my $rcb = delete $self->{refresh_hook}) {	3050	while ($self->{refresh_hook}) {
2415	$_->() for values %$rcb;	3051	$_->()
		3052	for values %{delete $self->{refresh_hook}};
		3053	}
		3054
		3055	if ($self->{check_size}) {
		3056	my @queue = ([], []);
		3057
		3058	for (;;) {
		3059	if ($self->{check_size}) {
		3060	# heuristic: check containers last
		3061	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3062	for values %{delete $self->{check_size}}
		3063	}
		3064
		3065	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3066
		3067	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3068	? @$widget{qw(user_w user_h)}
		3069	: $widget->size_request;
		3070
		3071	if (delete $widget->{force_alloc}
		3072	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3073	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3074
		3075	$widget->{req_w} = $w;
		3076	$widget->{req_h} = $h;
		3077
		3078	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3079
		3080	$widget->{parent}->check_size
		3081	if $widget->{parent};
		3082	}
		3083	}
		3084	}
		3085
		3086	while ($self->{size_alloc}) {
		3087	for (values %{delete $self->{size_alloc}}) {
		3088	my ($widget, $w, $h) = @$_;
		3089
		3090	$w = 0 if $w < 0;
		3091	$h = 0 if $h < 0;
		3092
		3093	$widget->{w} = $w;
		3094	$widget->{h} = $h;
		3095	$widget->size_allocate ($w, $h);
		3096	$widget->emit (size_allocate => $w, $h);
		3097	}
		3098	}
		3099
		3100	while ($self->{post_alloc_hook}) {
		3101	$_->()
		3102	for values %{delete $self->{post_alloc_hook}};
2416	}	3103	}
2417		3104
2418	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3105	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3106	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420	glClear GL_COLOR_BUFFER_BIT;	3107	glClear GL_COLOR_BUFFER_BIT;
2421		3108
2422	glMatrixMode GL_PROJECTION;	3109	glMatrixMode GL_PROJECTION;
2423	glLoadIdentity;	3110	glLoadIdentity;
2424	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3111	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425	glMatrixMode GL_MODELVIEW;	3112	glMatrixMode GL_MODELVIEW;
2426	glLoadIdentity;	3113	glLoadIdentity;
2427		3114
2428	$self->_draw;	3115	$self->_draw;
2429	}	3116	}
…		…
2431	#############################################################################	3118	#############################################################################
2432		3119
2433	package CFClient::UI;	3120	package CFClient::UI;
2434		3121
2435	$ROOT = new CFClient::UI::Root;	3122	$ROOT = new CFClient::UI::Root;
2436	$TOOLTIP = new CFClient::UI::Tooltip;	3123	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437		3124
2438	1	3125	1
2439		3126

Diff Legend

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