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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
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) = @_;
…		…
232	$self->{y} = $y;	268	$self->{y} = $y;
233	$self->update;	269	$self->update;
234	}	270	}
235		271
236	if ($self->{w} != $w || $self->{h} != $h) {	272	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	274	}
244	}	275	}
245		276
246	sub size_allocate {	277	sub size_allocate {
247	# nothing to be done	278	# nothing to be done
248	}	279	}
249		280
		281	sub reconfigure {
		282	my ($self) = @_;
		283
		284	$self->check_size (1);
		285	$self->update;
		286	}
		287
250	sub children {	288	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}	289	}
262		290
263	sub set_max_size {	291	sub set_max_size {
264	my ($self, $w, $h) = @_;	292	my ($self, $w, $h) = @_;
265		293
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	294	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	295	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}	296	}
269		297
270	# return top left coordinates	298	sub set_tooltip {
271	sub _topleft {
272	my ($self, $x, $y) = @_;	299	my ($self, $tooltip) = @_;
273		300
274	$self->{parent}	301	$self->{tooltip} = $tooltip;
275	or Carp::confess "no parent widget in _topleft\n";#d#
276		302
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		304	delete $CFClient::UI::TOOLTIP->{owner};
		305	CFClient::UI::check_tooltip;
		306	}
278	}	307	}
279		308
280	# translate global coordinates to local coordinate system	309	# translate global coordinates to local coordinate system
281	sub coord2local {	310	sub coord2local {
282	my ($self, $x, $y) = @_;	311	my ($self, $x, $y) = @_;
283		312
284	my ($X, $Y) = $self->_topleft;	313	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	314	}
287		315
288	# translate local coordinates to global coordinate system	316	# translate local coordinates to global coordinate system
289	sub coord2global {	317	sub coord2global {
290	my ($self, $x, $y) = @_;	318	my ($self, $x, $y) = @_;
291		319
292	my ($X, $Y) = $self->_topleft;	320	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	321	}
295		322
296	sub focus_in {	323	sub focus_in {
297	my ($self) = @_;	324	my ($self) = @_;
298		325
…		…
370	glVertex $self->{w}, 0;	397	glVertex $self->{w}, 0;
371	glVertex $self->{w}, $self->{h};	398	glVertex $self->{w}, $self->{h};
372	glVertex 0 , $self->{h};	399	glVertex 0 , $self->{h};
373	glEnd;	400	glEnd;
374	glPopMatrix;	401	glPopMatrix;
375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	402	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376	}	403	}
377	}	404	}
378		405
379	sub _draw {	406	sub _draw {
380	my ($self) = @_;	407	my ($self) = @_;
…		…
396		423
397	sub set_parent {	424	sub set_parent {
398	my ($self, $parent) = @_;	425	my ($self, $parent) = @_;
399		426
400	Scalar::Util::weaken ($self->{parent} = $parent);	427	Scalar::Util::weaken ($self->{parent} = $parent);
		428
		429	# TODO: req_w _does_change after ->reconfigure
		430	$self->check_size
		431	unless exists $self->{req_w};
401	}	432	}
402		433
403	sub check_size {	434	sub check_size {
404	my ($self) = @_;	435	my ($self, $forced) = @_;
405		436
406	$self->{parent}	437	$self->{force_alloc} = 1 if $forced;
407	or return 1;	438	$CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}	439	}
428		440
429	sub update {	441	sub update {
430	my ($self) = @_;	442	my ($self) = @_;
431		443
…		…
446	}	458	}
447		459
448	sub DESTROY {	460	sub DESTROY {
449	my ($self) = @_;	461	my ($self) = @_;
450		462
		463	delete $WIDGET{$self+0};
451	#$self->deactivate;	464	#$self->deactivate;
452	}	465	}
453		466
454	#############################################################################	467	#############################################################################
455		468
…		…
464	my $class = shift;	477	my $class = shift;
465		478
466	# range [value, low, high, page]	479	# range [value, low, high, page]
467		480
468	$class->SUPER::new (	481	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	482	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	483	#active_bg => [1, 1, 1, 0.5],
471	@_	484	@_
472	)	485	)
473	}	486	}
474		487
475	sub _draw {	488	sub _draw {
476	my ($self) = @_;	489	my ($self) = @_;
477		490
		491	my $color = $FOCUS == $self && $self->{active_bg}
		492	? $self->{active_bg}
		493	: $self->{bg};
		494
		495	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	496	my ($w, $h) = @$self{qw(w h)};
479		497
480	glEnable GL_BLEND;	498	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	499	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	500	glColor @$color;
483		501
484	glBegin GL_QUADS;	502	glBegin GL_QUADS;
485	glVertex 0 , 0;	503	glVertex 0 , 0;
486	glVertex 0 , $h;	504	glVertex 0 , $h;
487	glVertex $w, $h;	505	glVertex $w, $h;
488	glVertex $w, 0;	506	glVertex $w, 0;
489	glEnd;	507	glEnd;
490		508
491	glDisable GL_BLEND;	509	glDisable GL_BLEND;
		510	}
492	}	511	}
493		512
494	#############################################################################	513	#############################################################################
495		514
496	package CFClient::UI::Empty;	515	package CFClient::UI::Empty;
…		…
528		547
529	$self	548	$self
530	}	549	}
531		550
532	sub add {	551	sub add {
533	my ($self, $child) = @_;	552	my ($self, @widgets) = @_;
534		553
535	$child->set_parent ($self);	554	$_->set_parent ($self)
		555	for @widgets;
536		556
537	use sort 'stable';	557	use sort 'stable';
538		558
539	$self->{children} = [	559	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	560	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	561	@{$self->{children}}, @widgets
542	];	562	];
543		563
544	$child->check_size;	564	$self->check_size (1);
545	$self->update;	565	$self->update;
546	}	566	}
547		567
548	sub children {	568	sub children {
549	@{ $_[0]{children} }	569	@{ $_[0]{children} }
…		…
656	}	676	}
657		677
658	sub update {	678	sub update {
659	my ($self) = @_;	679	my ($self) = @_;
660		680
661	$ROOT->on_refresh ($self => sub { $self->render_child });	681	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	682	$self->SUPER::update;
663	}	683	}
664		684
665	sub size_allocate {	685	sub size_allocate {
666	my ($self, $w, $h) = @_;	686	my ($self, $w, $h) = @_;
…		…
679	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	699	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680	glClearColor 0, 0, 0, 0;	700	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	701	glClear GL_COLOR_BUFFER_BIT;
682		702
683	$self->_render;	703	$self->_render;
684	# glColorMask 1, 1, 1, 0;
685	# glEnable GL_BLEND;
686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687	# glRasterPos 0, 0;
688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
689	# glDisable GL_BLEND;
690	# glColorMask 1, 1, 1, 1;
691	};	704	};
692	}	705	}
693		706
694	sub _draw {	707	sub _draw {
695	my ($self) = @_;	708	my ($self) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	710	my ($w, $h) = ($self->w, $self->h);
698		711
699	my $tex = $self->{texture}	712	my $tex = $self->{texture}
700	or return;	713	or return;
701		714
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	717	glColor 1, 1, 1, 1;
707		718
708	$tex->draw_quad (0, 0, $w, $h);	719	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		720
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	721	glDisable GL_TEXTURE_2D;
712	}	722	}
713		723
714	#############################################################################	724	#############################################################################
715		725
…		…
737		747
738	$self->{view_x} = int $x;	748	$self->{view_x} = int $x;
739	$self->{view_y} = int $y;	749	$self->{view_y} = int $y;
740		750
741	$self->update;	751	$self->update;
		752	}
		753
		754	# hmm, this does not work for topleft of $self... but we should not ask for that
		755	sub coord2local {
		756	my ($self, $x, $y) = @_;
		757
		758	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		759	}
		760
		761	sub coord2global {
		762	my ($self, $x, $y) = @_;
		763
		764	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		765	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		766
		767	$self->SUPER::coord2global ($x, $y)
		768	}
		769
		770	sub find_widget {
		771	my ($self, $x, $y) = @_;
		772
		773	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		774	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		775	) {
		776	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		777	} else {
		778	$self->CFClient::UI::Base::find_widget ($x, $y)
		779	}
742	}	780	}
743		781
744	sub _render {	782	sub _render {
745	my ($self) = @_;	783	my ($self) = @_;
746		784
…		…
767	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768	},	806	},
769	;	807	;
770		808
771	$self = $class->SUPER::new (	809	$self = $class->SUPER::new (
772	vp => (new CFClient::UI::ViewPort),	810	vp => (new CFClient::UI::ViewPort expand => 1),
773	slider => $slider,	811	slider => $slider,
774	@_,	812	@_,
775	);	813	);
776		814
777	$self->{vp}->add ($self->{scrolled});	815	$self->{vp}->add ($self->{scrolled});
…		…
779	$self->add ($self->{slider});	817	$self->add ($self->{slider});
780		818
781	$self	819	$self
782	}	820	}
783		821
784	#TODO# update range on size_allocate depeneing on child	822	#TODO# update range on size_allocate depending on child
785	# update viewport offset on scroll	823	# update viewport offset on scroll
786		824
787	#############################################################################	825	#############################################################################
788		826
789	package CFClient::UI::Frame;	827	package CFClient::UI::Frame;
…		…
793	use CFClient::OpenGL;	831	use CFClient::OpenGL;
794		832
795	sub new {	833	sub new {
796	my $class = shift;	834	my $class = shift;
797		835
798	my $self = $class->SUPER::new (	836	$class->SUPER::new (
799	bg => [1, 1, 1, 1],	837	bg => undef,
800	border_bg => [1, 1, 1, 1],
801	border => 0.8,
802	@_	838	@_,
803	);	839	)
804
805	$self
806	}	840	}
807		841
808	sub _draw {	842	sub _draw {
809	my ($self) = @_;	843	my ($self) = @_;
810		844
811	my ($w, $h) = ($self->{w}, $self->{h});	845	if ($self->{bg}) {
		846	my ($w, $h) = @$self{qw(w h)};
812		847
813	glEnable GL_BLEND;	848	glEnable GL_BLEND;
814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	849	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815	glEnable GL_TEXTURE_2D;	850	glColor @{ $self->{bg} };
816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817		851
818	# glBegin GL_QUADS;	852	glBegin GL_QUADS;
819	# glColor 0, 0, 0, 0;
820	# glVertex 0 , 0;	853	glVertex 0 , 0;
821	# glVertex 0 , $h;	854	glVertex 0 , $h;
822	# glVertex $w, $h;	855	glVertex $w, $h;
823	# glVertex $w, 0;	856	glVertex $w, 0;
824	# glEnd;	857	glEnd;
825		858
826
827	$self->child->draw;
828	glDisable GL_BLEND;	859	glDisable GL_BLEND;
829	glDisable GL_TEXTURE_2D;	860	}
		861
		862	$self->SUPER::_draw;
830	}	863	}
831		864
832	#############################################################################	865	#############################################################################
833		866
834	package CFClient::UI::FancyFrame;	867	package CFClient::UI::FancyFrame;
…		…
848		881
849	my $self = $class->SUPER::new (	882	my $self = $class->SUPER::new (
850	bg => [1, 1, 1, 1],	883	bg => [1, 1, 1, 1],
851	border_bg => [1, 1, 1, 1],	884	border_bg => [1, 1, 1, 1],
852	border => 0.6,	885	border => 0.6,
		886	toplevel => 1,
853	can_events => 1,	887	can_events => 1,
854	@_	888	@_
855	);	889	);
856		890
857	$self->{title} &&= new CFClient::UI::Label	891	$self->{title} &&= new CFClient::UI::Label
…		…
882	my ($self, $w, $h) = @_;	916	my ($self, $w, $h) = @_;
883		917
884	$h -= List::Util::max 0, $self->border * 2;	918	$h -= List::Util::max 0, $self->border * 2;
885	$w -= List::Util::max 0, $self->border * 2;	919	$w -= List::Util::max 0, $self->border * 2;
886		920
887	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	921	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888	if $self->{title};	922	if $self->{title};
889		923
890	$self->child->configure ($self->border, $self->border, $w, $h);	924	$self->child->configure ($self->border, $self->border, $w, $h);
891	}	925	}
892		926
…		…
950	my ($self) = @_;	984	my ($self) = @_;
951		985
952	my ($w, $h ) = ($self->{w}, $self->{h});	986	my ($w, $h ) = ($self->{w}, $self->{h});
953	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	987	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954		988
955	glEnable GL_BLEND;
956	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957	glEnable GL_TEXTURE_2D;	989	glEnable GL_TEXTURE_2D;
958	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959		991
960	my $border = $self->border;	992	my $border = $self->border;
961		993
962	glColor @{ $self->{border_bg} };	994	glColor @{ $self->{border_bg} };
963	$tex[1]->draw_quad (0, 0, $w, $border);	995	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
964	$tex[3]->draw_quad (0, $border, $border, $ch);	996	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	997	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966	$tex[4]->draw_quad (0, $h - $border, $w, $border);	998	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967		999
968	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1000	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969	my $bg = $tex[0];	1001	my $bg = $tex[0];
970		1002
971	# TODO: repeat texture not scale	1003	# TODO: repeat texture not scale
…		…
975	glColor @{ $self->{bg} };	1007	glColor @{ $self->{bg} };
976		1008
977	$bg->{s} = $rep_x;	1009	$bg->{s} = $rep_x;
978	$bg->{t} = $rep_y;	1010	$bg->{t} = $rep_y;
979	$bg->{wrap_mode} = 1;	1011	$bg->{wrap_mode} = 1;
980	$bg->draw_quad ($border, $border, $cw, $ch);	1012	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1013	}
981		1014
982	glDisable GL_TEXTURE_2D;	1015	glDisable GL_TEXTURE_2D;
983	glDisable GL_BLEND;
984	}
985		1016
986	$self->{title}->draw if $self->{title};	1017	$self->{title}->draw if $self->{title};
987		1018
988	$self->child->draw;	1019	$self->child->draw;
989	}	1020	}
…		…
1216	}	1247	}
1217		1248
1218	sub size_allocate {	1249	sub size_allocate {
1219	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h) = @_;
1220		1251
		1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1253
1221	my $children = $self->{children};	1254	my $children = $self->{children};
1222		1255
1223	my @h = map $_->{req_h}, @$children;	1256	my @h = map $_->{req_h}, @$children;
1224		1257
1225	my $req_h = List::Util::sum @h;	1258	my $req_h = List::Util::sum @h;
…		…
1254		1287
1255	#############################################################################	1288	#############################################################################
1256		1289
1257	package CFClient::UI::Label;	1290	package CFClient::UI::Label;
1258		1291
1259	our @ISA = CFClient::UI::Base::;	1292	our @ISA = CFClient::UI::DrawBG::;
1260		1293
1261	use CFClient::OpenGL;	1294	use CFClient::OpenGL;
1262		1295
1263	sub new {	1296	sub new {
1264	my ($class, %arg) = @_;	1297	my ($class, %arg) = @_;
1265		1298
1266	my $self = $class->SUPER::new (	1299	my $self = $class->SUPER::new (
1267	fg => [1, 1, 1],	1300	fg => [1, 1, 1],
		1301	#bg => none
		1302	#active_bg => none
1268	#font => default_font	1303	#font => default_font
		1304	#text => initial text
		1305	#markup => initial narkup
		1306	#max_w => maximum pixel width
		1307	ellipsise => 3, # end
		1308	layout => (new CFClient::Layout),
1269	fontsize => 1,	1309	fontsize => 1,
1270	text => "",
1271	align => -1,	1310	align => -1,
1272	valign => -1,	1311	valign => -1,
1273	padding => 2,	1312	padding => 2,
1274	layout => new CFClient::Layout,
1275	can_events => 0,	1313	can_events => 0,
1276	%arg	1314	%arg
1277	);	1315	);
1278		1316
1279	if (exists $self->{template}) {	1317	if (exists $self->{template}) {
1280	my $layout = new CFClient::Layout;	1318	my $layout = new CFClient::Layout;
1281	$layout->set_text (delete $self->{template});	1319	$layout->set_text (delete $self->{template});
1282	$self->{template} = $layout;	1320	$self->{template} = $layout;
1283	}	1321	}
1284		1322
1285	$self->set_text (delete $self->{text}) if exists $self->{text};	1323	if (exists $self->{markup}) {
1286	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1324	$self->set_markup (delete $self->{markup});
		1325	} else {
		1326	$self->set_text (delete $self->{text});
		1327	}
1287		1328
1288	$self	1329	$self
1289	}	1330	}
1290		1331
1291	sub escape {	1332	sub escape($) {
1292	local $_ = $_[1];	1333	local $_ = $_[0];
1293		1334
1294	s/&/&amp;/g;	1335	s/&/&amp;/g;
1295	s/>/&gt;/g;	1336	s/>/&gt;/g;
1296	s/</&lt;/g;	1337	s/</&lt;/g;
1297		1338
1298	$_[1]	1339	$_
1299	}	1340	}
1300		1341
1301	sub update {	1342	sub update {
1302	my ($self) = @_;	1343	my ($self) = @_;
1303		1344
1304	delete $self->{texture};	1345	delete $self->{texture};
1305	$self->SUPER::update;	1346	$self->SUPER::update;
1306	}	1347	}
1307		1348
1308	sub reconfigure {
1309	my ($self) = @_;
1310
1311	delete $self->{texture};
1312	}
1313
1314	sub set_text {	1349	sub set_text {
1315	my ($self, $text) = @_;	1350	my ($self, $text) = @_;
1316		1351
1317	return if $self->{text} eq "T$text";	1352	return if $self->{text} eq "T$text";
1318	$self->{text} = "T$text";	1353	$self->{text} = "T$text";
1319		1354
		1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320	$self->{layout}->set_text ($text);	1356	$self->{layout}->set_text ($text);
1321		1357
1322	delete $self->{texture};
1323	$self->update;	1358	$self->update;
1324	$self->check_size;	1359	$self->check_size;
1325	}	1360	}
1326		1361
1327	sub set_markup {	1362	sub set_markup {
1328	my ($self, $markup) = @_;	1363	my ($self, $markup) = @_;
1329		1364
1330	return if $self->{text} eq "M$markup";	1365	return if $self->{text} eq "M$markup";
1331	$self->{text} = "M$markup";	1366	$self->{text} = "M$markup";
1332		1367
		1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1369
		1370	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333	$self->{layout}->set_markup ($markup);	1371	$self->{layout}->set_markup ($markup);
1334		1372
1335	delete $self->{texture};
1336	$self->update;	1373	$self->update;
1337	$self->check_size;	1374	$self->check_size;
1338	}	1375	}
1339		1376
1340	sub size_request {	1377	sub size_request {
1341	my ($self) = @_;	1378	my ($self) = @_;
1342		1379
1343	$self->{layout}->set_font ($self->{font}) if $self->{font};	1380	$self->{layout}->set_font ($self->{font}) if $self->{font};
1344	$self->{layout}->set_width ($self->{max_w} || -1);	1381	$self->{layout}->set_width ($self->{max_w} || -1);
		1382	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1383	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346		1385
1347	my ($w, $h) = $self->{layout}->size;	1386	my ($w, $h) = $self->{layout}->size;
1348		1387
1349	if (exists $self->{template}) {	1388	if (exists $self->{template}) {
…		…
1371	sub set_fontsize {	1410	sub set_fontsize {
1372	my ($self, $fontsize) = @_;	1411	my ($self, $fontsize) = @_;
1373		1412
1374	$self->{fontsize} = $fontsize;	1413	$self->{fontsize} = $fontsize;
1375	delete $self->{texture};	1414	delete $self->{texture};
		1415
		1416	$self->update;
1376	$self->check_size;	1417	$self->check_size;
1377	$self->update;
1378	}	1418	}
1379		1419
1380	sub _draw {	1420	sub _draw {
1381	my ($self) = @_;	1421	my ($self) = @_;
1382		1422
		1423	$self->SUPER::_draw; # draw background, if applicable
		1424
1383	my $tex = $self->{texture} ||= do {	1425	my $tex = $self->{texture} ||= do {
		1426	$self->{layout}->set_foreground (@{$self->{fg}});
1384	$self->{layout}->set_font ($self->{font}) if $self->{font};	1427	$self->{layout}->set_font ($self->{font}) if $self->{font};
1385	$self->{layout}->set_width ($self->{w});	1428	$self->{layout}->set_width ($self->{w});
		1429	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1430	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1431	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1432
1387	new_from_layout CFClient::Texture $self->{layout}	1433	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1434
		1435	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1436	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1437	: ($self->{w} - $tex->{w}) * 0.5);
		1438
		1439	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1440	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1441	: ($self->{h} - $tex->{h}) * 0.5);
		1442
		1443	$tex
1388	};	1444	};
1389		1445
1390	glEnable GL_BLEND;
1391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392	glEnable GL_TEXTURE_2D;	1446	glEnable GL_TEXTURE_2D;
1393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394		1448
		1449	if ($tex->{format} == GL_ALPHA) {
1395	glColor @{$self->{fg}};	1450	glColor @{$self->{fg}};
1396
1397	$self->{ox} = int (
1398	$self->{align} < 0 ? $self->{padding}
1399	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400	: ($self->{w} - $tex->{w}) * 0.5
1401	);
1402
1403	$self->{oy} = int (
1404	$self->{valign} < 0 ? $self->{padding}
1405	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406	: ($self->{h} - $tex->{h}) * 0.5
1407	);
1408
1409	$tex->draw_quad ($self->{ox}, $self->{oy});	1451	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1452	} else {
		1453	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1454	}
1410		1455
1411	glDisable GL_TEXTURE_2D;	1456	glDisable GL_TEXTURE_2D;
1412	glDisable GL_BLEND;
1413	}	1457	}
1414		1458
1415	#############################################################################	1459	#############################################################################
1416		1460
1417	package CFClient::UI::EntryBase;	1461	package CFClient::UI::EntryBase;
…		…
1452	$self->{layout}->set_text ("$text ");	1496	$self->{layout}->set_text ("$text ");
1453		1497
1454	$self->emit (changed => $self->{text});	1498	$self->emit (changed => $self->{text});
1455	}	1499	}
1456		1500
1457	sub get_text {
1458	$_[0]{text}
1459	}
1460
1461	sub size_request {
1462	my ($self) = @_;
1463
1464	my ($w, $h) = $self->SUPER::size_request;
1465
1466	($w + 1, $h) # add 1 for cursor
1467	}
1468
1469	sub size_allocate {
1470	my ($self, $w, $h) = @_;
1471
1472	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}
1474
1475	sub set_text {	1501	sub set_text {
1476	my ($self, $text) = @_;	1502	my ($self, $text) = @_;
1477		1503
1478	$self->{cursor} = length $text;	1504	$self->{cursor} = length $text;
1479	$self->_set_text ($text);	1505	$self->_set_text ($text);
1480	$self->update;	1506	$self->update;
		1507	$self->check_size;
		1508	}
		1509
		1510	sub get_text {
		1511	$_[0]{text}
		1512	}
		1513
		1514	sub size_request {
		1515	my ($self) = @_;
		1516
		1517	my ($w, $h) = $self->SUPER::size_request;
		1518
		1519	($w + 1, $h) # add 1 for cursor
		1520	}
		1521
		1522	sub size_allocate {
		1523	my ($self, $w, $h) = @_;
		1524
		1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1481	}	1526	}
1482		1527
1483	sub key_down {	1528	sub key_down {
1484	my ($self, $ev) = @_;	1529	my ($self, $ev) = @_;
1485		1530
…		…
1487	my $sym = $ev->{sym};	1532	my $sym = $ev->{sym};
1488	my $uni = $ev->{unicode};	1533	my $uni = $ev->{unicode};
1489		1534
1490	my $text = $self->get_text;	1535	my $text = $self->get_text;
1491		1536
1492	if ($sym == 8) {	1537	if ($uni == 8) {
1493	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1538	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494	} elsif ($sym == 127) {	1539	} elsif ($uni == 127) {
1495	substr $text, $self->{cursor}, 1, "";	1540	substr $text, $self->{cursor}, 1, "";
1496	} elsif ($sym == CFClient::SDLK_LEFT) {	1541	} elsif ($sym == CFClient::SDLK_LEFT) {
1497	--$self->{cursor} if $self->{cursor};	1542	--$self->{cursor} if $self->{cursor};
1498	} elsif ($sym == CFClient::SDLK_RIGHT) {	1543	} elsif ($sym == CFClient::SDLK_RIGHT) {
1499	++$self->{cursor} if $self->{cursor} < length $self->{text};	1544	++$self->{cursor} if $self->{cursor} < length $self->{text};
1500	} elsif ($sym == CFClient::SDLK_HOME) {	1545	} elsif ($sym == CFClient::SDLK_HOME) {
1501	$self->{cursor} = 0;	1546	$self->{cursor} = 0;
1502	} elsif ($sym == CFClient::SDLK_END) {	1547	} elsif ($sym == CFClient::SDLK_END) {
1503	$self->{cursor} = length $text;	1548	$self->{cursor} = length $text;
1504	} elsif ($sym == 27) {	1549	} elsif ($uni == 27) {
1505	$self->emit ('escape');	1550	$self->emit ('escape');
1506	} elsif ($uni) {	1551	} elsif ($uni) {
1507	substr $text, $self->{cursor}++, 0, chr $uni;	1552	substr $text, $self->{cursor}++, 0, chr $uni;
1508	}	1553	}
1509		1554
1510	$self->_set_text ($text);	1555	$self->_set_text ($text);
1511	$self->update;	1556	$self->update;
		1557	$self->check_size;
1512	}	1558	}
1513		1559
1514	sub focus_in {	1560	sub focus_in {
1515	my ($self) = @_;	1561	my ($self) = @_;
1516		1562
…		…
1645	my $class = shift;	1691	my $class = shift;
1646		1692
1647	$class->SUPER::new (	1693	$class->SUPER::new (
1648	padding => 4,	1694	padding => 4,
1649	fg => [1, 1, 1],	1695	fg => [1, 1, 1],
1650	bg => [1, 1, 1, 0.2],
1651	active_fg => [0, 0, 1],	1696	active_fg => [0, 0, 1],
1652	can_hover => 1,	1697	can_hover => 1,
1653	align => 0,	1698	align => 0,
1654	valign => 0,	1699	valign => 0,
1655	can_events => 1,	1700	can_events => 1,
…		…
1673		1718
1674	if ($GRAB == $self) {	1719	if ($GRAB == $self) {
1675	$self->{fg} = $self->{active_fg};	1720	$self->{fg} = $self->{active_fg};
1676	}	1721	}
1677		1722
1678	glEnable GL_BLEND;
1679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680	glEnable GL_TEXTURE_2D;	1723	glEnable GL_TEXTURE_2D;
1681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682	glColor 0, 0, 0, 1;	1725	glColor 0, 0, 0, 1;
1683		1726
1684	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1727	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685		1728
1686	glDisable GL_TEXTURE_2D;	1729	glDisable GL_TEXTURE_2D;
1687	glDisable GL_BLEND;
1688		1730
1689	$self->SUPER::_draw;	1731	$self->SUPER::_draw;
1690	}	1732	}
1691		1733
1692	#############################################################################	1734	#############################################################################
…		…
1706		1748
1707	$class->SUPER::new (	1749	$class->SUPER::new (
1708	padding => 2,	1750	padding => 2,
1709	fg => [1, 1, 1],	1751	fg => [1, 1, 1],
1710	active_fg => [1, 1, 0],	1752	active_fg => [1, 1, 0],
		1753	bg => [0, 0, 0, 0.2],
		1754	active_bg => [1, 1, 1, 0.5],
1711	state => 0,	1755	state => 0,
1712	can_hover => 1,	1756	can_hover => 1,
1713	@_	1757	@_
1714	)	1758	)
1715	}	1759	}
…		…
1739		1783
1740	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1784	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741		1785
1742	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1786	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743		1787
1744	glEnable GL_BLEND;	1788	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1789
1745	glEnable GL_TEXTURE_2D;	1790	glEnable GL_TEXTURE_2D;
1746	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748	my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750	$tex->draw_quad (0, 0, $s, $s);	1791	$tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752	glDisable GL_TEXTURE_2D;	1792	glDisable GL_TEXTURE_2D;
1753	glDisable GL_BLEND;
1754	}	1793	}
1755		1794
1756	#############################################################################	1795	#############################################################################
1757		1796
1758	package CFClient::UI::Image;	1797	package CFClient::UI::Image;
…		…
1801	glTranslate 0, -$self->{w}, 0;	1840	glTranslate 0, -$self->{w}, 0;
1802		1841
1803	($w, $h) = ($h, $w);	1842	($w, $h) = ($h, $w);
1804	}	1843	}
1805		1844
1806	glEnable GL_BLEND;
1807	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808	glEnable GL_TEXTURE_2D;	1845	glEnable GL_TEXTURE_2D;
1809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1846	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810		1847
1811	$tex->draw_quad (0, 0, $w, $h);	1848	$tex->draw_quad_alpha (0, 0, $w, $h);
1812		1849
1813	glDisable GL_BLEND;
1814	glDisable GL_TEXTURE_2D;	1850	glDisable GL_TEXTURE_2D;
1815	}	1851	}
1816		1852
1817	#############################################################################	1853	#############################################################################
1818		1854
…		…
2007	qw(s1_slider.png s1_slider_bg.png);	2043	qw(s1_slider.png s1_slider_bg.png);
2008		2044
2009	sub new {	2045	sub new {
2010	my $class = shift;	2046	my $class = shift;
2011		2047
2012	# range [value, low, high, page]	2048	# range [value, low, high, page, unit]
2013		2049
2014	# TODO: 0-width page	2050	# TODO: 0-width page
2015	# TODO: req_w/h are wrong with vertical	2051	# TODO: req_w/h are wrong with vertical
2016	# TODO: calculations are off	2052	# TODO: calculations are off
2017	my $self = $class->SUPER::new (	2053	my $self = $class->SUPER::new (
2018	fg => [1, 1, 1],	2054	fg => [1, 1, 1],
2019	active_fg => [0, 0, 0],	2055	active_fg => [0, 0, 0],
		2056	bg => [0, 0, 0, 0.2],
		2057	active_bg => [1, 1, 1, 0.5],
2020	range => [0, 0, 100, 10],	2058	range => [0, 0, 100, 10],
2021	req_w => $::WIDTH / 80,	2059	req_w => $::WIDTH / 80,
2022	req_h => $::WIDTH / 80,	2060	req_h => $::WIDTH / 80,
2023	vertical => 0,	2061	vertical => 0,
2024	can_hover => 1,	2062	can_hover => 1,
2025	inner_pad => 5,	2063	inner_pad => 0.02,
2026	@_	2064	@_
2027	);	2065	);
2028		2066
		2067	$self->set_value ($self->{range}[0]);
		2068	$self->update;
		2069
2029	$self	2070	$self
		2071	}
		2072
		2073	sub set_value {
		2074	my ($self, $value) = @_;
		2075
		2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2077
		2078	$hi = $lo + 1 if $hi <= $lo;
		2079
		2080	$value = $lo if $value < $lo;
		2081	$value = $hi if $value > $hi;
		2082
		2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2084	if $unit;
		2085
		2086	$page = $hi - $lo if $page > $hi - $lo;
		2087
		2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2089
		2090	if ($value != $old_value) {
		2091	$self->emit (changed => $value);
		2092	$self->update;
		2093	}
2030	}	2094	}
2031		2095
2032	sub size_request {	2096	sub size_request {
2033	my ($self) = @_;	2097	my ($self) = @_;
2034		2098
…		…
2047		2111
2048	sub mouse_motion {	2112	sub mouse_motion {
2049	my ($self, $ev, $x, $y) = @_;	2113	my ($self, $ev, $x, $y) = @_;
2050		2114
2051	if ($GRAB == $self) {	2115	if ($GRAB == $self) {
		2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2117
		2118	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2119
		2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2121
		2122	$self->set_value ($x * ($hi - $lo) + $lo);
		2123	}
		2124	}
		2125
		2126	sub update {
		2127	my ($self) = @_;
		2128
		2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2130	$self->set_value ($self->{range}[0]);
		2131
2052	my ($value, $lo, $hi, $page) = @{$self->{range}};	2132	my ($value, $lo, $hi, $page) = @{$self->{range}};
2053		2133
2054	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2134	my $inner_w = 1 - 2 * $self->{inner_pad};
2055		2135
2056	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2136	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2057	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2058		2137
2059	$x -= $inner_pad_px; # substract the padding	2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2060	$x = $x * ($hi - $lo) / $inner_w + $lo;	2139	$value = $self->{scale} * ($value - $lo);
2061	$x = $lo if $x < $lo;
2062	$x = $hi - $page if $x > $hi - $page;
2063	$self->{range}[0] = $x;
2064		2140
2065	$self->emit (changed => $x);	2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
2066	$self->update;	2142
		2143	$value = 0 if $value < 0;
		2144	$page = 1 - $value if $value + $page > 1;
		2145
		2146	$self->{knob_x} = $value;
		2147	$self->{knob_w} = $page;
2067	}	2148	});
2068	}
2069		2149
2070	# the inner_* stuff is for generating a padding for the slider handle,	2150	$self->SUPER::update;
2071	# so that the handle doesn't leave the texture. This calculation isn't 100%
2072	# correct propably, but it does the job for now
2073	sub _calc_inner_pad_px {
2074	my ($self, $w) = @_;
2075	($w / 100) * $self->{inner_pad} # % to pixels
2076	}	2151	}
2077		2152
2078	sub _draw {	2153	sub _draw {
2079	my ($self) = @_;	2154	my ($self) = @_;
2080		2155
2081	$self->SUPER::_draw ();	2156	$self->SUPER::_draw ();
2082		2157
2083	my ($w, $h) = @$self{qw(w h)};	2158	glScale $self->{w}, $self->{h};
2084		2159
2085	if ($self->{vertical}) {	2160	if ($self->{vertical}) {
2086	# draw a vertical slider like a rotated horizontal slider	2161	# draw a vertical slider like a rotated horizontal slider
2087		2162
		2163	glTranslate 1, 0, 0;
2088	glRotate 90, 0, 0, 1;	2164	glRotate 90, 0, 0, 1;
2089	glTranslate 0, -$self->{w}, 0;
2090
2091	($w, $h) = ($h, $w);
2092	}	2165	}
2093		2166
2094	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2167	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2168	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096		2169
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099	$hi = $value + 1 if $lo == $hi;
2100
2101	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104	$page = int $page * $inner_w / ($hi - $lo);
2105	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107	$w -= $page;
2108	$page &= ~1;
2109	glTranslate $page * 0.5, 0, 0;
2110	$page ||= 2;
2111
2112	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115	glEnable GL_BLEND;
2116	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117	glEnable GL_TEXTURE_2D;	2170	glEnable GL_TEXTURE_2D;
2118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2171	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119		2172
2120	# draw background	2173	# draw background
2121	$tex[1]->draw_quad (0, 0, $w, $h);	2174	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122		2175
2123	# draw handle	2176	# draw handle
2124	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2177	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125		2178
2126	glDisable GL_BLEND;
2127	glDisable GL_TEXTURE_2D;	2179	glDisable GL_TEXTURE_2D;
2128	}	2180	}
2129		2181
2130	#############################################################################	2182	#############################################################################
2131		2183
…		…
2142	fontsize => 1,	2194	fontsize => 1,
2143	can_events => 0,	2195	can_events => 0,
2144	#font => default_font	2196	#font => default_font
2145	@_,	2197	@_,
2146		2198
2147	layout => (new CFClient::Layout),	2199	layout => (new CFClient::Layout 1),
2148	par => [],	2200	par => [],
2149	height => 0,	2201	height => 0,
2150	children => [	2202	children => [
2151	(new CFClient::UI::Empty expand => 1),	2203	(new CFClient::UI::Empty expand => 1),
2152	(new CFClient::UI::Slider vertical => 1),	2204	(new CFClient::UI::Slider vertical => 1),
…		…
2163		2215
2164	$self->{fontsize} = $fontsize;	2216	$self->{fontsize} = $fontsize;
2165	$self->reflow;	2217	$self->reflow;
2166	}	2218	}
2167		2219
2168	sub text_height {
2169	my ($self, $text) = @_;
2170
2171	my $layout = $self->{layout};
2172
2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174	$layout->set_width ($self->{children}[0]{w});
2175	$layout->set_text ($text);
2176
2177	($layout->size)[1]
2178	}
2179
2180	sub reflow {
2181	my ($self) = @_;
2182
2183	$self->{need_reflow}++;
2184	$self->update;
2185	}
2186
2187	sub size_allocate {	2220	sub size_allocate {
2188	my ($self, $w, $h) = @_;	2221	my ($self, $w, $h) = @_;
2189		2222
2190	$self->SUPER::size_allocate ($w, $h);	2223	$self->SUPER::size_allocate ($w, $h);
2191		2224
…		…
2194	$self->{layout}->set_width ($self->{children}[0]{w});	2227	$self->{layout}->set_width ($self->{children}[0]{w});
2195		2228
2196	$self->reflow;	2229	$self->reflow;
2197	}	2230	}
2198		2231
		2232	sub text_height {
		2233	my ($self, $text, $indent) = @_;
		2234
		2235	my $layout = $self->{layout};
		2236
		2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2238	$layout->set_width ($self->{children}[0]{w} - $indent);
		2239	$layout->set_markup ($text);
		2240
		2241	($layout->size)[1]
		2242	}
		2243
		2244	sub reflow {
		2245	my ($self) = @_;
		2246
		2247	$self->{need_reflow}++;
		2248	$self->update;
		2249	}
		2250
2199	sub add_paragraph {	2251	sub add_paragraph {
2200	my ($self, $color, $text) = @_;	2252	my ($self, $color, $text, $indent) = @_;
2201		2253
2202	#TODO: intelligently "reformat" paragraph	2254	#TODO: intelligently "reformat" paragraph
2203		2255
		2256	for my $line (split /\n/, $text) {
2204	my $height = $self->text_height ($text);	2257	my $height = $self->text_height ($line);
2205
2206	$self->{height} += $height;	2258	$self->{height} += $height;
2207
2208	push @{$self->{par}}, [$height, $color, $text];	2259	push @{$self->{par}}, [$height, $color, $indent, $line];
		2260	}
2209		2261
2210	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2211	$self->{children}[1]->update;	2263	$self->{children}[1]->update;
2212	}	2264	}
2213		2265
…		…
2218		2270
2219	return unless $self->{h} > 0;	2271	return unless $self->{h} > 0;
2220		2272
2221	delete $self->{texture};	2273	delete $self->{texture};
2222		2274
2223	$ROOT->on_refresh ($self, sub {	2275	$ROOT->on_post_alloc ($self, sub {
2224	if (delete $self->{need_reflow}) {	2276	if (delete $self->{need_reflow}) {
2225	my $height = 0;	2277	my $height = 0;
2226		2278
2227	$height += $_->[0] = $self->text_height ($_->[2])	2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2228	for @{$self->{par}};	2280	for @{$self->{par}};
2229		2281
2230	$self->{height} = $height;	2282	$self->{height} = $height;
2231		2283
2232	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2285	$self->{children}[1]->update;
2233		2286
2234	delete $self->{texture};	2287	delete $self->{texture};
2235	}	2288	}
2236		2289
2237	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2290	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238	glClearColor 0, 0, 0, 0;	2291	glClearColor 0.5, 0.5, 0.5, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2292	glClear GL_COLOR_BUFFER_BIT;
2240
2241	glEnable GL_BLEND;
2242	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245		2293
2246	my $top = int $self->{children}[1]{range}[0];	2294	my $top = int $self->{children}[1]{range}[0];
2247		2295
2248	my $y0 = $top;	2296	my $y0 = $top;
2249	my $y1 = $top + $self->{h};	2297	my $y1 = $top + $self->{h};
…		…
2252		2300
2253	my $layout = $self->{layout};	2301	my $layout = $self->{layout};
2254		2302
2255	$layout->set_font ($self->{font}) if $self->{font};	2303	$layout->set_font ($self->{font}) if $self->{font};
2256		2304
		2305	glEnable GL_BLEND;
		2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2307
2257	for my $par (@{$self->{par}}) {	2308	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2309	my $h = $par->[0];
2259		2310
2260	if ($y0 < $y + $h && $y < $y1) {	2311	if ($y0 < $y + $h && $y < $y1) {
		2312	$layout->set_foreground (@{ $par->[1] });
		2313	$layout->set_width ($self->{w} - $par->[2]);
2261	$layout->set_text ($par->[2]);	2314	$layout->set_markup ($par->[3]);
2262		2315
2263	glColor @{ $par->[1] };	2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	my ($W, $H) = $layout->size;	2317
2265	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2318	glRasterPos $par->[2], $y - $y0;
		2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266	}	2320	}
2267		2321
2268	$y += $h;	2322	$y += $h;
2269	}	2323	}
2270		2324
2271	glDisable GL_TEXTURE_2D;
2272	glDisable GL_BLEND;	2325	glDisable GL_BLEND;
2273	};	2326	};
2274	});	2327	});
2275	}	2328	}
2276		2329
2277	sub _draw {	2330	sub _draw {
2278	my ($self) = @_;	2331	my ($self) = @_;
2279		2332
2280	glEnable GL_BLEND;
2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282	glEnable GL_TEXTURE_2D;	2333	glEnable GL_TEXTURE_2D;
2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284	glColor 1, 1, 1, 1;	2335	glColor 1, 1, 1, 1;
2285	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2336	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286	glDisable GL_TEXTURE_2D;	2337	glDisable GL_TEXTURE_2D;
2287	glDisable GL_BLEND;
2288		2338
2289	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
2290		2340
2291	}	2341	}
2292		2342
…		…
2386	@_,	2436	@_,
2387	can_events => 0,	2437	can_events => 0,
2388	)	2438	)
2389	}	2439	}
2390		2440
2391	sub set_markup {	2441	sub set_tooltip_from {
2392	my ($self, $text) = @_;	2442	my ($self, $widget) = @_;
2393		2443
2394	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2444	$self->add (new CFClient::UI::Label
2395	$self->{label}->set_markup ($text);	2445	markup => $widget->{tooltip},
2396	$self->add ($self->{label});	2446	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2447	fontsize => 0.8,
		2448	fg => [0, 0, 0, 1],
		2449	ellipsise => 0,
		2450	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2451	);
2397	}	2452	}
2398		2453
2399	sub size_request {	2454	sub size_request {
2400	my ($self) = @_;	2455	my ($self) = @_;
2401
2402	$self->child->set_max_size ($::WIDTH * 0.3);
2403		2456
2404	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2457	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405		2458
2406	($w + 4, $h + 4)	2459	($w + 4, $h + 4)
2407	}	2460	}
…		…
2413	}	2466	}
2414		2467
2415	sub _draw {	2468	sub _draw {
2416	my ($self) = @_;	2469	my ($self) = @_;
2417		2470
2418	glPushMatrix;
2419	glTranslate 0.375, 0.375;	2471	glTranslate 0.375, 0.375;
2420		2472
2421	my ($w, $h) = @$self{qw(w h)};	2473	my ($w, $h) = @$self{qw(w h)};
2422		2474
2423	glColor 1, 0.8, 0.4;	2475	glColor 1, 0.8, 0.4;
…		…
2434	glVertex 0 , $h;	2486	glVertex 0 , $h;
2435	glVertex $w, $h;	2487	glVertex $w, $h;
2436	glVertex $w, 0;	2488	glVertex $w, 0;
2437	glEnd;	2489	glEnd;
2438		2490
2439	glPopMatrix;	2491	glTranslate 2 - 0.375, 2 - 0.375;
2440
2441	glTranslate 2, 2;
2442	$self->SUPER::_draw;	2492	$self->SUPER::_draw;
2443	}	2493	}
2444		2494
2445	#############################################################################	2495	#############################################################################
2446		2496
…		…
2451	use CFClient::OpenGL;	2501	use CFClient::OpenGL;
2452		2502
2453	sub new {	2503	sub new {
2454	my $class = shift;	2504	my $class = shift;
2455		2505
2456	$class->SUPER::new (	2506	my $self = $class->SUPER::new (
2457	aspect => 1,	2507	aspect => 1,
2458	@_,	2508	@_,
2459	)	2509	);
		2510
		2511	if ($self->{anim} && $self->{animspeed}) {
		2512	Scalar::Util::weaken (my $widget = $self);
		2513
		2514	$self->{timer} = Event->timer (
		2515	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2516	hard => 1,
		2517	interval => $self->{animspeed},
		2518	cb => sub {
		2519	++$widget->{frame};
		2520	$widget->update;
		2521	},
		2522	);
		2523	}
		2524
		2525	$self
2460	}	2526	}
2461		2527
2462	sub size_request {	2528	sub size_request {
2463	(32, 8)	2529	(32, 8)
2464	}	2530	}
2465		2531
2466	sub _draw {	2532	sub _draw {
2467	my ($self) = @_;	2533	my ($self) = @_;
2468		2534
		2535	return unless $::CONN;#d# manage and cache textures differently
		2536
		2537	my $face;
		2538
		2539	if ($self->{frame}) {
		2540	my $anim = $::CONN->{anim}[$self->{anim}];
		2541
		2542	$face = $anim->[ $self->{frame} % @$anim ]
		2543	if $anim && @$anim;
		2544	}
		2545
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2546	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2547
2471	# TODO animation
2472	if ($tex) {	2548	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2549	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2550	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2551	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2552	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2554	}
		2555	}
		2556
		2557	sub DESTROY {
		2558	my ($self) = @_;
		2559
		2560	$self->{timer}->cancel
		2561	if $self->{timer};
		2562
		2563	$self->SUPER::DESTROY;
		2564	}
		2565
		2566	#############################################################################
		2567
		2568	package CFClient::UI::InventoryItem;
		2569
		2570	our @ISA = CFClient::UI::HBox::;
		2571
		2572	sub _item_to_desc {
		2573	my ($item) = @_;
		2574
		2575	my $desc =
		2576	$item->{nrof} < 2
		2577	? $item->{name}
		2578	: "$item->{nrof} × $item->{name_pl}";
		2579
		2580	$item->{flags} & Crossfire::Protocol::F_OPEN
		2581	and $desc .= " (open)";
		2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2583	and $desc .= " (applied)";
		2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2585	and $desc .= " (unpaid)";
		2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2587	and $desc .= " (magic)";
		2588	$item->{flags} & Crossfire::Protocol::F_CURSED
		2589	and $desc .= " (cursed)";
		2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2591	and $desc .= " (damned)";
		2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2593	and $desc .= " *";
		2594
		2595	$desc
		2596	}
		2597
		2598	sub new {
		2599	my $class = shift;
		2600
		2601	my %args = @_;
		2602
		2603	my $item = delete $args{item};
		2604
		2605	my $desc = _item_to_desc ($item);
		2606
		2607	my $self = $class->SUPER::new (
		2608	can_hover => 1,
		2609	can_events => 1,
		2610	tooltip => ((CFClient::UI::Label::escape $desc)
		2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2612	connect_button_down => sub {
		2613	my ($self, $ev, $x, $y) = @_;
		2614
		2615	# todo: maybe put examine on 1? but should just be a tooltip :(
		2616	if ($ev->{button} == 1) {
		2617	my $targ = $::CONN->{player}{tag};
		2618
		2619	if ($item->{container} == $::CONN->{player}{tag}) {
		2620	$targ = $main::OPENCONT;
		2621	}
		2622
		2623	$::CONN->send ("move $targ $item->{tag} 0");
		2624	} elsif ($ev->{button} == 2) {
		2625	$::CONN->send ("apply $item->{tag}");
		2626	} elsif ($ev->{button} == 3) {
		2627	my @menu_items = (
		2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2631	(
		2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2633	? (
		2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2635	)
		2636	: (
		2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2639	)
		2640	),
		2641	);
		2642
		2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2644	}
		2645
		2646	1
		2647	},
		2648	%args
		2649	);
		2650
		2651
		2652	$self->add (new CFClient::UI::Face
		2653	can_events => 0,
		2654	face => $item->{face},
		2655	anim => $item->{anim},
		2656	animspeed => $item->{animspeed},
		2657	);
		2658
		2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2660
		2661	$self->{item} = $item;
		2662
		2663	$self->update_item;
		2664
		2665	$self
		2666	}
		2667
		2668	sub update_item {
		2669	my ($self) = @_;
		2670
		2671	my $desc = _item_to_desc ($self->{item});
		2672
		2673	$self->{name_lbl}->set_text ($desc);
		2674	}
		2675
		2676	#############################################################################
		2677
		2678	package CFClient::UI::Inventory;
		2679
		2680	our @ISA = CFClient::UI::ScrolledWindow::;
		2681
		2682	sub new {
		2683	my $class = shift;
		2684
		2685	my $self = $class->SUPER::new (
		2686	scrolled => (new CFClient::UI::VBox),
		2687	@_,
		2688	);
		2689
		2690	$self
		2691	}
		2692
		2693	sub set_items {
		2694	my ($self, $items) = @_;
		2695
		2696	$self->{scrolled}->clear;
		2697	return unless $items;
		2698
		2699	my @items = sort {
		2700	($a->{type} <=> $b->{type})
		2701	or ($a->{name} cmp $b->{name})
		2702	} @$items;
		2703
		2704	$self->{real_items} = \@items;
		2705
		2706	for my $item (@items) {
		2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2708	$item->update_item ();
		2709	}
		2710
		2711	$self->{scrolled}->add (@items);
		2712
		2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2714	}
		2715
		2716	sub size_request {
		2717	my ($self) = @_;
		2718	($self->{req_w}, $self->{req_h});
2482	}	2719	}
2483		2720
2484	#############################################################################	2721	#############################################################################
2485		2722
2486	package CFClient::UI::Menu;	2723	package CFClient::UI::Menu;
…		…
2553	}	2790	}
2554	}	2791	}
2555		2792
2556	#############################################################################	2793	#############################################################################
2557		2794
		2795	package CFClient::UI::Statusbox;
		2796
		2797	our @ISA = CFClient::UI::VBox::;
		2798
		2799	sub new {
		2800	my $class = shift;
		2801
		2802	$class->SUPER::new (
		2803	fontsize => 0.8,
		2804	@_,
		2805	)
		2806	}
		2807
		2808	sub reorder {
		2809	my ($self) = @_;
		2810	my $NOW = time;
		2811
		2812	while (my ($k, $v) = each %{ $self->{item} }) {
		2813	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2814	}
		2815
		2816	my @widgets;
		2817
		2818	my @items = sort {
		2819	$a->{pri} <=> $b->{pri}
		2820	or $b->{id} <=> $a->{id}
		2821	} values %{ $self->{item} };
		2822
		2823	my $count = 10 + 1;
		2824	for my $item (@items) {
		2825	last unless --$count;
		2826
		2827	push @widgets, $item->{label} ||= do {
		2828	# TODO: doesn't handle markup well (read as: at all)
		2829	my $short = $item->{count} > 1
		2830	? "<b>$item->{count} ×</b> $item->{text}"
		2831	: $item->{text};
		2832
		2833	for ($short) {
		2834	s/^\s+//;
		2835	s/\s+/ /g;
		2836	}
		2837
		2838	new CFClient::UI::Label
		2839	markup => $short,
		2840	tooltip => $item->{tooltip},
		2841	tooltip_font => $::FONT_PROP,
		2842	tooltip_width => 0.67,
		2843	fontsize => $item->{fontsize} || $self->{fontsize},
		2844	max_w => $::WIDTH * 0.44,
		2845	fg => $item->{fg},
		2846	can_events => 1,
		2847	can_hover => 1
		2848	};
		2849	}
		2850
		2851	$self->clear;
		2852	$self->SUPER::add (reverse @widgets);
		2853	}
		2854
		2855	sub add {
		2856	my ($self, $text, %arg) = @_;
		2857
		2858	$text =~ s/^\s+//;
		2859	$text =~ s/\s+$//;
		2860
		2861	my $timeout = time + ((delete $arg{timeout}) || 60);
		2862
		2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2864
		2865	if (my $item = $self->{item}{$group}) {
		2866	if ($item->{text} eq $text) {
		2867	$item->{count}++;
		2868	} else {
		2869	$item->{count} = 1;
		2870	$item->{text} = $item->{tooltip} = $text;
		2871	}
		2872	$item->{id} = ++$self->{id};
		2873	$item->{timeout} = $timeout;
		2874	delete $item->{label};
		2875	} else {
		2876	$self->{item}{$group} = {
		2877	id => ++$self->{id},
		2878	text => $text,
		2879	timeout => $timeout,
		2880	tooltip => $text,
		2881	fg => [0.8, 0.8, 0.8, 0.8],
		2882	pri => 0,
		2883	count => 1,
		2884	%arg,
		2885	};
		2886	}
		2887
		2888	$self->reorder;
		2889	}
		2890
		2891	sub reconfigure {
		2892	my ($self) = @_;
		2893
		2894	delete $_->{label}
		2895	for values %{ $self->{item} || {} };
		2896
		2897	$self->reorder;
		2898	$self->SUPER::reconfigure;
		2899	}
		2900
		2901	#############################################################################
		2902
2558	package CFClient::UI::Root;	2903	package CFClient::UI::Root;
2559		2904
2560	our @ISA = CFClient::UI::Container::;	2905	our @ISA = CFClient::UI::Container::;
2561		2906
2562	use CFClient::OpenGL;	2907	use CFClient::OpenGL;
2563		2908
2564	sub check_size {	2909	sub new {
2565	my ($self) = @_;	2910	my $class = shift;
2566		2911
2567	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2912	$class->SUPER::new (
2568	}	2913	@_,
2569		2914	)
2570	sub size_request {
2571	($::WIDTH, $::HEIGHT)
2572	}	2915	}
2573		2916
2574	sub configure {	2917	sub configure {
2575	my ($self, $x, $y, $w, $h) = @_;	2918	my ($self, $x, $y, $w, $h) = @_;
2576		2919
2577	$self->SUPER::configure ($x, $y, $w, $h);	2920	$self->{w} = $w;
		2921	$self->{h} = $h;
		2922	}
2578		2923
		2924	sub check_size {
		2925	my ($self) = @_;
		2926
		2927	$self->size_allocate ($self->{w}, $self->{h})
		2928	if $self->{w};
		2929	}
		2930
		2931	sub size_request {
		2932	my ($self) = @_;
		2933
		2934	($self->{w}, $self->{h})
		2935	}
		2936
		2937	sub size_allocate {
		2938	my ($self, $w, $h) = @_;
		2939
		2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2942
		2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2945
2579	for my $child (@{$self->{children}}) {	2946	for my $child ($self->children) {
2580	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2947	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581		2948
		2949	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2950	if exists $child->{req_x};
		2951
		2952	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2953	if exists $child->{req_y};
		2954
2582	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2955	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2583	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2956	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2957
2584	$child->configure ($X, $Y, $W,$H);	2958	$child->configure ($X, $Y, $W, $H);
2585	}	2959	}
2586	}	2960	}
2587		2961
2588	sub _topleft {	2962	sub coord2local {
2589	my ($self, $x, $y) = @_;	2963	my ($self, $x, $y) = @_;
2590		2964
2591	($x, $y)	2965	($x, $y)
2592	}	2966	}
2593		2967
		2968	sub coord2global {
		2969	my ($self, $x, $y) = @_;
		2970
		2971	($x, $y)
		2972	}
		2973
2594	sub update {	2974	sub update {
2595	my ($self) = @_;	2975	my ($self) = @_;
2596		2976
2597	$self->check_size;	2977	$self->check_size;
2598	::refresh ();	2978	$::WANT_REFRESH++;
2599	}	2979	}
2600		2980
2601	sub add {	2981	sub add {
2602	my ($self, $child) = @_;	2982	my ($self, @children) = @_;
2603		2983
		2984	for my $child (@children) {
		2985	$child->{toplevel} = 1;
		2986
2604	# integerize window positions	2987	# integerise window positions
2605	$child->{x} = int $child->{x};	2988	$child->{x} = int $child->{x};
2606	$child->{y} = int $child->{y};	2989	$child->{y} = int $child->{y};
		2990	}
2607		2991
2608	$self->SUPER::add ($child);	2992	$self->SUPER::add (@children);
2609	}	2993	}
2610		2994
2611	sub on_refresh {	2995	sub on_refresh {
2612	my ($self, $id, $cb) = @_;	2996	my ($self, $id, $cb) = @_;
2613		2997
2614	$self->{refresh_hook}{$id} = $cb;	2998	$self->{refresh_hook}{$id} = $cb;
2615	}	2999	}
2616		3000
		3001	sub on_post_alloc {
		3002	my ($self, $id, $cb) = @_;
		3003
		3004	$self->{post_alloc_hook}{$id} = $cb;
		3005	}
		3006
2617	sub draw {	3007	sub draw {
2618	my ($self) = @_;	3008	my ($self) = @_;
2619		3009
2620	while (my $rcb = delete $self->{refresh_hook}) {	3010	while ($self->{refresh_hook}) {
2621	$_->() for values %$rcb;	3011	$_->()
		3012	for values %{delete $self->{refresh_hook}};
		3013	}
		3014
		3015	if ($self->{check_size}) {
		3016	my @queue = ([], []);
		3017
		3018	for (;;) {
		3019	if ($self->{check_size}) {
		3020	# heuristic: check containers last
		3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3022	for values %{delete $self->{check_size}}
		3023	}
		3024
		3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3026
		3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3028	? @$widget{qw(user_w user_h)}
		3029	: $widget->size_request;
		3030
		3031	if (delete $widget->{force_alloc}
		3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3033	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3034
		3035	$widget->{req_w} = $w;
		3036	$widget->{req_h} = $h;
		3037
		3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3039
		3040	$widget->{parent}->check_size
		3041	if $widget->{parent};
		3042	}
		3043	}
		3044	}
		3045
		3046	while ($self->{size_alloc}) {
		3047	for (values %{delete $self->{size_alloc}}) {
		3048	my ($widget, $w, $h) = @$_;
		3049
		3050	$w = 0 if $w < 0;
		3051	$h = 0 if $h < 0;
		3052
		3053	$widget->{w} = $w;
		3054	$widget->{h} = $h;
		3055	$widget->size_allocate ($w, $h);
		3056	$widget->emit (size_allocate => $w, $h);
		3057	}
		3058	}
		3059
		3060	while ($self->{post_alloc_hook}) {
		3061	$_->()
		3062	for values %{delete $self->{post_alloc_hook}};
2622	}	3063	}
2623		3064
2624	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3065	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3066	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626	glClear GL_COLOR_BUFFER_BIT;	3067	glClear GL_COLOR_BUFFER_BIT;
2627		3068
2628	glMatrixMode GL_PROJECTION;	3069	glMatrixMode GL_PROJECTION;
2629	glLoadIdentity;	3070	glLoadIdentity;
2630	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3071	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631	glMatrixMode GL_MODELVIEW;	3072	glMatrixMode GL_MODELVIEW;
2632	glLoadIdentity;	3073	glLoadIdentity;
2633		3074
2634	$self->_draw;	3075	$self->_draw;
2635	}	3076	}
2636		3077
2637	#############################################################################	3078	#############################################################################
2638		3079
2639	package CFClient::UI::Inventory;
2640
2641	our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643	sub new {
2644	my $class = shift;
2645
2646	my $self = $class->SUPER::new (
2647	scrolled => (new CFClient::UI::VBox),
2648	@_,
2649	);
2650
2651	$self
2652	}
2653
2654	sub set_items {
2655	my ($self, $items) = @_;
2656
2657	$self->{scrolled}->clear;
2658	return unless $items;
2659
2660	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662	$self->{real_items} = \@items;
2663
2664	for my $item (@items) {
2665	my $desc = $item->{nrof} < 2
2666	? $item->{name}
2667	: "$item->{nrof} $item->{name_pl}";
2668
2669	my $hb = new CFClient::UI::HBox;
2670
2671	$hb->add (my $f = new CFClient::UI::Face
2672	can_events => 0,
2673	face => $item->{face},
2674	anim => $item->{anim},
2675	animspeed => $item->{animspeed},
2676	expand => 1,
2677	);
2678	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679	$self->{scrolled}->add ($hb);
2680	}
2681
2682	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683	}
2684
2685	sub size_request {
2686	my ($self) = @_;
2687	(100, 200)
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI;	3080	package CFClient::UI;
2693		3081
2694	$ROOT = new CFClient::UI::Root;	3082	$ROOT = new CFClient::UI::Root;
2695	$TOOLTIP = new CFClient::UI::Tooltip;	3083	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696		3084
2697	1	3085	1
2698		3086

Diff Legend

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