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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 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
…		…
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
16	sub check_tooltip {	17	sub check_tooltip {
17	if (!$GRAB) {	18	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	20	if (length $widget->{tooltip}) {
20		21
21	if ($TOOLTIP->{owner} != $widget) {	22	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	23	$TOOLTIP->{owner} = $widget;
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_text ($widget->{tooltip});	29	$TOOLTIP->set_markup ($widget->{tooltip});
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));	30
30	$TOOLTIP->show;	31	$TOOLTIP->show;
		32
		33	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		34
		35	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		37	}
		38
		39	$TOOLTIP->move ($x, $y);
31	}	40	}
32		41
33	return;	42	return;
34	}	43	}
35	}	44	}
…		…
39	delete $TOOLTIP->{owner};	48	delete $TOOLTIP->{owner};
40	}	49	}
41		50
42	# class methods for events	51	# class methods for events
43	sub feed_sdl_key_down_event {	52	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	53	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		54	if $FOCUS;
45	}	55	}
46		56
47	sub feed_sdl_key_up_event {	57	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	58	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		59	if $FOCUS;
49	}	60	}
50		61
51	sub feed_sdl_button_down_event {	62	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	63	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	64	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	72	check_tooltip;
62	}	73	}
63		74
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	75	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		76
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	77	if ($GRAB) {
		78	($x, $y) = $GRAB->coord2local ($x, $y);
		79	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		80	}
67	}	81	}
68		82
69	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	84	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
72		86
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		88
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		90
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	91	if ($GRAB) {
		92	($x, $y) = $GRAB->coord2local ($x, $y);
		93	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		94	}
78		95
79	if (!$BUTTON_STATE) {	96	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	97	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	98	$grab->update if $grab;
82	$GRAB->update if $GRAB;	99	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	115	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		116
100	check_tooltip;	117	check_tooltip;
101	}	118	}
102		119
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	120	if ($HOVER) {
		121	($x, $y) = $HOVER->coord2local ($x, $y);
		122	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		123	}
104	}	124	}
105		125
106	# convert position array to integers	126	# convert position array to integers
107	sub harmonize {	127	sub harmonize {
108	my ($vals) = @_;	128	my ($vals) = @_;
…		…
126		146
127	sub new {	147	sub new {
128	my $class = shift;	148	my $class = shift;
129		149
130	my $self = bless {	150	my $self = bless {
131	x => 0,	151	x => 0,
132	y => 0,	152	y => 0,
133	z => 0,	153	z => 0,
134	can_events => 1,	154	can_events => 1,
135	@_	155	@_
136	}, $class;	156	}, $class;
137		157
138	for (keys %$self) {	158	for (keys %$self) {
…		…
142	}	162	}
143		163
144	$self	164	$self
145	}	165	}
146		166
		167	sub destroy {
		168	my ($self) = @_;
		169
		170	$self->hide;
		171	%$self = ();
		172	}
		173
147	sub show {	174	sub show {
148	my ($self) = @_;	175	my ($self) = @_;
149		176
150	return if $self->{parent};	177	return if $self->{parent};
151		178
…		…
153	}	180	}
154		181
155	sub hide {	182	sub hide {
156	my ($self) = @_;	183	my ($self) = @_;
157		184
158	return unless $self->{parent};	185	undef $GRAB if $GRAB == $self;
		186	undef $HOVER if $HOVER == $self;
159		187
160	$self->{parent}->remove ($self);	188	$self->{parent}->remove ($self)
		189	if $self->{parent};
161	}	190	}
162		191
163	sub move {	192	sub move {
164	my ($self, $x, $y, $z) = @_;	193	my ($self, $x, $y, $z) = @_;
165		194
…		…
204	$self->{y} = $y;	233	$self->{y} = $y;
205	$self->update;	234	$self->update;
206	}	235	}
207		236
208	if ($self->{w} != $w || $self->{h} != $h) {	237	if ($self->{w} != $w || $self->{h} != $h) {
209	$self->{w} = $w;	238	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210	$self->{h} = $h;
211
212	$self->size_allocate ($w, $h);
213	$self->update;
214	}	239	}
215	}	240	}
216		241
217	sub size_allocate {	242	sub size_allocate {
218	# nothing to be done	243	# nothing to be done
219	}	244	}
220		245
		246	sub children {
		247	}
		248
		249	# call when resolution changes etc.
		250	sub reconfigure {
		251	my ($self) = @_;
		252
		253	$_->reconfigure
		254	for $self->children;
		255
		256	$self->check_size;
		257	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		258	$self->update;
		259	}
		260
221	sub set_max_size {	261	sub set_max_size {
222	my ($self, $w, $h) = @_;	262	my ($self, $w, $h) = @_;
223		263
224	delete $self->{max_w}; $self->{max_w} = $w if $w;	264	delete $self->{max_w}; $self->{max_w} = $w if $w;
225	delete $self->{max_h}; $self->{max_h} = $h if $h;	265	delete $self->{max_h}; $self->{max_h} = $h if $h;
226	}
227
228	# return top left coordinates
229	sub _topleft {
230	my ($self, $x, $y) = @_;
231
232	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233	}	266	}
234		267
235	# translate global coordinates to local coordinate system	268	# translate global coordinates to local coordinate system
236	sub coord2local {	269	sub coord2local {
237	my ($self, $x, $y) = @_;	270	my ($self, $x, $y) = @_;
238		271
239	my ($X, $Y) = $self->_topleft;	272	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240	($x - $X, $y - $Y)
241	}	273	}
242		274
243	# translate local coordinates to global coordinate system	275	# translate local coordinates to global coordinate system
244	sub coord2global {	276	sub coord2global {
245	my ($self, $x, $y) = @_;	277	my ($self, $x, $y) = @_;
246		278
247	my ($X, $Y) = $self->_topleft;	279	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248	($x + $X, $y + $Y)
249	}	280	}
250		281
251	sub focus_in {	282	sub focus_in {
252	my ($self) = @_;	283	my ($self) = @_;
253		284
…		…
313	glVertex $x + $self->{w}, $y + $self->{h};	344	glVertex $x + $self->{w}, $y + $self->{h};
314	glVertex $x , $y + $self->{h};	345	glVertex $x , $y + $self->{h};
315	glEnd;	346	glEnd;
316	glDisable GL_BLEND;	347	glDisable GL_BLEND;
317	}	348	}
		349
		350	if ($ENV{PCLIENT_DEBUG}) {
		351	glPushMatrix;
		352	glColor 1, 1, 0, 1;
		353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		354	glBegin GL_LINE_LOOP;
		355	glVertex 0 , 0;
		356	glVertex $self->{w}, 0;
		357	glVertex $self->{w}, $self->{h};
		358	glVertex 0 , $self->{h};
		359	glEnd;
		360	glPopMatrix;
		361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		362	}
318	}	363	}
319		364
320	sub _draw {	365	sub _draw {
321	my ($self) = @_;	366	my ($self) = @_;
322		367
…		…
337		382
338	sub set_parent {	383	sub set_parent {
339	my ($self, $parent) = @_;	384	my ($self, $parent) = @_;
340		385
341	Scalar::Util::weaken ($self->{parent} = $parent);	386	Scalar::Util::weaken ($self->{parent} = $parent);
		387
		388	$self->check_size
		389	unless exists $self->{req_w};
342	}	390	}
343		391
344	sub check_size {	392	sub check_size {
345	my ($self) = @_;	393	my ($self) = @_;
346		394
347	$self->{parent}	395	$CFClient::UI::ROOT->{check_size}{$self} = $self;
348	or return 1;
349
350	my ($w, $h) = $self->{user_w} && $self->{user_h}
351	? @$self{qw(user_w user_h)}
352	: $self->size_request;
353
354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
355	$self->{req_w} = $w;
356	$self->{req_h} = $h;
357
358	$self->{parent}->check_size
359	or $self->size_allocate (
360	(List::Util::max $self->{w}, $w),
361	(List::Util::max $self->{h}, $h),
362	);
363
364	1
365	} else {
366	0
367	}
368	}	396	}
369		397
370	sub update {	398	sub update {
371	my ($self) = @_;	399	my ($self) = @_;
372		400
…		…
381	}	409	}
382		410
383	sub emit {	411	sub emit {
384	my ($self, $signal, @args) = @_;	412	my ($self, $signal, @args) = @_;
385		413
386	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	414	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387	$cb->($self, @args);
388	}
389	}	415	}
390		416
391	sub DESTROY {	417	sub DESTROY {
392	my ($self) = @_;	418	my ($self) = @_;
393		419
…		…
460	sub new {	486	sub new {
461	my ($class, %arg) = @_;	487	my ($class, %arg) = @_;
462		488
463	my $children = delete $arg{children} || [];	489	my $children = delete $arg{children} || [];
464		490
465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	491	my $self = $class->SUPER::new (
		492	children => [],
		493	can_events => 0,
		494	%arg,
		495	);
466	$self->add ($_) for @$children;	496	$self->add ($_) for @$children;
467		497
468	$self	498	$self
469	}	499	}
470		500
471	sub add {	501	sub add {
472	my ($self, $child) = @_;	502	my ($self, @widgets) = @_;
473		503
474	$child->set_parent ($self);	504	$_->set_parent ($self)
		505	for @widgets;
475		506
476	use sort 'stable';	507	use sort 'stable';
477		508
478	$self->{children} = [	509	$self->{children} = [
479	sort { $a->{z} <=> $b->{z} }	510	sort { $a->{z} <=> $b->{z} }
480	@{$self->{children}}, $child	511	@{$self->{children}}, @widgets
481	];	512	];
482		513
483	$child->check_size;	514	$self->check_size;
		515	$self->update;
		516	}
		517
		518	sub children {
		519	@{ $_[0]{children} }
484	}	520	}
485		521
486	sub remove {	522	sub remove {
487	my ($self, $child) = @_;	523	my ($self, $child) = @_;
488		524
489	delete $child->{parent};	525	delete $child->{parent};
		526	$child->hide;
490		527
491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		529
		530	$self->check_size;
		531	$self->update;
		532	}
		533
		534	sub clear {
		535	my ($self) = @_;
		536
		537	my $children = delete $self->{children};
		538	$self->{children} = [];
		539
		540	for (@$children) {
		541	delete $_->{parent};
		542	$_->hide;
		543	}
492		544
493	$self->check_size;	545	$self->check_size;
494	$self->update;	546	$self->update;
495	}	547	}
496		548
…		…
574	}	626	}
575		627
576	sub update {	628	sub update {
577	my ($self) = @_;	629	my ($self) = @_;
578		630
579	# we want to do this delayed...	631	$ROOT->on_refresh ($self => sub { $self->render_child });
580	$self->render_chld;
581	$self->SUPER::update;	632	$self->SUPER::update;
582	}
583
584	sub render_chld {
585	my ($self) = @_;
586
587	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588	glClearColor 0, 0, 0, 1;
589	glClear GL_COLOR_BUFFER_BIT;
590	$self->child->draw;
591	};
592	}	633	}
593		634
594	sub size_allocate {	635	sub size_allocate {
595	my ($self, $w, $h) = @_;	636	my ($self, $w, $h) = @_;
596		637
597	$self->child->configure (0, 0, $w, $h);	638	$self->SUPER::size_allocate ($w, $h);
		639	$self->update;
		640	}
598		641
		642	sub _render {
		643	$_[0]{children}[0]->draw;
		644	}
		645
		646	sub render_child {
		647	my ($self) = @_;
		648
		649	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		650	glClearColor 0, 0, 0, 0;
		651	glClear GL_COLOR_BUFFER_BIT;
		652
599	$self->render_chld;	653	$self->_render;
		654	# glColorMask 1, 1, 1, 0;
		655	# glEnable GL_BLEND;
		656	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		657	# glRasterPos 0, 0;
		658	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		659	# glDisable GL_BLEND;
		660	# glColorMask 1, 1, 1, 1;
		661	};
600	}	662	}
601		663
602	sub _draw {	664	sub _draw {
603	my ($self) = @_;	665	my ($self) = @_;
604		666
605	my ($w, $h) = ($self->w, $self->h);	667	my ($w, $h) = ($self->w, $self->h);
606		668
607	my $tex = $self->{texture}	669	my $tex = $self->{texture}
608	or return;	670	or return;
609		671
610	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612	glEnable GL_TEXTURE_2D;	672	glEnable GL_TEXTURE_2D;
613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		674	glColor 0, 0, 0, 1;
614		675
615	$tex->draw_quad (0, 0, $w, $h);	676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616		677
617	glDisable GL_BLEND;
618	glDisable GL_TEXTURE_2D;	678	glDisable GL_TEXTURE_2D;
619	}	679	}
620		680
621	#############################################################################	681	#############################################################################
622		682
623	package CFClient::UI::ViewPort;	683	package CFClient::UI::ViewPort;
624		684
625	our @ISA = CFClient::UI::Window::;	685	our @ISA = CFClient::UI::Window::;
626		686
627	sub new { die }
628
629	sub size_request {	687	sub size_request {
630	my ($self) = @_;	688	my ($self) = @_;
631		689
632	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	690	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	691	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
634		692
635	@$self{qw(child_w child_h)}	693	@$self{qw(child_w child_h)}
636	}	694	}
637		695
638	sub _draw {	696	sub size_allocate {
639	my ($self) = @_;	697	my ($self, $w, $h) = @_;
640		698
641	$self->{children}[1]->draw;	699	$self->update;
642	}	700	}
643		701
		702	sub set_offset {
		703	my ($self, $x, $y) = @_;
		704
		705	$self->{view_x} = int $x;
		706	$self->{view_y} = int $y;
		707
		708	$self->update;
		709	}
		710
		711	# hmm, this does not work for topleft of $self... but we should not ask for that
		712	sub coord2local {
		713	my ($self, $x, $y) = @_;
		714
		715	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		716	}
		717
		718	sub coord2global {
		719	my ($self, $x, $y) = @_;
		720
		721	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		722	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		723
		724	$self->SUPER::coord2global ($x, $y)
		725	}
		726
		727	sub find_widget {
		728	my ($self, $x, $y) = @_;
		729
		730	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		731	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		732	) {
		733	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		734	} else {
		735	$self->CFClient::UI::Base::find_widget ($x, $y)
		736	}
		737	}
		738
		739	sub _render {
		740	my ($self) = @_;
		741
		742	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		743
		744	$self->SUPER::_render;
		745	}
		746
		747	#############################################################################
		748
		749	package CFClient::UI::ScrolledWindow;
		750
		751	our @ISA = CFClient::UI::HBox::;
		752
		753	sub new {
		754	my $class = shift;
		755
		756	my $self;
		757
		758	my $slider = new CFClient::UI::Slider
		759	vertical => 1,
		760	range => [0, 0, 1, 0.01], # HACK fix
		761	connect_changed => sub {
		762	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		763	},
		764	;
		765
		766	$self = $class->SUPER::new (
		767	vp => (new CFClient::UI::ViewPort),
		768	slider => $slider,
		769	@_,
		770	);
		771
		772	$self->{vp}->add ($self->{scrolled});
		773	$self->add ($self->{vp});
		774	$self->add ($self->{slider});
		775
		776	$self
		777	}
		778
		779	#TODO# update range on size_allocate depeneing on child
		780	# update viewport offset on scroll
644		781
645	#############################################################################	782	#############################################################################
646		783
647	package CFClient::UI::Frame;	784	package CFClient::UI::Frame;
648		785
…		…
703	my $class = shift;	840	my $class = shift;
704		841
705	# TODO: user_x, user_y, overwrite moveto?	842	# TODO: user_x, user_y, overwrite moveto?
706		843
707	my $self = $class->SUPER::new (	844	my $self = $class->SUPER::new (
708	bg => [1, 1, 1, 1],	845	bg => [1, 1, 1, 1],
709	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
710	border => 0.8,	847	border => 0.6,
711	can_events => 1,	848	can_events => 1,
712	@_	849	@_
713	);	850	);
714		851
715	$self->{title} &&= new CFClient::UI::Label	852	$self->{title} &&= new CFClient::UI::Label
716	align => 0,	853	align => 0,
717	valign => 1,	854	valign => 1,
718	text => $self->{title},	855	text => $self->{title},
719	fontsize => 1;	856	fontsize => $self->{border};
720		857
721	$self	858	$self
722	}	859	}
723		860
724	sub border {	861	sub border {
…		…
749	}	886	}
750		887
751	sub button_down {	888	sub button_down {
752	my ($self, $ev, $x, $y) = @_;	889	my ($self, $ev, $x, $y) = @_;
753		890
		891	my ($w, $h) = @$self{qw(w h)};
754	my $border = $self->border;	892	my $border = $self->border;
755		893
756	if ($x < $self->{w} && $x >= $self->{w} - $border	894	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757	&& $y < $self->{h} && $y >= $self->{h} - $border) {	895	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758		896
		897	if ($lr & $td) {
		898	my ($wx, $wy) = ($self->{x}, $self->{y});
759	my ($ox, $oy) = ($ev->{x}, $ev->{y});	899	my ($ox, $oy) = ($ev->{x}, $ev->{y});
760	my ($bw, $bh) = ($self->{w}, $self->{h});	900	my ($bw, $bh) = ($self->{w}, $self->{h});
761		901
		902	my $mx = $x < $border;
		903	my $my = $y < $border;
		904
762	$self->{motion} = sub {	905	$self->{motion} = sub {
763	my ($ev, $x, $y) = @_;	906	my ($ev, $x, $y) = @_;
764		907
765	($x, $y) = ($ev->{x}, $ev->{y});	908	my $dx = $ev->{x} - $ox;
		909	my $dy = $ev->{y} - $oy;
766		910
767	$self->{user_w} = $bw + $x - $ox;	911	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768	$self->{user_h} = $bh + $y - $oy;	912	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		913	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
769	$self->check_size;	914	$self->check_size;
770	};	915	};
771		916
772	} elsif ($x >= 0 && $x < $self->{w}	917	} elsif ($lr ^ $td) {
773	&& $y >= 0 && $y < $border) {
774
775	my ($ox, $oy) = ($ev->{x}, $ev->{y});	918	my ($ox, $oy) = ($ev->{x}, $ev->{y});
776	my ($bx, $by) = ($self->{x}, $self->{y});	919	my ($bx, $by) = ($self->{x}, $self->{y});
777		920
778	$self->{motion} = sub {	921	$self->{motion} = sub {
779	my ($ev, $x, $y) = @_;	922	my ($ev, $x, $y) = @_;
…		…
815	$tex[1]->draw_quad (0, 0, $w, $border);	958	$tex[1]->draw_quad (0, 0, $w, $border);
816	$tex[3]->draw_quad (0, $border, $border, $ch);	959	$tex[3]->draw_quad (0, $border, $border, $ch);
817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
818	$tex[4]->draw_quad (0, $h - $border, $w, $border);	961	$tex[4]->draw_quad (0, $h - $border, $w, $border);
819		962
		963	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820	my $bg = $tex[0];	964	my $bg = $tex[0];
821		965
822	# TODO: repeat texture not scale	966	# TODO: repeat texture not scale
823	my $rep_x = $cw / $bg->{w};	967	my $rep_x = $cw / $bg->{w};
824	my $rep_y = $ch / $bg->{h};	968	my $rep_y = $ch / $bg->{h};
825		969
826	glColor @{ $self->{bg} };	970	glColor @{ $self->{bg} };
827		971
828	$bg->{s} = $rep_x;	972	$bg->{s} = $rep_x;
829	$bg->{t} = $rep_y;	973	$bg->{t} = $rep_y;
830	$bg->{wrap_mode} = 1;	974	$bg->{wrap_mode} = 1;
831	$bg->draw_quad ($border, $border, $cw, $ch);	975	$bg->draw_quad ($border, $border, $cw, $ch);
832		976
833	glDisable GL_TEXTURE_2D;	977	glDisable GL_TEXTURE_2D;
834	glDisable GL_BLEND;	978	glDisable GL_BLEND;
		979	}
835		980
836	$self->{title}->draw if $self->{title};	981	$self->{title}->draw if $self->{title};
		982
837	$self->child->draw;	983	$self->child->draw;
838	}	984	}
839		985
840	#############################################################################	986	#############################################################################
841		987
…		…
863	$self->{children}[$y][$x] = $child;	1009	$self->{children}[$y][$x] = $child;
864		1010
865	$child->check_size;	1011	$child->check_size;
866	}	1012	}
867		1013
		1014	sub children {
		1015	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1016	}
		1017
868	# TODO: move to container class maybe? send childs a signal on removal?	1018	# TODO: move to container class maybe? send childs a signal on removal?
869	sub clear {	1019	sub clear {
870	my ($self) = @_;	1020	my ($self) = @_;
871		1021
		1022	my @children = $self->children;
872	delete $self->{children};	1023	delete $self->{children};
		1024
		1025	for (@children) {
		1026	delete $_->{parent};
		1027	$_->hide;
		1028	}
		1029
873	$self->update;	1030	$self->update;
874	}	1031	}
875		1032
876	sub get_wh {	1033	sub get_wh {
877	my ($self) = @_;	1034	my ($self) = @_;
…		…
1054	}	1211	}
1055		1212
1056	sub size_allocate {	1213	sub size_allocate {
1057	my ($self, $w, $h) = @_;	1214	my ($self, $w, $h) = @_;
1058		1215
		1216	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1217
1059	my $children = $self->{children};	1218	my $children = $self->{children};
1060		1219
1061	my @h = map $_->{req_h}, @$children;	1220	my @h = map $_->{req_h}, @$children;
1062		1221
1063	my $req_h = List::Util::sum @h;	1222	my $req_h = List::Util::sum @h;
…		…
1100		1259
1101	sub new {	1260	sub new {
1102	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1103		1262
1104	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1105	fg => [1, 1, 1],	1264	fg => [1, 1, 1],
1106	#font => default_font	1265	#font => default_font
		1266	#text => initial text
		1267	#markup => initial narkup
		1268	layout => (new CFClient::Layout),
1107	fontsize => 1,	1269	fontsize => 1,
1108	text => "",
1109	align => -1,	1270	align => -1,
1110	valign => -1,	1271	valign => -1,
1111	padding => 2,	1272	padding => 2,
1112	layout => new CFClient::Layout,
1113	can_events => 0,	1273	can_events => 0,
1114	%arg	1274	%arg
1115	);	1275	);
1116		1276
1117	if (exists $self->{template}) {	1277	if (exists $self->{template}) {
1118	my $layout = new CFClient::Layout;	1278	my $layout = new CFClient::Layout;
1119	$layout->set_text (delete $self->{template});	1279	$layout->set_text (delete $self->{template});
1120	$self->{template} = $layout;	1280	$self->{template} = $layout;
1121	}	1281	}
1122		1282
1123	$self->set_text (delete $self->{text}) if exists $self->{text};	1283	if (exists $self->{markup}) {
1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1284	$self->set_markup (delete $self->{markup});
		1285	} else {
		1286	$self->set_text (delete $self->{text});
		1287	}
1125		1288
1126	$self	1289	$self
1127	}	1290	}
1128		1291
1129	sub escape_text {	1292	sub escape {
1130	local $_ = $_[1];	1293	local $_ = $_[1];
1131		1294
1132	s/&/&amp;/g;	1295	s/&/&amp;/g;
1133	s/>/&gt;/g;	1296	s/>/&gt;/g;
1134	s/</&lt;/g;	1297	s/</&lt;/g;
1135		1298
1136	$_[1]	1299	$_[1]
1137	}	1300	}
1138		1301
		1302	sub update {
		1303	my ($self) = @_;
		1304
		1305	delete $self->{texture};
		1306	$self->SUPER::update;
		1307	}
		1308
1139	sub set_text {	1309	sub set_text {
1140	my ($self, $text) = @_;	1310	my ($self, $text) = @_;
1141		1311
		1312	return if $self->{text} eq "T$text";
		1313	$self->{text} = "T$text";
		1314
		1315	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142	$self->{layout}->set_text ($text);	1316	$self->{layout}->set_text ($text);
1143		1317
1144	delete $self->{texture};	1318	$self->update;
1145	$self->check_size;	1319	$self->check_size;
1146	$self->update;
1147	}	1320	}
1148		1321
1149	sub set_markup {	1322	sub set_markup {
1150	my ($self, $markup) = @_;	1323	my ($self, $markup) = @_;
1151		1324
		1325	return if $self->{text} eq "M$markup";
		1326	$self->{text} = "M$markup";
		1327
		1328	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1329
		1330	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152	$self->{layout}->set_markup ($markup);	1331	$self->{layout}->set_markup ($markup);
1153		1332
1154	delete $self->{texture};	1333	$self->update;
1155	$self->check_size;	1334	$self->check_size;
1156	$self->update;
1157	}	1335	}
1158		1336
1159	sub size_request {	1337	sub size_request {
1160	my ($self) = @_;	1338	my ($self) = @_;
1161		1339
…		…
1190	sub set_fontsize {	1368	sub set_fontsize {
1191	my ($self, $fontsize) = @_;	1369	my ($self, $fontsize) = @_;
1192		1370
1193	$self->{fontsize} = $fontsize;	1371	$self->{fontsize} = $fontsize;
1194	delete $self->{texture};	1372	delete $self->{texture};
		1373
		1374	$self->update;
1195	$self->check_size;	1375	$self->check_size;
1196	$self->update;
1197	}	1376	}
1198		1377
1199	sub _draw {	1378	sub _draw {
1200	my ($self) = @_;	1379	my ($self) = @_;
1201		1380
1202	my $tex = $self->{texture} ||= do {	1381	my $tex = $self->{texture} ||= do {
		1382	$self->{layout}->set_foreground (@{$self->{fg}});
1203	$self->{layout}->set_font ($self->{font}) if $self->{font};	1383	$self->{layout}->set_font ($self->{font}) if $self->{font};
1204	$self->{layout}->set_width ($self->{w});	1384	$self->{layout}->set_width ($self->{w});
1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1385	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1386
1206	new_from_layout CFClient::Texture $self->{layout}	1387	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1388
		1389	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1390	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1391	: ($self->{w} - $tex->{w}) * 0.5;
		1392
		1393	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1394	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1395	: ($self->{h} - $tex->{h}) * 0.5;
		1396
		1397	$tex
1207	};	1398	};
1208		1399
1209	glEnable GL_BLEND;
1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211	glEnable GL_TEXTURE_2D;	1400	glEnable GL_TEXTURE_2D;
1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213		1402
		1403	if ($tex->{format} == GL_ALPHA) {
1214	glColor @{$self->{fg}};	1404	glColor @{$self->{fg}};
1215
1216	$self->{ox} = int (
1217	$self->{align} < 0 ? $self->{padding}
1218	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219	: ($self->{w} - $tex->{w}) * 0.5
1220	);
1221
1222	$self->{oy} = int (
1223	$self->{valign} < 0 ? $self->{padding}
1224	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225	: ($self->{h} - $tex->{h}) * 0.5
1226	);
1227
1228	$tex->draw_quad ($self->{ox}, $self->{oy});	1405	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1406	} else {
		1407	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1408	}
1229		1409
1230	glDisable GL_TEXTURE_2D;	1410	glDisable GL_TEXTURE_2D;
1231	glDisable GL_BLEND;
1232	}	1411	}
1233		1412
1234	#############################################################################	1413	#############################################################################
1235		1414
1236	package CFClient::UI::EntryBase;	1415	package CFClient::UI::EntryBase;
…		…
1241		1420
1242	sub new {	1421	sub new {
1243	my $class = shift;	1422	my $class = shift;
1244		1423
1245	$class->SUPER::new (	1424	$class->SUPER::new (
1246	fg => [1, 1, 1],	1425	fg => [1, 1, 1],
1247	bg => [0, 0, 0, 0.2],	1426	bg => [0, 0, 0, 0.2],
1248	active_bg => [1, 1, 1, 0.5],	1427	active_bg => [1, 1, 1, 0.5],
1249	active_fg => [0, 0, 0],	1428	active_fg => [0, 0, 0],
1250	can_hover => 1,	1429	can_hover => 1,
1251	can_focus => 1,	1430	can_focus => 1,
1252	valign => 0,	1431	valign => 0,
1253	can_events => 1,	1432	can_events => 1,
1254	@_	1433	@_
1255	)	1434	)
1256	}	1435	}
1257		1436
…		…
1271	$self->{layout}->set_text ("$text ");	1450	$self->{layout}->set_text ("$text ");
1272		1451
1273	$self->emit (changed => $self->{text});	1452	$self->emit (changed => $self->{text});
1274	}	1453	}
1275		1454
		1455	sub set_text {
		1456	my ($self, $text) = @_;
		1457
		1458	$self->{cursor} = length $text;
		1459	$self->_set_text ($text);
		1460	$self->check_size;
		1461	$self->update;
		1462	}
		1463
1276	sub get_text {	1464	sub get_text {
1277	$_[0]{text}	1465	$_[0]{text}
1278	}	1466	}
1279		1467
1280	sub size_request {	1468	sub size_request {
…		…
1287		1475
1288	sub size_allocate {	1476	sub size_allocate {
1289	my ($self, $w, $h) = @_;	1477	my ($self, $w, $h) = @_;
1290		1478
1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1479	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292	}
1293
1294	sub set_text {
1295	my ($self, $text) = @_;
1296
1297	$self->{cursor} = length $text;
1298	$self->_set_text ($text);
1299	$self->update;
1300	}	1480	}
1301		1481
1302	sub key_down {	1482	sub key_down {
1303	my ($self, $ev) = @_;	1483	my ($self, $ev) = @_;
1304		1484
…		…
1411	my ($self, $ev) = @_;	1591	my ($self, $ev) = @_;
1412		1592
1413	my $sym = $ev->{sym};	1593	my $sym = $ev->{sym};
1414		1594
1415	if ($sym == 13) {	1595	if ($sym == 13) {
		1596	unshift @{$self->{history}},
		1597	my $txt = $self->get_text;
		1598	$self->{history_pointer} = -1;
		1599	$self->{history_saveback} = '';
1416	$self->emit (activate => $self->get_text);	1600	$self->emit (activate => $txt);
1417	$self->update;	1601	$self->update;
		1602
		1603	} elsif ($sym == CFClient::SDLK_UP) {
		1604	if ($self->{history_pointer} < 0) {
		1605	$self->{history_saveback} = $self->get_text;
		1606	}
		1607	if (@{$self->{history} || []} > 0) {
		1608	$self->{history_pointer}++;
		1609	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1610	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1611	}
		1612	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1613	}
		1614
		1615	} elsif ($sym == CFClient::SDLK_DOWN) {
		1616	$self->{history_pointer}--;
		1617	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1618
		1619	if ($self->{history_pointer} >= 0) {
		1620	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1621	} else {
		1622	$self->set_text ($self->{history_saveback});
		1623	}
1418		1624
1419	} else {	1625	} else {
1420	$self->SUPER::key_down ($ev);	1626	$self->SUPER::key_down ($ev);
1421	}	1627	}
1422		1628
…		…
1436		1642
1437	sub new {	1643	sub new {
1438	my $class = shift;	1644	my $class = shift;
1439		1645
1440	$class->SUPER::new (	1646	$class->SUPER::new (
1441	padding => 4,	1647	padding => 4,
1442	fg => [1, 1, 1],	1648	fg => [1, 1, 1],
1443	bg => [1, 1, 1, 0.2],	1649	bg => [1, 1, 1, 0.2],
1444	active_fg => [0, 0, 1],	1650	active_fg => [0, 0, 1],
1445	can_hover => 1,	1651	can_hover => 1,
1446	align => 0,	1652	align => 0,
1447	valign => 0,	1653	valign => 0,
1448	can_events => 1,	1654	can_events => 1,
1449	@_	1655	@_
1450	)	1656	)
1451	}	1657	}
1452		1658
…		…
1659	}	1865	}
1660		1866
1661	sub set_max {	1867	sub set_max {
1662	my ($self, $max) = @_;	1868	my ($self, $max) = @_;
1663		1869
		1870	return if $self->{max_val} == $max;
		1871
1664	$self->{max_val} = $max;	1872	$self->{max_val} = $max;
		1873	$self->update;
1665	}	1874	}
1666		1875
1667	sub set_value {	1876	sub set_value {
1668	my ($self, $val, $max) = @_;	1877	my ($self, $val, $max) = @_;
1669		1878
1670	$self->set_max ($max)	1879	$self->set_max ($max)
1671	if defined $max;	1880	if defined $max;
1672		1881
1673	$max = $self->{max_val};	1882	return if $self->{val} == $val;
		1883
1674	$self->{val} = $val;	1884	$self->{val} = $val;
1675
1676	$self->update;	1885	$self->update;
1677	}	1886	}
1678		1887
1679	sub _draw {	1888	sub _draw {
1680	my ($self) = @_;	1889	my ($self) = @_;
…		…
1743		1952
1744	sub new {	1953	sub new {
1745	my ($class, %arg) = @_;	1954	my ($class, %arg) = @_;
1746		1955
1747	my $self = $class->SUPER::new (	1956	my $self = $class->SUPER::new (
1748	tooltip => $arg{type},	1957	tooltip => $arg{type},
		1958	can_hover => 1,
		1959	can_events => 1,
1749	%arg,	1960	%arg,
1750	);	1961	);
1751		1962
1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	1963	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	1964	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	1965	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755		1966
1756	$self	1967	$self
1757	}	1968	}
1758		1969
1759	sub set_fontsize {	1970	sub set_fontsize {
…		…
1761		1972
1762	$self->{value}->set_fontsize ($fsize);	1973	$self->{value}->set_fontsize ($fsize);
1763	$self->{max} ->set_fontsize ($fsize);	1974	$self->{max} ->set_fontsize ($fsize);
1764	}	1975	}
1765		1976
		1977	sub set_max {
		1978	my ($self, $max) = @_;
		1979
		1980	$self->{gauge}->set_max ($max);
		1981	$self->{max}->set_text ($max);
		1982	}
		1983
1766	sub set_value {	1984	sub set_value {
1767	my ($self, $val, $max) = @_;	1985	my ($self, $val, $max) = @_;
1768		1986
1769	$self->set_max ($max)	1987	$self->set_max ($max)
1770	if defined $max;	1988	if defined $max;
1771		1989
1772	$self->{gauge}->set_value ($val, $max);	1990	$self->{gauge}->set_value ($val, $max);
1773	$self->{value}->set_text ($val);	1991	$self->{value}->set_text ($val);
1774	}
1775
1776	sub set_max {
1777	my ($self, $max) = @_;
1778
1779	$self->{gauge}->set_max ($max);
1780	$self->{max}->set_text ($max);
1781	}	1992	}
1782		1993
1783	#############################################################################	1994	#############################################################################
1784		1995
1785	package CFClient::UI::Slider;	1996	package CFClient::UI::Slider;
…		…
1804	# TODO: calculations are off	2015	# TODO: calculations are off
1805	my $self = $class->SUPER::new (	2016	my $self = $class->SUPER::new (
1806	fg => [1, 1, 1],	2017	fg => [1, 1, 1],
1807	active_fg => [0, 0, 0],	2018	active_fg => [0, 0, 0],
1808	range => [0, 0, 100, 10],	2019	range => [0, 0, 100, 10],
1809	req_w => 20,	2020	req_w => $::WIDTH / 80,
1810	req_h => 20,	2021	req_h => $::WIDTH / 80,
1811	vertical => 0,	2022	vertical => 0,
1812	can_hover => 1,	2023	can_hover => 1,
1813	inner_pad => 5,	2024	inner_pad => 5,
1814	@_	2025	@_
1815	);	2026	);
…		…
1925		2136
1926	sub new {	2137	sub new {
1927	my $class = shift;	2138	my $class = shift;
1928		2139
1929	my $self = $class->SUPER::new (	2140	my $self = $class->SUPER::new (
1930	fontsize => 1,	2141	fontsize => 1,
		2142	can_events => 0,
1931	#font => default_font	2143	#font => default_font
1932	@_,	2144	@_,
1933		2145
1934	layout => (new CFClient::Layout),	2146	layout => (new CFClient::Layout),
1935	par => [],	2147	par => [],
1936	height => 0,	2148	height => 0,
1937	children => [	2149	children => [
1938	(new CFClient::UI::Empty expand => 1),	2150	(new CFClient::UI::Empty expand => 1),
1939	(new CFClient::UI::Slider vertical => 1),	2151	(new CFClient::UI::Slider vertical => 1),
1940	],	2152	],
1941	);	2153	);
1942		2154
1943	$self->{children}[1]->connect (changed => sub {	2155	$self->{children}[1]->connect (changed => sub { $self->update });
1944	$self->update;
1945	});
1946		2156
1947	$self	2157	$self
1948	}	2158	}
1949		2159
1950	sub set_fontsize {	2160	sub set_fontsize {
…		…
1958	my ($self, $text) = @_;	2168	my ($self, $text) = @_;
1959		2169
1960	my $layout = $self->{layout};	2170	my $layout = $self->{layout};
1961		2171
1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2172	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963	$layout->set_width ($self->{w});	2173	$layout->set_width ($self->{children}[0]{w});
1964	$layout->set_text ($text);	2174	$layout->set_text ($text);
1965		2175
1966	($layout->size)[1]	2176	($layout->size)[1]
1967	}	2177	}
1968		2178
…		…
2021	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2231	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022		2232
2023	delete $self->{texture};	2233	delete $self->{texture};
2024	}	2234	}
2025		2235
2026	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2236	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027	glClearColor 0, 0, 0, 1;	2237	glClearColor 0, 0, 0, 0;
2028	glClear GL_COLOR_BUFFER_BIT;	2238	glClear GL_COLOR_BUFFER_BIT;
2029		2239
2030	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
2031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032	glEnable GL_TEXTURE_2D;	2242	glEnable GL_TEXTURE_2D;
…		…
2064	}	2274	}
2065		2275
2066	sub _draw {	2276	sub _draw {
2067	my ($self) = @_;	2277	my ($self) = @_;
2068		2278
2069	if ($self->{texture}) {	2279	glEnable GL_BLEND;
		2280	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070	glEnable GL_TEXTURE_2D;	2281	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2283	glColor 1, 1, 1, 1;
2072	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2284	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073	glDisable GL_TEXTURE_2D;	2285	glDisable GL_TEXTURE_2D;
2074	}	2286	glDisable GL_BLEND;
2075		2287
2076	$self->{children}[1]->draw;	2288	$self->{children}[1]->draw;
2077		2289
2078	}	2290	}
2079		2291
…		…
2127		2339
2128	sub new {	2340	sub new {
2129	my $class = shift;	2341	my $class = shift;
2130		2342
2131	my $self = $class->SUPER::new (	2343	my $self = $class->SUPER::new (
2132	state => 0,	2344	state => 0,
2133	connect_activate => \&toggle_flopper,	2345	connect_activate => \&toggle_flopper,
2134	can_events => 1,
2135	@_	2346	@_
2136	);	2347	);
2137		2348
2138	if ($self->{state}) {	2349	if ($self->{state}) {
2139	$self->{state} = 0;	2350	$self->{state} = 0;
…		…
2174	@_,	2385	@_,
2175	can_events => 0,	2386	can_events => 0,
2176	)	2387	)
2177	}	2388	}
2178		2389
2179	sub set_text {	2390	sub set_markup {
2180	my ($self, $text) = @_;	2391	my ($self, $text) = @_;
2181		2392
2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2393	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2183	$self->{label}->set_text ($text);	2394	$self->{label}->set_markup ($text);
2184	$self->add ($self->{label});	2395	$self->add ($self->{label});
2185	}	2396	}
2186		2397
2187	sub size_request {	2398	sub size_request {
2188	my ($self) = @_;	2399	my ($self) = @_;
2189		2400
2190	$self->child->set_max_size ($::WIDTH * 0.2);	2401	$self->child->set_max_size ($::WIDTH * 0.3);
2191		2402
2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2403	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193		2404
2194	($w + 4, $h + 4)	2405	($w + 4, $h + 4)
		2406	}
		2407
		2408	sub size_allocate {
		2409	my ($self, $w, $h) = @_;
		2410
		2411	$self->SUPER::size_allocate ($w - 4, $h - 4);
2195	}	2412	}
2196		2413
2197	sub _draw {	2414	sub _draw {
2198	my ($self) = @_;	2415	my ($self) = @_;
2199		2416
…		…
2224	$self->SUPER::_draw;	2441	$self->SUPER::_draw;
2225	}	2442	}
2226		2443
2227	#############################################################################	2444	#############################################################################
2228		2445
		2446	package CFClient::UI::Face;
		2447
		2448	our @ISA = CFClient::UI::Base::;
		2449
		2450	use CFClient::OpenGL;
		2451
		2452	sub new {
		2453	my $class = shift;
		2454
		2455	$class->SUPER::new (
		2456	aspect => 1,
		2457	@_,
		2458	)
		2459	}
		2460
		2461	sub size_request {
		2462	(32, 8)
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	return unless $::CONN;#d# manage and cache textures differently
		2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2470
		2471	# TODO animation
		2472	if ($tex) {
		2473	glEnable GL_BLEND;
		2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2475	glEnable GL_TEXTURE_2D;
		2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2477	glColor 1, 1, 1, 1;
		2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2479	glDisable GL_TEXTURE_2D;
		2480	glDisable GL_BLEND;
		2481	}
		2482	}
		2483
		2484	#############################################################################
		2485
		2486	package CFClient::UI::InventoryItem;
		2487
		2488	our @ISA = CFClient::UI::HBox::;
		2489
		2490	sub new {
		2491	my $class = shift;
		2492
		2493	my %args = @_;
		2494
		2495	my $item = delete $args{item};
		2496
		2497	my $desc = $item->{nrof} < 2
		2498	? $item->{name}
		2499	: "$item->{nrof} $item->{name_pl}";
		2500
		2501
		2502	my $self = $class->SUPER::new (
		2503	can_hover => 1,
		2504	can_events => 1,
		2505	tooltip => (CFClient::UI::Label->escape ($desc)
		2506	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2507	connect_button_down => sub {
		2508	my ($self, $ev, $x, $y) = @_;
		2509
		2510	# todo: maybe put examine on 1? but should just be a tooltip :(
		2511	if ($ev->{button} == 1) {
		2512	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2513	} elsif ($ev->{button} == 2) {
		2514	$::CONN->send ("apply $item->{tag}");
		2515	} elsif ($ev->{button} == 3) {
		2516	CFClient::UI::Menu->new (
		2517	items => [
		2518	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2519	[
		2520	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2521	sub { $::CONN->send ("lock $item->{tag}") },
		2522	],
		2523	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2524	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2525	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2526	],
		2527	)->popup ($ev);
		2528	}
		2529
		2530	1
		2531	},
		2532	%args
		2533	);
		2534
		2535	$self->add (new CFClient::UI::Face
		2536	can_events => 0,
		2537	face => $item->{face},
		2538	anim => $item->{anim},
		2539	animspeed => $item->{animspeed},
		2540	);
		2541
		2542	$self->add (new CFClient::UI::Label
		2543	can_events => 0,
		2544	text => $desc,
		2545	);
		2546
		2547	$self
		2548	}
		2549
		2550	#############################################################################
		2551
		2552	package CFClient::UI::Inventory;
		2553
		2554	our @ISA = CFClient::UI::ScrolledWindow::;
		2555
		2556	sub new {
		2557	my $class = shift;
		2558
		2559	my $self = $class->SUPER::new (
		2560	scrolled => (new CFClient::UI::VBox),
		2561	@_,
		2562	);
		2563
		2564	$self
		2565	}
		2566
		2567	sub set_items {
		2568	my ($self, $items) = @_;
		2569
		2570	$self->{scrolled}->clear;
		2571	return unless $items;
		2572
		2573	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2574
		2575	$self->{real_items} = \@items;
		2576
		2577	for my $item (@items) {
		2578	my $desc = $item->{nrof} < 2
		2579	? $item->{name}
		2580	: "$item->{nrof} $item->{name_pl}";
		2581
		2582	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
		2583	}
		2584
		2585	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2586	}
		2587
		2588	sub size_request {
		2589	my ($self) = @_;
		2590	($self->{req_w}, $self->{req_h});
		2591	}
		2592
		2593	#############################################################################
		2594
		2595	package CFClient::UI::Menu;
		2596
		2597	our @ISA = CFClient::UI::FancyFrame::;
		2598
		2599	use CFClient::OpenGL;
		2600
		2601	sub new {
		2602	my $class = shift;
		2603
		2604	my $self = $class->SUPER::new (
		2605	items => [],
		2606	z => 100,
		2607	@_,
		2608	);
		2609
		2610	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2611
		2612	for my $item (@{ $self->{items} }) {
		2613	my ($widget, $cb) = @$item;
		2614
		2615	# handle various types of items, only text for now
		2616	if (!ref $widget) {
		2617	$widget = new CFClient::UI::Label
		2618	can_hover => 1,
		2619	can_events => 1,
		2620	text => $widget;
		2621	}
		2622
		2623	$self->{item}{$widget} = $item;
		2624
		2625	$self->{vbox}->add ($widget);
		2626	}
		2627
		2628	$self
		2629	}
		2630
		2631	# popup given the event (must be a mouse button down event currently)
		2632	sub popup {
		2633	my ($self, $ev) = @_;
		2634
		2635	$self->emit ("popdown");
		2636
		2637	# maybe save $GRAB? must be careful about events...
		2638	$GRAB = $self;
		2639	$self->{button} = $ev->{button};
		2640
		2641	$self->show;
		2642	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2643	}
		2644
		2645	sub mouse_motion {
		2646	my ($self, $ev, $x, $y) = @_;
		2647
		2648	# TODO: should use vbox->find_widget or so
		2649	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2650	$self->{hover} = $self->{item}{$HOVER};
		2651	}
		2652
		2653	sub button_up {
		2654	my ($self, $ev, $x, $y) = @_;
		2655
		2656	if ($ev->{button} == $self->{button}) {
		2657	undef $GRAB;
		2658	$self->hide;
		2659
		2660	$self->emit ("popdown");
		2661	$self->{hover}[1]->() if $self->{hover};
		2662	}
		2663	}
		2664
		2665	#############################################################################
		2666
		2667	package CFClient::UI::Statusbox;
		2668
		2669	our @ISA = CFClient::UI::VBox::;
		2670
		2671	sub reorder {
		2672	my ($self) = @_;
		2673	my $NOW = time;
		2674
		2675	while (my ($k, $v) = each %{ $self->{item} }) {
		2676	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2677	}
		2678
		2679	my @widgets;
		2680	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
		2681	my $count = 10 + 1;
		2682	for my $item (@items) {
		2683	last unless --$count;
		2684
		2685	push @widgets, $item->{label} ||= do {
		2686	# TODO: doesn't handle markup well (read as: at all)
		2687	my $short = delete $item->{text};
		2688	for ($short) {
		2689	s/^\s+//;
		2690	s/\012.*//s;
		2691	my $len = int 30 / $item->{fontsize};
		2692	substr $_, $len, length, "…" if $len < length;
		2693	}
		2694
		2695	new CFClient::UI::Label
		2696	markup => $short,
		2697	tooltip => delete $item->{tooltip},
		2698	fontsize => delete $item->{fontsize},
		2699	color => delete $item->{color},
		2700	can_events => 1,
		2701	can_hover => 1,
		2702	};
		2703	}
		2704
		2705	$self->clear;
		2706	$self->SUPER::add (@widgets);
		2707	}
		2708
		2709	sub add {
		2710	my ($self, $text, %arg) = @_;
		2711
		2712	my $item = {
		2713	time => time,
		2714	text => $text,
		2715	timeout => 60,
		2716	tooltip => $text,
		2717	fontsize => 0.8,
		2718	color => [0.8, 0.8, 0.8, 0.8],
		2719	%arg,
		2720	};
		2721
		2722	$item->{timeout} += time;
		2723	$item->{group} ||= $item+0;
		2724
		2725	$item = $self->{item}{$item->{group}} ||= $item;
		2726
		2727	$self->reorder;
		2728	}
		2729
		2730	#############################################################################
		2731
2229	package CFClient::UI::Root;	2732	package CFClient::UI::Root;
2230		2733
2231	our @ISA = CFClient::UI::Container::;	2734	our @ISA = CFClient::UI::Container::;
2232		2735
2233	use CFClient::OpenGL;	2736	use CFClient::OpenGL;
2234		2737
2235	sub check_size {	2738	sub new {
2236	my ($self) = @_;	2739	my $class = shift;
2237		2740
2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2741	$class->SUPER::new (
2239	}	2742	@_,
2240		2743	)
2241	sub size_request {
2242	($::WIDTH, $::HEIGHT)
2243	}	2744	}
2244		2745
2245	sub configure {	2746	sub configure {
2246	my ($self, $x, $y, $w, $h) = @_;	2747	my ($self, $x, $y, $w, $h) = @_;
2247		2748
2248	$self->SUPER::configure ($x, $y, $w, $h);	2749	$self->{w} = $w;
		2750	$self->{h} = $h;
		2751	}
2249		2752
		2753	sub check_size {
		2754	my ($self) = @_;
		2755
		2756	$self->size_allocate ($self->{w}, $self->{h})
		2757	if $self->{w};
		2758	}
		2759
		2760	sub size_request {
		2761	my ($self) = @_;
		2762
		2763	($self->{w}, $self->{h})
		2764	}
		2765
		2766	sub size_allocate {
		2767	my ($self, $w, $h) = @_;
		2768
		2769	my $old_w = $self->{old_w};
		2770	my $old_h = $self->{old_h};
		2771
		2772	if ($old_w && $old_h) {
		2773	for my $child ($self->children) {
		2774	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2775	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2776	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2777	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2778	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2779	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2780	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2781	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2782	}
		2783	}
		2784
2250	for my $child (@{$self->{children}}) {	2785	for my $child ($self->children) {
2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2786	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252		2787
2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2788	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2789	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2255	$child->configure ($X, $Y, $W,$H);	2790	$child->configure ($X, $Y, $W, $H);
2256	}	2791	}
2257	}
2258		2792
2259	sub _topleft {	2793	$self->{old_w} = $w;
		2794	$self->{old_h} = $h;
		2795	}
		2796
		2797	sub coord2local {
2260	my ($self, $x, $y) = @_;	2798	my ($self, $x, $y) = @_;
2261		2799
2262	($x, $y)	2800	($x, $y)
2263	}	2801	}
2264		2802
		2803	sub coord2global {
		2804	my ($self, $x, $y) = @_;
		2805
		2806	($x, $y)
		2807	}
		2808
2265	sub update {	2809	sub update {
2266	my ($self) = @_;	2810	my ($self) = @_;
2267		2811
2268	$self->check_size;	2812	$self->check_size;
2269	::refresh ();	2813	$::WANT_REFRESH++;
2270	}	2814	}
2271		2815
2272	sub add {	2816	sub add {
2273	my ($self, $child) = @_;	2817	my ($self, $child) = @_;
2274		2818
2275	# integerize window positions	2819	# integerise window positions
2276	$child->{x} = int $child->{x};	2820	$child->{x} = int $child->{x};
2277	$child->{y} = int $child->{y};	2821	$child->{y} = int $child->{y};
2278		2822
2279	$self->SUPER::add ($child);	2823	$self->SUPER::add ($child);
2280	}	2824	}
…		…
2283	my ($self, $id, $cb) = @_;	2827	my ($self, $id, $cb) = @_;
2284		2828
2285	$self->{refresh_hook}{$id} = $cb;	2829	$self->{refresh_hook}{$id} = $cb;
2286	}	2830	}
2287		2831
2288	sub draw {	2832	sub draw {
2289	my ($self) = @_;	2833	my ($self) = @_;
2290		2834
		2835	if ($self->{check_size}) {
		2836	my @queue = ([], []);
		2837
		2838	for (;;) {
		2839	if ($self->{check_size}) {
		2840	# heuristic: check containers last
		2841	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2842	for values %{delete $self->{check_size}}
		2843	}
		2844
		2845	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2846
		2847	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2848	? @$widget{qw(user_w user_h)}
		2849	: $widget->size_request;
		2850
		2851	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
		2852	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2853
		2854	$widget->{req_w} = $w;
		2855	$widget->{req_h} = $h;
		2856
		2857	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2858
		2859	$widget->{parent}->check_size
		2860	if $widget->{parent};
		2861	}
		2862	}
		2863	}
		2864
		2865	while ($self->{size_alloc}) {
		2866	for (values %{delete $self->{size_alloc}}) {
		2867	my ($widget, $w, $h) = @$_;
		2868
		2869	$w = 0 if $w < 0;
		2870	$h = 0 if $h < 0;
		2871
		2872	$widget->{w} = $w;
		2873	$widget->{h} = $h;
		2874	$widget->size_allocate ($w, $h);
		2875	$widget->emit (size_allocate => $w, $h);
		2876	}
		2877	}
		2878
2291	while (my $rcb = delete $self->{refresh_hook}) {	2879	while ($self->{refresh_hook}) {
2292	$_->() for values %$rcb;	2880	$_->()
		2881	for values %{delete $self->{refresh_hook}};
2293	}	2882	}
2294		2883
2295	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2884	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297	glClear GL_COLOR_BUFFER_BIT;	2886	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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