[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_markup ($widget->{tooltip});	29	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	$TOOLTIP->check_size;
		40	$TOOLTIP->update;
31	}	41	}
32		42
33	return;	43	return;
34	}	44	}
35	}	45	}
…		…
224	$self->{y} = $y;	234	$self->{y} = $y;
225	$self->update;	235	$self->update;
226	}	236	}
227		237
228	if ($self->{w} != $w \|\| $self->{h} != $h) {	238	if ($self->{w} != $w \|\| $self->{h} != $h) {
229	$self->{w} = $w;	239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	240	}
235	}	241	}
236		242
237	sub size_allocate {	243	sub size_allocate {
238	# nothing to be done	244	# nothing to be done
239	}	245	}
240		246
241	sub children {	247	sub children {
242	}	248	}
243		249
244	# call when resoltuion changes etc.	250	# call when resolution changes etc.
245	sub reconfigure {	251	sub reconfigure {
246	my ($self) = @_;	252	my ($self) = @_;
247		253
248	$_->reconfigure	254	$_->reconfigure
249	for $self->children;	255	for $self->children;
250		256
251	$_->check_size;	257	$self->check_size;
		258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		259	$self->update;
252	}	260	}
253		261
254	sub set_max_size {	262	sub set_max_size {
255	my ($self, $w, $h) = @_;	263	my ($self, $w, $h) = @_;
256		264
257	delete $self->{max_w}; $self->{max_w} = $w if $w;	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
258	delete $self->{max_h}; $self->{max_h} = $h if $h;	266	delete $self->{max_h}; $self->{max_h} = $h if $h;
259	}
260
261	# return top left coordinates
262	sub _topleft {
263	my ($self, $x, $y) = @_;
264
265	$self->{parent}
266	or Carp::confess "no parent widget in _topleft\n";#d#
267
268	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269	}	267	}
270		268
271	# translate global coordinates to local coordinate system	269	# translate global coordinates to local coordinate system
272	sub coord2local {	270	sub coord2local {
273	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
274		272
275	my ($X, $Y) = $self->_topleft;	273	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276	($x - $X, $y - $Y)
277	}	274	}
278		275
279	# translate local coordinates to global coordinate system	276	# translate local coordinates to global coordinate system
280	sub coord2global {	277	sub coord2global {
281	my ($self, $x, $y) = @_;	278	my ($self, $x, $y) = @_;
282		279
283	my ($X, $Y) = $self->_topleft;	280	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284	($x + $X, $y + $Y)
285	}	281	}
286		282
287	sub focus_in {	283	sub focus_in {
288	my ($self) = @_;	284	my ($self) = @_;
289		285
…		…
387		383
388	sub set_parent {	384	sub set_parent {
389	my ($self, $parent) = @_;	385	my ($self, $parent) = @_;
390		386
391	Scalar::Util::weaken ($self->{parent} = $parent);	387	Scalar::Util::weaken ($self->{parent} = $parent);
		388
		389	$self->check_size
		390	unless exists $self->{req_w};
392	}	391	}
393		392
394	sub check_size {	393	sub check_size {
395	my ($self) = @_;	394	my ($self, $forced) = @_;
396		395
397	$self->{parent}	396	$self->{force_alloc} = 1 if $forced;
398	or return 1;	397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400	my ($w, $h) = $self->{user_w} && $self->{user_h}
401	? @$self{qw(user_w user_h)}
402	: $self->size_request;
403
404	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
405	$self->{req_w} = $w;
406	$self->{req_h} = $h;
407
408	$self->{parent}->check_size
409	or $self->size_allocate (
410	(List::Util::max $self->{w}, $w),
411	(List::Util::max $self->{h}, $h),
412	);
413
414	1
415	} else {
416	0
417	}
418	}	398	}
419		399
420	sub update {	400	sub update {
421	my ($self) = @_;	401	my ($self) = @_;
422		402
…		…
519		499
520	$self	500	$self
521	}	501	}
522		502
523	sub add {	503	sub add {
524	my ($self, $child) = @_;	504	my ($self, @widgets) = @_;
525		505
526	$child->set_parent ($self);	506	$_->set_parent ($self)
		507	for @widgets;
527		508
528	use sort 'stable';	509	use sort 'stable';
529		510
530	$self->{children} = [	511	$self->{children} = [
531	sort { $a->{z} <=> $b->{z} }	512	sort { $a->{z} <=> $b->{z} }
532	@{$self->{children}}, $child	513	@{$self->{children}}, @widgets
533	];	514	];
534		515
535	$child->check_size;	516	$self->check_size (1);
		517	$self->update;
536	}	518	}
537		519
538	sub children {	520	sub children {
539	@{ $_[0]{children} }	521	@{ $_[0]{children} }
540	}	522	}
…		…
559		541
560	for (@$children) {	542	for (@$children) {
561	delete $_->{parent};	543	delete $_->{parent};
562	$_->hide;	544	$_->hide;
563	}	545	}
		546
		547	$self->check_size;
		548	$self->update;
564	}	549	}
565		550
566	sub find_widget {	551	sub find_widget {
567	my ($self, $x, $y) = @_;	552	my ($self, $x, $y) = @_;
568		553
…		…
643	}	628	}
644		629
645	sub update {	630	sub update {
646	my ($self) = @_;	631	my ($self) = @_;
647		632
648	# we want to do this delayed...	633	$ROOT->on_refresh ($self => sub { $self->render_child });
649	$self->render_chld;
650	$self->SUPER::update;	634	$self->SUPER::update;
651	}
652
653	sub render_chld {
654	my ($self) = @_;
655
656	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657	glClearColor 0, 0, 0, 1;
658	glClear GL_COLOR_BUFFER_BIT;
659	$self->child->draw;
660	};
661	}	635	}
662		636
663	sub size_allocate {	637	sub size_allocate {
664	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
665		639
666	$self->child->configure (0, 0, $w, $h);	640	$self->SUPER::size_allocate ($w, $h);
		641	$self->update;
		642	}
667		643
		644	sub _render {
		645	$_[0]{children}[0]->draw;
		646	}
		647
		648	sub render_child {
		649	my ($self) = @_;
		650
		651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		652	glClearColor 0, 0, 0, 0;
		653	glClear GL_COLOR_BUFFER_BIT;
		654
668	$self->render_chld;	655	$self->_render;
		656	# glColorMask 1, 1, 1, 0;
		657	# glEnable GL_BLEND;
		658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		659	# glRasterPos 0, 0;
		660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		661	# glDisable GL_BLEND;
		662	# glColorMask 1, 1, 1, 1;
		663	};
669	}	664	}
670		665
671	sub _draw {	666	sub _draw {
672	my ($self) = @_;	667	my ($self) = @_;
673		668
674	my ($w, $h) = ($self->w, $self->h);	669	my ($w, $h) = ($self->w, $self->h);
675		670
676	my $tex = $self->{texture}	671	my $tex = $self->{texture}
677	or return;	672	or return;
678		673
679	glEnable GL_BLEND;
680	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
682	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		676	glColor 0, 0, 0, 1;
683		677
684	$tex->draw_quad (0, 0, $w, $h);	678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685		679
686	glDisable GL_BLEND;
687	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
688	}	681	}
689		682
690	#############################################################################	683	#############################################################################
691		684
692	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
693		686
694	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
695		688
696	sub new { die }
697
698	sub size_request {	689	sub size_request {
699	my ($self) = @_;	690	my ($self) = @_;
700		691
701	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
703		694
704	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
705	}	696	}
706		697
707	sub _draw {	698	sub size_allocate {
708	my ($self) = @_;	699	my ($self, $w, $h) = @_;
709		700
710	$self->{children}[1]->draw;	701	$self->update;
711	}	702	}
712		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
713		706
714	#############################################################################	707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
715		709
		710	$self->update;
		711	}
		712
		713	# hmm, this does not work for topleft of $self... but we should not ask for that
		714	sub coord2local {
		715	my ($self, $x, $y) = @_;
		716
		717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
		727	}
		728
		729	sub find_widget {
		730	my ($self, $x, $y) = @_;
		731
		732	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		733	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		734	) {
		735	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		736	} else {
		737	$self->CFClient::UI::Base::find_widget ($x, $y)
		738	}
		739	}
		740
		741	sub _render {
		742	my ($self) = @_;
		743
		744	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		745
		746	$self->SUPER::_render;
		747	}
		748
		749	#############################################################################
		750
716	package CFClient::UI::Frame;	751	package CFClient::UI::ScrolledWindow;
717		752
718	our @ISA = CFClient::UI::Bin::;	753	our @ISA = CFClient::UI::HBox::;
719
720	use CFClient::OpenGL;
721		754
722	sub new {	755	sub new {
723	my $class = shift;	756	my $class = shift;
724		757
		758	my $self;
		759
		760	my $slider = new CFClient::UI::Slider
		761	vertical => 1,
		762	range => [0, 0, 1, 0.01], # HACK fix
		763	connect_changed => sub {
		764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		765	},
		766	;
		767
725	my $self = $class->SUPER::new (	768	$self = $class->SUPER::new (
726	bg => [1, 1, 1, 1],	769	vp => (new CFClient::UI::ViewPort),
727	border_bg => [1, 1, 1, 1],	770	slider => $slider,
728	border => 0.8,
729	@_	771	@_,
730	);	772	);
731		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
732	$self	778	$self
733	}	779	}
734		780
735	sub _draw {	781	#TODO# update range on size_allocate depeneing on child
736	my ($self) = @_;	782	# update viewport offset on scroll
737		783
738	my ($w, $h) = ($self->{w}, $self->{h});	784	#############################################################################
739		785
740	glEnable GL_BLEND;	786	package CFClient::UI::Frame;
741	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742	glEnable GL_TEXTURE_2D;
743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744		787
745	# glBegin GL_QUADS;	788	our @ISA = CFClient::UI::Bin::;
746	# glColor 0, 0, 0, 0;
747	# glVertex 0 , 0;
748	# glVertex 0 , $h;
749	# glVertex $w, $h;
750	# glVertex $w, 0;
751	# glEnd;
752		789
753		790	use CFClient::OpenGL;
754	$self->child->draw;
755	glDisable GL_BLEND;
756	glDisable GL_TEXTURE_2D;
757	}
758		791
759	#############################################################################	792	#############################################################################
760		793
761	package CFClient::UI::FancyFrame;	794	package CFClient::UI::FancyFrame;
762		795
…		…
774	# TODO: user_x, user_y, overwrite moveto?	807	# TODO: user_x, user_y, overwrite moveto?
775		808
776	my $self = $class->SUPER::new (	809	my $self = $class->SUPER::new (
777	bg => [1, 1, 1, 1],	810	bg => [1, 1, 1, 1],
778	border_bg => [1, 1, 1, 1],	811	border_bg => [1, 1, 1, 1],
779	border => 0.8,	812	border => 0.6,
780	can_events => 1,	813	can_events => 1,
781	@_	814	@_
782	);	815	);
783		816
784	$self->{title} &&= new CFClient::UI::Label	817	$self->{title} &&= new CFClient::UI::Label
785	align => 0,	818	align => 0,
786	valign => 1,	819	valign => 1,
787	text => $self->{title},	820	text => $self->{title},
788	fontsize => 1;	821	fontsize => $self->{border};
789		822
790	$self	823	$self
791	}	824	}
792		825
793	sub border {	826	sub border {
…		…
818	}	851	}
819		852
820	sub button_down {	853	sub button_down {
821	my ($self, $ev, $x, $y) = @_;	854	my ($self, $ev, $x, $y) = @_;
822		855
		856	my ($w, $h) = @$self{qw(w h)};
823	my $border = $self->border;	857	my $border = $self->border;
824		858
825	if ($x < $self->{w} && $x >= $self->{w} - $border	859	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
826	&& $y < $self->{h} && $y >= $self->{h} - $border) {	860	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
827		861
		862	if ($lr & $td) {
		863	my ($wx, $wy) = ($self->{x}, $self->{y});
828	my ($ox, $oy) = ($ev->{x}, $ev->{y});	864	my ($ox, $oy) = ($ev->{x}, $ev->{y});
829	my ($bw, $bh) = ($self->{w}, $self->{h});	865	my ($bw, $bh) = ($self->{w}, $self->{h});
830		866
		867	my $mx = $x < $border;
		868	my $my = $y < $border;
		869
831	$self->{motion} = sub {	870	$self->{motion} = sub {
832	my ($ev, $x, $y) = @_;	871	my ($ev, $x, $y) = @_;
833		872
834	($x, $y) = ($ev->{x}, $ev->{y});	873	my $dx = $ev->{x} - $ox;
		874	my $dy = $ev->{y} - $oy;
835		875
836	$self->{user_w} = $bw + $x - $ox;	876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837	$self->{user_h} = $bh + $y - $oy;	877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
838	$self->check_size;	879	$self->check_size;
839	};	880	};
840		881
841	} elsif ($x >= 0 && $x < $self->{w}	882	} elsif ($lr ^ $td) {
842	&& $y >= 0 && $y < $border) {
843
844	my ($ox, $oy) = ($ev->{x}, $ev->{y});	883	my ($ox, $oy) = ($ev->{x}, $ev->{y});
845	my ($bx, $by) = ($self->{x}, $self->{y});	884	my ($bx, $by) = ($self->{x}, $self->{y});
846		885
847	$self->{motion} = sub {	886	$self->{motion} = sub {
848	my ($ev, $x, $y) = @_;	887	my ($ev, $x, $y) = @_;
…		…
871	my ($self) = @_;	910	my ($self) = @_;
872		911
873	my ($w, $h ) = ($self->{w}, $self->{h});	912	my ($w, $h ) = ($self->{w}, $self->{h});
874	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	913	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875		914
876	glEnable GL_BLEND;
877	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878	glEnable GL_TEXTURE_2D;	915	glEnable GL_TEXTURE_2D;
879	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880		917
881	my $border = $self->border;	918	my $border = $self->border;
882		919
883	glColor @{ $self->{border_bg} };	920	glColor @{ $self->{border_bg} };
884	$tex[1]->draw_quad (0, 0, $w, $border);	921	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
885	$tex[3]->draw_quad (0, $border, $border, $ch);	922	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	923	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887	$tex[4]->draw_quad (0, $h - $border, $w, $border);	924	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888		925
		926	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
889	my $bg = $tex[0];	927	my $bg = $tex[0];
890		928
891	# TODO: repeat texture not scale	929	# TODO: repeat texture not scale
892	my $rep_x = $cw / $bg->{w};	930	my $rep_x = $cw / $bg->{w};
893	my $rep_y = $ch / $bg->{h};	931	my $rep_y = $ch / $bg->{h};
894		932
895	glColor @{ $self->{bg} };	933	glColor @{ $self->{bg} };
896		934
897	$bg->{s} = $rep_x;	935	$bg->{s} = $rep_x;
898	$bg->{t} = $rep_y;	936	$bg->{t} = $rep_y;
899	$bg->{wrap_mode} = 1;	937	$bg->{wrap_mode} = 1;
900	$bg->draw_quad ($border, $border, $cw, $ch);	938	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		939	}
901		940
902	glDisable GL_TEXTURE_2D;	941	glDisable GL_TEXTURE_2D;
903	glDisable GL_BLEND;
904		942
905	$self->{title}->draw if $self->{title};	943	$self->{title}->draw if $self->{title};
		944
906	$self->child->draw;	945	$self->child->draw;
907	}	946	}
908		947
909	#############################################################################	948	#############################################################################
910		949
…		…
1134	}	1173	}
1135		1174
1136	sub size_allocate {	1175	sub size_allocate {
1137	my ($self, $w, $h) = @_;	1176	my ($self, $w, $h) = @_;
1138		1177
		1178	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1179
1139	my $children = $self->{children};	1180	my $children = $self->{children};
1140		1181
1141	my @h = map $_->{req_h}, @$children;	1182	my @h = map $_->{req_h}, @$children;
1142		1183
1143	my $req_h = List::Util::sum @h;	1184	my $req_h = List::Util::sum @h;
…		…
1182	my ($class, %arg) = @_;	1223	my ($class, %arg) = @_;
1183		1224
1184	my $self = $class->SUPER::new (	1225	my $self = $class->SUPER::new (
1185	fg => [1, 1, 1],	1226	fg => [1, 1, 1],
1186	#font => default_font	1227	#font => default_font
		1228	#text => initial text
		1229	#markup => initial narkup
		1230	layout => (new CFClient::Layout),
1187	fontsize => 1,	1231	fontsize => 1,
1188	text => "",
1189	align => -1,	1232	align => -1,
1190	valign => -1,	1233	valign => -1,
1191	padding => 2,	1234	padding => 2,
1192	layout => new CFClient::Layout,
1193	can_events => 0,	1235	can_events => 0,
1194	%arg	1236	%arg
1195	);	1237	);
1196		1238
1197	if (exists $self->{template}) {	1239	if (exists $self->{template}) {
1198	my $layout = new CFClient::Layout;	1240	my $layout = new CFClient::Layout;
1199	$layout->set_text (delete $self->{template});	1241	$layout->set_text (delete $self->{template});
1200	$self->{template} = $layout;	1242	$self->{template} = $layout;
1201	}	1243	}
1202		1244
1203	$self->set_text (delete $self->{text}) if exists $self->{text};	1245	if (exists $self->{markup}) {
1204	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1246	$self->set_markup (delete $self->{markup});
		1247	} else {
		1248	$self->set_text (delete $self->{text});
		1249	}
1205		1250
1206	$self	1251	$self
1207	}	1252	}
1208		1253
1209	sub escape {	1254	sub escape {
…		…
1221		1266
1222	delete $self->{texture};	1267	delete $self->{texture};
1223	$self->SUPER::update;	1268	$self->SUPER::update;
1224	}	1269	}
1225		1270
1226	sub reconfigure {
1227	my ($self) = @_;
1228
1229	delete $self->{texture};
1230	}
1231
1232	sub set_text {	1271	sub set_text {
1233	my ($self, $text) = @_;	1272	my ($self, $text) = @_;
1234		1273
1235	return if $self->{text} eq "T$text";	1274	return if $self->{text} eq "T$text";
1236	$self->{text} = "T$text";	1275	$self->{text} = "T$text";
1237		1276
		1277	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238	$self->{layout}->set_text ($text);	1278	$self->{layout}->set_text ($text);
1239		1279
1240	delete $self->{texture};
1241	$self->update;	1280	$self->update;
1242	$self->check_size;	1281	$self->check_size;
1243	}	1282	}
1244		1283
1245	sub set_markup {	1284	sub set_markup {
1246	my ($self, $markup) = @_;	1285	my ($self, $markup) = @_;
1247		1286
1248	return if $self->{text} eq "M$markup";	1287	return if $self->{text} eq "M$markup";
1249	$self->{text} = "M$markup";	1288	$self->{text} = "M$markup";
1250		1289
		1290	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1291
		1292	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251	$self->{layout}->set_markup ($markup);	1293	$self->{layout}->set_markup ($markup);
1252		1294
1253	delete $self->{texture};
1254	$self->update;	1295	$self->update;
1255	$self->check_size;	1296	$self->check_size;
1256	}	1297	}
1257		1298
1258	sub size_request {	1299	sub size_request {
…		…
1289	sub set_fontsize {	1330	sub set_fontsize {
1290	my ($self, $fontsize) = @_;	1331	my ($self, $fontsize) = @_;
1291		1332
1292	$self->{fontsize} = $fontsize;	1333	$self->{fontsize} = $fontsize;
1293	delete $self->{texture};	1334	delete $self->{texture};
		1335
		1336	$self->update;
1294	$self->check_size;	1337	$self->check_size;
1295	$self->update;
1296	}	1338	}
1297		1339
1298	sub _draw {	1340	sub _draw {
1299	my ($self) = @_;	1341	my ($self) = @_;
1300		1342
1301	my $tex = $self->{texture} \|\|= do {	1343	my $tex = $self->{texture} \|\|= do {
		1344	$self->{layout}->set_foreground (@{$self->{fg}});
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1345	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{w});	1346	$self->{layout}->set_width ($self->{w});
1304	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1348
1305	new_from_layout CFClient::Texture $self->{layout}	1349	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1350
		1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1353	: ($self->{w} - $tex->{w}) * 0.5;
		1354
		1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1357	: ($self->{h} - $tex->{h}) * 0.5;
		1358
		1359	$tex
1306	};	1360	};
1307		1361
1308	glEnable GL_BLEND;
1309	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310	glEnable GL_TEXTURE_2D;	1362	glEnable GL_TEXTURE_2D;
1311	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312		1364
		1365	if ($tex->{format} == GL_ALPHA) {
1313	glColor @{$self->{fg}};	1366	glColor @{$self->{fg}};
1314
1315	$self->{ox} = int (
1316	$self->{align} < 0 ? $self->{padding}
1317	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318	: ($self->{w} - $tex->{w}) * 0.5
1319	);
1320
1321	$self->{oy} = int (
1322	$self->{valign} < 0 ? $self->{padding}
1323	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324	: ($self->{h} - $tex->{h}) * 0.5
1325	);
1326
1327	$tex->draw_quad ($self->{ox}, $self->{oy});	1367	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1368	} else {
		1369	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1370	}
1328		1371
1329	glDisable GL_TEXTURE_2D;	1372	glDisable GL_TEXTURE_2D;
1330	glDisable GL_BLEND;
1331	}	1373	}
1332		1374
1333	#############################################################################	1375	#############################################################################
1334		1376
1335	package CFClient::UI::EntryBase;	1377	package CFClient::UI::EntryBase;
…		…
1370	$self->{layout}->set_text ("$text ");	1412	$self->{layout}->set_text ("$text ");
1371		1413
1372	$self->emit (changed => $self->{text});	1414	$self->emit (changed => $self->{text});
1373	}	1415	}
1374		1416
		1417	sub set_text {
		1418	my ($self, $text) = @_;
		1419
		1420	$self->{cursor} = length $text;
		1421	$self->_set_text ($text);
		1422	$self->check_size;
		1423	$self->update;
		1424	}
		1425
1375	sub get_text {	1426	sub get_text {
1376	$_[0]{text}	1427	$_[0]{text}
1377	}	1428	}
1378		1429
1379	sub size_request {	1430	sub size_request {
…		…
1386		1437
1387	sub size_allocate {	1438	sub size_allocate {
1388	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1389		1440
1390	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391	}
1392
1393	sub set_text {
1394	my ($self, $text) = @_;
1395
1396	$self->{cursor} = length $text;
1397	$self->_set_text ($text);
1398	$self->update;
1399	}	1442	}
1400		1443
1401	sub key_down {	1444	sub key_down {
1402	my ($self, $ev) = @_;	1445	my ($self, $ev) = @_;
1403		1446
…		…
1591		1634
1592	if ($GRAB == $self) {	1635	if ($GRAB == $self) {
1593	$self->{fg} = $self->{active_fg};	1636	$self->{fg} = $self->{active_fg};
1594	}	1637	}
1595		1638
1596	glEnable GL_BLEND;
1597	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600	glColor 0, 0, 0, 1;	1641	glColor 0, 0, 0, 1;
1601		1642
1602	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1643	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603		1644
1604	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1605	glDisable GL_BLEND;
1606		1646
1607	$self->SUPER::_draw;	1647	$self->SUPER::_draw;
1608	}	1648	}
1609		1649
1610	#############################################################################	1650	#############################################################################
…		…
1657		1697
1658	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1698	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659		1699
1660	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1700	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661		1701
1662	glEnable GL_BLEND;	1702	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1703
1663	glEnable GL_TEXTURE_2D;	1704	glEnable GL_TEXTURE_2D;
1664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666	my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668	$tex->draw_quad (0, 0, $s, $s);	1705	$tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670	glDisable GL_TEXTURE_2D;	1706	glDisable GL_TEXTURE_2D;
1671	glDisable GL_BLEND;
1672	}	1707	}
1673		1708
1674	#############################################################################	1709	#############################################################################
1675		1710
1676	package CFClient::UI::Image;	1711	package CFClient::UI::Image;
…		…
1719	glTranslate 0, -$self->{w}, 0;	1754	glTranslate 0, -$self->{w}, 0;
1720		1755
1721	($w, $h) = ($h, $w);	1756	($w, $h) = ($h, $w);
1722	}	1757	}
1723		1758
1724	glEnable GL_BLEND;
1725	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1727	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728		1761
1729	$tex->draw_quad (0, 0, $w, $h);	1762	$tex->draw_quad_alpha (0, 0, $w, $h);
1730		1763
1731	glDisable GL_BLEND;
1732	glDisable GL_TEXTURE_2D;	1764	glDisable GL_TEXTURE_2D;
1733	}	1765	}
1734		1766
1735	#############################################################################	1767	#############################################################################
1736		1768
…		…
1934	# TODO: calculations are off	1966	# TODO: calculations are off
1935	my $self = $class->SUPER::new (	1967	my $self = $class->SUPER::new (
1936	fg => [1, 1, 1],	1968	fg => [1, 1, 1],
1937	active_fg => [0, 0, 0],	1969	active_fg => [0, 0, 0],
1938	range => [0, 0, 100, 10],	1970	range => [0, 0, 100, 10],
1939	req_w => 20,	1971	req_w => $::WIDTH / 80,
1940	req_h => 20,	1972	req_h => $::WIDTH / 80,
1941	vertical => 0,	1973	vertical => 0,
1942	can_hover => 1,	1974	can_hover => 1,
1943	inner_pad => 5,	1975	inner_pad => 5,
1944	@_	1976	@_
1945	);	1977	);
…		…
2028	$page \|\|= 2;	2060	$page \|\|= 2;
2029		2061
2030	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032		2064
2033	glEnable GL_BLEND;
2034	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035	glEnable GL_TEXTURE_2D;	2065	glEnable GL_TEXTURE_2D;
2036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037		2067
2038	# draw background	2068	# draw background
2039	$tex[1]->draw_quad (0, 0, $w, $h);	2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2040		2070
2041	# draw handle	2071	# draw handle
2042	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2043		2073
2044	glDisable GL_BLEND;
2045	glDisable GL_TEXTURE_2D;	2074	glDisable GL_TEXTURE_2D;
2046	}	2075	}
2047		2076
2048	#############################################################################	2077	#############################################################################
2049		2078
…		…
2060	fontsize => 1,	2089	fontsize => 1,
2061	can_events => 0,	2090	can_events => 0,
2062	#font => default_font	2091	#font => default_font
2063	@_,	2092	@_,
2064		2093
2065	layout => (new CFClient::Layout),	2094	layout => (new CFClient::Layout 1),
2066	par => [],	2095	par => [],
2067	height => 0,	2096	height => 0,
2068	children => [	2097	children => [
2069	(new CFClient::UI::Empty expand => 1),	2098	(new CFClient::UI::Empty expand => 1),
2070	(new CFClient::UI::Slider vertical => 1),	2099	(new CFClient::UI::Slider vertical => 1),
2071	],	2100	],
2072	);	2101	);
2073		2102
2074	$self->{children}[1]->connect (changed => sub {	2103	$self->{children}[1]->connect (changed => sub { $self->update });
2075	$self->update;
2076	});
2077		2104
2078	$self	2105	$self
2079	}	2106	}
2080		2107
2081	sub set_fontsize {	2108	sub set_fontsize {
…		…
2089	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
2090		2117
2091	my $layout = $self->{layout};	2118	my $layout = $self->{layout};
2092		2119
2093	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094	$layout->set_width ($self->{w});	2121	$layout->set_width ($self->{children}[0]{w});
2095	$layout->set_text ($text);	2122	$layout->set_markup ($text);
2096		2123
2097	($layout->size)[1]	2124	($layout->size)[1]
2098	}	2125	}
2099		2126
2100	sub reflow {	2127	sub reflow {
…		…
2152	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153		2180
2154	delete $self->{texture};	2181	delete $self->{texture};
2155	}	2182	}
2156		2183
2157	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2184	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158	glClearColor 0, 0, 0, 1;	2185	glClearColor 0, 0, 0, 0;
2159	glClear GL_COLOR_BUFFER_BIT;	2186	glClear GL_COLOR_BUFFER_BIT;
2160		2187
2161	glEnable GL_BLEND;
2162	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163	glEnable GL_TEXTURE_2D;	2188	glEnable GL_TEXTURE_2D;
2164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165		2190
2166	my $top = int $self->{children}[1]{range}[0];	2191	my $top = int $self->{children}[1]{range}[0];
2167		2192
…		…
2176		2201
2177	for my $par (@{$self->{par}}) {	2202	for my $par (@{$self->{par}}) {
2178	my $h = $par->[0];	2203	my $h = $par->[0];
2179		2204
2180	if ($y0 < $y + $h && $y < $y1) {	2205	if ($y0 < $y + $h && $y < $y1) {
		2206	$layout->set_foreground (@{ $par->[1] });
2181	$layout->set_text ($par->[2]);	2207	$layout->set_markup ($par->[2]);
2182		2208
2183	glColor @{ $par->[1] };
2184	my ($W, $H) = $layout->size;	2209	my ($W, $H) = $layout->size;
2185	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2186	}	2211	}
2187		2212
2188	$y += $h;	2213	$y += $h;
2189	}	2214	}
2190		2215
2191	glDisable GL_TEXTURE_2D;	2216	glDisable GL_TEXTURE_2D;
2192	glDisable GL_BLEND;
2193	};	2217	};
2194	});	2218	});
2195	}	2219	}
2196		2220
2197	sub _draw {	2221	sub _draw {
2198	my ($self) = @_;	2222	my ($self) = @_;
2199		2223
2200	if ($self->{texture}) {
2201	glEnable GL_TEXTURE_2D;	2224	glEnable GL_TEXTURE_2D;
2202	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203	glColor 1, 1, 1, 1;	2226	glColor 1, 1, 1, 1;
2204	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205	glDisable GL_TEXTURE_2D;	2228	glDisable GL_TEXTURE_2D;
2206	}
2207		2229
2208	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
2209		2231
2210	}	2232	}
2211		2233
…		…
2305	@_,	2327	@_,
2306	can_events => 0,	2328	can_events => 0,
2307	)	2329	)
2308	}	2330	}
2309		2331
2310	sub set_markup {	2332	sub set_tooltip_from {
2311	my ($self, $text) = @_;	2333	my ($self, $widget) = @_;
2312		2334
2313	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2335	$self->add (new CFClient::UI::Label
2314	$self->{label}->set_markup ($text);	2336	markup => $widget->{tooltip},
2315	$self->add ($self->{label});	2337	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2338	fontsize => 0.8,
		2339	fg => [0, 0, 0, 1],
		2340	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
		2341	);
2316	}	2342	}
2317		2343
2318	sub size_request {	2344	sub size_request {
2319	my ($self) = @_;	2345	my ($self) = @_;
2320
2321	$self->child->set_max_size ($::WIDTH * 0.3);
2322		2346
2323	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2347	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324		2348
2325	($w + 4, $h + 4)	2349	($w + 4, $h + 4)
2326	}	2350	}
…		…
2332	}	2356	}
2333		2357
2334	sub _draw {	2358	sub _draw {
2335	my ($self) = @_;	2359	my ($self) = @_;
2336		2360
2337	glPushMatrix;
2338	glTranslate 0.375, 0.375;	2361	glTranslate 0.375, 0.375;
2339		2362
2340	my ($w, $h) = @$self{qw(w h)};	2363	my ($w, $h) = @$self{qw(w h)};
2341		2364
2342	glColor 1, 0.8, 0.4;	2365	glColor 1, 0.8, 0.4;
…		…
2353	glVertex 0 , $h;	2376	glVertex 0 , $h;
2354	glVertex $w, $h;	2377	glVertex $w, $h;
2355	glVertex $w, 0;	2378	glVertex $w, 0;
2356	glEnd;	2379	glEnd;
2357		2380
2358	glPopMatrix;	2381	glTranslate 2 - 0.375, 2 - 0.375;
2359
2360	glTranslate 2, 2;
2361	$self->SUPER::_draw;	2382	$self->SUPER::_draw;
2362	}	2383	}
2363		2384
2364	#############################################################################	2385	#############################################################################
2365		2386
…		…
2380		2401
2381	sub size_request {	2402	sub size_request {
2382	(32, 8)	2403	(32, 8)
2383	}	2404	}
2384		2405
2385	sub draw {	2406	sub _draw {
2386	my ($self) = @_;	2407	my ($self) = @_;
2387		2408
		2409	return unless $::CONN;#d# manage and cache textures differently
2388	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389		2411
		2412	# TODO animation
2390	if ($tex) {	2413	if ($tex) {
2391	glEnable GL_BLEND;
2392	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393	glEnable GL_TEXTURE_2D;	2414	glEnable GL_TEXTURE_2D;
2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395	glColor 1, 1, 1, 1;	2416	glColor 1, 1, 1, 1;
2396	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397	glDisable GL_TEXTURE_2D;	2418	glDisable GL_TEXTURE_2D;
2398	glDisable GL_BLEND;
2399	}	2419	}
		2420	}
		2421
		2422	#############################################################################
		2423
		2424	package CFClient::UI::InventoryItem;
		2425
		2426	our @ISA = CFClient::UI::HBox::;
		2427
		2428	sub new {
		2429	my $class = shift;
		2430
		2431	my %args = @_;
		2432
		2433	my $item = delete $args{item};
		2434
		2435	my $desc = $item->{nrof} < 2
		2436	? $item->{name}
		2437	: "$item->{nrof} $item->{name_pl}";
		2438
		2439
		2440	my $self = $class->SUPER::new (
		2441	can_hover => 1,
		2442	can_events => 1,
		2443	tooltip => (CFClient::UI::Label->escape ($desc)
		2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2445	connect_button_down => sub {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	# todo: maybe put examine on 1? but should just be a tooltip :(
		2449	if ($ev->{button} == 1) {
		2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2451	} elsif ($ev->{button} == 2) {
		2452	$::CONN->send ("apply $item->{tag}");
		2453	} elsif ($ev->{button} == 3) {
		2454	CFClient::UI::Menu->new (
		2455	items => [
		2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2457	[
		2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2459	sub { $::CONN->send ("lock $item->{tag}") },
		2460	],
		2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2464	],
		2465	)->popup ($ev);
		2466	}
		2467
		2468	1
		2469	},
		2470	%args
		2471	);
		2472
		2473	$self->add (new CFClient::UI::Face
		2474	can_events => 0,
		2475	face => $item->{face},
		2476	anim => $item->{anim},
		2477	animspeed => $item->{animspeed},
		2478	);
		2479
		2480	$self->add (new CFClient::UI::Label
		2481	can_events => 0,
		2482	text => $desc,
		2483	);
		2484
		2485	$self
		2486	}
		2487
		2488	#############################################################################
		2489
		2490	package CFClient::UI::Inventory;
		2491
		2492	our @ISA = CFClient::UI::ScrolledWindow::;
		2493
		2494	sub new {
		2495	my $class = shift;
		2496
		2497	my $self = $class->SUPER::new (
		2498	scrolled => (new CFClient::UI::VBox),
		2499	@_,
		2500	);
		2501
		2502	$self
		2503	}
		2504
		2505	sub set_items {
		2506	my ($self, $items) = @_;
		2507
		2508	$self->{scrolled}->clear;
		2509	return unless $items;
		2510
		2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2512
		2513	$self->{real_items} = \@items;
		2514
		2515	for my $item (@items) {
		2516	my $desc = $item->{nrof} < 2
		2517	? $item->{name}
		2518	: "$item->{nrof} $item->{name_pl}";
		2519
		2520	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
		2521	}
		2522
		2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2524	}
		2525
		2526	sub size_request {
		2527	my ($self) = @_;
		2528	($self->{req_w}, $self->{req_h});
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Menu;
		2534
		2535	our @ISA = CFClient::UI::FancyFrame::;
		2536
		2537	use CFClient::OpenGL;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	items => [],
		2544	z => 100,
		2545	@_,
		2546	);
		2547
		2548	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2549
		2550	for my $item (@{ $self->{items} }) {
		2551	my ($widget, $cb) = @$item;
		2552
		2553	# handle various types of items, only text for now
		2554	if (!ref $widget) {
		2555	$widget = new CFClient::UI::Label
		2556	can_hover => 1,
		2557	can_events => 1,
		2558	text => $widget;
		2559	}
		2560
		2561	$self->{item}{$widget} = $item;
		2562
		2563	$self->{vbox}->add ($widget);
		2564	}
		2565
		2566	$self
		2567	}
		2568
		2569	# popup given the event (must be a mouse button down event currently)
		2570	sub popup {
		2571	my ($self, $ev) = @_;
		2572
		2573	$self->emit ("popdown");
		2574
		2575	# maybe save $GRAB? must be careful about events...
		2576	$GRAB = $self;
		2577	$self->{button} = $ev->{button};
		2578
		2579	$self->show;
		2580	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2581	}
		2582
		2583	sub mouse_motion {
		2584	my ($self, $ev, $x, $y) = @_;
		2585
		2586	# TODO: should use vbox->find_widget or so
		2587	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2588	$self->{hover} = $self->{item}{$HOVER};
		2589	}
		2590
		2591	sub button_up {
		2592	my ($self, $ev, $x, $y) = @_;
		2593
		2594	if ($ev->{button} == $self->{button}) {
		2595	undef $GRAB;
		2596	$self->hide;
		2597
		2598	$self->emit ("popdown");
		2599	$self->{hover}[1]->() if $self->{hover};
		2600	}
		2601	}
		2602
		2603	#############################################################################
		2604
		2605	package CFClient::UI::Statusbox;
		2606
		2607	our @ISA = CFClient::UI::VBox::;
		2608
		2609	sub reorder {
		2610	my ($self) = @_;
		2611	my $NOW = time;
		2612
		2613	while (my ($k, $v) = each %{ $self->{item} }) {
		2614	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2615	}
		2616
		2617	my @widgets;
		2618
		2619	my @items = sort {
		2620	$a->{pri} <=> $b->{pri}
		2621	or $b->{id} <=> $a->{id}
		2622	} values %{ $self->{item} };
		2623
		2624	my $count = 10 + 1;
		2625	for my $item (@items) {
		2626	last unless --$count;
		2627
		2628	push @widgets, $item->{label} \|\|= do {
		2629	# TODO: doesn't handle markup well (read as: at all)
		2630	my $short = $item->{count} > 1
		2631	? "<b>$item->{count} ×</b> $item->{text}"
		2632	: $item->{text};
		2633
		2634	for ($short) {
		2635	s/^\s+//;
		2636	s/\012.*/…/s;
		2637	my $len = int 30 / $item->{fontsize};
		2638	substr $_, $len, length, "…" if $len < length;
		2639	}
		2640
		2641	new CFClient::UI::Label
		2642	markup => $short,
		2643	tooltip => $item->{tooltip},
		2644	tooltip_font => $::FONT_PROP,
		2645	tooltip_width => 0.67,
		2646	fontsize => $item->{fontsize},
		2647	color => $item->{color},
		2648	can_events => 1,
		2649	can_hover => 1
		2650	};
		2651	}
		2652
		2653	$self->clear;
		2654	$self->SUPER::add (reverse @widgets);
		2655	}
		2656
		2657	sub add {
		2658	my ($self, $text, %arg) = @_;
		2659
		2660	my $timeout = time + ((delete $arg{timeout}) \|\| 60);
		2661
		2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2663
		2664	if (my $item = $self->{item}{$group}) {
		2665	if ($item->{text} eq $text) {
		2666	$item->{count}++;
		2667	} else {
		2668	$item->{count} = 1;
		2669	$item->{text} = $item->{tooltip} = $text;
		2670	}
		2671	$item->{timeout} = $timeout;
		2672	delete $item->{label};
		2673	} else {
		2674	$self->{item}{$group} = {
		2675	id => ++$self->{id},
		2676	text => $text,
		2677	timeout => $timeout,
		2678	tooltip => $text,
		2679	fontsize => 0.8,
		2680	color => [0.8, 0.8, 0.8, 0.8],
		2681	pri => 0,
		2682	count => 1,
		2683	%arg,
		2684	};
		2685	}
		2686
		2687	$self->reorder;
2400	}	2688	}
2401		2689
2402	#############################################################################	2690	#############################################################################
2403		2691
2404	package CFClient::UI::Root;	2692	package CFClient::UI::Root;
2405		2693
2406	our @ISA = CFClient::UI::Container::;	2694	our @ISA = CFClient::UI::Container::;
2407		2695
2408	use CFClient::OpenGL;	2696	use CFClient::OpenGL;
2409		2697
2410	sub check_size {	2698	sub new {
2411	my ($self) = @_;	2699	my $class = shift;
2412		2700
2413	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2701	$class->SUPER::new (
2414	}	2702	@_,
2415		2703	)
2416	sub size_request {
2417	($::WIDTH, $::HEIGHT)
2418	}	2704	}
2419		2705
2420	sub configure {	2706	sub configure {
2421	my ($self, $x, $y, $w, $h) = @_;	2707	my ($self, $x, $y, $w, $h) = @_;
2422		2708
2423	$self->SUPER::configure ($x, $y, $w, $h);	2709	$self->{w} = $w;
		2710	$self->{h} = $h;
		2711	}
2424		2712
		2713	sub check_size {
		2714	my ($self) = @_;
		2715
		2716	$self->size_allocate ($self->{w}, $self->{h})
		2717	if $self->{w};
		2718	}
		2719
		2720	sub size_request {
		2721	my ($self) = @_;
		2722
		2723	($self->{w}, $self->{h})
		2724	}
		2725
		2726	sub size_allocate {
		2727	my ($self, $w, $h) = @_;
		2728
		2729	my $old_w = $self->{old_w};
		2730	my $old_h = $self->{old_h};
		2731
		2732	if ($old_w && $old_h) {
		2733	for my $child ($self->children) {
		2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2742	}
		2743	}
		2744
2425	for my $child (@{$self->{children}}) {	2745	for my $child ($self->children) {
2426	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427		2747
2428	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2429	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430	$child->configure ($X, $Y, $W,$H);	2750	$child->configure ($X, $Y, $W, $H);
2431	}	2751	}
2432	}
2433		2752
2434	sub _topleft {	2753	$self->{old_w} = $w;
		2754	$self->{old_h} = $h;
		2755	}
		2756
		2757	sub coord2local {
2435	my ($self, $x, $y) = @_;	2758	my ($self, $x, $y) = @_;
2436		2759
2437	($x, $y)	2760	($x, $y)
2438	}	2761	}
2439		2762
		2763	sub coord2global {
		2764	my ($self, $x, $y) = @_;
		2765
		2766	($x, $y)
		2767	}
		2768
2440	sub update {	2769	sub update {
2441	my ($self) = @_;	2770	my ($self) = @_;
2442		2771
2443	$self->check_size;	2772	$self->check_size;
2444	::refresh ();	2773	$::WANT_REFRESH++;
2445	}	2774	}
2446		2775
2447	sub add {	2776	sub add {
2448	my ($self, $child) = @_;	2777	my ($self, $child) = @_;
2449		2778
2450	# integerize window positions	2779	# integerise window positions
2451	$child->{x} = int $child->{x};	2780	$child->{x} = int $child->{x};
2452	$child->{y} = int $child->{y};	2781	$child->{y} = int $child->{y};
2453		2782
2454	$self->SUPER::add ($child);	2783	$self->SUPER::add ($child);
2455	}	2784	}
…		…
2458	my ($self, $id, $cb) = @_;	2787	my ($self, $id, $cb) = @_;
2459		2788
2460	$self->{refresh_hook}{$id} = $cb;	2789	$self->{refresh_hook}{$id} = $cb;
2461	}	2790	}
2462		2791
2463	sub draw {	2792	sub draw {
2464	my ($self) = @_;	2793	my ($self) = @_;
2465		2794
		2795	if ($self->{check_size}) {
		2796	my @queue = ([], []);
		2797
		2798	for (;;) {
		2799	if ($self->{check_size}) {
		2800	# heuristic: check containers last
		2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2802	for values %{delete $self->{check_size}}
		2803	}
		2804
		2805	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2806
		2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2808	? @$widget{qw(user_w user_h)}
		2809	: $widget->size_request;
		2810
		2811	if (delete $widget->{force_alloc}
		2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2813	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2814
		2815	$widget->{req_w} = $w;
		2816	$widget->{req_h} = $h;
		2817
		2818	$self->{size_alloc}{$widget} = [$widget, $widget->{w} \|\| $w, $widget->{h} \|\| $h];
		2819
		2820	$widget->{parent}->check_size
		2821	if $widget->{parent};
		2822	}
		2823	}
		2824	}
		2825
		2826	while ($self->{size_alloc}) {
		2827	for (values %{delete $self->{size_alloc}}) {
		2828	my ($widget, $w, $h) = @$_;
		2829
		2830	$w = 0 if $w < 0;
		2831	$h = 0 if $h < 0;
		2832
		2833	$widget->{w} = $w;
		2834	$widget->{h} = $h;
		2835	$widget->size_allocate ($w, $h);
		2836	$widget->emit (size_allocate => $w, $h);
		2837	}
		2838	}
		2839
2466	while (my $rcb = delete $self->{refresh_hook}) {	2840	while ($self->{refresh_hook}) {
2467	$_->() for values %$rcb;	2841	$_->()
		2842	for values %{delete $self->{refresh_hook}};
2468	}	2843	}
2469		2844
2470	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472	glClear GL_COLOR_BUFFER_BIT;	2847	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs. Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC