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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
232	$self->{y} = $y;	268	$self->{y} = $y;
233	$self->update;	269	$self->update;
234	}	270	}
235		271
236	if ($self->{w} != $w || $self->{h} != $h) {	272	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	}	274	}
243	}	275	}
244		276
245	sub size_allocate {	277	sub size_allocate {
246	# nothing to be done	278	# nothing to be done
247	}	279	}
248		280
		281	sub reconfigure {
		282	my ($self) = @_;
		283
		284	$self->check_size (1);
		285	$self->update;
		286	}
		287
249	sub children {	288	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	}	289	}
261		290
262	sub set_max_size {	291	sub set_max_size {
263	my ($self, $w, $h) = @_;	292	my ($self, $w, $h) = @_;
264		293
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	294	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	295	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}	296	}
268		297
269	# return top left coordinates	298	sub set_tooltip {
270	sub _topleft {
271	my ($self, $x, $y) = @_;	299	my ($self, $tooltip) = @_;
272		300
273	$self->{parent}	301	$self->{tooltip} = $tooltip;
274	or Carp::confess "no parent widget in _topleft\n";#d#
275		302
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		304	delete $CFClient::UI::TOOLTIP->{owner};
		305	CFClient::UI::check_tooltip;
		306	}
277	}	307	}
278		308
279	# translate global coordinates to local coordinate system	309	# translate global coordinates to local coordinate system
280	sub coord2local {	310	sub coord2local {
281	my ($self, $x, $y) = @_;	311	my ($self, $x, $y) = @_;
282		312
283	my ($X, $Y) = $self->_topleft;	313	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	314	}
286		315
287	# translate local coordinates to global coordinate system	316	# translate local coordinates to global coordinate system
288	sub coord2global {	317	sub coord2global {
289	my ($self, $x, $y) = @_;	318	my ($self, $x, $y) = @_;
290		319
291	my ($X, $Y) = $self->_topleft;	320	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	321	}
294		322
295	sub focus_in {	323	sub focus_in {
296	my ($self) = @_;	324	my ($self) = @_;
297		325
…		…
369	glVertex $self->{w}, 0;	397	glVertex $self->{w}, 0;
370	glVertex $self->{w}, $self->{h};	398	glVertex $self->{w}, $self->{h};
371	glVertex 0 , $self->{h};	399	glVertex 0 , $self->{h};
372	glEnd;	400	glEnd;
373	glPopMatrix;	401	glPopMatrix;
374	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	402	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375	}	403	}
376	}	404	}
377		405
378	sub _draw {	406	sub _draw {
379	my ($self) = @_;	407	my ($self) = @_;
…		…
395		423
396	sub set_parent {	424	sub set_parent {
397	my ($self, $parent) = @_;	425	my ($self, $parent) = @_;
398		426
399	Scalar::Util::weaken ($self->{parent} = $parent);	427	Scalar::Util::weaken ($self->{parent} = $parent);
		428
		429	# TODO: req_w _does_change after ->reconfigure
		430	$self->check_size
		431	unless exists $self->{req_w};
400	}	432	}
401		433
402	sub check_size {	434	sub check_size {
403	my ($self) = @_;	435	my ($self, $forced) = @_;
404		436
405	$self->{parent}	437	$self->{force_alloc} = 1 if $forced;
406	or return 1;	438	$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	}	439	}
427		440
428	sub update {	441	sub update {
429	my ($self) = @_;	442	my ($self) = @_;
430		443
…		…
445	}	458	}
446		459
447	sub DESTROY {	460	sub DESTROY {
448	my ($self) = @_;	461	my ($self) = @_;
449		462
		463	delete $WIDGET{$self+0};
450	#$self->deactivate;	464	#$self->deactivate;
451	}	465	}
452		466
453	#############################################################################	467	#############################################################################
454		468
…		…
463	my $class = shift;	477	my $class = shift;
464		478
465	# range [value, low, high, page]	479	# range [value, low, high, page]
466		480
467	$class->SUPER::new (	481	$class->SUPER::new (
468	bg => [0, 0, 0, 0.2],	482	#bg => [0, 0, 0, 0.2],
469	active_bg => [1, 1, 1, 0.5],	483	#active_bg => [1, 1, 1, 0.5],
470	@_	484	@_
471	)	485	)
472	}	486	}
473		487
474	sub _draw {	488	sub _draw {
475	my ($self) = @_;	489	my ($self) = @_;
476		490
		491	my $color = $FOCUS == $self && $self->{active_bg}
		492	? $self->{active_bg}
		493	: $self->{bg};
		494
		495	if ($color && (@$color < 4 || $color->[3])) {
477	my ($w, $h) = @$self{qw(w h)};	496	my ($w, $h) = @$self{qw(w h)};
478		497
479	glEnable GL_BLEND;	498	glEnable GL_BLEND;
480	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	499	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	500	glColor @$color;
482		501
483	glBegin GL_QUADS;	502	glBegin GL_QUADS;
484	glVertex 0 , 0;	503	glVertex 0 , 0;
485	glVertex 0 , $h;	504	glVertex 0 , $h;
486	glVertex $w, $h;	505	glVertex $w, $h;
487	glVertex $w, 0;	506	glVertex $w, 0;
488	glEnd;	507	glEnd;
489		508
490	glDisable GL_BLEND;	509	glDisable GL_BLEND;
		510	}
491	}	511	}
492		512
493	#############################################################################	513	#############################################################################
494		514
495	package CFClient::UI::Empty;	515	package CFClient::UI::Empty;
…		…
527		547
528	$self	548	$self
529	}	549	}
530		550
531	sub add {	551	sub add {
532	my ($self, $child) = @_;	552	my ($self, @widgets) = @_;
533		553
534	$child->set_parent ($self);	554	$_->set_parent ($self)
		555	for @widgets;
535		556
536	use sort 'stable';	557	use sort 'stable';
537		558
538	$self->{children} = [	559	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	560	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	561	@{$self->{children}}, @widgets
541	];	562	];
542		563
543	$child->check_size;	564	$self->check_size (1);
		565	$self->update;
544	}	566	}
545		567
546	sub children {	568	sub children {
547	@{ $_[0]{children} }	569	@{ $_[0]{children} }
548	}	570	}
…		…
567		589
568	for (@$children) {	590	for (@$children) {
569	delete $_->{parent};	591	delete $_->{parent};
570	$_->hide;	592	$_->hide;
571	}	593	}
		594
		595	$self->check_size;
		596	$self->update;
572	}	597	}
573		598
574	sub find_widget {	599	sub find_widget {
575	my ($self, $x, $y) = @_;	600	my ($self, $x, $y) = @_;
576		601
…		…
651	}	676	}
652		677
653	sub update {	678	sub update {
654	my ($self) = @_;	679	my ($self) = @_;
655		680
656	$ROOT->on_refresh ($self => sub { $self->render_child });	681	$ROOT->on_post_alloc ($self => sub { $self->render_child });
657	$self->SUPER::update;	682	$self->SUPER::update;
658	}	683	}
659		684
660	sub size_allocate {	685	sub size_allocate {
661	my ($self, $w, $h) = @_;	686	my ($self, $w, $h) = @_;
662		687
663	$self->SUPER::size_allocate ($w, $h);	688	$self->SUPER::size_allocate ($w, $h);
664	$self->update;	689	$self->update;
		690	}
		691
		692	sub _render {
		693	$_[0]{children}[0]->draw;
665	}	694	}
666		695
667	sub render_child {	696	sub render_child {
668	my ($self) = @_;	697	my ($self) = @_;
669		698
670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	699	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671	glClearColor 0, 0, 0, 0;	700	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	701	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	702
674	# glColorMask 1, 1, 1, 0;	703	$self->_render;
675	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};
679	# glDisable GL_BLEND;
680	# glColorMask 1, 1, 1, 1;
681	};	704	};
682	}	705	}
683		706
684	sub _draw {	707	sub _draw {
685	my ($self) = @_;	708	my ($self) = @_;
…		…
687	my ($w, $h) = ($self->w, $self->h);	710	my ($w, $h) = ($self->w, $self->h);
688		711
689	my $tex = $self->{texture}	712	my $tex = $self->{texture}
690	or return;	713	or return;
691		714
692	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	717	glColor 1, 1, 1, 1;
697		718
698	$tex->draw_quad (0, 0, $w, $h);	719	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		720
700	glDisable GL_BLEND;
701	glDisable GL_TEXTURE_2D;	721	glDisable GL_TEXTURE_2D;
702	}	722	}
703		723
704	#############################################################################	724	#############################################################################
705		725
706	package CFClient::UI::ViewPort;	726	package CFClient::UI::ViewPort;
707		727
708	our @ISA = CFClient::UI::Window::;	728	our @ISA = CFClient::UI::Window::;
709		729
710	sub new { die }
711
712	sub size_request {	730	sub size_request {
713	my ($self) = @_;	731	my ($self) = @_;
714		732
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	733	@$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)});	734	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
717		735
718	@$self{qw(child_w child_h)}	736	@$self{qw(child_w child_h)}
719	}	737	}
720		738
721	sub _draw {	739	sub size_allocate {
722	my ($self) = @_;	740	my ($self, $w, $h) = @_;
723		741
724	$self->{children}[1]->draw;	742	$self->update;
725	}	743	}
726		744
		745	sub set_offset {
		746	my ($self, $x, $y) = @_;
727		747
728	#############################################################################	748	$self->{view_x} = int $x;
		749	$self->{view_y} = int $y;
729		750
		751	$self->update;
		752	}
		753
		754	# hmm, this does not work for topleft of $self... but we should not ask for that
		755	sub coord2local {
		756	my ($self, $x, $y) = @_;
		757
		758	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		759	}
		760
		761	sub coord2global {
		762	my ($self, $x, $y) = @_;
		763
		764	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		765	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		766
		767	$self->SUPER::coord2global ($x, $y)
		768	}
		769
		770	sub find_widget {
		771	my ($self, $x, $y) = @_;
		772
		773	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		774	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		775	) {
		776	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		777	} else {
		778	$self->CFClient::UI::Base::find_widget ($x, $y)
		779	}
		780	}
		781
		782	sub _render {
		783	my ($self) = @_;
		784
		785	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		786
		787	$self->SUPER::_render;
		788	}
		789
		790	#############################################################################
		791
730	package CFClient::UI::Frame;	792	package CFClient::UI::ScrolledWindow;
731		793
732	our @ISA = CFClient::UI::Bin::;	794	our @ISA = CFClient::UI::HBox::;
733
734	use CFClient::OpenGL;
735		795
736	sub new {	796	sub new {
737	my $class = shift;	797	my $class = shift;
738		798
		799	my $self;
		800
		801	my $slider = new CFClient::UI::Slider
		802	vertical => 1,
		803	range => [0, 0, 1, 0.01], # HACK fix
		804	connect_changed => sub {
		805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		806	},
		807	;
		808
739	my $self = $class->SUPER::new (	809	$self = $class->SUPER::new (
740	bg => [1, 1, 1, 1],	810	vp => (new CFClient::UI::ViewPort expand => 1),
741	border_bg => [1, 1, 1, 1],	811	slider => $slider,
742	border => 0.8,
743	@_	812	@_,
744	);	813	);
745		814
		815	$self->{vp}->add ($self->{scrolled});
		816	$self->add ($self->{vp});
		817	$self->add ($self->{slider});
		818
746	$self	819	$self
747	}	820	}
748		821
		822	#TODO# update range on size_allocate depending on child
		823	# update viewport offset on scroll
		824
		825	#############################################################################
		826
		827	package CFClient::UI::Frame;
		828
		829	our @ISA = CFClient::UI::Bin::;
		830
		831	use CFClient::OpenGL;
		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	bg => undef,
		838	@_,
		839	)
		840	}
		841
749	sub _draw {	842	sub _draw {
750	my ($self) = @_;	843	my ($self) = @_;
751		844
752	my ($w, $h) = ($self->{w}, $self->{h});	845	if ($self->{bg}) {
		846	my ($w, $h) = @$self{qw(w h)};
753		847
754	glEnable GL_BLEND;	848	glEnable GL_BLEND;
755	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	849	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756	glEnable GL_TEXTURE_2D;	850	glColor @{ $self->{bg} };
757	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758		851
759	# glBegin GL_QUADS;	852	glBegin GL_QUADS;
760	# glColor 0, 0, 0, 0;
761	# glVertex 0 , 0;	853	glVertex 0 , 0;
762	# glVertex 0 , $h;	854	glVertex 0 , $h;
763	# glVertex $w, $h;	855	glVertex $w, $h;
764	# glVertex $w, 0;	856	glVertex $w, 0;
765	# glEnd;	857	glEnd;
766		858
767
768	$self->child->draw;
769	glDisable GL_BLEND;	859	glDisable GL_BLEND;
770	glDisable GL_TEXTURE_2D;	860	}
		861
		862	$self->SUPER::_draw;
771	}	863	}
772		864
773	#############################################################################	865	#############################################################################
774		866
775	package CFClient::UI::FancyFrame;	867	package CFClient::UI::FancyFrame;
…		…
788	# TODO: user_x, user_y, overwrite moveto?	880	# TODO: user_x, user_y, overwrite moveto?
789		881
790	my $self = $class->SUPER::new (	882	my $self = $class->SUPER::new (
791	bg => [1, 1, 1, 1],	883	bg => [1, 1, 1, 1],
792	border_bg => [1, 1, 1, 1],	884	border_bg => [1, 1, 1, 1],
793	border => 0.8,	885	border => 0.6,
		886	toplevel => 1,
794	can_events => 1,	887	can_events => 1,
795	@_	888	@_
796	);	889	);
797		890
798	$self->{title} &&= new CFClient::UI::Label	891	$self->{title} &&= new CFClient::UI::Label
799	align => 0,	892	align => 0,
800	valign => 1,	893	valign => 1,
801	text => $self->{title},	894	text => $self->{title},
802	fontsize => 1;	895	fontsize => $self->{border};
803		896
804	$self	897	$self
805	}	898	}
806		899
807	sub border {	900	sub border {
…		…
823	my ($self, $w, $h) = @_;	916	my ($self, $w, $h) = @_;
824		917
825	$h -= List::Util::max 0, $self->border * 2;	918	$h -= List::Util::max 0, $self->border * 2;
826	$w -= List::Util::max 0, $self->border * 2;	919	$w -= List::Util::max 0, $self->border * 2;
827		920
828	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	921	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829	if $self->{title};	922	if $self->{title};
830		923
831	$self->child->configure ($self->border, $self->border, $w, $h);	924	$self->child->configure ($self->border, $self->border, $w, $h);
832	}	925	}
833		926
834	sub button_down {	927	sub button_down {
835	my ($self, $ev, $x, $y) = @_;	928	my ($self, $ev, $x, $y) = @_;
836		929
		930	my ($w, $h) = @$self{qw(w h)};
837	my $border = $self->border;	931	my $border = $self->border;
838		932
839	if ($x < $self->{w} && $x >= $self->{w} - $border	933	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840	&& $y < $self->{h} && $y >= $self->{h} - $border) {	934	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841		935
		936	if ($lr & $td) {
		937	my ($wx, $wy) = ($self->{x}, $self->{y});
842	my ($ox, $oy) = ($ev->{x}, $ev->{y});	938	my ($ox, $oy) = ($ev->{x}, $ev->{y});
843	my ($bw, $bh) = ($self->{w}, $self->{h});	939	my ($bw, $bh) = ($self->{w}, $self->{h});
844		940
		941	my $mx = $x < $border;
		942	my $my = $y < $border;
		943
845	$self->{motion} = sub {	944	$self->{motion} = sub {
846	my ($ev, $x, $y) = @_;	945	my ($ev, $x, $y) = @_;
847		946
848	($x, $y) = ($ev->{x}, $ev->{y});	947	my $dx = $ev->{x} - $ox;
		948	my $dy = $ev->{y} - $oy;
849		949
850	$self->{user_w} = $bw + $x - $ox;	950	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851	$self->{user_h} = $bh + $y - $oy;	951	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		952	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
852	$self->check_size;	953	$self->check_size;
853	};	954	};
854		955
855	} elsif ($x >= 0 && $x < $self->{w}	956	} elsif ($lr ^ $td) {
856	&& $y >= 0 && $y < $border) {
857
858	my ($ox, $oy) = ($ev->{x}, $ev->{y});	957	my ($ox, $oy) = ($ev->{x}, $ev->{y});
859	my ($bx, $by) = ($self->{x}, $self->{y});	958	my ($bx, $by) = ($self->{x}, $self->{y});
860		959
861	$self->{motion} = sub {	960	$self->{motion} = sub {
862	my ($ev, $x, $y) = @_;	961	my ($ev, $x, $y) = @_;
…		…
885	my ($self) = @_;	984	my ($self) = @_;
886		985
887	my ($w, $h ) = ($self->{w}, $self->{h});	986	my ($w, $h ) = ($self->{w}, $self->{h});
888	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	987	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
889		988
890	glEnable GL_BLEND;
891	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
892	glEnable GL_TEXTURE_2D;	989	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
894		991
895	my $border = $self->border;	992	my $border = $self->border;
896		993
897	glColor @{ $self->{border_bg} };	994	glColor @{ $self->{border_bg} };
898	$tex[1]->draw_quad (0, 0, $w, $border);	995	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
899	$tex[3]->draw_quad (0, $border, $border, $ch);	996	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
900	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	997	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
901	$tex[4]->draw_quad (0, $h - $border, $w, $border);	998	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
902		999
		1000	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903	my $bg = $tex[0];	1001	my $bg = $tex[0];
904		1002
905	# TODO: repeat texture not scale	1003	# TODO: repeat texture not scale
906	my $rep_x = $cw / $bg->{w};	1004	my $rep_x = $cw / $bg->{w};
907	my $rep_y = $ch / $bg->{h};	1005	my $rep_y = $ch / $bg->{h};
908		1006
909	glColor @{ $self->{bg} };	1007	glColor @{ $self->{bg} };
910		1008
911	$bg->{s} = $rep_x;	1009	$bg->{s} = $rep_x;
912	$bg->{t} = $rep_y;	1010	$bg->{t} = $rep_y;
913	$bg->{wrap_mode} = 1;	1011	$bg->{wrap_mode} = 1;
914	$bg->draw_quad ($border, $border, $cw, $ch);	1012	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1013	}
915		1014
916	glDisable GL_TEXTURE_2D;	1015	glDisable GL_TEXTURE_2D;
917	glDisable GL_BLEND;
918		1016
919	$self->{title}->draw if $self->{title};	1017	$self->{title}->draw if $self->{title};
		1018
920	$self->child->draw;	1019	$self->child->draw;
921	}	1020	}
922		1021
923	#############################################################################	1022	#############################################################################
924		1023
…		…
1148	}	1247	}
1149		1248
1150	sub size_allocate {	1249	sub size_allocate {
1151	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h) = @_;
1152		1251
		1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1253
1153	my $children = $self->{children};	1254	my $children = $self->{children};
1154		1255
1155	my @h = map $_->{req_h}, @$children;	1256	my @h = map $_->{req_h}, @$children;
1156		1257
1157	my $req_h = List::Util::sum @h;	1258	my $req_h = List::Util::sum @h;
…		…
1186		1287
1187	#############################################################################	1288	#############################################################################
1188		1289
1189	package CFClient::UI::Label;	1290	package CFClient::UI::Label;
1190		1291
1191	our @ISA = CFClient::UI::Base::;	1292	our @ISA = CFClient::UI::DrawBG::;
1192		1293
1193	use CFClient::OpenGL;	1294	use CFClient::OpenGL;
1194		1295
1195	sub new {	1296	sub new {
1196	my ($class, %arg) = @_;	1297	my ($class, %arg) = @_;
1197		1298
1198	my $self = $class->SUPER::new (	1299	my $self = $class->SUPER::new (
1199	fg => [1, 1, 1],	1300	fg => [1, 1, 1],
		1301	#bg => none
		1302	#active_bg => none
1200	#font => default_font	1303	#font => default_font
		1304	#text => initial text
		1305	#markup => initial narkup
		1306	#max_w => maximum pixel width
		1307	ellipsise => 3, # end
		1308	layout => (new CFClient::Layout),
1201	fontsize => 1,	1309	fontsize => 1,
1202	text => "",
1203	align => -1,	1310	align => -1,
1204	valign => -1,	1311	valign => -1,
1205	padding => 2,	1312	padding => 2,
1206	layout => new CFClient::Layout,
1207	can_events => 0,	1313	can_events => 0,
1208	%arg	1314	%arg
1209	);	1315	);
1210		1316
1211	if (exists $self->{template}) {	1317	if (exists $self->{template}) {
1212	my $layout = new CFClient::Layout;	1318	my $layout = new CFClient::Layout;
1213	$layout->set_text (delete $self->{template});	1319	$layout->set_text (delete $self->{template});
1214	$self->{template} = $layout;	1320	$self->{template} = $layout;
1215	}	1321	}
1216		1322
1217	$self->set_text (delete $self->{text}) if exists $self->{text};	1323	if (exists $self->{markup}) {
1218	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1324	$self->set_markup (delete $self->{markup});
		1325	} else {
		1326	$self->set_text (delete $self->{text});
		1327	}
1219		1328
1220	$self	1329	$self
1221	}	1330	}
1222		1331
1223	sub escape {	1332	sub escape($) {
1224	local $_ = $_[1];	1333	local $_ = $_[0];
1225		1334
1226	s/&/&amp;/g;	1335	s/&/&amp;/g;
1227	s/>/&gt;/g;	1336	s/>/&gt;/g;
1228	s/</&lt;/g;	1337	s/</&lt;/g;
1229		1338
1230	$_[1]	1339	$_
1231	}	1340	}
1232		1341
1233	sub update {	1342	sub update {
1234	my ($self) = @_;	1343	my ($self) = @_;
1235		1344
1236	delete $self->{texture};	1345	delete $self->{texture};
1237	$self->SUPER::update;	1346	$self->SUPER::update;
1238	}	1347	}
1239		1348
1240	sub reconfigure {
1241	my ($self) = @_;
1242
1243	delete $self->{texture};
1244	}
1245
1246	sub set_text {	1349	sub set_text {
1247	my ($self, $text) = @_;	1350	my ($self, $text) = @_;
1248		1351
1249	return if $self->{text} eq "T$text";	1352	return if $self->{text} eq "T$text";
1250	$self->{text} = "T$text";	1353	$self->{text} = "T$text";
1251		1354
		1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1252	$self->{layout}->set_text ($text);	1356	$self->{layout}->set_text ($text);
1253		1357
1254	delete $self->{texture};
1255	$self->update;	1358	$self->update;
1256	$self->check_size;	1359	$self->check_size;
1257	}	1360	}
1258		1361
1259	sub set_markup {	1362	sub set_markup {
1260	my ($self, $markup) = @_;	1363	my ($self, $markup) = @_;
1261		1364
1262	return if $self->{text} eq "M$markup";	1365	return if $self->{text} eq "M$markup";
1263	$self->{text} = "M$markup";	1366	$self->{text} = "M$markup";
1264		1367
		1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1369
		1370	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1265	$self->{layout}->set_markup ($markup);	1371	$self->{layout}->set_markup ($markup);
1266		1372
1267	delete $self->{texture};
1268	$self->update;	1373	$self->update;
1269	$self->check_size;	1374	$self->check_size;
1270	}	1375	}
1271		1376
1272	sub size_request {	1377	sub size_request {
1273	my ($self) = @_;	1378	my ($self) = @_;
1274		1379
1275	$self->{layout}->set_font ($self->{font}) if $self->{font};	1380	$self->{layout}->set_font ($self->{font}) if $self->{font};
1276	$self->{layout}->set_width ($self->{max_w} || -1);	1381	$self->{layout}->set_width ($self->{max_w} || -1);
		1382	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1383	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1277	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1278		1385
1279	my ($w, $h) = $self->{layout}->size;	1386	my ($w, $h) = $self->{layout}->size;
1280		1387
1281	if (exists $self->{template}) {	1388	if (exists $self->{template}) {
…		…
1303	sub set_fontsize {	1410	sub set_fontsize {
1304	my ($self, $fontsize) = @_;	1411	my ($self, $fontsize) = @_;
1305		1412
1306	$self->{fontsize} = $fontsize;	1413	$self->{fontsize} = $fontsize;
1307	delete $self->{texture};	1414	delete $self->{texture};
		1415
		1416	$self->update;
1308	$self->check_size;	1417	$self->check_size;
1309	$self->update;
1310	}	1418	}
1311		1419
1312	sub _draw {	1420	sub _draw {
1313	my ($self) = @_;	1421	my ($self) = @_;
1314		1422
		1423	$self->SUPER::_draw; # draw background, if applicable
		1424
1315	my $tex = $self->{texture} ||= do {	1425	my $tex = $self->{texture} ||= do {
		1426	$self->{layout}->set_foreground (@{$self->{fg}});
1316	$self->{layout}->set_font ($self->{font}) if $self->{font};	1427	$self->{layout}->set_font ($self->{font}) if $self->{font};
1317	$self->{layout}->set_width ($self->{w});	1428	$self->{layout}->set_width ($self->{w});
		1429	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1430	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1318	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1431	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1432
1319	new_from_layout CFClient::Texture $self->{layout}	1433	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1434
		1435	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1436	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1437	: ($self->{w} - $tex->{w}) * 0.5);
		1438
		1439	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1440	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1441	: ($self->{h} - $tex->{h}) * 0.5);
		1442
		1443	$tex
1320	};	1444	};
1321		1445
1322	glEnable GL_BLEND;
1323	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1324	glEnable GL_TEXTURE_2D;	1446	glEnable GL_TEXTURE_2D;
1325	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1326		1448
		1449	if ($tex->{format} == GL_ALPHA) {
1327	glColor @{$self->{fg}};	1450	glColor @{$self->{fg}};
1328
1329	$self->{ox} = int (
1330	$self->{align} < 0 ? $self->{padding}
1331	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1332	: ($self->{w} - $tex->{w}) * 0.5
1333	);
1334
1335	$self->{oy} = int (
1336	$self->{valign} < 0 ? $self->{padding}
1337	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1338	: ($self->{h} - $tex->{h}) * 0.5
1339	);
1340
1341	$tex->draw_quad ($self->{ox}, $self->{oy});	1451	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1452	} else {
		1453	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1454	}
1342		1455
1343	glDisable GL_TEXTURE_2D;	1456	glDisable GL_TEXTURE_2D;
1344	glDisable GL_BLEND;
1345	}	1457	}
1346		1458
1347	#############################################################################	1459	#############################################################################
1348		1460
1349	package CFClient::UI::EntryBase;	1461	package CFClient::UI::EntryBase;
…		…
1384	$self->{layout}->set_text ("$text ");	1496	$self->{layout}->set_text ("$text ");
1385		1497
1386	$self->emit (changed => $self->{text});	1498	$self->emit (changed => $self->{text});
1387	}	1499	}
1388		1500
1389	sub get_text {
1390	$_[0]{text}
1391	}
1392
1393	sub size_request {
1394	my ($self) = @_;
1395
1396	my ($w, $h) = $self->SUPER::size_request;
1397
1398	($w + 1, $h) # add 1 for cursor
1399	}
1400
1401	sub size_allocate {
1402	my ($self, $w, $h) = @_;
1403
1404	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1405	}
1406
1407	sub set_text {	1501	sub set_text {
1408	my ($self, $text) = @_;	1502	my ($self, $text) = @_;
1409		1503
1410	$self->{cursor} = length $text;	1504	$self->{cursor} = length $text;
1411	$self->_set_text ($text);	1505	$self->_set_text ($text);
1412	$self->update;	1506	$self->update;
		1507	$self->check_size;
		1508	}
		1509
		1510	sub get_text {
		1511	$_[0]{text}
		1512	}
		1513
		1514	sub size_request {
		1515	my ($self) = @_;
		1516
		1517	my ($w, $h) = $self->SUPER::size_request;
		1518
		1519	($w + 1, $h) # add 1 for cursor
		1520	}
		1521
		1522	sub size_allocate {
		1523	my ($self, $w, $h) = @_;
		1524
		1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1413	}	1526	}
1414		1527
1415	sub key_down {	1528	sub key_down {
1416	my ($self, $ev) = @_;	1529	my ($self, $ev) = @_;
1417		1530
…		…
1419	my $sym = $ev->{sym};	1532	my $sym = $ev->{sym};
1420	my $uni = $ev->{unicode};	1533	my $uni = $ev->{unicode};
1421		1534
1422	my $text = $self->get_text;	1535	my $text = $self->get_text;
1423		1536
1424	if ($sym == 8) {	1537	if ($uni == 8) {
1425	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1538	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1426	} elsif ($sym == 127) {	1539	} elsif ($uni == 127) {
1427	substr $text, $self->{cursor}, 1, "";	1540	substr $text, $self->{cursor}, 1, "";
1428	} elsif ($sym == CFClient::SDLK_LEFT) {	1541	} elsif ($sym == CFClient::SDLK_LEFT) {
1429	--$self->{cursor} if $self->{cursor};	1542	--$self->{cursor} if $self->{cursor};
1430	} elsif ($sym == CFClient::SDLK_RIGHT) {	1543	} elsif ($sym == CFClient::SDLK_RIGHT) {
1431	++$self->{cursor} if $self->{cursor} < length $self->{text};	1544	++$self->{cursor} if $self->{cursor} < length $self->{text};
1432	} elsif ($sym == CFClient::SDLK_HOME) {	1545	} elsif ($sym == CFClient::SDLK_HOME) {
1433	$self->{cursor} = 0;	1546	$self->{cursor} = 0;
1434	} elsif ($sym == CFClient::SDLK_END) {	1547	} elsif ($sym == CFClient::SDLK_END) {
1435	$self->{cursor} = length $text;	1548	$self->{cursor} = length $text;
1436	} elsif ($sym == 27) {	1549	} elsif ($uni == 27) {
1437	$self->emit ('escape');	1550	$self->emit ('escape');
1438	} elsif ($uni) {	1551	} elsif ($uni) {
1439	substr $text, $self->{cursor}++, 0, chr $uni;	1552	substr $text, $self->{cursor}++, 0, chr $uni;
1440	}	1553	}
1441		1554
1442	$self->_set_text ($text);	1555	$self->_set_text ($text);
1443	$self->update;	1556	$self->update;
		1557	$self->check_size;
1444	}	1558	}
1445		1559
1446	sub focus_in {	1560	sub focus_in {
1447	my ($self) = @_;	1561	my ($self) = @_;
1448		1562
…		…
1577	my $class = shift;	1691	my $class = shift;
1578		1692
1579	$class->SUPER::new (	1693	$class->SUPER::new (
1580	padding => 4,	1694	padding => 4,
1581	fg => [1, 1, 1],	1695	fg => [1, 1, 1],
1582	bg => [1, 1, 1, 0.2],
1583	active_fg => [0, 0, 1],	1696	active_fg => [0, 0, 1],
1584	can_hover => 1,	1697	can_hover => 1,
1585	align => 0,	1698	align => 0,
1586	valign => 0,	1699	valign => 0,
1587	can_events => 1,	1700	can_events => 1,
…		…
1605		1718
1606	if ($GRAB == $self) {	1719	if ($GRAB == $self) {
1607	$self->{fg} = $self->{active_fg};	1720	$self->{fg} = $self->{active_fg};
1608	}	1721	}
1609		1722
1610	glEnable GL_BLEND;
1611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1612	glEnable GL_TEXTURE_2D;	1723	glEnable GL_TEXTURE_2D;
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614	glColor 0, 0, 0, 1;	1725	glColor 0, 0, 0, 1;
1615		1726
1616	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1727	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1617		1728
1618	glDisable GL_TEXTURE_2D;	1729	glDisable GL_TEXTURE_2D;
1619	glDisable GL_BLEND;
1620		1730
1621	$self->SUPER::_draw;	1731	$self->SUPER::_draw;
1622	}	1732	}
1623		1733
1624	#############################################################################	1734	#############################################################################
…		…
1638		1748
1639	$class->SUPER::new (	1749	$class->SUPER::new (
1640	padding => 2,	1750	padding => 2,
1641	fg => [1, 1, 1],	1751	fg => [1, 1, 1],
1642	active_fg => [1, 1, 0],	1752	active_fg => [1, 1, 0],
		1753	bg => [0, 0, 0, 0.2],
		1754	active_bg => [1, 1, 1, 0.5],
1643	state => 0,	1755	state => 0,
1644	can_hover => 1,	1756	can_hover => 1,
1645	@_	1757	@_
1646	)	1758	)
1647	}	1759	}
…		…
1671		1783
1672	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1784	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1673		1785
1674	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1786	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1675		1787
1676	glEnable GL_BLEND;	1788	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1789
1677	glEnable GL_TEXTURE_2D;	1790	glEnable GL_TEXTURE_2D;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679
1680	my $tex = $self->{state} ? $tex[1] : $tex[0];
1681
1682	$tex->draw_quad (0, 0, $s, $s);	1791	$tex->draw_quad_alpha (0, 0, $s, $s);
1683
1684	glDisable GL_TEXTURE_2D;	1792	glDisable GL_TEXTURE_2D;
1685	glDisable GL_BLEND;
1686	}	1793	}
1687		1794
1688	#############################################################################	1795	#############################################################################
1689		1796
1690	package CFClient::UI::Image;	1797	package CFClient::UI::Image;
…		…
1733	glTranslate 0, -$self->{w}, 0;	1840	glTranslate 0, -$self->{w}, 0;
1734		1841
1735	($w, $h) = ($h, $w);	1842	($w, $h) = ($h, $w);
1736	}	1843	}
1737		1844
1738	glEnable GL_BLEND;
1739	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740	glEnable GL_TEXTURE_2D;	1845	glEnable GL_TEXTURE_2D;
1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1846	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742		1847
1743	$tex->draw_quad (0, 0, $w, $h);	1848	$tex->draw_quad_alpha (0, 0, $w, $h);
1744		1849
1745	glDisable GL_BLEND;
1746	glDisable GL_TEXTURE_2D;	1850	glDisable GL_TEXTURE_2D;
1747	}	1851	}
1748		1852
1749	#############################################################################	1853	#############################################################################
1750		1854
…		…
1939	qw(s1_slider.png s1_slider_bg.png);	2043	qw(s1_slider.png s1_slider_bg.png);
1940		2044
1941	sub new {	2045	sub new {
1942	my $class = shift;	2046	my $class = shift;
1943		2047
1944	# range [value, low, high, page]	2048	# range [value, low, high, page, unit]
1945		2049
1946	# TODO: 0-width page	2050	# TODO: 0-width page
1947	# TODO: req_w/h are wrong with vertical	2051	# TODO: req_w/h are wrong with vertical
1948	# TODO: calculations are off	2052	# TODO: calculations are off
1949	my $self = $class->SUPER::new (	2053	my $self = $class->SUPER::new (
1950	fg => [1, 1, 1],	2054	fg => [1, 1, 1],
1951	active_fg => [0, 0, 0],	2055	active_fg => [0, 0, 0],
		2056	bg => [0, 0, 0, 0.2],
		2057	active_bg => [1, 1, 1, 0.5],
1952	range => [0, 0, 100, 10],	2058	range => [0, 0, 100, 10],
1953	req_w => 20,	2059	req_w => $::WIDTH / 80,
1954	req_h => 20,	2060	req_h => $::WIDTH / 80,
1955	vertical => 0,	2061	vertical => 0,
1956	can_hover => 1,	2062	can_hover => 1,
1957	inner_pad => 5,	2063	inner_pad => 0.02,
1958	@_	2064	@_
1959	);	2065	);
1960		2066
		2067	$self->set_value ($self->{range}[0]);
		2068	$self->update;
		2069
1961	$self	2070	$self
		2071	}
		2072
		2073	sub set_value {
		2074	my ($self, $value) = @_;
		2075
		2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2077
		2078	$hi = $lo + 1 if $hi <= $lo;
		2079
		2080	$value = $lo if $value < $lo;
		2081	$value = $hi if $value > $hi;
		2082
		2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2084	if $unit;
		2085
		2086	$page = $hi - $lo if $page > $hi - $lo;
		2087
		2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2089
		2090	if ($value != $old_value) {
		2091	$self->emit (changed => $value);
		2092	$self->update;
		2093	}
1962	}	2094	}
1963		2095
1964	sub size_request {	2096	sub size_request {
1965	my ($self) = @_;	2097	my ($self) = @_;
1966		2098
…		…
1979		2111
1980	sub mouse_motion {	2112	sub mouse_motion {
1981	my ($self, $ev, $x, $y) = @_;	2113	my ($self, $ev, $x, $y) = @_;
1982		2114
1983	if ($GRAB == $self) {	2115	if ($GRAB == $self) {
		2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2117
		2118	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2119
		2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2121
		2122	$self->set_value ($x * ($hi - $lo) + $lo);
		2123	}
		2124	}
		2125
		2126	sub update {
		2127	my ($self) = @_;
		2128
		2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2130	$self->set_value ($self->{range}[0]);
		2131
1984	my ($value, $lo, $hi, $page) = @{$self->{range}};	2132	my ($value, $lo, $hi, $page) = @{$self->{range}};
1985		2133
1986	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2134	my $inner_w = 1 - 2 * $self->{inner_pad};
1987		2135
1988	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2136	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1989	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1990		2137
1991	$x -= $inner_pad_px; # substract the padding	2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1992	$x = $x * ($hi - $lo) / $inner_w + $lo;	2139	$value = $self->{scale} * ($value - $lo);
1993	$x = $lo if $x < $lo;
1994	$x = $hi - $page if $x > $hi - $page;
1995	$self->{range}[0] = $x;
1996		2140
1997	$self->emit (changed => $x);	2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
1998	$self->update;	2142
		2143	$value = 0 if $value < 0;
		2144	$page = 1 - $value if $value + $page > 1;
		2145
		2146	$self->{knob_x} = $value;
		2147	$self->{knob_w} = $page;
1999	}	2148	});
2000	}
2001		2149
2002	# the inner_* stuff is for generating a padding for the slider handle,	2150	$self->SUPER::update;
2003	# so that the handle doesn't leave the texture. This calculation isn't 100%
2004	# correct propably, but it does the job for now
2005	sub _calc_inner_pad_px {
2006	my ($self, $w) = @_;
2007	($w / 100) * $self->{inner_pad} # % to pixels
2008	}	2151	}
2009		2152
2010	sub _draw {	2153	sub _draw {
2011	my ($self) = @_;	2154	my ($self) = @_;
2012		2155
2013	$self->SUPER::_draw ();	2156	$self->SUPER::_draw ();
2014		2157
2015	my ($w, $h) = @$self{qw(w h)};	2158	glScale $self->{w}, $self->{h};
2016		2159
2017	if ($self->{vertical}) {	2160	if ($self->{vertical}) {
2018	# draw a vertical slider like a rotated horizontal slider	2161	# draw a vertical slider like a rotated horizontal slider
2019		2162
		2163	glTranslate 1, 0, 0;
2020	glRotate 90, 0, 0, 1;	2164	glRotate 90, 0, 0, 1;
2021	glTranslate 0, -$self->{w}, 0;
2022
2023	($w, $h) = ($h, $w);
2024	}	2165	}
2025		2166
2026	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2167	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2027	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2168	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2028		2169
2029	my ($value, $lo, $hi, $page) = @{$self->{range}};
2030
2031	$hi = $value + 1 if $lo == $hi;
2032
2033	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2034	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2035
2036	$page = int $page * $inner_w / ($hi - $lo);
2037	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2038
2039	$w -= $page;
2040	$page &= ~1;
2041	glTranslate $page * 0.5, 0, 0;
2042	$page ||= 2;
2043
2044	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2045	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2046
2047	glEnable GL_BLEND;
2048	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2049	glEnable GL_TEXTURE_2D;	2170	glEnable GL_TEXTURE_2D;
2050	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2171	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051		2172
2052	# draw background	2173	# draw background
2053	$tex[1]->draw_quad (0, 0, $w, $h);	2174	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2054		2175
2055	# draw handle	2176	# draw handle
2056	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2177	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2057		2178
2058	glDisable GL_BLEND;
2059	glDisable GL_TEXTURE_2D;	2179	glDisable GL_TEXTURE_2D;
2060	}	2180	}
2061		2181
2062	#############################################################################	2182	#############################################################################
2063		2183
…		…
2074	fontsize => 1,	2194	fontsize => 1,
2075	can_events => 0,	2195	can_events => 0,
2076	#font => default_font	2196	#font => default_font
2077	@_,	2197	@_,
2078		2198
2079	layout => (new CFClient::Layout),	2199	layout => (new CFClient::Layout 1),
2080	par => [],	2200	par => [],
2081	height => 0,	2201	height => 0,
2082	children => [	2202	children => [
2083	(new CFClient::UI::Empty expand => 1),	2203	(new CFClient::UI::Empty expand => 1),
2084	(new CFClient::UI::Slider vertical => 1),	2204	(new CFClient::UI::Slider vertical => 1),
2085	],	2205	],
2086	);	2206	);
2087		2207
2088	$self->{children}[1]->connect (changed => sub {	2208	$self->{children}[1]->connect (changed => sub { $self->update });
2089	$self->update;
2090	});
2091		2209
2092	$self	2210	$self
2093	}	2211	}
2094		2212
2095	sub set_fontsize {	2213	sub set_fontsize {
2096	my ($self, $fontsize) = @_;	2214	my ($self, $fontsize) = @_;
2097		2215
2098	$self->{fontsize} = $fontsize;	2216	$self->{fontsize} = $fontsize;
2099	$self->reflow;	2217	$self->reflow;
2100	}
2101
2102	sub text_height {
2103	my ($self, $text) = @_;
2104
2105	my $layout = $self->{layout};
2106
2107	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108	$layout->set_width ($self->{w});
2109	$layout->set_text ($text);
2110
2111	($layout->size)[1]
2112	}
2113
2114	sub reflow {
2115	my ($self) = @_;
2116
2117	$self->{need_reflow}++;
2118	$self->update;
2119	}	2218	}
2120		2219
2121	sub size_allocate {	2220	sub size_allocate {
2122	my ($self, $w, $h) = @_;	2221	my ($self, $w, $h) = @_;
2123		2222
…		…
2128	$self->{layout}->set_width ($self->{children}[0]{w});	2227	$self->{layout}->set_width ($self->{children}[0]{w});
2129		2228
2130	$self->reflow;	2229	$self->reflow;
2131	}	2230	}
2132		2231
		2232	sub text_height {
		2233	my ($self, $text, $indent) = @_;
		2234
		2235	my $layout = $self->{layout};
		2236
		2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2238	$layout->set_width ($self->{children}[0]{w} - $indent);
		2239	$layout->set_markup ($text);
		2240
		2241	($layout->size)[1]
		2242	}
		2243
		2244	sub reflow {
		2245	my ($self) = @_;
		2246
		2247	$self->{need_reflow}++;
		2248	$self->update;
		2249	}
		2250
2133	sub add_paragraph {	2251	sub add_paragraph {
2134	my ($self, $color, $text) = @_;	2252	my ($self, $color, $text, $indent) = @_;
2135		2253
2136	#TODO: intelligently "reformat" paragraph	2254	#TODO: intelligently "reformat" paragraph
2137		2255
		2256	for my $line (split /\n/, $text) {
2138	my $height = $self->text_height ($text);	2257	my $height = $self->text_height ($line);
2139
2140	$self->{height} += $height;	2258	$self->{height} += $height;
2141
2142	push @{$self->{par}}, [$height, $color, $text];	2259	push @{$self->{par}}, [$height, $color, $indent, $line];
		2260	}
2143		2261
2144	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2145	$self->{children}[1]->update;	2263	$self->{children}[1]->update;
2146	}	2264	}
2147		2265
…		…
2152		2270
2153	return unless $self->{h} > 0;	2271	return unless $self->{h} > 0;
2154		2272
2155	delete $self->{texture};	2273	delete $self->{texture};
2156		2274
2157	$ROOT->on_refresh ($self, sub {	2275	$ROOT->on_post_alloc ($self, sub {
2158	if (delete $self->{need_reflow}) {	2276	if (delete $self->{need_reflow}) {
2159	my $height = 0;	2277	my $height = 0;
2160		2278
2161	$height += $_->[0] = $self->text_height ($_->[2])	2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2162	for @{$self->{par}};	2280	for @{$self->{par}};
2163		2281
2164	$self->{height} = $height;	2282	$self->{height} = $height;
2165		2283
2166	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2285	$self->{children}[1]->update;
2167		2286
2168	delete $self->{texture};	2287	delete $self->{texture};
2169	}	2288	}
2170		2289
2171	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2290	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172	glClearColor 0, 0, 0, 0;	2291	glClearColor 0.5, 0.5, 0.5, 0;
2173	glClear GL_COLOR_BUFFER_BIT;	2292	glClear GL_COLOR_BUFFER_BIT;
2174
2175	glEnable GL_BLEND;
2176	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2177	glEnable GL_TEXTURE_2D;
2178	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2179		2293
2180	my $top = int $self->{children}[1]{range}[0];	2294	my $top = int $self->{children}[1]{range}[0];
2181		2295
2182	my $y0 = $top;	2296	my $y0 = $top;
2183	my $y1 = $top + $self->{h};	2297	my $y1 = $top + $self->{h};
…		…
2186		2300
2187	my $layout = $self->{layout};	2301	my $layout = $self->{layout};
2188		2302
2189	$layout->set_font ($self->{font}) if $self->{font};	2303	$layout->set_font ($self->{font}) if $self->{font};
2190		2304
		2305	glEnable GL_BLEND;
		2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2307
2191	for my $par (@{$self->{par}}) {	2308	for my $par (@{$self->{par}}) {
2192	my $h = $par->[0];	2309	my $h = $par->[0];
2193		2310
2194	if ($y0 < $y + $h && $y < $y1) {	2311	if ($y0 < $y + $h && $y < $y1) {
		2312	$layout->set_foreground (@{ $par->[1] });
		2313	$layout->set_width ($self->{w} - $par->[2]);
2195	$layout->set_text ($par->[2]);	2314	$layout->set_markup ($par->[3]);
2196		2315
2197	glColor @{ $par->[1] };	2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2198	my ($W, $H) = $layout->size;	2317
2199	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2318	glRasterPos $par->[2], $y - $y0;
		2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2200	}	2320	}
2201		2321
2202	$y += $h;	2322	$y += $h;
2203	}	2323	}
2204		2324
2205	glDisable GL_TEXTURE_2D;
2206	glDisable GL_BLEND;	2325	glDisable GL_BLEND;
2207	};	2326	};
2208	});	2327	});
2209	}	2328	}
2210		2329
2211	sub _draw {	2330	sub _draw {
2212	my ($self) = @_;	2331	my ($self) = @_;
2213		2332
2214	if ($self->{texture}) {
2215	glEnable GL_BLEND;
2216	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217	glEnable GL_TEXTURE_2D;	2333	glEnable GL_TEXTURE_2D;
2218	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219	glColor 1, 1, 1, 1;	2335	glColor 1, 1, 1, 1;
2220	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2336	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221	glDisable GL_TEXTURE_2D;	2337	glDisable GL_TEXTURE_2D;
2222	glDisable GL_BLEND;
2223	}
2224		2338
2225	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
2226		2340
2227	}	2341	}
2228		2342
…		…
2322	@_,	2436	@_,
2323	can_events => 0,	2437	can_events => 0,
2324	)	2438	)
2325	}	2439	}
2326		2440
2327	sub set_markup {	2441	sub set_tooltip_from {
2328	my ($self, $text) = @_;	2442	my ($self, $widget) = @_;
2329		2443
2330	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2444	$self->add (new CFClient::UI::Label
2331	$self->{label}->set_markup ($text);	2445	markup => $widget->{tooltip},
2332	$self->add ($self->{label});	2446	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2447	fontsize => 0.8,
		2448	fg => [0, 0, 0, 1],
		2449	ellipsise => 0,
		2450	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2451	);
2333	}	2452	}
2334		2453
2335	sub size_request {	2454	sub size_request {
2336	my ($self) = @_;	2455	my ($self) = @_;
2337
2338	$self->child->set_max_size ($::WIDTH * 0.3);
2339		2456
2340	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2457	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341		2458
2342	($w + 4, $h + 4)	2459	($w + 4, $h + 4)
2343	}	2460	}
…		…
2349	}	2466	}
2350		2467
2351	sub _draw {	2468	sub _draw {
2352	my ($self) = @_;	2469	my ($self) = @_;
2353		2470
2354	glPushMatrix;
2355	glTranslate 0.375, 0.375;	2471	glTranslate 0.375, 0.375;
2356		2472
2357	my ($w, $h) = @$self{qw(w h)};	2473	my ($w, $h) = @$self{qw(w h)};
2358		2474
2359	glColor 1, 0.8, 0.4;	2475	glColor 1, 0.8, 0.4;
…		…
2370	glVertex 0 , $h;	2486	glVertex 0 , $h;
2371	glVertex $w, $h;	2487	glVertex $w, $h;
2372	glVertex $w, 0;	2488	glVertex $w, 0;
2373	glEnd;	2489	glEnd;
2374		2490
2375	glPopMatrix;	2491	glTranslate 2 - 0.375, 2 - 0.375;
2376
2377	glTranslate 2, 2;
2378	$self->SUPER::_draw;	2492	$self->SUPER::_draw;
2379	}	2493	}
2380		2494
2381	#############################################################################	2495	#############################################################################
2382		2496
…		…
2387	use CFClient::OpenGL;	2501	use CFClient::OpenGL;
2388		2502
2389	sub new {	2503	sub new {
2390	my $class = shift;	2504	my $class = shift;
2391		2505
2392	$class->SUPER::new (	2506	my $self = $class->SUPER::new (
2393	aspect => 1,	2507	aspect => 1,
2394	@_,	2508	@_,
2395	)	2509	);
		2510
		2511	if ($self->{anim} && $self->{animspeed}) {
		2512	Scalar::Util::weaken (my $widget = $self);
		2513
		2514	$self->{timer} = Event->timer (
		2515	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2516	hard => 1,
		2517	interval => $self->{animspeed},
		2518	cb => sub {
		2519	++$widget->{frame};
		2520	$widget->update;
		2521	},
		2522	);
		2523	}
		2524
		2525	$self
2396	}	2526	}
2397		2527
2398	sub size_request {	2528	sub size_request {
2399	(32, 8)	2529	(32, 8)
2400	}	2530	}
2401		2531
2402	sub draw {	2532	sub _draw {
2403	my ($self) = @_;	2533	my ($self) = @_;
2404		2534
		2535	return unless $::CONN;#d# manage and cache textures differently
		2536
		2537	my $face;
		2538
		2539	if ($self->{frame}) {
		2540	my $anim = $::CONN->{anim}[$self->{anim}];
		2541
		2542	$face = $anim->[ $self->{frame} % @$anim ]
		2543	if $anim && @$anim;
		2544	}
		2545
2405	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2546	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2406		2547
2407	if ($tex) {	2548	if ($tex) {
2408	glEnable GL_BLEND;
2409	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410	glEnable GL_TEXTURE_2D;	2549	glEnable GL_TEXTURE_2D;
2411	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2550	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412	glColor 1, 1, 1, 1;	2551	glColor 1, 1, 1, 1;
2413	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2552	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2414	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2415	glDisable GL_BLEND;	2554	}
		2555	}
		2556
		2557	sub DESTROY {
		2558	my ($self) = @_;
		2559
		2560	$self->{timer}->cancel
		2561	if $self->{timer};
		2562
		2563	$self->SUPER::DESTROY;
		2564	}
		2565
		2566	#############################################################################
		2567
		2568	package CFClient::UI::InventoryItem;
		2569
		2570	our @ISA = CFClient::UI::HBox::;
		2571
		2572	sub _item_to_desc {
		2573	my ($item) = @_;
		2574
		2575	my $desc =
		2576	$item->{nrof} < 2
		2577	? $item->{name}
		2578	: "$item->{nrof} × $item->{name_pl}";
		2579
		2580	$item->{flags} & Crossfire::Protocol::F_OPEN
		2581	and $desc .= " (open)";
		2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2583	and $desc .= " (applied)";
		2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2585	and $desc .= " (unpaid)";
		2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2587	and $desc .= " (magic)";
		2588	$item->{flags} & Crossfire::Protocol::F_CURSED
		2589	and $desc .= " (cursed)";
		2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2591	and $desc .= " (damned)";
		2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2593	and $desc .= " *";
		2594
		2595	$desc
		2596	}
		2597
		2598	sub new {
		2599	my $class = shift;
		2600
		2601	my %args = @_;
		2602
		2603	my $item = delete $args{item};
		2604
		2605	my $desc = _item_to_desc ($item);
		2606
		2607	my $self = $class->SUPER::new (
		2608	can_hover => 1,
		2609	can_events => 1,
		2610	tooltip => ((CFClient::UI::Label::escape $desc)
		2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2612	connect_button_down => sub {
		2613	my ($self, $ev, $x, $y) = @_;
		2614
		2615	# todo: maybe put examine on 1? but should just be a tooltip :(
		2616	if ($ev->{button} == 1) {
		2617	my $targ = $::CONN->{player}{tag};
		2618
		2619	if ($item->{container} == $::CONN->{player}{tag}) {
		2620	$targ = $main::OPENCONT;
		2621	}
		2622
		2623	$::CONN->send ("move $targ $item->{tag} 0");
		2624	} elsif ($ev->{button} == 2) {
		2625	$::CONN->send ("apply $item->{tag}");
		2626	} elsif ($ev->{button} == 3) {
		2627	my @menu_items = (
		2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2631	(
		2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2633	? (
		2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2635	)
		2636	: (
		2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2639	)
		2640	),
		2641	);
		2642
		2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2644	}
		2645
		2646	1
		2647	},
		2648	%args
		2649	);
		2650
		2651
		2652	$self->add (new CFClient::UI::Face
		2653	can_events => 0,
		2654	face => $item->{face},
		2655	anim => $item->{anim},
		2656	animspeed => $item->{animspeed},
		2657	);
		2658
		2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2660
		2661	$self->{item} = $item;
		2662
		2663	$self->update_item;
		2664
		2665	$self
		2666	}
		2667
		2668	sub update_item {
		2669	my ($self) = @_;
		2670
		2671	my $desc = _item_to_desc ($self->{item});
		2672
		2673	$self->{name_lbl}->set_text ($desc);
		2674	}
		2675
		2676	#############################################################################
		2677
		2678	package CFClient::UI::Inventory;
		2679
		2680	our @ISA = CFClient::UI::ScrolledWindow::;
		2681
		2682	sub new {
		2683	my $class = shift;
		2684
		2685	my $self = $class->SUPER::new (
		2686	scrolled => (new CFClient::UI::VBox),
		2687	@_,
		2688	);
		2689
		2690	$self
		2691	}
		2692
		2693	sub set_items {
		2694	my ($self, $items) = @_;
		2695
		2696	$self->{scrolled}->clear;
		2697	return unless $items;
		2698
		2699	my @items = sort {
		2700	($a->{type} <=> $b->{type})
		2701	or ($a->{name} cmp $b->{name})
		2702	} @$items;
		2703
		2704	$self->{real_items} = \@items;
		2705
		2706	for my $item (@items) {
		2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2708	$item->update_item ();
		2709	}
		2710
		2711	$self->{scrolled}->add (@items);
		2712
		2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2714	}
		2715
		2716	sub size_request {
		2717	my ($self) = @_;
		2718	($self->{req_w}, $self->{req_h});
		2719	}
		2720
		2721	#############################################################################
		2722
		2723	package CFClient::UI::Menu;
		2724
		2725	our @ISA = CFClient::UI::FancyFrame::;
		2726
		2727	use CFClient::OpenGL;
		2728
		2729	sub new {
		2730	my $class = shift;
		2731
		2732	my $self = $class->SUPER::new (
		2733	items => [],
		2734	z => 100,
		2735	@_,
		2736	);
		2737
		2738	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2739
		2740	for my $item (@{ $self->{items} }) {
		2741	my ($widget, $cb) = @$item;
		2742
		2743	# handle various types of items, only text for now
		2744	if (!ref $widget) {
		2745	$widget = new CFClient::UI::Label
		2746	can_hover => 1,
		2747	can_events => 1,
		2748	text => $widget;
		2749	}
		2750
		2751	$self->{item}{$widget} = $item;
		2752
		2753	$self->{vbox}->add ($widget);
		2754	}
		2755
		2756	$self
		2757	}
		2758
		2759	# popup given the event (must be a mouse button down event currently)
		2760	sub popup {
		2761	my ($self, $ev) = @_;
		2762
		2763	$self->emit ("popdown");
		2764
		2765	# maybe save $GRAB? must be careful about events...
		2766	$GRAB = $self;
		2767	$self->{button} = $ev->{button};
		2768
		2769	$self->show;
		2770	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2771	}
		2772
		2773	sub mouse_motion {
		2774	my ($self, $ev, $x, $y) = @_;
		2775
		2776	# TODO: should use vbox->find_widget or so
		2777	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2778	$self->{hover} = $self->{item}{$HOVER};
		2779	}
		2780
		2781	sub button_up {
		2782	my ($self, $ev, $x, $y) = @_;
		2783
		2784	if ($ev->{button} == $self->{button}) {
		2785	undef $GRAB;
		2786	$self->hide;
		2787
		2788	$self->emit ("popdown");
		2789	$self->{hover}[1]->() if $self->{hover};
		2790	}
		2791	}
		2792
		2793	#############################################################################
		2794
		2795	package CFClient::UI::Statusbox;
		2796
		2797	our @ISA = CFClient::UI::VBox::;
		2798
		2799	sub new {
		2800	my $class = shift;
		2801
		2802	$class->SUPER::new (
		2803	fontsize => 0.8,
		2804	@_,
2416	}	2805	)
		2806	}
		2807
		2808	sub reorder {
		2809	my ($self) = @_;
		2810	my $NOW = time;
		2811
		2812	while (my ($k, $v) = each %{ $self->{item} }) {
		2813	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2814	}
		2815
		2816	my @widgets;
		2817
		2818	my @items = sort {
		2819	$a->{pri} <=> $b->{pri}
		2820	or $b->{id} <=> $a->{id}
		2821	} values %{ $self->{item} };
		2822
		2823	my $count = 10 + 1;
		2824	for my $item (@items) {
		2825	last unless --$count;
		2826
		2827	push @widgets, $item->{label} ||= do {
		2828	# TODO: doesn't handle markup well (read as: at all)
		2829	my $short = $item->{count} > 1
		2830	? "<b>$item->{count} ×</b> $item->{text}"
		2831	: $item->{text};
		2832
		2833	for ($short) {
		2834	s/^\s+//;
		2835	s/\s+/ /g;
		2836	}
		2837
		2838	new CFClient::UI::Label
		2839	markup => $short,
		2840	tooltip => $item->{tooltip},
		2841	tooltip_font => $::FONT_PROP,
		2842	tooltip_width => 0.67,
		2843	fontsize => $item->{fontsize} || $self->{fontsize},
		2844	max_w => $::WIDTH * 0.44,
		2845	fg => $item->{fg},
		2846	can_events => 1,
		2847	can_hover => 1
		2848	};
		2849	}
		2850
		2851	$self->clear;
		2852	$self->SUPER::add (reverse @widgets);
		2853	}
		2854
		2855	sub add {
		2856	my ($self, $text, %arg) = @_;
		2857
		2858	$text =~ s/^\s+//;
		2859	$text =~ s/\s+$//;
		2860
		2861	my $timeout = time + ((delete $arg{timeout}) || 60);
		2862
		2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2864
		2865	if (my $item = $self->{item}{$group}) {
		2866	if ($item->{text} eq $text) {
		2867	$item->{count}++;
		2868	} else {
		2869	$item->{count} = 1;
		2870	$item->{text} = $item->{tooltip} = $text;
		2871	}
		2872	$item->{id} = ++$self->{id};
		2873	$item->{timeout} = $timeout;
		2874	delete $item->{label};
		2875	} else {
		2876	$self->{item}{$group} = {
		2877	id => ++$self->{id},
		2878	text => $text,
		2879	timeout => $timeout,
		2880	tooltip => $text,
		2881	fg => [0.8, 0.8, 0.8, 0.8],
		2882	pri => 0,
		2883	count => 1,
		2884	%arg,
		2885	};
		2886	}
		2887
		2888	$self->reorder;
		2889	}
		2890
		2891	sub reconfigure {
		2892	my ($self) = @_;
		2893
		2894	delete $_->{label}
		2895	for values %{ $self->{item} || {} };
		2896
		2897	$self->reorder;
		2898	$self->SUPER::reconfigure;
2417	}	2899	}
2418		2900
2419	#############################################################################	2901	#############################################################################
2420		2902
2421	package CFClient::UI::Root;	2903	package CFClient::UI::Root;
2422		2904
2423	our @ISA = CFClient::UI::Container::;	2905	our @ISA = CFClient::UI::Container::;
2424		2906
2425	use CFClient::OpenGL;	2907	use CFClient::OpenGL;
2426		2908
2427	sub check_size {	2909	sub new {
2428	my ($self) = @_;	2910	my $class = shift;
2429		2911
2430	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2912	$class->SUPER::new (
2431	}	2913	@_,
2432		2914	)
2433	sub size_request {
2434	($::WIDTH, $::HEIGHT)
2435	}	2915	}
2436		2916
2437	sub configure {	2917	sub configure {
2438	my ($self, $x, $y, $w, $h) = @_;	2918	my ($self, $x, $y, $w, $h) = @_;
2439		2919
2440	$self->SUPER::configure ($x, $y, $w, $h);	2920	$self->{w} = $w;
		2921	$self->{h} = $h;
		2922	}
2441		2923
		2924	sub check_size {
		2925	my ($self) = @_;
		2926
		2927	$self->size_allocate ($self->{w}, $self->{h})
		2928	if $self->{w};
		2929	}
		2930
		2931	sub size_request {
		2932	my ($self) = @_;
		2933
		2934	($self->{w}, $self->{h})
		2935	}
		2936
		2937	sub size_allocate {
		2938	my ($self, $w, $h) = @_;
		2939
		2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2942
		2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2945
2442	for my $child (@{$self->{children}}) {	2946	for my $child ($self->children) {
2443	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2947	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2444		2948
		2949	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2950	if exists $child->{req_x};
		2951
		2952	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2953	if exists $child->{req_y};
		2954
2445	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2955	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2446	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2956	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2957
2447	$child->configure ($X, $Y, $W,$H);	2958	$child->configure ($X, $Y, $W, $H);
2448	}	2959	}
2449	}	2960	}
2450		2961
2451	sub _topleft {	2962	sub coord2local {
2452	my ($self, $x, $y) = @_;	2963	my ($self, $x, $y) = @_;
2453		2964
2454	($x, $y)	2965	($x, $y)
2455	}	2966	}
2456		2967
		2968	sub coord2global {
		2969	my ($self, $x, $y) = @_;
		2970
		2971	($x, $y)
		2972	}
		2973
2457	sub update {	2974	sub update {
2458	my ($self) = @_;	2975	my ($self) = @_;
2459		2976
2460	$self->check_size;	2977	$self->check_size;
2461	::refresh ();	2978	$::WANT_REFRESH++;
2462	}	2979	}
2463		2980
2464	sub add {	2981	sub add {
2465	my ($self, $child) = @_;	2982	my ($self, @children) = @_;
2466		2983
		2984	for my $child (@children) {
		2985	$child->{toplevel} = 1;
		2986
2467	# integerize window positions	2987	# integerise window positions
2468	$child->{x} = int $child->{x};	2988	$child->{x} = int $child->{x};
2469	$child->{y} = int $child->{y};	2989	$child->{y} = int $child->{y};
		2990	}
2470		2991
2471	$self->SUPER::add ($child);	2992	$self->SUPER::add (@children);
2472	}	2993	}
2473		2994
2474	sub on_refresh {	2995	sub on_refresh {
2475	my ($self, $id, $cb) = @_;	2996	my ($self, $id, $cb) = @_;
2476		2997
2477	$self->{refresh_hook}{$id} = $cb;	2998	$self->{refresh_hook}{$id} = $cb;
2478	}	2999	}
2479		3000
		3001	sub on_post_alloc {
		3002	my ($self, $id, $cb) = @_;
		3003
		3004	$self->{post_alloc_hook}{$id} = $cb;
		3005	}
		3006
2480	sub draw {	3007	sub draw {
2481	my ($self) = @_;	3008	my ($self) = @_;
2482		3009
2483	while (my $rcb = delete $self->{refresh_hook}) {	3010	while ($self->{refresh_hook}) {
2484	$_->() for values %$rcb;	3011	$_->()
		3012	for values %{delete $self->{refresh_hook}};
		3013	}
		3014
		3015	if ($self->{check_size}) {
		3016	my @queue = ([], []);
		3017
		3018	for (;;) {
		3019	if ($self->{check_size}) {
		3020	# heuristic: check containers last
		3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3022	for values %{delete $self->{check_size}}
		3023	}
		3024
		3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3026
		3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3028	? @$widget{qw(user_w user_h)}
		3029	: $widget->size_request;
		3030
		3031	if (delete $widget->{force_alloc}
		3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3033	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3034
		3035	$widget->{req_w} = $w;
		3036	$widget->{req_h} = $h;
		3037
		3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3039
		3040	$widget->{parent}->check_size
		3041	if $widget->{parent};
		3042	}
		3043	}
		3044	}
		3045
		3046	while ($self->{size_alloc}) {
		3047	for (values %{delete $self->{size_alloc}}) {
		3048	my ($widget, $w, $h) = @$_;
		3049
		3050	$w = 0 if $w < 0;
		3051	$h = 0 if $h < 0;
		3052
		3053	$widget->{w} = $w;
		3054	$widget->{h} = $h;
		3055	$widget->size_allocate ($w, $h);
		3056	$widget->emit (size_allocate => $w, $h);
		3057	}
		3058	}
		3059
		3060	while ($self->{post_alloc_hook}) {
		3061	$_->()
		3062	for values %{delete $self->{post_alloc_hook}};
2485	}	3063	}
2486		3064
2487	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3065	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3066	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489	glClear GL_COLOR_BUFFER_BIT;	3067	glClear GL_COLOR_BUFFER_BIT;
2490		3068
2491	glMatrixMode GL_PROJECTION;	3069	glMatrixMode GL_PROJECTION;
2492	glLoadIdentity;	3070	glLoadIdentity;
2493	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3071	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2494	glMatrixMode GL_MODELVIEW;	3072	glMatrixMode GL_MODELVIEW;
2495	glLoadIdentity;	3073	glLoadIdentity;
2496		3074
2497	$self->_draw;	3075	$self->_draw;
2498	}	3076	}
…		…
2500	#############################################################################	3078	#############################################################################
2501		3079
2502	package CFClient::UI;	3080	package CFClient::UI;
2503		3081
2504	$ROOT = new CFClient::UI::Root;	3082	$ROOT = new CFClient::UI::Root;
2505	$TOOLTIP = new CFClient::UI::Tooltip;	3083	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2506		3084
2507	1	3085	1
2508		3086

Diff Legend

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