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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

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

Diff Legend

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