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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

…		…
24	my $tip = $widget->{tooltip};	24	my $tip = $widget->{tooltip};
25		25
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	26	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		27
28	$TOOLTIP->set_markup ($widget->{tooltip});	28	$TOOLTIP->set_markup ($widget->{tooltip});
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));	29
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);
31	}	39	}
32		40
33	return;	41	return;
34	}	42	}
35	}	43	}
…		…
224	$self->{y} = $y;	232	$self->{y} = $y;
225	$self->update;	233	$self->update;
226	}	234	}
227		235
228	if ($self->{w} != $w \|\| $self->{h} != $h) {	236	if ($self->{w} != $w \|\| $self->{h} != $h) {
229	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	238	}
235	}	239	}
236		240
237	sub size_allocate {	241	sub size_allocate {
238	# nothing to be done	242	# nothing to be done
239	}	243	}
240		244
241	sub children {	245	sub children {
242	}	246	}
243		247
		248	# call when resolution changes etc.
		249	sub reconfigure {
		250	my ($self) = @_;
		251
		252	$_->reconfigure
		253	for $self->children;
		254
		255	$self->check_size;
		256	$self->size_allocate ($self->{w}, $self->{h});
		257	$self->update;
		258	}
		259
244	sub set_max_size {	260	sub set_max_size {
245	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
246		262
247	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
248	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
249	}
250
251	# return top left coordinates
252	sub _topleft {
253	my ($self, $x, $y) = @_;
254
255	$self->{parent}
256	or Carp::confess "no parent widget in _topleft\n";#d#
257
258	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
259	}	265	}
260		266
261	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
262	sub coord2local {	268	sub coord2local {
263	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
264		270
265	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266	($x - $X, $y - $Y)
267	}	272	}
268		273
269	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
270	sub coord2global {	275	sub coord2global {
271	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
272		277
273	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274	($x + $X, $y + $Y)
275	}	279	}
276		280
277	sub focus_in {	281	sub focus_in {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
376	}	380	}
377		381
378	sub set_parent {	382	sub set_parent {
379	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
380		384
		385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
381	Scalar::Util::weaken ($self->{parent} = $parent);	386	Scalar::Util::weaken ($self->{parent} = $parent);
382	}	387	}
383		388
384	sub check_size {	389	sub check_size {
385	my ($self) = @_;	390	my ($self) = @_;
386		391
387	$self->{parent}	392	$CFClient::UI::ROOT->{check_size}{$self} = $self;
388	or return 1;
389
390	my ($w, $h) = $self->{user_w} && $self->{user_h}
391	? @$self{qw(user_w user_h)}
392	: $self->size_request;
393
394	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
395	$self->{req_w} = $w;
396	$self->{req_h} = $h;
397
398	$self->{parent}->check_size
399	or $self->size_allocate (
400	(List::Util::max $self->{w}, $w),
401	(List::Util::max $self->{h}, $h),
402	);
403
404	1
405	} else {
406	0
407	}
408	}	393	}
409		394
410	sub update {	395	sub update {
411	my ($self) = @_;	396	my ($self) = @_;
412		397
…		…
509		494
510	$self	495	$self
511	}	496	}
512		497
513	sub add {	498	sub add {
514	my ($self, $child) = @_;	499	my ($self, @widgets) = @_;
515		500
516	$child->set_parent ($self);	501	$_->set_parent ($self)
		502	for @widgets;
517		503
518	use sort 'stable';	504	use sort 'stable';
519		505
520	$self->{children} = [	506	$self->{children} = [
521	sort { $a->{z} <=> $b->{z} }	507	sort { $a->{z} <=> $b->{z} }
522	@{$self->{children}}, $child	508	@{$self->{children}}, @widgets
523	];	509	];
524		510
525	$child->check_size;	511	$_->check_size
		512	for @widgets;
		513
		514	$self->update;
526	}	515	}
527		516
528	sub children {	517	sub children {
529	@{ $_[0]{children} }	518	@{ $_[0]{children} }
530	}	519	}
…		…
549		538
550	for (@$children) {	539	for (@$children) {
551	delete $_->{parent};	540	delete $_->{parent};
552	$_->hide;	541	$_->hide;
553	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
554	}	546	}
555		547
556	sub find_widget {	548	sub find_widget {
557	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
558		550
…		…
633	}	625	}
634		626
635	sub update {	627	sub update {
636	my ($self) = @_;	628	my ($self) = @_;
637		629
638	# we want to do this delayed...	630	$ROOT->on_refresh ($self => sub { $self->render_child });
639	$self->render_chld;
640	$self->SUPER::update;	631	$self->SUPER::update;
641	}
642
643	sub render_chld {
644	my ($self) = @_;
645
646	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647	glClearColor 0, 0, 0, 1;
648	glClear GL_COLOR_BUFFER_BIT;
649	$self->child->draw;
650	};
651	}	632	}
652		633
653	sub size_allocate {	634	sub size_allocate {
654	my ($self, $w, $h) = @_;	635	my ($self, $w, $h) = @_;
655		636
656	$self->child->configure (0, 0, $w, $h);	637	$self->SUPER::size_allocate ($w, $h);
		638	$self->update;
		639	}
657		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
		645	sub render_child {
		646	my ($self) = @_;
		647
		648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		649	glClearColor 0, 0, 0, 0;
		650	glClear GL_COLOR_BUFFER_BIT;
		651
658	$self->render_chld;	652	$self->_render;
		653	# glColorMask 1, 1, 1, 0;
		654	# glEnable GL_BLEND;
		655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		656	# glRasterPos 0, 0;
		657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		658	# glDisable GL_BLEND;
		659	# glColorMask 1, 1, 1, 1;
		660	};
659	}	661	}
660		662
661	sub _draw {	663	sub _draw {
662	my ($self) = @_;	664	my ($self) = @_;
663		665
…		…
665		667
666	my $tex = $self->{texture}	668	my $tex = $self->{texture}
667	or return;	669	or return;
668		670
669	glEnable GL_BLEND;	671	glEnable GL_BLEND;
670	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
671	glEnable GL_TEXTURE_2D;	673	glEnable GL_TEXTURE_2D;
672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		675	glColor 0, 0, 0, 1;
673		676
674	$tex->draw_quad (0, 0, $w, $h);	677	$tex->draw_quad (0, 0, $w, $h);
675		678
676	glDisable GL_BLEND;	679	glDisable GL_BLEND;
677	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
…		…
681		684
682	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
683		686
684	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
685		688
686	sub new { die }
687
688	sub size_request {	689	sub size_request {
689	my ($self) = @_;	690	my ($self) = @_;
690		691
691	@$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)};
692	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
693		694
694	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
695	}	696	}
696		697
697	sub _draw {	698	sub size_allocate {
698	my ($self) = @_;	699	my ($self, $w, $h) = @_;
699		700
700	$self->{children}[1]->draw;	701	$self->update;
701	}	702	}
702		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
		706
		707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
		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
		751	package CFClient::UI::ScrolledWindow;
		752
		753	our @ISA = CFClient::UI::HBox::;
		754
		755	sub new {
		756	my $class = shift;
		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
		768	$self = $class->SUPER::new (
		769	vp => (new CFClient::UI::ViewPort),
		770	slider => $slider,
		771	@_,
		772	);
		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
		778	$self
		779	}
		780
		781	#TODO# update range on size_allocate depeneing on child
		782	# update viewport offset on scroll
703		783
704	#############################################################################	784	#############################################################################
705		785
706	package CFClient::UI::Frame;	786	package CFClient::UI::Frame;
707		787
…		…
764	# TODO: user_x, user_y, overwrite moveto?	844	# TODO: user_x, user_y, overwrite moveto?
765		845
766	my $self = $class->SUPER::new (	846	my $self = $class->SUPER::new (
767	bg => [1, 1, 1, 1],	847	bg => [1, 1, 1, 1],
768	border_bg => [1, 1, 1, 1],	848	border_bg => [1, 1, 1, 1],
769	border => 0.8,	849	border => 0.6,
770	can_events => 1,	850	can_events => 1,
771	@_	851	@_
772	);	852	);
773		853
774	$self->{title} &&= new CFClient::UI::Label	854	$self->{title} &&= new CFClient::UI::Label
775	align => 0,	855	align => 0,
776	valign => 1,	856	valign => 1,
777	text => $self->{title},	857	text => $self->{title},
778	fontsize => 1;	858	fontsize => $self->{border};
779		859
780	$self	860	$self
781	}	861	}
782		862
783	sub border {	863	sub border {
…		…
808	}	888	}
809		889
810	sub button_down {	890	sub button_down {
811	my ($self, $ev, $x, $y) = @_;	891	my ($self, $ev, $x, $y) = @_;
812		892
		893	my ($w, $h) = @$self{qw(w h)};
813	my $border = $self->border;	894	my $border = $self->border;
814		895
815	if ($x < $self->{w} && $x >= $self->{w} - $border	896	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
816	&& $y < $self->{h} && $y >= $self->{h} - $border) {	897	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
817		898
		899	if ($lr & $td) {
		900	my ($wx, $wy) = ($self->{x}, $self->{y});
818	my ($ox, $oy) = ($ev->{x}, $ev->{y});	901	my ($ox, $oy) = ($ev->{x}, $ev->{y});
819	my ($bw, $bh) = ($self->{w}, $self->{h});	902	my ($bw, $bh) = ($self->{w}, $self->{h});
820		903
		904	my $mx = $x < $border;
		905	my $my = $y < $border;
		906
821	$self->{motion} = sub {	907	$self->{motion} = sub {
822	my ($ev, $x, $y) = @_;	908	my ($ev, $x, $y) = @_;
823		909
824	($x, $y) = ($ev->{x}, $ev->{y});	910	my $dx = $ev->{x} - $ox;
		911	my $dy = $ev->{y} - $oy;
825		912
826	$self->{user_w} = $bw + $x - $ox;	913	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827	$self->{user_h} = $bh + $y - $oy;	914	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		915	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
828	$self->check_size;	916	$self->check_size;
829	};	917	};
830		918
831	} elsif ($x >= 0 && $x < $self->{w}	919	} elsif ($lr ^ $td) {
832	&& $y >= 0 && $y < $border) {
833
834	my ($ox, $oy) = ($ev->{x}, $ev->{y});	920	my ($ox, $oy) = ($ev->{x}, $ev->{y});
835	my ($bx, $by) = ($self->{x}, $self->{y});	921	my ($bx, $by) = ($self->{x}, $self->{y});
836		922
837	$self->{motion} = sub {	923	$self->{motion} = sub {
838	my ($ev, $x, $y) = @_;	924	my ($ev, $x, $y) = @_;
…		…
874	$tex[1]->draw_quad (0, 0, $w, $border);	960	$tex[1]->draw_quad (0, 0, $w, $border);
875	$tex[3]->draw_quad (0, $border, $border, $ch);	961	$tex[3]->draw_quad (0, $border, $border, $ch);
876	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
877	$tex[4]->draw_quad (0, $h - $border, $w, $border);	963	$tex[4]->draw_quad (0, $h - $border, $w, $border);
878		964
		965	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
879	my $bg = $tex[0];	966	my $bg = $tex[0];
880		967
881	# TODO: repeat texture not scale	968	# TODO: repeat texture not scale
882	my $rep_x = $cw / $bg->{w};	969	my $rep_x = $cw / $bg->{w};
883	my $rep_y = $ch / $bg->{h};	970	my $rep_y = $ch / $bg->{h};
884		971
885	glColor @{ $self->{bg} };	972	glColor @{ $self->{bg} };
886		973
887	$bg->{s} = $rep_x;	974	$bg->{s} = $rep_x;
888	$bg->{t} = $rep_y;	975	$bg->{t} = $rep_y;
889	$bg->{wrap_mode} = 1;	976	$bg->{wrap_mode} = 1;
890	$bg->draw_quad ($border, $border, $cw, $ch);	977	$bg->draw_quad ($border, $border, $cw, $ch);
891		978
892	glDisable GL_TEXTURE_2D;	979	glDisable GL_TEXTURE_2D;
893	glDisable GL_BLEND;	980	glDisable GL_BLEND;
		981	}
894		982
895	$self->{title}->draw if $self->{title};	983	$self->{title}->draw if $self->{title};
		984
896	$self->child->draw;	985	$self->child->draw;
897	}	986	}
898		987
899	#############################################################################	988	#############################################################################
900		989
…		…
1204	s/</</g;	1293	s/</</g;
1205		1294
1206	$_[1]	1295	$_[1]
1207	}	1296	}
1208		1297
		1298	sub update {
		1299	my ($self) = @_;
		1300
		1301	delete $self->{texture};
		1302	$self->SUPER::update;
		1303	}
		1304
1209	sub set_text {	1305	sub set_text {
1210	my ($self, $text) = @_;	1306	my ($self, $text) = @_;
1211		1307
		1308	return if $self->{text} eq "T$text";
		1309	$self->{text} = "T$text";
		1310
1212	$self->{layout}->set_text ($text);	1311	$self->{layout}->set_text ($text);
1213		1312
1214	delete $self->{texture};	1313	$self->update;
1215	$self->check_size;	1314	$self->check_size;
1216	$self->update;
1217	}	1315	}
1218		1316
1219	sub set_markup {	1317	sub set_markup {
1220	my ($self, $markup) = @_;	1318	my ($self, $markup) = @_;
1221		1319
		1320	return if $self->{text} eq "M$markup";
		1321	$self->{text} = "M$markup";
		1322
1222	$self->{layout}->set_markup ($markup);	1323	$self->{layout}->set_markup ($markup);
1223		1324
1224	delete $self->{texture};	1325	$self->update;
1225	$self->check_size;	1326	$self->check_size;
1226	$self->update;
1227	}	1327	}
1228		1328
1229	sub size_request {	1329	sub size_request {
1230	my ($self) = @_;	1330	my ($self) = @_;
1231		1331
…		…
1260	sub set_fontsize {	1360	sub set_fontsize {
1261	my ($self, $fontsize) = @_;	1361	my ($self, $fontsize) = @_;
1262		1362
1263	$self->{fontsize} = $fontsize;	1363	$self->{fontsize} = $fontsize;
1264	delete $self->{texture};	1364	delete $self->{texture};
		1365
		1366	$self->update;
1265	$self->check_size;	1367	$self->check_size;
1266	$self->update;
1267	}	1368	}
1268		1369
1269	sub _draw {	1370	sub _draw {
1270	my ($self) = @_;	1371	my ($self) = @_;
1271		1372
…		…
1755	}	1856	}
1756		1857
1757	sub set_max {	1858	sub set_max {
1758	my ($self, $max) = @_;	1859	my ($self, $max) = @_;
1759		1860
		1861	return if $self->{max_val} == $max;
		1862
1760	$self->{max_val} = $max;	1863	$self->{max_val} = $max;
		1864	$self->update;
1761	}	1865	}
1762		1866
1763	sub set_value {	1867	sub set_value {
1764	my ($self, $val, $max) = @_;	1868	my ($self, $val, $max) = @_;
1765		1869
1766	$self->set_max ($max)	1870	$self->set_max ($max)
1767	if defined $max;	1871	if defined $max;
1768		1872
1769	$max = $self->{max_val};	1873	return if $self->{val} == $val;
		1874
1770	$self->{val} = $val;	1875	$self->{val} = $val;
1771
1772	$self->update;	1876	$self->update;
1773	}	1877	}
1774		1878
1775	sub _draw {	1879	sub _draw {
1776	my ($self) = @_;	1880	my ($self) = @_;
…		…
1859		1963
1860	$self->{value}->set_fontsize ($fsize);	1964	$self->{value}->set_fontsize ($fsize);
1861	$self->{max} ->set_fontsize ($fsize);	1965	$self->{max} ->set_fontsize ($fsize);
1862	}	1966	}
1863		1967
		1968	sub set_max {
		1969	my ($self, $max) = @_;
		1970
		1971	$self->{gauge}->set_max ($max);
		1972	$self->{max}->set_text ($max);
		1973	}
		1974
1864	sub set_value {	1975	sub set_value {
1865	my ($self, $val, $max) = @_;	1976	my ($self, $val, $max) = @_;
1866		1977
1867	$self->set_max ($max)	1978	$self->set_max ($max)
1868	if defined $max;	1979	if defined $max;
1869		1980
1870	$self->{gauge}->set_value ($val, $max);	1981	$self->{gauge}->set_value ($val, $max);
1871	$self->{value}->set_text ($val);	1982	$self->{value}->set_text ($val);
1872	}
1873
1874	sub set_max {
1875	my ($self, $max) = @_;
1876
1877	$self->{gauge}->set_max ($max);
1878	$self->{max}->set_text ($max);
1879	}	1983	}
1880		1984
1881	#############################################################################	1985	#############################################################################
1882		1986
1883	package CFClient::UI::Slider;	1987	package CFClient::UI::Slider;
…		…
1902	# TODO: calculations are off	2006	# TODO: calculations are off
1903	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1904	fg => [1, 1, 1],	2008	fg => [1, 1, 1],
1905	active_fg => [0, 0, 0],	2009	active_fg => [0, 0, 0],
1906	range => [0, 0, 100, 10],	2010	range => [0, 0, 100, 10],
1907	req_w => 20,	2011	req_w => $::WIDTH / 80,
1908	req_h => 20,	2012	req_h => $::WIDTH / 80,
1909	vertical => 0,	2013	vertical => 0,
1910	can_hover => 1,	2014	can_hover => 1,
1911	inner_pad => 5,	2015	inner_pad => 5,
1912	@_	2016	@_
1913	);	2017	);
…		…
2037	(new CFClient::UI::Empty expand => 1),	2141	(new CFClient::UI::Empty expand => 1),
2038	(new CFClient::UI::Slider vertical => 1),	2142	(new CFClient::UI::Slider vertical => 1),
2039	],	2143	],
2040	);	2144	);
2041		2145
2042	$self->{children}[1]->connect (changed => sub {	2146	$self->{children}[1]->connect (changed => sub { $self->update });
2043	$self->update;
2044	});
2045		2147
2046	$self	2148	$self
2047	}	2149	}
2048		2150
2049	sub set_fontsize {	2151	sub set_fontsize {
…		…
2057	my ($self, $text) = @_;	2159	my ($self, $text) = @_;
2058		2160
2059	my $layout = $self->{layout};	2161	my $layout = $self->{layout};
2060		2162
2061	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2163	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062	$layout->set_width ($self->{w});	2164	$layout->set_width ($self->{children}[0]{w});
2063	$layout->set_text ($text);	2165	$layout->set_text ($text);
2064		2166
2065	($layout->size)[1]	2167	($layout->size)[1]
2066	}	2168	}
2067		2169
…		…
2120	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121		2223
2122	delete $self->{texture};	2224	delete $self->{texture};
2123	}	2225	}
2124		2226
2125	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2227	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2126	glClearColor 0, 0, 0, 1;	2228	glClearColor 0, 0, 0, 0;
2127	glClear GL_COLOR_BUFFER_BIT;	2229	glClear GL_COLOR_BUFFER_BIT;
2128		2230
2129	glEnable GL_BLEND;	2231	glEnable GL_BLEND;
2130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131	glEnable GL_TEXTURE_2D;	2233	glEnable GL_TEXTURE_2D;
…		…
2163	}	2265	}
2164		2266
2165	sub _draw {	2267	sub _draw {
2166	my ($self) = @_;	2268	my ($self) = @_;
2167		2269
2168	if ($self->{texture}) {	2270	glEnable GL_BLEND;
		2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169	glEnable GL_TEXTURE_2D;	2272	glEnable GL_TEXTURE_2D;
2170	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171	glColor 1, 1, 1, 1;	2274	glColor 1, 1, 1, 1;
2172	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173	glDisable GL_TEXTURE_2D;	2276	glDisable GL_TEXTURE_2D;
2174	}	2277	glDisable GL_BLEND;
2175		2278
2176	$self->{children}[1]->draw;	2279	$self->{children}[1]->draw;
2177		2280
2178	}	2281	}
2179		2282
…		…
2348		2451
2349	sub size_request {	2452	sub size_request {
2350	(32, 8)	2453	(32, 8)
2351	}	2454	}
2352		2455
2353	sub draw {	2456	sub _draw {
2354	my ($self) = @_;	2457	my ($self) = @_;
2355		2458
		2459	return unless $::CONN;#d# manage and cache textures differently
2356	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357		2461
		2462	# TODO animation
2358	if ($tex) {	2463	if ($tex) {
2359	glEnable GL_BLEND;	2464	glEnable GL_BLEND;
2360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361	glEnable GL_TEXTURE_2D;	2466	glEnable GL_TEXTURE_2D;
2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
…		…
2367	}	2472	}
2368	}	2473	}
2369		2474
2370	#############################################################################	2475	#############################################################################
2371		2476
		2477	package CFClient::UI::InventoryItem;
		2478
		2479	our @ISA = CFClient::UI::HBox::;
		2480
		2481	sub new {
		2482	my $class = shift;
		2483
		2484	my %args = @_;
		2485
		2486	my $item = $args{item};
		2487
		2488	my $desc = $item->{nrof} < 2
		2489	? $item->{name}
		2490	: "$item->{nrof} $item->{name_pl}";
		2491
		2492
		2493	my $self = $class->SUPER::new (
		2494	can_hover => 1,
		2495	can_events => 1,
		2496	tooltip => (CFClient::UI::Label->escape ($desc)
		2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2498	connect_button_down => sub {
		2499	my ($self, $ev, $x, $y) = @_;
		2500
		2501	# todo: maybe put examine on 1? but should just be a tooltip :(
		2502	if ($ev->{button} == 1) {
		2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2504	} elsif ($ev->{button} == 2) {
		2505	$::CONN->send ("apply $item->{tag}");
		2506	} elsif ($ev->{button} == 3) {
		2507	CFClient::UI::Menu->new (
		2508	items => [
		2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2510	[
		2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2512	sub { $::CONN->send ("lock $item->{tag}") },
		2513	],
		2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2517	],
		2518	)->popup ($ev);
		2519	}
		2520
		2521	1
		2522	},
		2523	%args
		2524	);
		2525	$self->add(new CFClient::UI::Face
		2526	can_events => 0,
		2527	face => $item->{face},
		2528	anim => $item->{anim},
		2529	animspeed => $item->{animspeed});
		2530	$self->add(new CFClient::UI::Label
		2531	can_events => 0,
		2532	text => $desc);
		2533
		2534	$self
		2535	}
		2536
		2537	#############################################################################
		2538
		2539	package CFClient::UI::Inventory;
		2540
		2541	our @ISA = CFClient::UI::ScrolledWindow::;
		2542
		2543	sub new {
		2544	my $class = shift;
		2545
		2546	my $self = $class->SUPER::new (
		2547	scrolled => (new CFClient::UI::VBox),
		2548	@_,
		2549	);
		2550
		2551	$self
		2552	}
		2553
		2554	sub set_items {
		2555	my ($self, $items) = @_;
		2556
		2557	$self->{scrolled}->clear;
		2558	return unless $items;
		2559
		2560	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2561
		2562	$self->{real_items} = \@items;
		2563
		2564	for my $item (@items) {
		2565	my $desc = $item->{nrof} < 2
		2566	? $item->{name}
		2567	: "$item->{nrof} $item->{name_pl}";
		2568
		2569	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2570	}
		2571
		2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577	($self->{req_w}, $self->{req_h});
		2578	}
		2579
		2580	#############################################################################
		2581
		2582	package CFClient::UI::Menu;
		2583
		2584	our @ISA = CFClient::UI::FancyFrame::;
		2585
		2586	use CFClient::OpenGL;
		2587
		2588	sub new {
		2589	my $class = shift;
		2590
		2591	my $self = $class->SUPER::new (
		2592	items => [],
		2593	z => 100,
		2594	@_,
		2595	);
		2596
		2597	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2598
		2599	for my $item (@{ $self->{items} }) {
		2600	my ($widget, $cb) = @$item;
		2601
		2602	# handle various types of items, only text for now
		2603	if (!ref $widget) {
		2604	$widget = new CFClient::UI::Label
		2605	can_hover => 1,
		2606	can_events => 1,
		2607	text => $widget;
		2608	}
		2609
		2610	$self->{item}{$widget} = $item;
		2611
		2612	$self->{vbox}->add ($widget);
		2613	}
		2614
		2615	$self
		2616	}
		2617
		2618	# popup given the event (must be a mouse button down event currently)
		2619	sub popup {
		2620	my ($self, $ev) = @_;
		2621
		2622	$self->emit ("popdown");
		2623
		2624	# maybe save $GRAB? must be careful about events...
		2625	$GRAB = $self;
		2626	$self->{button} = $ev->{button};
		2627
		2628	$self->show;
		2629	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2630	}
		2631
		2632	sub mouse_motion {
		2633	my ($self, $ev, $x, $y) = @_;
		2634
		2635	# TODO: should use vbox->find_widget or so
		2636	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2637	$self->{hover} = $self->{item}{$HOVER};
		2638	}
		2639
		2640	sub button_up {
		2641	my ($self, $ev, $x, $y) = @_;
		2642
		2643	if ($ev->{button} == $self->{button}) {
		2644	undef $GRAB;
		2645	$self->hide;
		2646
		2647	$self->emit ("popdown");
		2648	$self->{hover}[1]->() if $self->{hover};
		2649	}
		2650	}
		2651
		2652	#############################################################################
		2653
2372	package CFClient::UI::Root;	2654	package CFClient::UI::Root;
2373		2655
2374	our @ISA = CFClient::UI::Container::;	2656	our @ISA = CFClient::UI::Container::;
2375		2657
2376	use CFClient::OpenGL;	2658	use CFClient::OpenGL;
2377		2659
2378	sub check_size {	2660	sub new {
2379	my ($self) = @_;	2661	my $class = shift;
2380		2662
2381	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2663	$class->SUPER::new (
2382	}	2664	@_,
2383		2665	)
2384	sub size_request {
2385	($::WIDTH, $::HEIGHT)
2386	}	2666	}
2387		2667
2388	sub configure {	2668	sub configure {
2389	my ($self, $x, $y, $w, $h) = @_;	2669	my ($self, $x, $y, $w, $h) = @_;
2390		2670
2391	$self->SUPER::configure ($x, $y, $w, $h);	2671	$self->{w} = $w;
		2672	$self->{h} = $h;
		2673	}
2392		2674
		2675	sub check_size {
		2676	my ($self) = @_;
		2677
		2678	$self->size_allocate ($self->{w}, $self->{h})
		2679	if $self->{w};
		2680	}
		2681
		2682	sub size_request {
		2683	my ($self) = @_;
		2684
		2685	($self->{w}, $self->{h})
		2686	}
		2687
		2688	sub size_allocate {
		2689	my ($self, $w, $h) = @_;
		2690
		2691	my $old_w = $self->{old_w};
		2692	my $old_h = $self->{old_h};
		2693
		2694	if ($old_w && $old_h) {
		2695	for my $child ($self->children) {
		2696	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2697	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2698	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2699	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2700	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2701	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2702	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2703	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2704	}
		2705	}
		2706
2393	for my $child (@{$self->{children}}) {	2707	for my $child ($self->children) {
2394	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395		2709
2396	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2397	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2711	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398	$child->configure ($X, $Y, $W,$H);	2712	$child->configure ($X, $Y, $W, $H);
2399	}	2713	}
2400	}
2401		2714
2402	sub _topleft {	2715	$self->{old_w} = $w;
		2716	$self->{old_h} = $h;
		2717	}
		2718
		2719	sub coord2local {
2403	my ($self, $x, $y) = @_;	2720	my ($self, $x, $y) = @_;
2404		2721
2405	($x, $y)	2722	($x, $y)
2406	}	2723	}
2407		2724
		2725	sub coord2global {
		2726	my ($self, $x, $y) = @_;
		2727
		2728	($x, $y)
		2729	}
		2730
2408	sub update {	2731	sub update {
2409	my ($self) = @_;	2732	my ($self) = @_;
2410		2733
2411	$self->check_size;	2734	$self->check_size;
2412	::refresh ();	2735	$::WANT_REFRESH++;
2413	}	2736	}
2414		2737
2415	sub add {	2738	sub add {
2416	my ($self, $child) = @_;	2739	my ($self, $child) = @_;
2417		2740
2418	# integerize window positions	2741	# integerise window positions
2419	$child->{x} = int $child->{x};	2742	$child->{x} = int $child->{x};
2420	$child->{y} = int $child->{y};	2743	$child->{y} = int $child->{y};
2421		2744
2422	$self->SUPER::add ($child);	2745	$self->SUPER::add ($child);
2423	}	2746	}
…		…
2426	my ($self, $id, $cb) = @_;	2749	my ($self, $id, $cb) = @_;
2427		2750
2428	$self->{refresh_hook}{$id} = $cb;	2751	$self->{refresh_hook}{$id} = $cb;
2429	}	2752	}
2430		2753
2431	sub draw {	2754	sub draw {
2432	my ($self) = @_;	2755	my ($self) = @_;
2433		2756
		2757	if ($self->{check_size}) {
		2758	my @queue = ([], []);
		2759
		2760	for (;;) {
		2761	if ($self->{check_size}) {
		2762	# heuristic: check containers last
		2763	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2764	for values %{delete $self->{check_size}}
		2765	}
		2766
		2767	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2768
		2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2770	? @$widget{qw(user_w user_h)}
		2771	: $widget->size_request;
		2772
		2773	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {
		2774	$widget->{req_w} = $w;
		2775	$widget->{req_h} = $h;
		2776
		2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2778
		2779	$widget->{parent}->check_size
		2780	if $widget->{parent};
		2781	}
		2782	}
		2783	}
		2784
		2785	while ($self->{size_alloc}) {
		2786	for (values %{delete $self->{size_alloc}}) {
		2787	my ($widget, $w, $h) = @$_;
		2788
		2789	$widget->{w} = $w;
		2790	$widget->{h} = $h;
		2791	$widget->size_allocate ($w, $h);
		2792	$widget->emit (size_allocate => $w, $h);
		2793	}
		2794	}
		2795
2434	while (my $rcb = delete $self->{refresh_hook}) {	2796	while ($self->{refresh_hook}) {
2435	$_->() for values %$rcb;	2797	$_->()
		2798	for values %{delete $self->{refresh_hook}};
2436	}	2799	}
2437		2800
2438	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440	glClear GL_COLOR_BUFFER_BIT;	2803	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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs. Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC