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

Diff Legend

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