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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 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
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $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;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
232	$self->{y} = $y;	280	$self->{y} = $y;
233	$self->update;	281	$self->update;
234	}	282	}
235		283
236	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	}	286	}
243	}	287	}
244		288
245	sub size_allocate {	289	sub size_allocate {
246	# nothing to be done	290	# nothing to be done
247	}	291	}
248		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
249	sub children {	300	sub children {
250	}
251
252	# call when resoltuion changes etc.
253	sub reconfigure {
254	my ($self) = @_;
255
256	$_->reconfigure
257	for $self->children;
258
259	$_->check_size;
260	}	301	}
261		302
262	sub set_max_size {	303	sub set_max_size {
263	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
264		305
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}	308	}
268		309
269	# return top left coordinates	310	sub set_tooltip {
270	sub _topleft {
271	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
272		312
273	$self->{parent}	313	$self->{tooltip} = $tooltip;
274	or Carp::confess "no parent widget in _topleft\n";#d#
275		314
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
277	}	319	}
278		320
279	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
280	sub coord2local {	322	sub coord2local {
281	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
282		324
283	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	326	}
286		327
287	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
288	sub coord2global {	329	sub coord2global {
289	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
290		331
291	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	333	}
294		334
295	sub focus_in {	335	sub focus_in {
296	my ($self) = @_;	336	my ($self) = @_;
297		337
…		…
369	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
370	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
371	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
372	glEnd;	412	glEnd;
373	glPopMatrix;	413	glPopMatrix;
374	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375	}	415	}
376	}	416	}
377		417
378	sub _draw {	418	sub _draw {
379	my ($self) = @_;	419	my ($self) = @_;
…		…
395		435
396	sub set_parent {	436	sub set_parent {
397	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
398		438
399	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
400	}	446	}
401		447
402	sub check_size {	448	sub check_size {
403	my ($self) = @_;	449	my ($self, $forced) = @_;
404		450
405	$self->{parent}	451	$self->{force_alloc} = 1 if $forced;
406	or return 1;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408	my ($w, $h) = $self->{user_w} && $self->{user_h}
409	? @$self{qw(user_w user_h)}
410	: $self->size_request;
411
412	if ($w != $self->{req_w} || $h != $self->{req_h}) {
413	$self->{req_w} = $w;
414	$self->{req_h} = $h;
415
416	$self->{parent}->check_size
417	or $self->size_allocate (
418	(List::Util::max $self->{w}, $w),
419	(List::Util::max $self->{h}, $h),
420	);
421
422	1
423	} else {
424	0
425	}
426	}	453	}
427		454
428	sub update {	455	sub update {
429	my ($self) = @_;	456	my ($self) = @_;
430		457
…		…
445	}	472	}
446		473
447	sub DESTROY {	474	sub DESTROY {
448	my ($self) = @_;	475	my ($self) = @_;
449		476
		477	delete $WIDGET{$self+0};
450	#$self->deactivate;	478	#$self->deactivate;
451	}	479	}
452		480
453	#############################################################################	481	#############################################################################
454		482
…		…
463	my $class = shift;	491	my $class = shift;
464		492
465	# range [value, low, high, page]	493	# range [value, low, high, page]
466		494
467	$class->SUPER::new (	495	$class->SUPER::new (
468	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
469	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
470	@_	498	@_
471	)	499	)
472	}	500	}
473		501
474	sub _draw {	502	sub _draw {
475	my ($self) = @_;	503	my ($self) = @_;
476		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
477	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
478		511
479	glEnable GL_BLEND;	512	glEnable GL_BLEND;
480	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
482		515
483	glBegin GL_QUADS;	516	glBegin GL_QUADS;
484	glVertex 0 , 0;	517	glVertex 0 , 0;
485	glVertex 0 , $h;	518	glVertex 0 , $h;
486	glVertex $w, $h;	519	glVertex $w, $h;
487	glVertex $w, 0;	520	glVertex $w, 0;
488	glEnd;	521	glEnd;
489		522
490	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
491	}	525	}
492		526
493	#############################################################################	527	#############################################################################
494		528
495	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
527		561
528	$self	562	$self
529	}	563	}
530		564
531	sub add {	565	sub add {
532	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
533		567
534	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
535		570
536	use sort 'stable';	571	use sort 'stable';
537		572
538	$self->{children} = [	573	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
541	];	576	];
542		577
543	$child->check_size;	578	$self->check_size (1);
		579	$self->update;
544	}	580	}
545		581
546	sub children {	582	sub children {
547	@{ $_[0]{children} }	583	@{ $_[0]{children} }
548	}	584	}
…		…
567		603
568	for (@$children) {	604	for (@$children) {
569	delete $_->{parent};	605	delete $_->{parent};
570	$_->hide;	606	$_->hide;
571	}	607	}
		608
		609	$self->check_size;
		610	$self->update;
572	}	611	}
573		612
574	sub find_widget {	613	sub find_widget {
575	my ($self, $x, $y) = @_;	614	my ($self, $x, $y) = @_;
576		615
…		…
651	}	690	}
652		691
653	sub update {	692	sub update {
654	my ($self) = @_;	693	my ($self) = @_;
655		694
656	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
657	$self->SUPER::update;	696	$self->SUPER::update;
658	}	697	}
659		698
660	sub size_allocate {	699	sub size_allocate {
661	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
662		701
663	$self->SUPER::size_allocate ($w, $h);	702	$self->SUPER::size_allocate ($w, $h);
664	$self->update;	703	$self->update;
		704	}
		705
		706	sub _render {
		707	$_[0]{children}[0]->draw;
665	}	708	}
666		709
667	sub render_child {	710	sub render_child {
668	my ($self) = @_;	711	my ($self) = @_;
669		712
670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	716
674	# glColorMask 1, 1, 1, 0;	717	$self->_render;
675	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};
679	# glDisable GL_BLEND;
680	# glColorMask 1, 1, 1, 1;
681	};	718	};
682	}	719	}
683		720
684	sub _draw {	721	sub _draw {
685	my ($self) = @_;	722	my ($self) = @_;
…		…
687	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
688		725
689	my $tex = $self->{texture}	726	my $tex = $self->{texture}
690	or return;	727	or return;
691		728
692	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
697		732
698	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		734
700	glDisable GL_BLEND;
701	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
702	}	736	}
703		737
704	#############################################################################	738	#############################################################################
705		739
706	package CFClient::UI::ViewPort;	740	package CFClient::UI::ViewPort;
707		741
708	our @ISA = CFClient::UI::Window::;	742	our @ISA = CFClient::UI::Window::;
709		743
710	sub new { die }
711
712	sub size_request {	744	sub size_request {
713	my ($self) = @_;	745	my ($self) = @_;
714		746
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717		748
718	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
719	}	750	}
720		751
721	sub _draw {	752	sub size_allocate {
722	my ($self) = @_;	753	my ($self, $w, $h) = @_;
723		754
724	$self->{children}[1]->draw;	755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
		758	$self->update;
725	}	759	}
726		760
		761	sub set_offset {
		762	my ($self, $x, $y) = @_;
		763
		764	$self->{view_x} = int $x;
		765	$self->{view_y} = int $y;
		766
		767	$self->update;
		768	}
		769
		770	# hmm, this does not work for topleft of $self... but we should not ask for that
		771	sub coord2local {
		772	my ($self, $x, $y) = @_;
		773
		774	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		775	}
		776
		777	sub coord2global {
		778	my ($self, $x, $y) = @_;
		779
		780	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		781	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		782
		783	$self->SUPER::coord2global ($x, $y)
		784	}
		785
		786	sub find_widget {
		787	my ($self, $x, $y) = @_;
		788
		789	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		790	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		791	) {
		792	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		793	} else {
		794	$self->CFClient::UI::Base::find_widget ($x, $y)
		795	}
		796	}
		797
		798	sub _render {
		799	my ($self) = @_;
		800
		801	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		802
		803	$self->SUPER::_render;
		804	}
727		805
728	#############################################################################	806	#############################################################################
729		807
730	package CFClient::UI::Frame;	808	package CFClient::UI::ScrolledWindow;
731		809
732	our @ISA = CFClient::UI::Bin::;	810	our @ISA = CFClient::UI::HBox::;
733
734	use CFClient::OpenGL;
735		811
736	sub new {	812	sub new {
737	my $class = shift;	813	my $class = shift;
738		814
		815	my $self;
		816
		817	my $slider = new CFClient::UI::Slider
		818	vertical => 1,
		819	range => [0, 0, 1, 0.01], # HACK fix
		820	connect_changed => sub {
		821	$self->{vp}->set_offset (0, $_[1]);
		822	},
		823	;
		824
739	my $self = $class->SUPER::new (	825	$self = $class->SUPER::new (
740	bg => [1, 1, 1, 1],	826	vp => (new CFClient::UI::ViewPort expand => 1),
741	border_bg => [1, 1, 1, 1],	827	slider => $slider,
742	border => 0.8,
743	@_	828	@_,
744	);	829	);
745		830
		831	$self->{vp}->add ($self->{scrolled});
		832	$self->add ($self->{vp});
		833	$self->add ($self->{slider});
		834
746	$self	835	$self
747	}	836	}
748		837
		838	sub size_allocate {
		839	my ($self, $w, $h) = @_;
		840
		841	$self->SUPER::size_allocate ($w, $h);
		842
		843	my $child = $self->{vp}->child;
		844	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		845	}
		846
		847	#TODO# update range on size_allocate depending on child
		848	# update viewport offset on scroll
		849
		850	#############################################################################
		851
		852	package CFClient::UI::Frame;
		853
		854	our @ISA = CFClient::UI::Bin::;
		855
		856	use CFClient::OpenGL;
		857
		858	sub new {
		859	my $class = shift;
		860
		861	$class->SUPER::new (
		862	bg => undef,
		863	@_,
		864	)
		865	}
		866
749	sub _draw {	867	sub _draw {
750	my ($self) = @_;	868	my ($self) = @_;
751		869
752	my ($w, $h) = ($self->{w}, $self->{h});	870	if ($self->{bg}) {
		871	my ($w, $h) = @$self{qw(w h)};
753		872
754	glEnable GL_BLEND;	873	glEnable GL_BLEND;
755	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	874	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756	glEnable GL_TEXTURE_2D;	875	glColor @{ $self->{bg} };
757	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758		876
759	# glBegin GL_QUADS;	877	glBegin GL_QUADS;
760	# glColor 0, 0, 0, 0;
761	# glVertex 0 , 0;	878	glVertex 0 , 0;
762	# glVertex 0 , $h;	879	glVertex 0 , $h;
763	# glVertex $w, $h;	880	glVertex $w, $h;
764	# glVertex $w, 0;	881	glVertex $w, 0;
765	# glEnd;	882	glEnd;
766		883
767
768	$self->child->draw;
769	glDisable GL_BLEND;	884	glDisable GL_BLEND;
770	glDisable GL_TEXTURE_2D;	885	}
		886
		887	$self->SUPER::_draw;
771	}	888	}
772		889
773	#############################################################################	890	#############################################################################
774		891
775	package CFClient::UI::FancyFrame;	892	package CFClient::UI::FancyFrame;
…		…
789		906
790	my $self = $class->SUPER::new (	907	my $self = $class->SUPER::new (
791	bg => [1, 1, 1, 1],	908	bg => [1, 1, 1, 1],
792	border_bg => [1, 1, 1, 1],	909	border_bg => [1, 1, 1, 1],
793	border => 0.6,	910	border => 0.6,
		911	toplevel => 1,
794	can_events => 1,	912	can_events => 1,
795	@_	913	@_
796	);	914	);
797		915
798	$self->{title} &&= new CFClient::UI::Label	916	$self->{title} &&= new CFClient::UI::Label
…		…
823	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
824		942
825	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
826	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
827		945
828	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	946	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829	if $self->{title};	947	if $self->{title};
830		948
831	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
832	}	950	}
833		951
…		…
891	my ($self) = @_;	1009	my ($self) = @_;
892		1010
893	my ($w, $h ) = ($self->{w}, $self->{h});	1011	my ($w, $h ) = ($self->{w}, $self->{h});
894	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1012	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895		1013
896	glEnable GL_BLEND;
897	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898	glEnable GL_TEXTURE_2D;	1014	glEnable GL_TEXTURE_2D;
899	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1015	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900		1016
901	my $border = $self->border;	1017	my $border = $self->border;
902		1018
903	glColor @{ $self->{border_bg} };	1019	glColor @{ $self->{border_bg} };
904	$tex[1]->draw_quad (0, 0, $w, $border);	1020	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
905	$tex[3]->draw_quad (0, $border, $border, $ch);	1021	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1022	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1023	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908		1024
909	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1025	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910	my $bg = $tex[0];	1026	my $bg = $tex[0];
911		1027
912	# TODO: repeat texture not scale	1028	# TODO: repeat texture not scale
…		…
916	glColor @{ $self->{bg} };	1032	glColor @{ $self->{bg} };
917		1033
918	$bg->{s} = $rep_x;	1034	$bg->{s} = $rep_x;
919	$bg->{t} = $rep_y;	1035	$bg->{t} = $rep_y;
920	$bg->{wrap_mode} = 1;	1036	$bg->{wrap_mode} = 1;
921	$bg->draw_quad ($border, $border, $cw, $ch);	1037	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1038	}
922		1039
923	glDisable GL_TEXTURE_2D;	1040	glDisable GL_TEXTURE_2D;
924	glDisable GL_BLEND;
925	}
926		1041
927	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
928		1043
929	$self->child->draw;	1044	$self->child->draw;
930	}	1045	}
…		…
1157	}	1272	}
1158		1273
1159	sub size_allocate {	1274	sub size_allocate {
1160	my ($self, $w, $h) = @_;	1275	my ($self, $w, $h) = @_;
1161		1276
		1277	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1278
1162	my $children = $self->{children};	1279	my $children = $self->{children};
1163		1280
1164	my @h = map $_->{req_h}, @$children;	1281	my @h = map $_->{req_h}, @$children;
1165		1282
1166	my $req_h = List::Util::sum @h;	1283	my $req_h = List::Util::sum @h;
…		…
1195		1312
1196	#############################################################################	1313	#############################################################################
1197		1314
1198	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1199		1316
1200	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1201		1318
1202	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1203		1320
1204	sub new {	1321	sub new {
1205	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1206		1323
1207	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1208	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1209	#font => default_font	1328	#font => default_font
		1329	#text => initial text
		1330	#markup => initial narkup
		1331	#max_w => maximum pixel width
		1332	ellipsise => 3, # end
		1333	layout => (new CFClient::Layout),
1210	fontsize => 1,	1334	fontsize => 1,
1211	text => "",
1212	align => -1,	1335	align => -1,
1213	valign => -1,	1336	valign => -1,
1214	padding => 2,	1337	padding => 2,
1215	layout => new CFClient::Layout,
1216	can_events => 0,	1338	can_events => 0,
1217	%arg	1339	%arg
1218	);	1340	);
1219		1341
1220	if (exists $self->{template}) {	1342	if (exists $self->{template}) {
1221	my $layout = new CFClient::Layout;	1343	my $layout = new CFClient::Layout;
1222	$layout->set_text (delete $self->{template});	1344	$layout->set_text (delete $self->{template});
1223	$self->{template} = $layout;	1345	$self->{template} = $layout;
1224	}	1346	}
1225		1347
1226	$self->set_text (delete $self->{text}) if exists $self->{text};	1348	if (exists $self->{markup}) {
1227	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1349	$self->set_markup (delete $self->{markup});
		1350	} else {
		1351	$self->set_text (delete $self->{text});
		1352	}
1228		1353
1229	$self	1354	$self
1230	}	1355	}
1231		1356
1232	sub escape {	1357	sub escape($) {
1233	local $_ = $_[1];	1358	local $_ = $_[0];
1234		1359
1235	s/&/&amp;/g;	1360	s/&/&amp;/g;
1236	s/>/&gt;/g;	1361	s/>/&gt;/g;
1237	s/</&lt;/g;	1362	s/</&lt;/g;
1238		1363
1239	$_[1]	1364	$_
1240	}	1365	}
1241		1366
1242	sub update {	1367	sub update {
1243	my ($self) = @_;	1368	my ($self) = @_;
1244		1369
1245	delete $self->{texture};	1370	delete $self->{texture};
1246	$self->SUPER::update;	1371	$self->SUPER::update;
1247	}	1372	}
1248		1373
1249	sub reconfigure {
1250	my ($self) = @_;
1251
1252	delete $self->{texture};
1253	}
1254
1255	sub set_text {	1374	sub set_text {
1256	my ($self, $text) = @_;	1375	my ($self, $text) = @_;
1257		1376
1258	return if $self->{text} eq "T$text";	1377	return if $self->{text} eq "T$text";
1259	$self->{text} = "T$text";	1378	$self->{text} = "T$text";
1260		1379
		1380	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261	$self->{layout}->set_text ($text);	1381	$self->{layout}->set_text ($text);
1262		1382
1263	delete $self->{texture};
1264	$self->update;	1383	$self->update;
1265	$self->check_size;	1384	$self->check_size;
1266	}	1385	}
1267		1386
1268	sub set_markup {	1387	sub set_markup {
1269	my ($self, $markup) = @_;	1388	my ($self, $markup) = @_;
1270		1389
1271	return if $self->{text} eq "M$markup";	1390	return if $self->{text} eq "M$markup";
1272	$self->{text} = "M$markup";	1391	$self->{text} = "M$markup";
1273		1392
		1393	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1394
		1395	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274	$self->{layout}->set_markup ($markup);	1396	$self->{layout}->set_markup ($markup);
1275		1397
1276	delete $self->{texture};
1277	$self->update;	1398	$self->update;
1278	$self->check_size;	1399	$self->check_size;
1279	}	1400	}
1280		1401
1281	sub size_request {	1402	sub size_request {
1282	my ($self) = @_;	1403	my ($self) = @_;
1283		1404
1284	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1285	$self->{layout}->set_width ($self->{max_w} || -1);	1406	$self->{layout}->set_width ($self->{max_w} || -1);
		1407	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1408	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287		1410
1288	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1289		1412
1290	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1312	sub set_fontsize {	1435	sub set_fontsize {
1313	my ($self, $fontsize) = @_;	1436	my ($self, $fontsize) = @_;
1314		1437
1315	$self->{fontsize} = $fontsize;	1438	$self->{fontsize} = $fontsize;
1316	delete $self->{texture};	1439	delete $self->{texture};
		1440
		1441	$self->update;
1317	$self->check_size;	1442	$self->check_size;
1318	$self->update;
1319	}	1443	}
1320		1444
1321	sub _draw {	1445	sub _draw {
1322	my ($self) = @_;	1446	my ($self) = @_;
1323		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1324	my $tex = $self->{texture} ||= do {	1450	my $tex = $self->{texture} ||= do {
		1451	$self->{layout}->set_foreground (@{$self->{fg}});
1325	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1326	$self->{layout}->set_width ($self->{w});	1453	$self->{layout}->set_width ($self->{w});
		1454	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1455	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1457
1328	new_from_layout CFClient::Texture $self->{layout}	1458	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1459
		1460	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1461	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1462	: ($self->{w} - $tex->{w}) * 0.5);
		1463
		1464	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1465	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1466	: ($self->{h} - $tex->{h}) * 0.5);
		1467
		1468	$tex
1329	};	1469	};
1330		1470
1331	glEnable GL_BLEND;
1332	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
1334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335		1473
		1474	if ($tex->{format} == GL_ALPHA) {
1336	glColor @{$self->{fg}};	1475	glColor @{$self->{fg}};
1337
1338	$self->{ox} = int (
1339	$self->{align} < 0 ? $self->{padding}
1340	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341	: ($self->{w} - $tex->{w}) * 0.5
1342	);
1343
1344	$self->{oy} = int (
1345	$self->{valign} < 0 ? $self->{padding}
1346	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347	: ($self->{h} - $tex->{h}) * 0.5
1348	);
1349
1350	$tex->draw_quad ($self->{ox}, $self->{oy});	1476	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1477	} else {
		1478	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1479	}
1351		1480
1352	glDisable GL_TEXTURE_2D;	1481	glDisable GL_TEXTURE_2D;
1353	glDisable GL_BLEND;
1354	}	1482	}
1355		1483
1356	#############################################################################	1484	#############################################################################
1357		1485
1358	package CFClient::UI::EntryBase;	1486	package CFClient::UI::EntryBase;
…		…
1371	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1372	can_hover => 1,	1500	can_hover => 1,
1373	can_focus => 1,	1501	can_focus => 1,
1374	valign => 0,	1502	valign => 0,
1375	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1376	@_	1505	@_
1377	)	1506	)
1378	}	1507	}
1379		1508
1380	sub _set_text {	1509	sub _set_text {
…		…
1391		1520
1392	$text =~ s/./*/g if $self->{hidden};	1521	$text =~ s/./*/g if $self->{hidden};
1393	$self->{layout}->set_text ("$text ");	1522	$self->{layout}->set_text ("$text ");
1394		1523
1395	$self->emit (changed => $self->{text});	1524	$self->emit (changed => $self->{text});
1396	}
1397
1398	sub get_text {
1399	$_[0]{text}
1400	}
1401
1402	sub size_request {
1403	my ($self) = @_;
1404
1405	my ($w, $h) = $self->SUPER::size_request;
1406
1407	($w + 1, $h) # add 1 for cursor
1408	}
1409
1410	sub size_allocate {
1411	my ($self, $w, $h) = @_;
1412
1413	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414	}	1525	}
1415		1526
1416	sub set_text {	1527	sub set_text {
1417	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1418		1529
1419	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1420	$self->_set_text ($text);	1531	$self->_set_text ($text);
1421	$self->update;	1532	$self->update;
		1533	$self->check_size;
		1534	}
		1535
		1536	sub get_text {
		1537	$_[0]{text}
		1538	}
		1539
		1540	sub size_request {
		1541	my ($self) = @_;
		1542
		1543	my ($w, $h) = $self->SUPER::size_request;
		1544
		1545	($w + 1, $h) # add 1 for cursor
		1546	}
		1547
		1548	sub size_allocate {
		1549	my ($self, $w, $h) = @_;
		1550
		1551	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1422	}	1552	}
1423		1553
1424	sub key_down {	1554	sub key_down {
1425	my ($self, $ev) = @_;	1555	my ($self, $ev) = @_;
1426		1556
…		…
1428	my $sym = $ev->{sym};	1558	my $sym = $ev->{sym};
1429	my $uni = $ev->{unicode};	1559	my $uni = $ev->{unicode};
1430		1560
1431	my $text = $self->get_text;	1561	my $text = $self->get_text;
1432		1562
1433	if ($sym == 8) {	1563	if ($uni == 8) {
1434	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1564	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435	} elsif ($sym == 127) {	1565	} elsif ($uni == 127) {
1436	substr $text, $self->{cursor}, 1, "";	1566	substr $text, $self->{cursor}, 1, "";
1437	} elsif ($sym == CFClient::SDLK_LEFT) {	1567	} elsif ($sym == CFClient::SDLK_LEFT) {
1438	--$self->{cursor} if $self->{cursor};	1568	--$self->{cursor} if $self->{cursor};
1439	} elsif ($sym == CFClient::SDLK_RIGHT) {	1569	} elsif ($sym == CFClient::SDLK_RIGHT) {
1440	++$self->{cursor} if $self->{cursor} < length $self->{text};	1570	++$self->{cursor} if $self->{cursor} < length $self->{text};
1441	} elsif ($sym == CFClient::SDLK_HOME) {	1571	} elsif ($sym == CFClient::SDLK_HOME) {
1442	$self->{cursor} = 0;	1572	$self->{cursor} = 0;
1443	} elsif ($sym == CFClient::SDLK_END) {	1573	} elsif ($sym == CFClient::SDLK_END) {
1444	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1445	} elsif ($sym == 27) {	1575	} elsif ($uni == 27) {
1446	$self->emit ('escape');	1576	$self->emit ('escape');
1447	} elsif ($uni) {	1577	} elsif ($uni) {
1448	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1449	}	1579	}
1450		1580
1451	$self->_set_text ($text);	1581	$self->_set_text ($text);
1452	$self->update;	1582	$self->update;
		1583	$self->check_size;
1453	}	1584	}
1454		1585
1455	sub focus_in {	1586	sub focus_in {
1456	my ($self) = @_;	1587	my ($self) = @_;
1457		1588
…		…
1586	my $class = shift;	1717	my $class = shift;
1587		1718
1588	$class->SUPER::new (	1719	$class->SUPER::new (
1589	padding => 4,	1720	padding => 4,
1590	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1591	bg => [1, 1, 1, 0.2],
1592	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1593	can_hover => 1,	1723	can_hover => 1,
1594	align => 0,	1724	align => 0,
1595	valign => 0,	1725	valign => 0,
1596	can_events => 1,	1726	can_events => 1,
…		…
1614		1744
1615	if ($GRAB == $self) {	1745	if ($GRAB == $self) {
1616	$self->{fg} = $self->{active_fg};	1746	$self->{fg} = $self->{active_fg};
1617	}	1747	}
1618		1748
1619	glEnable GL_BLEND;
1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621	glEnable GL_TEXTURE_2D;	1749	glEnable GL_TEXTURE_2D;
1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623	glColor 0, 0, 0, 1;	1751	glColor 0, 0, 0, 1;
1624		1752
1625	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1753	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626		1754
1627	glDisable GL_TEXTURE_2D;	1755	glDisable GL_TEXTURE_2D;
1628	glDisable GL_BLEND;
1629		1756
1630	$self->SUPER::_draw;	1757	$self->SUPER::_draw;
1631	}	1758	}
1632		1759
1633	#############################################################################	1760	#############################################################################
…		…
1647		1774
1648	$class->SUPER::new (	1775	$class->SUPER::new (
1649	padding => 2,	1776	padding => 2,
1650	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1651	active_fg => [1, 1, 0],	1778	active_fg => [1, 1, 0],
		1779	bg => [0, 0, 0, 0.2],
		1780	active_bg => [1, 1, 1, 0.5],
1652	state => 0,	1781	state => 0,
1653	can_hover => 1,	1782	can_hover => 1,
1654	@_	1783	@_
1655	)	1784	)
1656	}	1785	}
…		…
1680		1809
1681	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1810	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682		1811
1683	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1812	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684		1813
1685	glEnable GL_BLEND;	1814	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1815
1686	glEnable GL_TEXTURE_2D;	1816	glEnable GL_TEXTURE_2D;
1687	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689	my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691	$tex->draw_quad (0, 0, $s, $s);	1817	$tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1694	glDisable GL_BLEND;
1695	}	1819	}
1696		1820
1697	#############################################################################	1821	#############################################################################
1698		1822
1699	package CFClient::UI::Image;	1823	package CFClient::UI::Image;
…		…
1742	glTranslate 0, -$self->{w}, 0;	1866	glTranslate 0, -$self->{w}, 0;
1743		1867
1744	($w, $h) = ($h, $w);	1868	($w, $h) = ($h, $w);
1745	}	1869	}
1746		1870
1747	glEnable GL_BLEND;
1748	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749	glEnable GL_TEXTURE_2D;	1871	glEnable GL_TEXTURE_2D;
1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751		1873
1752	$tex->draw_quad (0, 0, $w, $h);	1874	$tex->draw_quad_alpha (0, 0, $w, $h);
1753		1875
1754	glDisable GL_BLEND;
1755	glDisable GL_TEXTURE_2D;	1876	glDisable GL_TEXTURE_2D;
1756	}	1877	}
1757		1878
1758	#############################################################################	1879	#############################################################################
1759		1880
…		…
1948	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
1949		2070
1950	sub new {	2071	sub new {
1951	my $class = shift;	2072	my $class = shift;
1952		2073
1953	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
1954		2075
1955	# TODO: 0-width page	2076	# TODO: 0-width page
1956	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
1957	# TODO: calculations are off	2078	# TODO: calculations are off
1958	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
1959	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
1960	active_fg => [0, 0, 0],	2081	active_fg => [0, 0, 0],
		2082	bg => [0, 0, 0, 0.2],
		2083	active_bg => [1, 1, 1, 0.5],
1961	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
1962	req_w => 20,	2085	req_w => $::WIDTH / 80,
1963	req_h => 20,	2086	req_h => $::WIDTH / 80,
1964	vertical => 0,	2087	vertical => 0,
1965	can_hover => 1,	2088	can_hover => 1,
1966	inner_pad => 5,	2089	inner_pad => 0.02,
1967	@_	2090	@_
1968	);	2091	);
1969		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
1970	$self	2096	$self
		2097	}
		2098
		2099	sub set_range {
		2100	my ($self, $range) = @_;
		2101
		2102	$self->{range} = $range;
		2103
		2104	$self->update;
		2105	}
		2106
		2107	sub set_value {
		2108	my ($self, $value) = @_;
		2109
		2110	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2111
		2112	$hi = $lo + 1 if $hi <= $lo;
		2113
		2114	$page = $hi - $lo if $page > $hi - $lo;
		2115
		2116	$value = $lo if $value < $lo;
		2117	$value = $hi - $page if $value > $hi - $page;
		2118
		2119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2120	if $unit;
		2121
		2122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2123
		2124	if ($value != $old_value) {
		2125	$self->emit (changed => $value);
		2126	$self->update;
		2127	}
1971	}	2128	}
1972		2129
1973	sub size_request {	2130	sub size_request {
1974	my ($self) = @_;	2131	my ($self) = @_;
1975		2132
…		…
1981		2138
1982	sub button_down {	2139	sub button_down {
1983	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
1984		2141
1985	$self->SUPER::button_down ($ev, $x, $y);	2142	$self->SUPER::button_down ($ev, $x, $y);
		2143
		2144	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2145
1986	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
1987	}	2147	}
1988		2148
1989	sub mouse_motion {	2149	sub mouse_motion {
1990	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
1991		2151
1992	if ($GRAB == $self) {	2152	if ($GRAB == $self) {
		2153	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2154
		2155	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2156
		2157	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2158
		2159	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2160	}
		2161	}
		2162
		2163	sub update {
		2164	my ($self) = @_;
		2165
		2166	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2167	$self->set_value ($self->{range}[0]);
		2168
1993	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) || 1e-100;
1994		2171
1995	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996		2173
1997	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2175	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999		2176
2000	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
2001	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$value = $value * $self->{scale} + $self->{offset};
2002	$x = $lo if $x < $lo;
2003	$x = $hi - $page if $x > $hi - $page;
2004	$self->{range}[0] = $x;
2005		2179
2006	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
2007	$self->update;	2181	$self->{knob_w} = $knob_w;
2008	}	2182	});
2009	}
2010		2183
2011	# the inner_* stuff is for generating a padding for the slider handle,	2184	$self->SUPER::update;
2012	# so that the handle doesn't leave the texture. This calculation isn't 100%
2013	# correct propably, but it does the job for now
2014	sub _calc_inner_pad_px {
2015	my ($self, $w) = @_;
2016	($w / 100) * $self->{inner_pad} # % to pixels
2017	}	2185	}
2018		2186
2019	sub _draw {	2187	sub _draw {
2020	my ($self) = @_;	2188	my ($self) = @_;
2021		2189
2022	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
2023		2191
2024	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
2025		2193
2026	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
2027	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
2028		2196
		2197	glTranslate 1, 0, 0;
2029	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
2030	glTranslate 0, -$self->{w}, 0;
2031
2032	($w, $h) = ($h, $w);
2033	}	2199	}
2034		2200
2035	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037		2203
2038	my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040	$hi = $value + 1 if $lo == $hi;
2041
2042	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045	$page = int $page * $inner_w / ($hi - $lo);
2046	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048	$w -= $page;
2049	$page &= ~1;
2050	glTranslate $page * 0.5, 0, 0;
2051	$page ||= 2;
2052
2053	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056	glEnable GL_BLEND;
2057	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058	glEnable GL_TEXTURE_2D;	2204	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2206
2061	# draw background	2207	# draw background
2062	$tex[1]->draw_quad (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063		2209
2064	# draw handle	2210	# draw handle
2065	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2211	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066		2212
2067	glDisable GL_BLEND;
2068	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2069	}	2214	}
		2215
		2216	#############################################################################
		2217
		2218	package CFClient::UI::ValSlider;
		2219
		2220	our @ISA = CFClient::UI::HBox::;
		2221
		2222	sub new {
		2223	my ($class, %arg) = @_;
		2224
		2225	my $range = delete $arg{range};
		2226
		2227	my $self = $class->SUPER::new (
		2228	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2229	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2230	to_value => sub { shift },
		2231	from_value => sub { shift },
		2232	%arg,
		2233	);
		2234
		2235	$self->{slider}->connect (changed => sub {
		2236	my ($self, $value) = @_;
		2237	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2238	$self->{parent}->emit (changed => $value);
		2239	});
		2240
		2241	# $self->{entry}->connect (changed => sub {
		2242	# my ($self, $value) = @_;
		2243	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2244	# $self->{parent}->emit (changed => $value);
		2245	# });
		2246
		2247	$self->add ($self->{slider}, $self->{entry});
		2248
		2249	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2250
		2251	$self
		2252	}
		2253
		2254	sub set_range { shift->{slider}->set_range (@_) }
		2255	sub set_value { shift->{slider}->set_value (@_) }
2070		2256
2071	#############################################################################	2257	#############################################################################
2072		2258
2073	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2074		2260
…		…
2083	fontsize => 1,	2269	fontsize => 1,
2084	can_events => 0,	2270	can_events => 0,
2085	#font => default_font	2271	#font => default_font
2086	@_,	2272	@_,
2087		2273
2088	layout => (new CFClient::Layout),	2274	layout => (new CFClient::Layout 1),
2089	par => [],	2275	par => [],
2090	height => 0,	2276	height => 0,
2091	children => [	2277	children => [
2092	(new CFClient::UI::Empty expand => 1),	2278	(new CFClient::UI::Empty expand => 1),
2093	(new CFClient::UI::Slider vertical => 1),	2279	(new CFClient::UI::Slider vertical => 1),
…		…
2104		2290
2105	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2106	$self->reflow;	2292	$self->reflow;
2107	}	2293	}
2108		2294
2109	sub text_height {
2110	my ($self, $text) = @_;
2111
2112	my $layout = $self->{layout};
2113
2114	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115	$layout->set_width ($self->{children}[0]{w});
2116	$layout->set_text ($text);
2117
2118	($layout->size)[1]
2119	}
2120
2121	sub reflow {
2122	my ($self) = @_;
2123
2124	$self->{need_reflow}++;
2125	$self->update;
2126	}
2127
2128	sub size_allocate {	2295	sub size_allocate {
2129	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2130		2297
2131	$self->SUPER::size_allocate ($w, $h);	2298	$self->SUPER::size_allocate ($w, $h);
2132		2299
…		…
2135	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2136		2303
2137	$self->reflow;	2304	$self->reflow;
2138	}	2305	}
2139		2306
		2307	sub text_size {
		2308	my ($self, $text, $indent) = @_;
		2309
		2310	my $layout = $self->{layout};
		2311
		2312	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2313	$layout->set_width ($self->{children}[0]{w} - $indent);
		2314	$layout->set_markup ($text);
		2315
		2316	$layout->size
		2317	}
		2318
		2319	sub reflow {
		2320	my ($self) = @_;
		2321
		2322	$self->{need_reflow}++;
		2323	$self->update;
		2324	}
		2325
		2326	sub set_offset {
		2327	my ($self, $offset) = @_;
		2328
		2329	# todo: base offset on lines or so, not on pixels
		2330	$self->{children}[1]->set_value ($offset);
		2331	}
		2332
		2333	sub clear {
		2334	my ($self) = @_;
		2335
		2336	$self->{par} = [];
		2337	$self->{height} = 0;
		2338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2339	}
		2340
2140	sub add_paragraph {	2341	sub add_paragraph {
2141	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2142		2343
2143	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2144		2345	my ($w, $h) = $self->text_size ($line);
2145	my $height = $self->text_height ($text);
2146
2147	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2148		2349
2149	push @{$self->{par}}, [$height, $color, $text];
2150
2151	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2350	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152	$self->{children}[1]->update;
2153	}	2351	}
2154		2352
2155	sub update {	2353	sub update {
2156	my ($self) = @_;	2354	my ($self) = @_;
2157		2355
…		…
2159		2357
2160	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2161		2359
2162	delete $self->{texture};	2360	delete $self->{texture};
2163		2361
2164	$ROOT->on_refresh ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2165	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2166	my $height = 0;	2366	my $height = 0;
2167		2367
2168	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2169	for @{$self->{par}};	2372	for (@{$self->{par}}) {
		2373	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2374	$layout->set_width ($W - $_->[3]);
		2375	$layout->set_markup ($_->[4]);
		2376	my ($w, $h) = $layout->size;
		2377	$_->[0] = $w + $_->[3];
		2378	$_->[1] = $h;
		2379	}
		2380
		2381	$height += $_->[1];
		2382	}
2170		2383
2171	$self->{height} = $height;	2384	$self->{height} = $height;
2172		2385
2173	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174		2387
2175	delete $self->{texture};	2388	delete $self->{texture};
2176	}	2389	}
2177		2390
2178	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2391	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179	glClearColor 0, 0, 0, 0;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2180	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2181		2394
		2395	my $top = int $self->{children}[1]{range}[0];
		2396
		2397	my $y0 = $top;
		2398	my $y1 = $top + $H;
		2399
		2400	my $y = 0;
		2401
		2402	my $layout = $self->{layout};
		2403
		2404	$layout->set_font ($self->{font}) if $self->{font};
		2405
2182	glEnable GL_BLEND;	2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
2183	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2408	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184	glEnable GL_TEXTURE_2D;
2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187	my $top = int $self->{children}[1]{range}[0];
2188
2189	my $y0 = $top;
2190	my $y1 = $top + $self->{h};
2191
2192	my $y = 0;
2193
2194	my $layout = $self->{layout};
2195
2196	$layout->set_font ($self->{font}) if $self->{font};
2197		2409
2198	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2199	my $h = $par->[0];	2411	my $h = $par->[1];
2200		2412
2201	if ($y0 < $y + $h && $y < $y1) {	2413	if ($y0 < $y + $h && $y < $y1) {
		2414	$layout->set_foreground (@{ $par->[2] });
		2415	$layout->set_width ($W - $par->[3]);
2202	$layout->set_text ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2203		2417
2204	glColor @{ $par->[1] };	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205	my ($W, $H) = $layout->size;	2419
2206	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2420	glRasterPos $par->[3], $y - $y0;
		2421	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207	}	2422	}
2208		2423
2209	$y += $h;	2424	$y += $h;
2210	}	2425	}
2211		2426
2212	glDisable GL_TEXTURE_2D;
2213	glDisable GL_BLEND;	2427	glDisable GL_BLEND;
2214	};	2428	};
2215	});	2429	});
2216	}	2430	}
2217		2431
2218	sub _draw {	2432	sub _draw {
2219	my ($self) = @_;	2433	my ($self) = @_;
2220		2434
2221	glEnable GL_BLEND;
2222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2226	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2438	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2228	glDisable GL_BLEND;
2229		2440
2230	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2231		2442
2232	}	2443	}
2233		2444
…		…
2327	@_,	2538	@_,
2328	can_events => 0,	2539	can_events => 0,
2329	)	2540	)
2330	}	2541	}
2331		2542
2332	sub set_markup {	2543	sub set_tooltip_from {
2333	my ($self, $text) = @_;	2544	my ($self, $widget) = @_;
2334		2545
2335	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2546	$self->add (new CFClient::UI::Label
2336	$self->{label}->set_markup ($text);	2547	markup => $widget->{tooltip},
2337	$self->add ($self->{label});	2548	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2549	fontsize => 0.8,
		2550	fg => [0, 0, 0, 1],
		2551	ellipsise => 0,
		2552	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2553	);
2338	}	2554	}
2339		2555
2340	sub size_request {	2556	sub size_request {
2341	my ($self) = @_;	2557	my ($self) = @_;
2342
2343	$self->child->set_max_size ($::WIDTH * 0.3);
2344		2558
2345	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2559	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346		2560
2347	($w + 4, $h + 4)	2561	($w + 4, $h + 4)
2348	}	2562	}
…		…
2354	}	2568	}
2355		2569
2356	sub _draw {	2570	sub _draw {
2357	my ($self) = @_;	2571	my ($self) = @_;
2358		2572
2359	glPushMatrix;
2360	glTranslate 0.375, 0.375;	2573	glTranslate 0.375, 0.375;
2361		2574
2362	my ($w, $h) = @$self{qw(w h)};	2575	my ($w, $h) = @$self{qw(w h)};
2363		2576
2364	glColor 1, 0.8, 0.4;	2577	glColor 1, 0.8, 0.4;
…		…
2375	glVertex 0 , $h;	2588	glVertex 0 , $h;
2376	glVertex $w, $h;	2589	glVertex $w, $h;
2377	glVertex $w, 0;	2590	glVertex $w, 0;
2378	glEnd;	2591	glEnd;
2379		2592
2380	glPopMatrix;	2593	glTranslate 2 - 0.375, 2 - 0.375;
2381
2382	glTranslate 2, 2;
2383	$self->SUPER::_draw;	2594	$self->SUPER::_draw;
2384	}	2595	}
2385		2596
2386	#############################################################################	2597	#############################################################################
2387		2598
…		…
2392	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2393		2604
2394	sub new {	2605	sub new {
2395	my $class = shift;	2606	my $class = shift;
2396		2607
2397	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2398	aspect => 1,	2609	aspect => 1,
2399	@_,	2610	@_,
2400	)	2611	);
		2612
		2613	if ($self->{anim} && $self->{animspeed}) {
		2614	Scalar::Util::weaken (my $widget = $self);
		2615
		2616	$self->{timer} = Event->timer (
		2617	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2618	hard => 1,
		2619	interval => $self->{animspeed},
		2620	cb => sub {
		2621	++$widget->{frame};
		2622	$widget->update;
		2623	},
		2624	);
		2625	}
		2626
		2627	$self
2401	}	2628	}
2402		2629
2403	sub size_request {	2630	sub size_request {
2404	(32, 8)	2631	(32, 8)
2405	}	2632	}
2406		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2407	sub _draw {	2642	sub _draw {
2408	my ($self) = @_;	2643	my ($self) = @_;
2409		2644
		2645	return unless $::CONN;
		2646
		2647	my $face;
		2648
		2649	if ($self->{frame}) {
		2650	my $anim = $::CONN->{anim}[$self->{anim}];
		2651
		2652	$face = $anim->[ $self->{frame} % @$anim ]
		2653	if $anim && @$anim;
		2654	}
		2655
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2657
2412	# TODO animation
2413	if ($tex) {	2658	if ($tex) {
2414	glEnable GL_BLEND;
2415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2419	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2421	glDisable GL_BLEND;
2422	}	2664	}
		2665	}
		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
		2674	}
		2675
		2676	#############################################################################
		2677
		2678	package CFClient::UI::InventoryItem;
		2679
		2680	our @ISA = CFClient::UI::HBox::;
		2681
		2682	sub _item_to_desc {
		2683	my ($item) = @_;
		2684
		2685	my $desc =
		2686	$item->{nrof} < 2
		2687	? $item->{name}
		2688	: "$item->{nrof} × $item->{name_pl}";
		2689
		2690	$item->{flags} & Crossfire::Protocol::F_OPEN
		2691	and $desc .= " (open)";
		2692	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2693	and $desc .= " (applied)";
		2694	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2695	and $desc .= " (unpaid)";
		2696	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2697	and $desc .= " (magic)";
		2698	$item->{flags} & Crossfire::Protocol::F_CURSED
		2699	and $desc .= " (cursed)";
		2700	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2701	and $desc .= " (damned)";
		2702	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2703	and $desc .= " *";
		2704
		2705	$desc
		2706	}
		2707
		2708	sub new {
		2709	my $class = shift;
		2710
		2711	my %args = @_;
		2712
		2713	my $item = delete $args{item};
		2714
		2715	my $desc = _item_to_desc ($item);
		2716
		2717	my $self = $class->SUPER::new (
		2718	can_hover => 1,
		2719	can_events => 1,
		2720	tooltip => ((CFClient::UI::Label::escape $desc)
		2721	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
		2722	connect_button_down => sub {
		2723	my ($self, $ev, $x, $y) = @_;
		2724
		2725	# todo: maybe put examine on 1? but should just be a tooltip :(
		2726	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2727	my $targ = $::CONN->{player}{tag};
		2728
		2729	if ($item->{container} == $::CONN->{player}{tag}) {
		2730	$targ = $main::OPENCONT;
		2731	}
		2732
		2733	$::CONN->send ("move $targ $item->{tag} 0");
		2734	} elsif ($ev->{button} == 1) {
		2735	$::CONN->send ("examine $item->{tag}");
		2736	} elsif ($ev->{button} == 2) {
		2737	$::CONN->send ("apply $item->{tag}");
		2738	} elsif ($ev->{button} == 3) {
		2739	my @menu_items = (
		2740	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2742	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2743	(
		2744	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2745	? (
		2746	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2747	)
		2748	: (
		2749	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
		2752	),
		2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2756	}
		2757
		2758	1
		2759	},
		2760	%args
		2761	);
		2762
		2763
		2764	$self->add (new CFClient::UI::Face
		2765	can_events => 0,
		2766	face => $item->{face},
		2767	anim => $item->{anim},
		2768	animspeed => $item->{animspeed},
		2769	);
		2770
		2771	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2772
		2773	$self->{item} = $item;
		2774
		2775	$self->update_item;
		2776
		2777	$self
		2778	}
		2779
		2780	sub update_item {
		2781	my ($self) = @_;
		2782
		2783	my $desc = _item_to_desc ($self->{item});
		2784
		2785	$self->{name_lbl}->set_text ($desc);
		2786	}
		2787
		2788	#############################################################################
		2789
		2790	package CFClient::UI::Inventory;
		2791
		2792	our @ISA = CFClient::UI::ScrolledWindow::;
		2793
		2794	sub new {
		2795	my $class = shift;
		2796
		2797	my $self = $class->SUPER::new (
		2798	scrolled => (new CFClient::UI::Table),
		2799	@_,
		2800	);
		2801
		2802	$self
		2803	}
		2804
		2805	sub set_items {
		2806	my ($self, $items) = @_;
		2807
		2808	$self->{scrolled}->clear;
		2809	return unless $items;
		2810
		2811	my @items = sort {
		2812	($a->{type} <=> $b->{type})
		2813	or ($a->{name} cmp $b->{name})
		2814	} @$items;
		2815
		2816	$self->{real_items} = \@items;
		2817
		2818	for my $item (@items) {
		2819	$item->{item} = $item;
		2820	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2821	$item->update_item ();
		2822	}
		2823
		2824	my $i = 0;
		2825	for (@items) {
		2826	$self->{scrolled}->add (0, $i, $_);
		2827	my $nrof = $_->{item}->{nrof} || 1;
		2828	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2829	}
		2830
		2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2832	}
		2833
		2834	sub size_request {
		2835	my ($self) = @_;
		2836	($self->{req_w}, $self->{req_h});
2423	}	2837	}
2424		2838
2425	#############################################################################	2839	#############################################################################
2426		2840
2427	package CFClient::UI::Menu;	2841	package CFClient::UI::Menu;
…		…
2475	}	2889	}
2476		2890
2477	sub mouse_motion {	2891	sub mouse_motion {
2478	my ($self, $ev, $x, $y) = @_;	2892	my ($self, $ev, $x, $y) = @_;
2479		2893
2480	# TODO: should use vbox->fdind_widget or so	2894	# TODO: should use vbox->find_widget or so
2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2895	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482	$self->{hover} = $self->{item}{$HOVER};	2896	$self->{hover} = $self->{item}{$HOVER};
2483	}	2897	}
2484		2898
2485	sub button_up {	2899	sub button_up {
…		…
2494	}	2908	}
2495	}	2909	}
2496		2910
2497	#############################################################################	2911	#############################################################################
2498		2912
		2913	package CFClient::UI::Statusbox;
		2914
		2915	our @ISA = CFClient::UI::VBox::;
		2916
		2917	sub new {
		2918	my $class = shift;
		2919
		2920	$class->SUPER::new (
		2921	fontsize => 0.8,
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub reorder {
		2927	my ($self) = @_;
		2928	my $NOW = time;
		2929
		2930	while (my ($k, $v) = each %{ $self->{item} }) {
		2931	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2932	}
		2933
		2934	my @widgets;
		2935
		2936	my @items = sort {
		2937	$a->{pri} <=> $b->{pri}
		2938	or $b->{id} <=> $a->{id}
		2939	} values %{ $self->{item} };
		2940
		2941	my $count = 10 + 1;
		2942	for my $item (@items) {
		2943	last unless --$count;
		2944
		2945	push @widgets, $item->{label} ||= do {
		2946	# TODO: doesn't handle markup well (read as: at all)
		2947	my $short = $item->{count} > 1
		2948	? "<b>$item->{count} ×</b> $item->{text}"
		2949	: $item->{text};
		2950
		2951	for ($short) {
		2952	s/^\s+//;
		2953	s/\s+/ /g;
		2954	}
		2955
		2956	new CFClient::UI::Label
		2957	markup => $short,
		2958	tooltip => $item->{tooltip},
		2959	tooltip_font => $::FONT_PROP,
		2960	tooltip_width => 0.67,
		2961	fontsize => $item->{fontsize} || $self->{fontsize},
		2962	max_w => $::WIDTH * 0.44,
		2963	fg => $item->{fg},
		2964	can_events => 1,
		2965	can_hover => 1
		2966	};
		2967	}
		2968
		2969	$self->clear;
		2970	$self->SUPER::add (reverse @widgets);
		2971	}
		2972
		2973	sub add {
		2974	my ($self, $text, %arg) = @_;
		2975
		2976	$text =~ s/^\s+//;
		2977	$text =~ s/\s+$//;
		2978
		2979	my $timeout = time + ((delete $arg{timeout}) || 60);
		2980
		2981	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2982
		2983	if (my $item = $self->{item}{$group}) {
		2984	if ($item->{text} eq $text) {
		2985	$item->{count}++;
		2986	} else {
		2987	$item->{count} = 1;
		2988	$item->{text} = $item->{tooltip} = $text;
		2989	}
		2990	$item->{id} = ++$self->{id};
		2991	$item->{timeout} = $timeout;
		2992	delete $item->{label};
		2993	} else {
		2994	$self->{item}{$group} = {
		2995	id => ++$self->{id},
		2996	text => $text,
		2997	timeout => $timeout,
		2998	tooltip => $text,
		2999	fg => [0.8, 0.8, 0.8, 0.8],
		3000	pri => 0,
		3001	count => 1,
		3002	%arg,
		3003	};
		3004	}
		3005
		3006	$self->reorder;
		3007	}
		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	delete $_->{label}
		3013	for values %{ $self->{item} || {} };
		3014
		3015	$self->reorder;
		3016	$self->SUPER::reconfigure;
		3017	}
		3018
		3019	#############################################################################
		3020
2499	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2500		3022
2501	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
2502		3024
2503	use CFClient::OpenGL;	3025	use CFClient::OpenGL;
2504		3026
2505	sub check_size {	3027	sub new {
2506	my ($self) = @_;	3028	my $class = shift;
2507		3029
2508	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3030	$class->SUPER::new (
2509	}	3031	@_,
2510		3032	)
2511	sub size_request {
2512	($::WIDTH, $::HEIGHT)
2513	}	3033	}
2514		3034
2515	sub configure {	3035	sub configure {
2516	my ($self, $x, $y, $w, $h) = @_;	3036	my ($self, $x, $y, $w, $h) = @_;
2517		3037
2518	$self->SUPER::configure ($x, $y, $w, $h);	3038	$self->{w} = $w;
		3039	$self->{h} = $h;
		3040	}
2519		3041
		3042	sub check_size {
		3043	my ($self) = @_;
		3044
		3045	$self->size_allocate ($self->{w}, $self->{h})
		3046	if $self->{w};
		3047	}
		3048
		3049	sub size_request {
		3050	my ($self) = @_;
		3051
		3052	($self->{w}, $self->{h})
		3053	}
		3054
		3055	sub size_allocate {
		3056	my ($self, $w, $h) = @_;
		3057
		3058	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		3059	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		3060
		3061	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		3062	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		3063
2520	for my $child (@{$self->{children}}) {	3064	for my $child ($self->children) {
2521	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522		3066
		3067	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3068	if exists $child->{req_x};
		3069
		3070	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3071	if exists $child->{req_y};
		3072
2523	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3073	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3074	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3075
2525	$child->configure ($X, $Y, $W,$H);	3076	$child->configure ($X, $Y, $W, $H);
2526	}	3077	}
2527	}	3078	}
2528		3079
2529	sub _topleft {	3080	sub coord2local {
2530	my ($self, $x, $y) = @_;	3081	my ($self, $x, $y) = @_;
2531		3082
2532	($x, $y)	3083	($x, $y)
2533	}	3084	}
2534		3085
		3086	sub coord2global {
		3087	my ($self, $x, $y) = @_;
		3088
		3089	($x, $y)
		3090	}
		3091
2535	sub update {	3092	sub update {
2536	my ($self) = @_;	3093	my ($self) = @_;
2537		3094
2538	$self->check_size;	3095	$self->check_size;
2539	::refresh ();	3096	$::WANT_REFRESH++;
2540	}	3097	}
2541		3098
2542	sub add {	3099	sub add {
2543	my ($self, $child) = @_;	3100	my ($self, @children) = @_;
2544		3101
		3102	for (my @widgets = @children; my $w = pop @widgets; ) {
		3103	push @widgets, $w->children;
		3104	$w->{root} = $self;
		3105	$w->{visible} = 1;
		3106	}
		3107
		3108	for my $child (@children) {
		3109	$child->{toplevel} = 1;
		3110
2545	# integerize window positions	3111	# integerise window positions
2546	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2547	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
		3114	}
2548		3115
2549	$self->SUPER::add ($child);	3116	$self->SUPER::add (@children);
		3117	}
		3118
		3119	sub remove {
		3120	my ($self, @children) = @_;
		3121
		3122	$self->SUPER::remove (@children);
		3123
		3124	while (@children) {
		3125	my $w = pop @children;
		3126	push @children, $w->children;
		3127	delete $w->{visible};
		3128	}
2550	}	3129	}
2551		3130
2552	sub on_refresh {	3131	sub on_refresh {
2553	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2554		3133
2555	$self->{refresh_hook}{$id} = $cb;	3134	$self->{refresh_hook}{$id} = $cb;
2556	}	3135	}
2557		3136
		3137	sub on_post_alloc {
		3138	my ($self, $id, $cb) = @_;
		3139
		3140	$self->{post_alloc_hook}{$id} = $cb;
		3141	}
		3142
2558	sub draw {	3143	sub draw {
2559	my ($self) = @_;	3144	my ($self) = @_;
2560		3145
2561	while (my $rcb = delete $self->{refresh_hook}) {	3146	while ($self->{refresh_hook}) {
2562	$_->() for values %$rcb;	3147	$_->()
		3148	for values %{delete $self->{refresh_hook}};
		3149	}
		3150
		3151	if ($self->{check_size}) {
		3152	my @queue = ([], []);
		3153
		3154	for (;;) {
		3155	if ($self->{check_size}) {
		3156	# heuristic: check containers last
		3157	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3158	for values %{delete $self->{check_size}}
		3159	}
		3160
		3161	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3162
		3163	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3164	? @$widget{qw(user_w user_h)}
		3165	: $widget->size_request;
		3166
		3167	if (delete $widget->{force_alloc}
		3168	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3169	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3170
		3171	$widget->{req_w} = $w;
		3172	$widget->{req_h} = $h;
		3173
		3174	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3175
		3176	$widget->{parent}->check_size
		3177	if $widget->{parent};
		3178	}
		3179	}
		3180	}
		3181
		3182	while ($self->{size_alloc}) {
		3183	for (values %{delete $self->{size_alloc}}) {
		3184	my ($widget, $w, $h) = @$_;
		3185
		3186	$w = 0 if $w < 0;
		3187	$h = 0 if $h < 0;
		3188
		3189	$widget->{w} = $w;
		3190	$widget->{h} = $h;
		3191	$widget->size_allocate ($w, $h);
		3192	$widget->emit (size_allocate => $w, $h);
		3193	}
		3194	}
		3195
		3196	while ($self->{post_alloc_hook}) {
		3197	$_->()
		3198	for values %{delete $self->{post_alloc_hook}};
2563	}	3199	}
2564		3200
2565	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2568		3204
2569	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2570	glLoadIdentity;	3206	glLoadIdentity;
2571	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2573	glLoadIdentity;	3209	glLoadIdentity;
2574		3210
2575	$self->_draw;	3211	$self->_draw;
2576	}	3212	}
2577		3213
2578	#############################################################################	3214	#############################################################################
2579		3215
2580	package CFClient::UI::Inventory;
2581
2582	our @ISA = CFClient::UI::Container::;
2583
2584	use CFClient::OpenGL;
2585
2586	sub new {
2587	my $class = shift;
2588
2589	my $self = $class->SUPER::new (@_);
2590
2591	$self
2592	}
2593
2594	sub size_allocate {
2595	my ($self, $w, $h) = @_;
2596
2597	$self->{w} = $w;
2598	$self->{h} = $h;
2599
2600	$self->check_size;
2601	}
2602
2603	sub set_items {
2604	my ($self, $items) = @_;
2605	my @items = values %{$items};
2606	@items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608	$self->{real_items} = \@items;
2609
2610	for my $item (@items) {
2611	my $desc = $item->{nrof} < 2
2612	? $item->{name}
2613	: "$item->{nrof} $item->{name_pl}";
2614
2615	$self->add (my $hb = new CFClient::UI::HBox);
2616
2617	$hb->add (my $f = new CFClient::UI::Face
2618	can_events => 0,
2619	face => $item->{face},
2620	anim => $item->{anim},
2621	animspeed => $item->{animspeed},
2622	expand => 1
2623	);
2624	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625	}
2626
2627	$self->{max_pos} = (scalar @items) - 1;
2628
2629	my $range = $self->{range};
2630	my $page = $self->{h} / 32; # waht information souce to use for face size?
2631	# it should be configurable i guess...
2632	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	$range->update;
2634	}
2635
2636	sub size_request {
2637	my ($self) = @_;
2638	(100, 200)
2639	}
2640
2641	sub set_range {
2642	my ($self, $range) = @_;
2643
2644	$self->{range} = $range;
2645	$range->connect (changed => sub { $self->update });
2646
2647	my $page = $self->{h} / 32; # waht information souce to use for face size?
2648	# it should be configurable i guess...
2649
2650	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651	$range->update;
2652
2653	$self->update;
2654	}
2655
2656	sub _draw {
2657	my ($self) = @_;
2658
2659	my ($w, $h) = ($self->{w}, $self->{h});
2660
2661	$self->{pos} = int $self->{range}{range}[0];
2662
2663	my $y = 0;
2664	my $cnt = 0;
2665	my $hrem = $self->{h}; # horiz. remaining space
2666
2667	for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668	my $chld = $self->{children}->[$i];
2669
2670	if ($hrem >= $chld->{h}) {
2671	$chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673	$chld->show;
2674	$chld->draw;
2675
2676	$hrem -= $chld->{h};
2677	$y += $chld->{h};
2678	} else {
2679	last
2680	}
2681	}
2682	}
2683
2684
2685	#############################################################################
2686
2687	package CFClient::UI;	3216	package CFClient::UI;
2688		3217
2689	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2690	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691		3220
2692	1	3221	1
2693		3222

Diff Legend

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