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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
232	$self->{y} = $y;	280	$self->{y} = $y;
233	$self->update;	281	$self->update;
234	}	282	}
235		283
236	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$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;
…		…
542	$self->{children} = [	573	$self->{children} = [
543	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
544	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
545	];	576	];
546		577
547	$_->check_size	578	$self->check_size (1);
548	for @widgets;
549
550	$self->update;	579	$self->update;
551	}	580	}
552		581
553	sub children {	582	sub children {
554	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
661	}	690	}
662		691
663	sub update {	692	sub update {
664	my ($self) = @_;	693	my ($self) = @_;
665		694
666	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
667	$self->SUPER::update;	696	$self->SUPER::update;
668	}	697	}
669		698
670	sub size_allocate {	699	sub size_allocate {
671	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
684	$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 {
685	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
686	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
687		716
688	$self->_render;	717	$self->_render;
689	# glColorMask 1, 1, 1, 0;
690	# glEnable GL_BLEND;
691	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692	# glRasterPos 0, 0;
693	# glCopyPixels 0, 0, $self->{w}, $self->{h};
694	# glDisable GL_BLEND;
695	# glColorMask 1, 1, 1, 1;
696	};	718	};
697	}	719	}
698		720
699	sub _draw {	721	sub _draw {
700	my ($self) = @_;	722	my ($self) = @_;
…		…
702	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
703		725
704	my $tex = $self->{texture}	726	my $tex = $self->{texture}
705	or return;	727	or return;
706		728
707	glEnable GL_BLEND;
708	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
710	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
712		732
713	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714		734
715	glDisable GL_BLEND;
716	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
717	}	736	}
718		737
719	#############################################################################	738	#############################################################################
720		739
…		…
724		743
725	sub size_request {	744	sub size_request {
726	my ($self) = @_;	745	my ($self) = @_;
727		746
728	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
729	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
730		748
731	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
732	}	750	}
733		751
734	sub size_allocate {	752	sub size_allocate {
735	my ($self, $w, $h) = @_;	753	my ($self, $w, $h) = @_;
736		754
		755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
737	$self->update;	758	$self->update;
738	}	759	}
739		760
740	sub set_offset {	761	sub set_offset {
741	my ($self, $x, $y) = @_;	762	my ($self, $x, $y) = @_;
…		…
744	$self->{view_y} = int $y;	765	$self->{view_y} = int $y;
745		766
746	$self->update;	767	$self->update;
747	}	768	}
748		769
749	# hmm, this does not work for topleft of $self... but we should not aks for that	770	# hmm, this does not work for topleft of $self... but we should not ask for that
750	sub _topleft {	771	sub coord2local {
751	my ($self, $x, $y) = @_;	772	my ($self, $x, $y) = @_;
752		773
753	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	774	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		775	}
		776
		777	sub coord2global {
		778	my ($self, $x, $y) = @_;
		779
		780	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		781	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		782
		783	$self->SUPER::coord2global ($x, $y)
754	}	784	}
755		785
756	sub find_widget {	786	sub find_widget {
757	my ($self, $x, $y) = @_;	787	my ($self, $x, $y) = @_;
758		788
…		…
786		816
787	my $slider = new CFClient::UI::Slider	817	my $slider = new CFClient::UI::Slider
788	vertical => 1,	818	vertical => 1,
789	range => [0, 0, 1, 0.01], # HACK fix	819	range => [0, 0, 1, 0.01], # HACK fix
790	connect_changed => sub {	820	connect_changed => sub {
791	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1]);
792	},	822	},
793	;	823	;
794		824
795	$self = $class->SUPER::new (	825	$self = $class->SUPER::new (
796	vp => (new CFClient::UI::ViewPort),	826	vp => (new CFClient::UI::ViewPort expand => 1),
797	slider => $slider,	827	slider => $slider,
798	@_,	828	@_,
799	);	829	);
800		830
801	$self->{vp}->add ($self->{scrolled});	831	$self->{vp}->add ($self->{scrolled});
…		…
803	$self->add ($self->{slider});	833	$self->add ($self->{slider});
804		834
805	$self	835	$self
806	}	836	}
807		837
		838	sub size_allocate {
		839	my ($self, $w, $h) = @_;
		840
		841	$self->SUPER::size_allocate ($w, $h);
		842
		843	my $child = $self->{vp}->child;
		844	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		845	}
		846
808	#TODO# update range on size_allocate depeneing on child	847	#TODO# update range on size_allocate depending on child
809	# update viewport offset on scroll	848	# update viewport offset on scroll
810		849
811	#############################################################################	850	#############################################################################
812		851
813	package CFClient::UI::Frame;	852	package CFClient::UI::Frame;
…		…
817	use CFClient::OpenGL;	856	use CFClient::OpenGL;
818		857
819	sub new {	858	sub new {
820	my $class = shift;	859	my $class = shift;
821		860
822	my $self = $class->SUPER::new (	861	$class->SUPER::new (
823	bg => [1, 1, 1, 1],	862	bg => undef,
824	border_bg => [1, 1, 1, 1],
825	border => 0.8,
826	@_	863	@_,
827	);	864	)
828
829	$self
830	}	865	}
831		866
832	sub _draw {	867	sub _draw {
833	my ($self) = @_;	868	my ($self) = @_;
834		869
835	my ($w, $h) = ($self->{w}, $self->{h});	870	if ($self->{bg}) {
		871	my ($w, $h) = @$self{qw(w h)};
836		872
837	glEnable GL_BLEND;	873	glEnable GL_BLEND;
838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	874	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839	glEnable GL_TEXTURE_2D;	875	glColor @{ $self->{bg} };
840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841		876
842	# glBegin GL_QUADS;	877	glBegin GL_QUADS;
843	# glColor 0, 0, 0, 0;
844	# glVertex 0 , 0;	878	glVertex 0 , 0;
845	# glVertex 0 , $h;	879	glVertex 0 , $h;
846	# glVertex $w, $h;	880	glVertex $w, $h;
847	# glVertex $w, 0;	881	glVertex $w, 0;
848	# glEnd;	882	glEnd;
849		883
850
851	$self->child->draw;
852	glDisable GL_BLEND;	884	glDisable GL_BLEND;
853	glDisable GL_TEXTURE_2D;	885	}
		886
		887	$self->SUPER::_draw;
854	}	888	}
855		889
856	#############################################################################	890	#############################################################################
857		891
858	package CFClient::UI::FancyFrame;	892	package CFClient::UI::FancyFrame;
…		…
872		906
873	my $self = $class->SUPER::new (	907	my $self = $class->SUPER::new (
874	bg => [1, 1, 1, 1],	908	bg => [1, 1, 1, 1],
875	border_bg => [1, 1, 1, 1],	909	border_bg => [1, 1, 1, 1],
876	border => 0.6,	910	border => 0.6,
		911	toplevel => 1,
877	can_events => 1,	912	can_events => 1,
878	@_	913	@_
879	);	914	);
880		915
881	$self->{title} &&= new CFClient::UI::Label	916	$self->{title} &&= new CFClient::UI::Label
…		…
906	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
907		942
908	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
909	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
910		945
911	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	946	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912	if $self->{title};	947	if $self->{title};
913		948
914	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
915	}	950	}
916		951
…		…
974	my ($self) = @_;	1009	my ($self) = @_;
975		1010
976	my ($w, $h ) = ($self->{w}, $self->{h});	1011	my ($w, $h ) = ($self->{w}, $self->{h});
977	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1012	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978		1013
979	glEnable GL_BLEND;
980	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981	glEnable GL_TEXTURE_2D;	1014	glEnable GL_TEXTURE_2D;
982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1015	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983		1016
984	my $border = $self->border;	1017	my $border = $self->border;
985		1018
986	glColor @{ $self->{border_bg} };	1019	glColor @{ $self->{border_bg} };
987	$tex[1]->draw_quad (0, 0, $w, $border);	1020	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
988	$tex[3]->draw_quad (0, $border, $border, $ch);	1021	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1022	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1023	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991		1024
992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1025	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993	my $bg = $tex[0];	1026	my $bg = $tex[0];
994		1027
995	# TODO: repeat texture not scale	1028	# TODO: repeat texture not scale
…		…
999	glColor @{ $self->{bg} };	1032	glColor @{ $self->{bg} };
1000		1033
1001	$bg->{s} = $rep_x;	1034	$bg->{s} = $rep_x;
1002	$bg->{t} = $rep_y;	1035	$bg->{t} = $rep_y;
1003	$bg->{wrap_mode} = 1;	1036	$bg->{wrap_mode} = 1;
1004	$bg->draw_quad ($border, $border, $cw, $ch);	1037	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1038	}
1005		1039
1006	glDisable GL_TEXTURE_2D;	1040	glDisable GL_TEXTURE_2D;
1007	glDisable GL_BLEND;
1008	}
1009		1041
1010	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
1011		1043
1012	$self->child->draw;	1044	$self->child->draw;
1013	}	1045	}
…		…
1240	}	1272	}
1241		1273
1242	sub size_allocate {	1274	sub size_allocate {
1243	my ($self, $w, $h) = @_;	1275	my ($self, $w, $h) = @_;
1244		1276
		1277	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1278
1245	my $children = $self->{children};	1279	my $children = $self->{children};
1246		1280
1247	my @h = map $_->{req_h}, @$children;	1281	my @h = map $_->{req_h}, @$children;
1248		1282
1249	my $req_h = List::Util::sum @h;	1283	my $req_h = List::Util::sum @h;
…		…
1278		1312
1279	#############################################################################	1313	#############################################################################
1280		1314
1281	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1282		1316
1283	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1284		1318
1285	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1286		1320
1287	sub new {	1321	sub new {
1288	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1289		1323
1290	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1291	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1292	#font => default_font	1328	#font => default_font
		1329	#text => initial text
		1330	#markup => initial narkup
		1331	#max_w => maximum pixel width
		1332	ellipsise => 3, # end
		1333	layout => (new CFClient::Layout),
1293	fontsize => 1,	1334	fontsize => 1,
1294	text => "",
1295	align => -1,	1335	align => -1,
1296	valign => -1,	1336	valign => -1,
1297	padding => 2,	1337	padding => 2,
1298	layout => new CFClient::Layout,
1299	can_events => 0,	1338	can_events => 0,
1300	%arg	1339	%arg
1301	);	1340	);
1302		1341
1303	if (exists $self->{template}) {	1342	if (exists $self->{template}) {
1304	my $layout = new CFClient::Layout;	1343	my $layout = new CFClient::Layout;
1305	$layout->set_text (delete $self->{template});	1344	$layout->set_text (delete $self->{template});
1306	$self->{template} = $layout;	1345	$self->{template} = $layout;
1307	}	1346	}
1308		1347
1309	$self->set_text (delete $self->{text}) if exists $self->{text};	1348	if (exists $self->{markup}) {
1310	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1349	$self->set_markup (delete $self->{markup});
		1350	} else {
		1351	$self->set_text (delete $self->{text});
		1352	}
1311		1353
1312	$self	1354	$self
1313	}	1355	}
1314		1356
1315	sub escape {	1357	sub escape($) {
1316	local $_ = $_[1];	1358	local $_ = $_[0];
1317		1359
1318	s/&/&amp;/g;	1360	s/&/&amp;/g;
1319	s/>/&gt;/g;	1361	s/>/&gt;/g;
1320	s/</&lt;/g;	1362	s/</&lt;/g;
1321		1363
1322	$_[1]	1364	$_
1323	}	1365	}
1324		1366
1325	sub update {	1367	sub update {
1326	my ($self) = @_;	1368	my ($self) = @_;
1327		1369
…		…
1333	my ($self, $text) = @_;	1375	my ($self, $text) = @_;
1334		1376
1335	return if $self->{text} eq "T$text";	1377	return if $self->{text} eq "T$text";
1336	$self->{text} = "T$text";	1378	$self->{text} = "T$text";
1337		1379
		1380	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338	$self->{layout}->set_text ($text);	1381	$self->{layout}->set_text ($text);
1339		1382
1340	delete $self->{texture};
1341	$self->update;	1383	$self->update;
1342	$self->check_size;	1384	$self->check_size;
1343	}	1385	}
1344		1386
1345	sub set_markup {	1387	sub set_markup {
1346	my ($self, $markup) = @_;	1388	my ($self, $markup) = @_;
1347		1389
1348	return if $self->{text} eq "M$markup";	1390	return if $self->{text} eq "M$markup";
1349	$self->{text} = "M$markup";	1391	$self->{text} = "M$markup";
1350		1392
		1393	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1394
		1395	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351	$self->{layout}->set_markup ($markup);	1396	$self->{layout}->set_markup ($markup);
1352		1397
1353	delete $self->{texture};
1354	$self->update;	1398	$self->update;
1355	$self->check_size;	1399	$self->check_size;
1356	}	1400	}
1357		1401
1358	sub size_request {	1402	sub size_request {
1359	my ($self) = @_;	1403	my ($self) = @_;
1360		1404
1361	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1362	$self->{layout}->set_width ($self->{max_w} || -1);	1406	$self->{layout}->set_width ($self->{max_w} || -1);
		1407	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1408	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364		1410
1365	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1366		1412
1367	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1397	}	1443	}
1398		1444
1399	sub _draw {	1445	sub _draw {
1400	my ($self) = @_;	1446	my ($self) = @_;
1401		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1402	my $tex = $self->{texture} ||= do {	1450	my $tex = $self->{texture} ||= do {
		1451	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1453	$self->{layout}->set_width ($self->{w});
		1454	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1455	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1457
1406	new_from_layout CFClient::Texture $self->{layout}	1458	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1459
		1460	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1461	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1462	: ($self->{w} - $tex->{w}) * 0.5);
		1463
		1464	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1465	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1466	: ($self->{h} - $tex->{h}) * 0.5);
		1467
		1468	$tex
1407	};	1469	};
1408		1470
1409	glEnable GL_BLEND;
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413		1473
		1474	if ($tex->{format} == GL_ALPHA) {
1414	glColor @{$self->{fg}};	1475	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});	1476	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1477	} else {
		1478	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1479	}
1429		1480
1430	glDisable GL_TEXTURE_2D;	1481	glDisable GL_TEXTURE_2D;
1431	glDisable GL_BLEND;
1432	}	1482	}
1433		1483
1434	#############################################################################	1484	#############################################################################
1435		1485
1436	package CFClient::UI::EntryBase;	1486	package CFClient::UI::EntryBase;
…		…
1449	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1450	can_hover => 1,	1500	can_hover => 1,
1451	can_focus => 1,	1501	can_focus => 1,
1452	valign => 0,	1502	valign => 0,
1453	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1454	@_	1505	@_
1455	)	1506	)
1456	}	1507	}
1457		1508
1458	sub _set_text {	1509	sub _set_text {
…		…
1469		1520
1470	$text =~ s/./*/g if $self->{hidden};	1521	$text =~ s/./*/g if $self->{hidden};
1471	$self->{layout}->set_text ("$text ");	1522	$self->{layout}->set_text ("$text ");
1472		1523
1473	$self->emit (changed => $self->{text});	1524	$self->emit (changed => $self->{text});
1474	}
1475
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	}	1525	}
1493		1526
1494	sub set_text {	1527	sub set_text {
1495	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1496		1529
1497	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1498	$self->_set_text ($text);	1531	$self->_set_text ($text);
1499	$self->update;	1532	$self->update;
		1533	$self->check_size;
		1534	}
		1535
		1536	sub get_text {
		1537	$_[0]{text}
		1538	}
		1539
		1540	sub size_request {
		1541	my ($self) = @_;
		1542
		1543	my ($w, $h) = $self->SUPER::size_request;
		1544
		1545	($w + 1, $h) # add 1 for cursor
		1546	}
		1547
		1548	sub size_allocate {
		1549	my ($self, $w, $h) = @_;
		1550
		1551	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1500	}	1552	}
1501		1553
1502	sub key_down {	1554	sub key_down {
1503	my ($self, $ev) = @_;	1555	my ($self, $ev) = @_;
1504		1556
…		…
1506	my $sym = $ev->{sym};	1558	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1559	my $uni = $ev->{unicode};
1508		1560
1509	my $text = $self->get_text;	1561	my $text = $self->get_text;
1510		1562
1511	if ($sym == 8) {	1563	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1564	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1565	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1566	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1567	} elsif ($sym == CFClient::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1568	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1569	} elsif ($sym == CFClient::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1570	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1571	} elsif ($sym == CFClient::SDLK_HOME) {
1520	$self->{cursor} = 0;	1572	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1573	} elsif ($sym == CFClient::SDLK_END) {
1522	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1523	} elsif ($sym == 27) {	1575	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1576	$self->emit ('escape');
1525	} elsif ($uni) {	1577	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1527	}	1579	}
1528		1580
1529	$self->_set_text ($text);	1581	$self->_set_text ($text);
1530	$self->update;	1582	$self->update;
		1583	$self->check_size;
1531	}	1584	}
1532		1585
1533	sub focus_in {	1586	sub focus_in {
1534	my ($self) = @_;	1587	my ($self) = @_;
1535		1588
…		…
1664	my $class = shift;	1717	my $class = shift;
1665		1718
1666	$class->SUPER::new (	1719	$class->SUPER::new (
1667	padding => 4,	1720	padding => 4,
1668	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1671	can_hover => 1,	1723	can_hover => 1,
1672	align => 0,	1724	align => 0,
1673	valign => 0,	1725	valign => 0,
1674	can_events => 1,	1726	can_events => 1,
…		…
1692		1744
1693	if ($GRAB == $self) {	1745	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};	1746	$self->{fg} = $self->{active_fg};
1695	}	1747	}
1696		1748
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	1749	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	1751	glColor 0, 0, 0, 1;
1702		1752
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1753	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		1754
1705	glDisable GL_TEXTURE_2D;	1755	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		1756
1708	$self->SUPER::_draw;	1757	$self->SUPER::_draw;
1709	}	1758	}
1710		1759
1711	#############################################################################	1760	#############################################################################
…		…
1725		1774
1726	$class->SUPER::new (	1775	$class->SUPER::new (
1727	padding => 2,	1776	padding => 2,
1728	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	1778	active_fg => [1, 1, 0],
		1779	bg => [0, 0, 0, 0.2],
		1780	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	1781	state => 0,
1731	can_hover => 1,	1782	can_hover => 1,
1732	@_	1783	@_
1733	)	1784	)
1734	}	1785	}
…		…
1758		1809
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1810	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760		1811
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1812	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		1813
1763	glEnable GL_BLEND;	1814	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1815
1764	glEnable GL_TEXTURE_2D;	1816	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);	1817	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	1819	}
1774		1820
1775	#############################################################################	1821	#############################################################################
1776		1822
1777	package CFClient::UI::Image;	1823	package CFClient::UI::Image;
…		…
1820	glTranslate 0, -$self->{w}, 0;	1866	glTranslate 0, -$self->{w}, 0;
1821		1867
1822	($w, $h) = ($h, $w);	1868	($w, $h) = ($h, $w);
1823	}	1869	}
1824		1870
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	1871	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		1873
1830	$tex->draw_quad (0, 0, $w, $h);	1874	$tex->draw_quad_alpha (0, 0, $w, $h);
1831		1875
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	1876	glDisable GL_TEXTURE_2D;
1834	}	1877	}
1835		1878
1836	#############################################################################	1879	#############################################################################
1837		1880
…		…
2026	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
2027		2070
2028	sub new {	2071	sub new {
2029	my $class = shift;	2072	my $class = shift;
2030		2073
2031	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
2032		2075
2033	# TODO: 0-width page	2076	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2078	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2081	active_fg => [0, 0, 0],
		2082	bg => [0, 0, 0, 0.2],
		2083	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
2040	req_w => $::WIDTH / 80,	2085	req_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2086	req_h => $::WIDTH / 80,
2042	vertical => 0,	2087	vertical => 0,
2043	can_hover => 1,	2088	can_hover => 1,
2044	inner_pad => 5,	2089	inner_pad => 0.02,
2045	@_	2090	@_
2046	);	2091	);
2047		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
2048	$self	2096	$self
		2097	}
		2098
		2099	sub set_range {
		2100	my ($self, $range) = @_;
		2101
		2102	$self->{range} = $range;
		2103
		2104	$self->update;
		2105	}
		2106
		2107	sub set_value {
		2108	my ($self, $value) = @_;
		2109
		2110	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2111
		2112	$hi = $lo + 1 if $hi <= $lo;
		2113
		2114	$page = $hi - $lo if $page > $hi - $lo;
		2115
		2116	$value = $lo if $value < $lo;
		2117	$value = $hi - $page if $value > $hi - $page;
		2118
		2119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2120	if $unit;
		2121
		2122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2123
		2124	if ($value != $old_value) {
		2125	$self->emit (changed => $value);
		2126	$self->update;
		2127	}
2049	}	2128	}
2050		2129
2051	sub size_request {	2130	sub size_request {
2052	my ($self) = @_;	2131	my ($self) = @_;
2053		2132
…		…
2059		2138
2060	sub button_down {	2139	sub button_down {
2061	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
2062		2141
2063	$self->SUPER::button_down ($ev, $x, $y);	2142	$self->SUPER::button_down ($ev, $x, $y);
		2143
		2144	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2145
2064	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
2065	}	2147	}
2066		2148
2067	sub mouse_motion {	2149	sub mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
2069		2151
2070	if ($GRAB == $self) {	2152	if ($GRAB == $self) {
		2153	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2154
		2155	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2156
		2157	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2158
		2159	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2160	}
		2161	}
		2162
		2163	sub update {
		2164	my ($self) = @_;
		2165
		2166	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2167	$self->set_value ($self->{range}[0]);
		2168
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) || 1e-100;
2072		2171
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074		2173
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2175	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077		2176
2078	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$value = $value * $self->{scale} + $self->{offset};
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2179
2084	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
2085	$self->update;	2181	$self->{knob_w} = $knob_w;
2086	}	2182	});
2087	}
2088		2183
2089	# the inner_* stuff is for generating a padding for the slider handle,	2184	$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	}	2185	}
2096		2186
2097	sub _draw {	2187	sub _draw {
2098	my ($self) = @_;	2188	my ($self) = @_;
2099		2189
2100	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
2101		2191
2102	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
2103		2193
2104	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
2106		2196
		2197	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2199	}
2112		2200
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2203
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;	2204	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2206
2139	# draw background	2207	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2209
2142	# draw handle	2210	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2211	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2212
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2147	}	2214	}
		2215
		2216	#############################################################################
		2217
		2218	package CFClient::UI::ValSlider;
		2219
		2220	our @ISA = CFClient::UI::HBox::;
		2221
		2222	sub new {
		2223	my ($class, %arg) = @_;
		2224
		2225	my $range = delete $arg{range};
		2226
		2227	my $self = $class->SUPER::new (
		2228	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2229	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2230	to_value => sub { shift },
		2231	from_value => sub { shift },
		2232	%arg,
		2233	);
		2234
		2235	$self->{slider}->connect (changed => sub {
		2236	my ($self, $value) = @_;
		2237	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2238	$self->{parent}->emit (changed => $value);
		2239	});
		2240
		2241	# $self->{entry}->connect (changed => sub {
		2242	# my ($self, $value) = @_;
		2243	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2244	# $self->{parent}->emit (changed => $value);
		2245	# });
		2246
		2247	$self->add ($self->{slider}, $self->{entry});
		2248
		2249	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2250
		2251	$self
		2252	}
		2253
		2254	sub set_range { shift->{slider}->set_range (@_) }
		2255	sub set_value { shift->{slider}->set_value (@_) }
2148		2256
2149	#############################################################################	2257	#############################################################################
2150		2258
2151	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2152		2260
…		…
2161	fontsize => 1,	2269	fontsize => 1,
2162	can_events => 0,	2270	can_events => 0,
2163	#font => default_font	2271	#font => default_font
2164	@_,	2272	@_,
2165		2273
2166	layout => (new CFClient::Layout),	2274	layout => (new CFClient::Layout 1),
2167	par => [],	2275	par => [],
2168	height => 0,	2276	height => 0,
2169	children => [	2277	children => [
2170	(new CFClient::UI::Empty expand => 1),	2278	(new CFClient::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2279	(new CFClient::UI::Slider vertical => 1),
…		…
2182		2290
2183	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2292	$self->reflow;
2185	}	2293	}
2186		2294
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 {	2295	sub size_allocate {
2207	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2208		2297
2209	$self->SUPER::size_allocate ($w, $h);	2298	$self->SUPER::size_allocate ($w, $h);
2210		2299
…		…
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2214		2303
2215	$self->reflow;	2304	$self->reflow;
2216	}	2305	}
2217		2306
		2307	sub text_size {
		2308	my ($self, $text, $indent) = @_;
		2309
		2310	my $layout = $self->{layout};
		2311
		2312	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2313	$layout->set_width ($self->{children}[0]{w} - $indent);
		2314	$layout->set_markup ($text);
		2315
		2316	$layout->size
		2317	}
		2318
		2319	sub reflow {
		2320	my ($self) = @_;
		2321
		2322	$self->{need_reflow}++;
		2323	$self->update;
		2324	}
		2325
		2326	sub set_offset {
		2327	my ($self, $offset) = @_;
		2328
		2329	# todo: base offset on lines or so, not on pixels
		2330	$self->{children}[1]->set_value ($offset);
		2331	}
		2332
		2333	sub clear {
		2334	my ($self) = @_;
		2335
		2336	$self->{par} = [];
		2337	$self->{height} = 0;
		2338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2339	}
		2340
2218	sub add_paragraph {	2341	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2220		2343
2221	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2222		2345	my ($w, $h) = $self->text_size ($line);
2223	my $height = $self->text_height ($text);
2224
2225	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2226		2349
2227	push @{$self->{par}}, [$height, $color, $text];
2228
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2350	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230	$self->{children}[1]->update;
2231	}	2351	}
2232		2352
2233	sub update {	2353	sub update {
2234	my ($self) = @_;	2354	my ($self) = @_;
2235		2355
…		…
2237		2357
2238	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2239		2359
2240	delete $self->{texture};	2360	delete $self->{texture};
2241		2361
2242	$ROOT->on_refresh ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2243	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2244	my $height = 0;	2366	my $height = 0;
2245		2367
2246	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2247	for @{$self->{par}};	2372	for (@{$self->{par}}) {
		2373	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2374	$layout->set_width ($W - $_->[3]);
		2375	$layout->set_markup ($_->[4]);
		2376	my ($w, $h) = $layout->size;
		2377	$_->[0] = $w + $_->[3];
		2378	$_->[1] = $h;
		2379	}
		2380
		2381	$height += $_->[1];
		2382	}
2248		2383
2249	$self->{height} = $height;	2384	$self->{height} = $height;
2250		2385
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252		2387
2253	delete $self->{texture};	2388	delete $self->{texture};
2254	}	2389	}
2255		2390
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2391	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257	glClearColor 0, 0, 0, 0;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2259		2394
		2395	my $top = int $self->{children}[1]{range}[0];
		2396
		2397	my $y0 = $top;
		2398	my $y1 = $top + $H;
		2399
		2400	my $y = 0;
		2401
		2402	my $layout = $self->{layout};
		2403
		2404	$layout->set_font ($self->{font}) if $self->{font};
		2405
2260	glEnable GL_BLEND;	2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2408	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265	my $top = int $self->{children}[1]{range}[0];
2266
2267	my $y0 = $top;
2268	my $y1 = $top + $self->{h};
2269
2270	my $y = 0;
2271
2272	my $layout = $self->{layout};
2273
2274	$layout->set_font ($self->{font}) if $self->{font};
2275		2409
2276	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2277	my $h = $par->[0];	2411	my $h = $par->[1];
2278		2412
2279	if ($y0 < $y + $h && $y < $y1) {	2413	if ($y0 < $y + $h && $y < $y1) {
		2414	$layout->set_foreground (@{ $par->[2] });
		2415	$layout->set_width ($W - $par->[3]);
2280	$layout->set_text ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2281		2417
2282	glColor @{ $par->[1] };	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283	my ($W, $H) = $layout->size;	2419
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2420	glRasterPos $par->[3], $y - $y0;
		2421	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285	}	2422	}
2286		2423
2287	$y += $h;	2424	$y += $h;
2288	}	2425	}
2289		2426
2290	glDisable GL_TEXTURE_2D;
2291	glDisable GL_BLEND;	2427	glDisable GL_BLEND;
2292	};	2428	};
2293	});	2429	});
2294	}	2430	}
2295		2431
2296	sub _draw {	2432	sub _draw {
2297	my ($self) = @_;	2433	my ($self) = @_;
2298		2434
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2438	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		2440
2308	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2309		2442
2310	}	2443	}
2311		2444
…		…
2405	@_,	2538	@_,
2406	can_events => 0,	2539	can_events => 0,
2407	)	2540	)
2408	}	2541	}
2409		2542
2410	sub set_markup {	2543	sub set_tooltip_from {
2411	my ($self, $text) = @_;	2544	my ($self, $widget) = @_;
2412		2545
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2546	$self->add (new CFClient::UI::Label
2414	$self->{label}->set_markup ($text);	2547	markup => $widget->{tooltip},
2415	$self->add ($self->{label});	2548	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2549	fontsize => 0.8,
		2550	fg => [0, 0, 0, 1],
		2551	ellipsise => 0,
		2552	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2553	);
2416	}	2554	}
2417		2555
2418	sub size_request {	2556	sub size_request {
2419	my ($self) = @_;	2557	my ($self) = @_;
2420
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422		2558
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2559	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		2560
2425	($w + 4, $h + 4)	2561	($w + 4, $h + 4)
2426	}	2562	}
…		…
2432	}	2568	}
2433		2569
2434	sub _draw {	2570	sub _draw {
2435	my ($self) = @_;	2571	my ($self) = @_;
2436		2572
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	2573	glTranslate 0.375, 0.375;
2439		2574
2440	my ($w, $h) = @$self{qw(w h)};	2575	my ($w, $h) = @$self{qw(w h)};
2441		2576
2442	glColor 1, 0.8, 0.4;	2577	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	2588	glVertex 0 , $h;
2454	glVertex $w, $h;	2589	glVertex $w, $h;
2455	glVertex $w, 0;	2590	glVertex $w, 0;
2456	glEnd;	2591	glEnd;
2457		2592
2458	glPopMatrix;	2593	glTranslate 2 - 0.375, 2 - 0.375;
2459
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	2594	$self->SUPER::_draw;
2462	}	2595	}
2463		2596
2464	#############################################################################	2597	#############################################################################
2465		2598
…		…
2470	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2471		2604
2472	sub new {	2605	sub new {
2473	my $class = shift;	2606	my $class = shift;
2474		2607
2475	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2476	aspect => 1,	2609	aspect => 1,
2477	@_,	2610	@_,
2478	)	2611	);
		2612
		2613	if ($self->{anim} && $self->{animspeed}) {
		2614	Scalar::Util::weaken (my $widget = $self);
		2615
		2616	$self->{timer} = Event->timer (
		2617	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2618	hard => 1,
		2619	interval => $self->{animspeed},
		2620	cb => sub {
		2621	++$widget->{frame};
		2622	$widget->update;
		2623	},
		2624	);
		2625	}
		2626
		2627	$self
2479	}	2628	}
2480		2629
2481	sub size_request {	2630	sub size_request {
2482	(32, 8)	2631	(32, 8)
2483	}	2632	}
2484		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2485	sub _draw {	2642	sub _draw {
2486	my ($self) = @_;	2643	my ($self) = @_;
2487		2644
2488	return unless $::CONN;#d# manage and cache textures differently	2645	return unless $::CONN;
		2646
		2647	my $face;
		2648
		2649	if ($self->{frame}) {
		2650	my $anim = $::CONN->{anim}[$self->{anim}];
		2651
		2652	$face = $anim->[ $self->{frame} % @$anim ]
		2653	if $anim && @$anim;
		2654	}
		2655
2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490		2657
2491	# TODO animation
2492	if ($tex) {	2658	if ($tex) {
2493	glEnable GL_BLEND;
2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2500	glDisable GL_BLEND;
2501	}	2664	}
		2665	}
		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
2502	}	2674	}
2503		2675
2504	#############################################################################	2676	#############################################################################
2505		2677
2506	package CFClient::UI::InventoryItem;	2678	package CFClient::UI::InventoryItem;
2507		2679
2508	our @ISA = CFClient::UI::HBox::;	2680	our @ISA = CFClient::UI::HBox::;
		2681
		2682	sub _item_to_desc {
		2683	my ($item) = @_;
		2684
		2685	my $desc =
		2686	$item->{nrof} < 2
		2687	? $item->{name}
		2688	: "$item->{nrof} × $item->{name_pl}";
		2689
		2690	$item->{flags} & Crossfire::Protocol::F_OPEN
		2691	and $desc .= " (open)";
		2692	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2693	and $desc .= " (applied)";
		2694	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2695	and $desc .= " (unpaid)";
		2696	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2697	and $desc .= " (magic)";
		2698	$item->{flags} & Crossfire::Protocol::F_CURSED
		2699	and $desc .= " (cursed)";
		2700	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2701	and $desc .= " (damned)";
		2702	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2703	and $desc .= " *";
		2704
		2705	$desc
		2706	}
2509		2707
2510	sub new {	2708	sub new {
2511	my $class = shift;	2709	my $class = shift;
2512		2710
2513	my %args = @_;	2711	my %args = @_;
2514		2712
2515	my $item = $args{item};	2713	my $item = delete $args{item};
2516		2714
2517	my $desc = $item->{nrof} < 2	2715	my $desc = _item_to_desc ($item);
2518	? $item->{name}
2519	: "$item->{nrof} $item->{name_pl}";
2520
2521		2716
2522	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2523	can_hover => 1,	2718	can_hover => 1,
2524	can_events => 1,	2719	can_events => 1,
2525	tooltip => (CFClient::UI::Label->escape ($desc)	2720	tooltip => ((CFClient::UI::Label::escape $desc)
2526	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2721	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2527	connect_button_down => sub {	2722	connect_button_down => sub {
2528	my ($self, $ev, $x, $y) = @_;	2723	my ($self, $ev, $x, $y) = @_;
2529		2724
2530	# todo: maybe put examine on 1? but should just be a tooltip :(	2725	# todo: maybe put examine on 1? but should just be a tooltip :(
		2726	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2727	my $targ = $::CONN->{player}{tag};
		2728
		2729	if ($item->{container} == $::CONN->{player}{tag}) {
		2730	$targ = $main::OPENCONT;
		2731	}
		2732
		2733	$::CONN->send ("move $targ $item->{tag} 0");
2531	if ($ev->{button} == 1) {	2734	} elsif ($ev->{button} == 1) {
2532	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2735	$::CONN->send ("examine $item->{tag}");
2533	} elsif ($ev->{button} == 2) {	2736	} elsif ($ev->{button} == 2) {
2534	$::CONN->send ("apply $item->{tag}");	2737	$::CONN->send ("apply $item->{tag}");
2535	} elsif ($ev->{button} == 3) {	2738	} elsif ($ev->{button} == 3) {
2536	CFClient::UI::Menu->new (	2739	my @menu_items = (
2537	items => [
2538	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2740	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539	[
2540	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541	sub { $::CONN->send ("lock $item->{tag}") },
2542	],
2543	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2544	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2742	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2743	(
		2744	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2745	? (
		2746	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2747	)
		2748	: (
		2749	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2545	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
2546	],	2752	),
2547	)->popup ($ev);	2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2548	}	2756	}
2549		2757
2550	1	2758	1
2551	},	2759	},
2552	%args	2760	%args
2553	);	2761	);
		2762
		2763
2554	$self->add(new CFClient::UI::Face	2764	$self->add (new CFClient::UI::Face
2555	can_events => 0,	2765	can_events => 0,
2556	face => $item->{face},	2766	face => $item->{face},
2557	anim => $item->{anim},	2767	anim => $item->{anim},
2558	animspeed => $item->{animspeed});	2768	animspeed => $item->{animspeed},
2559	$self->add(new CFClient::UI::Label	2769	);
2560	can_events => 0,	2770
2561	text => $desc);	2771	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2772
		2773	$self->{item} = $item;
		2774
		2775	$self->update_item;
2562		2776
2563	$self	2777	$self
		2778	}
		2779
		2780	sub update_item {
		2781	my ($self) = @_;
		2782
		2783	my $desc = _item_to_desc ($self->{item});
		2784
		2785	$self->{name_lbl}->set_text ($desc);
2564	}	2786	}
2565		2787
2566	#############################################################################	2788	#############################################################################
2567		2789
2568	package CFClient::UI::Inventory;	2790	package CFClient::UI::Inventory;
…		…
2571		2793
2572	sub new {	2794	sub new {
2573	my $class = shift;	2795	my $class = shift;
2574		2796
2575	my $self = $class->SUPER::new (	2797	my $self = $class->SUPER::new (
2576	scrolled => (new CFClient::UI::VBox),	2798	scrolled => (new CFClient::UI::Table),
2577	@_,	2799	@_,
2578	);	2800	);
2579		2801
2580	$self	2802	$self
2581	}	2803	}
…		…
2584	my ($self, $items) = @_;	2806	my ($self, $items) = @_;
2585		2807
2586	$self->{scrolled}->clear;	2808	$self->{scrolled}->clear;
2587	return unless $items;	2809	return unless $items;
2588		2810
2589	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2811	my @items = sort {
		2812	($a->{type} <=> $b->{type})
		2813	or ($a->{name} cmp $b->{name})
		2814	} @$items;
2590		2815
2591	$self->{real_items} = \@items;	2816	$self->{real_items} = \@items;
2592		2817
2593	for my $item (@items) {	2818	for my $item (@items) {
2594	my $desc = $item->{nrof} < 2	2819	$item->{item} = $item;
2595	? $item->{name}
2596	: "$item->{nrof} $item->{name_pl}";
2597
2598	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2820	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2821	$item->update_item ();
		2822	}
		2823
		2824	my $i = 0;
		2825	for (@items) {
		2826	$self->{scrolled}->add (0, $i, $_);
		2827	my $nrof = $_->{item}->{nrof} || 1;
		2828	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2599	}	2829	}
2600		2830
2601	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602	}	2832	}
2603		2833
…		…
2678	}	2908	}
2679	}	2909	}
2680		2910
2681	#############################################################################	2911	#############################################################################
2682		2912
		2913	package CFClient::UI::Statusbox;
		2914
		2915	our @ISA = CFClient::UI::VBox::;
		2916
		2917	sub new {
		2918	my $class = shift;
		2919
		2920	$class->SUPER::new (
		2921	fontsize => 0.8,
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub reorder {
		2927	my ($self) = @_;
		2928	my $NOW = time;
		2929
		2930	while (my ($k, $v) = each %{ $self->{item} }) {
		2931	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2932	}
		2933
		2934	my @widgets;
		2935
		2936	my @items = sort {
		2937	$a->{pri} <=> $b->{pri}
		2938	or $b->{id} <=> $a->{id}
		2939	} values %{ $self->{item} };
		2940
		2941	my $count = 10 + 1;
		2942	for my $item (@items) {
		2943	last unless --$count;
		2944
		2945	push @widgets, $item->{label} ||= do {
		2946	# TODO: doesn't handle markup well (read as: at all)
		2947	my $short = $item->{count} > 1
		2948	? "<b>$item->{count} ×</b> $item->{text}"
		2949	: $item->{text};
		2950
		2951	for ($short) {
		2952	s/^\s+//;
		2953	s/\s+/ /g;
		2954	}
		2955
		2956	new CFClient::UI::Label
		2957	markup => $short,
		2958	tooltip => $item->{tooltip},
		2959	tooltip_font => $::FONT_PROP,
		2960	tooltip_width => 0.67,
		2961	fontsize => $item->{fontsize} || $self->{fontsize},
		2962	max_w => $::WIDTH * 0.44,
		2963	fg => $item->{fg},
		2964	can_events => 1,
		2965	can_hover => 1
		2966	};
		2967	}
		2968
		2969	$self->clear;
		2970	$self->SUPER::add (reverse @widgets);
		2971	}
		2972
		2973	sub add {
		2974	my ($self, $text, %arg) = @_;
		2975
		2976	$text =~ s/^\s+//;
		2977	$text =~ s/\s+$//;
		2978
		2979	my $timeout = time + ((delete $arg{timeout}) || 60);
		2980
		2981	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2982
		2983	if (my $item = $self->{item}{$group}) {
		2984	if ($item->{text} eq $text) {
		2985	$item->{count}++;
		2986	} else {
		2987	$item->{count} = 1;
		2988	$item->{text} = $item->{tooltip} = $text;
		2989	}
		2990	$item->{id} = ++$self->{id};
		2991	$item->{timeout} = $timeout;
		2992	delete $item->{label};
		2993	} else {
		2994	$self->{item}{$group} = {
		2995	id => ++$self->{id},
		2996	text => $text,
		2997	timeout => $timeout,
		2998	tooltip => $text,
		2999	fg => [0.8, 0.8, 0.8, 0.8],
		3000	pri => 0,
		3001	count => 1,
		3002	%arg,
		3003	};
		3004	}
		3005
		3006	$self->reorder;
		3007	}
		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	delete $_->{label}
		3013	for values %{ $self->{item} || {} };
		3014
		3015	$self->reorder;
		3016	$self->SUPER::reconfigure;
		3017	}
		3018
		3019	#############################################################################
		3020
2683	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2684		3022
2685	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
2686		3024
2687	use CFClient::OpenGL;	3025	use CFClient::OpenGL;
2688		3026
		3027	sub new {
		3028	my $class = shift;
		3029
		3030	$class->SUPER::new (
		3031	@_,
		3032	)
		3033	}
		3034
		3035	sub configure {
		3036	my ($self, $x, $y, $w, $h) = @_;
		3037
		3038	$self->{w} = $w;
		3039	$self->{h} = $h;
		3040	}
		3041
2689	sub check_size {	3042	sub check_size {
2690	my ($self) = @_;	3043	my ($self) = @_;
2691		3044
2692	$self->configure (0, 0, $self->{w}, $self->{h});	3045	$self->size_allocate ($self->{w}, $self->{h})
		3046	if $self->{w};
2693	}	3047	}
2694		3048
2695	sub size_request {	3049	sub size_request {
2696	my ($self) = @_;	3050	my ($self) = @_;
2697		3051
…		…
2699	}	3053	}
2700		3054
2701	sub size_allocate {	3055	sub size_allocate {
2702	my ($self, $w, $h) = @_;	3056	my ($self, $w, $h) = @_;
2703		3057
2704	my $old_w = $self->{old_w};	3058	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2705	my $old_h = $self->{old_h};	3059	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2706		3060
2707	if ($old_w && $old_h) {	3061	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2708	for my $child ($self->children) {	3062	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2709	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717	}
2718	}
2719
2720	$self->{old_w} = $w;
2721	$self->{old_h} = $h;
2722	}
2723
2724	sub configure {
2725	my ($self, $x, $y, $w, $h) = @_;
2726
2727	$self->SUPER::configure ($x, $y, $w, $h);
2728		3063
2729	for my $child ($self->children) {	3064	for my $child ($self->children) {
2730	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731		3066
		3067	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3068	if exists $child->{req_x};
		3069
		3070	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3071	if exists $child->{req_y};
		3072
2732	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3073	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3074	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3075
2734	$child->configure ($X, $Y, $W, $H);	3076	$child->configure ($X, $Y, $W, $H);
2735	}	3077	}
2736	}	3078	}
2737		3079
2738	sub _topleft {	3080	sub coord2local {
2739	my ($self, $x, $y) = @_;	3081	my ($self, $x, $y) = @_;
2740		3082
2741	($x, $y)	3083	($x, $y)
2742	}	3084	}
2743		3085
		3086	sub coord2global {
		3087	my ($self, $x, $y) = @_;
		3088
		3089	($x, $y)
		3090	}
		3091
2744	sub update {	3092	sub update {
2745	my ($self) = @_;	3093	my ($self) = @_;
2746		3094
2747	$self->check_size;	3095	$self->check_size;
2748	::refresh ();	3096	$::WANT_REFRESH++;
2749	}	3097	}
2750		3098
2751	sub add {	3099	sub add {
2752	my ($self, $child) = @_;	3100	my ($self, @children) = @_;
2753		3101
		3102	for (my @widgets = @children; my $w = pop @widgets; ) {
		3103	push @widgets, $w->children;
		3104	$w->{root} = $self;
		3105	$w->{visible} = 1;
		3106	}
		3107
		3108	for my $child (@children) {
		3109	$child->{toplevel} = 1;
		3110
2754	# integerize window positions	3111	# integerise window positions
2755	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2756	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
		3114	}
2757		3115
2758	$self->SUPER::add ($child);	3116	$self->SUPER::add (@children);
		3117	}
		3118
		3119	sub remove {
		3120	my ($self, @children) = @_;
		3121
		3122	$self->SUPER::remove (@children);
		3123
		3124	while (@children) {
		3125	my $w = pop @children;
		3126	push @children, $w->children;
		3127	delete $w->{visible};
		3128	}
2759	}	3129	}
2760		3130
2761	sub on_refresh {	3131	sub on_refresh {
2762	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2763		3133
2764	$self->{refresh_hook}{$id} = $cb;	3134	$self->{refresh_hook}{$id} = $cb;
2765	}	3135	}
2766		3136
		3137	sub on_post_alloc {
		3138	my ($self, $id, $cb) = @_;
		3139
		3140	$self->{post_alloc_hook}{$id} = $cb;
		3141	}
		3142
2767	sub draw {	3143	sub draw {
2768	my ($self) = @_;	3144	my ($self) = @_;
2769		3145
2770	while (my $rcb = delete $self->{refresh_hook}) {	3146	while ($self->{refresh_hook}) {
2771	$_->() for values %$rcb;	3147	$_->()
		3148	for values %{delete $self->{refresh_hook}};
		3149	}
		3150
		3151	if ($self->{check_size}) {
		3152	my @queue = ([], []);
		3153
		3154	for (;;) {
		3155	if ($self->{check_size}) {
		3156	# heuristic: check containers last
		3157	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3158	for values %{delete $self->{check_size}}
		3159	}
		3160
		3161	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3162
		3163	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3164	? @$widget{qw(user_w user_h)}
		3165	: $widget->size_request;
		3166
		3167	if (delete $widget->{force_alloc}
		3168	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3169	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3170
		3171	$widget->{req_w} = $w;
		3172	$widget->{req_h} = $h;
		3173
		3174	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3175
		3176	$widget->{parent}->check_size
		3177	if $widget->{parent};
		3178	}
		3179	}
		3180	}
		3181
		3182	while ($self->{size_alloc}) {
		3183	for (values %{delete $self->{size_alloc}}) {
		3184	my ($widget, $w, $h) = @$_;
		3185
		3186	$w = 0 if $w < 0;
		3187	$h = 0 if $h < 0;
		3188
		3189	$widget->{w} = $w;
		3190	$widget->{h} = $h;
		3191	$widget->size_allocate ($w, $h);
		3192	$widget->emit (size_allocate => $w, $h);
		3193	}
		3194	}
		3195
		3196	while ($self->{post_alloc_hook}) {
		3197	$_->()
		3198	for values %{delete $self->{post_alloc_hook}};
2772	}	3199	}
2773		3200
2774	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2777		3204
2778	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2779	glLoadIdentity;	3206	glLoadIdentity;
2780	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2782	glLoadIdentity;	3209	glLoadIdentity;
2783		3210
2784	$self->_draw;	3211	$self->_draw;
2785	}	3212	}
…		…
2787	#############################################################################	3214	#############################################################################
2788		3215
2789	package CFClient::UI;	3216	package CFClient::UI;
2790		3217
2791	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2792	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793		3220
2794	1	3221	1
2795		3222

Diff Legend

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