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

Diff Legend

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