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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 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	}
…		…
236		244
237	sub size_allocate {	245	sub size_allocate {
238	# nothing to be done	246	# nothing to be done
239	}	247	}
240		248
		249	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	}
		261
241	sub set_max_size {	262	sub set_max_size {
242	my ($self, $w, $h) = @_;	263	my ($self, $w, $h) = @_;
243		264
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	266	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}	267	}
247		268
248	# return top left coordinates	269	# return top left coordinates
249	sub _topleft {	270	sub _topleft {
250	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
		272
		273	$self->{parent}
		274	or Carp::confess "no parent widget in _topleft\n";#d#
251		275
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253	}	277	}
254		278
255	# translate global coordinates to local coordinate system	279	# translate global coordinates to local coordinate system
…		…
492	sub new {	516	sub new {
493	my ($class, %arg) = @_;	517	my ($class, %arg) = @_;
494		518
495	my $children = delete $arg{children} \|\| [];	519	my $children = delete $arg{children} \|\| [];
496		520
497	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	521	my $self = $class->SUPER::new (
		522	children => [],
		523	can_events => 0,
		524	%arg,
		525	);
498	$self->add ($_) for @$children;	526	$self->add ($_) for @$children;
499		527
500	$self	528	$self
501	}	529	}
502		530
…		…
513	];	541	];
514		542
515	$child->check_size;	543	$child->check_size;
516	}	544	}
517		545
		546	sub children {
		547	@{ $_[0]{children} }
		548	}
		549
518	sub remove {	550	sub remove {
519	my ($self, $child) = @_;	551	my ($self, $child) = @_;
520		552
521	delete $child->{parent};	553	delete $child->{parent};
522	$child->hide;	554	$child->hide;
…		…
619	}	651	}
620		652
621	sub update {	653	sub update {
622	my ($self) = @_;	654	my ($self) = @_;
623		655
624	# we want to do this delayed...	656	$ROOT->on_refresh ($self => sub { $self->render_child });
625	$self->render_chld;
626	$self->SUPER::update;	657	$self->SUPER::update;
627	}	658	}
628		659
		660	sub size_allocate {
		661	my ($self, $w, $h) = @_;
		662
		663	$self->SUPER::size_allocate ($w, $h);
		664	$self->update;
		665	}
		666
629	sub render_chld {	667	sub render_child {
630	my ($self) = @_;	668	my ($self) = @_;
631		669
632	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633	glClearColor 0, 0, 0, 1;	671	glClearColor 0, 0, 0, 0;
634	glClear GL_COLOR_BUFFER_BIT;	672	glClear GL_COLOR_BUFFER_BIT;
635	$self->child->draw;	673	$self->child->draw;
		674	# glColorMask 1, 1, 1, 0;
		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;
636	};	681	};
637	}
638
639	sub size_allocate {
640	my ($self, $w, $h) = @_;
641
642	$self->child->configure (0, 0, $w, $h);
643
644	$self->render_chld;
645	}	682	}
646		683
647	sub _draw {	684	sub _draw {
648	my ($self) = @_;	685	my ($self) = @_;
649		686
…		…
651		688
652	my $tex = $self->{texture}	689	my $tex = $self->{texture}
653	or return;	690	or return;
654		691
655	glEnable GL_BLEND;	692	glEnable GL_BLEND;
656	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
657	glEnable GL_TEXTURE_2D;	694	glEnable GL_TEXTURE_2D;
658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		696	glColor 0, 0, 0, 1;
659		697
660	$tex->draw_quad (0, 0, $w, $h);	698	$tex->draw_quad (0, 0, $w, $h);
661		699
662	glDisable GL_BLEND;	700	glDisable GL_BLEND;
663	glDisable GL_TEXTURE_2D;	701	glDisable GL_TEXTURE_2D;
…		…
751		789
752	my $self = $class->SUPER::new (	790	my $self = $class->SUPER::new (
753	bg => [1, 1, 1, 1],	791	bg => [1, 1, 1, 1],
754	border_bg => [1, 1, 1, 1],	792	border_bg => [1, 1, 1, 1],
755	border => 0.8,	793	border => 0.8,
756	can_events => 0,	794	can_events => 1,
757	@_	795	@_
758	);	796	);
759		797
760	$self->{title} &&= new CFClient::UI::Label	798	$self->{title} &&= new CFClient::UI::Label
761	align => 0,	799	align => 0,
…		…
908	$self->{children}[$y][$x] = $child;	946	$self->{children}[$y][$x] = $child;
909		947
910	$child->check_size;	948	$child->check_size;
911	}	949	}
912		950
		951	sub children {
		952	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		953	}
		954
913	# TODO: move to container class maybe? send childs a signal on removal?	955	# TODO: move to container class maybe? send childs a signal on removal?
914	sub clear {	956	sub clear {
915	my ($self) = @_;	957	my ($self) = @_;
916		958
917	my $children = delete $self->{children};	959	my @children = $self->children;
		960	delete $self->{children};
918		961
919	for (grep $_, map @$_, grep $_, @$children) {	962	for (@children) {
920	delete $_->{parent};	963	delete $_->{parent};
921	$_->hide;	964	$_->hide;
922	}	965	}
923		966
924	$self->update;	967	$self->update;
…		…
1185	s/</</g;	1228	s/</</g;
1186		1229
1187	$_[1]	1230	$_[1]
1188	}	1231	}
1189		1232
		1233	sub update {
		1234	my ($self) = @_;
		1235
		1236	delete $self->{texture};
		1237	$self->SUPER::update;
		1238	}
		1239
		1240	sub reconfigure {
		1241	my ($self) = @_;
		1242
		1243	delete $self->{texture};
		1244	}
		1245
1190	sub set_text {	1246	sub set_text {
1191	my ($self, $text) = @_;	1247	my ($self, $text) = @_;
1192		1248
		1249	return if $self->{text} eq "T$text";
		1250	$self->{text} = "T$text";
		1251
1193	$self->{layout}->set_text ($text);	1252	$self->{layout}->set_text ($text);
1194		1253
1195	delete $self->{texture};	1254	delete $self->{texture};
		1255	$self->update;
1196	$self->check_size;	1256	$self->check_size;
1197	$self->update;
1198	}	1257	}
1199		1258
1200	sub set_markup {	1259	sub set_markup {
1201	my ($self, $markup) = @_;	1260	my ($self, $markup) = @_;
1202		1261
		1262	return if $self->{text} eq "M$markup";
		1263	$self->{text} = "M$markup";
		1264
1203	$self->{layout}->set_markup ($markup);	1265	$self->{layout}->set_markup ($markup);
1204		1266
1205	delete $self->{texture};	1267	delete $self->{texture};
		1268	$self->update;
1206	$self->check_size;	1269	$self->check_size;
1207	$self->update;
1208	}	1270	}
1209		1271
1210	sub size_request {	1272	sub size_request {
1211	my ($self) = @_;	1273	my ($self) = @_;
1212		1274
…		…
1462	my ($self, $ev) = @_;	1524	my ($self, $ev) = @_;
1463		1525
1464	my $sym = $ev->{sym};	1526	my $sym = $ev->{sym};
1465		1527
1466	if ($sym == 13) {	1528	if ($sym == 13) {
		1529	unshift @{$self->{history}},
		1530	my $txt = $self->get_text;
		1531	$self->{history_pointer} = -1;
		1532	$self->{history_saveback} = '';
1467	$self->emit (activate => $self->get_text);	1533	$self->emit (activate => $txt);
1468	$self->update;	1534	$self->update;
		1535
		1536	} elsif ($sym == CFClient::SDLK_UP) {
		1537	if ($self->{history_pointer} < 0) {
		1538	$self->{history_saveback} = $self->get_text;
		1539	}
		1540	if (@{$self->{history} \|\| []} > 0) {
		1541	$self->{history_pointer}++;
		1542	if ($self->{history_pointer} >= @{$self->{history} \|\| []}) {
		1543	$self->{history_pointer} = @{$self->{history} \|\| []} - 1;
		1544	}
		1545	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1546	}
		1547
		1548	} elsif ($sym == CFClient::SDLK_DOWN) {
		1549	$self->{history_pointer}--;
		1550	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1551
		1552	if ($self->{history_pointer} >= 0) {
		1553	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1554	} else {
		1555	$self->set_text ($self->{history_saveback});
		1556	}
1469		1557
1470	} else {	1558	} else {
1471	$self->SUPER::key_down ($ev);	1559	$self->SUPER::key_down ($ev);
1472	}	1560	}
1473		1561
…		…
1710	}	1798	}
1711		1799
1712	sub set_max {	1800	sub set_max {
1713	my ($self, $max) = @_;	1801	my ($self, $max) = @_;
1714		1802
		1803	return if $self->{max_val} == $max;
		1804
1715	$self->{max_val} = $max;	1805	$self->{max_val} = $max;
		1806	$self->update;
1716	}	1807	}
1717		1808
1718	sub set_value {	1809	sub set_value {
1719	my ($self, $val, $max) = @_;	1810	my ($self, $val, $max) = @_;
1720		1811
1721	$self->set_max ($max)	1812	$self->set_max ($max)
1722	if defined $max;	1813	if defined $max;
1723		1814
1724	$max = $self->{max_val};	1815	return if $self->{val} == $val;
		1816
1725	$self->{val} = $val;	1817	$self->{val} = $val;
1726
1727	$self->update;	1818	$self->update;
1728	}	1819	}
1729		1820
1730	sub _draw {	1821	sub _draw {
1731	my ($self) = @_;	1822	my ($self) = @_;
…		…
1794		1885
1795	sub new {	1886	sub new {
1796	my ($class, %arg) = @_;	1887	my ($class, %arg) = @_;
1797		1888
1798	my $self = $class->SUPER::new (	1889	my $self = $class->SUPER::new (
1799	tooltip => $arg{type},	1890	tooltip => $arg{type},
1800	can_hover => 1,	1891	can_hover => 1,
		1892	can_events => 1,
1801	%arg,	1893	%arg,
1802	);	1894	);
1803		1895
1804	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1896	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	1897	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1813		1905
1814	$self->{value}->set_fontsize ($fsize);	1906	$self->{value}->set_fontsize ($fsize);
1815	$self->{max} ->set_fontsize ($fsize);	1907	$self->{max} ->set_fontsize ($fsize);
1816	}	1908	}
1817		1909
		1910	sub set_max {
		1911	my ($self, $max) = @_;
		1912
		1913	$self->{gauge}->set_max ($max);
		1914	$self->{max}->set_text ($max);
		1915	}
		1916
1818	sub set_value {	1917	sub set_value {
1819	my ($self, $val, $max) = @_;	1918	my ($self, $val, $max) = @_;
1820		1919
1821	$self->set_max ($max)	1920	$self->set_max ($max)
1822	if defined $max;	1921	if defined $max;
1823		1922
1824	$self->{gauge}->set_value ($val, $max);	1923	$self->{gauge}->set_value ($val, $max);
1825	$self->{value}->set_text ($val);	1924	$self->{value}->set_text ($val);
1826	}
1827
1828	sub set_max {
1829	my ($self, $max) = @_;
1830
1831	$self->{gauge}->set_max ($max);
1832	$self->{max}->set_text ($max);
1833	}	1925	}
1834		1926
1835	#############################################################################	1927	#############################################################################
1836		1928
1837	package CFClient::UI::Slider;	1929	package CFClient::UI::Slider;
…		…
2075		2167
2076	delete $self->{texture};	2168	delete $self->{texture};
2077	}	2169	}
2078		2170
2079	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2171	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2080	glClearColor 0, 0, 0, 1;	2172	glClearColor 0, 0, 0, 0;
2081	glClear GL_COLOR_BUFFER_BIT;	2173	glClear GL_COLOR_BUFFER_BIT;
2082		2174
2083	glEnable GL_BLEND;	2175	glEnable GL_BLEND;
2084	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2176	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085	glEnable GL_TEXTURE_2D;	2177	glEnable GL_TEXTURE_2D;
…		…
2118		2210
2119	sub _draw {	2211	sub _draw {
2120	my ($self) = @_;	2212	my ($self) = @_;
2121		2213
2122	if ($self->{texture}) {	2214	if ($self->{texture}) {
		2215	glEnable GL_BLEND;
		2216	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123	glEnable GL_TEXTURE_2D;	2217	glEnable GL_TEXTURE_2D;
2124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2218	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2219	glColor 1, 1, 1, 1;
2125	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2220	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2126	glDisable GL_TEXTURE_2D;	2221	glDisable GL_TEXTURE_2D;
		2222	glDisable GL_BLEND;
2127	}	2223	}
2128		2224
2129	$self->{children}[1]->draw;	2225	$self->{children}[1]->draw;
2130		2226
2131	}	2227	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.164 by root, Mon Apr 24 06:57:39 2006 UTC vs. Revision 1.175 by root, Tue Apr 25 11:48:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 2006 UTC