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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

…		…
31	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	32	$TOOLTIP->show;
33		33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
39		38
40	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
42	$TOOLTIP->update;	41	$TOOLTIP->update;
43	}	42	}
…		…
137	$rem += $_ - $i;	136	$rem += $_ - $i;
138	$_ = $i;	137	$_ = $i;
139	}	138	}
140	}	139	}
141		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
142	# call when resolution changes etc.	149	# call when resolution changes etc.
143	sub rescale_widgets {	150	sub rescale_widgets {
144	my ($sx, $sy) = @_;	151	my ($sx, $sy) = @_;
145		152
		153	# make a copy, otherwise for complains about freed values.
146	for my $widget (values %WIDGET) {	154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
147	if ($widget->{toplevel}) {	157	if ($widget->{toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
…		…
196	%$self = ();	206	%$self = ();
197	}	207	}
198		208
199	sub show {	209	sub show {
200	my ($self) = @_;	210	my ($self) = @_;
201
202	return if $self->{parent};	211	return if $self->{parent};
203		212
204	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
205	}	227	}
206		228
207	sub hide {	229	sub hide {
208	my ($self) = @_;	230	my ($self) = @_;
209		231
…		…
281	sub set_max_size {	303	sub set_max_size {
282	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
283		305
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
		308	}
		309
		310	sub set_tooltip {
		311	my ($self, $tooltip) = @_;
		312
		313	$self->{tooltip} = $tooltip;
		314
		315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
286	}	319	}
287		320
288	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
289	sub coord2local {	322	sub coord2local {
290	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
…		…
376	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
377	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
378	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
379	glEnd;	412	glEnd;
380	glPopMatrix;	413	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	415	}
383	}	416	}
384		417
385	sub _draw {	418	sub _draw {
386	my ($self) = @_;	419	my ($self) = @_;
…		…
406	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
407		440
408	# TODO: req_w _does_change after ->reconfigure	441	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	442	$self->check_size
410	unless exists $self->{req_w};	443	unless exists $self->{req_w};
		444
		445	$self->show;
411	}	446	}
412		447
413	sub check_size {	448	sub check_size {
414	my ($self, $forced) = @_;	449	my ($self, $forced) = @_;
415		450
…		…
456	my $class = shift;	491	my $class = shift;
457		492
458	# range [value, low, high, page]	493	# range [value, low, high, page]
459		494
460	$class->SUPER::new (	495	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
463	@_	498	@_
464	)	499	)
465	}	500	}
466		501
467	sub _draw {	502	sub _draw {
468	my ($self) = @_;	503	my ($self) = @_;
469		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 \|\| $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
471		511
472	glEnable GL_BLEND;	512	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
475		515
476	glBegin GL_QUADS;	516	glBegin GL_QUADS;
477	glVertex 0 , 0;	517	glVertex 0 , 0;
478	glVertex 0 , $h;	518	glVertex 0 , $h;
479	glVertex $w, $h;	519	glVertex $w, $h;
480	glVertex $w, 0;	520	glVertex $w, 0;
481	glEnd;	521	glEnd;
482		522
483	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
484	}	525	}
485		526
486	#############################################################################	527	#############################################################################
487		528
488	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
675		716
676	$self->_render;	717	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	718	};
685	}	719	}
686		720
687	sub _draw {	721	sub _draw {
688	my ($self) = @_;	722	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	726	my $tex = $self->{texture}
693	or return;	727	or return;
694		728
695	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
698		732
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		734
701	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
702	}	736	}
…		…
709		743
710	sub size_request {	744	sub size_request {
711	my ($self) = @_;	745	my ($self) = @_;
712		746
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		748
716	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
717	}	750	}
718		751
719	sub size_allocate {	752	sub size_allocate {
720	my ($self, $w, $h) = @_;	753	my ($self, $w, $h) = @_;
721		754
		755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
722	$self->update;	758	$self->update;
723	}	759	}
724		760
725	sub set_offset {	761	sub set_offset {
726	my ($self, $x, $y) = @_;	762	my ($self, $x, $y) = @_;
…		…
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
786	},	822	},
787	;	823	;
788		824
789	$self = $class->SUPER::new (	825	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	826	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	827	slider => $slider,
792	@_,	828	@_,
793	);	829	);
794		830
795	$self->{vp}->add ($self->{scrolled});	831	$self->{vp}->add ($self->{scrolled});
…		…
896	my ($self, $w, $h) = @_;	932	my ($self, $w, $h) = @_;
897		933
898	$h -= List::Util::max 0, $self->border * 2;	934	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	935	$w -= List::Util::max 0, $self->border * 2;
900		936
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	938	if $self->{title};
903		939
904	$self->child->configure ($self->border, $self->border, $w, $h);	940	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	941	}
906		942
…		…
1267		1303
1268	#############################################################################	1304	#############################################################################
1269		1305
1270	package CFClient::UI::Label;	1306	package CFClient::UI::Label;
1271		1307
1272	our @ISA = CFClient::UI::Base::;	1308	our @ISA = CFClient::UI::DrawBG::;
1273		1309
1274	use CFClient::OpenGL;	1310	use CFClient::OpenGL;
1275		1311
1276	sub new {	1312	sub new {
1277	my ($class, %arg) = @_;	1313	my ($class, %arg) = @_;
1278		1314
1279	my $self = $class->SUPER::new (	1315	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1316	fg => [1, 1, 1],
		1317	#bg => none
		1318	#active_bg => none
1281	#font => default_font	1319	#font => default_font
1282	#text => initial text	1320	#text => initial text
1283	#markup => initial narkup	1321	#markup => initial narkup
		1322	#max_w => maximum pixel width
		1323	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1324	layout => (new CFClient::Layout),
1285	fontsize => 1,	1325	fontsize => 1,
1286	align => -1,	1326	align => -1,
1287	valign => -1,	1327	valign => -1,
1288	padding => 2,	1328	padding => 2,
…		…
1303	}	1343	}
1304		1344
1305	$self	1345	$self
1306	}	1346	}
1307		1347
1308	sub escape {	1348	sub escape($) {
1309	local $_ = $_[1];	1349	local $_ = $_[0];
1310		1350
1311	s/&/&/g;	1351	s/&/&/g;
1312	s/>/>/g;	1352	s/>/>/g;
1313	s/</</g;	1353	s/</</g;
1314		1354
1315	$_[1]	1355	$_
1316	}	1356	}
1317		1357
1318	sub update {	1358	sub update {
1319	my ($self) = @_;	1359	my ($self) = @_;
1320		1360
…		…
1353	sub size_request {	1393	sub size_request {
1354	my ($self) = @_;	1394	my ($self) = @_;
1355		1395
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1396	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1397	$self->{layout}->set_width ($self->{max_w} \|\| -1);
		1398	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1399	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1401
1360	my ($w, $h) = $self->{layout}->size;	1402	my ($w, $h) = $self->{layout}->size;
1361		1403
1362	if (exists $self->{template}) {	1404	if (exists $self->{template}) {
…		…
1392	}	1434	}
1393		1435
1394	sub _draw {	1436	sub _draw {
1395	my ($self) = @_;	1437	my ($self) = @_;
1396		1438
		1439	$self->SUPER::_draw; # draw background, if applicable
		1440
1397	my $tex = $self->{texture} \|\|= do {	1441	my $tex = $self->{texture} \|\|= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1442	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1443	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1444	$self->{layout}->set_width ($self->{w});
		1445	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1448
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1449	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1450
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1453	: ($self->{w} - $tex->{w}) * 0.5);
1408		1454
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1457	: ($self->{h} - $tex->{h}) * 0.5);
1412		1458
1413	$tex	1459	$tex
1414	};	1460	};
1415		1461
1416	glEnable GL_TEXTURE_2D;	1462	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1490	active_fg => [0, 0, 0],
1445	can_hover => 1,	1491	can_hover => 1,
1446	can_focus => 1,	1492	can_focus => 1,
1447	valign => 0,	1493	valign => 0,
1448	can_events => 1,	1494	can_events => 1,
		1495	#text => ...
1449	@_	1496	@_
1450	)	1497	)
1451	}	1498	}
1452		1499
1453	sub _set_text {	1500	sub _set_text {
…		…
1471	sub set_text {	1518	sub set_text {
1472	my ($self, $text) = @_;	1519	my ($self, $text) = @_;
1473		1520
1474	$self->{cursor} = length $text;	1521	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1522	$self->_set_text ($text);
		1523	$self->update;
1476	$self->check_size;	1524	$self->check_size;
1477	$self->update;
1478	}	1525	}
1479		1526
1480	sub get_text {	1527	sub get_text {
1481	$_[0]{text}	1528	$_[0]{text}
1482	}	1529	}
…		…
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1569	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1570	}
1524		1571
1525	$self->_set_text ($text);	1572	$self->_set_text ($text);
1526	$self->update;	1573	$self->update;
		1574	$self->check_size;
1527	}	1575	}
1528		1576
1529	sub focus_in {	1577	sub focus_in {
1530	my ($self) = @_;	1578	my ($self) = @_;
1531		1579
…		…
1660	my $class = shift;	1708	my $class = shift;
1661		1709
1662	$class->SUPER::new (	1710	$class->SUPER::new (
1663	padding => 4,	1711	padding => 4,
1664	fg => [1, 1, 1],	1712	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1713	active_fg => [0, 0, 1],
1667	can_hover => 1,	1714	can_hover => 1,
1668	align => 0,	1715	align => 0,
1669	valign => 0,	1716	valign => 0,
1670	can_events => 1,	1717	can_events => 1,
…		…
1718		1765
1719	$class->SUPER::new (	1766	$class->SUPER::new (
1720	padding => 2,	1767	padding => 2,
1721	fg => [1, 1, 1],	1768	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1769	active_fg => [1, 1, 0],
		1770	bg => [0, 0, 0, 0.2],
		1771	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1772	state => 0,
1724	can_hover => 1,	1773	can_hover => 1,
1725	@_	1774	@_
1726	)	1775	)
1727	}	1776	}
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2060	qw(s1_slider.png s1_slider_bg.png);
2012		2061
2013	sub new {	2062	sub new {
2014	my $class = shift;	2063	my $class = shift;
2015		2064
2016	# range [value, low, high, page]	2065	# range [value, low, high, page, unit]
2017		2066
2018	# TODO: 0-width page	2067	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2068	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2069	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2070	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2071	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2072	active_fg => [0, 0, 0],
		2073	bg => [0, 0, 0, 0.2],
		2074	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2075	range => [0, 0, 100, 10],
2025	req_w => $::WIDTH / 80,	2076	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2077	req_h => $::WIDTH / 80,
2027	vertical => 0,	2078	vertical => 0,
2028	can_hover => 1,	2079	can_hover => 1,
2029	inner_pad => 5,	2080	inner_pad => 0.02,
2030	@_	2081	@_
2031	);	2082	);
2032		2083
		2084	$self->set_value ($self->{range}[0]);
		2085	$self->update;
		2086
2033	$self	2087	$self
		2088	}
		2089
		2090	sub set_range {
		2091	my ($self, $range) = @_;
		2092
		2093	$self->{range} = $range;
		2094
		2095	$self->update;
		2096	}
		2097
		2098	sub set_value {
		2099	my ($self, $value) = @_;
		2100
		2101	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2102
		2103	$hi = $lo + 1 if $hi <= $lo;
		2104
		2105	$value = $lo if $value < $lo;
		2106	$value = $hi if $value > $hi;
		2107
		2108	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2109	if $unit;
		2110
		2111	$page = $hi - $lo if $page > $hi - $lo;
		2112
		2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2114
		2115	if ($value != $old_value) {
		2116	$self->emit (changed => $value);
		2117	$self->update;
		2118	}
2034	}	2119	}
2035		2120
2036	sub size_request {	2121	sub size_request {
2037	my ($self) = @_;	2122	my ($self) = @_;
2038		2123
…		…
2051		2136
2052	sub mouse_motion {	2137	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2138	my ($self, $ev, $x, $y) = @_;
2054		2139
2055	if ($GRAB == $self) {	2140	if ($GRAB == $self) {
		2141	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2142
		2143	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2144
		2145	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2146
		2147	$self->set_value ($x * ($hi - $lo) + $lo);
		2148	}
		2149	}
		2150
		2151	sub update {
		2152	my ($self) = @_;
		2153
		2154	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2155	$self->set_value ($self->{range}[0]);
		2156
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2157	my ($value, $lo, $hi, $page) = @{$self->{range}};
2057		2158
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2159	my $inner_w = 1 - 2 * $self->{inner_pad};
2059		2160
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2161	$self->{scale} = ($inner_w / ($hi - $lo)) \|\| 1;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2062		2162
2063	$x -= $inner_pad_px; # substract the padding	2163	$page = $self->{scale} * $page \|\| 10 / ($self->{w} \|\| 1);
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2164	$value = $self->{scale} * ($value - $lo);
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2165
2069	$self->emit (changed => $x);	2166	$value = $self->{inner_pad} + ($value - $page * 0.5);
2070	$self->update;	2167
		2168	$value = 0 if $value < 0;
		2169	$page = 1 - $value if $value + $page > 1;
		2170
		2171	$self->{knob_x} = $value;
		2172	$self->{knob_w} = $page;
2071	}	2173	});
2072	}
2073		2174
2074	# the inner_* stuff is for generating a padding for the slider handle,	2175	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2176	}
2081		2177
2082	sub _draw {	2178	sub _draw {
2083	my ($self) = @_;	2179	my ($self) = @_;
2084		2180
2085	$self->SUPER::_draw ();	2181	$self->SUPER::_draw ();
2086		2182
2087	my ($w, $h) = @$self{qw(w h)};	2183	glScale $self->{w}, $self->{h};
2088		2184
2089	if ($self->{vertical}) {	2185	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2186	# draw a vertical slider like a rotated horizontal slider
2091		2187
		2188	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2189	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2190	}
2097		2191
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2192	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2193	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2194
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page \|\|= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2195	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2196	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2197
2122	# draw background	2198	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2199	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2200
2125	# draw handle	2201	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2202	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2203
2128	glDisable GL_TEXTURE_2D;	2204	glDisable GL_TEXTURE_2D;
2129	}	2205	}
		2206
		2207	#############################################################################
		2208
		2209	package CFClient::UI::ValSlider;
		2210
		2211	our @ISA = CFClient::UI::HBox::;
		2212
		2213	sub new {
		2214	my ($class, %arg) = @_;
		2215
		2216	my $range = delete $arg{range};
		2217
		2218	my $self = $class->SUPER::new (
		2219	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2220	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2221	to_value => sub { shift },
		2222	from_value => sub { shift },
		2223	%arg,
		2224	);
		2225
		2226	$self->{slider}->connect (changed => sub {
		2227	my ($self, $value) = @_;
		2228	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2229	$self->{parent}->emit (changed => $value);
		2230	});
		2231
		2232	# $self->{entry}->connect (changed => sub {
		2233	# my ($self, $value) = @_;
		2234	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2235	# $self->{parent}->emit (changed => $value);
		2236	# });
		2237
		2238	$self->add ($self->{slider}, $self->{entry});
		2239
		2240	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2241
		2242	$self
		2243	}
		2244
		2245	sub set_range { shift->{slider}->set_range (@_) }
		2246	sub set_value { shift->{slider}->set_value (@_) }
2130		2247
2131	#############################################################################	2248	#############################################################################
2132		2249
2133	package CFClient::UI::TextView;	2250	package CFClient::UI::TextView;
2134		2251
…		…
2164		2281
2165	$self->{fontsize} = $fontsize;	2282	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2283	$self->reflow;
2167	}	2284	}
2168		2285
		2286	sub size_allocate {
		2287	my ($self, $w, $h) = @_;
		2288
		2289	$self->SUPER::size_allocate ($w, $h);
		2290
		2291	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2292	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2293	$self->{layout}->set_width ($self->{children}[0]{w});
		2294
		2295	$self->reflow;
		2296	}
		2297
2169	sub text_height {	2298	sub text_height {
2170	my ($self, $text) = @_;	2299	my ($self, $text, $indent) = @_;
2171		2300
2172	my $layout = $self->{layout};	2301	my $layout = $self->{layout};
2173		2302
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});	2304	$layout->set_width ($self->{children}[0]{w} - $indent);
2176	$layout->set_markup ($text);	2305	$layout->set_markup ($text);
2177		2306
2178	($layout->size)[1]	2307	($layout->size)[1]
2179	}	2308	}
2180		2309
…		…
2183		2312
2184	$self->{need_reflow}++;	2313	$self->{need_reflow}++;
2185	$self->update;	2314	$self->update;
2186	}	2315	}
2187		2316
2188	sub size_allocate {
2189	my ($self, $w, $h) = @_;
2190
2191	$self->SUPER::size_allocate ($w, $h);
2192
2193	$self->{layout}->set_font ($self->{font}) if $self->{font};
2194	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2195	$self->{layout}->set_width ($self->{children}[0]{w});
2196
2197	$self->reflow;
2198	}
2199
2200	sub add_paragraph {	2317	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2318	my ($self, $color, $text, $indent) = @_;
2202		2319
2203	#TODO: intelligently "reformat" paragraph	2320	#TODO: intelligently "reformat" paragraph
2204		2321
		2322	for my $line (split /\n/, $text) {
2205	my $height = $self->text_height ($text);	2323	my $height = $self->text_height ($line);
2206
2207	$self->{height} += $height;	2324	$self->{height} += $height;
2208
2209	push @{$self->{par}}, [$height, $color, $text];	2325	push @{$self->{par}}, [$height, $color, $indent, $line];
		2326	}
2210		2327
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2328	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2212	$self->{children}[1]->update;	2329	$self->{children}[1]->update;
2213	}	2330	}
2214		2331
…		…
2223		2340
2224	$ROOT->on_post_alloc ($self, sub {	2341	$ROOT->on_post_alloc ($self, sub {
2225	if (delete $self->{need_reflow}) {	2342	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2343	my $height = 0;
2227		2344
2228	$height += $_->[0] = $self->text_height ($_->[2])	2345	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2229	for @{$self->{par}};	2346	for @{$self->{par}};
2230		2347
2231	$self->{height} = $height;	2348	$self->{height} = $height;
2232		2349
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2350	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2351	$self->{children}[1]->update;
2234		2352
2235	delete $self->{texture};	2353	delete $self->{texture};
2236	}	2354	}
2237		2355
2238	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2356	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2239	glClearColor 0, 0, 0, 0;	2357	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2358	glClear GL_COLOR_BUFFER_BIT;
2241
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244		2359
2245	my $top = int $self->{children}[1]{range}[0];	2360	my $top = int $self->{children}[1]{range}[0];
2246		2361
2247	my $y0 = $top;	2362	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2363	my $y1 = $top + $self->{h};
…		…
2251		2366
2252	my $layout = $self->{layout};	2367	my $layout = $self->{layout};
2253		2368
2254	$layout->set_font ($self->{font}) if $self->{font};	2369	$layout->set_font ($self->{font}) if $self->{font};
2255		2370
		2371	glEnable GL_BLEND;
		2372	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2373
2256	for my $par (@{$self->{par}}) {	2374	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2375	my $h = $par->[0];
2258		2376
2259	if ($y0 < $y + $h && $y < $y1) {	2377	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2378	$layout->set_foreground (@{ $par->[1] });
		2379	$layout->set_width ($self->{w} - $par->[2]);
2261	$layout->set_markup ($par->[2]);	2380	$layout->set_markup ($par->[3]);
2262		2381
2263	my ($W, $H) = $layout->size;	2382	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2383
		2384	glRasterPos $par->[2], $y - $y0;
		2385	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2386	}
2266		2387
2267	$y += $h;	2388	$y += $h;
2268	}	2389	}
2269		2390
2270	glDisable GL_TEXTURE_2D;	2391	glDisable GL_BLEND;
2271	};	2392	};
2272	});	2393	});
2273	}	2394	}
2274		2395
2275	sub _draw {	2396	sub _draw {
2276	my ($self) = @_;	2397	my ($self) = @_;
2277		2398
2278	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2401	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2402	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2403	glDisable GL_TEXTURE_2D;
2283		2404
2284	$self->{children}[1]->draw;	2405	$self->{children}[1]->draw;
2285		2406
2286	}	2407	}
…		…
2385		2506
2386	sub set_tooltip_from {	2507	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2508	my ($self, $widget) = @_;
2388		2509
2389	$self->add (new CFClient::UI::Label	2510	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2511	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2512	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2513	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2514	fg => [0, 0, 0, 1],
		2515	ellipsise => 0,
2394	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2516	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
2395	);	2517	);
2396	}	2518	}
2397		2519
2398	sub size_request {	2520	sub size_request {
2399	my ($self) = @_;	2521	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2567	use CFClient::OpenGL;
2446		2568
2447	sub new {	2569	sub new {
2448	my $class = shift;	2570	my $class = shift;
2449		2571
2450	$class->SUPER::new (	2572	my $self = $class->SUPER::new (
2451	aspect => 1,	2573	aspect => 1,
2452	@_,	2574	@_,
2453	)	2575	);
		2576
		2577	if ($self->{anim} && $self->{animspeed}) {
		2578	Scalar::Util::weaken (my $widget = $self);
		2579
		2580	$self->{timer} = Event->timer (
		2581	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2582	hard => 1,
		2583	interval => $self->{animspeed},
		2584	cb => sub {
		2585	++$widget->{frame};
		2586	$widget->update;
		2587	},
		2588	);
		2589	}
		2590
		2591	$self
2454	}	2592	}
2455		2593
2456	sub size_request {	2594	sub size_request {
2457	(32, 8)	2595	(32, 8)
2458	}	2596	}
2459		2597
		2598	sub update {
		2599	my ($self) = @_;
		2600
		2601	return unless $self->{visible};
		2602
		2603	$self->SUPER::update;
		2604	}
		2605
2460	sub _draw {	2606	sub _draw {
2461	my ($self) = @_;	2607	my ($self) = @_;
2462		2608
2463	return unless $::CONN;#d# manage and cache textures differently	2609	return unless $::CONN;#d# manage and cache textures differently
		2610
		2611	my $face;
		2612
		2613	if ($self->{frame}) {
		2614	my $anim = $::CONN->{anim}[$self->{anim}];
		2615
		2616	$face = $anim->[ $self->{frame} % @$anim ]
		2617	if $anim && @$anim;
		2618	}
		2619
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2620	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2465		2621
2466	# TODO animation
2467	if ($tex) {	2622	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2623	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2625	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2626	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2627	glDisable GL_TEXTURE_2D;
2473	}	2628	}
2474	}	2629	}
2475		2630
		2631	sub DESTROY {
		2632	my ($self) = @_;
		2633
		2634	$self->{timer}->cancel
		2635	if $self->{timer};
		2636
		2637	$self->SUPER::DESTROY;
		2638	}
		2639
2476	#############################################################################	2640	#############################################################################
2477		2641
2478	package CFClient::UI::InventoryItem;	2642	package CFClient::UI::InventoryItem;
2479		2643
2480	our @ISA = CFClient::UI::HBox::;	2644	our @ISA = CFClient::UI::HBox::;
		2645
		2646	sub _item_to_desc {
		2647	my ($item) = @_;
		2648
		2649	my $desc =
		2650	$item->{nrof} < 2
		2651	? $item->{name}
		2652	: "$item->{nrof} × $item->{name_pl}";
		2653
		2654	$item->{flags} & Crossfire::Protocol::F_OPEN
		2655	and $desc .= " (open)";
		2656	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2657	and $desc .= " (applied)";
		2658	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2659	and $desc .= " (unpaid)";
		2660	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2661	and $desc .= " (magic)";
		2662	$item->{flags} & Crossfire::Protocol::F_CURSED
		2663	and $desc .= " (cursed)";
		2664	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2665	and $desc .= " (damned)";
		2666	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2667	and $desc .= " *";
		2668
		2669	$desc
		2670	}
2481		2671
2482	sub new {	2672	sub new {
2483	my $class = shift;	2673	my $class = shift;
2484		2674
2485	my %args = @_;	2675	my %args = @_;
2486		2676
2487	my $item = delete $args{item};	2677	my $item = delete $args{item};
2488		2678
2489	my $desc = $item->{nrof} < 2	2679	my $desc = _item_to_desc ($item);
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493		2680
2494	my $self = $class->SUPER::new (	2681	my $self = $class->SUPER::new (
2495	can_hover => 1,	2682	can_hover => 1,
2496	can_events => 1,	2683	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)	2684	tooltip => ((CFClient::UI::Label::escape $desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2685	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {	2686	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;	2687	my ($self, $ev, $x, $y) = @_;
2501		2688
2502	# todo: maybe put examine on 1? but should just be a tooltip :(	2689	# todo: maybe put examine on 1? but should just be a tooltip :(
		2690	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2691	my $targ = $::CONN->{player}{tag};
		2692
		2693	if ($item->{container} == $::CONN->{player}{tag}) {
		2694	$targ = $main::OPENCONT;
		2695	}
		2696
		2697	$::CONN->send ("move $targ $item->{tag} 0");
2503	if ($ev->{button} == 1) {	2698	} elsif ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2699	$::CONN->send ("examine $item->{tag}");
2505	} elsif ($ev->{button} == 2) {	2700	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");	2701	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {	2702	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (	2703	my @menu_items = (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2704	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2705	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2706	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2707	(
		2708	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2709	? (
		2710	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2711	)
		2712	: (
		2713	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2714	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2715	)
2518	],	2716	),
2519	)->popup ($ev);	2717	);
		2718
		2719	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520	}	2720	}
2521		2721
2522	1	2722	1
2523	},	2723	},
2524	%args	2724	%args
2525	);	2725	);
		2726
2526		2727
2527	$self->add (new CFClient::UI::Face	2728	$self->add (new CFClient::UI::Face
2528	can_events => 0,	2729	can_events => 0,
2529	face => $item->{face},	2730	face => $item->{face},
2530	anim => $item->{anim},	2731	anim => $item->{anim},
2531	animspeed => $item->{animspeed},	2732	animspeed => $item->{animspeed},
2532	);	2733	);
2533		2734
2534	$self->add (new CFClient::UI::Label	2735	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535	can_events => 0,	2736
2536	text => $desc,	2737	$self->{item} = $item;
2537	);	2738
		2739	$self->update_item;
2538		2740
2539	$self	2741	$self
		2742	}
		2743
		2744	sub update_item {
		2745	my ($self) = @_;
		2746
		2747	my $desc = _item_to_desc ($self->{item});
		2748
		2749	$self->{name_lbl}->set_text ($desc);
2540	}	2750	}
2541		2751
2542	#############################################################################	2752	#############################################################################
2543		2753
2544	package CFClient::UI::Inventory;	2754	package CFClient::UI::Inventory;
…		…
2547		2757
2548	sub new {	2758	sub new {
2549	my $class = shift;	2759	my $class = shift;
2550		2760
2551	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),	2762	scrolled => (new CFClient::UI::Table),
2553	@_,	2763	@_,
2554	);	2764	);
2555		2765
2556	$self	2766	$self
2557	}	2767	}
…		…
2568	} @$items;	2778	} @$items;
2569		2779
2570	$self->{real_items} = \@items;	2780	$self->{real_items} = \@items;
2571		2781
2572	for my $item (@items) {	2782	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2783	$item->{item} = $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576
2577	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;	2784	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
		2785	$item->update_item ();
2578	}	2786	}
2579		2787
		2788	my $i = 0;
		2789	for (@items) {
2580	$self->{scrolled}->add (@items);	2790	$self->{scrolled}->add (0, $i, $_);
		2791	my $nrof = $_->{item}->{nrof} \|\| 1;
		2792	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2793	}
2581		2794
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2795	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2796	}
2584		2797
2585	sub size_request {	2798	sub size_request {
…		…
2663		2876
2664	package CFClient::UI::Statusbox;	2877	package CFClient::UI::Statusbox;
2665		2878
2666	our @ISA = CFClient::UI::VBox::;	2879	our @ISA = CFClient::UI::VBox::;
2667		2880
		2881	sub new {
		2882	my $class = shift;
		2883
		2884	$class->SUPER::new (
		2885	fontsize => 0.8,
		2886	@_,
		2887	)
		2888	}
		2889
2668	sub reorder {	2890	sub reorder {
2669	my ($self) = @_;	2891	my ($self) = @_;
2670	my $NOW = time;	2892	my $NOW = time;
2671		2893
2672	while (my ($k, $v) = each %{ $self->{item} }) {	2894	while (my ($k, $v) = each %{ $self->{item} }) {
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2912	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2913	: $item->{text};
2692		2914
2693	for ($short) {	2915	for ($short) {
2694	s/^\s+//;	2916	s/^\s+//;
2695	s/\012.*/…/s;	2917	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2918	}
2699		2919
2700	new CFClient::UI::Label	2920	new CFClient::UI::Label
2701	markup => $short,	2921	markup => $short,
2702	tooltip => $item->{tooltip},	2922	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2923	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2924	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2925	fontsize => $item->{fontsize} \|\| $self->{fontsize},
		2926	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2927	fg => $item->{fg},
2707	can_events => 1,	2928	can_events => 1,
2708	can_hover => 1	2929	can_hover => 1
2709	};	2930	};
2710	}	2931	}
2711		2932
…		…
2737	$self->{item}{$group} = {	2958	$self->{item}{$group} = {
2738	id => ++$self->{id},	2959	id => ++$self->{id},
2739	text => $text,	2960	text => $text,
2740	timeout => $timeout,	2961	timeout => $timeout,
2741	tooltip => $text,	2962	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2963	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2964	pri => 0,
2745	count => 1,	2965	count => 1,
2746	%arg,	2966	%arg,
2747	};	2967	};
2748	}	2968	}
2749		2969
2750	$self->reorder;	2970	$self->reorder;
2751	}	2971	}
2752		2972
		2973	sub reconfigure {
		2974	my ($self) = @_;
		2975
		2976	delete $_->{label}
		2977	for values %{ $self->{item} \|\| {} };
		2978
		2979	$self->reorder;
		2980	$self->SUPER::reconfigure;
		2981	}
		2982
2753	#############################################################################	2983	#############################################################################
2754		2984
2755	package CFClient::UI::Root;	2985	package CFClient::UI::Root;
2756		2986
2757	our @ISA = CFClient::UI::Container::;	2987	our @ISA = CFClient::UI::Container::;
…		…
2796	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);	3026	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2797		3027
2798	for my $child ($self->children) {	3028	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3030
		3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3032	if exists $child->{req_x};
		3033
		3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3035	if exists $child->{req_y};
		3036
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3039
2803	$child->configure ($X, $Y, $W, $H);	3040	$child->configure ($X, $Y, $W, $H);
2804	}	3041	}
2805	}	3042	}
2806		3043
2807	sub coord2local {	3044	sub coord2local {
…		…
2833	$child->{x} = int $child->{x};	3070	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3071	$child->{y} = int $child->{y};
2835	}	3072	}
2836		3073
2837	$self->SUPER::add (@children);	3074	$self->SUPER::add (@children);
		3075
		3076	while (@children) {
		3077	my $w = pop @children;
		3078	push @children, $w->children;
		3079	$w->{visible} = 1;
		3080	}
		3081	}
		3082
		3083	sub remove {
		3084	my ($self, @children) = @_;
		3085
		3086	$self->SUPER::remove (@children);
		3087
		3088	while (@children) {
		3089	my $w = pop @children;
		3090	push @children, $w->children;
		3091	delete $w->{visible};
		3092	}
2838	}	3093	}
2839		3094
2840	sub on_refresh {	3095	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3096	my ($self, $id, $cb) = @_;
2842		3097
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3166	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3167	glClear GL_COLOR_BUFFER_BIT;
2913		3168
2914	glMatrixMode GL_PROJECTION;	3169	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3170	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3171	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3172	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3173	glLoadIdentity;
2919		3174
2920	$self->_draw;	3175	$self->_draw;
2921	}	3176	}
…		…
2923	#############################################################################	3178	#############################################################################
2924		3179
2925	package CFClient::UI;	3180	package CFClient::UI;
2926		3181
2927	$ROOT = new CFClient::UI::Root;	3182	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3183	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3184
2930	1	3185	1
2931		3186

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs. Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC