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.189 by root, Mon May 8 22:17:24 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->_check_size;	451	$self->{force_alloc} = 1 if $forced;
409	return;
410	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412	$check_size->{$self} = $self;
413
414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
415	while (%$check_size) {
416	my @widgets = values %$check_size;
417	$_->_check_size
418	for @widgets;
419	}
420	});
421	}
422
423	sub _check_size {
424	my ($self) = @_;
425
426	delete $CFClient::UI::ROOT->{_check_size}{$self};	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428	$self->{parent}
429	or return 1;
430
431	my ($w, $h) = $self->{user_w} && $self->{user_h}
432	? @$self{qw(user_w user_h)}
433	: $self->size_request;
434
435	if ($w != $self->{req_w} || $h != $self->{req_h}) {
436	$self->{req_w} = $w;
437	$self->{req_h} = $h;
438
439	$self->{parent}->_check_size
440	or $self->size_allocate (
441	(List::Util::max $self->{w}, $w),
442	(List::Util::max $self->{h}, $h),
443	);
444
445	1
446	} else {
447	0
448	}
449	}	453	}
450		454
451	sub update {	455	sub update {
452	my ($self) = @_;	456	my ($self) = @_;
453		457
454	my $update = $CFClient::UI::ROOT->{_update} ||= {};	458	$self->{parent}->update
455		459	if $self->{parent};
456	$update->{$self} = $self;
457
458	$CFClient::UI::ROOT->on_refresh (_update => sub {
459	while (%$update) {
460	my @widgets = values %$update;
461	%$update = ();
462
463	$_->{parent} && $_->{parent}->update
464	for @widgets;
465	}
466	});
467	}	460	}
468		461
469	sub connect {	462	sub connect {
470	my ($self, $signal, $cb) = @_;	463	my ($self, $signal, $cb) = @_;
471		464
…		…
479	}	472	}
480		473
481	sub DESTROY {	474	sub DESTROY {
482	my ($self) = @_;	475	my ($self) = @_;
483		476
		477	delete $WIDGET{$self+0};
484	#$self->deactivate;	478	#$self->deactivate;
485	}	479	}
486		480
487	#############################################################################	481	#############################################################################
488		482
…		…
497	my $class = shift;	491	my $class = shift;
498		492
499	# range [value, low, high, page]	493	# range [value, low, high, page]
500		494
501	$class->SUPER::new (	495	$class->SUPER::new (
502	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
503	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
504	@_	498	@_
505	)	499	)
506	}	500	}
507		501
508	sub _draw {	502	sub _draw {
509	my ($self) = @_;	503	my ($self) = @_;
510		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
511	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
512		511
513	glEnable GL_BLEND;	512	glEnable GL_BLEND;
514	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
516		515
517	glBegin GL_QUADS;	516	glBegin GL_QUADS;
518	glVertex 0 , 0;	517	glVertex 0 , 0;
519	glVertex 0 , $h;	518	glVertex 0 , $h;
520	glVertex $w, $h;	519	glVertex $w, $h;
521	glVertex $w, 0;	520	glVertex $w, 0;
522	glEnd;	521	glEnd;
523		522
524	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
525	}	525	}
526		526
527	#############################################################################	527	#############################################################################
528		528
529	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
573	$self->{children} = [	573	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
576	];	576	];
577		577
578	$_->check_size	578	$self->check_size (1);
579	for @widgets;
580
581	$self->update;	579	$self->update;
582	}	580	}
583		581
584	sub children {	582	sub children {
585	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
692	}	690	}
693		691
694	sub update {	692	sub update {
695	my ($self) = @_;	693	my ($self) = @_;
696		694
697	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
698	$self->SUPER::update;	696	$self->SUPER::update;
699	}	697	}
700		698
701	sub size_allocate {	699	sub size_allocate {
702	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
715	$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 {
716	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
717	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
718		716
719	$self->_render;	717	$self->_render;
720	# glColorMask 1, 1, 1, 0;
721	# glEnable GL_BLEND;
722	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723	# glRasterPos 0, 0;
724	# glCopyPixels 0, 0, $self->{w}, $self->{h};
725	# glDisable GL_BLEND;
726	# glColorMask 1, 1, 1, 1;
727	};	718	};
728	}	719	}
729		720
730	sub _draw {	721	sub _draw {
731	my ($self) = @_;	722	my ($self) = @_;
…		…
733	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
734		725
735	my $tex = $self->{texture}	726	my $tex = $self->{texture}
736	or return;	727	or return;
737		728
738	glEnable GL_BLEND;
739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
743		732
744	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745		734
746	glDisable GL_BLEND;
747	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
748	}	736	}
749		737
750	#############################################################################	738	#############################################################################
751		739
…		…
755		743
756	sub size_request {	744	sub size_request {
757	my ($self) = @_;	745	my ($self) = @_;
758		746
759	@$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)};
760	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
761		748
762	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
763	}	750	}
764		751
765	sub size_allocate {	752	sub size_allocate {
766	my ($self, $w, $h) = @_;	753	my ($self, $w, $h) = @_;
767		754
		755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
768	$self->update;	758	$self->update;
769	}	759	}
770		760
771	sub set_offset {	761	sub set_offset {
772	my ($self, $x, $y) = @_;	762	my ($self, $x, $y) = @_;
…		…
775	$self->{view_y} = int $y;	765	$self->{view_y} = int $y;
776		766
777	$self->update;	767	$self->update;
778	}	768	}
779		769
780	# 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
781	sub _topleft {	771	sub coord2local {
782	my ($self, $x, $y) = @_;	772	my ($self, $x, $y) = @_;
783		773
784	$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)
785	}	784	}
786		785
787	sub find_widget {	786	sub find_widget {
788	my ($self, $x, $y) = @_;	787	my ($self, $x, $y) = @_;
789		788
…		…
817		816
818	my $slider = new CFClient::UI::Slider	817	my $slider = new CFClient::UI::Slider
819	vertical => 1,	818	vertical => 1,
820	range => [0, 0, 1, 0.01], # HACK fix	819	range => [0, 0, 1, 0.01], # HACK fix
821	connect_changed => sub {	820	connect_changed => sub {
822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1]);
823	},	822	},
824	;	823	;
825		824
826	$self = $class->SUPER::new (	825	$self = $class->SUPER::new (
827	vp => (new CFClient::UI::ViewPort),	826	vp => (new CFClient::UI::ViewPort expand => 1),
828	slider => $slider,	827	slider => $slider,
829	@_,	828	@_,
830	);	829	);
831		830
832	$self->{vp}->add ($self->{scrolled});	831	$self->{vp}->add ($self->{scrolled});
…		…
834	$self->add ($self->{slider});	833	$self->add ($self->{slider});
835		834
836	$self	835	$self
837	}	836	}
838		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
839	#TODO# update range on size_allocate depeneing on child	847	#TODO# update range on size_allocate depending on child
840	# update viewport offset on scroll	848	# update viewport offset on scroll
841		849
842	#############################################################################	850	#############################################################################
843		851
844	package CFClient::UI::Frame;	852	package CFClient::UI::Frame;
…		…
848	use CFClient::OpenGL;	856	use CFClient::OpenGL;
849		857
850	sub new {	858	sub new {
851	my $class = shift;	859	my $class = shift;
852		860
853	my $self = $class->SUPER::new (	861	$class->SUPER::new (
854	bg => [1, 1, 1, 1],	862	bg => undef,
855	border_bg => [1, 1, 1, 1],
856	border => 0.8,
857	@_	863	@_,
858	);	864	)
859
860	$self
861	}	865	}
862		866
863	sub _draw {	867	sub _draw {
864	my ($self) = @_;	868	my ($self) = @_;
865		869
866	my ($w, $h) = ($self->{w}, $self->{h});	870	if ($self->{bg}) {
		871	my ($w, $h) = @$self{qw(w h)};
867		872
868	glEnable GL_BLEND;	873	glEnable GL_BLEND;
869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	874	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870	glEnable GL_TEXTURE_2D;	875	glColor @{ $self->{bg} };
871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872		876
873	# glBegin GL_QUADS;	877	glBegin GL_QUADS;
874	# glColor 0, 0, 0, 0;
875	# glVertex 0 , 0;	878	glVertex 0 , 0;
876	# glVertex 0 , $h;	879	glVertex 0 , $h;
877	# glVertex $w, $h;	880	glVertex $w, $h;
878	# glVertex $w, 0;	881	glVertex $w, 0;
879	# glEnd;	882	glEnd;
880		883
881
882	$self->child->draw;
883	glDisable GL_BLEND;	884	glDisable GL_BLEND;
884	glDisable GL_TEXTURE_2D;	885	}
		886
		887	$self->SUPER::_draw;
885	}	888	}
886		889
887	#############################################################################	890	#############################################################################
888		891
889	package CFClient::UI::FancyFrame;	892	package CFClient::UI::FancyFrame;
…		…
903		906
904	my $self = $class->SUPER::new (	907	my $self = $class->SUPER::new (
905	bg => [1, 1, 1, 1],	908	bg => [1, 1, 1, 1],
906	border_bg => [1, 1, 1, 1],	909	border_bg => [1, 1, 1, 1],
907	border => 0.6,	910	border => 0.6,
		911	toplevel => 1,
908	can_events => 1,	912	can_events => 1,
909	@_	913	@_
910	);	914	);
911		915
912	$self->{title} &&= new CFClient::UI::Label	916	$self->{title} &&= new CFClient::UI::Label
…		…
937	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
938		942
939	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
940	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
941		945
942	$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)
943	if $self->{title};	947	if $self->{title};
944		948
945	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
946	}	950	}
947		951
…		…
1005	my ($self) = @_;	1009	my ($self) = @_;
1006		1010
1007	my ($w, $h ) = ($self->{w}, $self->{h});	1011	my ($w, $h ) = ($self->{w}, $self->{h});
1008	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1012	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009		1013
1010	glEnable GL_BLEND;
1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012	glEnable GL_TEXTURE_2D;	1014	glEnable GL_TEXTURE_2D;
1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1015	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014		1016
1015	my $border = $self->border;	1017	my $border = $self->border;
1016		1018
1017	glColor @{ $self->{border_bg} };	1019	glColor @{ $self->{border_bg} };
1018	$tex[1]->draw_quad (0, 0, $w, $border);	1020	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019	$tex[3]->draw_quad (0, $border, $border, $ch);	1021	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1022	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1023	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022		1024
1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1025	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024	my $bg = $tex[0];	1026	my $bg = $tex[0];
1025		1027
1026	# TODO: repeat texture not scale	1028	# TODO: repeat texture not scale
…		…
1030	glColor @{ $self->{bg} };	1032	glColor @{ $self->{bg} };
1031		1033
1032	$bg->{s} = $rep_x;	1034	$bg->{s} = $rep_x;
1033	$bg->{t} = $rep_y;	1035	$bg->{t} = $rep_y;
1034	$bg->{wrap_mode} = 1;	1036	$bg->{wrap_mode} = 1;
1035	$bg->draw_quad ($border, $border, $cw, $ch);	1037	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1038	}
1036		1039
1037	glDisable GL_TEXTURE_2D;	1040	glDisable GL_TEXTURE_2D;
1038	glDisable GL_BLEND;
1039	}
1040		1041
1041	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
1042		1043
1043	$self->child->draw;	1044	$self->child->draw;
1044	}	1045	}
…		…
1271	}	1272	}
1272		1273
1273	sub size_allocate {	1274	sub size_allocate {
1274	my ($self, $w, $h) = @_;	1275	my ($self, $w, $h) = @_;
1275		1276
		1277	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1278
1276	my $children = $self->{children};	1279	my $children = $self->{children};
1277		1280
1278	my @h = map $_->{req_h}, @$children;	1281	my @h = map $_->{req_h}, @$children;
1279		1282
1280	my $req_h = List::Util::sum @h;	1283	my $req_h = List::Util::sum @h;
…		…
1309		1312
1310	#############################################################################	1313	#############################################################################
1311		1314
1312	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1313		1316
1314	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1315		1318
1316	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1317		1320
1318	sub new {	1321	sub new {
1319	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1320		1323
1321	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1322	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1323	#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),
1324	fontsize => 1,	1334	fontsize => 1,
1325	text => "",
1326	align => -1,	1335	align => -1,
1327	valign => -1,	1336	valign => -1,
1328	padding => 2,	1337	padding => 2,
1329	layout => new CFClient::Layout,
1330	can_events => 0,	1338	can_events => 0,
1331	%arg	1339	%arg
1332	);	1340	);
1333		1341
1334	if (exists $self->{template}) {	1342	if (exists $self->{template}) {
1335	my $layout = new CFClient::Layout;	1343	my $layout = new CFClient::Layout;
1336	$layout->set_text (delete $self->{template});	1344	$layout->set_text (delete $self->{template});
1337	$self->{template} = $layout;	1345	$self->{template} = $layout;
1338	}	1346	}
1339		1347
1340	$self->set_text (delete $self->{text}) if exists $self->{text};	1348	if (exists $self->{markup}) {
1341	$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	}
1342		1353
1343	$self	1354	$self
1344	}	1355	}
1345		1356
1346	sub escape {	1357	sub escape($) {
1347	local $_ = $_[1];	1358	local $_ = $_[0];
1348		1359
1349	s/&/&amp;/g;	1360	s/&/&amp;/g;
1350	s/>/&gt;/g;	1361	s/>/&gt;/g;
1351	s/</&lt;/g;	1362	s/</&lt;/g;
1352		1363
1353	$_[1]	1364	$_
1354	}	1365	}
1355		1366
1356	sub update {	1367	sub update {
1357	my ($self) = @_;	1368	my ($self) = @_;
1358		1369
…		…
1364	my ($self, $text) = @_;	1375	my ($self, $text) = @_;
1365		1376
1366	return if $self->{text} eq "T$text";	1377	return if $self->{text} eq "T$text";
1367	$self->{text} = "T$text";	1378	$self->{text} = "T$text";
1368		1379
		1380	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369	$self->{layout}->set_text ($text);	1381	$self->{layout}->set_text ($text);
1370		1382
1371	delete $self->{texture};
1372	$self->update;	1383	$self->update;
1373	$self->check_size;	1384	$self->check_size;
1374	}	1385	}
1375		1386
1376	sub set_markup {	1387	sub set_markup {
1377	my ($self, $markup) = @_;	1388	my ($self, $markup) = @_;
1378		1389
1379	return if $self->{text} eq "M$markup";	1390	return if $self->{text} eq "M$markup";
1380	$self->{text} = "M$markup";	1391	$self->{text} = "M$markup";
1381		1392
		1393	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1394
		1395	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382	$self->{layout}->set_markup ($markup);	1396	$self->{layout}->set_markup ($markup);
1383		1397
1384	delete $self->{texture};
1385	$self->update;	1398	$self->update;
1386	$self->check_size;	1399	$self->check_size;
1387	}	1400	}
1388		1401
1389	sub size_request {	1402	sub size_request {
1390	my ($self) = @_;	1403	my ($self) = @_;
1391		1404
1392	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1393	$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});
1394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395		1410
1396	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1397		1412
1398	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1428	}	1443	}
1429		1444
1430	sub _draw {	1445	sub _draw {
1431	my ($self) = @_;	1446	my ($self) = @_;
1432		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1433	my $tex = $self->{texture} ||= do {	1450	my $tex = $self->{texture} ||= do {
		1451	$self->{layout}->set_foreground (@{$self->{fg}});
1434	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1435	$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});
1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1457
1437	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
1438	};	1469	};
1439		1470
1440	glEnable GL_BLEND;
1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
1443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444		1473
		1474	if ($tex->{format} == GL_ALPHA) {
1445	glColor @{$self->{fg}};	1475	glColor @{$self->{fg}};
1446
1447	$self->{ox} = int (
1448	$self->{align} < 0 ? $self->{padding}
1449	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450	: ($self->{w} - $tex->{w}) * 0.5
1451	);
1452
1453	$self->{oy} = int (
1454	$self->{valign} < 0 ? $self->{padding}
1455	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456	: ($self->{h} - $tex->{h}) * 0.5
1457	);
1458
1459	$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	}
1460		1480
1461	glDisable GL_TEXTURE_2D;	1481	glDisable GL_TEXTURE_2D;
1462	glDisable GL_BLEND;
1463	}	1482	}
1464		1483
1465	#############################################################################	1484	#############################################################################
1466		1485
1467	package CFClient::UI::EntryBase;	1486	package CFClient::UI::EntryBase;
…		…
1480	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1481	can_hover => 1,	1500	can_hover => 1,
1482	can_focus => 1,	1501	can_focus => 1,
1483	valign => 0,	1502	valign => 0,
1484	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1485	@_	1505	@_
1486	)	1506	)
1487	}	1507	}
1488		1508
1489	sub _set_text {	1509	sub _set_text {
…		…
1500		1520
1501	$text =~ s/./*/g if $self->{hidden};	1521	$text =~ s/./*/g if $self->{hidden};
1502	$self->{layout}->set_text ("$text ");	1522	$self->{layout}->set_text ("$text ");
1503		1523
1504	$self->emit (changed => $self->{text});	1524	$self->emit (changed => $self->{text});
1505	}
1506
1507	sub get_text {
1508	$_[0]{text}
1509	}
1510
1511	sub size_request {
1512	my ($self) = @_;
1513
1514	my ($w, $h) = $self->SUPER::size_request;
1515
1516	($w + 1, $h) # add 1 for cursor
1517	}
1518
1519	sub size_allocate {
1520	my ($self, $w, $h) = @_;
1521
1522	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523	}	1525	}
1524		1526
1525	sub set_text {	1527	sub set_text {
1526	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1527		1529
1528	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1529	$self->_set_text ($text);	1531	$self->_set_text ($text);
1530	$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
1531	}	1552	}
1532		1553
1533	sub key_down {	1554	sub key_down {
1534	my ($self, $ev) = @_;	1555	my ($self, $ev) = @_;
1535		1556
…		…
1537	my $sym = $ev->{sym};	1558	my $sym = $ev->{sym};
1538	my $uni = $ev->{unicode};	1559	my $uni = $ev->{unicode};
1539		1560
1540	my $text = $self->get_text;	1561	my $text = $self->get_text;
1541		1562
1542	if ($sym == 8) {	1563	if ($uni == 8) {
1543	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1564	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544	} elsif ($sym == 127) {	1565	} elsif ($uni == 127) {
1545	substr $text, $self->{cursor}, 1, "";	1566	substr $text, $self->{cursor}, 1, "";
1546	} elsif ($sym == CFClient::SDLK_LEFT) {	1567	} elsif ($sym == CFClient::SDLK_LEFT) {
1547	--$self->{cursor} if $self->{cursor};	1568	--$self->{cursor} if $self->{cursor};
1548	} elsif ($sym == CFClient::SDLK_RIGHT) {	1569	} elsif ($sym == CFClient::SDLK_RIGHT) {
1549	++$self->{cursor} if $self->{cursor} < length $self->{text};	1570	++$self->{cursor} if $self->{cursor} < length $self->{text};
1550	} elsif ($sym == CFClient::SDLK_HOME) {	1571	} elsif ($sym == CFClient::SDLK_HOME) {
1551	$self->{cursor} = 0;	1572	$self->{cursor} = 0;
1552	} elsif ($sym == CFClient::SDLK_END) {	1573	} elsif ($sym == CFClient::SDLK_END) {
1553	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1554	} elsif ($sym == 27) {	1575	} elsif ($uni == 27) {
1555	$self->emit ('escape');	1576	$self->emit ('escape');
1556	} elsif ($uni) {	1577	} elsif ($uni) {
1557	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1558	}	1579	}
1559		1580
1560	$self->_set_text ($text);	1581	$self->_set_text ($text);
1561	$self->update;	1582	$self->update;
		1583	$self->check_size;
1562	}	1584	}
1563		1585
1564	sub focus_in {	1586	sub focus_in {
1565	my ($self) = @_;	1587	my ($self) = @_;
1566		1588
…		…
1695	my $class = shift;	1717	my $class = shift;
1696		1718
1697	$class->SUPER::new (	1719	$class->SUPER::new (
1698	padding => 4,	1720	padding => 4,
1699	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1700	bg => [1, 1, 1, 0.2],
1701	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1702	can_hover => 1,	1723	can_hover => 1,
1703	align => 0,	1724	align => 0,
1704	valign => 0,	1725	valign => 0,
1705	can_events => 1,	1726	can_events => 1,
…		…
1723		1744
1724	if ($GRAB == $self) {	1745	if ($GRAB == $self) {
1725	$self->{fg} = $self->{active_fg};	1746	$self->{fg} = $self->{active_fg};
1726	}	1747	}
1727		1748
1728	glEnable GL_BLEND;
1729	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730	glEnable GL_TEXTURE_2D;	1749	glEnable GL_TEXTURE_2D;
1731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732	glColor 0, 0, 0, 1;	1751	glColor 0, 0, 0, 1;
1733		1752
1734	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1753	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735		1754
1736	glDisable GL_TEXTURE_2D;	1755	glDisable GL_TEXTURE_2D;
1737	glDisable GL_BLEND;
1738		1756
1739	$self->SUPER::_draw;	1757	$self->SUPER::_draw;
1740	}	1758	}
1741		1759
1742	#############################################################################	1760	#############################################################################
…		…
1756		1774
1757	$class->SUPER::new (	1775	$class->SUPER::new (
1758	padding => 2,	1776	padding => 2,
1759	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1760	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],
1761	state => 0,	1781	state => 0,
1762	can_hover => 1,	1782	can_hover => 1,
1763	@_	1783	@_
1764	)	1784	)
1765	}	1785	}
…		…
1789		1809
1790	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;
1791		1811
1792	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1812	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793		1813
1794	glEnable GL_BLEND;	1814	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1815
1795	glEnable GL_TEXTURE_2D;	1816	glEnable GL_TEXTURE_2D;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798	my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800	$tex->draw_quad (0, 0, $s, $s);	1817	$tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1803	glDisable GL_BLEND;
1804	}	1819	}
1805		1820
1806	#############################################################################	1821	#############################################################################
1807		1822
1808	package CFClient::UI::Image;	1823	package CFClient::UI::Image;
…		…
1851	glTranslate 0, -$self->{w}, 0;	1866	glTranslate 0, -$self->{w}, 0;
1852		1867
1853	($w, $h) = ($h, $w);	1868	($w, $h) = ($h, $w);
1854	}	1869	}
1855		1870
1856	glEnable GL_BLEND;
1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858	glEnable GL_TEXTURE_2D;	1871	glEnable GL_TEXTURE_2D;
1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860		1873
1861	$tex->draw_quad (0, 0, $w, $h);	1874	$tex->draw_quad_alpha (0, 0, $w, $h);
1862		1875
1863	glDisable GL_BLEND;
1864	glDisable GL_TEXTURE_2D;	1876	glDisable GL_TEXTURE_2D;
1865	}	1877	}
1866		1878
1867	#############################################################################	1879	#############################################################################
1868		1880
…		…
2057	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
2058		2070
2059	sub new {	2071	sub new {
2060	my $class = shift;	2072	my $class = shift;
2061		2073
2062	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
2063		2075
2064	# TODO: 0-width page	2076	# TODO: 0-width page
2065	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
2066	# TODO: calculations are off	2078	# TODO: calculations are off
2067	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
2069	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],
2070	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
2071	req_w => $::WIDTH / 80,	2085	req_w => $::WIDTH / 80,
2072	req_h => $::WIDTH / 80,	2086	req_h => $::WIDTH / 80,
2073	vertical => 0,	2087	vertical => 0,
2074	can_hover => 1,	2088	can_hover => 1,
2075	inner_pad => 5,	2089	inner_pad => 0.02,
2076	@_	2090	@_
2077	);	2091	);
2078		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
2079	$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	}
2080	}	2128	}
2081		2129
2082	sub size_request {	2130	sub size_request {
2083	my ($self) = @_;	2131	my ($self) = @_;
2084		2132
…		…
2090		2138
2091	sub button_down {	2139	sub button_down {
2092	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
2093		2141
2094	$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
2095	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
2096	}	2147	}
2097		2148
2098	sub mouse_motion {	2149	sub mouse_motion {
2099	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
2100		2151
2101	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
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) || 1e-100;
2103		2171
2104	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2105		2173
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2175	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2108		2176
2109	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
2110	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$value = $value * $self->{scale} + $self->{offset};
2111	$x = $lo if $x < $lo;
2112	$x = $hi - $page if $x > $hi - $page;
2113	$self->{range}[0] = $x;
2114		2179
2115	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
2116	$self->update;	2181	$self->{knob_w} = $knob_w;
2117	}	2182	});
2118	}
2119		2183
2120	# the inner_* stuff is for generating a padding for the slider handle,	2184	$self->SUPER::update;
2121	# so that the handle doesn't leave the texture. This calculation isn't 100%
2122	# correct propably, but it does the job for now
2123	sub _calc_inner_pad_px {
2124	my ($self, $w) = @_;
2125	($w / 100) * $self->{inner_pad} # % to pixels
2126	}	2185	}
2127		2186
2128	sub _draw {	2187	sub _draw {
2129	my ($self) = @_;	2188	my ($self) = @_;
2130		2189
2131	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
2132		2191
2133	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
2134		2193
2135	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
2136	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
2137		2196
		2197	glTranslate 1, 0, 0;
2138	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
2139	glTranslate 0, -$self->{w}, 0;
2140
2141	($w, $h) = ($h, $w);
2142	}	2199	}
2143		2200
2144	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146		2203
2147	my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149	$hi = $value + 1 if $lo == $hi;
2150
2151	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154	$page = int $page * $inner_w / ($hi - $lo);
2155	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157	$w -= $page;
2158	$page &= ~1;
2159	glTranslate $page * 0.5, 0, 0;
2160	$page ||= 2;
2161
2162	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165	glEnable GL_BLEND;
2166	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2204	glEnable GL_TEXTURE_2D;
2168	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169		2206
2170	# draw background	2207	# draw background
2171	$tex[1]->draw_quad (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172		2209
2173	# draw handle	2210	# draw handle
2174	$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);
2175		2212
2176	glDisable GL_BLEND;
2177	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2178	}	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 (@_) }
2179		2256
2180	#############################################################################	2257	#############################################################################
2181		2258
2182	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2183		2260
…		…
2192	fontsize => 1,	2269	fontsize => 1,
2193	can_events => 0,	2270	can_events => 0,
2194	#font => default_font	2271	#font => default_font
2195	@_,	2272	@_,
2196		2273
2197	layout => (new CFClient::Layout),	2274	layout => (new CFClient::Layout 1),
2198	par => [],	2275	par => [],
2199	height => 0,	2276	height => 0,
2200	children => [	2277	children => [
2201	(new CFClient::UI::Empty expand => 1),	2278	(new CFClient::UI::Empty expand => 1),
2202	(new CFClient::UI::Slider vertical => 1),	2279	(new CFClient::UI::Slider vertical => 1),
…		…
2213		2290
2214	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2215	$self->reflow;	2292	$self->reflow;
2216	}	2293	}
2217		2294
2218	sub text_height {
2219	my ($self, $text) = @_;
2220
2221	my $layout = $self->{layout};
2222
2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224	$layout->set_width ($self->{children}[0]{w});
2225	$layout->set_text ($text);
2226
2227	($layout->size)[1]
2228	}
2229
2230	sub reflow {
2231	my ($self) = @_;
2232
2233	$self->{need_reflow}++;
2234	$self->update;
2235	}
2236
2237	sub size_allocate {	2295	sub size_allocate {
2238	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2239		2297
2240	$self->SUPER::size_allocate ($w, $h);	2298	$self->SUPER::size_allocate ($w, $h);
2241		2299
…		…
2244	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2245		2303
2246	$self->reflow;	2304	$self->reflow;
2247	}	2305	}
2248		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
2249	sub add_paragraph {	2341	sub add_paragraph {
2250	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2251		2343
2252	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2253		2345	my ($w, $h) = $self->text_size ($line);
2254	my $height = $self->text_height ($text);
2255
2256	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2257		2349
2258	push @{$self->{par}}, [$height, $color, $text];
2259
2260	$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]);
2261	$self->{children}[1]->update;
2262	}	2351	}
2263		2352
2264	sub update {	2353	sub update {
2265	my ($self) = @_;	2354	my ($self) = @_;
2266		2355
…		…
2268		2357
2269	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2270		2359
2271	delete $self->{texture};	2360	delete $self->{texture};
2272		2361
2273	$ROOT->on_refresh ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2274	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2275	my $height = 0;	2366	my $height = 0;
2276		2367
2277	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2278	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	}
2279		2383
2280	$self->{height} = $height;	2384	$self->{height} = $height;
2281		2385
2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2283		2387
2284	delete $self->{texture};	2388	delete $self->{texture};
2285	}	2389	}
2286		2390
2287	$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 {
2288	glClearColor 0, 0, 0, 0;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2289	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2290		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
2291	glEnable GL_BLEND;	2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2408	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2293	glEnable GL_TEXTURE_2D;
2294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295
2296	my $top = int $self->{children}[1]{range}[0];
2297
2298	my $y0 = $top;
2299	my $y1 = $top + $self->{h};
2300
2301	my $y = 0;
2302
2303	my $layout = $self->{layout};
2304
2305	$layout->set_font ($self->{font}) if $self->{font};
2306		2409
2307	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2308	my $h = $par->[0];	2411	my $h = $par->[1];
2309		2412
2310	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]);
2311	$layout->set_text ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2312		2417
2313	glColor @{ $par->[1] };	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	my ($W, $H) = $layout->size;	2419
2315	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;
2316	}	2422	}
2317		2423
2318	$y += $h;	2424	$y += $h;
2319	}	2425	}
2320		2426
2321	glDisable GL_TEXTURE_2D;
2322	glDisable GL_BLEND;	2427	glDisable GL_BLEND;
2323	};	2428	};
2324	});	2429	});
2325	}	2430	}
2326		2431
2327	sub _draw {	2432	sub _draw {
2328	my ($self) = @_;	2433	my ($self) = @_;
2329		2434
2330	glEnable GL_BLEND;
2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2335	$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});
2336	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2337	glDisable GL_BLEND;
2338		2440
2339	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2340		2442
2341	}	2443	}
2342		2444
…		…
2436	@_,	2538	@_,
2437	can_events => 0,	2539	can_events => 0,
2438	)	2540	)
2439	}	2541	}
2440		2542
2441	sub set_markup {	2543	sub set_tooltip_from {
2442	my ($self, $text) = @_;	2544	my ($self, $widget) = @_;
2443		2545
2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2546	$self->add (new CFClient::UI::Label
2445	$self->{label}->set_markup ($text);	2547	markup => $widget->{tooltip},
2446	$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	);
2447	}	2554	}
2448		2555
2449	sub size_request {	2556	sub size_request {
2450	my ($self) = @_;	2557	my ($self) = @_;
2451
2452	$self->child->set_max_size ($::WIDTH * 0.3);
2453		2558
2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2559	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455		2560
2456	($w + 4, $h + 4)	2561	($w + 4, $h + 4)
2457	}	2562	}
…		…
2463	}	2568	}
2464		2569
2465	sub _draw {	2570	sub _draw {
2466	my ($self) = @_;	2571	my ($self) = @_;
2467		2572
2468	glPushMatrix;
2469	glTranslate 0.375, 0.375;	2573	glTranslate 0.375, 0.375;
2470		2574
2471	my ($w, $h) = @$self{qw(w h)};	2575	my ($w, $h) = @$self{qw(w h)};
2472		2576
2473	glColor 1, 0.8, 0.4;	2577	glColor 1, 0.8, 0.4;
…		…
2484	glVertex 0 , $h;	2588	glVertex 0 , $h;
2485	glVertex $w, $h;	2589	glVertex $w, $h;
2486	glVertex $w, 0;	2590	glVertex $w, 0;
2487	glEnd;	2591	glEnd;
2488		2592
2489	glPopMatrix;	2593	glTranslate 2 - 0.375, 2 - 0.375;
2490
2491	glTranslate 2, 2;
2492	$self->SUPER::_draw;	2594	$self->SUPER::_draw;
2493	}	2595	}
2494		2596
2495	#############################################################################	2597	#############################################################################
2496		2598
…		…
2501	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2502		2604
2503	sub new {	2605	sub new {
2504	my $class = shift;	2606	my $class = shift;
2505		2607
2506	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2507	aspect => 1,	2609	aspect => 1,
2508	@_,	2610	@_,
2509	)	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
2510	}	2628	}
2511		2629
2512	sub size_request {	2630	sub size_request {
2513	(32, 8)	2631	(32, 8)
2514	}	2632	}
2515		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2516	sub _draw {	2642	sub _draw {
2517	my ($self) = @_;	2643	my ($self) = @_;
2518		2644
2519	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
2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521		2657
2522	# TODO animation
2523	if ($tex) {	2658	if ($tex) {
2524	glEnable GL_BLEND;
2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2531	glDisable GL_BLEND;
2532	}	2664	}
		2665	}
		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
2533	}	2674	}
2534		2675
2535	#############################################################################	2676	#############################################################################
2536		2677
2537	package CFClient::UI::InventoryItem;	2678	package CFClient::UI::InventoryItem;
2538		2679
2539	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	}
2540		2707
2541	sub new {	2708	sub new {
2542	my $class = shift;	2709	my $class = shift;
2543		2710
2544	my %args = @_;	2711	my %args = @_;
2545		2712
2546	my $item = $args{item};	2713	my $item = delete $args{item};
2547		2714
2548	my $desc = $item->{nrof} < 2	2715	my $desc = _item_to_desc ($item);
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551
2552		2716
2553	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2554	can_hover => 1,	2718	can_hover => 1,
2555	can_events => 1,	2719	can_events => 1,
2556	tooltip => (CFClient::UI::Label->escape ($desc)	2720	tooltip => ((CFClient::UI::Label::escape $desc)
2557	. "\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>"),
2558	connect_button_down => sub {	2722	connect_button_down => sub {
2559	my ($self, $ev, $x, $y) = @_;	2723	my ($self, $ev, $x, $y) = @_;
2560		2724
2561	# 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");
2562	if ($ev->{button} == 1) {	2734	} elsif ($ev->{button} == 1) {
2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2735	$::CONN->send ("examine $item->{tag}");
2564	} elsif ($ev->{button} == 2) {	2736	} elsif ($ev->{button} == 2) {
2565	$::CONN->send ("apply $item->{tag}");	2737	$::CONN->send ("apply $item->{tag}");
2566	} elsif ($ev->{button} == 3) {	2738	} elsif ($ev->{button} == 3) {
2567	CFClient::UI::Menu->new (	2739	my @menu_items = (
2568	items => [
2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2740	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570	[
2571	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572	sub { $::CONN->send ("lock $item->{tag}") },
2573	],
2574	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2575	["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}) }],
2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
2577	],	2752	),
2578	)->popup ($ev);	2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2579	}	2756	}
2580		2757
2581	1	2758	1
2582	},	2759	},
2583	%args	2760	%args
2584	);	2761	);
		2762
		2763
2585	$self->add(new CFClient::UI::Face	2764	$self->add (new CFClient::UI::Face
2586	can_events => 0,	2765	can_events => 0,
2587	face => $item->{face},	2766	face => $item->{face},
2588	anim => $item->{anim},	2767	anim => $item->{anim},
2589	animspeed => $item->{animspeed});	2768	animspeed => $item->{animspeed},
2590	$self->add(new CFClient::UI::Label	2769	);
2591	can_events => 0,	2770
2592	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;
2593		2776
2594	$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);
2595	}	2786	}
2596		2787
2597	#############################################################################	2788	#############################################################################
2598		2789
2599	package CFClient::UI::Inventory;	2790	package CFClient::UI::Inventory;
…		…
2602		2793
2603	sub new {	2794	sub new {
2604	my $class = shift;	2795	my $class = shift;
2605		2796
2606	my $self = $class->SUPER::new (	2797	my $self = $class->SUPER::new (
2607	scrolled => (new CFClient::UI::VBox),	2798	scrolled => (new CFClient::UI::Table),
2608	@_,	2799	@_,
2609	);	2800	);
2610		2801
2611	$self	2802	$self
2612	}	2803	}
…		…
2615	my ($self, $items) = @_;	2806	my ($self, $items) = @_;
2616		2807
2617	$self->{scrolled}->clear;	2808	$self->{scrolled}->clear;
2618	return unless $items;	2809	return unless $items;
2619		2810
2620	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;
2621		2815
2622	$self->{real_items} = \@items;	2816	$self->{real_items} = \@items;
2623		2817
2624	for my $item (@items) {	2818	for my $item (@items) {
2625	my $desc = $item->{nrof} < 2	2819	$item->{item} = $item;
2626	? $item->{name}
2627	: "$item->{nrof} $item->{name_pl}";
2628
2629	$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);
2630	}	2829	}
2631		2830
2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	}	2832	}
2634		2833
…		…
2709	}	2908	}
2710	}	2909	}
2711		2910
2712	#############################################################################	2911	#############################################################################
2713		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
2714	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2715		3022
2716	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
2717		3024
2718	use CFClient::OpenGL;	3025	use CFClient::OpenGL;
2719		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
2720	sub check_size {	3042	sub check_size {
2721	my ($self) = @_;	3043	my ($self) = @_;
2722		3044
2723	$self->configure (0, 0, $self->{w}, $self->{h});	3045	$self->size_allocate ($self->{w}, $self->{h})
		3046	if $self->{w};
2724	}	3047	}
2725		3048
2726	sub size_request {	3049	sub size_request {
2727	my ($self) = @_;	3050	my ($self) = @_;
2728		3051
…		…
2730	}	3053	}
2731		3054
2732	sub size_allocate {	3055	sub size_allocate {
2733	my ($self, $w, $h) = @_;	3056	my ($self, $w, $h) = @_;
2734		3057
2735	my $old_w = $self->{old_w};	3058	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736	my $old_h = $self->{old_h};	3059	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737		3060
2738	if ($old_w && $old_h) {	3061	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739	for my $child ($self->children) {	3062	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2740	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748	}
2749	}
2750
2751	$self->{old_w} = $w;
2752	$self->{old_h} = $h;
2753	}
2754
2755	sub configure {
2756	my ($self, $x, $y, $w, $h) = @_;
2757
2758	$self->SUPER::configure ($x, $y, $w, $h);
2759		3063
2760	for my $child ($self->children) {	3064	for my $child ($self->children) {
2761	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)};
2762		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
2763	$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;
2764	$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
2765	$child->configure ($X, $Y, $W, $H);	3076	$child->configure ($X, $Y, $W, $H);
2766	}	3077	}
2767	}	3078	}
2768		3079
2769	sub _topleft {	3080	sub coord2local {
2770	my ($self, $x, $y) = @_;	3081	my ($self, $x, $y) = @_;
2771		3082
2772	($x, $y)	3083	($x, $y)
2773	}	3084	}
2774		3085
		3086	sub coord2global {
		3087	my ($self, $x, $y) = @_;
		3088
		3089	($x, $y)
		3090	}
		3091
2775	sub update {	3092	sub update {
2776	my ($self) = @_;	3093	my ($self) = @_;
2777		3094
2778	$self->check_size;	3095	$self->check_size;
2779	::refresh ();	3096	$::WANT_REFRESH++;
2780	}	3097	}
2781		3098
2782	sub add {	3099	sub add {
2783	my ($self, $child) = @_;	3100	my ($self, @children) = @_;
2784		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
2785	# integerize window positions	3111	# integerise window positions
2786	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2787	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
		3114	}
2788		3115
2789	$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	}
2790	}	3129	}
2791		3130
2792	sub on_refresh {	3131	sub on_refresh {
2793	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2794		3133
2795	$self->{refresh_hook}{$id} = $cb;	3134	$self->{refresh_hook}{$id} = $cb;
2796	}	3135	}
2797		3136
		3137	sub on_post_alloc {
		3138	my ($self, $id, $cb) = @_;
		3139
		3140	$self->{post_alloc_hook}{$id} = $cb;
		3141	}
		3142
2798	sub draw {	3143	sub draw {
2799	my ($self) = @_;	3144	my ($self) = @_;
2800		3145
2801	while (my $rcb = delete $self->{refresh_hook}) {	3146	while ($self->{refresh_hook}) {
2802	$_->() 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}};
2803	}	3199	}
2804		3200
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2808		3204
2809	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2810	glLoadIdentity;	3206	glLoadIdentity;
2811	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2813	glLoadIdentity;	3209	glLoadIdentity;
2814		3210
2815	$self->_draw;	3211	$self->_draw;
2816	}	3212	}
…		…
2818	#############################################################################	3214	#############################################################################
2819		3215
2820	package CFClient::UI;	3216	package CFClient::UI;
2821		3217
2822	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2823	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824		3220
2825	1	3221	1
2826		3222

Diff Legend

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