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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.210 by root, Wed May 17 10:14:52 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	for my $widget (values %WIDGET) {
		146	if ($widget->{toplevel}) {
		147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		155	}
		156
		157	$widget->reconfigure;
135	}	158	}
136	}	159	}
137		160
138	#############################################################################	161	#############################################################################
139		162
…		…
158	if (/^connect_(.*)$/) {	181	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	182	$self->connect ($1 => delete $self->{$_});
160	}	183	}
161	}	184	}
162		185
		186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		187
163	$self	188	$self
164	}	189	}
165		190
166	sub destroy {	191	sub destroy {
167	my ($self) = @_;	192	my ($self) = @_;
…		…
232	$self->{y} = $y;	257	$self->{y} = $y;
233	$self->update;	258	$self->update;
234	}	259	}
235		260
236	if ($self->{w} != $w || $self->{h} != $h) {	261	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	}	263	}
243	}	264	}
244		265
245	sub size_allocate {	266	sub size_allocate {
246	# nothing to be done	267	# nothing to be done
247	}	268	}
248		269
		270	sub reconfigure {
		271	my ($self) = @_;
		272
		273	$self->check_size (1);
		274	$self->update;
		275	}
		276
249	sub children {	277	sub children {
250	}
251
252	# call when resoltuion changes etc.
253	sub reconfigure {
254	my ($self) = @_;
255
256	$_->reconfigure
257	for $self->children;
258
259	$_->check_size;
260	}	278	}
261		279
262	sub set_max_size {	280	sub set_max_size {
263	my ($self, $w, $h) = @_;	281	my ($self, $w, $h) = @_;
264		282
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	283	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	284	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}	285	}
268		286
269	# return top left coordinates	287	sub set_tooltip {
270	sub _topleft {
271	my ($self, $x, $y) = @_;	288	my ($self, $tooltip) = @_;
272		289
273	$self->{parent}	290	$self->{tooltip} = $tooltip;
274	or Carp::confess "no parent widget in _topleft\n";#d#
275		291
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		293	delete $CFClient::UI::TOOLTIP->{owner};
		294	CFClient::UI::check_tooltip;
		295	}
277	}	296	}
278		297
279	# translate global coordinates to local coordinate system	298	# translate global coordinates to local coordinate system
280	sub coord2local {	299	sub coord2local {
281	my ($self, $x, $y) = @_;	300	my ($self, $x, $y) = @_;
282		301
283	my ($X, $Y) = $self->_topleft;	302	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	303	}
286		304
287	# translate local coordinates to global coordinate system	305	# translate local coordinates to global coordinate system
288	sub coord2global {	306	sub coord2global {
289	my ($self, $x, $y) = @_;	307	my ($self, $x, $y) = @_;
290		308
291	my ($X, $Y) = $self->_topleft;	309	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	310	}
294		311
295	sub focus_in {	312	sub focus_in {
296	my ($self) = @_;	313	my ($self) = @_;
297		314
…		…
369	glVertex $self->{w}, 0;	386	glVertex $self->{w}, 0;
370	glVertex $self->{w}, $self->{h};	387	glVertex $self->{w}, $self->{h};
371	glVertex 0 , $self->{h};	388	glVertex 0 , $self->{h};
372	glEnd;	389	glEnd;
373	glPopMatrix;	390	glPopMatrix;
374	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375	}	392	}
376	}	393	}
377		394
378	sub _draw {	395	sub _draw {
379	my ($self) = @_;	396	my ($self) = @_;
…		…
395		412
396	sub set_parent {	413	sub set_parent {
397	my ($self, $parent) = @_;	414	my ($self, $parent) = @_;
398		415
399	Scalar::Util::weaken ($self->{parent} = $parent);	416	Scalar::Util::weaken ($self->{parent} = $parent);
		417
		418	# TODO: req_w _does_change after ->reconfigure
		419	$self->check_size
		420	unless exists $self->{req_w};
400	}	421	}
401		422
402	sub check_size {	423	sub check_size {
403	my ($self) = @_;	424	my ($self, $forced) = @_;
404		425
405	$self->{parent}	426	$self->{force_alloc} = 1 if $forced;
406	or return 1;	427	$CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408	my ($w, $h) = $self->{user_w} && $self->{user_h}
409	? @$self{qw(user_w user_h)}
410	: $self->size_request;
411
412	if ($w != $self->{req_w} || $h != $self->{req_h}) {
413	$self->{req_w} = $w;
414	$self->{req_h} = $h;
415
416	$self->{parent}->check_size
417	or $self->size_allocate (
418	(List::Util::max $self->{w}, $w),
419	(List::Util::max $self->{h}, $h),
420	);
421
422	1
423	} else {
424	0
425	}
426	}	428	}
427		429
428	sub update {	430	sub update {
429	my ($self) = @_;	431	my ($self) = @_;
430		432
…		…
445	}	447	}
446		448
447	sub DESTROY {	449	sub DESTROY {
448	my ($self) = @_;	450	my ($self) = @_;
449		451
		452	delete $WIDGET{$self+0};
450	#$self->deactivate;	453	#$self->deactivate;
451	}	454	}
452		455
453	#############################################################################	456	#############################################################################
454		457
…		…
463	my $class = shift;	466	my $class = shift;
464		467
465	# range [value, low, high, page]	468	# range [value, low, high, page]
466		469
467	$class->SUPER::new (	470	$class->SUPER::new (
468	bg => [0, 0, 0, 0.2],	471	#bg => [0, 0, 0, 0.2],
469	active_bg => [1, 1, 1, 0.5],	472	#active_bg => [1, 1, 1, 0.5],
470	@_	473	@_
471	)	474	)
472	}	475	}
473		476
474	sub _draw {	477	sub _draw {
475	my ($self) = @_;	478	my ($self) = @_;
476		479
		480	my $color = $FOCUS == $self && $self->{active_bg}
		481	? $self->{active_bg}
		482	: $self->{bg};
		483
		484	if ($color && (@$color < 4 || $color->[3])) {
477	my ($w, $h) = @$self{qw(w h)};	485	my ($w, $h) = @$self{qw(w h)};
478		486
479	glEnable GL_BLEND;	487	glEnable GL_BLEND;
480	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	488	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	489	glColor @$color;
482		490
483	glBegin GL_QUADS;	491	glBegin GL_QUADS;
484	glVertex 0 , 0;	492	glVertex 0 , 0;
485	glVertex 0 , $h;	493	glVertex 0 , $h;
486	glVertex $w, $h;	494	glVertex $w, $h;
487	glVertex $w, 0;	495	glVertex $w, 0;
488	glEnd;	496	glEnd;
489		497
490	glDisable GL_BLEND;	498	glDisable GL_BLEND;
		499	}
491	}	500	}
492		501
493	#############################################################################	502	#############################################################################
494		503
495	package CFClient::UI::Empty;	504	package CFClient::UI::Empty;
…		…
527		536
528	$self	537	$self
529	}	538	}
530		539
531	sub add {	540	sub add {
532	my ($self, $child) = @_;	541	my ($self, @widgets) = @_;
533		542
534	$child->set_parent ($self);	543	$_->set_parent ($self)
		544	for @widgets;
535		545
536	use sort 'stable';	546	use sort 'stable';
537		547
538	$self->{children} = [	548	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	549	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	550	@{$self->{children}}, @widgets
541	];	551	];
542		552
543	$child->check_size;	553	$self->check_size (1);
		554	$self->update;
544	}	555	}
545		556
546	sub children {	557	sub children {
547	@{ $_[0]{children} }	558	@{ $_[0]{children} }
548	}	559	}
…		…
567		578
568	for (@$children) {	579	for (@$children) {
569	delete $_->{parent};	580	delete $_->{parent};
570	$_->hide;	581	$_->hide;
571	}	582	}
		583
		584	$self->check_size;
		585	$self->update;
572	}	586	}
573		587
574	sub find_widget {	588	sub find_widget {
575	my ($self, $x, $y) = @_;	589	my ($self, $x, $y) = @_;
576		590
…		…
651	}	665	}
652		666
653	sub update {	667	sub update {
654	my ($self) = @_;	668	my ($self) = @_;
655		669
656	$ROOT->on_refresh ($self => sub { $self->render_child });	670	$ROOT->on_post_alloc ($self => sub { $self->render_child });
657	$self->SUPER::update;	671	$self->SUPER::update;
658	}	672	}
659		673
660	sub size_allocate {	674	sub size_allocate {
661	my ($self, $w, $h) = @_;	675	my ($self, $w, $h) = @_;
662		676
663	$self->SUPER::size_allocate ($w, $h);	677	$self->SUPER::size_allocate ($w, $h);
664	$self->update;	678	$self->update;
		679	}
		680
		681	sub _render {
		682	$_[0]{children}[0]->draw;
665	}	683	}
666		684
667	sub render_child {	685	sub render_child {
668	my ($self) = @_;	686	my ($self) = @_;
669		687
670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671	glClearColor 0, 0, 0, 0;	689	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	690	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	691
		692	$self->_render;
674	# glColorMask 1, 1, 1, 0;	693	# glColorMask 1, 1, 1, 0;
675	# glEnable GL_BLEND;	694	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;	695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;	696	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};	697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
…		…
687	my ($w, $h) = ($self->w, $self->h);	706	my ($w, $h) = ($self->w, $self->h);
688		707
689	my $tex = $self->{texture}	708	my $tex = $self->{texture}
690	or return;	709	or return;
691		710
692	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glEnable GL_TEXTURE_2D;	711	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	713	glColor 0, 0, 0, 1;
697		714
698	$tex->draw_quad (0, 0, $w, $h);	715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		716
700	glDisable GL_BLEND;
701	glDisable GL_TEXTURE_2D;	717	glDisable GL_TEXTURE_2D;
702	}	718	}
703		719
704	#############################################################################	720	#############################################################################
705		721
706	package CFClient::UI::ViewPort;	722	package CFClient::UI::ViewPort;
707		723
708	our @ISA = CFClient::UI::Window::;	724	our @ISA = CFClient::UI::Window::;
709		725
710	sub new { die }
711
712	sub size_request {	726	sub size_request {
713	my ($self) = @_;	727	my ($self) = @_;
714		728
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
717		731
718	@$self{qw(child_w child_h)}	732	@$self{qw(child_w child_h)}
719	}	733	}
720		734
721	sub _draw {	735	sub size_allocate {
722	my ($self) = @_;	736	my ($self, $w, $h) = @_;
723		737
724	$self->{children}[1]->draw;	738	$self->update;
725	}	739	}
726		740
		741	sub set_offset {
		742	my ($self, $x, $y) = @_;
727		743
728	#############################################################################	744	$self->{view_x} = int $x;
		745	$self->{view_y} = int $y;
729		746
		747	$self->update;
		748	}
		749
		750	# hmm, this does not work for topleft of $self... but we should not ask for that
		751	sub coord2local {
		752	my ($self, $x, $y) = @_;
		753
		754	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		755	}
		756
		757	sub coord2global {
		758	my ($self, $x, $y) = @_;
		759
		760	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		761	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		762
		763	$self->SUPER::coord2global ($x, $y)
		764	}
		765
		766	sub find_widget {
		767	my ($self, $x, $y) = @_;
		768
		769	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		770	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		771	) {
		772	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		773	} else {
		774	$self->CFClient::UI::Base::find_widget ($x, $y)
		775	}
		776	}
		777
		778	sub _render {
		779	my ($self) = @_;
		780
		781	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		782
		783	$self->SUPER::_render;
		784	}
		785
		786	#############################################################################
		787
730	package CFClient::UI::Frame;	788	package CFClient::UI::ScrolledWindow;
731		789
732	our @ISA = CFClient::UI::Bin::;	790	our @ISA = CFClient::UI::HBox::;
733
734	use CFClient::OpenGL;
735		791
736	sub new {	792	sub new {
737	my $class = shift;	793	my $class = shift;
738		794
		795	my $self;
		796
		797	my $slider = new CFClient::UI::Slider
		798	vertical => 1,
		799	range => [0, 0, 1, 0.01], # HACK fix
		800	connect_changed => sub {
		801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		802	},
		803	;
		804
739	my $self = $class->SUPER::new (	805	$self = $class->SUPER::new (
740	bg => [1, 1, 1, 1],	806	vp => (new CFClient::UI::ViewPort),
741	border_bg => [1, 1, 1, 1],	807	slider => $slider,
742	border => 0.8,
743	@_	808	@_,
744	);	809	);
745		810
		811	$self->{vp}->add ($self->{scrolled});
		812	$self->add ($self->{vp});
		813	$self->add ($self->{slider});
		814
746	$self	815	$self
747	}	816	}
748		817
		818	#TODO# update range on size_allocate depending on child
		819	# update viewport offset on scroll
		820
		821	#############################################################################
		822
		823	package CFClient::UI::Frame;
		824
		825	our @ISA = CFClient::UI::Bin::;
		826
		827	use CFClient::OpenGL;
		828
		829	sub new {
		830	my $class = shift;
		831
		832	$class->SUPER::new (
		833	bg => undef,
		834	@_,
		835	)
		836	}
		837
749	sub _draw {	838	sub _draw {
750	my ($self) = @_;	839	my ($self) = @_;
751		840
752	my ($w, $h) = ($self->{w}, $self->{h});	841	if ($self->{bg}) {
		842	my ($w, $h) = @$self{qw(w h)};
753		843
754	glEnable GL_BLEND;	844	glEnable GL_BLEND;
755	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	845	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756	glEnable GL_TEXTURE_2D;	846	glColor @{ $self->{bg} };
757	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758		847
759	# glBegin GL_QUADS;	848	glBegin GL_QUADS;
760	# glColor 0, 0, 0, 0;
761	# glVertex 0 , 0;	849	glVertex 0 , 0;
762	# glVertex 0 , $h;	850	glVertex 0 , $h;
763	# glVertex $w, $h;	851	glVertex $w, $h;
764	# glVertex $w, 0;	852	glVertex $w, 0;
765	# glEnd;	853	glEnd;
766		854
767
768	$self->child->draw;
769	glDisable GL_BLEND;	855	glDisable GL_BLEND;
770	glDisable GL_TEXTURE_2D;	856	}
		857
		858	$self->SUPER::_draw;
771	}	859	}
772		860
773	#############################################################################	861	#############################################################################
774		862
775	package CFClient::UI::FancyFrame;	863	package CFClient::UI::FancyFrame;
…		…
789		877
790	my $self = $class->SUPER::new (	878	my $self = $class->SUPER::new (
791	bg => [1, 1, 1, 1],	879	bg => [1, 1, 1, 1],
792	border_bg => [1, 1, 1, 1],	880	border_bg => [1, 1, 1, 1],
793	border => 0.6,	881	border => 0.6,
		882	toplevel => 1,
794	can_events => 1,	883	can_events => 1,
795	@_	884	@_
796	);	885	);
797		886
798	$self->{title} &&= new CFClient::UI::Label	887	$self->{title} &&= new CFClient::UI::Label
…		…
823	my ($self, $w, $h) = @_;	912	my ($self, $w, $h) = @_;
824		913
825	$h -= List::Util::max 0, $self->border * 2;	914	$h -= List::Util::max 0, $self->border * 2;
826	$w -= List::Util::max 0, $self->border * 2;	915	$w -= List::Util::max 0, $self->border * 2;
827		916
828	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	917	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829	if $self->{title};	918	if $self->{title};
830		919
831	$self->child->configure ($self->border, $self->border, $w, $h);	920	$self->child->configure ($self->border, $self->border, $w, $h);
832	}	921	}
833		922
…		…
891	my ($self) = @_;	980	my ($self) = @_;
892		981
893	my ($w, $h ) = ($self->{w}, $self->{h});	982	my ($w, $h ) = ($self->{w}, $self->{h});
894	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	983	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895		984
896	glEnable GL_BLEND;
897	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898	glEnable GL_TEXTURE_2D;	985	glEnable GL_TEXTURE_2D;
899	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900		987
901	my $border = $self->border;	988	my $border = $self->border;
902		989
903	glColor @{ $self->{border_bg} };	990	glColor @{ $self->{border_bg} };
904	$tex[1]->draw_quad (0, 0, $w, $border);	991	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
905	$tex[3]->draw_quad (0, $border, $border, $ch);	992	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	993	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907	$tex[4]->draw_quad (0, $h - $border, $w, $border);	994	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908		995
909	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	996	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910	my $bg = $tex[0];	997	my $bg = $tex[0];
911		998
912	# TODO: repeat texture not scale	999	# TODO: repeat texture not scale
…		…
916	glColor @{ $self->{bg} };	1003	glColor @{ $self->{bg} };
917		1004
918	$bg->{s} = $rep_x;	1005	$bg->{s} = $rep_x;
919	$bg->{t} = $rep_y;	1006	$bg->{t} = $rep_y;
920	$bg->{wrap_mode} = 1;	1007	$bg->{wrap_mode} = 1;
921	$bg->draw_quad ($border, $border, $cw, $ch);	1008	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1009	}
922		1010
923	glDisable GL_TEXTURE_2D;	1011	glDisable GL_TEXTURE_2D;
924	glDisable GL_BLEND;
925	}
926		1012
927	$self->{title}->draw if $self->{title};	1013	$self->{title}->draw if $self->{title};
928		1014
929	$self->child->draw;	1015	$self->child->draw;
930	}	1016	}
…		…
1157	}	1243	}
1158		1244
1159	sub size_allocate {	1245	sub size_allocate {
1160	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h) = @_;
1161		1247
		1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1249
1162	my $children = $self->{children};	1250	my $children = $self->{children};
1163		1251
1164	my @h = map $_->{req_h}, @$children;	1252	my @h = map $_->{req_h}, @$children;
1165		1253
1166	my $req_h = List::Util::sum @h;	1254	my $req_h = List::Util::sum @h;
…		…
1195		1283
1196	#############################################################################	1284	#############################################################################
1197		1285
1198	package CFClient::UI::Label;	1286	package CFClient::UI::Label;
1199		1287
1200	our @ISA = CFClient::UI::Base::;	1288	our @ISA = CFClient::UI::DrawBG::;
1201		1289
1202	use CFClient::OpenGL;	1290	use CFClient::OpenGL;
1203		1291
1204	sub new {	1292	sub new {
1205	my ($class, %arg) = @_;	1293	my ($class, %arg) = @_;
1206		1294
1207	my $self = $class->SUPER::new (	1295	my $self = $class->SUPER::new (
1208	fg => [1, 1, 1],	1296	fg => [1, 1, 1],
		1297	#bg => none
		1298	#active_bg => none
1209	#font => default_font	1299	#font => default_font
		1300	#text => initial text
		1301	#markup => initial narkup
		1302	layout => (new CFClient::Layout),
1210	fontsize => 1,	1303	fontsize => 1,
1211	text => "",
1212	align => -1,	1304	align => -1,
1213	valign => -1,	1305	valign => -1,
1214	padding => 2,	1306	padding => 2,
1215	layout => new CFClient::Layout,
1216	can_events => 0,	1307	can_events => 0,
1217	%arg	1308	%arg
1218	);	1309	);
1219		1310
1220	if (exists $self->{template}) {	1311	if (exists $self->{template}) {
1221	my $layout = new CFClient::Layout;	1312	my $layout = new CFClient::Layout;
1222	$layout->set_text (delete $self->{template});	1313	$layout->set_text (delete $self->{template});
1223	$self->{template} = $layout;	1314	$self->{template} = $layout;
1224	}	1315	}
1225		1316
1226	$self->set_text (delete $self->{text}) if exists $self->{text};	1317	if (exists $self->{markup}) {
1227	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1318	$self->set_markup (delete $self->{markup});
		1319	} else {
		1320	$self->set_text (delete $self->{text});
		1321	}
1228		1322
1229	$self	1323	$self
1230	}	1324	}
1231		1325
1232	sub escape {	1326	sub escape($) {
1233	local $_ = $_[1];	1327	local $_ = $_[0];
1234		1328
1235	s/&/&amp;/g;	1329	s/&/&amp;/g;
1236	s/>/&gt;/g;	1330	s/>/&gt;/g;
1237	s/</&lt;/g;	1331	s/</&lt;/g;
1238		1332
1239	$_[1]	1333	$_
1240	}	1334	}
1241		1335
1242	sub update {	1336	sub update {
1243	my ($self) = @_;	1337	my ($self) = @_;
1244		1338
1245	delete $self->{texture};	1339	delete $self->{texture};
1246	$self->SUPER::update;	1340	$self->SUPER::update;
1247	}	1341	}
1248		1342
1249	sub reconfigure {
1250	my ($self) = @_;
1251
1252	delete $self->{texture};
1253	}
1254
1255	sub set_text {	1343	sub set_text {
1256	my ($self, $text) = @_;	1344	my ($self, $text) = @_;
1257		1345
1258	return if $self->{text} eq "T$text";	1346	return if $self->{text} eq "T$text";
1259	$self->{text} = "T$text";	1347	$self->{text} = "T$text";
1260		1348
		1349	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261	$self->{layout}->set_text ($text);	1350	$self->{layout}->set_text ($text);
1262		1351
1263	delete $self->{texture};
1264	$self->update;	1352	$self->update;
1265	$self->check_size;	1353	$self->check_size;
1266	}	1354	}
1267		1355
1268	sub set_markup {	1356	sub set_markup {
1269	my ($self, $markup) = @_;	1357	my ($self, $markup) = @_;
1270		1358
1271	return if $self->{text} eq "M$markup";	1359	return if $self->{text} eq "M$markup";
1272	$self->{text} = "M$markup";	1360	$self->{text} = "M$markup";
1273		1361
		1362	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1363
		1364	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274	$self->{layout}->set_markup ($markup);	1365	$self->{layout}->set_markup ($markup);
1275		1366
1276	delete $self->{texture};
1277	$self->update;	1367	$self->update;
1278	$self->check_size;	1368	$self->check_size;
1279	}	1369	}
1280		1370
1281	sub size_request {	1371	sub size_request {
…		…
1312	sub set_fontsize {	1402	sub set_fontsize {
1313	my ($self, $fontsize) = @_;	1403	my ($self, $fontsize) = @_;
1314		1404
1315	$self->{fontsize} = $fontsize;	1405	$self->{fontsize} = $fontsize;
1316	delete $self->{texture};	1406	delete $self->{texture};
		1407
		1408	$self->update;
1317	$self->check_size;	1409	$self->check_size;
1318	$self->update;
1319	}	1410	}
1320		1411
1321	sub _draw {	1412	sub _draw {
1322	my ($self) = @_;	1413	my ($self) = @_;
1323		1414
		1415	$self->SUPER::_draw; # draw background, if applicable
		1416
1324	my $tex = $self->{texture} ||= do {	1417	my $tex = $self->{texture} ||= do {
		1418	$self->{layout}->set_foreground (@{$self->{fg}});
1325	$self->{layout}->set_font ($self->{font}) if $self->{font};	1419	$self->{layout}->set_font ($self->{font}) if $self->{font};
1326	$self->{layout}->set_width ($self->{w});	1420	$self->{layout}->set_width ($self->{w});
1327	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1422
1328	new_from_layout CFClient::Texture $self->{layout}	1423	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1424
		1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1427	: ($self->{w} - $tex->{w}) * 0.5);
		1428
		1429	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1430	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1431	: ($self->{h} - $tex->{h}) * 0.5);
		1432
		1433	$tex
1329	};	1434	};
1330		1435
1331	glEnable GL_BLEND;
1332	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333	glEnable GL_TEXTURE_2D;	1436	glEnable GL_TEXTURE_2D;
1334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335		1438
		1439	if ($tex->{format} == GL_ALPHA) {
1336	glColor @{$self->{fg}};	1440	glColor @{$self->{fg}};
1337
1338	$self->{ox} = int (
1339	$self->{align} < 0 ? $self->{padding}
1340	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341	: ($self->{w} - $tex->{w}) * 0.5
1342	);
1343
1344	$self->{oy} = int (
1345	$self->{valign} < 0 ? $self->{padding}
1346	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347	: ($self->{h} - $tex->{h}) * 0.5
1348	);
1349
1350	$tex->draw_quad ($self->{ox}, $self->{oy});	1441	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1442	} else {
		1443	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1444	}
1351		1445
1352	glDisable GL_TEXTURE_2D;	1446	glDisable GL_TEXTURE_2D;
1353	glDisable GL_BLEND;
1354	}	1447	}
1355		1448
1356	#############################################################################	1449	#############################################################################
1357		1450
1358	package CFClient::UI::EntryBase;	1451	package CFClient::UI::EntryBase;
…		…
1393	$self->{layout}->set_text ("$text ");	1486	$self->{layout}->set_text ("$text ");
1394		1487
1395	$self->emit (changed => $self->{text});	1488	$self->emit (changed => $self->{text});
1396	}	1489	}
1397		1490
1398	sub get_text {
1399	$_[0]{text}
1400	}
1401
1402	sub size_request {
1403	my ($self) = @_;
1404
1405	my ($w, $h) = $self->SUPER::size_request;
1406
1407	($w + 1, $h) # add 1 for cursor
1408	}
1409
1410	sub size_allocate {
1411	my ($self, $w, $h) = @_;
1412
1413	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414	}
1415
1416	sub set_text {	1491	sub set_text {
1417	my ($self, $text) = @_;	1492	my ($self, $text) = @_;
1418		1493
1419	$self->{cursor} = length $text;	1494	$self->{cursor} = length $text;
1420	$self->_set_text ($text);	1495	$self->_set_text ($text);
1421	$self->update;	1496	$self->update;
		1497	$self->check_size;
		1498	}
		1499
		1500	sub get_text {
		1501	$_[0]{text}
		1502	}
		1503
		1504	sub size_request {
		1505	my ($self) = @_;
		1506
		1507	my ($w, $h) = $self->SUPER::size_request;
		1508
		1509	($w + 1, $h) # add 1 for cursor
		1510	}
		1511
		1512	sub size_allocate {
		1513	my ($self, $w, $h) = @_;
		1514
		1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1422	}	1516	}
1423		1517
1424	sub key_down {	1518	sub key_down {
1425	my ($self, $ev) = @_;	1519	my ($self, $ev) = @_;
1426		1520
…		…
1428	my $sym = $ev->{sym};	1522	my $sym = $ev->{sym};
1429	my $uni = $ev->{unicode};	1523	my $uni = $ev->{unicode};
1430		1524
1431	my $text = $self->get_text;	1525	my $text = $self->get_text;
1432		1526
1433	if ($sym == 8) {	1527	if ($uni == 8) {
1434	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1528	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435	} elsif ($sym == 127) {	1529	} elsif ($uni == 127) {
1436	substr $text, $self->{cursor}, 1, "";	1530	substr $text, $self->{cursor}, 1, "";
1437	} elsif ($sym == CFClient::SDLK_LEFT) {	1531	} elsif ($sym == CFClient::SDLK_LEFT) {
1438	--$self->{cursor} if $self->{cursor};	1532	--$self->{cursor} if $self->{cursor};
1439	} elsif ($sym == CFClient::SDLK_RIGHT) {	1533	} elsif ($sym == CFClient::SDLK_RIGHT) {
1440	++$self->{cursor} if $self->{cursor} < length $self->{text};	1534	++$self->{cursor} if $self->{cursor} < length $self->{text};
1441	} elsif ($sym == CFClient::SDLK_HOME) {	1535	} elsif ($sym == CFClient::SDLK_HOME) {
1442	$self->{cursor} = 0;	1536	$self->{cursor} = 0;
1443	} elsif ($sym == CFClient::SDLK_END) {	1537	} elsif ($sym == CFClient::SDLK_END) {
1444	$self->{cursor} = length $text;	1538	$self->{cursor} = length $text;
1445	} elsif ($sym == 27) {	1539	} elsif ($uni == 27) {
1446	$self->emit ('escape');	1540	$self->emit ('escape');
1447	} elsif ($uni) {	1541	} elsif ($uni) {
1448	substr $text, $self->{cursor}++, 0, chr $uni;	1542	substr $text, $self->{cursor}++, 0, chr $uni;
1449	}	1543	}
1450		1544
1451	$self->_set_text ($text);	1545	$self->_set_text ($text);
1452	$self->update;	1546	$self->update;
		1547	$self->check_size;
1453	}	1548	}
1454		1549
1455	sub focus_in {	1550	sub focus_in {
1456	my ($self) = @_;	1551	my ($self) = @_;
1457		1552
…		…
1586	my $class = shift;	1681	my $class = shift;
1587		1682
1588	$class->SUPER::new (	1683	$class->SUPER::new (
1589	padding => 4,	1684	padding => 4,
1590	fg => [1, 1, 1],	1685	fg => [1, 1, 1],
1591	bg => [1, 1, 1, 0.2],
1592	active_fg => [0, 0, 1],	1686	active_fg => [0, 0, 1],
1593	can_hover => 1,	1687	can_hover => 1,
1594	align => 0,	1688	align => 0,
1595	valign => 0,	1689	valign => 0,
1596	can_events => 1,	1690	can_events => 1,
…		…
1614		1708
1615	if ($GRAB == $self) {	1709	if ($GRAB == $self) {
1616	$self->{fg} = $self->{active_fg};	1710	$self->{fg} = $self->{active_fg};
1617	}	1711	}
1618		1712
1619	glEnable GL_BLEND;
1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621	glEnable GL_TEXTURE_2D;	1713	glEnable GL_TEXTURE_2D;
1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623	glColor 0, 0, 0, 1;	1715	glColor 0, 0, 0, 1;
1624		1716
1625	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1717	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626		1718
1627	glDisable GL_TEXTURE_2D;	1719	glDisable GL_TEXTURE_2D;
1628	glDisable GL_BLEND;
1629		1720
1630	$self->SUPER::_draw;	1721	$self->SUPER::_draw;
1631	}	1722	}
1632		1723
1633	#############################################################################	1724	#############################################################################
…		…
1647		1738
1648	$class->SUPER::new (	1739	$class->SUPER::new (
1649	padding => 2,	1740	padding => 2,
1650	fg => [1, 1, 1],	1741	fg => [1, 1, 1],
1651	active_fg => [1, 1, 0],	1742	active_fg => [1, 1, 0],
		1743	bg => [0, 0, 0, 0.2],
		1744	active_bg => [1, 1, 1, 0.5],
1652	state => 0,	1745	state => 0,
1653	can_hover => 1,	1746	can_hover => 1,
1654	@_	1747	@_
1655	)	1748	)
1656	}	1749	}
…		…
1680		1773
1681	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1774	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682		1775
1683	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1776	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684		1777
1685	glEnable GL_BLEND;	1778	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1779
1686	glEnable GL_TEXTURE_2D;	1780	glEnable GL_TEXTURE_2D;
1687	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689	my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691	$tex->draw_quad (0, 0, $s, $s);	1781	$tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693	glDisable GL_TEXTURE_2D;	1782	glDisable GL_TEXTURE_2D;
1694	glDisable GL_BLEND;
1695	}	1783	}
1696		1784
1697	#############################################################################	1785	#############################################################################
1698		1786
1699	package CFClient::UI::Image;	1787	package CFClient::UI::Image;
…		…
1742	glTranslate 0, -$self->{w}, 0;	1830	glTranslate 0, -$self->{w}, 0;
1743		1831
1744	($w, $h) = ($h, $w);	1832	($w, $h) = ($h, $w);
1745	}	1833	}
1746		1834
1747	glEnable GL_BLEND;
1748	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749	glEnable GL_TEXTURE_2D;	1835	glEnable GL_TEXTURE_2D;
1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1836	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751		1837
1752	$tex->draw_quad (0, 0, $w, $h);	1838	$tex->draw_quad_alpha (0, 0, $w, $h);
1753		1839
1754	glDisable GL_BLEND;
1755	glDisable GL_TEXTURE_2D;	1840	glDisable GL_TEXTURE_2D;
1756	}	1841	}
1757		1842
1758	#############################################################################	1843	#############################################################################
1759		1844
…		…
1948	qw(s1_slider.png s1_slider_bg.png);	2033	qw(s1_slider.png s1_slider_bg.png);
1949		2034
1950	sub new {	2035	sub new {
1951	my $class = shift;	2036	my $class = shift;
1952		2037
1953	# range [value, low, high, page]	2038	# range [value, low, high, page, unit]
1954		2039
1955	# TODO: 0-width page	2040	# TODO: 0-width page
1956	# TODO: req_w/h are wrong with vertical	2041	# TODO: req_w/h are wrong with vertical
1957	# TODO: calculations are off	2042	# TODO: calculations are off
1958	my $self = $class->SUPER::new (	2043	my $self = $class->SUPER::new (
1959	fg => [1, 1, 1],	2044	fg => [1, 1, 1],
1960	active_fg => [0, 0, 0],	2045	active_fg => [0, 0, 0],
		2046	bg => [0, 0, 0, 0.2],
		2047	active_bg => [1, 1, 1, 0.5],
1961	range => [0, 0, 100, 10],	2048	range => [0, 0, 100, 10],
1962	req_w => 20,	2049	req_w => $::WIDTH / 80,
1963	req_h => 20,	2050	req_h => $::WIDTH / 80,
1964	vertical => 0,	2051	vertical => 0,
1965	can_hover => 1,	2052	can_hover => 1,
1966	inner_pad => 5,	2053	inner_pad => .05,
1967	@_	2054	@_
1968	);	2055	);
1969		2056
		2057	$self->set_value ($self->{range}[0]);
		2058	$self->update;
		2059
1970	$self	2060	$self
		2061	}
		2062
		2063	sub set_value {
		2064	my ($self, $value) = @_;
		2065
		2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2067
		2068	$hi = $lo + 1 if $hi <= $lo;
		2069
		2070	$value = $lo if $value < $lo;
		2071	$value = $hi if $value > $hi;
		2072
		2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2074	if $unit;
		2075
		2076	$page = $hi - $lo if $page > $hi - $lo;
		2077
		2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2079
		2080	if ($value != $old_value) {
		2081	$self->emit (changed => $value);
		2082	$self->update;
		2083	}
1971	}	2084	}
1972		2085
1973	sub size_request {	2086	sub size_request {
1974	my ($self) = @_;	2087	my ($self) = @_;
1975		2088
…		…
1988		2101
1989	sub mouse_motion {	2102	sub mouse_motion {
1990	my ($self, $ev, $x, $y) = @_;	2103	my ($self, $ev, $x, $y) = @_;
1991		2104
1992	if ($GRAB == $self) {	2105	if ($GRAB == $self) {
		2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2107
		2108	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2109
		2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2111
		2112	$self->set_value ($x * ($hi - $lo) + $lo);
		2113	}
		2114	}
		2115
		2116	sub update {
		2117	my ($self) = @_;
		2118
		2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2120	$self->set_value ($self->{range}[0]);
		2121
1993	my ($value, $lo, $hi, $page) = @{$self->{range}};	2122	my ($value, $lo, $hi, $page) = @{$self->{range}};
1994		2123
1995	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2124	my $inner_w = 1 - 2 * $self->{inner_pad};
1996		2125
1997	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1998	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1999		2127
2000	$x -= $inner_pad_px; # substract the padding	2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2001	$x = $x * ($hi - $lo) / $inner_w + $lo;	2129	$value = $self->{scale} * ($value - $lo);
2002	$x = $lo if $x < $lo;
2003	$x = $hi - $page if $x > $hi - $page;
2004	$self->{range}[0] = $x;
2005		2130
2006	$self->emit (changed => $x);	2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2007	$self->update;	2132
		2133	$value = 0 if $value < 0;
		2134	$page = 1 - $value if $value + $page > 1;
		2135
		2136	$self->{knob_x} = $value;
		2137	$self->{knob_w} = $page;
2008	}	2138	});
2009	}
2010		2139
2011	# the inner_* stuff is for generating a padding for the slider handle,	2140	$self->SUPER::update;
2012	# so that the handle doesn't leave the texture. This calculation isn't 100%
2013	# correct propably, but it does the job for now
2014	sub _calc_inner_pad_px {
2015	my ($self, $w) = @_;
2016	($w / 100) * $self->{inner_pad} # % to pixels
2017	}	2141	}
2018		2142
2019	sub _draw {	2143	sub _draw {
2020	my ($self) = @_;	2144	my ($self) = @_;
2021		2145
2022	$self->SUPER::_draw ();	2146	$self->SUPER::_draw ();
2023		2147
2024	my ($w, $h) = @$self{qw(w h)};	2148	glScale $self->{w}, $self->{h};
2025		2149
2026	if ($self->{vertical}) {	2150	if ($self->{vertical}) {
2027	# draw a vertical slider like a rotated horizontal slider	2151	# draw a vertical slider like a rotated horizontal slider
2028		2152
2029	glRotate 90, 0, 0, 1;	2153	glRotate 90, 0, 0, 1;
2030	glTranslate 0, -$self->{w}, 0;	2154	glTranslate 0, 1, 0;
2031
2032	($w, $h) = ($h, $w);
2033	}	2155	}
2034		2156
2035	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037		2159
2038	my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040	$hi = $value + 1 if $lo == $hi;
2041
2042	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045	$page = int $page * $inner_w / ($hi - $lo);
2046	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048	$w -= $page;
2049	$page &= ~1;
2050	glTranslate $page * 0.5, 0, 0;
2051	$page ||= 2;
2052
2053	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056	glEnable GL_BLEND;
2057	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058	glEnable GL_TEXTURE_2D;	2160	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2161	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2162
2061	# draw background	2163	# draw background
2062	$tex[1]->draw_quad (0, 0, $w, $h);	2164	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063		2165
2064	# draw handle	2166	# draw handle
2065	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066		2168
2067	glDisable GL_BLEND;
2068	glDisable GL_TEXTURE_2D;	2169	glDisable GL_TEXTURE_2D;
2069	}	2170	}
2070		2171
2071	#############################################################################	2172	#############################################################################
2072		2173
…		…
2083	fontsize => 1,	2184	fontsize => 1,
2084	can_events => 0,	2185	can_events => 0,
2085	#font => default_font	2186	#font => default_font
2086	@_,	2187	@_,
2087		2188
2088	layout => (new CFClient::Layout),	2189	layout => (new CFClient::Layout 1),
2089	par => [],	2190	par => [],
2090	height => 0,	2191	height => 0,
2091	children => [	2192	children => [
2092	(new CFClient::UI::Empty expand => 1),	2193	(new CFClient::UI::Empty expand => 1),
2093	(new CFClient::UI::Slider vertical => 1),	2194	(new CFClient::UI::Slider vertical => 1),
…		…
2111		2212
2112	my $layout = $self->{layout};	2213	my $layout = $self->{layout};
2113		2214
2114	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115	$layout->set_width ($self->{children}[0]{w});	2216	$layout->set_width ($self->{children}[0]{w});
2116	$layout->set_text ($text);	2217	$layout->set_markup ($text);
2117		2218
2118	($layout->size)[1]	2219	($layout->size)[1]
2119	}	2220	}
2120		2221
2121	sub reflow {	2222	sub reflow {
…		…
2159		2260
2160	return unless $self->{h} > 0;	2261	return unless $self->{h} > 0;
2161		2262
2162	delete $self->{texture};	2263	delete $self->{texture};
2163		2264
2164	$ROOT->on_refresh ($self, sub {	2265	$ROOT->on_post_alloc ($self, sub {
2165	if (delete $self->{need_reflow}) {	2266	if (delete $self->{need_reflow}) {
2166	my $height = 0;	2267	my $height = 0;
2167		2268
2168	$height += $_->[0] = $self->text_height ($_->[2])	2269	$height += $_->[0] = $self->text_height ($_->[2])
2169	for @{$self->{par}};	2270	for @{$self->{par}};
…		…
2177		2278
2178	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2179	glClearColor 0, 0, 0, 0;	2280	glClearColor 0, 0, 0, 0;
2180	glClear GL_COLOR_BUFFER_BIT;	2281	glClear GL_COLOR_BUFFER_BIT;
2181		2282
2182	glEnable GL_BLEND;
2183	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184	glEnable GL_TEXTURE_2D;	2283	glEnable GL_TEXTURE_2D;
2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186		2285
2187	my $top = int $self->{children}[1]{range}[0];	2286	my $top = int $self->{children}[1]{range}[0];
2188		2287
…		…
2197		2296
2198	for my $par (@{$self->{par}}) {	2297	for my $par (@{$self->{par}}) {
2199	my $h = $par->[0];	2298	my $h = $par->[0];
2200		2299
2201	if ($y0 < $y + $h && $y < $y1) {	2300	if ($y0 < $y + $h && $y < $y1) {
		2301	$layout->set_foreground (@{ $par->[1] });
2202	$layout->set_text ($par->[2]);	2302	$layout->set_markup ($par->[2]);
2203		2303
2204	glColor @{ $par->[1] };
2205	my ($W, $H) = $layout->size;	2304	my ($W, $H) = $layout->size;
2206	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2207	}	2306	}
2208		2307
2209	$y += $h;	2308	$y += $h;
2210	}	2309	}
2211		2310
2212	glDisable GL_TEXTURE_2D;	2311	glDisable GL_TEXTURE_2D;
2213	glDisable GL_BLEND;
2214	};	2312	};
2215	});	2313	});
2216	}	2314	}
2217		2315
2218	sub _draw {	2316	sub _draw {
2219	my ($self) = @_;	2317	my ($self) = @_;
2220		2318
2221	glEnable GL_BLEND;
2222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223	glEnable GL_TEXTURE_2D;	2319	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 1, 1, 1, 1;	2321	glColor 1, 1, 1, 1;
2226	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227	glDisable GL_TEXTURE_2D;	2323	glDisable GL_TEXTURE_2D;
2228	glDisable GL_BLEND;
2229		2324
2230	$self->{children}[1]->draw;	2325	$self->{children}[1]->draw;
2231		2326
2232	}	2327	}
2233		2328
…		…
2327	@_,	2422	@_,
2328	can_events => 0,	2423	can_events => 0,
2329	)	2424	)
2330	}	2425	}
2331		2426
2332	sub set_markup {	2427	sub set_tooltip_from {
2333	my ($self, $text) = @_;	2428	my ($self, $widget) = @_;
2334		2429
2335	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2430	$self->add (new CFClient::UI::Label
2336	$self->{label}->set_markup ($text);	2431	markup => $widget->{tooltip},
2337	$self->add ($self->{label});	2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2433	fontsize => 0.8,
		2434	fg => [0, 0, 0, 1],
		2435	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2436	);
2338	}	2437	}
2339		2438
2340	sub size_request {	2439	sub size_request {
2341	my ($self) = @_;	2440	my ($self) = @_;
2342
2343	$self->child->set_max_size ($::WIDTH * 0.3);
2344		2441
2345	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2442	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346		2443
2347	($w + 4, $h + 4)	2444	($w + 4, $h + 4)
2348	}	2445	}
…		…
2354	}	2451	}
2355		2452
2356	sub _draw {	2453	sub _draw {
2357	my ($self) = @_;	2454	my ($self) = @_;
2358		2455
2359	glPushMatrix;
2360	glTranslate 0.375, 0.375;	2456	glTranslate 0.375, 0.375;
2361		2457
2362	my ($w, $h) = @$self{qw(w h)};	2458	my ($w, $h) = @$self{qw(w h)};
2363		2459
2364	glColor 1, 0.8, 0.4;	2460	glColor 1, 0.8, 0.4;
…		…
2375	glVertex 0 , $h;	2471	glVertex 0 , $h;
2376	glVertex $w, $h;	2472	glVertex $w, $h;
2377	glVertex $w, 0;	2473	glVertex $w, 0;
2378	glEnd;	2474	glEnd;
2379		2475
2380	glPopMatrix;	2476	glTranslate 2 - 0.375, 2 - 0.375;
2381
2382	glTranslate 2, 2;
2383	$self->SUPER::_draw;	2477	$self->SUPER::_draw;
2384	}	2478	}
2385		2479
2386	#############################################################################	2480	#############################################################################
2387		2481
…		…
2405	}	2499	}
2406		2500
2407	sub _draw {	2501	sub _draw {
2408	my ($self) = @_;	2502	my ($self) = @_;
2409		2503
		2504	return unless $::CONN;#d# manage and cache textures differently
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411		2506
2412	# TODO animation	2507	# TODO animation
2413	if ($tex) {	2508	if ($tex) {
2414	glEnable GL_BLEND;
2415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416	glEnable GL_TEXTURE_2D;	2509	glEnable GL_TEXTURE_2D;
2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418	glColor 1, 1, 1, 1;	2511	glColor 1, 1, 1, 1;
2419	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420	glDisable GL_TEXTURE_2D;	2513	glDisable GL_TEXTURE_2D;
2421	glDisable GL_BLEND;
2422	}	2514	}
		2515	}
		2516
		2517	#############################################################################
		2518
		2519	package CFClient::UI::InventoryItem;
		2520
		2521	our @ISA = CFClient::UI::HBox::;
		2522
		2523	sub new {
		2524	my $class = shift;
		2525
		2526	my %args = @_;
		2527
		2528	my $item = delete $args{item};
		2529
		2530	my $desc = $item->{nrof} < 2
		2531	? $item->{name}
		2532	: "$item->{nrof} $item->{name_pl}";
		2533
		2534	$item->{flags} & Crossfire::Protocol::F_OPEN
		2535	and $desc .= " (open)";
		2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2537	and $desc .= " (applied)";
		2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2539	and $desc .= " (unpaid)";
		2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2541	and $desc .= " (magic)";
		2542	$item->{flags} & Crossfire::Protocol::F_CURSED
		2543	and $desc .= " (cursed)";
		2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2545	and $desc .= " (damned)";
		2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2547	and $desc .= " *";
		2548
		2549	my $self = $class->SUPER::new (
		2550	can_hover => 1,
		2551	can_events => 1,
		2552	tooltip => ((CFClient::UI::Label::escape $desc)
		2553	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2554	connect_button_down => sub {
		2555	my ($self, $ev, $x, $y) = @_;
		2556
		2557	# todo: maybe put examine on 1? but should just be a tooltip :(
		2558	if ($ev->{button} == 1) {
		2559	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2560	} elsif ($ev->{button} == 2) {
		2561	$::CONN->send ("apply $item->{tag}");
		2562	} elsif ($ev->{button} == 3) {
		2563	my @menu_items = (
		2564	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2565	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2566	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2567	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2568	[
		2569	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2570	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
		2571	],
		2572	);
		2573
		2574	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2575	}
		2576
		2577	1
		2578	},
		2579	%args
		2580	);
		2581
		2582	$self->add (new CFClient::UI::Face
		2583	can_events => 0,
		2584	face => $item->{face},
		2585	anim => $item->{anim},
		2586	animspeed => $item->{animspeed},
		2587	);
		2588
		2589	$self->add (new CFClient::UI::Label
		2590	can_events => 0,
		2591	text => $desc,
		2592	);
		2593
		2594	$self
		2595	}
		2596
		2597	#############################################################################
		2598
		2599	package CFClient::UI::Inventory;
		2600
		2601	our @ISA = CFClient::UI::ScrolledWindow::;
		2602
		2603	sub new {
		2604	my $class = shift;
		2605
		2606	my $self = $class->SUPER::new (
		2607	scrolled => (new CFClient::UI::VBox),
		2608	@_,
		2609	);
		2610
		2611	$self
		2612	}
		2613
		2614	sub set_items {
		2615	my ($self, $items) = @_;
		2616
		2617	$self->{scrolled}->clear;
		2618	return unless $items;
		2619
		2620	my @items = sort {
		2621	($a->{type} <=> $b->{type})
		2622	or ($a->{name} cmp $b->{name})
		2623	} @$items;
		2624
		2625	$self->{real_items} = \@items;
		2626
		2627	for my $item (@items) {
		2628	my $desc = $item->{nrof} < 2
		2629	? $item->{name}
		2630	: "$item->{nrof} $item->{name_pl}";
		2631
		2632	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2633	}
		2634
		2635	$self->{scrolled}->add (@items);
		2636
		2637	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2638	}
		2639
		2640	sub size_request {
		2641	my ($self) = @_;
		2642	($self->{req_w}, $self->{req_h});
2423	}	2643	}
2424		2644
2425	#############################################################################	2645	#############################################################################
2426		2646
2427	package CFClient::UI::Menu;	2647	package CFClient::UI::Menu;
…		…
2475	}	2695	}
2476		2696
2477	sub mouse_motion {	2697	sub mouse_motion {
2478	my ($self, $ev, $x, $y) = @_;	2698	my ($self, $ev, $x, $y) = @_;
2479		2699
2480	# TODO: should use vbox->fdind_widget or so	2700	# TODO: should use vbox->find_widget or so
2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2701	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482	$self->{hover} = $self->{item}{$HOVER};	2702	$self->{hover} = $self->{item}{$HOVER};
2483	}	2703	}
2484		2704
2485	sub button_up {	2705	sub button_up {
…		…
2494	}	2714	}
2495	}	2715	}
2496		2716
2497	#############################################################################	2717	#############################################################################
2498		2718
		2719	package CFClient::UI::Statusbox;
		2720
		2721	our @ISA = CFClient::UI::VBox::;
		2722
		2723	sub new {
		2724	my $class = shift;
		2725
		2726	$class->SUPER::new (
		2727	fontsize => 0.8,
		2728	@_,
		2729	)
		2730	}
		2731
		2732	sub reorder {
		2733	my ($self) = @_;
		2734	my $NOW = time;
		2735
		2736	while (my ($k, $v) = each %{ $self->{item} }) {
		2737	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2738	}
		2739
		2740	my @widgets;
		2741
		2742	my @items = sort {
		2743	$a->{pri} <=> $b->{pri}
		2744	or $b->{id} <=> $a->{id}
		2745	} values %{ $self->{item} };
		2746
		2747	my $count = 10 + 1;
		2748	for my $item (@items) {
		2749	last unless --$count;
		2750
		2751	push @widgets, $item->{label} ||= do {
		2752	# TODO: doesn't handle markup well (read as: at all)
		2753	my $short = $item->{count} > 1
		2754	? "<b>$item->{count} ×</b> $item->{text}"
		2755	: $item->{text};
		2756
		2757	my $fontsize = $item->{fontsize} || $self->{fontsize};
		2758
		2759	for ($short) {
		2760	s/^\s+//;
		2761	s/\s+/ /g;
		2762	my $len = int 40 / $fontsize;
		2763	substr $_, $len, length, "…" if $len < length;
		2764	}
		2765
		2766	new CFClient::UI::Label
		2767	markup => $short,
		2768	tooltip => $item->{tooltip},
		2769	tooltip_font => $::FONT_PROP,
		2770	tooltip_width => 0.67,
		2771	fontsize => $fontsize,
		2772	fg => $item->{fg},
		2773	can_events => 1,
		2774	can_hover => 1
		2775	};
		2776	}
		2777
		2778	$self->clear;
		2779	$self->SUPER::add (reverse @widgets);
		2780	}
		2781
		2782	sub add {
		2783	my ($self, $text, %arg) = @_;
		2784
		2785	$text =~ s/^\s+//;
		2786	$text =~ s/\s+$//;
		2787
		2788	my $timeout = time + ((delete $arg{timeout}) || 60);
		2789
		2790	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2791
		2792	if (my $item = $self->{item}{$group}) {
		2793	if ($item->{text} eq $text) {
		2794	$item->{count}++;
		2795	} else {
		2796	$item->{count} = 1;
		2797	$item->{text} = $item->{tooltip} = $text;
		2798	}
		2799	$item->{id} = ++$self->{id};
		2800	$item->{timeout} = $timeout;
		2801	delete $item->{label};
		2802	} else {
		2803	$self->{item}{$group} = {
		2804	id => ++$self->{id},
		2805	text => $text,
		2806	timeout => $timeout,
		2807	tooltip => $text,
		2808	fg => [0.8, 0.8, 0.8, 0.8],
		2809	pri => 0,
		2810	count => 1,
		2811	%arg,
		2812	};
		2813	}
		2814
		2815	$self->reorder;
		2816	}
		2817
		2818	#############################################################################
		2819
2499	package CFClient::UI::Root;	2820	package CFClient::UI::Root;
2500		2821
2501	our @ISA = CFClient::UI::Container::;	2822	our @ISA = CFClient::UI::Container::;
2502		2823
2503	use CFClient::OpenGL;	2824	use CFClient::OpenGL;
2504		2825
2505	sub check_size {	2826	sub new {
2506	my ($self) = @_;	2827	my $class = shift;
2507		2828
2508	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2829	$class->SUPER::new (
2509	}	2830	@_,
2510		2831	)
2511	sub size_request {
2512	($::WIDTH, $::HEIGHT)
2513	}	2832	}
2514		2833
2515	sub configure {	2834	sub configure {
2516	my ($self, $x, $y, $w, $h) = @_;	2835	my ($self, $x, $y, $w, $h) = @_;
2517		2836
2518	$self->SUPER::configure ($x, $y, $w, $h);	2837	$self->{w} = $w;
		2838	$self->{h} = $h;
		2839	}
2519		2840
		2841	sub check_size {
		2842	my ($self) = @_;
		2843
		2844	$self->size_allocate ($self->{w}, $self->{h})
		2845	if $self->{w};
		2846	}
		2847
		2848	sub size_request {
		2849	my ($self) = @_;
		2850
		2851	($self->{w}, $self->{h})
		2852	}
		2853
		2854	sub size_allocate {
		2855	my ($self, $w, $h) = @_;
		2856
		2857	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2858	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2859
		2860	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2861	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2862
2520	for my $child (@{$self->{children}}) {	2863	for my $child ($self->children) {
2521	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2864	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522		2865
		2866	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2867	if exists $child->{req_x};
		2868
		2869	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2870	if exists $child->{req_y};
		2871
2523	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2872	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2873	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2874
2525	$child->configure ($X, $Y, $W,$H);	2875	$child->configure ($X, $Y, $W, $H);
2526	}	2876	}
2527	}	2877	}
2528		2878
2529	sub _topleft {	2879	sub coord2local {
2530	my ($self, $x, $y) = @_;	2880	my ($self, $x, $y) = @_;
2531		2881
2532	($x, $y)	2882	($x, $y)
2533	}	2883	}
2534		2884
		2885	sub coord2global {
		2886	my ($self, $x, $y) = @_;
		2887
		2888	($x, $y)
		2889	}
		2890
2535	sub update {	2891	sub update {
2536	my ($self) = @_;	2892	my ($self) = @_;
2537		2893
2538	$self->check_size;	2894	$self->check_size;
2539	::refresh ();	2895	$::WANT_REFRESH++;
2540	}	2896	}
2541		2897
2542	sub add {	2898	sub add {
2543	my ($self, $child) = @_;	2899	my ($self, @children) = @_;
2544		2900
		2901	for my $child (@children) {
		2902	$child->{toplevel} = 1;
		2903
2545	# integerize window positions	2904	# integerise window positions
2546	$child->{x} = int $child->{x};	2905	$child->{x} = int $child->{x};
2547	$child->{y} = int $child->{y};	2906	$child->{y} = int $child->{y};
		2907	}
2548		2908
2549	$self->SUPER::add ($child);	2909	$self->SUPER::add (@children);
2550	}	2910	}
2551		2911
2552	sub on_refresh {	2912	sub on_refresh {
2553	my ($self, $id, $cb) = @_;	2913	my ($self, $id, $cb) = @_;
2554		2914
2555	$self->{refresh_hook}{$id} = $cb;	2915	$self->{refresh_hook}{$id} = $cb;
2556	}	2916	}
2557		2917
		2918	sub on_post_alloc {
		2919	my ($self, $id, $cb) = @_;
		2920
		2921	$self->{post_alloc_hook}{$id} = $cb;
		2922	}
		2923
2558	sub draw {	2924	sub draw {
2559	my ($self) = @_;	2925	my ($self) = @_;
2560		2926
2561	while (my $rcb = delete $self->{refresh_hook}) {	2927	while ($self->{refresh_hook}) {
2562	$_->() for values %$rcb;	2928	$_->()
		2929	for values %{delete $self->{refresh_hook}};
		2930	}
		2931
		2932	if ($self->{check_size}) {
		2933	my @queue = ([], []);
		2934
		2935	for (;;) {
		2936	if ($self->{check_size}) {
		2937	# heuristic: check containers last
		2938	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2939	for values %{delete $self->{check_size}}
		2940	}
		2941
		2942	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2943
		2944	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2945	? @$widget{qw(user_w user_h)}
		2946	: $widget->size_request;
		2947
		2948	if (delete $widget->{force_alloc}
		2949	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2950	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2951
		2952	$widget->{req_w} = $w;
		2953	$widget->{req_h} = $h;
		2954
		2955	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2956
		2957	$widget->{parent}->check_size
		2958	if $widget->{parent};
		2959	}
		2960	}
		2961	}
		2962
		2963	while ($self->{size_alloc}) {
		2964	for (values %{delete $self->{size_alloc}}) {
		2965	my ($widget, $w, $h) = @$_;
		2966
		2967	$w = 0 if $w < 0;
		2968	$h = 0 if $h < 0;
		2969
		2970	$widget->{w} = $w;
		2971	$widget->{h} = $h;
		2972	$widget->size_allocate ($w, $h);
		2973	$widget->emit (size_allocate => $w, $h);
		2974	}
		2975	}
		2976
		2977	while ($self->{post_alloc_hook}) {
		2978	$_->()
		2979	for values %{delete $self->{post_alloc_hook}};
2563	}	2980	}
2564		2981
2565	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2982	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2983	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567	glClear GL_COLOR_BUFFER_BIT;	2984	glClear GL_COLOR_BUFFER_BIT;
…		…
2575	$self->_draw;	2992	$self->_draw;
2576	}	2993	}
2577		2994
2578	#############################################################################	2995	#############################################################################
2579		2996
2580	package CFClient::UI::Inventory;
2581
2582	our @ISA = CFClient::UI::Container::;
2583
2584	use CFClient::OpenGL;
2585
2586	sub new {
2587	my $class = shift;
2588
2589	my $self = $class->SUPER::new (@_);
2590
2591	$self
2592	}
2593
2594	sub size_allocate {
2595	my ($self, $w, $h) = @_;
2596
2597	$self->{w} = $w;
2598	$self->{h} = $h;
2599
2600	$self->check_size;
2601	}
2602
2603	sub set_items {
2604	my ($self, $items) = @_;
2605	my @items = values %{$items};
2606	@items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608	$self->{real_items} = \@items;
2609
2610	for my $item (@items) {
2611	my $desc = $item->{nrof} < 2
2612	? $item->{name}
2613	: "$item->{nrof} $item->{name_pl}";
2614
2615	$self->add (my $hb = new CFClient::UI::HBox);
2616
2617	$hb->add (my $f = new CFClient::UI::Face
2618	can_events => 0,
2619	face => $item->{face},
2620	anim => $item->{anim},
2621	animspeed => $item->{animspeed},
2622	expand => 1
2623	);
2624	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625	}
2626
2627	$self->{max_pos} = (scalar @items) - 1;
2628
2629	my $range = $self->{range};
2630	my $page = $self->{h} / 32; # waht information souce to use for face size?
2631	# it should be configurable i guess...
2632	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	$range->update;
2634	}
2635
2636	sub size_request {
2637	my ($self) = @_;
2638	(100, 200)
2639	}
2640
2641	sub set_range {
2642	my ($self, $range) = @_;
2643
2644	$self->{range} = $range;
2645	$range->connect (changed => sub { $self->update });
2646
2647	my $page = $self->{h} / 32; # waht information souce to use for face size?
2648	# it should be configurable i guess...
2649
2650	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651	$range->update;
2652
2653	$self->update;
2654	}
2655
2656	sub _draw {
2657	my ($self) = @_;
2658
2659	my ($w, $h) = ($self->{w}, $self->{h});
2660
2661	$self->{pos} = int $self->{range}{range}[0];
2662
2663	my $y = 0;
2664	my $cnt = 0;
2665	my $hrem = $self->{h}; # horiz. remaining space
2666
2667	for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668	my $chld = $self->{children}->[$i];
2669
2670	if ($hrem >= $chld->{h}) {
2671	$chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673	$chld->show;
2674	$chld->draw;
2675
2676	$hrem -= $chld->{h};
2677	$y += $chld->{h};
2678	} else {
2679	last
2680	}
2681	}
2682	}
2683
2684
2685	#############################################################################
2686
2687	package CFClient::UI;	2997	package CFClient::UI;
2688		2998
2689	$ROOT = new CFClient::UI::Root;	2999	$ROOT = new CFClient::UI::Root;
2690	$TOOLTIP = new CFClient::UI::Tooltip;	3000	$TOOLTIP = new CFClient::UI::Tooltip;
2691		3001

Diff Legend

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