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.220 by root, Mon May 22 03:28:55 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) = @_;
…		…
224	$self->{y} = $y;	268	$self->{y} = $y;
225	$self->update;	269	$self->update;
226	}	270	}
227		271
228	if ($self->{w} != $w || $self->{h} != $h) {	272	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	274	}
235	}	275	}
236		276
237	sub size_allocate {	277	sub size_allocate {
238	# nothing to be done	278	# nothing to be done
239	}	279	}
240		280
		281	sub reconfigure {
		282	my ($self) = @_;
		283
		284	$self->check_size (1);
		285	$self->update;
		286	}
		287
		288	sub children {
		289	}
		290
241	sub set_max_size {	291	sub set_max_size {
242	my ($self, $w, $h) = @_;	292	my ($self, $w, $h) = @_;
243		293
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	294	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	295	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	296	}
247		297
248	# return top left coordinates	298	sub set_tooltip {
249	sub _topleft {
250	my ($self, $x, $y) = @_;	299	my ($self, $tooltip) = @_;
251		300
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	301	$self->{tooltip} = $tooltip;
		302
		303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		304	delete $CFClient::UI::TOOLTIP->{owner};
		305	CFClient::UI::check_tooltip;
		306	}
253	}	307	}
254		308
255	# translate global coordinates to local coordinate system	309	# translate global coordinates to local coordinate system
256	sub coord2local {	310	sub coord2local {
257	my ($self, $x, $y) = @_;	311	my ($self, $x, $y) = @_;
258		312
259	my ($X, $Y) = $self->_topleft;	313	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260	($x - $X, $y - $Y)
261	}	314	}
262		315
263	# translate local coordinates to global coordinate system	316	# translate local coordinates to global coordinate system
264	sub coord2global {	317	sub coord2global {
265	my ($self, $x, $y) = @_;	318	my ($self, $x, $y) = @_;
266		319
267	my ($X, $Y) = $self->_topleft;	320	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268	($x + $X, $y + $Y)
269	}	321	}
270		322
271	sub focus_in {	323	sub focus_in {
272	my ($self) = @_;	324	my ($self) = @_;
273		325
…		…
345	glVertex $self->{w}, 0;	397	glVertex $self->{w}, 0;
346	glVertex $self->{w}, $self->{h};	398	glVertex $self->{w}, $self->{h};
347	glVertex 0 , $self->{h};	399	glVertex 0 , $self->{h};
348	glEnd;	400	glEnd;
349	glPopMatrix;	401	glPopMatrix;
350	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	402	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351	}	403	}
352	}	404	}
353		405
354	sub _draw {	406	sub _draw {
355	my ($self) = @_;	407	my ($self) = @_;
…		…
371		423
372	sub set_parent {	424	sub set_parent {
373	my ($self, $parent) = @_;	425	my ($self, $parent) = @_;
374		426
375	Scalar::Util::weaken ($self->{parent} = $parent);	427	Scalar::Util::weaken ($self->{parent} = $parent);
		428
		429	# TODO: req_w _does_change after ->reconfigure
		430	$self->check_size
		431	unless exists $self->{req_w};
376	}	432	}
377		433
378	sub check_size {	434	sub check_size {
379	my ($self) = @_;	435	my ($self, $forced) = @_;
380		436
381	$self->{parent}	437	$self->{force_alloc} = 1 if $forced;
382	or return 1;	438	$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	}	439	}
403		440
404	sub update {	441	sub update {
405	my ($self) = @_;	442	my ($self) = @_;
406		443
…		…
421	}	458	}
422		459
423	sub DESTROY {	460	sub DESTROY {
424	my ($self) = @_;	461	my ($self) = @_;
425		462
		463	delete $WIDGET{$self+0};
426	#$self->deactivate;	464	#$self->deactivate;
427	}	465	}
428		466
429	#############################################################################	467	#############################################################################
430		468
…		…
439	my $class = shift;	477	my $class = shift;
440		478
441	# range [value, low, high, page]	479	# range [value, low, high, page]
442		480
443	$class->SUPER::new (	481	$class->SUPER::new (
444	bg => [0, 0, 0, 0.2],	482	#bg => [0, 0, 0, 0.2],
445	active_bg => [1, 1, 1, 0.5],	483	#active_bg => [1, 1, 1, 0.5],
446	@_	484	@_
447	)	485	)
448	}	486	}
449		487
450	sub _draw {	488	sub _draw {
451	my ($self) = @_;	489	my ($self) = @_;
452		490
		491	my $color = $FOCUS == $self && $self->{active_bg}
		492	? $self->{active_bg}
		493	: $self->{bg};
		494
		495	if ($color && (@$color < 4 || $color->[3])) {
453	my ($w, $h) = @$self{qw(w h)};	496	my ($w, $h) = @$self{qw(w h)};
454		497
455	glEnable GL_BLEND;	498	glEnable GL_BLEND;
456	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	499	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	500	glColor @$color;
458		501
459	glBegin GL_QUADS;	502	glBegin GL_QUADS;
460	glVertex 0 , 0;	503	glVertex 0 , 0;
461	glVertex 0 , $h;	504	glVertex 0 , $h;
462	glVertex $w, $h;	505	glVertex $w, $h;
463	glVertex $w, 0;	506	glVertex $w, 0;
464	glEnd;	507	glEnd;
465		508
466	glDisable GL_BLEND;	509	glDisable GL_BLEND;
		510	}
467	}	511	}
468		512
469	#############################################################################	513	#############################################################################
470		514
471	package CFClient::UI::Empty;	515	package CFClient::UI::Empty;
…		…
503		547
504	$self	548	$self
505	}	549	}
506		550
507	sub add {	551	sub add {
508	my ($self, $child) = @_;	552	my ($self, @widgets) = @_;
509		553
510	$child->set_parent ($self);	554	$_->set_parent ($self)
		555	for @widgets;
511		556
512	use sort 'stable';	557	use sort 'stable';
513		558
514	$self->{children} = [	559	$self->{children} = [
515	sort { $a->{z} <=> $b->{z} }	560	sort { $a->{z} <=> $b->{z} }
516	@{$self->{children}}, $child	561	@{$self->{children}}, @widgets
517	];	562	];
518		563
519	$child->check_size;	564	$self->check_size (1);
		565	$self->update;
		566	}
		567
		568	sub children {
		569	@{ $_[0]{children} }
520	}	570	}
521		571
522	sub remove {	572	sub remove {
523	my ($self, $child) = @_;	573	my ($self, $child) = @_;
524		574
…		…
539		589
540	for (@$children) {	590	for (@$children) {
541	delete $_->{parent};	591	delete $_->{parent};
542	$_->hide;	592	$_->hide;
543	}	593	}
		594
		595	$self->check_size;
		596	$self->update;
544	}	597	}
545		598
546	sub find_widget {	599	sub find_widget {
547	my ($self, $x, $y) = @_;	600	my ($self, $x, $y) = @_;
548		601
…		…
623	}	676	}
624		677
625	sub update {	678	sub update {
626	my ($self) = @_;	679	my ($self) = @_;
627		680
628	# we want to do this delayed...	681	$ROOT->on_post_alloc ($self => sub { $self->render_child });
629	$self->render_chld;
630	$self->SUPER::update;	682	$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	}	683	}
642		684
643	sub size_allocate {	685	sub size_allocate {
644	my ($self, $w, $h) = @_;	686	my ($self, $w, $h) = @_;
645		687
646	$self->child->configure (0, 0, $w, $h);	688	$self->SUPER::size_allocate ($w, $h);
		689	$self->update;
		690	}
647		691
		692	sub _render {
		693	$_[0]{children}[0]->draw;
		694	}
		695
		696	sub render_child {
		697	my ($self) = @_;
		698
		699	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		700	glClearColor 0, 0, 0, 0;
		701	glClear GL_COLOR_BUFFER_BIT;
		702
648	$self->render_chld;	703	$self->_render;
		704	};
649	}	705	}
650		706
651	sub _draw {	707	sub _draw {
652	my ($self) = @_;	708	my ($self) = @_;
653		709
654	my ($w, $h) = ($self->w, $self->h);	710	my ($w, $h) = ($self->w, $self->h);
655		711
656	my $tex = $self->{texture}	712	my $tex = $self->{texture}
657	or return;	713	or return;
658		714
659	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		717	glColor 1, 1, 1, 1;
663		718
664	$tex->draw_quad (0, 0, $w, $h);	719	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665		720
666	glDisable GL_BLEND;
667	glDisable GL_TEXTURE_2D;	721	glDisable GL_TEXTURE_2D;
668	}	722	}
669		723
670	#############################################################################	724	#############################################################################
671		725
672	package CFClient::UI::ViewPort;	726	package CFClient::UI::ViewPort;
673		727
674	our @ISA = CFClient::UI::Window::;	728	our @ISA = CFClient::UI::Window::;
675		729
676	sub new { die }
677
678	sub size_request {	730	sub size_request {
679	my ($self) = @_;	731	my ($self) = @_;
680		732
681	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	733	@$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)});	734	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
683		735
684	@$self{qw(child_w child_h)}	736	@$self{qw(child_w child_h)}
685	}	737	}
686		738
687	sub _draw {	739	sub size_allocate {
688	my ($self) = @_;	740	my ($self, $w, $h) = @_;
689		741
690	$self->{children}[1]->draw;	742	$self->update;
691	}	743	}
692		744
		745	sub set_offset {
		746	my ($self, $x, $y) = @_;
693		747
694	#############################################################################	748	$self->{view_x} = int $x;
		749	$self->{view_y} = int $y;
695		750
		751	$self->update;
		752	}
		753
		754	# hmm, this does not work for topleft of $self... but we should not ask for that
		755	sub coord2local {
		756	my ($self, $x, $y) = @_;
		757
		758	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		759	}
		760
		761	sub coord2global {
		762	my ($self, $x, $y) = @_;
		763
		764	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		765	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		766
		767	$self->SUPER::coord2global ($x, $y)
		768	}
		769
		770	sub find_widget {
		771	my ($self, $x, $y) = @_;
		772
		773	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		774	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		775	) {
		776	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		777	} else {
		778	$self->CFClient::UI::Base::find_widget ($x, $y)
		779	}
		780	}
		781
		782	sub _render {
		783	my ($self) = @_;
		784
		785	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		786
		787	$self->SUPER::_render;
		788	}
		789
		790	#############################################################################
		791
696	package CFClient::UI::Frame;	792	package CFClient::UI::ScrolledWindow;
697		793
698	our @ISA = CFClient::UI::Bin::;	794	our @ISA = CFClient::UI::HBox::;
699
700	use CFClient::OpenGL;
701		795
702	sub new {	796	sub new {
703	my $class = shift;	797	my $class = shift;
704		798
		799	my $self;
		800
		801	my $slider = new CFClient::UI::Slider
		802	vertical => 1,
		803	range => [0, 0, 1, 0.01], # HACK fix
		804	connect_changed => sub {
		805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		806	},
		807	;
		808
705	my $self = $class->SUPER::new (	809	$self = $class->SUPER::new (
706	bg => [1, 1, 1, 1],	810	vp => (new CFClient::UI::ViewPort expand => 1),
707	border_bg => [1, 1, 1, 1],	811	slider => $slider,
708	border => 0.8,
709	@_	812	@_,
710	);	813	);
711		814
		815	$self->{vp}->add ($self->{scrolled});
		816	$self->add ($self->{vp});
		817	$self->add ($self->{slider});
		818
712	$self	819	$self
713	}	820	}
714		821
		822	#TODO# update range on size_allocate depending on child
		823	# update viewport offset on scroll
		824
		825	#############################################################################
		826
		827	package CFClient::UI::Frame;
		828
		829	our @ISA = CFClient::UI::Bin::;
		830
		831	use CFClient::OpenGL;
		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	bg => undef,
		838	@_,
		839	)
		840	}
		841
715	sub _draw {	842	sub _draw {
716	my ($self) = @_;	843	my ($self) = @_;
717		844
718	my ($w, $h) = ($self->{w}, $self->{h});	845	if ($self->{bg}) {
		846	my ($w, $h) = @$self{qw(w h)};
719		847
720	glEnable GL_BLEND;	848	glEnable GL_BLEND;
721	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	849	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722	glEnable GL_TEXTURE_2D;	850	glColor @{ $self->{bg} };
723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724		851
725	# glBegin GL_QUADS;	852	glBegin GL_QUADS;
726	# glColor 0, 0, 0, 0;
727	# glVertex 0 , 0;	853	glVertex 0 , 0;
728	# glVertex 0 , $h;	854	glVertex 0 , $h;
729	# glVertex $w, $h;	855	glVertex $w, $h;
730	# glVertex $w, 0;	856	glVertex $w, 0;
731	# glEnd;	857	glEnd;
732		858
733
734	$self->child->draw;
735	glDisable GL_BLEND;	859	glDisable GL_BLEND;
736	glDisable GL_TEXTURE_2D;	860	}
		861
		862	$self->SUPER::_draw;
737	}	863	}
738		864
739	#############################################################################	865	#############################################################################
740		866
741	package CFClient::UI::FancyFrame;	867	package CFClient::UI::FancyFrame;
…		…
754	# TODO: user_x, user_y, overwrite moveto?	880	# TODO: user_x, user_y, overwrite moveto?
755		881
756	my $self = $class->SUPER::new (	882	my $self = $class->SUPER::new (
757	bg => [1, 1, 1, 1],	883	bg => [1, 1, 1, 1],
758	border_bg => [1, 1, 1, 1],	884	border_bg => [1, 1, 1, 1],
759	border => 0.8,	885	border => 0.6,
		886	toplevel => 1,
760	can_events => 1,	887	can_events => 1,
761	@_	888	@_
762	);	889	);
763		890
764	$self->{title} &&= new CFClient::UI::Label	891	$self->{title} &&= new CFClient::UI::Label
765	align => 0,	892	align => 0,
766	valign => 1,	893	valign => 1,
767	text => $self->{title},	894	text => $self->{title},
768	fontsize => 1;	895	fontsize => $self->{border};
769		896
770	$self	897	$self
771	}	898	}
772		899
773	sub border {	900	sub border {
…		…
789	my ($self, $w, $h) = @_;	916	my ($self, $w, $h) = @_;
790		917
791	$h -= List::Util::max 0, $self->border * 2;	918	$h -= List::Util::max 0, $self->border * 2;
792	$w -= List::Util::max 0, $self->border * 2;	919	$w -= List::Util::max 0, $self->border * 2;
793		920
794	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	921	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
795	if $self->{title};	922	if $self->{title};
796		923
797	$self->child->configure ($self->border, $self->border, $w, $h);	924	$self->child->configure ($self->border, $self->border, $w, $h);
798	}	925	}
799		926
800	sub button_down {	927	sub button_down {
801	my ($self, $ev, $x, $y) = @_;	928	my ($self, $ev, $x, $y) = @_;
802		929
		930	my ($w, $h) = @$self{qw(w h)};
803	my $border = $self->border;	931	my $border = $self->border;
804		932
805	if ($x < $self->{w} && $x >= $self->{w} - $border	933	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806	&& $y < $self->{h} && $y >= $self->{h} - $border) {	934	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807		935
		936	if ($lr & $td) {
		937	my ($wx, $wy) = ($self->{x}, $self->{y});
808	my ($ox, $oy) = ($ev->{x}, $ev->{y});	938	my ($ox, $oy) = ($ev->{x}, $ev->{y});
809	my ($bw, $bh) = ($self->{w}, $self->{h});	939	my ($bw, $bh) = ($self->{w}, $self->{h});
810		940
		941	my $mx = $x < $border;
		942	my $my = $y < $border;
		943
811	$self->{motion} = sub {	944	$self->{motion} = sub {
812	my ($ev, $x, $y) = @_;	945	my ($ev, $x, $y) = @_;
813		946
814	($x, $y) = ($ev->{x}, $ev->{y});	947	my $dx = $ev->{x} - $ox;
		948	my $dy = $ev->{y} - $oy;
815		949
816	$self->{user_w} = $bw + $x - $ox;	950	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817	$self->{user_h} = $bh + $y - $oy;	951	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		952	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
818	$self->check_size;	953	$self->check_size;
819	};	954	};
820		955
821	} elsif ($x >= 0 && $x < $self->{w}	956	} elsif ($lr ^ $td) {
822	&& $y >= 0 && $y < $border) {
823
824	my ($ox, $oy) = ($ev->{x}, $ev->{y});	957	my ($ox, $oy) = ($ev->{x}, $ev->{y});
825	my ($bx, $by) = ($self->{x}, $self->{y});	958	my ($bx, $by) = ($self->{x}, $self->{y});
826		959
827	$self->{motion} = sub {	960	$self->{motion} = sub {
828	my ($ev, $x, $y) = @_;	961	my ($ev, $x, $y) = @_;
…		…
851	my ($self) = @_;	984	my ($self) = @_;
852		985
853	my ($w, $h ) = ($self->{w}, $self->{h});	986	my ($w, $h ) = ($self->{w}, $self->{h});
854	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	987	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855		988
856	glEnable GL_BLEND;
857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858	glEnable GL_TEXTURE_2D;	989	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860		991
861	my $border = $self->border;	992	my $border = $self->border;
862		993
863	glColor @{ $self->{border_bg} };	994	glColor @{ $self->{border_bg} };
864	$tex[1]->draw_quad (0, 0, $w, $border);	995	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
865	$tex[3]->draw_quad (0, $border, $border, $ch);	996	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	997	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867	$tex[4]->draw_quad (0, $h - $border, $w, $border);	998	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868		999
		1000	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869	my $bg = $tex[0];	1001	my $bg = $tex[0];
870		1002
871	# TODO: repeat texture not scale	1003	# TODO: repeat texture not scale
872	my $rep_x = $cw / $bg->{w};	1004	my $rep_x = $cw / $bg->{w};
873	my $rep_y = $ch / $bg->{h};	1005	my $rep_y = $ch / $bg->{h};
874		1006
875	glColor @{ $self->{bg} };	1007	glColor @{ $self->{bg} };
876		1008
877	$bg->{s} = $rep_x;	1009	$bg->{s} = $rep_x;
878	$bg->{t} = $rep_y;	1010	$bg->{t} = $rep_y;
879	$bg->{wrap_mode} = 1;	1011	$bg->{wrap_mode} = 1;
880	$bg->draw_quad ($border, $border, $cw, $ch);	1012	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1013	}
881		1014
882	glDisable GL_TEXTURE_2D;	1015	glDisable GL_TEXTURE_2D;
883	glDisable GL_BLEND;
884		1016
885	$self->{title}->draw if $self->{title};	1017	$self->{title}->draw if $self->{title};
		1018
886	$self->child->draw;	1019	$self->child->draw;
887	}	1020	}
888		1021
889	#############################################################################	1022	#############################################################################
890		1023
…		…
912	$self->{children}[$y][$x] = $child;	1045	$self->{children}[$y][$x] = $child;
913		1046
914	$child->check_size;	1047	$child->check_size;
915	}	1048	}
916		1049
		1050	sub children {
		1051	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1052	}
		1053
917	# TODO: move to container class maybe? send childs a signal on removal?	1054	# TODO: move to container class maybe? send childs a signal on removal?
918	sub clear {	1055	sub clear {
919	my ($self) = @_;	1056	my ($self) = @_;
920		1057
921	my $children = delete $self->{children};	1058	my @children = $self->children;
		1059	delete $self->{children};
922		1060
923	for (grep $_, map @$_, grep $_, @$children) {	1061	for (@children) {
924	delete $_->{parent};	1062	delete $_->{parent};
925	$_->hide;	1063	$_->hide;
926	}	1064	}
927		1065
928	$self->update;	1066	$self->update;
…		…
1109	}	1247	}
1110		1248
1111	sub size_allocate {	1249	sub size_allocate {
1112	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h) = @_;
1113		1251
		1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1253
1114	my $children = $self->{children};	1254	my $children = $self->{children};
1115		1255
1116	my @h = map $_->{req_h}, @$children;	1256	my @h = map $_->{req_h}, @$children;
1117		1257
1118	my $req_h = List::Util::sum @h;	1258	my $req_h = List::Util::sum @h;
…		…
1147		1287
1148	#############################################################################	1288	#############################################################################
1149		1289
1150	package CFClient::UI::Label;	1290	package CFClient::UI::Label;
1151		1291
1152	our @ISA = CFClient::UI::Base::;	1292	our @ISA = CFClient::UI::DrawBG::;
1153		1293
1154	use CFClient::OpenGL;	1294	use CFClient::OpenGL;
1155		1295
1156	sub new {	1296	sub new {
1157	my ($class, %arg) = @_;	1297	my ($class, %arg) = @_;
1158		1298
1159	my $self = $class->SUPER::new (	1299	my $self = $class->SUPER::new (
1160	fg => [1, 1, 1],	1300	fg => [1, 1, 1],
		1301	#bg => none
		1302	#active_bg => none
1161	#font => default_font	1303	#font => default_font
		1304	#text => initial text
		1305	#markup => initial narkup
		1306	#max_w => maximum pixel width
		1307	ellipsise => 3, # end
		1308	layout => (new CFClient::Layout),
1162	fontsize => 1,	1309	fontsize => 1,
1163	text => "",
1164	align => -1,	1310	align => -1,
1165	valign => -1,	1311	valign => -1,
1166	padding => 2,	1312	padding => 2,
1167	layout => new CFClient::Layout,
1168	can_events => 0,	1313	can_events => 0,
1169	%arg	1314	%arg
1170	);	1315	);
1171		1316
1172	if (exists $self->{template}) {	1317	if (exists $self->{template}) {
1173	my $layout = new CFClient::Layout;	1318	my $layout = new CFClient::Layout;
1174	$layout->set_text (delete $self->{template});	1319	$layout->set_text (delete $self->{template});
1175	$self->{template} = $layout;	1320	$self->{template} = $layout;
1176	}	1321	}
1177		1322
1178	$self->set_text (delete $self->{text}) if exists $self->{text};	1323	if (exists $self->{markup}) {
1179	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1324	$self->set_markup (delete $self->{markup});
		1325	} else {
		1326	$self->set_text (delete $self->{text});
		1327	}
1180		1328
1181	$self	1329	$self
1182	}	1330	}
1183		1331
1184	sub escape {	1332	sub escape($) {
1185	local $_ = $_[1];	1333	local $_ = $_[0];
1186		1334
1187	s/&/&amp;/g;	1335	s/&/&amp;/g;
1188	s/>/&gt;/g;	1336	s/>/&gt;/g;
1189	s/</&lt;/g;	1337	s/</&lt;/g;
1190		1338
1191	$_[1]	1339	$_
		1340	}
		1341
		1342	sub update {
		1343	my ($self) = @_;
		1344
		1345	delete $self->{texture};
		1346	$self->SUPER::update;
1192	}	1347	}
1193		1348
1194	sub set_text {	1349	sub set_text {
1195	my ($self, $text) = @_;	1350	my ($self, $text) = @_;
1196		1351
		1352	return if $self->{text} eq "T$text";
		1353	$self->{text} = "T$text";
		1354
		1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197	$self->{layout}->set_text ($text);	1356	$self->{layout}->set_text ($text);
1198		1357
1199	delete $self->{texture};	1358	$self->update;
1200	$self->check_size;	1359	$self->check_size;
1201	$self->update;
1202	}	1360	}
1203		1361
1204	sub set_markup {	1362	sub set_markup {
1205	my ($self, $markup) = @_;	1363	my ($self, $markup) = @_;
1206		1364
		1365	return if $self->{text} eq "M$markup";
		1366	$self->{text} = "M$markup";
		1367
		1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1369
		1370	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207	$self->{layout}->set_markup ($markup);	1371	$self->{layout}->set_markup ($markup);
1208		1372
1209	delete $self->{texture};	1373	$self->update;
1210	$self->check_size;	1374	$self->check_size;
1211	$self->update;
1212	}	1375	}
1213		1376
1214	sub size_request {	1377	sub size_request {
1215	my ($self) = @_;	1378	my ($self) = @_;
1216		1379
1217	$self->{layout}->set_font ($self->{font}) if $self->{font};	1380	$self->{layout}->set_font ($self->{font}) if $self->{font};
1218	$self->{layout}->set_width ($self->{max_w} || -1);	1381	$self->{layout}->set_width ($self->{max_w} || -1);
		1382	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1383	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220		1385
1221	my ($w, $h) = $self->{layout}->size;	1386	my ($w, $h) = $self->{layout}->size;
1222		1387
1223	if (exists $self->{template}) {	1388	if (exists $self->{template}) {
…		…
1245	sub set_fontsize {	1410	sub set_fontsize {
1246	my ($self, $fontsize) = @_;	1411	my ($self, $fontsize) = @_;
1247		1412
1248	$self->{fontsize} = $fontsize;	1413	$self->{fontsize} = $fontsize;
1249	delete $self->{texture};	1414	delete $self->{texture};
		1415
		1416	$self->update;
1250	$self->check_size;	1417	$self->check_size;
1251	$self->update;
1252	}	1418	}
1253		1419
1254	sub _draw {	1420	sub _draw {
1255	my ($self) = @_;	1421	my ($self) = @_;
1256		1422
		1423	$self->SUPER::_draw; # draw background, if applicable
		1424
1257	my $tex = $self->{texture} ||= do {	1425	my $tex = $self->{texture} ||= do {
		1426	$self->{layout}->set_foreground (@{$self->{fg}});
1258	$self->{layout}->set_font ($self->{font}) if $self->{font};	1427	$self->{layout}->set_font ($self->{font}) if $self->{font};
1259	$self->{layout}->set_width ($self->{w});	1428	$self->{layout}->set_width ($self->{w});
		1429	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1430	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1431	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1432
1261	new_from_layout CFClient::Texture $self->{layout}	1433	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1434
		1435	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1436	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1437	: ($self->{w} - $tex->{w}) * 0.5);
		1438
		1439	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1440	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1441	: ($self->{h} - $tex->{h}) * 0.5);
		1442
		1443	$tex
1262	};	1444	};
1263		1445
1264	glEnable GL_BLEND;
1265	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266	glEnable GL_TEXTURE_2D;	1446	glEnable GL_TEXTURE_2D;
1267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268		1448
		1449	if ($tex->{format} == GL_ALPHA) {
1269	glColor @{$self->{fg}};	1450	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});	1451	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1452	} else {
		1453	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1454	}
1284		1455
1285	glDisable GL_TEXTURE_2D;	1456	glDisable GL_TEXTURE_2D;
1286	glDisable GL_BLEND;
1287	}	1457	}
1288		1458
1289	#############################################################################	1459	#############################################################################
1290		1460
1291	package CFClient::UI::EntryBase;	1461	package CFClient::UI::EntryBase;
…		…
1326	$self->{layout}->set_text ("$text ");	1496	$self->{layout}->set_text ("$text ");
1327		1497
1328	$self->emit (changed => $self->{text});	1498	$self->emit (changed => $self->{text});
1329	}	1499	}
1330		1500
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 {	1501	sub set_text {
1350	my ($self, $text) = @_;	1502	my ($self, $text) = @_;
1351		1503
1352	$self->{cursor} = length $text;	1504	$self->{cursor} = length $text;
1353	$self->_set_text ($text);	1505	$self->_set_text ($text);
1354	$self->update;	1506	$self->update;
		1507	$self->check_size;
		1508	}
		1509
		1510	sub get_text {
		1511	$_[0]{text}
		1512	}
		1513
		1514	sub size_request {
		1515	my ($self) = @_;
		1516
		1517	my ($w, $h) = $self->SUPER::size_request;
		1518
		1519	($w + 1, $h) # add 1 for cursor
		1520	}
		1521
		1522	sub size_allocate {
		1523	my ($self, $w, $h) = @_;
		1524
		1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1355	}	1526	}
1356		1527
1357	sub key_down {	1528	sub key_down {
1358	my ($self, $ev) = @_;	1529	my ($self, $ev) = @_;
1359		1530
…		…
1361	my $sym = $ev->{sym};	1532	my $sym = $ev->{sym};
1362	my $uni = $ev->{unicode};	1533	my $uni = $ev->{unicode};
1363		1534
1364	my $text = $self->get_text;	1535	my $text = $self->get_text;
1365		1536
1366	if ($sym == 8) {	1537	if ($uni == 8) {
1367	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1538	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368	} elsif ($sym == 127) {	1539	} elsif ($uni == 127) {
1369	substr $text, $self->{cursor}, 1, "";	1540	substr $text, $self->{cursor}, 1, "";
1370	} elsif ($sym == CFClient::SDLK_LEFT) {	1541	} elsif ($sym == CFClient::SDLK_LEFT) {
1371	--$self->{cursor} if $self->{cursor};	1542	--$self->{cursor} if $self->{cursor};
1372	} elsif ($sym == CFClient::SDLK_RIGHT) {	1543	} elsif ($sym == CFClient::SDLK_RIGHT) {
1373	++$self->{cursor} if $self->{cursor} < length $self->{text};	1544	++$self->{cursor} if $self->{cursor} < length $self->{text};
1374	} elsif ($sym == CFClient::SDLK_HOME) {	1545	} elsif ($sym == CFClient::SDLK_HOME) {
1375	$self->{cursor} = 0;	1546	$self->{cursor} = 0;
1376	} elsif ($sym == CFClient::SDLK_END) {	1547	} elsif ($sym == CFClient::SDLK_END) {
1377	$self->{cursor} = length $text;	1548	$self->{cursor} = length $text;
1378	} elsif ($sym == 27) {	1549	} elsif ($uni == 27) {
1379	$self->emit ('escape');	1550	$self->emit ('escape');
1380	} elsif ($uni) {	1551	} elsif ($uni) {
1381	substr $text, $self->{cursor}++, 0, chr $uni;	1552	substr $text, $self->{cursor}++, 0, chr $uni;
1382	}	1553	}
1383		1554
1384	$self->_set_text ($text);	1555	$self->_set_text ($text);
1385	$self->update;	1556	$self->update;
		1557	$self->check_size;
1386	}	1558	}
1387		1559
1388	sub focus_in {	1560	sub focus_in {
1389	my ($self) = @_;	1561	my ($self) = @_;
1390		1562
…		…
1469		1641
1470	if ($sym == 13) {	1642	if ($sym == 13) {
1471	unshift @{$self->{history}},	1643	unshift @{$self->{history}},
1472	my $txt = $self->get_text;	1644	my $txt = $self->get_text;
1473	$self->{history_pointer} = -1;	1645	$self->{history_pointer} = -1;
		1646	$self->{history_saveback} = '';
1474	$self->emit (activate => $txt);	1647	$self->emit (activate => $txt);
1475	$self->update;	1648	$self->update;
1476		1649
1477	} elsif ($sym == CFClient::SDLK_UP) {	1650	} elsif ($sym == CFClient::SDLK_UP) {
1478	if ($self->{history_pointer} < 0) {	1651	if ($self->{history_pointer} < 0) {
1479	$self->{history_saveback} = $self->get_text;	1652	$self->{history_saveback} = $self->get_text;
1480	}	1653	}
		1654	if (@{$self->{history} || []} > 0) {
1481	$self->{history_pointer}++;	1655	$self->{history_pointer}++;
1482	if ($self->{history_pointer} >= @{$self->{history}}) {	1656	if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483	$self->{history_pointer} = @{$self->{history}} - 1;	1657	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1658	}
		1659	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1484	}	1660	}
1485	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1486		1661
1487	} elsif ($sym == CFClient::SDLK_DOWN) {	1662	} elsif ($sym == CFClient::SDLK_DOWN) {
1488	$self->{history_pointer}--;	1663	$self->{history_pointer}--;
1489	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1664	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490		1665
…		…
1516	my $class = shift;	1691	my $class = shift;
1517		1692
1518	$class->SUPER::new (	1693	$class->SUPER::new (
1519	padding => 4,	1694	padding => 4,
1520	fg => [1, 1, 1],	1695	fg => [1, 1, 1],
1521	bg => [1, 1, 1, 0.2],
1522	active_fg => [0, 0, 1],	1696	active_fg => [0, 0, 1],
1523	can_hover => 1,	1697	can_hover => 1,
1524	align => 0,	1698	align => 0,
1525	valign => 0,	1699	valign => 0,
1526	can_events => 1,	1700	can_events => 1,
…		…
1544		1718
1545	if ($GRAB == $self) {	1719	if ($GRAB == $self) {
1546	$self->{fg} = $self->{active_fg};	1720	$self->{fg} = $self->{active_fg};
1547	}	1721	}
1548		1722
1549	glEnable GL_BLEND;
1550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551	glEnable GL_TEXTURE_2D;	1723	glEnable GL_TEXTURE_2D;
1552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553	glColor 0, 0, 0, 1;	1725	glColor 0, 0, 0, 1;
1554		1726
1555	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1727	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556		1728
1557	glDisable GL_TEXTURE_2D;	1729	glDisable GL_TEXTURE_2D;
1558	glDisable GL_BLEND;
1559		1730
1560	$self->SUPER::_draw;	1731	$self->SUPER::_draw;
1561	}	1732	}
1562		1733
1563	#############################################################################	1734	#############################################################################
…		…
1577		1748
1578	$class->SUPER::new (	1749	$class->SUPER::new (
1579	padding => 2,	1750	padding => 2,
1580	fg => [1, 1, 1],	1751	fg => [1, 1, 1],
1581	active_fg => [1, 1, 0],	1752	active_fg => [1, 1, 0],
		1753	bg => [0, 0, 0, 0.2],
		1754	active_bg => [1, 1, 1, 0.5],
1582	state => 0,	1755	state => 0,
1583	can_hover => 1,	1756	can_hover => 1,
1584	@_	1757	@_
1585	)	1758	)
1586	}	1759	}
…		…
1610		1783
1611	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1784	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612		1785
1613	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1786	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614		1787
1615	glEnable GL_BLEND;	1788	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1789
1616	glEnable GL_TEXTURE_2D;	1790	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);	1791	$tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623	glDisable GL_TEXTURE_2D;	1792	glDisable GL_TEXTURE_2D;
1624	glDisable GL_BLEND;
1625	}	1793	}
1626		1794
1627	#############################################################################	1795	#############################################################################
1628		1796
1629	package CFClient::UI::Image;	1797	package CFClient::UI::Image;
…		…
1672	glTranslate 0, -$self->{w}, 0;	1840	glTranslate 0, -$self->{w}, 0;
1673		1841
1674	($w, $h) = ($h, $w);	1842	($w, $h) = ($h, $w);
1675	}	1843	}
1676		1844
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1845	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1846	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681		1847
1682	$tex->draw_quad (0, 0, $w, $h);	1848	$tex->draw_quad_alpha (0, 0, $w, $h);
1683		1849
1684	glDisable GL_BLEND;
1685	glDisable GL_TEXTURE_2D;	1850	glDisable GL_TEXTURE_2D;
1686	}	1851	}
1687		1852
1688	#############################################################################	1853	#############################################################################
1689		1854
…		…
1737	}	1902	}
1738		1903
1739	sub set_max {	1904	sub set_max {
1740	my ($self, $max) = @_;	1905	my ($self, $max) = @_;
1741		1906
		1907	return if $self->{max_val} == $max;
		1908
1742	$self->{max_val} = $max;	1909	$self->{max_val} = $max;
		1910	$self->update;
1743	}	1911	}
1744		1912
1745	sub set_value {	1913	sub set_value {
1746	my ($self, $val, $max) = @_;	1914	my ($self, $val, $max) = @_;
1747		1915
1748	$self->set_max ($max)	1916	$self->set_max ($max)
1749	if defined $max;	1917	if defined $max;
1750		1918
1751	$max = $self->{max_val};	1919	return if $self->{val} == $val;
		1920
1752	$self->{val} = $val;	1921	$self->{val} = $val;
1753
1754	$self->update;	1922	$self->update;
1755	}	1923	}
1756		1924
1757	sub _draw {	1925	sub _draw {
1758	my ($self) = @_;	1926	my ($self) = @_;
…		…
1821		1989
1822	sub new {	1990	sub new {
1823	my ($class, %arg) = @_;	1991	my ($class, %arg) = @_;
1824		1992
1825	my $self = $class->SUPER::new (	1993	my $self = $class->SUPER::new (
1826	tooltip => $arg{type},	1994	tooltip => $arg{type},
1827	can_hover => 1,	1995	can_hover => 1,
		1996	can_events => 1,
1828	%arg,	1997	%arg,
1829	);	1998	);
1830		1999
1831	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2000	$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);	2001	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1840		2009
1841	$self->{value}->set_fontsize ($fsize);	2010	$self->{value}->set_fontsize ($fsize);
1842	$self->{max} ->set_fontsize ($fsize);	2011	$self->{max} ->set_fontsize ($fsize);
1843	}	2012	}
1844		2013
		2014	sub set_max {
		2015	my ($self, $max) = @_;
		2016
		2017	$self->{gauge}->set_max ($max);
		2018	$self->{max}->set_text ($max);
		2019	}
		2020
1845	sub set_value {	2021	sub set_value {
1846	my ($self, $val, $max) = @_;	2022	my ($self, $val, $max) = @_;
1847		2023
1848	$self->set_max ($max)	2024	$self->set_max ($max)
1849	if defined $max;	2025	if defined $max;
1850		2026
1851	$self->{gauge}->set_value ($val, $max);	2027	$self->{gauge}->set_value ($val, $max);
1852	$self->{value}->set_text ($val);	2028	$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	}	2029	}
1861		2030
1862	#############################################################################	2031	#############################################################################
1863		2032
1864	package CFClient::UI::Slider;	2033	package CFClient::UI::Slider;
…		…
1874	qw(s1_slider.png s1_slider_bg.png);	2043	qw(s1_slider.png s1_slider_bg.png);
1875		2044
1876	sub new {	2045	sub new {
1877	my $class = shift;	2046	my $class = shift;
1878		2047
1879	# range [value, low, high, page]	2048	# range [value, low, high, page, unit]
1880		2049
1881	# TODO: 0-width page	2050	# TODO: 0-width page
1882	# TODO: req_w/h are wrong with vertical	2051	# TODO: req_w/h are wrong with vertical
1883	# TODO: calculations are off	2052	# TODO: calculations are off
1884	my $self = $class->SUPER::new (	2053	my $self = $class->SUPER::new (
1885	fg => [1, 1, 1],	2054	fg => [1, 1, 1],
1886	active_fg => [0, 0, 0],	2055	active_fg => [0, 0, 0],
		2056	bg => [0, 0, 0, 0.2],
		2057	active_bg => [1, 1, 1, 0.5],
1887	range => [0, 0, 100, 10],	2058	range => [0, 0, 100, 10],
1888	req_w => 20,	2059	req_w => $::WIDTH / 80,
1889	req_h => 20,	2060	req_h => $::WIDTH / 80,
1890	vertical => 0,	2061	vertical => 0,
1891	can_hover => 1,	2062	can_hover => 1,
1892	inner_pad => 5,	2063	inner_pad => 0.02,
1893	@_	2064	@_
1894	);	2065	);
1895		2066
		2067	$self->set_value ($self->{range}[0]);
		2068	$self->update;
		2069
1896	$self	2070	$self
		2071	}
		2072
		2073	sub set_value {
		2074	my ($self, $value) = @_;
		2075
		2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2077
		2078	$hi = $lo + 1 if $hi <= $lo;
		2079
		2080	$value = $lo if $value < $lo;
		2081	$value = $hi if $value > $hi;
		2082
		2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2084	if $unit;
		2085
		2086	$page = $hi - $lo if $page > $hi - $lo;
		2087
		2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2089
		2090	if ($value != $old_value) {
		2091	$self->emit (changed => $value);
		2092	$self->update;
		2093	}
1897	}	2094	}
1898		2095
1899	sub size_request {	2096	sub size_request {
1900	my ($self) = @_;	2097	my ($self) = @_;
1901		2098
…		…
1914		2111
1915	sub mouse_motion {	2112	sub mouse_motion {
1916	my ($self, $ev, $x, $y) = @_;	2113	my ($self, $ev, $x, $y) = @_;
1917		2114
1918	if ($GRAB == $self) {	2115	if ($GRAB == $self) {
		2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2117
		2118	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2119
		2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2121
		2122	$self->set_value ($x * ($hi - $lo) + $lo);
		2123	}
		2124	}
		2125
		2126	sub update {
		2127	my ($self) = @_;
		2128
		2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2130	$self->set_value ($self->{range}[0]);
		2131
1919	my ($value, $lo, $hi, $page) = @{$self->{range}};	2132	my ($value, $lo, $hi, $page) = @{$self->{range}};
1920		2133
1921	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2134	my $inner_w = 1 - 2 * $self->{inner_pad};
1922		2135
1923	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2136	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1924	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925		2137
1926	$x -= $inner_pad_px; # substract the padding	2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1927	$x = $x * ($hi - $lo) / $inner_w + $lo;	2139	$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		2140
1932	$self->emit (changed => $x);	2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
1933	$self->update;	2142
		2143	$value = 0 if $value < 0;
		2144	$page = 1 - $value if $value + $page > 1;
		2145
		2146	$self->{knob_x} = $value;
		2147	$self->{knob_w} = $page;
1934	}	2148	});
1935	}
1936		2149
1937	# the inner_* stuff is for generating a padding for the slider handle,	2150	$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	}	2151	}
1944		2152
1945	sub _draw {	2153	sub _draw {
1946	my ($self) = @_;	2154	my ($self) = @_;
1947		2155
1948	$self->SUPER::_draw ();	2156	$self->SUPER::_draw ();
1949		2157
1950	my ($w, $h) = @$self{qw(w h)};	2158	glScale $self->{w}, $self->{h};
1951		2159
1952	if ($self->{vertical}) {	2160	if ($self->{vertical}) {
1953	# draw a vertical slider like a rotated horizontal slider	2161	# draw a vertical slider like a rotated horizontal slider
1954		2162
		2163	glTranslate 1, 0, 0;
1955	glRotate 90, 0, 0, 1;	2164	glRotate 90, 0, 0, 1;
1956	glTranslate 0, -$self->{w}, 0;
1957
1958	($w, $h) = ($h, $w);
1959	}	2165	}
1960		2166
1961	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2167	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2168	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963		2169
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;	2170	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2171	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986		2172
1987	# draw background	2173	# draw background
1988	$tex[1]->draw_quad (0, 0, $w, $h);	2174	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989		2175
1990	# draw handle	2176	# draw handle
1991	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2177	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992		2178
1993	glDisable GL_BLEND;
1994	glDisable GL_TEXTURE_2D;	2179	glDisable GL_TEXTURE_2D;
1995	}	2180	}
1996		2181
1997	#############################################################################	2182	#############################################################################
1998		2183
…		…
2009	fontsize => 1,	2194	fontsize => 1,
2010	can_events => 0,	2195	can_events => 0,
2011	#font => default_font	2196	#font => default_font
2012	@_,	2197	@_,
2013		2198
2014	layout => (new CFClient::Layout),	2199	layout => (new CFClient::Layout 1),
2015	par => [],	2200	par => [],
2016	height => 0,	2201	height => 0,
2017	children => [	2202	children => [
2018	(new CFClient::UI::Empty expand => 1),	2203	(new CFClient::UI::Empty expand => 1),
2019	(new CFClient::UI::Slider vertical => 1),	2204	(new CFClient::UI::Slider vertical => 1),
2020	],	2205	],
2021	);	2206	);
2022		2207
2023	$self->{children}[1]->connect (changed => sub {	2208	$self->{children}[1]->connect (changed => sub { $self->update });
2024	$self->update;
2025	});
2026		2209
2027	$self	2210	$self
2028	}	2211	}
2029		2212
2030	sub set_fontsize {	2213	sub set_fontsize {
2031	my ($self, $fontsize) = @_;	2214	my ($self, $fontsize) = @_;
2032		2215
2033	$self->{fontsize} = $fontsize;	2216	$self->{fontsize} = $fontsize;
2034	$self->reflow;	2217	$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	}	2218	}
2055		2219
2056	sub size_allocate {	2220	sub size_allocate {
2057	my ($self, $w, $h) = @_;	2221	my ($self, $w, $h) = @_;
2058		2222
…		…
2063	$self->{layout}->set_width ($self->{children}[0]{w});	2227	$self->{layout}->set_width ($self->{children}[0]{w});
2064		2228
2065	$self->reflow;	2229	$self->reflow;
2066	}	2230	}
2067		2231
		2232	sub text_height {
		2233	my ($self, $text, $indent) = @_;
		2234
		2235	my $layout = $self->{layout};
		2236
		2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2238	$layout->set_width ($self->{children}[0]{w} - $indent);
		2239	$layout->set_markup ($text);
		2240
		2241	($layout->size)[1]
		2242	}
		2243
		2244	sub reflow {
		2245	my ($self) = @_;
		2246
		2247	$self->{need_reflow}++;
		2248	$self->update;
		2249	}
		2250
2068	sub add_paragraph {	2251	sub add_paragraph {
2069	my ($self, $color, $text) = @_;	2252	my ($self, $color, $text, $indent) = @_;
2070		2253
2071	#TODO: intelligently "reformat" paragraph	2254	#TODO: intelligently "reformat" paragraph
2072		2255
		2256	for my $line (split /\n/, $text) {
2073	my $height = $self->text_height ($text);	2257	my $height = $self->text_height ($line);
2074
2075	$self->{height} += $height;	2258	$self->{height} += $height;
2076
2077	push @{$self->{par}}, [$height, $color, $text];	2259	push @{$self->{par}}, [$height, $color, $indent, $line];
		2260	}
2078		2261
2079	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2080	$self->{children}[1]->update;	2263	$self->{children}[1]->update;
2081	}	2264	}
2082		2265
…		…
2087		2270
2088	return unless $self->{h} > 0;	2271	return unless $self->{h} > 0;
2089		2272
2090	delete $self->{texture};	2273	delete $self->{texture};
2091		2274
2092	$ROOT->on_refresh ($self, sub {	2275	$ROOT->on_post_alloc ($self, sub {
2093	if (delete $self->{need_reflow}) {	2276	if (delete $self->{need_reflow}) {
2094	my $height = 0;	2277	my $height = 0;
2095		2278
2096	$height += $_->[0] = $self->text_height ($_->[2])	2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2097	for @{$self->{par}};	2280	for @{$self->{par}};
2098		2281
2099	$self->{height} = $height;	2282	$self->{height} = $height;
2100		2283
2101	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2285	$self->{children}[1]->update;
2102		2286
2103	delete $self->{texture};	2287	delete $self->{texture};
2104	}	2288	}
2105		2289
2106	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2290	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2107	glClearColor 0, 0, 0, 1;	2291	glClearColor 0.5, 0.5, 0.5, 0;
2108	glClear GL_COLOR_BUFFER_BIT;	2292	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		2293
2115	my $top = int $self->{children}[1]{range}[0];	2294	my $top = int $self->{children}[1]{range}[0];
2116		2295
2117	my $y0 = $top;	2296	my $y0 = $top;
2118	my $y1 = $top + $self->{h};	2297	my $y1 = $top + $self->{h};
…		…
2121		2300
2122	my $layout = $self->{layout};	2301	my $layout = $self->{layout};
2123		2302
2124	$layout->set_font ($self->{font}) if $self->{font};	2303	$layout->set_font ($self->{font}) if $self->{font};
2125		2304
		2305	glEnable GL_BLEND;
		2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2307
2126	for my $par (@{$self->{par}}) {	2308	for my $par (@{$self->{par}}) {
2127	my $h = $par->[0];	2309	my $h = $par->[0];
2128		2310
2129	if ($y0 < $y + $h && $y < $y1) {	2311	if ($y0 < $y + $h && $y < $y1) {
		2312	$layout->set_foreground (@{ $par->[1] });
		2313	$layout->set_width ($self->{w} - $par->[2]);
2130	$layout->set_text ($par->[2]);	2314	$layout->set_markup ($par->[3]);
2131		2315
2132	glColor @{ $par->[1] };	2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133	my ($W, $H) = $layout->size;	2317
2134	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2318	glRasterPos $par->[2], $y - $y0;
		2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2135	}	2320	}
2136		2321
2137	$y += $h;	2322	$y += $h;
2138	}	2323	}
2139		2324
2140	glDisable GL_TEXTURE_2D;
2141	glDisable GL_BLEND;	2325	glDisable GL_BLEND;
2142	};	2326	};
2143	});	2327	});
2144	}	2328	}
2145		2329
2146	sub _draw {	2330	sub _draw {
2147	my ($self) = @_;	2331	my ($self) = @_;
2148		2332
2149	if ($self->{texture}) {
2150	glEnable GL_TEXTURE_2D;	2333	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2335	glColor 1, 1, 1, 1;
2152	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2336	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153	glDisable GL_TEXTURE_2D;	2337	glDisable GL_TEXTURE_2D;
2154	}
2155		2338
2156	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
2157		2340
2158	}	2341	}
2159		2342
…		…
2253	@_,	2436	@_,
2254	can_events => 0,	2437	can_events => 0,
2255	)	2438	)
2256	}	2439	}
2257		2440
2258	sub set_markup {	2441	sub set_tooltip_from {
2259	my ($self, $text) = @_;	2442	my ($self, $widget) = @_;
2260		2443
2261	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2444	$self->add (new CFClient::UI::Label
2262	$self->{label}->set_markup ($text);	2445	markup => $widget->{tooltip},
2263	$self->add ($self->{label});	2446	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2447	fontsize => 0.8,
		2448	fg => [0, 0, 0, 1],
		2449	ellipsise => 0,
		2450	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2451	);
2264	}	2452	}
2265		2453
2266	sub size_request {	2454	sub size_request {
2267	my ($self) = @_;	2455	my ($self) = @_;
2268
2269	$self->child->set_max_size ($::WIDTH * 0.3);
2270		2456
2271	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2457	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272		2458
2273	($w + 4, $h + 4)	2459	($w + 4, $h + 4)
2274	}	2460	}
…		…
2280	}	2466	}
2281		2467
2282	sub _draw {	2468	sub _draw {
2283	my ($self) = @_;	2469	my ($self) = @_;
2284		2470
2285	glPushMatrix;
2286	glTranslate 0.375, 0.375;	2471	glTranslate 0.375, 0.375;
2287		2472
2288	my ($w, $h) = @$self{qw(w h)};	2473	my ($w, $h) = @$self{qw(w h)};
2289		2474
2290	glColor 1, 0.8, 0.4;	2475	glColor 1, 0.8, 0.4;
…		…
2301	glVertex 0 , $h;	2486	glVertex 0 , $h;
2302	glVertex $w, $h;	2487	glVertex $w, $h;
2303	glVertex $w, 0;	2488	glVertex $w, 0;
2304	glEnd;	2489	glEnd;
2305		2490
2306	glPopMatrix;	2491	glTranslate 2 - 0.375, 2 - 0.375;
2307
2308	glTranslate 2, 2;
2309	$self->SUPER::_draw;	2492	$self->SUPER::_draw;
2310	}	2493	}
2311		2494
2312	#############################################################################	2495	#############################################################################
2313		2496
…		…
2318	use CFClient::OpenGL;	2501	use CFClient::OpenGL;
2319		2502
2320	sub new {	2503	sub new {
2321	my $class = shift;	2504	my $class = shift;
2322		2505
2323	$class->SUPER::new (	2506	my $self = $class->SUPER::new (
2324	aspect => 1,	2507	aspect => 1,
2325	@_,	2508	@_,
2326	)	2509	);
		2510
		2511	if ($self->{anim} && $self->{animspeed}) {
		2512	Scalar::Util::weaken (my $widget = $self);
		2513
		2514	$self->{timer} = Event->timer (
		2515	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2516	hard => 1,
		2517	interval => $self->{animspeed},
		2518	cb => sub {
		2519	++$widget->{frame};
		2520	$widget->update;
		2521	},
		2522	);
		2523	}
		2524
		2525	$self
2327	}	2526	}
2328		2527
2329	sub size_request {	2528	sub size_request {
2330	(32, 8)	2529	(32, 8)
2331	}	2530	}
2332		2531
2333	sub draw {	2532	sub _draw {
2334	my ($self) = @_;	2533	my ($self) = @_;
2335		2534
		2535	return unless $::CONN;#d# manage and cache textures differently
		2536
		2537	my $face;
		2538
		2539	if ($self->{frame}) {
		2540	my $anim = $::CONN->{anim}[$self->{anim}];
		2541
		2542	$face = $anim->[ $self->{frame} % @$anim ]
		2543	if $anim && @$anim;
		2544	}
		2545
2336	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2546	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337		2547
2338	if ($tex) {	2548	if ($tex) {
2339	glEnable GL_BLEND;
2340	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341	glEnable GL_TEXTURE_2D;	2549	glEnable GL_TEXTURE_2D;
2342	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2550	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343	glColor 1, 1, 1, 1;	2551	glColor 1, 1, 1, 1;
2344	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2552	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2346	glDisable GL_BLEND;	2554	}
		2555	}
		2556
		2557	sub DESTROY {
		2558	my ($self) = @_;
		2559
		2560	$self->{timer}->cancel
		2561	if $self->{timer};
		2562
		2563	$self->SUPER::DESTROY;
		2564	}
		2565
		2566	#############################################################################
		2567
		2568	package CFClient::UI::InventoryItem;
		2569
		2570	our @ISA = CFClient::UI::HBox::;
		2571
		2572	sub _item_to_desc {
		2573	my ($item) = @_;
		2574
		2575	my $desc =
		2576	$item->{nrof} < 2
		2577	? $item->{name}
		2578	: "$item->{nrof} × $item->{name_pl}";
		2579
		2580	$item->{flags} & Crossfire::Protocol::F_OPEN
		2581	and $desc .= " (open)";
		2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2583	and $desc .= " (applied)";
		2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2585	and $desc .= " (unpaid)";
		2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2587	and $desc .= " (magic)";
		2588	$item->{flags} & Crossfire::Protocol::F_CURSED
		2589	and $desc .= " (cursed)";
		2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2591	and $desc .= " (damned)";
		2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2593	and $desc .= " *";
		2594
		2595	$desc
		2596	}
		2597
		2598	sub new {
		2599	my $class = shift;
		2600
		2601	my %args = @_;
		2602
		2603	my $item = delete $args{item};
		2604
		2605	my $desc = _item_to_desc ($item);
		2606
		2607	my $self = $class->SUPER::new (
		2608	can_hover => 1,
		2609	can_events => 1,
		2610	tooltip => ((CFClient::UI::Label::escape $desc)
		2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2612	connect_button_down => sub {
		2613	my ($self, $ev, $x, $y) = @_;
		2614
		2615	# todo: maybe put examine on 1? but should just be a tooltip :(
		2616	if ($ev->{button} == 1) {
		2617	my $targ = $::CONN->{player}{tag};
		2618
		2619	if ($item->{container} == $::CONN->{player}{tag}) {
		2620	$targ = $main::OPENCONT;
		2621	}
		2622
		2623	$::CONN->send ("move $targ $item->{tag} 0");
		2624	} elsif ($ev->{button} == 2) {
		2625	$::CONN->send ("apply $item->{tag}");
		2626	} elsif ($ev->{button} == 3) {
		2627	my @menu_items = (
		2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2631	(
		2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2633	? (
		2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2635	)
		2636	: (
		2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2639	)
		2640	),
		2641	);
		2642
		2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2644	}
		2645
		2646	1
		2647	},
		2648	%args
		2649	);
		2650
		2651
		2652	$self->add (new CFClient::UI::Face
		2653	can_events => 0,
		2654	face => $item->{face},
		2655	anim => $item->{anim},
		2656	animspeed => $item->{animspeed},
		2657	);
		2658
		2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2660
		2661	$self->{item} = $item;
		2662
		2663	$self->update_item;
		2664
		2665	$self
		2666	}
		2667
		2668	sub update_item {
		2669	my ($self) = @_;
		2670
		2671	my $desc = _item_to_desc ($self->{item});
		2672
		2673	$self->{name_lbl}->set_text ($desc);
		2674	}
		2675
		2676	#############################################################################
		2677
		2678	package CFClient::UI::Inventory;
		2679
		2680	our @ISA = CFClient::UI::ScrolledWindow::;
		2681
		2682	sub new {
		2683	my $class = shift;
		2684
		2685	my $self = $class->SUPER::new (
		2686	scrolled => (new CFClient::UI::VBox),
		2687	@_,
		2688	);
		2689
		2690	$self
		2691	}
		2692
		2693	sub set_items {
		2694	my ($self, $items) = @_;
		2695
		2696	$self->{scrolled}->clear;
		2697	return unless $items;
		2698
		2699	my @items = sort {
		2700	($a->{type} <=> $b->{type})
		2701	or ($a->{name} cmp $b->{name})
		2702	} @$items;
		2703
		2704	$self->{real_items} = \@items;
		2705
		2706	for my $item (@items) {
		2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2708	$item->update_item ();
		2709	}
		2710
		2711	$self->{scrolled}->add (@items);
		2712
		2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2714	}
		2715
		2716	sub size_request {
		2717	my ($self) = @_;
		2718	($self->{req_w}, $self->{req_h});
		2719	}
		2720
		2721	#############################################################################
		2722
		2723	package CFClient::UI::Menu;
		2724
		2725	our @ISA = CFClient::UI::FancyFrame::;
		2726
		2727	use CFClient::OpenGL;
		2728
		2729	sub new {
		2730	my $class = shift;
		2731
		2732	my $self = $class->SUPER::new (
		2733	items => [],
		2734	z => 100,
		2735	@_,
		2736	);
		2737
		2738	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2739
		2740	for my $item (@{ $self->{items} }) {
		2741	my ($widget, $cb) = @$item;
		2742
		2743	# handle various types of items, only text for now
		2744	if (!ref $widget) {
		2745	$widget = new CFClient::UI::Label
		2746	can_hover => 1,
		2747	can_events => 1,
		2748	text => $widget;
		2749	}
		2750
		2751	$self->{item}{$widget} = $item;
		2752
		2753	$self->{vbox}->add ($widget);
		2754	}
		2755
		2756	$self
		2757	}
		2758
		2759	# popup given the event (must be a mouse button down event currently)
		2760	sub popup {
		2761	my ($self, $ev) = @_;
		2762
		2763	$self->emit ("popdown");
		2764
		2765	# maybe save $GRAB? must be careful about events...
		2766	$GRAB = $self;
		2767	$self->{button} = $ev->{button};
		2768
		2769	$self->show;
		2770	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2771	}
		2772
		2773	sub mouse_motion {
		2774	my ($self, $ev, $x, $y) = @_;
		2775
		2776	# TODO: should use vbox->find_widget or so
		2777	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2778	$self->{hover} = $self->{item}{$HOVER};
		2779	}
		2780
		2781	sub button_up {
		2782	my ($self, $ev, $x, $y) = @_;
		2783
		2784	if ($ev->{button} == $self->{button}) {
		2785	undef $GRAB;
		2786	$self->hide;
		2787
		2788	$self->emit ("popdown");
		2789	$self->{hover}[1]->() if $self->{hover};
		2790	}
		2791	}
		2792
		2793	#############################################################################
		2794
		2795	package CFClient::UI::Statusbox;
		2796
		2797	our @ISA = CFClient::UI::VBox::;
		2798
		2799	sub new {
		2800	my $class = shift;
		2801
		2802	$class->SUPER::new (
		2803	fontsize => 0.8,
		2804	@_,
2347	}	2805	)
		2806	}
		2807
		2808	sub reorder {
		2809	my ($self) = @_;
		2810	my $NOW = time;
		2811
		2812	while (my ($k, $v) = each %{ $self->{item} }) {
		2813	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2814	}
		2815
		2816	my @widgets;
		2817
		2818	my @items = sort {
		2819	$a->{pri} <=> $b->{pri}
		2820	or $b->{id} <=> $a->{id}
		2821	} values %{ $self->{item} };
		2822
		2823	my $count = 10 + 1;
		2824	for my $item (@items) {
		2825	last unless --$count;
		2826
		2827	push @widgets, $item->{label} ||= do {
		2828	# TODO: doesn't handle markup well (read as: at all)
		2829	my $short = $item->{count} > 1
		2830	? "<b>$item->{count} ×</b> $item->{text}"
		2831	: $item->{text};
		2832
		2833	for ($short) {
		2834	s/^\s+//;
		2835	s/\s+/ /g;
		2836	}
		2837
		2838	new CFClient::UI::Label
		2839	markup => $short,
		2840	tooltip => $item->{tooltip},
		2841	tooltip_font => $::FONT_PROP,
		2842	tooltip_width => 0.67,
		2843	fontsize => $item->{fontsize} || $self->{fontsize},
		2844	max_w => $::WIDTH * 0.44,
		2845	fg => $item->{fg},
		2846	can_events => 1,
		2847	can_hover => 1
		2848	};
		2849	}
		2850
		2851	$self->clear;
		2852	$self->SUPER::add (reverse @widgets);
		2853	}
		2854
		2855	sub add {
		2856	my ($self, $text, %arg) = @_;
		2857
		2858	$text =~ s/^\s+//;
		2859	$text =~ s/\s+$//;
		2860
		2861	my $timeout = time + ((delete $arg{timeout}) || 60);
		2862
		2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2864
		2865	if (my $item = $self->{item}{$group}) {
		2866	if ($item->{text} eq $text) {
		2867	$item->{count}++;
		2868	} else {
		2869	$item->{count} = 1;
		2870	$item->{text} = $item->{tooltip} = $text;
		2871	}
		2872	$item->{id} = ++$self->{id};
		2873	$item->{timeout} = $timeout;
		2874	delete $item->{label};
		2875	} else {
		2876	$self->{item}{$group} = {
		2877	id => ++$self->{id},
		2878	text => $text,
		2879	timeout => $timeout,
		2880	tooltip => $text,
		2881	fg => [0.8, 0.8, 0.8, 0.8],
		2882	pri => 0,
		2883	count => 1,
		2884	%arg,
		2885	};
		2886	}
		2887
		2888	$self->reorder;
		2889	}
		2890
		2891	sub reconfigure {
		2892	my ($self) = @_;
		2893
		2894	delete $_->{label}
		2895	for values %{ $self->{item} || {} };
		2896
		2897	$self->reorder;
		2898	$self->SUPER::reconfigure;
2348	}	2899	}
2349		2900
2350	#############################################################################	2901	#############################################################################
2351		2902
2352	package CFClient::UI::Root;	2903	package CFClient::UI::Root;
2353		2904
2354	our @ISA = CFClient::UI::Container::;	2905	our @ISA = CFClient::UI::Container::;
2355		2906
2356	use CFClient::OpenGL;	2907	use CFClient::OpenGL;
2357		2908
2358	sub check_size {	2909	sub new {
2359	my ($self) = @_;	2910	my $class = shift;
2360		2911
2361	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2912	$class->SUPER::new (
2362	}	2913	@_,
2363		2914	)
2364	sub size_request {
2365	($::WIDTH, $::HEIGHT)
2366	}	2915	}
2367		2916
2368	sub configure {	2917	sub configure {
2369	my ($self, $x, $y, $w, $h) = @_;	2918	my ($self, $x, $y, $w, $h) = @_;
2370		2919
2371	$self->SUPER::configure ($x, $y, $w, $h);	2920	$self->{w} = $w;
		2921	$self->{h} = $h;
		2922	}
2372		2923
		2924	sub check_size {
		2925	my ($self) = @_;
		2926
		2927	$self->size_allocate ($self->{w}, $self->{h})
		2928	if $self->{w};
		2929	}
		2930
		2931	sub size_request {
		2932	my ($self) = @_;
		2933
		2934	($self->{w}, $self->{h})
		2935	}
		2936
		2937	sub size_allocate {
		2938	my ($self, $w, $h) = @_;
		2939
		2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2942
		2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2945
2373	for my $child (@{$self->{children}}) {	2946	for my $child ($self->children) {
2374	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2947	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375		2948
		2949	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2950	if exists $child->{req_x};
		2951
		2952	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2953	if exists $child->{req_y};
		2954
2376	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2955	$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;	2956	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2957
2378	$child->configure ($X, $Y, $W,$H);	2958	$child->configure ($X, $Y, $W, $H);
2379	}	2959	}
2380	}	2960	}
2381		2961
2382	sub _topleft {	2962	sub coord2local {
2383	my ($self, $x, $y) = @_;	2963	my ($self, $x, $y) = @_;
2384		2964
2385	($x, $y)	2965	($x, $y)
2386	}	2966	}
2387		2967
		2968	sub coord2global {
		2969	my ($self, $x, $y) = @_;
		2970
		2971	($x, $y)
		2972	}
		2973
2388	sub update {	2974	sub update {
2389	my ($self) = @_;	2975	my ($self) = @_;
2390		2976
2391	$self->check_size;	2977	$self->check_size;
2392	::refresh ();	2978	$::WANT_REFRESH++;
2393	}	2979	}
2394		2980
2395	sub add {	2981	sub add {
2396	my ($self, $child) = @_;	2982	my ($self, @children) = @_;
2397		2983
		2984	for my $child (@children) {
		2985	$child->{toplevel} = 1;
		2986
2398	# integerize window positions	2987	# integerise window positions
2399	$child->{x} = int $child->{x};	2988	$child->{x} = int $child->{x};
2400	$child->{y} = int $child->{y};	2989	$child->{y} = int $child->{y};
		2990	}
2401		2991
2402	$self->SUPER::add ($child);	2992	$self->SUPER::add (@children);
2403	}	2993	}
2404		2994
2405	sub on_refresh {	2995	sub on_refresh {
2406	my ($self, $id, $cb) = @_;	2996	my ($self, $id, $cb) = @_;
2407		2997
2408	$self->{refresh_hook}{$id} = $cb;	2998	$self->{refresh_hook}{$id} = $cb;
2409	}	2999	}
2410		3000
		3001	sub on_post_alloc {
		3002	my ($self, $id, $cb) = @_;
		3003
		3004	$self->{post_alloc_hook}{$id} = $cb;
		3005	}
		3006
2411	sub draw {	3007	sub draw {
2412	my ($self) = @_;	3008	my ($self) = @_;
2413		3009
2414	while (my $rcb = delete $self->{refresh_hook}) {	3010	while ($self->{refresh_hook}) {
2415	$_->() for values %$rcb;	3011	$_->()
		3012	for values %{delete $self->{refresh_hook}};
		3013	}
		3014
		3015	if ($self->{check_size}) {
		3016	my @queue = ([], []);
		3017
		3018	for (;;) {
		3019	if ($self->{check_size}) {
		3020	# heuristic: check containers last
		3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3022	for values %{delete $self->{check_size}}
		3023	}
		3024
		3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3026
		3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3028	? @$widget{qw(user_w user_h)}
		3029	: $widget->size_request;
		3030
		3031	if (delete $widget->{force_alloc}
		3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3033	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3034
		3035	$widget->{req_w} = $w;
		3036	$widget->{req_h} = $h;
		3037
		3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3039
		3040	$widget->{parent}->check_size
		3041	if $widget->{parent};
		3042	}
		3043	}
		3044	}
		3045
		3046	while ($self->{size_alloc}) {
		3047	for (values %{delete $self->{size_alloc}}) {
		3048	my ($widget, $w, $h) = @$_;
		3049
		3050	$w = 0 if $w < 0;
		3051	$h = 0 if $h < 0;
		3052
		3053	$widget->{w} = $w;
		3054	$widget->{h} = $h;
		3055	$widget->size_allocate ($w, $h);
		3056	$widget->emit (size_allocate => $w, $h);
		3057	}
		3058	}
		3059
		3060	while ($self->{post_alloc_hook}) {
		3061	$_->()
		3062	for values %{delete $self->{post_alloc_hook}};
2416	}	3063	}
2417		3064
2418	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3065	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3066	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420	glClear GL_COLOR_BUFFER_BIT;	3067	glClear GL_COLOR_BUFFER_BIT;
2421		3068
2422	glMatrixMode GL_PROJECTION;	3069	glMatrixMode GL_PROJECTION;
2423	glLoadIdentity;	3070	glLoadIdentity;
2424	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3071	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425	glMatrixMode GL_MODELVIEW;	3072	glMatrixMode GL_MODELVIEW;
2426	glLoadIdentity;	3073	glLoadIdentity;
2427		3074
2428	$self->_draw;	3075	$self->_draw;
2429	}	3076	}
…		…
2431	#############################################################################	3078	#############################################################################
2432		3079
2433	package CFClient::UI;	3080	package CFClient::UI;
2434		3081
2435	$ROOT = new CFClient::UI::Root;	3082	$ROOT = new CFClient::UI::Root;
2436	$TOOLTIP = new CFClient::UI::Tooltip;	3083	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437		3084
2438	1	3085	1
2439		3086

Diff Legend

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