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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 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
30	$TOOLTIP->show;	30	$TOOLTIP->show;
31		31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {	34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
…		…
232	$self->{y} = $y;	232	$self->{y} = $y;
233	$self->update;	233	$self->update;
234	}	234	}
235		235
236	if ($self->{w} != $w \|\| $self->{h} != $h) {	236	if ($self->{w} != $w \|\| $self->{h} != $h) {
237	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	238	}
244	}	239	}
245		240
246	sub size_allocate {	241	sub size_allocate {
247	# nothing to be done	242	# nothing to be done
…		…
255	my ($self) = @_;	250	my ($self) = @_;
256		251
257	$_->reconfigure	252	$_->reconfigure
258	for $self->children;	253	for $self->children;
259		254
260	$_->check_size;	255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
261	}	258	}
262		259
263	sub set_max_size {	260	sub set_max_size {
264	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
265		262
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}
269
270	# return top left coordinates
271	sub _topleft {
272	my ($self, $x, $y) = @_;
273
274	$self->{parent}
275	or Carp::confess "no parent widget in _topleft\n";#d#
276
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278	}	265	}
279		266
280	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
281	sub coord2local {	268	sub coord2local {
282	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
283		270
284	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	272	}
287		273
288	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
289	sub coord2global {	275	sub coord2global {
290	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
291		277
292	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	279	}
295		280
296	sub focus_in {	281	sub focus_in {
297	my ($self) = @_;	282	my ($self) = @_;
298		283
…		…
396		381
397	sub set_parent {	382	sub set_parent {
398	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
399		384
400	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
401	}	389	}
402		390
403	sub check_size {	391	sub check_size {
404	my ($self) = @_;	392	my ($self) = @_;
405		393
406	$self->{parent}	394	$CFClient::UI::ROOT->{check_size}{$self} = $self;
407	or return 1;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}	395	}
428		396
429	sub update {	397	sub update {
430	my ($self) = @_;	398	my ($self) = @_;
431		399
…		…
528		496
529	$self	497	$self
530	}	498	}
531		499
532	sub add {	500	sub add {
533	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
534		502
535	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
536		505
537	use sort 'stable';	506	use sort 'stable';
538		507
539	$self->{children} = [	508	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
542	];	511	];
543		512
544	$child->check_size;	513	$self->check_size;
545	$self->update;	514	$self->update;
546	}	515	}
547		516
548	sub children {	517	sub children {
549	@{ $_[0]{children} }	518	@{ $_[0]{children} }
…		…
697	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
698		667
699	my $tex = $self->{texture}	668	my $tex = $self->{texture}
700	or return;	669	or return;
701		670
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	671	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	673	glColor 0, 0, 0, 1;
707		674
708	$tex->draw_quad (0, 0, $w, $h);	675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		676
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
712	}	678	}
713		679
714	#############################################################################	680	#############################################################################
715		681
…		…
737		703
738	$self->{view_x} = int $x;	704	$self->{view_x} = int $x;
739	$self->{view_y} = int $y;	705	$self->{view_y} = int $y;
740		706
741	$self->update;	707	$self->update;
		708	}
		709
		710	# hmm, this does not work for topleft of $self... but we should not ask for that
		711	sub coord2local {
		712	my ($self, $x, $y) = @_;
		713
		714	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		715	}
		716
		717	sub coord2global {
		718	my ($self, $x, $y) = @_;
		719
		720	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		721	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		722
		723	$self->SUPER::coord2global ($x, $y)
		724	}
		725
		726	sub find_widget {
		727	my ($self, $x, $y) = @_;
		728
		729	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		730	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		731	) {
		732	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		733	} else {
		734	$self->CFClient::UI::Base::find_widget ($x, $y)
		735	}
742	}	736	}
743		737
744	sub _render {	738	sub _render {
745	my ($self) = @_;	739	my ($self) = @_;
746		740
…		…
1216	}	1210	}
1217		1211
1218	sub size_allocate {	1212	sub size_allocate {
1219	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1220		1214
		1215	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1216
1221	my $children = $self->{children};	1217	my $children = $self->{children};
1222		1218
1223	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1224		1220
1225	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1264	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1265		1261
1266	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1267	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1268	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1269	fontsize => 1,	1268	fontsize => 1,
1270	text => "",
1271	align => -1,	1269	align => -1,
1272	valign => -1,	1270	valign => -1,
1273	padding => 2,	1271	padding => 2,
1274	layout => new CFClient::Layout,
1275	can_events => 0,	1272	can_events => 0,
1276	%arg	1273	%arg
1277	);	1274	);
1278		1275
1279	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1280	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1281	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1282	$self->{template} = $layout;	1279	$self->{template} = $layout;
1283	}	1280	}
1284		1281
1285	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1286	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1283	$self->set_markup (delete $self->{markup});
		1284	} else {
		1285	$self->set_text (delete $self->{text});
		1286	}
1287		1287
1288	$self	1288	$self
1289	}	1289	}
1290		1290
1291	sub escape {	1291	sub escape {
…		…
1303		1303
1304	delete $self->{texture};	1304	delete $self->{texture};
1305	$self->SUPER::update;	1305	$self->SUPER::update;
1306	}	1306	}
1307		1307
1308	sub reconfigure {
1309	my ($self) = @_;
1310
1311	delete $self->{texture};
1312	}
1313
1314	sub set_text {	1308	sub set_text {
1315	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1316		1310
1317	return if $self->{text} eq "T$text";	1311	return if $self->{text} eq "T$text";
1318	$self->{text} = "T$text";	1312	$self->{text} = "T$text";
1319		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1321		1316
1322	delete $self->{texture};
1323	$self->update;	1317	$self->update;
1324	$self->check_size;	1318	$self->check_size;
1325	}	1319	}
1326		1320
1327	sub set_markup {	1321	sub set_markup {
1328	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1329		1323
1330	return if $self->{text} eq "M$markup";	1324	return if $self->{text} eq "M$markup";
1331	$self->{text} = "M$markup";	1325	$self->{text} = "M$markup";
1332		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1334		1331
1335	delete $self->{texture};
1336	$self->update;	1332	$self->update;
1337	$self->check_size;	1333	$self->check_size;
1338	}	1334	}
1339		1335
1340	sub size_request {	1336	sub size_request {
…		…
1371	sub set_fontsize {	1367	sub set_fontsize {
1372	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1373		1369
1374	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1375	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1376	$self->check_size;	1374	$self->check_size;
1377	$self->update;
1378	}	1375	}
1379		1376
1380	sub _draw {	1377	sub _draw {
1381	my ($self) = @_;	1378	my ($self) = @_;
1382		1379
1383	my $tex = $self->{texture} \|\|= do {	1380	my $tex = $self->{texture} \|\|= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1384	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1385	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1386	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1385
1387	new_from_layout CFClient::Texture $self->{layout}	1386	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1387
		1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1390	: ($self->{w} - $tex->{w}) * 0.5;
		1391
		1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1394	: ($self->{h} - $tex->{h}) * 0.5;
		1395
		1396	$tex
1388	};	1397	};
1389		1398
1390	glEnable GL_BLEND;
1391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1395	glColor @{$self->{fg}};	1403	glColor @{$self->{fg}};
1396
1397	$self->{ox} = int (
1398	$self->{align} < 0 ? $self->{padding}
1399	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400	: ($self->{w} - $tex->{w}) * 0.5
1401	);
1402
1403	$self->{oy} = int (
1404	$self->{valign} < 0 ? $self->{padding}
1405	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406	: ($self->{h} - $tex->{h}) * 0.5
1407	);
1408
1409	$tex->draw_quad ($self->{ox}, $self->{oy});	1404	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1405	} else {
		1406	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1407	}
1410		1408
1411	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1412	glDisable GL_BLEND;
1413	}	1410	}
1414		1411
1415	#############################################################################	1412	#############################################################################
1416		1413
1417	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1452	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1453		1450
1454	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1455	}	1452	}
1456		1453
		1454	sub set_text {
		1455	my ($self, $text) = @_;
		1456
		1457	$self->{cursor} = length $text;
		1458	$self->_set_text ($text);
		1459	$self->check_size;
		1460	$self->update;
		1461	}
		1462
1457	sub get_text {	1463	sub get_text {
1458	$_[0]{text}	1464	$_[0]{text}
1459	}	1465	}
1460		1466
1461	sub size_request {	1467	sub size_request {
…		…
1468		1474
1469	sub size_allocate {	1475	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1471		1477
1472	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}
1474
1475	sub set_text {
1476	my ($self, $text) = @_;
1477
1478	$self->{cursor} = length $text;
1479	$self->_set_text ($text);
1480	$self->update;
1481	}	1479	}
1482		1480
1483	sub key_down {	1481	sub key_down {
1484	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1485		1483
…		…
1673		1671
1674	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1675	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1676	}	1674	}
1677		1675
1678	glEnable GL_BLEND;
1679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1683		1679
1684	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685		1681
1686	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1687	glDisable GL_BLEND;
1688		1683
1689	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1690	}	1685	}
1691		1686
1692	#############################################################################	1687	#############################################################################
…		…
1739		1734
1740	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741		1736
1742	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743		1738
1744	glEnable GL_BLEND;
1745	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1746	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747		1740
1748	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1749		1742
1750	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1751		1744
1752	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1753	glDisable GL_BLEND;
1754	}	1746	}
1755		1747
1756	#############################################################################	1748	#############################################################################
1757		1749
1758	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1801	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1802		1794
1803	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1804	}	1796	}
1805		1797
1806	glEnable GL_BLEND;
1807	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810		1800
1811	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1812		1802
1813	glDisable GL_BLEND;
1814	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1815	}	1804	}
1816		1805
1817	#############################################################################	1806	#############################################################################
1818		1807
…		…
2110	$page \|\|= 2;	2099	$page \|\|= 2;
2111		2100
2112	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114		2103
2115	glEnable GL_BLEND;
2116	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
2118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119		2106
2120	# draw background	2107	# draw background
2121	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2122		2109
2123	# draw handle	2110	# draw handle
2124	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2125		2112
2126	glDisable GL_BLEND;
2127	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
2128	}	2114	}
2129		2115
2130	#############################################################################	2116	#############################################################################
2131		2117
…		…
2142	fontsize => 1,	2128	fontsize => 1,
2143	can_events => 0,	2129	can_events => 0,
2144	#font => default_font	2130	#font => default_font
2145	@_,	2131	@_,
2146		2132
2147	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
2148	par => [],	2134	par => [],
2149	height => 0,	2135	height => 0,
2150	children => [	2136	children => [
2151	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
2152	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
…		…
2170		2156
2171	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2172		2158
2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174	$layout->set_width ($self->{children}[0]{w});	2160	$layout->set_width ($self->{children}[0]{w});
2175	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2176		2162
2177	($layout->size)[1]	2163	($layout->size)[1]
2178	}	2164	}
2179		2165
2180	sub reflow {	2166	sub reflow {
…		…
2236		2222
2237	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2223	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238	glClearColor 0, 0, 0, 0;	2224	glClearColor 0, 0, 0, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2240		2226
2241	glEnable GL_BLEND;
2242	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245		2229
2246	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2247		2231
…		…
2256		2240
2257	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2242	my $h = $par->[0];
2259		2243
2260	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2261	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2262		2247
2263	glColor @{ $par->[1] };
2264	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2265	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2266	}	2250	}
2267		2251
2268	$y += $h;	2252	$y += $h;
2269	}	2253	}
2270		2254
2271	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2272	glDisable GL_BLEND;
2273	};	2256	};
2274	});	2257	});
2275	}	2258	}
2276		2259
2277	sub _draw {	2260	sub _draw {
2278	my ($self) = @_;	2261	my ($self) = @_;
2279		2262
2280	glEnable GL_BLEND;
2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284	glColor 1, 1, 1, 1;	2265	glColor 1, 1, 1, 1;
2285	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2287	glDisable GL_BLEND;
2288		2268
2289	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2290		2270
2291	}	2271	}
2292		2272
…		…
2386	@_,	2366	@_,
2387	can_events => 0,	2367	can_events => 0,
2388	)	2368	)
2389	}	2369	}
2390		2370
2391	sub set_markup {	2371	sub set_tooltip_from {
2392	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2393		2373
2394	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2395	$self->{label}->set_markup ($text);	2375	markup => $widget->{tooltip},
		2376	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2377	fontsize => 0.8,
		2378	fg => [0, 0, 0, 1],
		2379	font => ($widget->{tooltip_font} \|\| $::FONT_PROP);
		2380
2396	$self->add ($self->{label});	2381	$self->add ($self->{label});
2397	}	2382	}
2398		2383
2399	sub size_request {	2384	sub size_request {
2400	my ($self) = @_;	2385	my ($self) = @_;
2401
2402	$self->child->set_max_size ($::WIDTH * 0.3);
2403		2386
2404	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405		2388
2406	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2407	}	2390	}
…		…
2464	}	2447	}
2465		2448
2466	sub _draw {	2449	sub _draw {
2467	my ($self) = @_;	2450	my ($self) = @_;
2468		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470		2454
2471	# TODO animation	2455	# TODO animation
2472	if ($tex) {	2456	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2462	}
		2463	}
		2464
		2465	#############################################################################
		2466
		2467	package CFClient::UI::InventoryItem;
		2468
		2469	our @ISA = CFClient::UI::HBox::;
		2470
		2471	sub new {
		2472	my $class = shift;
		2473
		2474	my %args = @_;
		2475
		2476	my $item = delete $args{item};
		2477
		2478	my $desc = $item->{nrof} < 2
		2479	? $item->{name}
		2480	: "$item->{nrof} $item->{name_pl}";
		2481
		2482
		2483	my $self = $class->SUPER::new (
		2484	can_hover => 1,
		2485	can_events => 1,
		2486	tooltip => (CFClient::UI::Label->escape ($desc)
		2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2488	connect_button_down => sub {
		2489	my ($self, $ev, $x, $y) = @_;
		2490
		2491	# todo: maybe put examine on 1? but should just be a tooltip :(
		2492	if ($ev->{button} == 1) {
		2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2494	} elsif ($ev->{button} == 2) {
		2495	$::CONN->send ("apply $item->{tag}");
		2496	} elsif ($ev->{button} == 3) {
		2497	CFClient::UI::Menu->new (
		2498	items => [
		2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2500	[
		2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2502	sub { $::CONN->send ("lock $item->{tag}") },
		2503	],
		2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2507	],
		2508	)->popup ($ev);
		2509	}
		2510
		2511	1
		2512	},
		2513	%args
		2514	);
		2515
		2516	$self->add (new CFClient::UI::Face
		2517	can_events => 0,
		2518	face => $item->{face},
		2519	anim => $item->{anim},
		2520	animspeed => $item->{animspeed},
		2521	);
		2522
		2523	$self->add (new CFClient::UI::Label
		2524	can_events => 0,
		2525	text => $desc,
		2526	);
		2527
		2528	$self
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Inventory;
		2534
		2535	our @ISA = CFClient::UI::ScrolledWindow::;
		2536
		2537	sub new {
		2538	my $class = shift;
		2539
		2540	my $self = $class->SUPER::new (
		2541	scrolled => (new CFClient::UI::VBox),
		2542	@_,
		2543	);
		2544
		2545	$self
		2546	}
		2547
		2548	sub set_items {
		2549	my ($self, $items) = @_;
		2550
		2551	$self->{scrolled}->clear;
		2552	return unless $items;
		2553
		2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2555
		2556	$self->{real_items} = \@items;
		2557
		2558	for my $item (@items) {
		2559	my $desc = $item->{nrof} < 2
		2560	? $item->{name}
		2561	: "$item->{nrof} $item->{name_pl}";
		2562
		2563	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
		2564	}
		2565
		2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571	($self->{req_w}, $self->{req_h});
2482	}	2572	}
2483		2573
2484	#############################################################################	2574	#############################################################################
2485		2575
2486	package CFClient::UI::Menu;	2576	package CFClient::UI::Menu;
…		…
2553	}	2643	}
2554	}	2644	}
2555		2645
2556	#############################################################################	2646	#############################################################################
2557		2647
		2648	package CFClient::UI::Statusbox;
		2649
		2650	our @ISA = CFClient::UI::VBox::;
		2651
		2652	sub reorder {
		2653	my ($self) = @_;
		2654	my $NOW = time;
		2655
		2656	while (my ($k, $v) = each %{ $self->{item} }) {
		2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2658	}
		2659
		2660	my @widgets;
		2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
		2662	my $count = 10 + 1;
		2663	for my $item (@items) {
		2664	last unless --$count;
		2665
		2666	push @widgets, $item->{label} \|\|= do {
		2667	# TODO: doesn't handle markup well (read as: at all)
		2668	my $short = delete $item->{text};
		2669	for ($short) {
		2670	s/^\s+//;
		2671	s/\012.*//s;
		2672	my $len = int 30 / $item->{fontsize};
		2673	substr $_, $len, length, "…" if $len < length;
		2674	}
		2675
		2676	new CFClient::UI::Label
		2677	markup => $short,
		2678	tooltip => delete $item->{tooltip},
		2679	tooltip_font => $::FONT_PROP,
		2680	tooltip_width => 0.75,
		2681	fontsize => delete $item->{fontsize},
		2682	color => delete $item->{color},
		2683	can_events => 1,
		2684	can_hover => 1,
		2685	};
		2686	}
		2687
		2688	$self->clear;
		2689	$self->SUPER::add (@widgets);
		2690	}
		2691
		2692	sub add {
		2693	my ($self, $text, %arg) = @_;
		2694
		2695	my $item = {
		2696	time => time,
		2697	text => $text,
		2698	timeout => 60,
		2699	tooltip => $text,
		2700	fontsize => 0.8,
		2701	color => [0.8, 0.8, 0.8, 0.8],
		2702	%arg,
		2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} \|\|= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} \|\|= $item;
		2709
		2710	$self->reorder;
		2711	}
		2712
		2713	#############################################################################
		2714
2558	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2559		2716
2560	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2561		2718
2562	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2563		2720
2564	sub check_size {	2721	sub new {
2565	my ($self) = @_;	2722	my $class = shift;
2566		2723
2567	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2568	}	2725	@_,
2569		2726	)
2570	sub size_request {
2571	($::WIDTH, $::HEIGHT)
2572	}	2727	}
2573		2728
2574	sub configure {	2729	sub configure {
2575	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2576		2731
2577	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2578		2735
		2736	sub check_size {
		2737	my ($self) = @_;
		2738
		2739	$self->size_allocate ($self->{w}, $self->{h})
		2740	if $self->{w};
		2741	}
		2742
		2743	sub size_request {
		2744	my ($self) = @_;
		2745
		2746	($self->{w}, $self->{h})
		2747	}
		2748
		2749	sub size_allocate {
		2750	my ($self, $w, $h) = @_;
		2751
		2752	my $old_w = $self->{old_w};
		2753	my $old_h = $self->{old_h};
		2754
		2755	if ($old_w && $old_h) {
		2756	for my $child ($self->children) {
		2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2765	}
		2766	}
		2767
2579	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2580	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581		2770
2582	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2583	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2584	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2585	}	2774	}
2586	}
2587		2775
2588	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2589	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2590		2782
2591	($x, $y)	2783	($x, $y)
2592	}	2784	}
2593		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2594	sub update {	2792	sub update {
2595	my ($self) = @_;	2793	my ($self) = @_;
2596		2794
2597	$self->check_size;	2795	$self->check_size;
2598	::refresh ();	2796	$::WANT_REFRESH++;
2599	}	2797	}
2600		2798
2601	sub add {	2799	sub add {
2602	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2603		2801
2604	# integerize window positions	2802	# integerise window positions
2605	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2606	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2607		2805
2608	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2609	}	2807	}
…		…
2612	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2613		2811
2614	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2615	}	2813	}
2616		2814
2617	sub draw {	2815	sub draw {
2618	my ($self) = @_;	2816	my ($self) = @_;
2619		2817
		2818	if ($self->{check_size}) {
		2819	my @queue = ([], []);
		2820
		2821	for (;;) {
		2822	if ($self->{check_size}) {
		2823	# heuristic: check containers last
		2824	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2825	for values %{delete $self->{check_size}}
		2826	}
		2827
		2828	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2829
		2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2831	? @$widget{qw(user_w user_h)}
		2832	: $widget->size_request;
		2833
		2834	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {
		2835	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2836
		2837	$widget->{req_w} = $w;
		2838	$widget->{req_h} = $h;
		2839
		2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2841
		2842	$widget->{parent}->check_size
		2843	if $widget->{parent};
		2844	}
		2845	}
		2846	}
		2847
		2848	while ($self->{size_alloc}) {
		2849	for (values %{delete $self->{size_alloc}}) {
		2850	my ($widget, $w, $h) = @$_;
		2851
		2852	$w = 0 if $w < 0;
		2853	$h = 0 if $h < 0;
		2854
		2855	$widget->{w} = $w;
		2856	$widget->{h} = $h;
		2857	$widget->size_allocate ($w, $h);
		2858	$widget->emit (size_allocate => $w, $h);
		2859	}
		2860	}
		2861
2620	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2621	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2622	}	2865	}
2623		2866
2624	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626	glClear GL_COLOR_BUFFER_BIT;	2869	glClear GL_COLOR_BUFFER_BIT;
…		…
2634	$self->_draw;	2877	$self->_draw;
2635	}	2878	}
2636		2879
2637	#############################################################################	2880	#############################################################################
2638		2881
2639	package CFClient::UI::Inventory;
2640
2641	our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643	sub new {
2644	my $class = shift;
2645
2646	my $self = $class->SUPER::new (
2647	scrolled => (new CFClient::UI::VBox),
2648	@_,
2649	);
2650
2651	$self
2652	}
2653
2654	sub set_items {
2655	my ($self, $items) = @_;
2656
2657	$self->{scrolled}->clear;
2658	return unless $items;
2659
2660	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662	$self->{real_items} = \@items;
2663
2664	for my $item (@items) {
2665	my $desc = $item->{nrof} < 2
2666	? $item->{name}
2667	: "$item->{nrof} $item->{name_pl}";
2668
2669	my $hb = new CFClient::UI::HBox;
2670
2671	$hb->add (my $f = new CFClient::UI::Face
2672	can_events => 0,
2673	face => $item->{face},
2674	anim => $item->{anim},
2675	animspeed => $item->{animspeed},
2676	expand => 1,
2677	);
2678	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679	$self->{scrolled}->add ($hb);
2680	}
2681
2682	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683	}
2684
2685	sub size_request {
2686	my ($self) = @_;
2687	(100, 200)
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI;	2882	package CFClient::UI;
2693		2883
2694	$ROOT = new CFClient::UI::Root;	2884	$ROOT = new CFClient::UI::Root;
2695	$TOOLTIP = new CFClient::UI::Tooltip;	2885	$TOOLTIP = new CFClient::UI::Tooltip;
2696		2886

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs. Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC