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.222 by root, Mon May 22 03:59:51 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);
179	}	214	}
180		215
…		…
232	$self->{y} = $y;	267	$self->{y} = $y;
233	$self->update;	268	$self->update;
234	}	269	}
235		270
236	if ($self->{w} != $w || $self->{h} != $h) {	271	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	272	$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	}	273	}
244	}	274	}
245		275
246	sub size_allocate {	276	sub size_allocate {
247	# nothing to be done	277	# nothing to be done
248	}	278	}
249		279
		280	sub reconfigure {
		281	my ($self) = @_;
		282
		283	$self->check_size (1);
		284	$self->update;
		285	}
		286
250	sub children {	287	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	}	288	}
264		289
265	sub set_max_size {	290	sub set_max_size {
266	my ($self, $w, $h) = @_;	291	my ($self, $w, $h) = @_;
267		292
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	293	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	294	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	295	}
271		296
272	# return top left coordinates	297	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	298	my ($self, $tooltip) = @_;
275		299
276	$self->{parent}	300	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		301
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		303	delete $CFClient::UI::TOOLTIP->{owner};
		304	CFClient::UI::check_tooltip;
		305	}
280	}	306	}
281		307
282	# translate global coordinates to local coordinate system	308	# translate global coordinates to local coordinate system
283	sub coord2local {	309	sub coord2local {
284	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
285		311
286	my ($X, $Y) = $self->_topleft;	312	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	313	}
289		314
290	# translate local coordinates to global coordinate system	315	# translate local coordinates to global coordinate system
291	sub coord2global {	316	sub coord2global {
292	my ($self, $x, $y) = @_;	317	my ($self, $x, $y) = @_;
293		318
294	my ($X, $Y) = $self->_topleft;	319	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	320	}
297		321
298	sub focus_in {	322	sub focus_in {
299	my ($self) = @_;	323	my ($self) = @_;
300		324
…		…
372	glVertex $self->{w}, 0;	396	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	397	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	398	glVertex 0 , $self->{h};
375	glEnd;	399	glEnd;
376	glPopMatrix;	400	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	402	}
379	}	403	}
380		404
381	sub _draw {	405	sub _draw {
382	my ($self) = @_;	406	my ($self) = @_;
…		…
398		422
399	sub set_parent {	423	sub set_parent {
400	my ($self, $parent) = @_;	424	my ($self, $parent) = @_;
401		425
402	Scalar::Util::weaken ($self->{parent} = $parent);	426	Scalar::Util::weaken ($self->{parent} = $parent);
		427
		428	# TODO: req_w _does_change after ->reconfigure
		429	$self->check_size
		430	unless exists $self->{req_w};
		431
		432	$self->show;
403	}	433	}
404		434
405	sub check_size {	435	sub check_size {
406	my ($self) = @_;	436	my ($self, $forced) = @_;
407		437
408	$self->_check_size;	438	$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};	439	$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	}	440	}
450		441
451	sub update {	442	sub update {
452	my ($self) = @_;	443	my ($self) = @_;
453		444
454	my $update = $CFClient::UI::ROOT->{_update} ||= {};	445	$self->{parent}->update
455		446	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	}	447	}
468		448
469	sub connect {	449	sub connect {
470	my ($self, $signal, $cb) = @_;	450	my ($self, $signal, $cb) = @_;
471		451
…		…
479	}	459	}
480		460
481	sub DESTROY {	461	sub DESTROY {
482	my ($self) = @_;	462	my ($self) = @_;
483		463
		464	delete $WIDGET{$self+0};
484	#$self->deactivate;	465	#$self->deactivate;
485	}	466	}
486		467
487	#############################################################################	468	#############################################################################
488		469
…		…
497	my $class = shift;	478	my $class = shift;
498		479
499	# range [value, low, high, page]	480	# range [value, low, high, page]
500		481
501	$class->SUPER::new (	482	$class->SUPER::new (
502	bg => [0, 0, 0, 0.2],	483	#bg => [0, 0, 0, 0.2],
503	active_bg => [1, 1, 1, 0.5],	484	#active_bg => [1, 1, 1, 0.5],
504	@_	485	@_
505	)	486	)
506	}	487	}
507		488
508	sub _draw {	489	sub _draw {
509	my ($self) = @_;	490	my ($self) = @_;
510		491
		492	my $color = $FOCUS == $self && $self->{active_bg}
		493	? $self->{active_bg}
		494	: $self->{bg};
		495
		496	if ($color && (@$color < 4 || $color->[3])) {
511	my ($w, $h) = @$self{qw(w h)};	497	my ($w, $h) = @$self{qw(w h)};
512		498
513	glEnable GL_BLEND;	499	glEnable GL_BLEND;
514	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	500	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	501	glColor @$color;
516		502
517	glBegin GL_QUADS;	503	glBegin GL_QUADS;
518	glVertex 0 , 0;	504	glVertex 0 , 0;
519	glVertex 0 , $h;	505	glVertex 0 , $h;
520	glVertex $w, $h;	506	glVertex $w, $h;
521	glVertex $w, 0;	507	glVertex $w, 0;
522	glEnd;	508	glEnd;
523		509
524	glDisable GL_BLEND;	510	glDisable GL_BLEND;
		511	}
525	}	512	}
526		513
527	#############################################################################	514	#############################################################################
528		515
529	package CFClient::UI::Empty;	516	package CFClient::UI::Empty;
…		…
573	$self->{children} = [	560	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	561	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	562	@{$self->{children}}, @widgets
576	];	563	];
577		564
578	$_->check_size	565	$self->check_size (1);
579	for @widgets;
580
581	$self->update;	566	$self->update;
582	}	567	}
583		568
584	sub children {	569	sub children {
585	@{ $_[0]{children} }	570	@{ $_[0]{children} }
…		…
692	}	677	}
693		678
694	sub update {	679	sub update {
695	my ($self) = @_;	680	my ($self) = @_;
696		681
697	$ROOT->on_refresh ($self => sub { $self->render_child });	682	$ROOT->on_post_alloc ($self => sub { $self->render_child });
698	$self->SUPER::update;	683	$self->SUPER::update;
699	}	684	}
700		685
701	sub size_allocate {	686	sub size_allocate {
702	my ($self, $w, $h) = @_;	687	my ($self, $w, $h) = @_;
…		…
715	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
716	glClearColor 0, 0, 0, 0;	701	glClearColor 0, 0, 0, 0;
717	glClear GL_COLOR_BUFFER_BIT;	702	glClear GL_COLOR_BUFFER_BIT;
718		703
719	$self->_render;	704	$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	};	705	};
728	}	706	}
729		707
730	sub _draw {	708	sub _draw {
731	my ($self) = @_;	709	my ($self) = @_;
…		…
733	my ($w, $h) = ($self->w, $self->h);	711	my ($w, $h) = ($self->w, $self->h);
734		712
735	my $tex = $self->{texture}	713	my $tex = $self->{texture}
736	or return;	714	or return;
737		715
738	glEnable GL_BLEND;
739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740	glEnable GL_TEXTURE_2D;	716	glEnable GL_TEXTURE_2D;
741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742	glColor 0, 0, 0, 1;	718	glColor 1, 1, 1, 1;
743		719
744	$tex->draw_quad (0, 0, $w, $h);	720	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745		721
746	glDisable GL_BLEND;
747	glDisable GL_TEXTURE_2D;	722	glDisable GL_TEXTURE_2D;
748	}	723	}
749		724
750	#############################################################################	725	#############################################################################
751		726
…		…
775	$self->{view_y} = int $y;	750	$self->{view_y} = int $y;
776		751
777	$self->update;	752	$self->update;
778	}	753	}
779		754
780	# hmm, this does not work for topleft of $self... but we should not aks for that	755	# hmm, this does not work for topleft of $self... but we should not ask for that
781	sub _topleft {	756	sub coord2local {
782	my ($self, $x, $y) = @_;	757	my ($self, $x, $y) = @_;
783		758
784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	759	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		760	}
		761
		762	sub coord2global {
		763	my ($self, $x, $y) = @_;
		764
		765	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		766	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		767
		768	$self->SUPER::coord2global ($x, $y)
785	}	769	}
786		770
787	sub find_widget {	771	sub find_widget {
788	my ($self, $x, $y) = @_;	772	my ($self, $x, $y) = @_;
789		773
…		…
822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
823	},	807	},
824	;	808	;
825		809
826	$self = $class->SUPER::new (	810	$self = $class->SUPER::new (
827	vp => (new CFClient::UI::ViewPort),	811	vp => (new CFClient::UI::ViewPort expand => 1),
828	slider => $slider,	812	slider => $slider,
829	@_,	813	@_,
830	);	814	);
831		815
832	$self->{vp}->add ($self->{scrolled});	816	$self->{vp}->add ($self->{scrolled});
…		…
834	$self->add ($self->{slider});	818	$self->add ($self->{slider});
835		819
836	$self	820	$self
837	}	821	}
838		822
839	#TODO# update range on size_allocate depeneing on child	823	#TODO# update range on size_allocate depending on child
840	# update viewport offset on scroll	824	# update viewport offset on scroll
841		825
842	#############################################################################	826	#############################################################################
843		827
844	package CFClient::UI::Frame;	828	package CFClient::UI::Frame;
…		…
848	use CFClient::OpenGL;	832	use CFClient::OpenGL;
849		833
850	sub new {	834	sub new {
851	my $class = shift;	835	my $class = shift;
852		836
853	my $self = $class->SUPER::new (	837	$class->SUPER::new (
854	bg => [1, 1, 1, 1],	838	bg => undef,
855	border_bg => [1, 1, 1, 1],
856	border => 0.8,
857	@_	839	@_,
858	);	840	)
859
860	$self
861	}	841	}
862		842
863	sub _draw {	843	sub _draw {
864	my ($self) = @_;	844	my ($self) = @_;
865		845
866	my ($w, $h) = ($self->{w}, $self->{h});	846	if ($self->{bg}) {
		847	my ($w, $h) = @$self{qw(w h)};
867		848
868	glEnable GL_BLEND;	849	glEnable GL_BLEND;
869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	850	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870	glEnable GL_TEXTURE_2D;	851	glColor @{ $self->{bg} };
871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872		852
873	# glBegin GL_QUADS;	853	glBegin GL_QUADS;
874	# glColor 0, 0, 0, 0;
875	# glVertex 0 , 0;	854	glVertex 0 , 0;
876	# glVertex 0 , $h;	855	glVertex 0 , $h;
877	# glVertex $w, $h;	856	glVertex $w, $h;
878	# glVertex $w, 0;	857	glVertex $w, 0;
879	# glEnd;	858	glEnd;
880		859
881
882	$self->child->draw;
883	glDisable GL_BLEND;	860	glDisable GL_BLEND;
884	glDisable GL_TEXTURE_2D;	861	}
		862
		863	$self->SUPER::_draw;
885	}	864	}
886		865
887	#############################################################################	866	#############################################################################
888		867
889	package CFClient::UI::FancyFrame;	868	package CFClient::UI::FancyFrame;
…		…
903		882
904	my $self = $class->SUPER::new (	883	my $self = $class->SUPER::new (
905	bg => [1, 1, 1, 1],	884	bg => [1, 1, 1, 1],
906	border_bg => [1, 1, 1, 1],	885	border_bg => [1, 1, 1, 1],
907	border => 0.6,	886	border => 0.6,
		887	toplevel => 1,
908	can_events => 1,	888	can_events => 1,
909	@_	889	@_
910	);	890	);
911		891
912	$self->{title} &&= new CFClient::UI::Label	892	$self->{title} &&= new CFClient::UI::Label
…		…
937	my ($self, $w, $h) = @_;	917	my ($self, $w, $h) = @_;
938		918
939	$h -= List::Util::max 0, $self->border * 2;	919	$h -= List::Util::max 0, $self->border * 2;
940	$w -= List::Util::max 0, $self->border * 2;	920	$w -= List::Util::max 0, $self->border * 2;
941		921
942	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
943	if $self->{title};	923	if $self->{title};
944		924
945	$self->child->configure ($self->border, $self->border, $w, $h);	925	$self->child->configure ($self->border, $self->border, $w, $h);
946	}	926	}
947		927
…		…
1005	my ($self) = @_;	985	my ($self) = @_;
1006		986
1007	my ($w, $h ) = ($self->{w}, $self->{h});	987	my ($w, $h ) = ($self->{w}, $self->{h});
1008	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009		989
1010	glEnable GL_BLEND;
1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012	glEnable GL_TEXTURE_2D;	990	glEnable GL_TEXTURE_2D;
1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014		992
1015	my $border = $self->border;	993	my $border = $self->border;
1016		994
1017	glColor @{ $self->{border_bg} };	995	glColor @{ $self->{border_bg} };
1018	$tex[1]->draw_quad (0, 0, $w, $border);	996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019	$tex[3]->draw_quad (0, $border, $border, $ch);	997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);	999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022		1000
1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024	my $bg = $tex[0];	1002	my $bg = $tex[0];
1025		1003
1026	# TODO: repeat texture not scale	1004	# TODO: repeat texture not scale
…		…
1030	glColor @{ $self->{bg} };	1008	glColor @{ $self->{bg} };
1031		1009
1032	$bg->{s} = $rep_x;	1010	$bg->{s} = $rep_x;
1033	$bg->{t} = $rep_y;	1011	$bg->{t} = $rep_y;
1034	$bg->{wrap_mode} = 1;	1012	$bg->{wrap_mode} = 1;
1035	$bg->draw_quad ($border, $border, $cw, $ch);	1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1014	}
1036		1015
1037	glDisable GL_TEXTURE_2D;	1016	glDisable GL_TEXTURE_2D;
1038	glDisable GL_BLEND;
1039	}
1040		1017
1041	$self->{title}->draw if $self->{title};	1018	$self->{title}->draw if $self->{title};
1042		1019
1043	$self->child->draw;	1020	$self->child->draw;
1044	}	1021	}
…		…
1271	}	1248	}
1272		1249
1273	sub size_allocate {	1250	sub size_allocate {
1274	my ($self, $w, $h) = @_;	1251	my ($self, $w, $h) = @_;
1275		1252
		1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1254
1276	my $children = $self->{children};	1255	my $children = $self->{children};
1277		1256
1278	my @h = map $_->{req_h}, @$children;	1257	my @h = map $_->{req_h}, @$children;
1279		1258
1280	my $req_h = List::Util::sum @h;	1259	my $req_h = List::Util::sum @h;
…		…
1309		1288
1310	#############################################################################	1289	#############################################################################
1311		1290
1312	package CFClient::UI::Label;	1291	package CFClient::UI::Label;
1313		1292
1314	our @ISA = CFClient::UI::Base::;	1293	our @ISA = CFClient::UI::DrawBG::;
1315		1294
1316	use CFClient::OpenGL;	1295	use CFClient::OpenGL;
1317		1296
1318	sub new {	1297	sub new {
1319	my ($class, %arg) = @_;	1298	my ($class, %arg) = @_;
1320		1299
1321	my $self = $class->SUPER::new (	1300	my $self = $class->SUPER::new (
1322	fg => [1, 1, 1],	1301	fg => [1, 1, 1],
		1302	#bg => none
		1303	#active_bg => none
1323	#font => default_font	1304	#font => default_font
		1305	#text => initial text
		1306	#markup => initial narkup
		1307	#max_w => maximum pixel width
		1308	ellipsise => 3, # end
		1309	layout => (new CFClient::Layout),
1324	fontsize => 1,	1310	fontsize => 1,
1325	text => "",
1326	align => -1,	1311	align => -1,
1327	valign => -1,	1312	valign => -1,
1328	padding => 2,	1313	padding => 2,
1329	layout => new CFClient::Layout,
1330	can_events => 0,	1314	can_events => 0,
1331	%arg	1315	%arg
1332	);	1316	);
1333		1317
1334	if (exists $self->{template}) {	1318	if (exists $self->{template}) {
1335	my $layout = new CFClient::Layout;	1319	my $layout = new CFClient::Layout;
1336	$layout->set_text (delete $self->{template});	1320	$layout->set_text (delete $self->{template});
1337	$self->{template} = $layout;	1321	$self->{template} = $layout;
1338	}	1322	}
1339		1323
1340	$self->set_text (delete $self->{text}) if exists $self->{text};	1324	if (exists $self->{markup}) {
1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1325	$self->set_markup (delete $self->{markup});
		1326	} else {
		1327	$self->set_text (delete $self->{text});
		1328	}
1342		1329
1343	$self	1330	$self
1344	}	1331	}
1345		1332
1346	sub escape {	1333	sub escape($) {
1347	local $_ = $_[1];	1334	local $_ = $_[0];
1348		1335
1349	s/&/&amp;/g;	1336	s/&/&amp;/g;
1350	s/>/&gt;/g;	1337	s/>/&gt;/g;
1351	s/</&lt;/g;	1338	s/</&lt;/g;
1352		1339
1353	$_[1]	1340	$_
1354	}	1341	}
1355		1342
1356	sub update {	1343	sub update {
1357	my ($self) = @_;	1344	my ($self) = @_;
1358		1345
…		…
1364	my ($self, $text) = @_;	1351	my ($self, $text) = @_;
1365		1352
1366	return if $self->{text} eq "T$text";	1353	return if $self->{text} eq "T$text";
1367	$self->{text} = "T$text";	1354	$self->{text} = "T$text";
1368		1355
		1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369	$self->{layout}->set_text ($text);	1357	$self->{layout}->set_text ($text);
1370		1358
1371	delete $self->{texture};
1372	$self->update;	1359	$self->update;
1373	$self->check_size;	1360	$self->check_size;
1374	}	1361	}
1375		1362
1376	sub set_markup {	1363	sub set_markup {
1377	my ($self, $markup) = @_;	1364	my ($self, $markup) = @_;
1378		1365
1379	return if $self->{text} eq "M$markup";	1366	return if $self->{text} eq "M$markup";
1380	$self->{text} = "M$markup";	1367	$self->{text} = "M$markup";
1381		1368
		1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1370
		1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382	$self->{layout}->set_markup ($markup);	1372	$self->{layout}->set_markup ($markup);
1383		1373
1384	delete $self->{texture};
1385	$self->update;	1374	$self->update;
1386	$self->check_size;	1375	$self->check_size;
1387	}	1376	}
1388		1377
1389	sub size_request {	1378	sub size_request {
1390	my ($self) = @_;	1379	my ($self) = @_;
1391		1380
1392	$self->{layout}->set_font ($self->{font}) if $self->{font};	1381	$self->{layout}->set_font ($self->{font}) if $self->{font};
1393	$self->{layout}->set_width ($self->{max_w} || -1);	1382	$self->{layout}->set_width ($self->{max_w} || -1);
		1383	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1384	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395		1386
1396	my ($w, $h) = $self->{layout}->size;	1387	my ($w, $h) = $self->{layout}->size;
1397		1388
1398	if (exists $self->{template}) {	1389	if (exists $self->{template}) {
…		…
1428	}	1419	}
1429		1420
1430	sub _draw {	1421	sub _draw {
1431	my ($self) = @_;	1422	my ($self) = @_;
1432		1423
		1424	$self->SUPER::_draw; # draw background, if applicable
		1425
1433	my $tex = $self->{texture} ||= do {	1426	my $tex = $self->{texture} ||= do {
		1427	$self->{layout}->set_foreground (@{$self->{fg}});
1434	$self->{layout}->set_font ($self->{font}) if $self->{font};	1428	$self->{layout}->set_font ($self->{font}) if $self->{font};
1435	$self->{layout}->set_width ($self->{w});	1429	$self->{layout}->set_width ($self->{w});
		1430	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1433
1437	new_from_layout CFClient::Texture $self->{layout}	1434	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1435
		1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1438	: ($self->{w} - $tex->{w}) * 0.5);
		1439
		1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1442	: ($self->{h} - $tex->{h}) * 0.5);
		1443
		1444	$tex
1438	};	1445	};
1439		1446
1440	glEnable GL_BLEND;
1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442	glEnable GL_TEXTURE_2D;	1447	glEnable GL_TEXTURE_2D;
1443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444		1449
		1450	if ($tex->{format} == GL_ALPHA) {
1445	glColor @{$self->{fg}};	1451	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});	1452	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1453	} else {
		1454	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1455	}
1460		1456
1461	glDisable GL_TEXTURE_2D;	1457	glDisable GL_TEXTURE_2D;
1462	glDisable GL_BLEND;
1463	}	1458	}
1464		1459
1465	#############################################################################	1460	#############################################################################
1466		1461
1467	package CFClient::UI::EntryBase;	1462	package CFClient::UI::EntryBase;
…		…
1502	$self->{layout}->set_text ("$text ");	1497	$self->{layout}->set_text ("$text ");
1503		1498
1504	$self->emit (changed => $self->{text});	1499	$self->emit (changed => $self->{text});
1505	}	1500	}
1506		1501
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	}
1524
1525	sub set_text {	1502	sub set_text {
1526	my ($self, $text) = @_;	1503	my ($self, $text) = @_;
1527		1504
1528	$self->{cursor} = length $text;	1505	$self->{cursor} = length $text;
1529	$self->_set_text ($text);	1506	$self->_set_text ($text);
1530	$self->update;	1507	$self->update;
		1508	$self->check_size;
		1509	}
		1510
		1511	sub get_text {
		1512	$_[0]{text}
		1513	}
		1514
		1515	sub size_request {
		1516	my ($self) = @_;
		1517
		1518	my ($w, $h) = $self->SUPER::size_request;
		1519
		1520	($w + 1, $h) # add 1 for cursor
		1521	}
		1522
		1523	sub size_allocate {
		1524	my ($self, $w, $h) = @_;
		1525
		1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1531	}	1527	}
1532		1528
1533	sub key_down {	1529	sub key_down {
1534	my ($self, $ev) = @_;	1530	my ($self, $ev) = @_;
1535		1531
…		…
1537	my $sym = $ev->{sym};	1533	my $sym = $ev->{sym};
1538	my $uni = $ev->{unicode};	1534	my $uni = $ev->{unicode};
1539		1535
1540	my $text = $self->get_text;	1536	my $text = $self->get_text;
1541		1537
1542	if ($sym == 8) {	1538	if ($uni == 8) {
1543	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1539	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544	} elsif ($sym == 127) {	1540	} elsif ($uni == 127) {
1545	substr $text, $self->{cursor}, 1, "";	1541	substr $text, $self->{cursor}, 1, "";
1546	} elsif ($sym == CFClient::SDLK_LEFT) {	1542	} elsif ($sym == CFClient::SDLK_LEFT) {
1547	--$self->{cursor} if $self->{cursor};	1543	--$self->{cursor} if $self->{cursor};
1548	} elsif ($sym == CFClient::SDLK_RIGHT) {	1544	} elsif ($sym == CFClient::SDLK_RIGHT) {
1549	++$self->{cursor} if $self->{cursor} < length $self->{text};	1545	++$self->{cursor} if $self->{cursor} < length $self->{text};
1550	} elsif ($sym == CFClient::SDLK_HOME) {	1546	} elsif ($sym == CFClient::SDLK_HOME) {
1551	$self->{cursor} = 0;	1547	$self->{cursor} = 0;
1552	} elsif ($sym == CFClient::SDLK_END) {	1548	} elsif ($sym == CFClient::SDLK_END) {
1553	$self->{cursor} = length $text;	1549	$self->{cursor} = length $text;
1554	} elsif ($sym == 27) {	1550	} elsif ($uni == 27) {
1555	$self->emit ('escape');	1551	$self->emit ('escape');
1556	} elsif ($uni) {	1552	} elsif ($uni) {
1557	substr $text, $self->{cursor}++, 0, chr $uni;	1553	substr $text, $self->{cursor}++, 0, chr $uni;
1558	}	1554	}
1559		1555
1560	$self->_set_text ($text);	1556	$self->_set_text ($text);
1561	$self->update;	1557	$self->update;
		1558	$self->check_size;
1562	}	1559	}
1563		1560
1564	sub focus_in {	1561	sub focus_in {
1565	my ($self) = @_;	1562	my ($self) = @_;
1566		1563
…		…
1695	my $class = shift;	1692	my $class = shift;
1696		1693
1697	$class->SUPER::new (	1694	$class->SUPER::new (
1698	padding => 4,	1695	padding => 4,
1699	fg => [1, 1, 1],	1696	fg => [1, 1, 1],
1700	bg => [1, 1, 1, 0.2],
1701	active_fg => [0, 0, 1],	1697	active_fg => [0, 0, 1],
1702	can_hover => 1,	1698	can_hover => 1,
1703	align => 0,	1699	align => 0,
1704	valign => 0,	1700	valign => 0,
1705	can_events => 1,	1701	can_events => 1,
…		…
1723		1719
1724	if ($GRAB == $self) {	1720	if ($GRAB == $self) {
1725	$self->{fg} = $self->{active_fg};	1721	$self->{fg} = $self->{active_fg};
1726	}	1722	}
1727		1723
1728	glEnable GL_BLEND;
1729	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730	glEnable GL_TEXTURE_2D;	1724	glEnable GL_TEXTURE_2D;
1731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1725	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732	glColor 0, 0, 0, 1;	1726	glColor 0, 0, 0, 1;
1733		1727
1734	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1728	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735		1729
1736	glDisable GL_TEXTURE_2D;	1730	glDisable GL_TEXTURE_2D;
1737	glDisable GL_BLEND;
1738		1731
1739	$self->SUPER::_draw;	1732	$self->SUPER::_draw;
1740	}	1733	}
1741		1734
1742	#############################################################################	1735	#############################################################################
…		…
1756		1749
1757	$class->SUPER::new (	1750	$class->SUPER::new (
1758	padding => 2,	1751	padding => 2,
1759	fg => [1, 1, 1],	1752	fg => [1, 1, 1],
1760	active_fg => [1, 1, 0],	1753	active_fg => [1, 1, 0],
		1754	bg => [0, 0, 0, 0.2],
		1755	active_bg => [1, 1, 1, 0.5],
1761	state => 0,	1756	state => 0,
1762	can_hover => 1,	1757	can_hover => 1,
1763	@_	1758	@_
1764	)	1759	)
1765	}	1760	}
…		…
1789		1784
1790	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791		1786
1792	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793		1788
1794	glEnable GL_BLEND;	1789	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1790
1795	glEnable GL_TEXTURE_2D;	1791	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);	1792	$tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802	glDisable GL_TEXTURE_2D;	1793	glDisable GL_TEXTURE_2D;
1803	glDisable GL_BLEND;
1804	}	1794	}
1805		1795
1806	#############################################################################	1796	#############################################################################
1807		1797
1808	package CFClient::UI::Image;	1798	package CFClient::UI::Image;
…		…
1851	glTranslate 0, -$self->{w}, 0;	1841	glTranslate 0, -$self->{w}, 0;
1852		1842
1853	($w, $h) = ($h, $w);	1843	($w, $h) = ($h, $w);
1854	}	1844	}
1855		1845
1856	glEnable GL_BLEND;
1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858	glEnable GL_TEXTURE_2D;	1846	glEnable GL_TEXTURE_2D;
1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860		1848
1861	$tex->draw_quad (0, 0, $w, $h);	1849	$tex->draw_quad_alpha (0, 0, $w, $h);
1862		1850
1863	glDisable GL_BLEND;
1864	glDisable GL_TEXTURE_2D;	1851	glDisable GL_TEXTURE_2D;
1865	}	1852	}
1866		1853
1867	#############################################################################	1854	#############################################################################
1868		1855
…		…
2057	qw(s1_slider.png s1_slider_bg.png);	2044	qw(s1_slider.png s1_slider_bg.png);
2058		2045
2059	sub new {	2046	sub new {
2060	my $class = shift;	2047	my $class = shift;
2061		2048
2062	# range [value, low, high, page]	2049	# range [value, low, high, page, unit]
2063		2050
2064	# TODO: 0-width page	2051	# TODO: 0-width page
2065	# TODO: req_w/h are wrong with vertical	2052	# TODO: req_w/h are wrong with vertical
2066	# TODO: calculations are off	2053	# TODO: calculations are off
2067	my $self = $class->SUPER::new (	2054	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2055	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2056	active_fg => [0, 0, 0],
		2057	bg => [0, 0, 0, 0.2],
		2058	active_bg => [1, 1, 1, 0.5],
2070	range => [0, 0, 100, 10],	2059	range => [0, 0, 100, 10],
2071	req_w => $::WIDTH / 80,	2060	req_w => $::WIDTH / 80,
2072	req_h => $::WIDTH / 80,	2061	req_h => $::WIDTH / 80,
2073	vertical => 0,	2062	vertical => 0,
2074	can_hover => 1,	2063	can_hover => 1,
2075	inner_pad => 5,	2064	inner_pad => 0.02,
2076	@_	2065	@_
2077	);	2066	);
2078		2067
		2068	$self->set_value ($self->{range}[0]);
		2069	$self->update;
		2070
2079	$self	2071	$self
		2072	}
		2073
		2074	sub set_value {
		2075	my ($self, $value) = @_;
		2076
		2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2078
		2079	$hi = $lo + 1 if $hi <= $lo;
		2080
		2081	$value = $lo if $value < $lo;
		2082	$value = $hi if $value > $hi;
		2083
		2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2085	if $unit;
		2086
		2087	$page = $hi - $lo if $page > $hi - $lo;
		2088
		2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2090
		2091	if ($value != $old_value) {
		2092	$self->emit (changed => $value);
		2093	$self->update;
		2094	}
2080	}	2095	}
2081		2096
2082	sub size_request {	2097	sub size_request {
2083	my ($self) = @_;	2098	my ($self) = @_;
2084		2099
…		…
2097		2112
2098	sub mouse_motion {	2113	sub mouse_motion {
2099	my ($self, $ev, $x, $y) = @_;	2114	my ($self, $ev, $x, $y) = @_;
2100		2115
2101	if ($GRAB == $self) {	2116	if ($GRAB == $self) {
		2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2118
		2119	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2120
		2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2122
		2123	$self->set_value ($x * ($hi - $lo) + $lo);
		2124	}
		2125	}
		2126
		2127	sub update {
		2128	my ($self) = @_;
		2129
		2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2131	$self->set_value ($self->{range}[0]);
		2132
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};	2133	my ($value, $lo, $hi, $page) = @{$self->{range}};
2103		2134
2104	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2135	my $inner_w = 1 - 2 * $self->{inner_pad};
2105		2136
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108		2138
2109	$x -= $inner_pad_px; # substract the padding	2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2110	$x = $x * ($hi - $lo) / $inner_w + $lo;	2140	$value = $self->{scale} * ($value - $lo);
2111	$x = $lo if $x < $lo;
2112	$x = $hi - $page if $x > $hi - $page;
2113	$self->{range}[0] = $x;
2114		2141
2115	$self->emit (changed => $x);	2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2116	$self->update;	2143
		2144	$value = 0 if $value < 0;
		2145	$page = 1 - $value if $value + $page > 1;
		2146
		2147	$self->{knob_x} = $value;
		2148	$self->{knob_w} = $page;
2117	}	2149	});
2118	}
2119		2150
2120	# the inner_* stuff is for generating a padding for the slider handle,	2151	$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	}	2152	}
2127		2153
2128	sub _draw {	2154	sub _draw {
2129	my ($self) = @_;	2155	my ($self) = @_;
2130		2156
2131	$self->SUPER::_draw ();	2157	$self->SUPER::_draw ();
2132		2158
2133	my ($w, $h) = @$self{qw(w h)};	2159	glScale $self->{w}, $self->{h};
2134		2160
2135	if ($self->{vertical}) {	2161	if ($self->{vertical}) {
2136	# draw a vertical slider like a rotated horizontal slider	2162	# draw a vertical slider like a rotated horizontal slider
2137		2163
		2164	glTranslate 1, 0, 0;
2138	glRotate 90, 0, 0, 1;	2165	glRotate 90, 0, 0, 1;
2139	glTranslate 0, -$self->{w}, 0;
2140
2141	($w, $h) = ($h, $w);
2142	}	2166	}
2143		2167
2144	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2168	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2169	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146		2170
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;	2171	glEnable GL_TEXTURE_2D;
2168	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2172	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169		2173
2170	# draw background	2174	# draw background
2171	$tex[1]->draw_quad (0, 0, $w, $h);	2175	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172		2176
2173	# draw handle	2177	# draw handle
2174	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2175		2179
2176	glDisable GL_BLEND;
2177	glDisable GL_TEXTURE_2D;	2180	glDisable GL_TEXTURE_2D;
2178	}	2181	}
2179		2182
2180	#############################################################################	2183	#############################################################################
2181		2184
…		…
2192	fontsize => 1,	2195	fontsize => 1,
2193	can_events => 0,	2196	can_events => 0,
2194	#font => default_font	2197	#font => default_font
2195	@_,	2198	@_,
2196		2199
2197	layout => (new CFClient::Layout),	2200	layout => (new CFClient::Layout 1),
2198	par => [],	2201	par => [],
2199	height => 0,	2202	height => 0,
2200	children => [	2203	children => [
2201	(new CFClient::UI::Empty expand => 1),	2204	(new CFClient::UI::Empty expand => 1),
2202	(new CFClient::UI::Slider vertical => 1),	2205	(new CFClient::UI::Slider vertical => 1),
…		…
2213		2216
2214	$self->{fontsize} = $fontsize;	2217	$self->{fontsize} = $fontsize;
2215	$self->reflow;	2218	$self->reflow;
2216	}	2219	}
2217		2220
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 {	2221	sub size_allocate {
2238	my ($self, $w, $h) = @_;	2222	my ($self, $w, $h) = @_;
2239		2223
2240	$self->SUPER::size_allocate ($w, $h);	2224	$self->SUPER::size_allocate ($w, $h);
2241		2225
…		…
2244	$self->{layout}->set_width ($self->{children}[0]{w});	2228	$self->{layout}->set_width ($self->{children}[0]{w});
2245		2229
2246	$self->reflow;	2230	$self->reflow;
2247	}	2231	}
2248		2232
		2233	sub text_height {
		2234	my ($self, $text, $indent) = @_;
		2235
		2236	my $layout = $self->{layout};
		2237
		2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2239	$layout->set_width ($self->{children}[0]{w} - $indent);
		2240	$layout->set_markup ($text);
		2241
		2242	($layout->size)[1]
		2243	}
		2244
		2245	sub reflow {
		2246	my ($self) = @_;
		2247
		2248	$self->{need_reflow}++;
		2249	$self->update;
		2250	}
		2251
2249	sub add_paragraph {	2252	sub add_paragraph {
2250	my ($self, $color, $text) = @_;	2253	my ($self, $color, $text, $indent) = @_;
2251		2254
2252	#TODO: intelligently "reformat" paragraph	2255	#TODO: intelligently "reformat" paragraph
2253		2256
		2257	for my $line (split /\n/, $text) {
2254	my $height = $self->text_height ($text);	2258	my $height = $self->text_height ($line);
2255
2256	$self->{height} += $height;	2259	$self->{height} += $height;
2257
2258	push @{$self->{par}}, [$height, $color, $text];	2260	push @{$self->{par}}, [$height, $color, $indent, $line];
		2261	}
2259		2262
2260	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2261	$self->{children}[1]->update;	2264	$self->{children}[1]->update;
2262	}	2265	}
2263		2266
…		…
2268		2271
2269	return unless $self->{h} > 0;	2272	return unless $self->{h} > 0;
2270		2273
2271	delete $self->{texture};	2274	delete $self->{texture};
2272		2275
2273	$ROOT->on_refresh ($self, sub {	2276	$ROOT->on_post_alloc ($self, sub {
2274	if (delete $self->{need_reflow}) {	2277	if (delete $self->{need_reflow}) {
2275	my $height = 0;	2278	my $height = 0;
2276		2279
2277	$height += $_->[0] = $self->text_height ($_->[2])	2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2278	for @{$self->{par}};	2281	for @{$self->{par}};
2279		2282
2280	$self->{height} = $height;	2283	$self->{height} = $height;
2281		2284
2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2286	$self->{children}[1]->update;
2283		2287
2284	delete $self->{texture};	2288	delete $self->{texture};
2285	}	2289	}
2286		2290
2287	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288	glClearColor 0, 0, 0, 0;	2292	glClearColor 0.5, 0.5, 0.5, 0;
2289	glClear GL_COLOR_BUFFER_BIT;	2293	glClear GL_COLOR_BUFFER_BIT;
2290
2291	glEnable GL_BLEND;
2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293	glEnable GL_TEXTURE_2D;
2294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295		2294
2296	my $top = int $self->{children}[1]{range}[0];	2295	my $top = int $self->{children}[1]{range}[0];
2297		2296
2298	my $y0 = $top;	2297	my $y0 = $top;
2299	my $y1 = $top + $self->{h};	2298	my $y1 = $top + $self->{h};
…		…
2302		2301
2303	my $layout = $self->{layout};	2302	my $layout = $self->{layout};
2304		2303
2305	$layout->set_font ($self->{font}) if $self->{font};	2304	$layout->set_font ($self->{font}) if $self->{font};
2306		2305
		2306	glEnable GL_BLEND;
		2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2308
2307	for my $par (@{$self->{par}}) {	2309	for my $par (@{$self->{par}}) {
2308	my $h = $par->[0];	2310	my $h = $par->[0];
2309		2311
2310	if ($y0 < $y + $h && $y < $y1) {	2312	if ($y0 < $y + $h && $y < $y1) {
		2313	$layout->set_foreground (@{ $par->[1] });
		2314	$layout->set_width ($self->{w} - $par->[2]);
2311	$layout->set_text ($par->[2]);	2315	$layout->set_markup ($par->[3]);
2312		2316
2313	glColor @{ $par->[1] };	2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	my ($W, $H) = $layout->size;	2318
2315	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2319	glRasterPos $par->[2], $y - $y0;
		2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2316	}	2321	}
2317		2322
2318	$y += $h;	2323	$y += $h;
2319	}	2324	}
2320		2325
2321	glDisable GL_TEXTURE_2D;
2322	glDisable GL_BLEND;	2326	glDisable GL_BLEND;
2323	};	2327	};
2324	});	2328	});
2325	}	2329	}
2326		2330
2327	sub _draw {	2331	sub _draw {
2328	my ($self) = @_;	2332	my ($self) = @_;
2329		2333
2330	glEnable GL_BLEND;
2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332	glEnable GL_TEXTURE_2D;	2334	glEnable GL_TEXTURE_2D;
2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334	glColor 1, 1, 1, 1;	2336	glColor 1, 1, 1, 1;
2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2337	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
2337	glDisable GL_BLEND;
2338		2339
2339	$self->{children}[1]->draw;	2340	$self->{children}[1]->draw;
2340		2341
2341	}	2342	}
2342		2343
…		…
2436	@_,	2437	@_,
2437	can_events => 0,	2438	can_events => 0,
2438	)	2439	)
2439	}	2440	}
2440		2441
2441	sub set_markup {	2442	sub set_tooltip_from {
2442	my ($self, $text) = @_;	2443	my ($self, $widget) = @_;
2443		2444
2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2445	$self->add (new CFClient::UI::Label
2445	$self->{label}->set_markup ($text);	2446	markup => $widget->{tooltip},
2446	$self->add ($self->{label});	2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2448	fontsize => 0.8,
		2449	fg => [0, 0, 0, 1],
		2450	ellipsise => 0,
		2451	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2452	);
2447	}	2453	}
2448		2454
2449	sub size_request {	2455	sub size_request {
2450	my ($self) = @_;	2456	my ($self) = @_;
2451
2452	$self->child->set_max_size ($::WIDTH * 0.3);
2453		2457
2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2458	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455		2459
2456	($w + 4, $h + 4)	2460	($w + 4, $h + 4)
2457	}	2461	}
…		…
2463	}	2467	}
2464		2468
2465	sub _draw {	2469	sub _draw {
2466	my ($self) = @_;	2470	my ($self) = @_;
2467		2471
2468	glPushMatrix;
2469	glTranslate 0.375, 0.375;	2472	glTranslate 0.375, 0.375;
2470		2473
2471	my ($w, $h) = @$self{qw(w h)};	2474	my ($w, $h) = @$self{qw(w h)};
2472		2475
2473	glColor 1, 0.8, 0.4;	2476	glColor 1, 0.8, 0.4;
…		…
2484	glVertex 0 , $h;	2487	glVertex 0 , $h;
2485	glVertex $w, $h;	2488	glVertex $w, $h;
2486	glVertex $w, 0;	2489	glVertex $w, 0;
2487	glEnd;	2490	glEnd;
2488		2491
2489	glPopMatrix;	2492	glTranslate 2 - 0.375, 2 - 0.375;
2490
2491	glTranslate 2, 2;
2492	$self->SUPER::_draw;	2493	$self->SUPER::_draw;
2493	}	2494	}
2494		2495
2495	#############################################################################	2496	#############################################################################
2496		2497
…		…
2501	use CFClient::OpenGL;	2502	use CFClient::OpenGL;
2502		2503
2503	sub new {	2504	sub new {
2504	my $class = shift;	2505	my $class = shift;
2505		2506
2506	$class->SUPER::new (	2507	my $self = $class->SUPER::new (
2507	aspect => 1,	2508	aspect => 1,
2508	@_,	2509	@_,
2509	)	2510	);
		2511
		2512	if ($self->{anim} && $self->{animspeed}) {
		2513	Scalar::Util::weaken (my $widget = $self);
		2514
		2515	$self->{timer} = Event->timer (
		2516	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2517	hard => 1,
		2518	interval => $self->{animspeed},
		2519	cb => sub {
		2520	++$widget->{frame};
		2521	$widget->update;
		2522	},
		2523	);
		2524	}
		2525
		2526	$self
2510	}	2527	}
2511		2528
2512	sub size_request {	2529	sub size_request {
2513	(32, 8)	2530	(32, 8)
2514	}	2531	}
2515		2532
		2533	sub update {
		2534	my ($self) = @_;
		2535
		2536	return unless $self->{visible};
		2537
		2538	$self->SUPER::update;
		2539	}
		2540
2516	sub _draw {	2541	sub _draw {
2517	my ($self) = @_;	2542	my ($self) = @_;
2518		2543
2519	return unless $::CONN;#d# manage and cache textures differently	2544	return unless $::CONN;#d# manage and cache textures differently
		2545
		2546	my $face;
		2547
		2548	if ($self->{frame}) {
		2549	my $anim = $::CONN->{anim}[$self->{anim}];
		2550
		2551	$face = $anim->[ $self->{frame} % @$anim ]
		2552	if $anim && @$anim;
		2553	}
		2554
2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2555	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521		2556
2522	# TODO animation
2523	if ($tex) {	2557	if ($tex) {
2524	glEnable GL_BLEND;
2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526	glEnable GL_TEXTURE_2D;	2558	glEnable GL_TEXTURE_2D;
2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2559	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528	glColor 1, 1, 1, 1;	2560	glColor 1, 1, 1, 1;
2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2561	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530	glDisable GL_TEXTURE_2D;	2562	glDisable GL_TEXTURE_2D;
2531	glDisable GL_BLEND;
2532	}	2563	}
		2564	}
		2565
		2566	sub DESTROY {
		2567	my ($self) = @_;
		2568
		2569	$self->{timer}->cancel
		2570	if $self->{timer};
		2571
		2572	$self->SUPER::DESTROY;
2533	}	2573	}
2534		2574
2535	#############################################################################	2575	#############################################################################
2536		2576
2537	package CFClient::UI::InventoryItem;	2577	package CFClient::UI::InventoryItem;
2538		2578
2539	our @ISA = CFClient::UI::HBox::;	2579	our @ISA = CFClient::UI::HBox::;
		2580
		2581	sub _item_to_desc {
		2582	my ($item) = @_;
		2583
		2584	my $desc =
		2585	$item->{nrof} < 2
		2586	? $item->{name}
		2587	: "$item->{nrof} × $item->{name_pl}";
		2588
		2589	$item->{flags} & Crossfire::Protocol::F_OPEN
		2590	and $desc .= " (open)";
		2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2592	and $desc .= " (applied)";
		2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2594	and $desc .= " (unpaid)";
		2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2596	and $desc .= " (magic)";
		2597	$item->{flags} & Crossfire::Protocol::F_CURSED
		2598	and $desc .= " (cursed)";
		2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2600	and $desc .= " (damned)";
		2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2602	and $desc .= " *";
		2603
		2604	$desc
		2605	}
2540		2606
2541	sub new {	2607	sub new {
2542	my $class = shift;	2608	my $class = shift;
2543		2609
2544	my %args = @_;	2610	my %args = @_;
2545		2611
2546	my $item = $args{item};	2612	my $item = delete $args{item};
2547		2613
2548	my $desc = $item->{nrof} < 2	2614	my $desc = _item_to_desc ($item);
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551
2552		2615
2553	my $self = $class->SUPER::new (	2616	my $self = $class->SUPER::new (
2554	can_hover => 1,	2617	can_hover => 1,
2555	can_events => 1,	2618	can_events => 1,
2556	tooltip => (CFClient::UI::Label->escape ($desc)	2619	tooltip => ((CFClient::UI::Label::escape $desc)
2557	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558	connect_button_down => sub {	2621	connect_button_down => sub {
2559	my ($self, $ev, $x, $y) = @_;	2622	my ($self, $ev, $x, $y) = @_;
2560		2623
2561	# todo: maybe put examine on 1? but should just be a tooltip :(	2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2562	if ($ev->{button} == 1) {	2625	if ($ev->{button} == 1) {
		2626	my $targ = $::CONN->{player}{tag};
		2627
		2628	if ($item->{container} == $::CONN->{player}{tag}) {
		2629	$targ = $main::OPENCONT;
		2630	}
		2631
2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2632	$::CONN->send ("move $targ $item->{tag} 0");
2564	} elsif ($ev->{button} == 2) {	2633	} elsif ($ev->{button} == 2) {
2565	$::CONN->send ("apply $item->{tag}");	2634	$::CONN->send ("apply $item->{tag}");
2566	} elsif ($ev->{button} == 3) {	2635	} elsif ($ev->{button} == 3) {
2567	CFClient::UI::Menu->new (	2636	my @menu_items = (
2568	items => [
2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2637	["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}") }],	2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2575	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2640	(
		2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2642	? (
		2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2644	)
		2645	: (
		2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2648	)
2577	],	2649	),
2578	)->popup ($ev);	2650	);
		2651
		2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2579	}	2653	}
2580		2654
2581	1	2655	1
2582	},	2656	},
2583	%args	2657	%args
2584	);	2658	);
		2659
		2660
2585	$self->add(new CFClient::UI::Face	2661	$self->add (new CFClient::UI::Face
2586	can_events => 0,	2662	can_events => 0,
2587	face => $item->{face},	2663	face => $item->{face},
2588	anim => $item->{anim},	2664	anim => $item->{anim},
2589	animspeed => $item->{animspeed});	2665	animspeed => $item->{animspeed},
2590	$self->add(new CFClient::UI::Label	2666	);
2591	can_events => 0,	2667
2592	text => $desc);	2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2669
		2670	$self->{item} = $item;
		2671
		2672	$self->update_item;
2593		2673
2594	$self	2674	$self
		2675	}
		2676
		2677	sub update_item {
		2678	my ($self) = @_;
		2679
		2680	my $desc = _item_to_desc ($self->{item});
		2681
		2682	$self->{name_lbl}->set_text ($desc);
2595	}	2683	}
2596		2684
2597	#############################################################################	2685	#############################################################################
2598		2686
2599	package CFClient::UI::Inventory;	2687	package CFClient::UI::Inventory;
…		…
2615	my ($self, $items) = @_;	2703	my ($self, $items) = @_;
2616		2704
2617	$self->{scrolled}->clear;	2705	$self->{scrolled}->clear;
2618	return unless $items;	2706	return unless $items;
2619		2707
2620	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2708	my @items = sort {
		2709	($a->{type} <=> $b->{type})
		2710	or ($a->{name} cmp $b->{name})
		2711	} @$items;
2621		2712
2622	$self->{real_items} = \@items;	2713	$self->{real_items} = \@items;
2623		2714
2624	for my $item (@items) {	2715	for my $item (@items) {
2625	my $desc = $item->{nrof} < 2
2626	? $item->{name}
2627	: "$item->{nrof} $item->{name_pl}";
2628
2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2717	$item->update_item ();
2630	}	2718	}
		2719
		2720	$self->{scrolled}->add (@items);
2631		2721
2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	}	2723	}
2634		2724
2635	sub size_request {	2725	sub size_request {
…		…
2709	}	2799	}
2710	}	2800	}
2711		2801
2712	#############################################################################	2802	#############################################################################
2713		2803
		2804	package CFClient::UI::Statusbox;
		2805
		2806	our @ISA = CFClient::UI::VBox::;
		2807
		2808	sub new {
		2809	my $class = shift;
		2810
		2811	$class->SUPER::new (
		2812	fontsize => 0.8,
		2813	@_,
		2814	)
		2815	}
		2816
		2817	sub reorder {
		2818	my ($self) = @_;
		2819	my $NOW = time;
		2820
		2821	while (my ($k, $v) = each %{ $self->{item} }) {
		2822	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2823	}
		2824
		2825	my @widgets;
		2826
		2827	my @items = sort {
		2828	$a->{pri} <=> $b->{pri}
		2829	or $b->{id} <=> $a->{id}
		2830	} values %{ $self->{item} };
		2831
		2832	my $count = 10 + 1;
		2833	for my $item (@items) {
		2834	last unless --$count;
		2835
		2836	push @widgets, $item->{label} ||= do {
		2837	# TODO: doesn't handle markup well (read as: at all)
		2838	my $short = $item->{count} > 1
		2839	? "<b>$item->{count} ×</b> $item->{text}"
		2840	: $item->{text};
		2841
		2842	for ($short) {
		2843	s/^\s+//;
		2844	s/\s+/ /g;
		2845	}
		2846
		2847	new CFClient::UI::Label
		2848	markup => $short,
		2849	tooltip => $item->{tooltip},
		2850	tooltip_font => $::FONT_PROP,
		2851	tooltip_width => 0.67,
		2852	fontsize => $item->{fontsize} || $self->{fontsize},
		2853	max_w => $::WIDTH * 0.44,
		2854	fg => $item->{fg},
		2855	can_events => 1,
		2856	can_hover => 1
		2857	};
		2858	}
		2859
		2860	$self->clear;
		2861	$self->SUPER::add (reverse @widgets);
		2862	}
		2863
		2864	sub add {
		2865	my ($self, $text, %arg) = @_;
		2866
		2867	$text =~ s/^\s+//;
		2868	$text =~ s/\s+$//;
		2869
		2870	my $timeout = time + ((delete $arg{timeout}) || 60);
		2871
		2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2873
		2874	if (my $item = $self->{item}{$group}) {
		2875	if ($item->{text} eq $text) {
		2876	$item->{count}++;
		2877	} else {
		2878	$item->{count} = 1;
		2879	$item->{text} = $item->{tooltip} = $text;
		2880	}
		2881	$item->{id} = ++$self->{id};
		2882	$item->{timeout} = $timeout;
		2883	delete $item->{label};
		2884	} else {
		2885	$self->{item}{$group} = {
		2886	id => ++$self->{id},
		2887	text => $text,
		2888	timeout => $timeout,
		2889	tooltip => $text,
		2890	fg => [0.8, 0.8, 0.8, 0.8],
		2891	pri => 0,
		2892	count => 1,
		2893	%arg,
		2894	};
		2895	}
		2896
		2897	$self->reorder;
		2898	}
		2899
		2900	sub reconfigure {
		2901	my ($self) = @_;
		2902
		2903	delete $_->{label}
		2904	for values %{ $self->{item} || {} };
		2905
		2906	$self->reorder;
		2907	$self->SUPER::reconfigure;
		2908	}
		2909
		2910	#############################################################################
		2911
2714	package CFClient::UI::Root;	2912	package CFClient::UI::Root;
2715		2913
2716	our @ISA = CFClient::UI::Container::;	2914	our @ISA = CFClient::UI::Container::;
2717		2915
2718	use CFClient::OpenGL;	2916	use CFClient::OpenGL;
2719		2917
		2918	sub new {
		2919	my $class = shift;
		2920
		2921	$class->SUPER::new (
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub configure {
		2927	my ($self, $x, $y, $w, $h) = @_;
		2928
		2929	$self->{w} = $w;
		2930	$self->{h} = $h;
		2931	}
		2932
2720	sub check_size {	2933	sub check_size {
2721	my ($self) = @_;	2934	my ($self) = @_;
2722		2935
2723	$self->configure (0, 0, $self->{w}, $self->{h});	2936	$self->size_allocate ($self->{w}, $self->{h})
		2937	if $self->{w};
2724	}	2938	}
2725		2939
2726	sub size_request {	2940	sub size_request {
2727	my ($self) = @_;	2941	my ($self) = @_;
2728		2942
…		…
2730	}	2944	}
2731		2945
2732	sub size_allocate {	2946	sub size_allocate {
2733	my ($self, $w, $h) = @_;	2947	my ($self, $w, $h) = @_;
2734		2948
2735	my $old_w = $self->{old_w};	2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736	my $old_h = $self->{old_h};	2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737		2951
2738	if ($old_w && $old_h) {	2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739	for my $child ($self->children) {	2953	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		2954
2760	for my $child ($self->children) {	2955	for my $child ($self->children) {
2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762		2957
		2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2959	if exists $child->{req_x};
		2960
		2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2962	if exists $child->{req_y};
		2963
2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2964	$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;	2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2966
2765	$child->configure ($X, $Y, $W, $H);	2967	$child->configure ($X, $Y, $W, $H);
2766	}	2968	}
2767	}	2969	}
2768		2970
2769	sub _topleft {	2971	sub coord2local {
2770	my ($self, $x, $y) = @_;	2972	my ($self, $x, $y) = @_;
2771		2973
2772	($x, $y)	2974	($x, $y)
2773	}	2975	}
2774		2976
		2977	sub coord2global {
		2978	my ($self, $x, $y) = @_;
		2979
		2980	($x, $y)
		2981	}
		2982
2775	sub update {	2983	sub update {
2776	my ($self) = @_;	2984	my ($self) = @_;
2777		2985
2778	$self->check_size;	2986	$self->check_size;
2779	::refresh ();	2987	$::WANT_REFRESH++;
2780	}	2988	}
2781		2989
2782	sub add {	2990	sub add {
2783	my ($self, $child) = @_;	2991	my ($self, @children) = @_;
2784		2992
		2993	for my $child (@children) {
		2994	$child->{toplevel} = 1;
		2995
2785	# integerize window positions	2996	# integerise window positions
2786	$child->{x} = int $child->{x};	2997	$child->{x} = int $child->{x};
2787	$child->{y} = int $child->{y};	2998	$child->{y} = int $child->{y};
		2999	}
2788		3000
2789	$self->SUPER::add ($child);	3001	$self->SUPER::add (@children);
		3002
		3003	while (@children) {
		3004	my $w = pop @children;
		3005	push @children, $w->children;
		3006	$w->{visible} = 1;
		3007	}
		3008	}
		3009
		3010	sub remove {
		3011	my ($self, @children) = @_;
		3012
		3013	$self->SUPER::remove (@children);
		3014
		3015	while (@children) {
		3016	my $w = pop @children;
		3017	push @children, $w->children;
		3018	delete $w->{visible};
		3019	}
2790	}	3020	}
2791		3021
2792	sub on_refresh {	3022	sub on_refresh {
2793	my ($self, $id, $cb) = @_;	3023	my ($self, $id, $cb) = @_;
2794		3024
2795	$self->{refresh_hook}{$id} = $cb;	3025	$self->{refresh_hook}{$id} = $cb;
2796	}	3026	}
2797		3027
		3028	sub on_post_alloc {
		3029	my ($self, $id, $cb) = @_;
		3030
		3031	$self->{post_alloc_hook}{$id} = $cb;
		3032	}
		3033
2798	sub draw {	3034	sub draw {
2799	my ($self) = @_;	3035	my ($self) = @_;
2800		3036
2801	while (my $rcb = delete $self->{refresh_hook}) {	3037	while ($self->{refresh_hook}) {
2802	$_->() for values %$rcb;	3038	$_->()
		3039	for values %{delete $self->{refresh_hook}};
		3040	}
		3041
		3042	if ($self->{check_size}) {
		3043	my @queue = ([], []);
		3044
		3045	for (;;) {
		3046	if ($self->{check_size}) {
		3047	# heuristic: check containers last
		3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3049	for values %{delete $self->{check_size}}
		3050	}
		3051
		3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3053
		3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3055	? @$widget{qw(user_w user_h)}
		3056	: $widget->size_request;
		3057
		3058	if (delete $widget->{force_alloc}
		3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3061
		3062	$widget->{req_w} = $w;
		3063	$widget->{req_h} = $h;
		3064
		3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3066
		3067	$widget->{parent}->check_size
		3068	if $widget->{parent};
		3069	}
		3070	}
		3071	}
		3072
		3073	while ($self->{size_alloc}) {
		3074	for (values %{delete $self->{size_alloc}}) {
		3075	my ($widget, $w, $h) = @$_;
		3076
		3077	$w = 0 if $w < 0;
		3078	$h = 0 if $h < 0;
		3079
		3080	$widget->{w} = $w;
		3081	$widget->{h} = $h;
		3082	$widget->size_allocate ($w, $h);
		3083	$widget->emit (size_allocate => $w, $h);
		3084	}
		3085	}
		3086
		3087	while ($self->{post_alloc_hook}) {
		3088	$_->()
		3089	for values %{delete $self->{post_alloc_hook}};
2803	}	3090	}
2804		3091
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	3094	glClear GL_COLOR_BUFFER_BIT;
2808		3095
2809	glMatrixMode GL_PROJECTION;	3096	glMatrixMode GL_PROJECTION;
2810	glLoadIdentity;	3097	glLoadIdentity;
2811	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812	glMatrixMode GL_MODELVIEW;	3099	glMatrixMode GL_MODELVIEW;
2813	glLoadIdentity;	3100	glLoadIdentity;
2814		3101
2815	$self->_draw;	3102	$self->_draw;
2816	}	3103	}
…		…
2818	#############################################################################	3105	#############################################################################
2819		3106
2820	package CFClient::UI;	3107	package CFClient::UI;
2821		3108
2822	$ROOT = new CFClient::UI::Root;	3109	$ROOT = new CFClient::UI::Root;
2823	$TOOLTIP = new CFClient::UI::Tooltip;	3110	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824		3111
2825	1	3112	1
2826		3113

Diff Legend

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