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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.179 by elmex, Fri Apr 28 05:17:21 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	}
…		…
137		145
138	sub new {	146	sub new {
139	my $class = shift;	147	my $class = shift;
140		148
141	my $self = bless {	149	my $self = bless {
142	x => 0,	150	x => 0,
143	y => 0,	151	y => 0,
144	z => 0,	152	z => 0,
145	can_events => 1,	153	can_events => 1,
146	@_	154	@_
147	}, $class;	155	}, $class;
148		156
149	for (keys %$self) {	157	for (keys %$self) {
…		…
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;
…		…
748	my $class = shift;	786	my $class = shift;
749		787
750	# TODO: user_x, user_y, overwrite moveto?	788	# TODO: user_x, user_y, overwrite moveto?
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.6,
756	can_events => 1,	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,
762	valign => 1,	800	valign => 1,
763	text => $self->{title},	801	text => $self->{title},
764	fontsize => 1;	802	fontsize => $self->{border};
765		803
766	$self	804	$self
767	}	805	}
768		806
769	sub border {	807	sub border {
…		…
794	}	832	}
795		833
796	sub button_down {	834	sub button_down {
797	my ($self, $ev, $x, $y) = @_;	835	my ($self, $ev, $x, $y) = @_;
798		836
		837	my ($w, $h) = @$self{qw(w h)};
799	my $border = $self->border;	838	my $border = $self->border;
800		839
801	if ($x < $self->{w} && $x >= $self->{w} - $border	840	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
802	&& $y < $self->{h} && $y >= $self->{h} - $border) {	841	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
803		842
		843	if ($lr & $td) {
		844	my ($wx, $wy) = ($self->{x}, $self->{y});
804	my ($ox, $oy) = ($ev->{x}, $ev->{y});	845	my ($ox, $oy) = ($ev->{x}, $ev->{y});
805	my ($bw, $bh) = ($self->{w}, $self->{h});	846	my ($bw, $bh) = ($self->{w}, $self->{h});
806		847
		848	my $mx = $x < $border;
		849	my $my = $y < $border;
		850
807	$self->{motion} = sub {	851	$self->{motion} = sub {
808	my ($ev, $x, $y) = @_;	852	my ($ev, $x, $y) = @_;
809		853
810	($x, $y) = ($ev->{x}, $ev->{y});	854	my $dx = $ev->{x} - $ox;
		855	my $dy = $ev->{y} - $oy;
811		856
812	$self->{user_w} = $bw + $x - $ox;	857	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813	$self->{user_h} = $bh + $y - $oy;	858	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		859	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
814	$self->check_size;	860	$self->check_size;
815	};	861	};
816		862
817	} elsif ($x >= 0 && $x < $self->{w}	863	} elsif ($lr ^ $td) {
818	&& $y >= 0 && $y < $border) {
819
820	my ($ox, $oy) = ($ev->{x}, $ev->{y});	864	my ($ox, $oy) = ($ev->{x}, $ev->{y});
821	my ($bx, $by) = ($self->{x}, $self->{y});	865	my ($bx, $by) = ($self->{x}, $self->{y});
822		866
823	$self->{motion} = sub {	867	$self->{motion} = sub {
824	my ($ev, $x, $y) = @_;	868	my ($ev, $x, $y) = @_;
…		…
860	$tex[1]->draw_quad (0, 0, $w, $border);	904	$tex[1]->draw_quad (0, 0, $w, $border);
861	$tex[3]->draw_quad (0, $border, $border, $ch);	905	$tex[3]->draw_quad (0, $border, $border, $ch);
862	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	906	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
863	$tex[4]->draw_quad (0, $h - $border, $w, $border);	907	$tex[4]->draw_quad (0, $h - $border, $w, $border);
864		908
		909	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
865	my $bg = $tex[0];	910	my $bg = $tex[0];
866		911
867	# TODO: repeat texture not scale	912	# TODO: repeat texture not scale
868	my $rep_x = $cw / $bg->{w};	913	my $rep_x = $cw / $bg->{w};
869	my $rep_y = $ch / $bg->{h};	914	my $rep_y = $ch / $bg->{h};
870		915
871	glColor @{ $self->{bg} };	916	glColor @{ $self->{bg} };
872		917
873	$bg->{s} = $rep_x;	918	$bg->{s} = $rep_x;
874	$bg->{t} = $rep_y;	919	$bg->{t} = $rep_y;
875	$bg->{wrap_mode} = 1;	920	$bg->{wrap_mode} = 1;
876	$bg->draw_quad ($border, $border, $cw, $ch);	921	$bg->draw_quad ($border, $border, $cw, $ch);
877		922
878	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
879	glDisable GL_BLEND;	924	glDisable GL_BLEND;
		925	}
880		926
881	$self->{title}->draw if $self->{title};	927	$self->{title}->draw if $self->{title};
		928
882	$self->child->draw;	929	$self->child->draw;
883	}	930	}
884		931
885	#############################################################################	932	#############################################################################
886		933
…		…
908	$self->{children}[$y][$x] = $child;	955	$self->{children}[$y][$x] = $child;
909		956
910	$child->check_size;	957	$child->check_size;
911	}	958	}
912		959
		960	sub children {
		961	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		962	}
		963
913	# TODO: move to container class maybe? send childs a signal on removal?	964	# TODO: move to container class maybe? send childs a signal on removal?
914	sub clear {	965	sub clear {
915	my ($self) = @_;	966	my ($self) = @_;
916		967
917	my $children = delete $self->{children};	968	my @children = $self->children;
		969	delete $self->{children};
918		970
919	for (grep $_, map @$_, grep $_, @$children) {	971	for (@children) {
920	delete $_->{parent};	972	delete $_->{parent};
921	$_->hide;	973	$_->hide;
922	}	974	}
923		975
924	$self->update;	976	$self->update;
…		…
1151		1203
1152	sub new {	1204	sub new {
1153	my ($class, %arg) = @_;	1205	my ($class, %arg) = @_;
1154		1206
1155	my $self = $class->SUPER::new (	1207	my $self = $class->SUPER::new (
1156	fg => [1, 1, 1],	1208	fg => [1, 1, 1],
1157	#font => default_font	1209	#font => default_font
1158	fontsize => 1,	1210	fontsize => 1,
1159	text => "",	1211	text => "",
1160	align => -1,	1212	align => -1,
1161	valign => -1,	1213	valign => -1,
1162	padding => 2,	1214	padding => 2,
1163	layout => new CFClient::Layout,	1215	layout => new CFClient::Layout,
1164	can_events => 0,	1216	can_events => 0,
1165	%arg	1217	%arg
1166	);	1218	);
1167		1219
1168	if (exists $self->{template}) {	1220	if (exists $self->{template}) {
…		…
1185	s/</</g;	1237	s/</</g;
1186		1238
1187	$_[1]	1239	$_[1]
1188	}	1240	}
1189		1241
		1242	sub update {
		1243	my ($self) = @_;
		1244
		1245	delete $self->{texture};
		1246	$self->SUPER::update;
		1247	}
		1248
		1249	sub reconfigure {
		1250	my ($self) = @_;
		1251
		1252	delete $self->{texture};
		1253	}
		1254
1190	sub set_text {	1255	sub set_text {
1191	my ($self, $text) = @_;	1256	my ($self, $text) = @_;
1192		1257
		1258	return if $self->{text} eq "T$text";
		1259	$self->{text} = "T$text";
		1260
1193	$self->{layout}->set_text ($text);	1261	$self->{layout}->set_text ($text);
1194		1262
1195	delete $self->{texture};	1263	delete $self->{texture};
		1264	$self->update;
1196	$self->check_size;	1265	$self->check_size;
1197	$self->update;
1198	}	1266	}
1199		1267
1200	sub set_markup {	1268	sub set_markup {
1201	my ($self, $markup) = @_;	1269	my ($self, $markup) = @_;
1202		1270
		1271	return if $self->{text} eq "M$markup";
		1272	$self->{text} = "M$markup";
		1273
1203	$self->{layout}->set_markup ($markup);	1274	$self->{layout}->set_markup ($markup);
1204		1275
1205	delete $self->{texture};	1276	delete $self->{texture};
		1277	$self->update;
1206	$self->check_size;	1278	$self->check_size;
1207	$self->update;
1208	}	1279	}
1209		1280
1210	sub size_request {	1281	sub size_request {
1211	my ($self) = @_;	1282	my ($self) = @_;
1212		1283
…		…
1292		1363
1293	sub new {	1364	sub new {
1294	my $class = shift;	1365	my $class = shift;
1295		1366
1296	$class->SUPER::new (	1367	$class->SUPER::new (
1297	fg => [1, 1, 1],	1368	fg => [1, 1, 1],
1298	bg => [0, 0, 0, 0.2],	1369	bg => [0, 0, 0, 0.2],
1299	active_bg => [1, 1, 1, 0.5],	1370	active_bg => [1, 1, 1, 0.5],
1300	active_fg => [0, 0, 0],	1371	active_fg => [0, 0, 0],
1301	can_hover => 1,	1372	can_hover => 1,
1302	can_focus => 1,	1373	can_focus => 1,
1303	valign => 0,	1374	valign => 0,
1304	can_events => 1,	1375	can_events => 1,
1305	@_	1376	@_
1306	)	1377	)
1307	}	1378	}
1308		1379
…		…
1462	my ($self, $ev) = @_;	1533	my ($self, $ev) = @_;
1463		1534
1464	my $sym = $ev->{sym};	1535	my $sym = $ev->{sym};
1465		1536
1466	if ($sym == 13) {	1537	if ($sym == 13) {
		1538	unshift @{$self->{history}},
		1539	my $txt = $self->get_text;
		1540	$self->{history_pointer} = -1;
		1541	$self->{history_saveback} = '';
1467	$self->emit (activate => $self->get_text);	1542	$self->emit (activate => $txt);
1468	$self->update;	1543	$self->update;
		1544
		1545	} elsif ($sym == CFClient::SDLK_UP) {
		1546	if ($self->{history_pointer} < 0) {
		1547	$self->{history_saveback} = $self->get_text;
		1548	}
		1549	if (@{$self->{history} \|\| []} > 0) {
		1550	$self->{history_pointer}++;
		1551	if ($self->{history_pointer} >= @{$self->{history} \|\| []}) {
		1552	$self->{history_pointer} = @{$self->{history} \|\| []} - 1;
		1553	}
		1554	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1555	}
		1556
		1557	} elsif ($sym == CFClient::SDLK_DOWN) {
		1558	$self->{history_pointer}--;
		1559	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1560
		1561	if ($self->{history_pointer} >= 0) {
		1562	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1563	} else {
		1564	$self->set_text ($self->{history_saveback});
		1565	}
1469		1566
1470	} else {	1567	} else {
1471	$self->SUPER::key_down ($ev);	1568	$self->SUPER::key_down ($ev);
1472	}	1569	}
1473		1570
…		…
1487		1584
1488	sub new {	1585	sub new {
1489	my $class = shift;	1586	my $class = shift;
1490		1587
1491	$class->SUPER::new (	1588	$class->SUPER::new (
1492	padding => 4,	1589	padding => 4,
1493	fg => [1, 1, 1],	1590	fg => [1, 1, 1],
1494	bg => [1, 1, 1, 0.2],	1591	bg => [1, 1, 1, 0.2],
1495	active_fg => [0, 0, 1],	1592	active_fg => [0, 0, 1],
1496	can_hover => 1,	1593	can_hover => 1,
1497	align => 0,	1594	align => 0,
1498	valign => 0,	1595	valign => 0,
1499	can_events => 1,	1596	can_events => 1,
1500	@_	1597	@_
1501	)	1598	)
1502	}	1599	}
1503		1600
…		…
1710	}	1807	}
1711		1808
1712	sub set_max {	1809	sub set_max {
1713	my ($self, $max) = @_;	1810	my ($self, $max) = @_;
1714		1811
		1812	return if $self->{max_val} == $max;
		1813
1715	$self->{max_val} = $max;	1814	$self->{max_val} = $max;
		1815	$self->update;
1716	}	1816	}
1717		1817
1718	sub set_value {	1818	sub set_value {
1719	my ($self, $val, $max) = @_;	1819	my ($self, $val, $max) = @_;
1720		1820
1721	$self->set_max ($max)	1821	$self->set_max ($max)
1722	if defined $max;	1822	if defined $max;
1723		1823
1724	$max = $self->{max_val};	1824	return if $self->{val} == $val;
		1825
1725	$self->{val} = $val;	1826	$self->{val} = $val;
1726
1727	$self->update;	1827	$self->update;
1728	}	1828	}
1729		1829
1730	sub _draw {	1830	sub _draw {
1731	my ($self) = @_;	1831	my ($self) = @_;
…		…
1794		1894
1795	sub new {	1895	sub new {
1796	my ($class, %arg) = @_;	1896	my ($class, %arg) = @_;
1797		1897
1798	my $self = $class->SUPER::new (	1898	my $self = $class->SUPER::new (
1799	tooltip => $arg{type},	1899	tooltip => $arg{type},
		1900	can_hover => 1,
1800	can_events => 1,	1901	can_events => 1,
1801	can_hover => 1,
1802	%arg,	1902	%arg,
1803	);	1903	);
1804		1904
1805	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1905	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	1906	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1814		1914
1815	$self->{value}->set_fontsize ($fsize);	1915	$self->{value}->set_fontsize ($fsize);
1816	$self->{max} ->set_fontsize ($fsize);	1916	$self->{max} ->set_fontsize ($fsize);
1817	}	1917	}
1818		1918
		1919	sub set_max {
		1920	my ($self, $max) = @_;
		1921
		1922	$self->{gauge}->set_max ($max);
		1923	$self->{max}->set_text ($max);
		1924	}
		1925
1819	sub set_value {	1926	sub set_value {
1820	my ($self, $val, $max) = @_;	1927	my ($self, $val, $max) = @_;
1821		1928
1822	$self->set_max ($max)	1929	$self->set_max ($max)
1823	if defined $max;	1930	if defined $max;
1824		1931
1825	$self->{gauge}->set_value ($val, $max);	1932	$self->{gauge}->set_value ($val, $max);
1826	$self->{value}->set_text ($val);	1933	$self->{value}->set_text ($val);
1827	}
1828
1829	sub set_max {
1830	my ($self, $max) = @_;
1831
1832	$self->{gauge}->set_max ($max);
1833	$self->{max}->set_text ($max);
1834	}	1934	}
1835		1935
1836	#############################################################################	1936	#############################################################################
1837		1937
1838	package CFClient::UI::Slider;	1938	package CFClient::UI::Slider;
…		…
1978		2078
1979	sub new {	2079	sub new {
1980	my $class = shift;	2080	my $class = shift;
1981		2081
1982	my $self = $class->SUPER::new (	2082	my $self = $class->SUPER::new (
1983	fontsize => 1,	2083	fontsize => 1,
		2084	can_events => 0,
1984	#font => default_font	2085	#font => default_font
1985	@_,	2086	@_,
1986		2087
1987	layout => (new CFClient::Layout),	2088	layout => (new CFClient::Layout),
1988	par => [],	2089	par => [],
1989	height => 0,	2090	height => 0,
1990	children => [	2091	children => [
1991	(new CFClient::UI::Empty expand => 1),	2092	(new CFClient::UI::Empty expand => 1),
1992	(new CFClient::UI::Slider vertical => 1),	2093	(new CFClient::UI::Slider vertical => 1),
1993	],	2094	],
1994	);	2095	);
1995		2096
1996	$self->{children}[1]->connect (changed => sub {	2097	$self->{children}[1]->connect (changed => sub { $self->update });
1997	$self->update;
1998	});
1999		2098
2000	$self	2099	$self
2001	}	2100	}
2002		2101
2003	sub set_fontsize {	2102	sub set_fontsize {
…		…
2011	my ($self, $text) = @_;	2110	my ($self, $text) = @_;
2012		2111
2013	my $layout = $self->{layout};	2112	my $layout = $self->{layout};
2014		2113
2015	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2114	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016	$layout->set_width ($self->{w});	2115	$layout->set_width ($self->{children}[0]{w});
2017	$layout->set_text ($text);	2116	$layout->set_text ($text);
2018		2117
2019	($layout->size)[1]	2118	($layout->size)[1]
2020	}	2119	}
2021		2120
…		…
2074	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2173	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075		2174
2076	delete $self->{texture};	2175	delete $self->{texture};
2077	}	2176	}
2078		2177
2079	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2178	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080	glClearColor 0, 0, 0, 1;	2179	glClearColor 0, 0, 0, 0;
2081	glClear GL_COLOR_BUFFER_BIT;	2180	glClear GL_COLOR_BUFFER_BIT;
2082		2181
2083	glEnable GL_BLEND;	2182	glEnable GL_BLEND;
2084	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2183	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085	glEnable GL_TEXTURE_2D;	2184	glEnable GL_TEXTURE_2D;
…		…
2117	}	2216	}
2118		2217
2119	sub _draw {	2218	sub _draw {
2120	my ($self) = @_;	2219	my ($self) = @_;
2121		2220
2122	if ($self->{texture}) {	2221	glEnable GL_BLEND;
		2222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2123	glEnable GL_TEXTURE_2D;	2223	glEnable GL_TEXTURE_2D;
2124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2225	glColor 1, 1, 1, 1;
2125	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2226	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126	glDisable GL_TEXTURE_2D;	2227	glDisable GL_TEXTURE_2D;
2127	}	2228	glDisable GL_BLEND;
2128		2229
2129	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
2130		2231
2131	}	2232	}
2132		2233
…		…
2180		2281
2181	sub new {	2282	sub new {
2182	my $class = shift;	2283	my $class = shift;
2183		2284
2184	my $self = $class->SUPER::new (	2285	my $self = $class->SUPER::new (
2185	state => 0,	2286	state => 0,
2186	connect_activate => \&toggle_flopper,	2287	connect_activate => \&toggle_flopper,
2187	can_events => 1,
2188	@_	2288	@_
2189	);	2289	);
2190		2290
2191	if ($self->{state}) {	2291	if ($self->{state}) {
2192	$self->{state} = 0;	2292	$self->{state} = 0;
…		…
2302		2402
2303	sub size_request {	2403	sub size_request {
2304	(32, 8)	2404	(32, 8)
2305	}	2405	}
2306		2406
2307	sub draw {	2407	sub _draw {
2308	my ($self) = @_;	2408	my ($self) = @_;
2309		2409
2310	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311		2411
		2412	# TODO animation
2312	if ($tex) {	2413	if ($tex) {
2313	glEnable GL_BLEND;	2414	glEnable GL_BLEND;
2314	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315	glEnable GL_TEXTURE_2D;	2416	glEnable GL_TEXTURE_2D;
2316	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
…		…
2321	}	2422	}
2322	}	2423	}
2323		2424
2324	#############################################################################	2425	#############################################################################
2325		2426
		2427	package CFClient::UI::Menu;
		2428
		2429	our @ISA = CFClient::UI::FancyFrame::;
		2430
		2431	use CFClient::OpenGL;
		2432
		2433	sub new {
		2434	my $class = shift;
		2435
		2436	my $self = $class->SUPER::new (
		2437	items => [],
		2438	z => 100,
		2439	@_,
		2440	);
		2441
		2442	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2443
		2444	for my $item (@{ $self->{items} }) {
		2445	my ($widget, $cb) = @$item;
		2446
		2447	# handle various types of items, only text for now
		2448	if (!ref $widget) {
		2449	$widget = new CFClient::UI::Label
		2450	can_hover => 1,
		2451	can_events => 1,
		2452	text => $widget;
		2453	}
		2454
		2455	$self->{item}{$widget} = $item;
		2456
		2457	$self->{vbox}->add ($widget);
		2458	}
		2459
		2460	$self
		2461	}
		2462
		2463	# popup given the event (must be a mouse button down event currently)
		2464	sub popup {
		2465	my ($self, $ev) = @_;
		2466
		2467	$self->emit ("popdown");
		2468
		2469	# maybe save $GRAB? must be careful about events...
		2470	$GRAB = $self;
		2471	$self->{button} = $ev->{button};
		2472
		2473	$self->show;
		2474	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2475	}
		2476
		2477	sub mouse_motion {
		2478	my ($self, $ev, $x, $y) = @_;
		2479
		2480	# TODO: should use vbox->fdind_widget or so
		2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2482	$self->{hover} = $self->{item}{$HOVER};
		2483	}
		2484
		2485	sub button_up {
		2486	my ($self, $ev, $x, $y) = @_;
		2487
		2488	if ($ev->{button} == $self->{button}) {
		2489	undef $GRAB;
		2490	$self->hide;
		2491
		2492	$self->emit ("popdown");
		2493	$self->{hover}[1]->() if $self->{hover};
		2494	}
		2495	}
		2496
		2497	#############################################################################
		2498
2326	package CFClient::UI::Root;	2499	package CFClient::UI::Root;
2327		2500
2328	our @ISA = CFClient::UI::Container::;	2501	our @ISA = CFClient::UI::Container::;
2329		2502
2330	use CFClient::OpenGL;	2503	use CFClient::OpenGL;
…		…
2402	$self->_draw;	2575	$self->_draw;
2403	}	2576	}
2404		2577
2405	#############################################################################	2578	#############################################################################
2406		2579
		2580	package CFClient::UI::Inventory;
		2581
		2582	our @ISA = CFClient::UI::Container::;
		2583
		2584	use CFClient::OpenGL;
		2585
		2586	sub new {
		2587	my $class = shift;
		2588
		2589	my $self = $class->SUPER::new (@_);
		2590
		2591	$self
		2592	}
		2593
		2594	sub size_allocate {
		2595	my ($self, $w, $h) = @_;
		2596
		2597	$self->{w} = $w;
		2598	$self->{h} = $h;
		2599
		2600	$self->check_size;
		2601	}
		2602
		2603	sub set_items {
		2604	my ($self, $items) = @_;
		2605	my @items = values %{$items};
		2606	@items = sort { $a->{type} <=> $b->{type} } @items;
		2607
		2608	$self->{real_items} = \@items;
		2609
		2610	for my $item (@items) {
		2611	my $desc = $item->{nrof} < 2
		2612	? $item->{name}
		2613	: "$item->{nrof} $item->{name_pl}";
		2614
		2615	$self->add (my $hb = new CFClient::UI::HBox);
		2616
		2617	$hb->add (my $f = new CFClient::UI::Face
		2618	can_events => 0,
		2619	face => $item->{face},
		2620	anim => $item->{anim},
		2621	animspeed => $item->{animspeed},
		2622	expand => 1
		2623	);
		2624	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
		2625	}
		2626
		2627	$self->{max_pos} = (scalar @items) - 1;
		2628
		2629	my $range = $self->{range};
		2630	my $page = $self->{h} / 32; # waht information souce to use for face size?
		2631	# it should be configurable i guess...
		2632	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2633	$range->update;
		2634	}
		2635
		2636	sub size_request {
		2637	my ($self) = @_;
		2638	(100, 200)
		2639	}
		2640
		2641	sub set_range {
		2642	my ($self, $range) = @_;
		2643
		2644	$self->{range} = $range;
		2645	$range->connect (changed => sub { $self->update });
		2646
		2647	my $page = $self->{h} / 32; # waht information souce to use for face size?
		2648	# it should be configurable i guess...
		2649
		2650	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2651	$range->update;
		2652
		2653	$self->update;
		2654	}
		2655
		2656	sub _draw {
		2657	my ($self) = @_;
		2658
		2659	my ($w, $h) = ($self->{w}, $self->{h});
		2660
		2661	$self->{pos} = int $self->{range}{range}[0];
		2662
		2663	my $y = 0;
		2664	my $cnt = 0;
		2665	my $hrem = $self->{h}; # horiz. remaining space
		2666
		2667	for (my $i = $self->{pos}; $i < @{$self->{children} \|\| []}; $i++) {
		2668	my $chld = $self->{children}->[$i];
		2669
		2670	if ($hrem >= $chld->{h}) {
		2671	$chld->configure (0, $y, $chld->{w}, $chld->{h});
		2672
		2673	$chld->show;
		2674	$chld->draw;
		2675
		2676	$hrem -= $chld->{h};
		2677	$y += $chld->{h};
		2678	} else {
		2679	last
		2680	}
		2681	}
		2682	}
		2683
		2684
		2685	#############################################################################
		2686
2407	package CFClient::UI;	2687	package CFClient::UI;
2408		2688
2409	$ROOT = new CFClient::UI::Root;	2689	$ROOT = new CFClient::UI::Root;
2410	$TOOLTIP = new CFClient::UI::Tooltip;	2690	$TOOLTIP = new CFClient::UI::Tooltip;
2411		2691

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC vs. Revision 1.179 by elmex, Fri Apr 28 05:17:21 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.179 by elmex, Fri Apr 28 05:17:21 2006 UTC