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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 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	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
122		133
123	for (@$vals) {	134	for (@$vals) {
124	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
125	$rem += $_ - $i;	136	$rem += $_ - $i;
126	$_ = $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;
127	}	169	}
128	}	170	}
129		171
130	#############################################################################	172	#############################################################################
131		173
…		…
150	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
152	}	194	}
153	}	195	}
154		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
155	$self	199	$self
156	}	200	}
157		201
158	sub destroy {	202	sub destroy {
159	my ($self) = @_;	203	my ($self) = @_;
…		…
163	}	207	}
164		208
165	sub show {	209	sub show {
166	my ($self) = @_;	210	my ($self) = @_;
167		211
		212	for (my @w = $self; @w; ) {
		213	my $w = pop @w;
		214	push @w, $w->children;
		215	$w->{visible} = 1;
		216	}
		217
168	return if $self->{parent};	218	return if $self->{parent};
169		219
170	$CFClient::UI::ROOT->add ($self);	220	$CFClient::UI::ROOT->add ($self);
171	}	221	}
172		222
173	sub hide {	223	sub hide {
174	my ($self) = @_;	224	my ($self) = @_;
		225
		226	for (my @w = $self; @w; ) {
		227	my $w = pop @w;
		228	push @w, $w->children;
		229	$w->{visible} = 1;
		230	}
175		231
176	undef $GRAB if $GRAB == $self;	232	undef $GRAB if $GRAB == $self;
177	undef $HOVER if $HOVER == $self;	233	undef $HOVER if $HOVER == $self;
178		234
179	$self->{parent}->remove ($self)	235	$self->{parent}->remove ($self)
…		…
224	$self->{y} = $y;	280	$self->{y} = $y;
225	$self->update;	281	$self->update;
226	}	282	}
227		283
228	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	286	}
235	}	287	}
236		288
237	sub size_allocate {	289	sub size_allocate {
238	# nothing to be done	290	# nothing to be done
239	}	291	}
240		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
		300	sub children {
		301	}
		302
241	sub set_max_size {	303	sub set_max_size {
242	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
243		305
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	308	}
247		309
248	# return top left coordinates	310	sub set_tooltip {
249	sub _topleft {
250	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
251		312
252	$self->{parent}	313	$self->{tooltip} = $tooltip;
253	or Carp::confess "no parent widget in _topleft\n";#d#
254		314
255	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
256	}	319	}
257		320
258	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
259	sub coord2local {	322	sub coord2local {
260	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
261		324
262	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263	($x - $X, $y - $Y)
264	}	326	}
265		327
266	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
267	sub coord2global {	329	sub coord2global {
268	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
269		331
270	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271	($x + $X, $y + $Y)
272	}	333	}
273		334
274	sub focus_in {	335	sub focus_in {
275	my ($self) = @_;	336	my ($self) = @_;
276		337
…		…
348	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
349	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
350	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
351	glEnd;	412	glEnd;
352	glPopMatrix;	413	glPopMatrix;
353	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354	}	415	}
355	}	416	}
356		417
357	sub _draw {	418	sub _draw {
358	my ($self) = @_;	419	my ($self) = @_;
…		…
374		435
375	sub set_parent {	436	sub set_parent {
376	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
377		438
378	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
379	}	446	}
380		447
381	sub check_size {	448	sub check_size {
382	my ($self) = @_;	449	my ($self, $forced) = @_;
383		450
384	$self->{parent}	451	$self->{force_alloc} = 1 if $forced;
385	or return 1;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
386
387	my ($w, $h) = $self->{user_w} && $self->{user_h}
388	? @$self{qw(user_w user_h)}
389	: $self->size_request;
390
391	if ($w != $self->{req_w} || $h != $self->{req_h}) {
392	$self->{req_w} = $w;
393	$self->{req_h} = $h;
394
395	$self->{parent}->check_size
396	or $self->size_allocate (
397	(List::Util::max $self->{w}, $w),
398	(List::Util::max $self->{h}, $h),
399	);
400
401	1
402	} else {
403	0
404	}
405	}	453	}
406		454
407	sub update {	455	sub update {
408	my ($self) = @_;	456	my ($self) = @_;
409		457
…		…
424	}	472	}
425		473
426	sub DESTROY {	474	sub DESTROY {
427	my ($self) = @_;	475	my ($self) = @_;
428		476
		477	delete $WIDGET{$self+0};
429	#$self->deactivate;	478	#$self->deactivate;
430	}	479	}
431		480
432	#############################################################################	481	#############################################################################
433		482
…		…
442	my $class = shift;	491	my $class = shift;
443		492
444	# range [value, low, high, page]	493	# range [value, low, high, page]
445		494
446	$class->SUPER::new (	495	$class->SUPER::new (
447	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
448	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
449	@_	498	@_
450	)	499	)
451	}	500	}
452		501
453	sub _draw {	502	sub _draw {
454	my ($self) = @_;	503	my ($self) = @_;
455		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
456	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
457		511
458	glEnable GL_BLEND;	512	glEnable GL_BLEND;
459	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
461		515
462	glBegin GL_QUADS;	516	glBegin GL_QUADS;
463	glVertex 0 , 0;	517	glVertex 0 , 0;
464	glVertex 0 , $h;	518	glVertex 0 , $h;
465	glVertex $w, $h;	519	glVertex $w, $h;
466	glVertex $w, 0;	520	glVertex $w, 0;
467	glEnd;	521	glEnd;
468		522
469	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
470	}	525	}
471		526
472	#############################################################################	527	#############################################################################
473		528
474	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
506		561
507	$self	562	$self
508	}	563	}
509		564
510	sub add {	565	sub add {
511	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
512		567
513	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
514		570
515	use sort 'stable';	571	use sort 'stable';
516		572
517	$self->{children} = [	573	$self->{children} = [
518	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
519	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
520	];	576	];
521		577
522	$child->check_size;	578	$self->check_size (1);
		579	$self->update;
		580	}
		581
		582	sub children {
		583	@{ $_[0]{children} }
523	}	584	}
524		585
525	sub remove {	586	sub remove {
526	my ($self, $child) = @_;	587	my ($self, $child) = @_;
527		588
…		…
542		603
543	for (@$children) {	604	for (@$children) {
544	delete $_->{parent};	605	delete $_->{parent};
545	$_->hide;	606	$_->hide;
546	}	607	}
		608
		609	$self->check_size;
		610	$self->update;
547	}	611	}
548		612
549	sub find_widget {	613	sub find_widget {
550	my ($self, $x, $y) = @_;	614	my ($self, $x, $y) = @_;
551		615
…		…
626	}	690	}
627		691
628	sub update {	692	sub update {
629	my ($self) = @_;	693	my ($self) = @_;
630		694
631	# we want to do this delayed...	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->render_chld;
633	$self->SUPER::update;	696	$self->SUPER::update;
634	}
635
636	sub render_chld {
637	my ($self) = @_;
638
639	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640	glClearColor 0, 0, 0, 1;
641	glClear GL_COLOR_BUFFER_BIT;
642	$self->child->draw;
643	};
644	}	697	}
645		698
646	sub size_allocate {	699	sub size_allocate {
647	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
648		701
649	$self->child->configure (0, 0, $w, $h);	702	$self->SUPER::size_allocate ($w, $h);
		703	$self->update;
		704	}
650		705
		706	sub _render {
		707	$_[0]{children}[0]->draw;
		708	}
		709
		710	sub render_child {
		711	my ($self) = @_;
		712
		713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		714	glClearColor 0, 0, 0, 0;
		715	glClear GL_COLOR_BUFFER_BIT;
		716
651	$self->render_chld;	717	$self->_render;
		718	};
652	}	719	}
653		720
654	sub _draw {	721	sub _draw {
655	my ($self) = @_;	722	my ($self) = @_;
656		723
657	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
658		725
659	my $tex = $self->{texture}	726	my $tex = $self->{texture}
660	or return;	727	or return;
661		728
662	glEnable GL_BLEND;
663	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		731	glColor 1, 1, 1, 1;
666		732
667	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668		734
669	glDisable GL_BLEND;
670	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
671	}	736	}
672		737
673	#############################################################################	738	#############################################################################
674		739
675	package CFClient::UI::ViewPort;	740	package CFClient::UI::ViewPort;
676		741
677	our @ISA = CFClient::UI::Window::;	742	our @ISA = CFClient::UI::Window::;
678		743
679	sub new { die }
680
681	sub size_request {	744	sub size_request {
682	my ($self) = @_;	745	my ($self) = @_;
683		746
684	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
686		749
687	@$self{qw(child_w child_h)}	750	@$self{qw(child_w child_h)}
688	}	751	}
689		752
690	sub _draw {	753	sub size_allocate {
691	my ($self) = @_;	754	my ($self, $w, $h) = @_;
692		755
693	$self->{children}[1]->draw;	756	$self->update;
694	}	757	}
695		758
		759	sub set_offset {
		760	my ($self, $x, $y) = @_;
		761
		762	$self->{view_x} = int $x;
		763	$self->{view_y} = int $y;
		764
		765	$self->update;
		766	}
		767
		768	# hmm, this does not work for topleft of $self... but we should not ask for that
		769	sub coord2local {
		770	my ($self, $x, $y) = @_;
		771
		772	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		773	}
		774
		775	sub coord2global {
		776	my ($self, $x, $y) = @_;
		777
		778	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		779	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		780
		781	$self->SUPER::coord2global ($x, $y)
		782	}
		783
		784	sub find_widget {
		785	my ($self, $x, $y) = @_;
		786
		787	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		788	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		789	) {
		790	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		791	} else {
		792	$self->CFClient::UI::Base::find_widget ($x, $y)
		793	}
		794	}
		795
		796	sub _render {
		797	my ($self) = @_;
		798
		799	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		800
		801	$self->SUPER::_render;
		802	}
696		803
697	#############################################################################	804	#############################################################################
698		805
699	package CFClient::UI::Frame;	806	package CFClient::UI::ScrolledWindow;
700		807
701	our @ISA = CFClient::UI::Bin::;	808	our @ISA = CFClient::UI::HBox::;
702
703	use CFClient::OpenGL;
704		809
705	sub new {	810	sub new {
706	my $class = shift;	811	my $class = shift;
707		812
		813	my $self;
		814
		815	my $slider = new CFClient::UI::Slider
		816	vertical => 1,
		817	range => [0, 0, 1, 0.01], # HACK fix
		818	connect_changed => sub {
		819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		820	},
		821	;
		822
708	my $self = $class->SUPER::new (	823	$self = $class->SUPER::new (
709	bg => [1, 1, 1, 1],	824	vp => (new CFClient::UI::ViewPort expand => 1),
710	border_bg => [1, 1, 1, 1],	825	slider => $slider,
711	border => 0.8,
712	@_	826	@_,
713	);	827	);
714		828
		829	$self->{vp}->add ($self->{scrolled});
		830	$self->add ($self->{vp});
		831	$self->add ($self->{slider});
		832
715	$self	833	$self
716	}	834	}
717		835
		836	#TODO# update range on size_allocate depending on child
		837	# update viewport offset on scroll
		838
		839	#############################################################################
		840
		841	package CFClient::UI::Frame;
		842
		843	our @ISA = CFClient::UI::Bin::;
		844
		845	use CFClient::OpenGL;
		846
		847	sub new {
		848	my $class = shift;
		849
		850	$class->SUPER::new (
		851	bg => undef,
		852	@_,
		853	)
		854	}
		855
718	sub _draw {	856	sub _draw {
719	my ($self) = @_;	857	my ($self) = @_;
720		858
721	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
722		861
723	glEnable GL_BLEND;	862	glEnable GL_BLEND;
724	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
726	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727		865
728	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
729	# glColor 0, 0, 0, 0;
730	# glVertex 0 , 0;	867	glVertex 0 , 0;
731	# glVertex 0 , $h;	868	glVertex 0 , $h;
732	# glVertex $w, $h;	869	glVertex $w, $h;
733	# glVertex $w, 0;	870	glVertex $w, 0;
734	# glEnd;	871	glEnd;
735		872
736
737	$self->child->draw;
738	glDisable GL_BLEND;	873	glDisable GL_BLEND;
739	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
740	}	877	}
741		878
742	#############################################################################	879	#############################################################################
743		880
744	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
757	# TODO: user_x, user_y, overwrite moveto?	894	# TODO: user_x, user_y, overwrite moveto?
758		895
759	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
760	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
761	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
762	border => 0.8,	899	border => 0.6,
		900	toplevel => 1,
763	can_events => 1,	901	can_events => 1,
764	@_	902	@_
765	);	903	);
766		904
767	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
768	align => 0,	906	align => 0,
769	valign => 1,	907	valign => 1,
770	text => $self->{title},	908	text => $self->{title},
771	fontsize => 1;	909	fontsize => $self->{border};
772		910
773	$self	911	$self
774	}	912	}
775		913
776	sub border {	914	sub border {
…		…
792	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
793		931
794	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
795	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
796		934
797	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
798	if $self->{title};	936	if $self->{title};
799		937
800	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
801	}	939	}
802		940
803	sub button_down {	941	sub button_down {
804	my ($self, $ev, $x, $y) = @_;	942	my ($self, $ev, $x, $y) = @_;
805		943
		944	my ($w, $h) = @$self{qw(w h)};
806	my $border = $self->border;	945	my $border = $self->border;
807		946
808	if ($x < $self->{w} && $x >= $self->{w} - $border	947	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809	&& $y < $self->{h} && $y >= $self->{h} - $border) {	948	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810		949
		950	if ($lr & $td) {
		951	my ($wx, $wy) = ($self->{x}, $self->{y});
811	my ($ox, $oy) = ($ev->{x}, $ev->{y});	952	my ($ox, $oy) = ($ev->{x}, $ev->{y});
812	my ($bw, $bh) = ($self->{w}, $self->{h});	953	my ($bw, $bh) = ($self->{w}, $self->{h});
813		954
		955	my $mx = $x < $border;
		956	my $my = $y < $border;
		957
814	$self->{motion} = sub {	958	$self->{motion} = sub {
815	my ($ev, $x, $y) = @_;	959	my ($ev, $x, $y) = @_;
816		960
817	($x, $y) = ($ev->{x}, $ev->{y});	961	my $dx = $ev->{x} - $ox;
		962	my $dy = $ev->{y} - $oy;
818		963
819	$self->{user_w} = $bw + $x - $ox;	964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820	$self->{user_h} = $bh + $y - $oy;	965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
821	$self->check_size;	967	$self->check_size;
822	};	968	};
823		969
824	} elsif ($x >= 0 && $x < $self->{w}	970	} elsif ($lr ^ $td) {
825	&& $y >= 0 && $y < $border) {
826
827	my ($ox, $oy) = ($ev->{x}, $ev->{y});	971	my ($ox, $oy) = ($ev->{x}, $ev->{y});
828	my ($bx, $by) = ($self->{x}, $self->{y});	972	my ($bx, $by) = ($self->{x}, $self->{y});
829		973
830	$self->{motion} = sub {	974	$self->{motion} = sub {
831	my ($ev, $x, $y) = @_;	975	my ($ev, $x, $y) = @_;
…		…
854	my ($self) = @_;	998	my ($self) = @_;
855		999
856	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
857	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858		1002
859	glEnable GL_BLEND;
860	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863		1005
864	my $border = $self->border;	1006	my $border = $self->border;
865		1007
866	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
867	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
868	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871		1013
		1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872	my $bg = $tex[0];	1015	my $bg = $tex[0];
873		1016
874	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
875	my $rep_x = $cw / $bg->{w};	1018	my $rep_x = $cw / $bg->{w};
876	my $rep_y = $ch / $bg->{h};	1019	my $rep_y = $ch / $bg->{h};
877		1020
878	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
879		1022
880	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
881	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
882	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
883	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
884		1028
885	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
886	glDisable GL_BLEND;
887		1030
888	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
		1032
889	$self->child->draw;	1033	$self->child->draw;
890	}	1034	}
891		1035
892	#############################################################################	1036	#############################################################################
893		1037
…		…
915	$self->{children}[$y][$x] = $child;	1059	$self->{children}[$y][$x] = $child;
916		1060
917	$child->check_size;	1061	$child->check_size;
918	}	1062	}
919		1063
		1064	sub children {
		1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1066	}
		1067
920	# TODO: move to container class maybe? send childs a signal on removal?	1068	# TODO: move to container class maybe? send childs a signal on removal?
921	sub clear {	1069	sub clear {
922	my ($self) = @_;	1070	my ($self) = @_;
923		1071
924	my $children = delete $self->{children};	1072	my @children = $self->children;
		1073	delete $self->{children};
925		1074
926	for (grep $_, map @$_, grep $_, @$children) {	1075	for (@children) {
927	delete $_->{parent};	1076	delete $_->{parent};
928	$_->hide;	1077	$_->hide;
929	}	1078	}
930		1079
931	$self->update;	1080	$self->update;
…		…
1112	}	1261	}
1113		1262
1114	sub size_allocate {	1263	sub size_allocate {
1115	my ($self, $w, $h) = @_;	1264	my ($self, $w, $h) = @_;
1116		1265
		1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1267
1117	my $children = $self->{children};	1268	my $children = $self->{children};
1118		1269
1119	my @h = map $_->{req_h}, @$children;	1270	my @h = map $_->{req_h}, @$children;
1120		1271
1121	my $req_h = List::Util::sum @h;	1272	my $req_h = List::Util::sum @h;
…		…
1150		1301
1151	#############################################################################	1302	#############################################################################
1152		1303
1153	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1154		1305
1155	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1156		1307
1157	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1158		1309
1159	sub new {	1310	sub new {
1160	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1161		1312
1162	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1163	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1164	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1165	fontsize => 1,	1323	fontsize => 1,
1166	text => "",
1167	align => -1,	1324	align => -1,
1168	valign => -1,	1325	valign => -1,
1169	padding => 2,	1326	padding => 2,
1170	layout => new CFClient::Layout,
1171	can_events => 0,	1327	can_events => 0,
1172	%arg	1328	%arg
1173	);	1329	);
1174		1330
1175	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1176	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1177	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1178	$self->{template} = $layout;	1334	$self->{template} = $layout;
1179	}	1335	}
1180		1336
1181	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1182	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1183		1342
1184	$self	1343	$self
1185	}	1344	}
1186		1345
1187	sub escape {	1346	sub escape($) {
1188	local $_ = $_[1];	1347	local $_ = $_[0];
1189		1348
1190	s/&/&amp;/g;	1349	s/&/&amp;/g;
1191	s/>/&gt;/g;	1350	s/>/&gt;/g;
1192	s/</&lt;/g;	1351	s/</&lt;/g;
1193		1352
1194	$_[1]	1353	$_
		1354	}
		1355
		1356	sub update {
		1357	my ($self) = @_;
		1358
		1359	delete $self->{texture};
		1360	$self->SUPER::update;
1195	}	1361	}
1196		1362
1197	sub set_text {	1363	sub set_text {
1198	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1199		1365
		1366	return if $self->{text} eq "T$text";
		1367	$self->{text} = "T$text";
		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1201		1371
1202	delete $self->{texture};	1372	$self->update;
1203	$self->check_size;	1373	$self->check_size;
1204	$self->update;
1205	}	1374	}
1206		1375
1207	sub set_markup {	1376	sub set_markup {
1208	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1209		1378
		1379	return if $self->{text} eq "M$markup";
		1380	$self->{text} = "M$markup";
		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1211		1386
1212	delete $self->{texture};	1387	$self->update;
1213	$self->check_size;	1388	$self->check_size;
1214	$self->update;
1215	}	1389	}
1216		1390
1217	sub size_request {	1391	sub size_request {
1218	my ($self) = @_;	1392	my ($self) = @_;
1219		1393
1220	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1221	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1222	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223		1399
1224	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1225		1401
1226	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1248	sub set_fontsize {	1424	sub set_fontsize {
1249	my ($self, $fontsize) = @_;	1425	my ($self, $fontsize) = @_;
1250		1426
1251	$self->{fontsize} = $fontsize;	1427	$self->{fontsize} = $fontsize;
1252	delete $self->{texture};	1428	delete $self->{texture};
		1429
		1430	$self->update;
1253	$self->check_size;	1431	$self->check_size;
1254	$self->update;
1255	}	1432	}
1256		1433
1257	sub _draw {	1434	sub _draw {
1258	my ($self) = @_;	1435	my ($self) = @_;
1259		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1260	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1261	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1262	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1264	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1265	};	1458	};
1266		1459
1267	glEnable GL_BLEND;
1268	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1270	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1272	glColor @{$self->{fg}};	1464	glColor @{$self->{fg}};
1273
1274	$self->{ox} = int (
1275	$self->{align} < 0 ? $self->{padding}
1276	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277	: ($self->{w} - $tex->{w}) * 0.5
1278	);
1279
1280	$self->{oy} = int (
1281	$self->{valign} < 0 ? $self->{padding}
1282	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283	: ($self->{h} - $tex->{h}) * 0.5
1284	);
1285
1286	$tex->draw_quad ($self->{ox}, $self->{oy});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1287		1469
1288	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1289	glDisable GL_BLEND;
1290	}	1471	}
1291		1472
1292	#############################################################################	1473	#############################################################################
1293		1474
1294	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1329	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1330		1511
1331	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1332	}	1513	}
1333		1514
1334	sub get_text {
1335	$_[0]{text}
1336	}
1337
1338	sub size_request {
1339	my ($self) = @_;
1340
1341	my ($w, $h) = $self->SUPER::size_request;
1342
1343	($w + 1, $h) # add 1 for cursor
1344	}
1345
1346	sub size_allocate {
1347	my ($self, $w, $h) = @_;
1348
1349	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350	}
1351
1352	sub set_text {	1515	sub set_text {
1353	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1354		1517
1355	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1356	$self->_set_text ($text);	1519	$self->_set_text ($text);
1357	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1358	}	1540	}
1359		1541
1360	sub key_down {	1542	sub key_down {
1361	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1362		1544
…		…
1364	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1365	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1366		1548
1367	my $text = $self->get_text;	1549	my $text = $self->get_text;
1368		1550
1369	if ($sym == 8) {	1551	if ($uni == 8) {
1370	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1372	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1373	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1374	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1375	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1376	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1377	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1378	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1379	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1380	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1381	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1382	$self->emit ('escape');	1564	$self->emit ('escape');
1383	} elsif ($uni) {	1565	} elsif ($uni) {
1384	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1385	}	1567	}
1386		1568
1387	$self->_set_text ($text);	1569	$self->_set_text ($text);
1388	$self->update;	1570	$self->update;
		1571	$self->check_size;
1389	}	1572	}
1390		1573
1391	sub focus_in {	1574	sub focus_in {
1392	my ($self) = @_;	1575	my ($self) = @_;
1393		1576
…		…
1522	my $class = shift;	1705	my $class = shift;
1523		1706
1524	$class->SUPER::new (	1707	$class->SUPER::new (
1525	padding => 4,	1708	padding => 4,
1526	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1527	bg => [1, 1, 1, 0.2],
1528	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1529	can_hover => 1,	1711	can_hover => 1,
1530	align => 0,	1712	align => 0,
1531	valign => 0,	1713	valign => 0,
1532	can_events => 1,	1714	can_events => 1,
…		…
1550		1732
1551	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1552	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1553	}	1735	}
1554		1736
1555	glEnable GL_BLEND;
1556	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1560		1740
1561	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562		1742
1563	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1564	glDisable GL_BLEND;
1565		1744
1566	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1567	}	1746	}
1568		1747
1569	#############################################################################	1748	#############################################################################
…		…
1583		1762
1584	$class->SUPER::new (	1763	$class->SUPER::new (
1585	padding => 2,	1764	padding => 2,
1586	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1587	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1588	state => 0,	1769	state => 0,
1589	can_hover => 1,	1770	can_hover => 1,
1590	@_	1771	@_
1591	)	1772	)
1592	}	1773	}
…		…
1616		1797
1617	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1618		1799
1619	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620		1801
1621	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1622	glEnable GL_TEXTURE_2D;	1804	glEnable GL_TEXTURE_2D;
1623	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625	my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627	$tex->draw_quad (0, 0, $s, $s);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1630	glDisable GL_BLEND;
1631	}	1807	}
1632		1808
1633	#############################################################################	1809	#############################################################################
1634		1810
1635	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1678	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1679		1855
1680	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1681	}	1857	}
1682		1858
1683	glEnable GL_BLEND;
1684	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1686	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687		1861
1688	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1689		1863
1690	glDisable GL_BLEND;
1691	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1692	}	1865	}
1693		1866
1694	#############################################################################	1867	#############################################################################
1695		1868
…		…
1743	}	1916	}
1744		1917
1745	sub set_max {	1918	sub set_max {
1746	my ($self, $max) = @_;	1919	my ($self, $max) = @_;
1747		1920
		1921	return if $self->{max_val} == $max;
		1922
1748	$self->{max_val} = $max;	1923	$self->{max_val} = $max;
		1924	$self->update;
1749	}	1925	}
1750		1926
1751	sub set_value {	1927	sub set_value {
1752	my ($self, $val, $max) = @_;	1928	my ($self, $val, $max) = @_;
1753		1929
1754	$self->set_max ($max)	1930	$self->set_max ($max)
1755	if defined $max;	1931	if defined $max;
1756		1932
1757	$max = $self->{max_val};	1933	return if $self->{val} == $val;
		1934
1758	$self->{val} = $val;	1935	$self->{val} = $val;
1759
1760	$self->update;	1936	$self->update;
1761	}	1937	}
1762		1938
1763	sub _draw {	1939	sub _draw {
1764	my ($self) = @_;	1940	my ($self) = @_;
…		…
1827		2003
1828	sub new {	2004	sub new {
1829	my ($class, %arg) = @_;	2005	my ($class, %arg) = @_;
1830		2006
1831	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1832	tooltip => $arg{type},	2008	tooltip => $arg{type},
1833	can_hover => 1,	2009	can_hover => 1,
		2010	can_events => 1,
1834	%arg,	2011	%arg,
1835	);	2012	);
1836		2013
1837	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2014	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2015	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1846		2023
1847	$self->{value}->set_fontsize ($fsize);	2024	$self->{value}->set_fontsize ($fsize);
1848	$self->{max} ->set_fontsize ($fsize);	2025	$self->{max} ->set_fontsize ($fsize);
1849	}	2026	}
1850		2027
		2028	sub set_max {
		2029	my ($self, $max) = @_;
		2030
		2031	$self->{gauge}->set_max ($max);
		2032	$self->{max}->set_text ($max);
		2033	}
		2034
1851	sub set_value {	2035	sub set_value {
1852	my ($self, $val, $max) = @_;	2036	my ($self, $val, $max) = @_;
1853		2037
1854	$self->set_max ($max)	2038	$self->set_max ($max)
1855	if defined $max;	2039	if defined $max;
1856		2040
1857	$self->{gauge}->set_value ($val, $max);	2041	$self->{gauge}->set_value ($val, $max);
1858	$self->{value}->set_text ($val);	2042	$self->{value}->set_text ($val);
1859	}
1860
1861	sub set_max {
1862	my ($self, $max) = @_;
1863
1864	$self->{gauge}->set_max ($max);
1865	$self->{max}->set_text ($max);
1866	}	2043	}
1867		2044
1868	#############################################################################	2045	#############################################################################
1869		2046
1870	package CFClient::UI::Slider;	2047	package CFClient::UI::Slider;
…		…
1880	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
1881		2058
1882	sub new {	2059	sub new {
1883	my $class = shift;	2060	my $class = shift;
1884		2061
1885	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
1886		2063
1887	# TODO: 0-width page	2064	# TODO: 0-width page
1888	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
1889	# TODO: calculations are off	2066	# TODO: calculations are off
1890	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
1891	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
1892	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
1893	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
1894	req_w => 20,	2073	req_w => $::WIDTH / 80,
1895	req_h => 20,	2074	req_h => $::WIDTH / 80,
1896	vertical => 0,	2075	vertical => 0,
1897	can_hover => 1,	2076	can_hover => 1,
1898	inner_pad => 5,	2077	inner_pad => 0.02,
1899	@_	2078	@_
1900	);	2079	);
1901		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
1902	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
1903	}	2108	}
1904		2109
1905	sub size_request {	2110	sub size_request {
1906	my ($self) = @_;	2111	my ($self) = @_;
1907		2112
…		…
1920		2125
1921	sub mouse_motion {	2126	sub mouse_motion {
1922	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
1923		2128
1924	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
1925	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
1926		2147
1927	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
1928		2149
1929	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1930	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1931		2151
1932	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1933	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$value = $self->{scale} * ($value - $lo);
1934	$x = $lo if $x < $lo;
1935	$x = $hi - $page if $x > $hi - $page;
1936	$self->{range}[0] = $x;
1937		2154
1938	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
1939	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
1940	}	2162	});
1941	}
1942		2163
1943	# the inner_* stuff is for generating a padding for the slider handle,	2164	$self->SUPER::update;
1944	# so that the handle doesn't leave the texture. This calculation isn't 100%
1945	# correct propably, but it does the job for now
1946	sub _calc_inner_pad_px {
1947	my ($self, $w) = @_;
1948	($w / 100) * $self->{inner_pad} # % to pixels
1949	}	2165	}
1950		2166
1951	sub _draw {	2167	sub _draw {
1952	my ($self) = @_;	2168	my ($self) = @_;
1953		2169
1954	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
1955		2171
1956	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
1957		2173
1958	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
1959	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
1960		2176
		2177	glTranslate 1, 0, 0;
1961	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
1962	glTranslate 0, -$self->{w}, 0;
1963
1964	($w, $h) = ($h, $w);
1965	}	2179	}
1966		2180
1967	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1968	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1969		2183
1970	my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972	$hi = $value + 1 if $lo == $hi;
1973
1974	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977	$page = int $page * $inner_w / ($hi - $lo);
1978	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1979
1980	$w -= $page;
1981	$page &= ~1;
1982	glTranslate $page * 0.5, 0, 0;
1983	$page ||= 2;
1984
1985	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1986	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1987
1988	glEnable GL_BLEND;
1989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1990	glEnable GL_TEXTURE_2D;	2184	glEnable GL_TEXTURE_2D;
1991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1992		2186
1993	# draw background	2187	# draw background
1994	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1995		2189
1996	# draw handle	2190	# draw handle
1997	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1998		2192
1999	glDisable GL_BLEND;
2000	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
2001	}	2194	}
2002		2195
2003	#############################################################################	2196	#############################################################################
2004		2197
…		…
2015	fontsize => 1,	2208	fontsize => 1,
2016	can_events => 0,	2209	can_events => 0,
2017	#font => default_font	2210	#font => default_font
2018	@_,	2211	@_,
2019		2212
2020	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2021	par => [],	2214	par => [],
2022	height => 0,	2215	height => 0,
2023	children => [	2216	children => [
2024	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2025	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
2026	],	2219	],
2027	);	2220	);
2028		2221
2029	$self->{children}[1]->connect (changed => sub {	2222	$self->{children}[1]->connect (changed => sub { $self->update });
2030	$self->update;
2031	});
2032		2223
2033	$self	2224	$self
2034	}	2225	}
2035		2226
2036	sub set_fontsize {	2227	sub set_fontsize {
2037	my ($self, $fontsize) = @_;	2228	my ($self, $fontsize) = @_;
2038		2229
2039	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2040	$self->reflow;	2231	$self->reflow;
2041	}
2042
2043	sub text_height {
2044	my ($self, $text) = @_;
2045
2046	my $layout = $self->{layout};
2047
2048	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049	$layout->set_width ($self->{w});
2050	$layout->set_text ($text);
2051
2052	($layout->size)[1]
2053	}
2054
2055	sub reflow {
2056	my ($self) = @_;
2057
2058	$self->{need_reflow}++;
2059	$self->update;
2060	}	2232	}
2061		2233
2062	sub size_allocate {	2234	sub size_allocate {
2063	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2064		2236
…		…
2069	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2070		2242
2071	$self->reflow;	2243	$self->reflow;
2072	}	2244	}
2073		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2074	sub add_paragraph {	2265	sub add_paragraph {
2075	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2076		2267
2077	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2078		2269
		2270	for my $line (split /\n/, $text) {
2079	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2080
2081	$self->{height} += $height;	2272	$self->{height} += $height;
2082
2083	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2084		2275
2085	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2086	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2087	}	2278	}
2088		2279
…		…
2093		2284
2094	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2095		2286
2096	delete $self->{texture};	2287	delete $self->{texture};
2097		2288
2098	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2099	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2100	my $height = 0;	2291	my $height = 0;
2101		2292
2102	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2103	for @{$self->{par}};	2294	for @{$self->{par}};
2104		2295
2105	$self->{height} = $height;	2296	$self->{height} = $height;
2106		2297
2107	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2108		2300
2109	delete $self->{texture};	2301	delete $self->{texture};
2110	}	2302	}
2111		2303
2112	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2113	glClearColor 0, 0, 0, 1;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2114	glClear GL_COLOR_BUFFER_BIT;	2306	glClear GL_COLOR_BUFFER_BIT;
2115
2116	glEnable GL_BLEND;
2117	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2118	glEnable GL_TEXTURE_2D;
2119	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120		2307
2121	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2122		2309
2123	my $y0 = $top;	2310	my $y0 = $top;
2124	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2127		2314
2128	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2129		2316
2130	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2131		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2132	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2133	my $h = $par->[0];	2323	my $h = $par->[0];
2134		2324
2135	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2136	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2137		2329
2138	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2139	my ($W, $H) = $layout->size;	2331
2140	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2141	}	2334	}
2142		2335
2143	$y += $h;	2336	$y += $h;
2144	}	2337	}
2145		2338
2146	glDisable GL_TEXTURE_2D;
2147	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2148	};	2340	};
2149	});	2341	});
2150	}	2342	}
2151		2343
2152	sub _draw {	2344	sub _draw {
2153	my ($self) = @_;	2345	my ($self) = @_;
2154		2346
2155	if ($self->{texture}) {
2156	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2349	glColor 1, 1, 1, 1;
2158	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2160	}
2161		2352
2162	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2163		2354
2164	}	2355	}
2165		2356
…		…
2259	@_,	2450	@_,
2260	can_events => 0,	2451	can_events => 0,
2261	)	2452	)
2262	}	2453	}
2263		2454
2264	sub set_markup {	2455	sub set_tooltip_from {
2265	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2266		2457
2267	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2268	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2269	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2270	}	2466	}
2271		2467
2272	sub size_request {	2468	sub size_request {
2273	my ($self) = @_;	2469	my ($self) = @_;
2274
2275	$self->child->set_max_size ($::WIDTH * 0.3);
2276		2470
2277	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278		2472
2279	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2280	}	2474	}
…		…
2286	}	2480	}
2287		2481
2288	sub _draw {	2482	sub _draw {
2289	my ($self) = @_;	2483	my ($self) = @_;
2290		2484
2291	glPushMatrix;
2292	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2293		2486
2294	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2295		2488
2296	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2307	glVertex 0 , $h;	2500	glVertex 0 , $h;
2308	glVertex $w, $h;	2501	glVertex $w, $h;
2309	glVertex $w, 0;	2502	glVertex $w, 0;
2310	glEnd;	2503	glEnd;
2311		2504
2312	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2313
2314	glTranslate 2, 2;
2315	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2316	}	2507	}
2317		2508
2318	#############################################################################	2509	#############################################################################
2319		2510
…		…
2324	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2325		2516
2326	sub new {	2517	sub new {
2327	my $class = shift;	2518	my $class = shift;
2328		2519
2329	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2330	aspect => 1,	2521	aspect => 1,
2331	@_,	2522	@_,
2332	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2333	}	2540	}
2334		2541
2335	sub size_request {	2542	sub size_request {
2336	(32, 8)	2543	(32, 8)
2337	}	2544	}
2338		2545
2339	sub draw {	2546	sub _draw {
2340	my ($self) = @_;	2547	my ($self) = @_;
2341		2548
		2549	return unless $::CONN;#d# manage and cache textures differently
		2550
		2551	my $face;
		2552
		2553	if ($self->{frame}) {
		2554	my $anim = $::CONN->{anim}[$self->{anim}];
		2555
		2556	$face = $anim->[ $self->{frame} % @$anim ]
		2557	if $anim && @$anim;
		2558	}
		2559
2342	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2560	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2343		2561
2344	if ($tex) {	2562	if ($tex) {
2345	glEnable GL_BLEND;
2346	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347	glEnable GL_TEXTURE_2D;	2563	glEnable GL_TEXTURE_2D;
2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349	glColor 1, 1, 1, 1;	2565	glColor 1, 1, 1, 1;
2350	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2566	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2351	glDisable GL_TEXTURE_2D;	2567	glDisable GL_TEXTURE_2D;
2352	glDisable GL_BLEND;
2353	}	2568	}
		2569	}
		2570
		2571	sub DESTROY {
		2572	my ($self) = @_;
		2573
		2574	$self->{timer}->cancel
		2575	if $self->{timer};
		2576
		2577	$self->SUPER::DESTROY;
2354	}	2578	}
2355		2579
2356	#############################################################################	2580	#############################################################################
2357		2581
		2582	package CFClient::UI::InventoryItem;
		2583
		2584	our @ISA = CFClient::UI::HBox::;
		2585
		2586	sub _item_to_desc {
		2587	my ($item) = @_;
		2588
		2589	my $desc =
		2590	$item->{nrof} < 2
		2591	? $item->{name}
		2592	: "$item->{nrof} × $item->{name_pl}";
		2593
		2594	$item->{flags} & Crossfire::Protocol::F_OPEN
		2595	and $desc .= " (open)";
		2596	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2597	and $desc .= " (applied)";
		2598	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2599	and $desc .= " (unpaid)";
		2600	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2601	and $desc .= " (magic)";
		2602	$item->{flags} & Crossfire::Protocol::F_CURSED
		2603	and $desc .= " (cursed)";
		2604	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2605	and $desc .= " (damned)";
		2606	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2607	and $desc .= " *";
		2608
		2609	$desc
		2610	}
		2611
		2612	sub new {
		2613	my $class = shift;
		2614
		2615	my %args = @_;
		2616
		2617	my $item = delete $args{item};
		2618
		2619	my $desc = _item_to_desc ($item);
		2620
		2621	my $self = $class->SUPER::new (
		2622	can_hover => 1,
		2623	can_events => 1,
		2624	tooltip => ((CFClient::UI::Label::escape $desc)
		2625	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2626	connect_button_down => sub {
		2627	my ($self, $ev, $x, $y) = @_;
		2628
		2629	# todo: maybe put examine on 1? but should just be a tooltip :(
		2630	if ($ev->{button} == 1) {
		2631	my $targ = $::CONN->{player}{tag};
		2632
		2633	if ($item->{container} == $::CONN->{player}{tag}) {
		2634	$targ = $main::OPENCONT;
		2635	}
		2636
		2637	$::CONN->send ("move $targ $item->{tag} 0");
		2638	} elsif ($ev->{button} == 2) {
		2639	$::CONN->send ("apply $item->{tag}");
		2640	} elsif ($ev->{button} == 3) {
		2641	my @menu_items = (
		2642	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2643	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2644	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2645	(
		2646	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2647	? (
		2648	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2649	)
		2650	: (
		2651	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2652	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2653	)
		2654	),
		2655	);
		2656
		2657	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2658	}
		2659
		2660	1
		2661	},
		2662	%args
		2663	);
		2664
		2665
		2666	$self->add (new CFClient::UI::Face
		2667	can_events => 0,
		2668	face => $item->{face},
		2669	anim => $item->{anim},
		2670	animspeed => $item->{animspeed},
		2671	);
		2672
		2673	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2674
		2675	$self->{item} = $item;
		2676
		2677	$self->update_item;
		2678
		2679	$self
		2680	}
		2681
		2682	sub update_item {
		2683	my ($self) = @_;
		2684
		2685	my $desc = _item_to_desc ($self->{item});
		2686
		2687	$self->{name_lbl}->set_text ($desc);
		2688	}
		2689
		2690	#############################################################################
		2691
		2692	package CFClient::UI::Inventory;
		2693
		2694	our @ISA = CFClient::UI::ScrolledWindow::;
		2695
		2696	sub new {
		2697	my $class = shift;
		2698
		2699	my $self = $class->SUPER::new (
		2700	scrolled => (new CFClient::UI::VBox),
		2701	@_,
		2702	);
		2703
		2704	$self
		2705	}
		2706
		2707	sub set_items {
		2708	my ($self, $items) = @_;
		2709
		2710	$self->{scrolled}->clear;
		2711	return unless $items;
		2712
		2713	my @items = sort {
		2714	($a->{type} <=> $b->{type})
		2715	or ($a->{name} cmp $b->{name})
		2716	} @$items;
		2717
		2718	$self->{real_items} = \@items;
		2719
		2720	for my $item (@items) {
		2721	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2722	$item->update_item ();
		2723	}
		2724
		2725	$self->{scrolled}->add (@items);
		2726
		2727	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2728	}
		2729
		2730	sub size_request {
		2731	my ($self) = @_;
		2732	($self->{req_w}, $self->{req_h});
		2733	}
		2734
		2735	#############################################################################
		2736
		2737	package CFClient::UI::Menu;
		2738
		2739	our @ISA = CFClient::UI::FancyFrame::;
		2740
		2741	use CFClient::OpenGL;
		2742
		2743	sub new {
		2744	my $class = shift;
		2745
		2746	my $self = $class->SUPER::new (
		2747	items => [],
		2748	z => 100,
		2749	@_,
		2750	);
		2751
		2752	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2753
		2754	for my $item (@{ $self->{items} }) {
		2755	my ($widget, $cb) = @$item;
		2756
		2757	# handle various types of items, only text for now
		2758	if (!ref $widget) {
		2759	$widget = new CFClient::UI::Label
		2760	can_hover => 1,
		2761	can_events => 1,
		2762	text => $widget;
		2763	}
		2764
		2765	$self->{item}{$widget} = $item;
		2766
		2767	$self->{vbox}->add ($widget);
		2768	}
		2769
		2770	$self
		2771	}
		2772
		2773	# popup given the event (must be a mouse button down event currently)
		2774	sub popup {
		2775	my ($self, $ev) = @_;
		2776
		2777	$self->emit ("popdown");
		2778
		2779	# maybe save $GRAB? must be careful about events...
		2780	$GRAB = $self;
		2781	$self->{button} = $ev->{button};
		2782
		2783	$self->show;
		2784	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2785	}
		2786
		2787	sub mouse_motion {
		2788	my ($self, $ev, $x, $y) = @_;
		2789
		2790	# TODO: should use vbox->find_widget or so
		2791	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2792	$self->{hover} = $self->{item}{$HOVER};
		2793	}
		2794
		2795	sub button_up {
		2796	my ($self, $ev, $x, $y) = @_;
		2797
		2798	if ($ev->{button} == $self->{button}) {
		2799	undef $GRAB;
		2800	$self->hide;
		2801
		2802	$self->emit ("popdown");
		2803	$self->{hover}[1]->() if $self->{hover};
		2804	}
		2805	}
		2806
		2807	#############################################################################
		2808
		2809	package CFClient::UI::Statusbox;
		2810
		2811	our @ISA = CFClient::UI::VBox::;
		2812
		2813	sub new {
		2814	my $class = shift;
		2815
		2816	$class->SUPER::new (
		2817	fontsize => 0.8,
		2818	@_,
		2819	)
		2820	}
		2821
		2822	sub reorder {
		2823	my ($self) = @_;
		2824	my $NOW = time;
		2825
		2826	while (my ($k, $v) = each %{ $self->{item} }) {
		2827	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2828	}
		2829
		2830	my @widgets;
		2831
		2832	my @items = sort {
		2833	$a->{pri} <=> $b->{pri}
		2834	or $b->{id} <=> $a->{id}
		2835	} values %{ $self->{item} };
		2836
		2837	my $count = 10 + 1;
		2838	for my $item (@items) {
		2839	last unless --$count;
		2840
		2841	push @widgets, $item->{label} ||= do {
		2842	# TODO: doesn't handle markup well (read as: at all)
		2843	my $short = $item->{count} > 1
		2844	? "<b>$item->{count} ×</b> $item->{text}"
		2845	: $item->{text};
		2846
		2847	for ($short) {
		2848	s/^\s+//;
		2849	s/\s+/ /g;
		2850	}
		2851
		2852	new CFClient::UI::Label
		2853	markup => $short,
		2854	tooltip => $item->{tooltip},
		2855	tooltip_font => $::FONT_PROP,
		2856	tooltip_width => 0.67,
		2857	fontsize => $item->{fontsize} || $self->{fontsize},
		2858	max_w => $::WIDTH * 0.44,
		2859	fg => $item->{fg},
		2860	can_events => 1,
		2861	can_hover => 1
		2862	};
		2863	}
		2864
		2865	$self->clear;
		2866	$self->SUPER::add (reverse @widgets);
		2867	}
		2868
		2869	sub add {
		2870	my ($self, $text, %arg) = @_;
		2871
		2872	$text =~ s/^\s+//;
		2873	$text =~ s/\s+$//;
		2874
		2875	my $timeout = time + ((delete $arg{timeout}) || 60);
		2876
		2877	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2878
		2879	if (my $item = $self->{item}{$group}) {
		2880	if ($item->{text} eq $text) {
		2881	$item->{count}++;
		2882	} else {
		2883	$item->{count} = 1;
		2884	$item->{text} = $item->{tooltip} = $text;
		2885	}
		2886	$item->{id} = ++$self->{id};
		2887	$item->{timeout} = $timeout;
		2888	delete $item->{label};
		2889	} else {
		2890	$self->{item}{$group} = {
		2891	id => ++$self->{id},
		2892	text => $text,
		2893	timeout => $timeout,
		2894	tooltip => $text,
		2895	fg => [0.8, 0.8, 0.8, 0.8],
		2896	pri => 0,
		2897	count => 1,
		2898	%arg,
		2899	};
		2900	}
		2901
		2902	$self->reorder;
		2903	}
		2904
		2905	sub reconfigure {
		2906	my ($self) = @_;
		2907
		2908	delete $_->{label}
		2909	for values %{ $self->{item} || {} };
		2910
		2911	$self->reorder;
		2912	$self->SUPER::reconfigure;
		2913	}
		2914
		2915	#############################################################################
		2916
2358	package CFClient::UI::Root;	2917	package CFClient::UI::Root;
2359		2918
2360	our @ISA = CFClient::UI::Container::;	2919	our @ISA = CFClient::UI::Container::;
2361		2920
2362	use CFClient::OpenGL;	2921	use CFClient::OpenGL;
2363		2922
2364	sub check_size {	2923	sub new {
2365	my ($self) = @_;	2924	my $class = shift;
2366		2925
2367	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2926	$class->SUPER::new (
2368	}	2927	@_,
2369		2928	)
2370	sub size_request {
2371	($::WIDTH, $::HEIGHT)
2372	}	2929	}
2373		2930
2374	sub configure {	2931	sub configure {
2375	my ($self, $x, $y, $w, $h) = @_;	2932	my ($self, $x, $y, $w, $h) = @_;
2376		2933
2377	$self->SUPER::configure ($x, $y, $w, $h);	2934	$self->{w} = $w;
		2935	$self->{h} = $h;
		2936	}
2378		2937
		2938	sub check_size {
		2939	my ($self) = @_;
		2940
		2941	$self->size_allocate ($self->{w}, $self->{h})
		2942	if $self->{w};
		2943	}
		2944
		2945	sub size_request {
		2946	my ($self) = @_;
		2947
		2948	($self->{w}, $self->{h})
		2949	}
		2950
		2951	sub size_allocate {
		2952	my ($self, $w, $h) = @_;
		2953
		2954	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2955	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2956
		2957	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2958	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2959
2379	for my $child (@{$self->{children}}) {	2960	for my $child ($self->children) {
2380	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2961	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2381		2962
		2963	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2964	if exists $child->{req_x};
		2965
		2966	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2967	if exists $child->{req_y};
		2968
2382	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2969	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2383	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2970	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2971
2384	$child->configure ($X, $Y, $W,$H);	2972	$child->configure ($X, $Y, $W, $H);
2385	}	2973	}
2386	}	2974	}
2387		2975
2388	sub _topleft {	2976	sub coord2local {
2389	my ($self, $x, $y) = @_;	2977	my ($self, $x, $y) = @_;
2390		2978
2391	($x, $y)	2979	($x, $y)
2392	}	2980	}
2393		2981
		2982	sub coord2global {
		2983	my ($self, $x, $y) = @_;
		2984
		2985	($x, $y)
		2986	}
		2987
2394	sub update {	2988	sub update {
2395	my ($self) = @_;	2989	my ($self) = @_;
2396		2990
2397	$self->check_size;	2991	$self->check_size;
2398	::refresh ();	2992	$::WANT_REFRESH++;
2399	}	2993	}
2400		2994
2401	sub add {	2995	sub add {
2402	my ($self, $child) = @_;	2996	my ($self, @children) = @_;
2403		2997
		2998	for my $child (@children) {
		2999	$child->{toplevel} = 1;
		3000
2404	# integerize window positions	3001	# integerise window positions
2405	$child->{x} = int $child->{x};	3002	$child->{x} = int $child->{x};
2406	$child->{y} = int $child->{y};	3003	$child->{y} = int $child->{y};
		3004	}
2407		3005
2408	$self->SUPER::add ($child);	3006	$self->SUPER::add (@children);
2409	}	3007	}
2410		3008
2411	sub on_refresh {	3009	sub on_refresh {
2412	my ($self, $id, $cb) = @_;	3010	my ($self, $id, $cb) = @_;
2413		3011
2414	$self->{refresh_hook}{$id} = $cb;	3012	$self->{refresh_hook}{$id} = $cb;
2415	}	3013	}
2416		3014
		3015	sub on_post_alloc {
		3016	my ($self, $id, $cb) = @_;
		3017
		3018	$self->{post_alloc_hook}{$id} = $cb;
		3019	}
		3020
2417	sub draw {	3021	sub draw {
2418	my ($self) = @_;	3022	my ($self) = @_;
2419		3023
2420	while (my $rcb = delete $self->{refresh_hook}) {	3024	while ($self->{refresh_hook}) {
2421	$_->() for values %$rcb;	3025	$_->()
		3026	for values %{delete $self->{refresh_hook}};
		3027	}
		3028
		3029	if ($self->{check_size}) {
		3030	my @queue = ([], []);
		3031
		3032	for (;;) {
		3033	if ($self->{check_size}) {
		3034	# heuristic: check containers last
		3035	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3036	for values %{delete $self->{check_size}}
		3037	}
		3038
		3039	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3040
		3041	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3042	? @$widget{qw(user_w user_h)}
		3043	: $widget->size_request;
		3044
		3045	if (delete $widget->{force_alloc}
		3046	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3047	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3048
		3049	$widget->{req_w} = $w;
		3050	$widget->{req_h} = $h;
		3051
		3052	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3053
		3054	$widget->{parent}->check_size
		3055	if $widget->{parent};
		3056	}
		3057	}
		3058	}
		3059
		3060	while ($self->{size_alloc}) {
		3061	for (values %{delete $self->{size_alloc}}) {
		3062	my ($widget, $w, $h) = @$_;
		3063
		3064	$w = 0 if $w < 0;
		3065	$h = 0 if $h < 0;
		3066
		3067	$widget->{w} = $w;
		3068	$widget->{h} = $h;
		3069	$widget->size_allocate ($w, $h);
		3070	$widget->emit (size_allocate => $w, $h);
		3071	}
		3072	}
		3073
		3074	while ($self->{post_alloc_hook}) {
		3075	$_->()
		3076	for values %{delete $self->{post_alloc_hook}};
2422	}	3077	}
2423		3078
2424	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3079	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2425	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3080	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2426	glClear GL_COLOR_BUFFER_BIT;	3081	glClear GL_COLOR_BUFFER_BIT;
2427		3082
2428	glMatrixMode GL_PROJECTION;	3083	glMatrixMode GL_PROJECTION;
2429	glLoadIdentity;	3084	glLoadIdentity;
2430	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3085	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2431	glMatrixMode GL_MODELVIEW;	3086	glMatrixMode GL_MODELVIEW;
2432	glLoadIdentity;	3087	glLoadIdentity;
2433		3088
2434	$self->_draw;	3089	$self->_draw;
2435	}	3090	}
…		…
2437	#############################################################################	3092	#############################################################################
2438		3093
2439	package CFClient::UI;	3094	package CFClient::UI;
2440		3095
2441	$ROOT = new CFClient::UI::Root;	3096	$ROOT = new CFClient::UI::Root;
2442	$TOOLTIP = new CFClient::UI::Tooltip;	3097	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2443		3098
2444	1	3099	1
2445		3100

Diff Legend

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