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

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.195 by root, Thu May 11 23:54:31 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.195 by root, Thu May 11 23:54:31 2006 UTC