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.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00: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) = @_;
…		…
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	$self->emit (size_allocate => $w, $h);
243	}	286	}
244	}	287	}
245		288
246	sub size_allocate {	289	sub size_allocate {
247	# nothing to be done	290	# nothing to be done
248	}	291	}
249		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
250	sub children {	300	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	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	301	}
264		302
265	sub set_max_size {	303	sub set_max_size {
266	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
267		305
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	308	}
271		309
272	# return top left coordinates	310	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
275		312
276	$self->{parent}	313	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		314
279	$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	}
280	}	319	}
281		320
282	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
283	sub coord2local {	322	sub coord2local {
284	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
285		324
286	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	326	}
289		327
290	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
291	sub coord2global {	329	sub coord2global {
292	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
293		331
294	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	333	}
297		334
298	sub focus_in {	335	sub focus_in {
299	my ($self) = @_;	336	my ($self) = @_;
300		337
…		…
372	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
375	glEnd;	412	glEnd;
376	glPopMatrix;	413	glPopMatrix;
377	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;
378	}	415	}
379	}	416	}
380		417
381	sub _draw {	418	sub _draw {
382	my ($self) = @_;	419	my ($self) = @_;
…		…
398		435
399	sub set_parent {	436	sub set_parent {
400	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
401		438
402	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;
403	}	446	}
404		447
405	sub check_size {	448	sub check_size {
406	my ($self) = @_;	449	my ($self, $forced) = @_;
407		450
408	$self->{parent}	451	$self->{force_alloc} = 1 if $forced;
409	or return 1;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411	my ($w, $h) = $self->{user_w} && $self->{user_h}
412	? @$self{qw(user_w user_h)}
413	: $self->size_request;
414
415	if ($w != $self->{req_w} || $h != $self->{req_h}) {
416	$self->{req_w} = $w;
417	$self->{req_h} = $h;
418
419	$self->{parent}->check_size
420	or $self->size_allocate (
421	(List::Util::max $self->{w}, $w),
422	(List::Util::max $self->{h}, $h),
423	);
424
425	1
426	} else {
427	0
428	}
429	}	453	}
430		454
431	sub update {	455	sub update {
432	my ($self) = @_;	456	my ($self) = @_;
433		457
…		…
448	}	472	}
449		473
450	sub DESTROY {	474	sub DESTROY {
451	my ($self) = @_;	475	my ($self) = @_;
452		476
		477	delete $WIDGET{$self+0};
453	#$self->deactivate;	478	#$self->deactivate;
454	}	479	}
455		480
456	#############################################################################	481	#############################################################################
457		482
…		…
466	my $class = shift;	491	my $class = shift;
467		492
468	# range [value, low, high, page]	493	# range [value, low, high, page]
469		494
470	$class->SUPER::new (	495	$class->SUPER::new (
471	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
472	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
473	@_	498	@_
474	)	499	)
475	}	500	}
476		501
477	sub _draw {	502	sub _draw {
478	my ($self) = @_;	503	my ($self) = @_;
479		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
480	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
481		511
482	glEnable GL_BLEND;	512	glEnable GL_BLEND;
483	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
485		515
486	glBegin GL_QUADS;	516	glBegin GL_QUADS;
487	glVertex 0 , 0;	517	glVertex 0 , 0;
488	glVertex 0 , $h;	518	glVertex 0 , $h;
489	glVertex $w, $h;	519	glVertex $w, $h;
490	glVertex $w, 0;	520	glVertex $w, 0;
491	glEnd;	521	glEnd;
492		522
493	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
494	}	525	}
495		526
496	#############################################################################	527	#############################################################################
497		528
498	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
530		561
531	$self	562	$self
532	}	563	}
533		564
534	sub add {	565	sub add {
535	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
536		567
537	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
538		570
539	use sort 'stable';	571	use sort 'stable';
540		572
541	$self->{children} = [	573	$self->{children} = [
542	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
543	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
544	];	576	];
545		577
546	$child->check_size;	578	$self->check_size (1);
547	$self->update;	579	$self->update;
548	}	580	}
549		581
550	sub children {	582	sub children {
551	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
658	}	690	}
659		691
660	sub update {	692	sub update {
661	my ($self) = @_;	693	my ($self) = @_;
662		694
663	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
664	$self->SUPER::update;	696	$self->SUPER::update;
665	}	697	}
666		698
667	sub size_allocate {	699	sub size_allocate {
668	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
681	$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 {
682	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
683	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
684		716
685	$self->_render;	717	$self->_render;
686	# glColorMask 1, 1, 1, 0;
687	# glEnable GL_BLEND;
688	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689	# glRasterPos 0, 0;
690	# glCopyPixels 0, 0, $self->{w}, $self->{h};
691	# glDisable GL_BLEND;
692	# glColorMask 1, 1, 1, 1;
693	};	718	};
694	}	719	}
695		720
696	sub _draw {	721	sub _draw {
697	my ($self) = @_;	722	my ($self) = @_;
…		…
699	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
700		725
701	my $tex = $self->{texture}	726	my $tex = $self->{texture}
702	or return;	727	or return;
703		728
704	glEnable GL_BLEND;
705	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
707	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
709		732
710	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711		734
712	glDisable GL_BLEND;
713	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
714	}	736	}
715		737
716	#############################################################################	738	#############################################################################
717		739
…		…
741	$self->{view_y} = int $y;	763	$self->{view_y} = int $y;
742		764
743	$self->update;	765	$self->update;
744	}	766	}
745		767
746	# hmm, this does not work for topleft of $self... but we should not aks for that	768	# hmm, this does not work for topleft of $self... but we should not ask for that
747	sub _topleft {	769	sub coord2local {
748	my ($self, $x, $y) = @_;	770	my ($self, $x, $y) = @_;
749		771
750	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	772	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		773	}
		774
		775	sub coord2global {
		776	my ($self, $x, $y) = @_;
		777
		778	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		779	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		780
		781	$self->SUPER::coord2global ($x, $y)
751	}	782	}
752		783
753	sub find_widget {	784	sub find_widget {
754	my ($self, $x, $y) = @_;	785	my ($self, $x, $y) = @_;
755		786
…		…
788	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789	},	820	},
790	;	821	;
791		822
792	$self = $class->SUPER::new (	823	$self = $class->SUPER::new (
793	vp => (new CFClient::UI::ViewPort),	824	vp => (new CFClient::UI::ViewPort expand => 1),
794	slider => $slider,	825	slider => $slider,
795	@_,	826	@_,
796	);	827	);
797		828
798	$self->{vp}->add ($self->{scrolled});	829	$self->{vp}->add ($self->{scrolled});
…		…
800	$self->add ($self->{slider});	831	$self->add ($self->{slider});
801		832
802	$self	833	$self
803	}	834	}
804		835
805	#TODO# update range on size_allocate depeneing on child	836	#TODO# update range on size_allocate depending on child
806	# update viewport offset on scroll	837	# update viewport offset on scroll
807		838
808	#############################################################################	839	#############################################################################
809		840
810	package CFClient::UI::Frame;	841	package CFClient::UI::Frame;
…		…
814	use CFClient::OpenGL;	845	use CFClient::OpenGL;
815		846
816	sub new {	847	sub new {
817	my $class = shift;	848	my $class = shift;
818		849
819	my $self = $class->SUPER::new (	850	$class->SUPER::new (
820	bg => [1, 1, 1, 1],	851	bg => undef,
821	border_bg => [1, 1, 1, 1],
822	border => 0.8,
823	@_	852	@_,
824	);	853	)
825
826	$self
827	}	854	}
828		855
829	sub _draw {	856	sub _draw {
830	my ($self) = @_;	857	my ($self) = @_;
831		858
832	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
833		861
834	glEnable GL_BLEND;	862	glEnable GL_BLEND;
835	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
837	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838		865
839	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
840	# glColor 0, 0, 0, 0;
841	# glVertex 0 , 0;	867	glVertex 0 , 0;
842	# glVertex 0 , $h;	868	glVertex 0 , $h;
843	# glVertex $w, $h;	869	glVertex $w, $h;
844	# glVertex $w, 0;	870	glVertex $w, 0;
845	# glEnd;	871	glEnd;
846		872
847
848	$self->child->draw;
849	glDisable GL_BLEND;	873	glDisable GL_BLEND;
850	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
851	}	877	}
852		878
853	#############################################################################	879	#############################################################################
854		880
855	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
869		895
870	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
871	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
872	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
873	border => 0.6,	899	border => 0.6,
		900	toplevel => 1,
874	can_events => 1,	901	can_events => 1,
875	@_	902	@_
876	);	903	);
877		904
878	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
…		…
903	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
904		931
905	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
906	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
907		934
908	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909	if $self->{title};	936	if $self->{title};
910		937
911	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
912	}	939	}
913		940
…		…
971	my ($self) = @_;	998	my ($self) = @_;
972		999
973	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
974	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975		1002
976	glEnable GL_BLEND;
977	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
979	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980		1005
981	my $border = $self->border;	1006	my $border = $self->border;
982		1007
983	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
984	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
985	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988		1013
989	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990	my $bg = $tex[0];	1015	my $bg = $tex[0];
991		1016
992	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
…		…
996	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
997		1022
998	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
999	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
1000	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
1001	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
1002		1028
1003	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
1004	glDisable GL_BLEND;
1005	}
1006		1030
1007	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
1008		1032
1009	$self->child->draw;	1033	$self->child->draw;
1010	}	1034	}
…		…
1237	}	1261	}
1238		1262
1239	sub size_allocate {	1263	sub size_allocate {
1240	my ($self, $w, $h) = @_;	1264	my ($self, $w, $h) = @_;
1241		1265
		1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1267
1242	my $children = $self->{children};	1268	my $children = $self->{children};
1243		1269
1244	my @h = map $_->{req_h}, @$children;	1270	my @h = map $_->{req_h}, @$children;
1245		1271
1246	my $req_h = List::Util::sum @h;	1272	my $req_h = List::Util::sum @h;
…		…
1275		1301
1276	#############################################################################	1302	#############################################################################
1277		1303
1278	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1279		1305
1280	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1281		1307
1282	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1283		1309
1284	sub new {	1310	sub new {
1285	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1286		1312
1287	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1288	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1289	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1290	fontsize => 1,	1323	fontsize => 1,
1291	text => "",
1292	align => -1,	1324	align => -1,
1293	valign => -1,	1325	valign => -1,
1294	padding => 2,	1326	padding => 2,
1295	layout => new CFClient::Layout,
1296	can_events => 0,	1327	can_events => 0,
1297	%arg	1328	%arg
1298	);	1329	);
1299		1330
1300	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1301	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1302	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1303	$self->{template} = $layout;	1334	$self->{template} = $layout;
1304	}	1335	}
1305		1336
1306	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1307	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1308		1342
1309	$self	1343	$self
1310	}	1344	}
1311		1345
1312	sub escape {	1346	sub escape($) {
1313	local $_ = $_[1];	1347	local $_ = $_[0];
1314		1348
1315	s/&/&amp;/g;	1349	s/&/&amp;/g;
1316	s/>/&gt;/g;	1350	s/>/&gt;/g;
1317	s/</&lt;/g;	1351	s/</&lt;/g;
1318		1352
1319	$_[1]	1353	$_
1320	}	1354	}
1321		1355
1322	sub update {	1356	sub update {
1323	my ($self) = @_;	1357	my ($self) = @_;
1324		1358
…		…
1330	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1331		1365
1332	return if $self->{text} eq "T$text";	1366	return if $self->{text} eq "T$text";
1333	$self->{text} = "T$text";	1367	$self->{text} = "T$text";
1334		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1336		1371
1337	delete $self->{texture};
1338	$self->update;	1372	$self->update;
1339	$self->check_size;	1373	$self->check_size;
1340	}	1374	}
1341		1375
1342	sub set_markup {	1376	sub set_markup {
1343	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1344		1378
1345	return if $self->{text} eq "M$markup";	1379	return if $self->{text} eq "M$markup";
1346	$self->{text} = "M$markup";	1380	$self->{text} = "M$markup";
1347		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1349		1386
1350	delete $self->{texture};
1351	$self->update;	1387	$self->update;
1352	$self->check_size;	1388	$self->check_size;
1353	}	1389	}
1354		1390
1355	sub size_request {	1391	sub size_request {
1356	my ($self) = @_;	1392	my ($self) = @_;
1357		1393
1358	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1359	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361		1399
1362	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1363		1401
1364	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1394	}	1432	}
1395		1433
1396	sub _draw {	1434	sub _draw {
1397	my ($self) = @_;	1435	my ($self) = @_;
1398		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1399	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1400	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1401	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1403	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1404	};	1458	};
1405		1459
1406	glEnable GL_BLEND;
1407	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1409	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1411	glColor @{$self->{fg}};	1464	glColor @{$self->{fg}};
1412
1413	$self->{ox} = int (
1414	$self->{align} < 0 ? $self->{padding}
1415	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416	: ($self->{w} - $tex->{w}) * 0.5
1417	);
1418
1419	$self->{oy} = int (
1420	$self->{valign} < 0 ? $self->{padding}
1421	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422	: ($self->{h} - $tex->{h}) * 0.5
1423	);
1424
1425	$tex->draw_quad ($self->{ox}, $self->{oy});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1426		1469
1427	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1428	glDisable GL_BLEND;
1429	}	1471	}
1430		1472
1431	#############################################################################	1473	#############################################################################
1432		1474
1433	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1468	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1469		1511
1470	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1471	}	1513	}
1472		1514
1473	sub get_text {
1474	$_[0]{text}
1475	}
1476
1477	sub size_request {
1478	my ($self) = @_;
1479
1480	my ($w, $h) = $self->SUPER::size_request;
1481
1482	($w + 1, $h) # add 1 for cursor
1483	}
1484
1485	sub size_allocate {
1486	my ($self, $w, $h) = @_;
1487
1488	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489	}
1490
1491	sub set_text {	1515	sub set_text {
1492	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1493		1517
1494	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1495	$self->_set_text ($text);	1519	$self->_set_text ($text);
1496	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497	}	1540	}
1498		1541
1499	sub key_down {	1542	sub key_down {
1500	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1501		1544
…		…
1503	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1504	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1505		1548
1506	my $text = $self->get_text;	1549	my $text = $self->get_text;
1507		1550
1508	if ($sym == 8) {	1551	if ($uni == 8) {
1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1511	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1512	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1513	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1514	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1515	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1516	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1517	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1518	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1519	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1520	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1521	$self->emit ('escape');	1564	$self->emit ('escape');
1522	} elsif ($uni) {	1565	} elsif ($uni) {
1523	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1524	}	1567	}
1525		1568
1526	$self->_set_text ($text);	1569	$self->_set_text ($text);
1527	$self->update;	1570	$self->update;
		1571	$self->check_size;
1528	}	1572	}
1529		1573
1530	sub focus_in {	1574	sub focus_in {
1531	my ($self) = @_;	1575	my ($self) = @_;
1532		1576
…		…
1661	my $class = shift;	1705	my $class = shift;
1662		1706
1663	$class->SUPER::new (	1707	$class->SUPER::new (
1664	padding => 4,	1708	padding => 4,
1665	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1666	bg => [1, 1, 1, 0.2],
1667	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1668	can_hover => 1,	1711	can_hover => 1,
1669	align => 0,	1712	align => 0,
1670	valign => 0,	1713	valign => 0,
1671	can_events => 1,	1714	can_events => 1,
…		…
1689		1732
1690	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1691	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1692	}	1735	}
1693		1736
1694	glEnable GL_BLEND;
1695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1699		1740
1700	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701		1742
1702	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1703	glDisable GL_BLEND;
1704		1744
1705	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1706	}	1746	}
1707		1747
1708	#############################################################################	1748	#############################################################################
…		…
1722		1762
1723	$class->SUPER::new (	1763	$class->SUPER::new (
1724	padding => 2,	1764	padding => 2,
1725	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1726	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1727	state => 0,	1769	state => 0,
1728	can_hover => 1,	1770	can_hover => 1,
1729	@_	1771	@_
1730	)	1772	)
1731	}	1773	}
…		…
1755		1797
1756	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757		1799
1758	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759		1801
1760	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1761	glEnable GL_TEXTURE_2D;	1804	glEnable GL_TEXTURE_2D;
1762	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764	my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766	$tex->draw_quad (0, 0, $s, $s);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1769	glDisable GL_BLEND;
1770	}	1807	}
1771		1808
1772	#############################################################################	1809	#############################################################################
1773		1810
1774	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1817	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1818		1855
1819	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1820	}	1857	}
1821		1858
1822	glEnable GL_BLEND;
1823	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826		1861
1827	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1828		1863
1829	glDisable GL_BLEND;
1830	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1831	}	1865	}
1832		1866
1833	#############################################################################	1867	#############################################################################
1834		1868
…		…
2023	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
2024		2058
2025	sub new {	2059	sub new {
2026	my $class = shift;	2060	my $class = shift;
2027		2061
2028	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
2029		2063
2030	# TODO: 0-width page	2064	# TODO: 0-width page
2031	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
2032	# TODO: calculations are off	2066	# TODO: calculations are off
2033	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
2034	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
2035	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
2036	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
2037	req_w => $::WIDTH / 80,	2073	req_w => $::WIDTH / 80,
2038	req_h => $::WIDTH / 80,	2074	req_h => $::WIDTH / 80,
2039	vertical => 0,	2075	vertical => 0,
2040	can_hover => 1,	2076	can_hover => 1,
2041	inner_pad => 5,	2077	inner_pad => 0.02,
2042	@_	2078	@_
2043	);	2079	);
2044		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
2045	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
2046	}	2108	}
2047		2109
2048	sub size_request {	2110	sub size_request {
2049	my ($self) = @_;	2111	my ($self) = @_;
2050		2112
…		…
2063		2125
2064	sub mouse_motion {	2126	sub mouse_motion {
2065	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
2066		2128
2067	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
2068	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
2069		2147
2070	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
2071		2149
2072	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074		2151
2075	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$value = $self->{scale} * ($value - $lo);
2077	$x = $lo if $x < $lo;
2078	$x = $hi - $page if $x > $hi - $page;
2079	$self->{range}[0] = $x;
2080		2154
2081	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2082	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
2083	}	2162	});
2084	}
2085		2163
2086	# the inner_* stuff is for generating a padding for the slider handle,	2164	$self->SUPER::update;
2087	# so that the handle doesn't leave the texture. This calculation isn't 100%
2088	# correct propably, but it does the job for now
2089	sub _calc_inner_pad_px {
2090	my ($self, $w) = @_;
2091	($w / 100) * $self->{inner_pad} # % to pixels
2092	}	2165	}
2093		2166
2094	sub _draw {	2167	sub _draw {
2095	my ($self) = @_;	2168	my ($self) = @_;
2096		2169
2097	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
2098		2171
2099	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
2100		2173
2101	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
2102	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
2103		2176
		2177	glTranslate 1, 0, 0;
2104	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
2105	glTranslate 0, -$self->{w}, 0;
2106
2107	($w, $h) = ($h, $w);
2108	}	2179	}
2109		2180
2110	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112		2183
2113	my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115	$hi = $value + 1 if $lo == $hi;
2116
2117	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120	$page = int $page * $inner_w / ($hi - $lo);
2121	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123	$w -= $page;
2124	$page &= ~1;
2125	glTranslate $page * 0.5, 0, 0;
2126	$page ||= 2;
2127
2128	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131	glEnable GL_BLEND;
2132	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133	glEnable GL_TEXTURE_2D;	2184	glEnable GL_TEXTURE_2D;
2134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135		2186
2136	# draw background	2187	# draw background
2137	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138		2189
2139	# draw handle	2190	# draw handle
2140	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141		2192
2142	glDisable GL_BLEND;
2143	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
2144	}	2194	}
2145		2195
2146	#############################################################################	2196	#############################################################################
2147		2197
…		…
2158	fontsize => 1,	2208	fontsize => 1,
2159	can_events => 0,	2209	can_events => 0,
2160	#font => default_font	2210	#font => default_font
2161	@_,	2211	@_,
2162		2212
2163	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2164	par => [],	2214	par => [],
2165	height => 0,	2215	height => 0,
2166	children => [	2216	children => [
2167	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2168	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
…		…
2179		2229
2180	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2181	$self->reflow;	2231	$self->reflow;
2182	}	2232	}
2183		2233
2184	sub text_height {
2185	my ($self, $text) = @_;
2186
2187	my $layout = $self->{layout};
2188
2189	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190	$layout->set_width ($self->{children}[0]{w});
2191	$layout->set_text ($text);
2192
2193	($layout->size)[1]
2194	}
2195
2196	sub reflow {
2197	my ($self) = @_;
2198
2199	$self->{need_reflow}++;
2200	$self->update;
2201	}
2202
2203	sub size_allocate {	2234	sub size_allocate {
2204	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2205		2236
2206	$self->SUPER::size_allocate ($w, $h);	2237	$self->SUPER::size_allocate ($w, $h);
2207		2238
…		…
2210	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2211		2242
2212	$self->reflow;	2243	$self->reflow;
2213	}	2244	}
2214		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2215	sub add_paragraph {	2265	sub add_paragraph {
2216	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2217		2267
2218	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2219		2269
		2270	for my $line (split /\n/, $text) {
2220	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2221
2222	$self->{height} += $height;	2272	$self->{height} += $height;
2223
2224	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2225		2275
2226	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2227	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2228	}	2278	}
2229		2279
…		…
2234		2284
2235	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2236		2286
2237	delete $self->{texture};	2287	delete $self->{texture};
2238		2288
2239	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2240	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2241	my $height = 0;	2291	my $height = 0;
2242		2292
2243	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2244	for @{$self->{par}};	2294	for @{$self->{par}};
2245		2295
2246	$self->{height} = $height;	2296	$self->{height} = $height;
2247		2297
2248	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2249		2300
2250	delete $self->{texture};	2301	delete $self->{texture};
2251	}	2302	}
2252		2303
2253	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2254	glClearColor 0, 0, 0, 0;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2255	glClear GL_COLOR_BUFFER_BIT;	2306	glClear GL_COLOR_BUFFER_BIT;
2256
2257	glEnable GL_BLEND;
2258	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259	glEnable GL_TEXTURE_2D;
2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261		2307
2262	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2263		2309
2264	my $y0 = $top;	2310	my $y0 = $top;
2265	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2268		2314
2269	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2270		2316
2271	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2272		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2273	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2274	my $h = $par->[0];	2323	my $h = $par->[0];
2275		2324
2276	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2277	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2278		2329
2279	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	my ($W, $H) = $layout->size;	2331
2281	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282	}	2334	}
2283		2335
2284	$y += $h;	2336	$y += $h;
2285	}	2337	}
2286		2338
2287	glDisable GL_TEXTURE_2D;
2288	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2289	};	2340	};
2290	});	2341	});
2291	}	2342	}
2292		2343
2293	sub _draw {	2344	sub _draw {
2294	my ($self) = @_;	2345	my ($self) = @_;
2295		2346
2296	glEnable GL_BLEND;
2297	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2299	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300	glColor 1, 1, 1, 1;	2349	glColor 1, 1, 1, 1;
2301	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2303	glDisable GL_BLEND;
2304		2352
2305	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2306		2354
2307	}	2355	}
2308		2356
…		…
2402	@_,	2450	@_,
2403	can_events => 0,	2451	can_events => 0,
2404	)	2452	)
2405	}	2453	}
2406		2454
2407	sub set_markup {	2455	sub set_tooltip_from {
2408	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2409		2457
2410	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2411	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2412	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2413	}	2466	}
2414		2467
2415	sub size_request {	2468	sub size_request {
2416	my ($self) = @_;	2469	my ($self) = @_;
2417
2418	$self->child->set_max_size ($::WIDTH * 0.3);
2419		2470
2420	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421		2472
2422	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2423	}	2474	}
…		…
2429	}	2480	}
2430		2481
2431	sub _draw {	2482	sub _draw {
2432	my ($self) = @_;	2483	my ($self) = @_;
2433		2484
2434	glPushMatrix;
2435	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2436		2486
2437	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2438		2488
2439	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2450	glVertex 0 , $h;	2500	glVertex 0 , $h;
2451	glVertex $w, $h;	2501	glVertex $w, $h;
2452	glVertex $w, 0;	2502	glVertex $w, 0;
2453	glEnd;	2503	glEnd;
2454		2504
2455	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2456
2457	glTranslate 2, 2;
2458	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2459	}	2507	}
2460		2508
2461	#############################################################################	2509	#############################################################################
2462		2510
…		…
2467	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2468		2516
2469	sub new {	2517	sub new {
2470	my $class = shift;	2518	my $class = shift;
2471		2519
2472	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2473	aspect => 1,	2521	aspect => 1,
2474	@_,	2522	@_,
2475	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2476	}	2540	}
2477		2541
2478	sub size_request {	2542	sub size_request {
2479	(32, 8)	2543	(32, 8)
2480	}	2544	}
2481		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2482	sub _draw {	2554	sub _draw {
2483	my ($self) = @_;	2555	my ($self) = @_;
2484		2556
2485	return unless $::CONN;#d# manage and cache textures differently	2557	return unless $::CONN;#d# manage and cache textures differently
		2558
		2559	my $face;
		2560
		2561	if ($self->{frame}) {
		2562	my $anim = $::CONN->{anim}[$self->{anim}];
		2563
		2564	$face = $anim->[ $self->{frame} % @$anim ]
		2565	if $anim && @$anim;
		2566	}
		2567
2486	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2568	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487		2569
2488	# TODO animation
2489	if ($tex) {	2570	if ($tex) {
2490	glEnable GL_BLEND;
2491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
2493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494	glColor 1, 1, 1, 1;	2573	glColor 1, 1, 1, 1;
2495	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2574	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496	glDisable GL_TEXTURE_2D;	2575	glDisable GL_TEXTURE_2D;
2497	glDisable GL_BLEND;
2498	}	2576	}
		2577	}
		2578
		2579	sub DESTROY {
		2580	my ($self) = @_;
		2581
		2582	$self->{timer}->cancel
		2583	if $self->{timer};
		2584
		2585	$self->SUPER::DESTROY;
2499	}	2586	}
2500		2587
2501	#############################################################################	2588	#############################################################################
2502		2589
2503	package CFClient::UI::InventoryItem;	2590	package CFClient::UI::InventoryItem;
2504		2591
2505	our @ISA = CFClient::UI::HBox::;	2592	our @ISA = CFClient::UI::HBox::;
		2593
		2594	sub _item_to_desc {
		2595	my ($item) = @_;
		2596
		2597	my $desc =
		2598	$item->{nrof} < 2
		2599	? $item->{name}
		2600	: "$item->{nrof} × $item->{name_pl}";
		2601
		2602	$item->{flags} & Crossfire::Protocol::F_OPEN
		2603	and $desc .= " (open)";
		2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2605	and $desc .= " (applied)";
		2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2607	and $desc .= " (unpaid)";
		2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2609	and $desc .= " (magic)";
		2610	$item->{flags} & Crossfire::Protocol::F_CURSED
		2611	and $desc .= " (cursed)";
		2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2613	and $desc .= " (damned)";
		2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2615	and $desc .= " *";
		2616
		2617	$desc
		2618	}
2506		2619
2507	sub new {	2620	sub new {
2508	my $class = shift;	2621	my $class = shift;
2509		2622
2510	my %args = @_;	2623	my %args = @_;
2511		2624
2512	my $item = $args{item};	2625	my $item = delete $args{item};
2513		2626
2514	my $desc = $item->{nrof} < 2	2627	my $desc = _item_to_desc ($item);
2515	? $item->{name}
2516	: "$item->{nrof} $item->{name_pl}";
2517
2518		2628
2519	my $self = $class->SUPER::new (	2629	my $self = $class->SUPER::new (
2520	can_hover => 1,	2630	can_hover => 1,
2521	can_events => 1,	2631	can_events => 1,
2522	tooltip => (CFClient::UI::Label->escape ($desc)	2632	tooltip => ((CFClient::UI::Label::escape $desc)
2523	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2524	connect_button_down => sub {	2634	connect_button_down => sub {
2525	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2526		2636
2527	# todo: maybe put examine on 1? but should just be a tooltip :(	2637	# todo: maybe put examine on 1? but should just be a tooltip :(
		2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2639	my $targ = $::CONN->{player}{tag};
		2640
		2641	if ($item->{container} == $::CONN->{player}{tag}) {
		2642	$targ = $main::OPENCONT;
		2643	}
		2644
		2645	$::CONN->send ("move $targ $item->{tag} 0");
2528	if ($ev->{button} == 1) {	2646	} elsif ($ev->{button} == 1) {
2529	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2647	$::CONN->send ("examine $item->{tag}");
2530	} elsif ($ev->{button} == 2) {	2648	} elsif ($ev->{button} == 2) {
2531	$::CONN->send ("apply $item->{tag}");	2649	$::CONN->send ("apply $item->{tag}");
2532	} elsif ($ev->{button} == 3) {	2650	} elsif ($ev->{button} == 3) {
2533	CFClient::UI::Menu->new (	2651	my @menu_items = (
2534	items => [
2535	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2652	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536	[
2537	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538	sub { $::CONN->send ("lock $item->{tag}") },
2539	],
2540	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2653	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2654	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2655	(
		2656	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2657	? (
		2658	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2659	)
		2660	: (
		2661	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2662	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2663	)
2543	],	2664	),
2544	)->popup ($ev);	2665	);
		2666
		2667	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545	}	2668	}
2546		2669
2547	1	2670	1
2548	},	2671	},
2549	%args	2672	%args
2550	);	2673	);
		2674
		2675
2551	$self->add(new CFClient::UI::Face	2676	$self->add (new CFClient::UI::Face
2552	can_events => 0,	2677	can_events => 0,
2553	face => $item->{face},	2678	face => $item->{face},
2554	anim => $item->{anim},	2679	anim => $item->{anim},
2555	animspeed => $item->{animspeed});	2680	animspeed => $item->{animspeed},
2556	$self->add(new CFClient::UI::Label	2681	);
2557	can_events => 0,	2682
2558	text => $desc);	2683	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2684
		2685	$self->{item} = $item;
		2686
		2687	$self->update_item;
2559		2688
2560	$self	2689	$self
		2690	}
		2691
		2692	sub update_item {
		2693	my ($self) = @_;
		2694
		2695	my $desc = _item_to_desc ($self->{item});
		2696
		2697	$self->{name_lbl}->set_text ($desc);
2561	}	2698	}
2562		2699
2563	#############################################################################	2700	#############################################################################
2564		2701
2565	package CFClient::UI::Inventory;	2702	package CFClient::UI::Inventory;
…		…
2568		2705
2569	sub new {	2706	sub new {
2570	my $class = shift;	2707	my $class = shift;
2571		2708
2572	my $self = $class->SUPER::new (	2709	my $self = $class->SUPER::new (
2573	scrolled => (new CFClient::UI::VBox),	2710	scrolled => (new CFClient::UI::Table),
2574	@_,	2711	@_,
2575	);	2712	);
2576		2713
2577	$self	2714	$self
2578	}	2715	}
…		…
2581	my ($self, $items) = @_;	2718	my ($self, $items) = @_;
2582		2719
2583	$self->{scrolled}->clear;	2720	$self->{scrolled}->clear;
2584	return unless $items;	2721	return unless $items;
2585		2722
2586	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2723	my @items = sort {
		2724	($a->{type} <=> $b->{type})
		2725	or ($a->{name} cmp $b->{name})
		2726	} @$items;
2587		2727
2588	$self->{real_items} = \@items;	2728	$self->{real_items} = \@items;
2589		2729
2590	for my $item (@items) {	2730	for my $item (@items) {
2591	my $desc = $item->{nrof} < 2	2731	$item->{item} = $item;
2592	? $item->{name}
2593	: "$item->{nrof} $item->{name_pl}";
2594
2595	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2733	$item->update_item ();
		2734	}
		2735
		2736	my $i = 0;
		2737	for (@items) {
		2738	$self->{scrolled}->add (0, $i, $_);
		2739	my $nrof = $_->{item}->{nrof} || 1;
		2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2596	}	2741	}
2597		2742
2598	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599	}	2744	}
2600		2745
…		…
2675	}	2820	}
2676	}	2821	}
2677		2822
2678	#############################################################################	2823	#############################################################################
2679		2824
		2825	package CFClient::UI::Statusbox;
		2826
		2827	our @ISA = CFClient::UI::VBox::;
		2828
		2829	sub new {
		2830	my $class = shift;
		2831
		2832	$class->SUPER::new (
		2833	fontsize => 0.8,
		2834	@_,
		2835	)
		2836	}
		2837
		2838	sub reorder {
		2839	my ($self) = @_;
		2840	my $NOW = time;
		2841
		2842	while (my ($k, $v) = each %{ $self->{item} }) {
		2843	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2844	}
		2845
		2846	my @widgets;
		2847
		2848	my @items = sort {
		2849	$a->{pri} <=> $b->{pri}
		2850	or $b->{id} <=> $a->{id}
		2851	} values %{ $self->{item} };
		2852
		2853	my $count = 10 + 1;
		2854	for my $item (@items) {
		2855	last unless --$count;
		2856
		2857	push @widgets, $item->{label} ||= do {
		2858	# TODO: doesn't handle markup well (read as: at all)
		2859	my $short = $item->{count} > 1
		2860	? "<b>$item->{count} ×</b> $item->{text}"
		2861	: $item->{text};
		2862
		2863	for ($short) {
		2864	s/^\s+//;
		2865	s/\s+/ /g;
		2866	}
		2867
		2868	new CFClient::UI::Label
		2869	markup => $short,
		2870	tooltip => $item->{tooltip},
		2871	tooltip_font => $::FONT_PROP,
		2872	tooltip_width => 0.67,
		2873	fontsize => $item->{fontsize} || $self->{fontsize},
		2874	max_w => $::WIDTH * 0.44,
		2875	fg => $item->{fg},
		2876	can_events => 1,
		2877	can_hover => 1
		2878	};
		2879	}
		2880
		2881	$self->clear;
		2882	$self->SUPER::add (reverse @widgets);
		2883	}
		2884
		2885	sub add {
		2886	my ($self, $text, %arg) = @_;
		2887
		2888	$text =~ s/^\s+//;
		2889	$text =~ s/\s+$//;
		2890
		2891	my $timeout = time + ((delete $arg{timeout}) || 60);
		2892
		2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2894
		2895	if (my $item = $self->{item}{$group}) {
		2896	if ($item->{text} eq $text) {
		2897	$item->{count}++;
		2898	} else {
		2899	$item->{count} = 1;
		2900	$item->{text} = $item->{tooltip} = $text;
		2901	}
		2902	$item->{id} = ++$self->{id};
		2903	$item->{timeout} = $timeout;
		2904	delete $item->{label};
		2905	} else {
		2906	$self->{item}{$group} = {
		2907	id => ++$self->{id},
		2908	text => $text,
		2909	timeout => $timeout,
		2910	tooltip => $text,
		2911	fg => [0.8, 0.8, 0.8, 0.8],
		2912	pri => 0,
		2913	count => 1,
		2914	%arg,
		2915	};
		2916	}
		2917
		2918	$self->reorder;
		2919	}
		2920
		2921	sub reconfigure {
		2922	my ($self) = @_;
		2923
		2924	delete $_->{label}
		2925	for values %{ $self->{item} || {} };
		2926
		2927	$self->reorder;
		2928	$self->SUPER::reconfigure;
		2929	}
		2930
		2931	#############################################################################
		2932
2680	package CFClient::UI::Root;	2933	package CFClient::UI::Root;
2681		2934
2682	our @ISA = CFClient::UI::Container::;	2935	our @ISA = CFClient::UI::Container::;
2683		2936
2684	use CFClient::OpenGL;	2937	use CFClient::OpenGL;
2685		2938
		2939	sub new {
		2940	my $class = shift;
		2941
		2942	$class->SUPER::new (
		2943	@_,
		2944	)
		2945	}
		2946
		2947	sub configure {
		2948	my ($self, $x, $y, $w, $h) = @_;
		2949
		2950	$self->{w} = $w;
		2951	$self->{h} = $h;
		2952	}
		2953
2686	sub check_size {	2954	sub check_size {
2687	my ($self) = @_;	2955	my ($self) = @_;
2688		2956
2689	$self->configure (0, 0, $self->{w}, $self->{h});	2957	$self->size_allocate ($self->{w}, $self->{h})
		2958	if $self->{w};
2690	}	2959	}
2691		2960
2692	sub size_request {	2961	sub size_request {
2693	my ($self) = @_;	2962	my ($self) = @_;
2694		2963
…		…
2696	}	2965	}
2697		2966
2698	sub size_allocate {	2967	sub size_allocate {
2699	my ($self, $w, $h) = @_;	2968	my ($self, $w, $h) = @_;
2700		2969
2701	my $old_w = $self->{old_w};	2970	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702	my $old_h = $self->{old_h};	2971	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703		2972
2704	if ($old_w && $old_h) {	2973	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705	for my $child ($self->children) {	2974	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2706	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707	$child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714	}
2715	}
2716
2717	$self->{old_w} = $w;
2718	$self->{old_h} = $h;
2719	}
2720
2721	sub configure {
2722	my ($self, $x, $y, $w, $h) = @_;
2723
2724	$self->SUPER::configure ($x, $y, $w, $h);
2725		2975
2726	for my $child ($self->children) {	2976	for my $child ($self->children) {
2727	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728		2978
		2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2980	if exists $child->{req_x};
		2981
		2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2983	if exists $child->{req_y};
		2984
2729	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2986	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2987
2731	$child->configure ($X, $Y, $W, $H);	2988	$child->configure ($X, $Y, $W, $H);
2732	}	2989	}
2733	}	2990	}
2734		2991
2735	sub _topleft {	2992	sub coord2local {
2736	my ($self, $x, $y) = @_;	2993	my ($self, $x, $y) = @_;
2737		2994
2738	($x, $y)	2995	($x, $y)
2739	}	2996	}
2740		2997
		2998	sub coord2global {
		2999	my ($self, $x, $y) = @_;
		3000
		3001	($x, $y)
		3002	}
		3003
2741	sub update {	3004	sub update {
2742	my ($self) = @_;	3005	my ($self) = @_;
2743		3006
2744	$self->check_size;	3007	$self->check_size;
2745	::refresh ();	3008	$::WANT_REFRESH++;
2746	}	3009	}
2747		3010
2748	sub add {	3011	sub add {
2749	my ($self, $child) = @_;	3012	my ($self, @children) = @_;
2750		3013
		3014	for my $child (@children) {
		3015	$child->{toplevel} = 1;
		3016
2751	# integerize window positions	3017	# integerise window positions
2752	$child->{x} = int $child->{x};	3018	$child->{x} = int $child->{x};
2753	$child->{y} = int $child->{y};	3019	$child->{y} = int $child->{y};
		3020	}
2754		3021
2755	$self->SUPER::add ($child);	3022	$self->SUPER::add (@children);
		3023
		3024	while (@children) {
		3025	my $w = pop @children;
		3026	push @children, $w->children;
		3027	$w->{visible} = 1;
		3028	}
		3029	}
		3030
		3031	sub remove {
		3032	my ($self, @children) = @_;
		3033
		3034	$self->SUPER::remove (@children);
		3035
		3036	while (@children) {
		3037	my $w = pop @children;
		3038	push @children, $w->children;
		3039	delete $w->{visible};
		3040	}
2756	}	3041	}
2757		3042
2758	sub on_refresh {	3043	sub on_refresh {
2759	my ($self, $id, $cb) = @_;	3044	my ($self, $id, $cb) = @_;
2760		3045
2761	$self->{refresh_hook}{$id} = $cb;	3046	$self->{refresh_hook}{$id} = $cb;
2762	}	3047	}
2763		3048
		3049	sub on_post_alloc {
		3050	my ($self, $id, $cb) = @_;
		3051
		3052	$self->{post_alloc_hook}{$id} = $cb;
		3053	}
		3054
2764	sub draw {	3055	sub draw {
2765	my ($self) = @_;	3056	my ($self) = @_;
2766		3057
2767	while (my $rcb = delete $self->{refresh_hook}) {	3058	while ($self->{refresh_hook}) {
2768	$_->() for values %$rcb;	3059	$_->()
		3060	for values %{delete $self->{refresh_hook}};
		3061	}
		3062
		3063	if ($self->{check_size}) {
		3064	my @queue = ([], []);
		3065
		3066	for (;;) {
		3067	if ($self->{check_size}) {
		3068	# heuristic: check containers last
		3069	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3070	for values %{delete $self->{check_size}}
		3071	}
		3072
		3073	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3074
		3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3076	? @$widget{qw(user_w user_h)}
		3077	: $widget->size_request;
		3078
		3079	if (delete $widget->{force_alloc}
		3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3082
		3083	$widget->{req_w} = $w;
		3084	$widget->{req_h} = $h;
		3085
		3086	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3087
		3088	$widget->{parent}->check_size
		3089	if $widget->{parent};
		3090	}
		3091	}
		3092	}
		3093
		3094	while ($self->{size_alloc}) {
		3095	for (values %{delete $self->{size_alloc}}) {
		3096	my ($widget, $w, $h) = @$_;
		3097
		3098	$w = 0 if $w < 0;
		3099	$h = 0 if $h < 0;
		3100
		3101	$widget->{w} = $w;
		3102	$widget->{h} = $h;
		3103	$widget->size_allocate ($w, $h);
		3104	$widget->emit (size_allocate => $w, $h);
		3105	}
		3106	}
		3107
		3108	while ($self->{post_alloc_hook}) {
		3109	$_->()
		3110	for values %{delete $self->{post_alloc_hook}};
2769	}	3111	}
2770		3112
2771	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3113	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3114	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773	glClear GL_COLOR_BUFFER_BIT;	3115	glClear GL_COLOR_BUFFER_BIT;
2774		3116
2775	glMatrixMode GL_PROJECTION;	3117	glMatrixMode GL_PROJECTION;
2776	glLoadIdentity;	3118	glLoadIdentity;
2777	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3119	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778	glMatrixMode GL_MODELVIEW;	3120	glMatrixMode GL_MODELVIEW;
2779	glLoadIdentity;	3121	glLoadIdentity;
2780		3122
2781	$self->_draw;	3123	$self->_draw;
2782	}	3124	}
…		…
2784	#############################################################################	3126	#############################################################################
2785		3127
2786	package CFClient::UI;	3128	package CFClient::UI;
2787		3129
2788	$ROOT = new CFClient::UI::Root;	3130	$ROOT = new CFClient::UI::Root;
2789	$TOOLTIP = new CFClient::UI::Tooltip;	3131	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790		3132
2791	1	3133	1
2792		3134

Diff Legend

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