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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.202 by root, Sun May 14 20:51:19 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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC