[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.229 by root, Wed May 24 21:49:58 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) = @_;
…		…
780		816
781	my $slider = new CFClient::UI::Slider	817	my $slider = new CFClient::UI::Slider
782	vertical => 1,	818	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	819	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	820	connect_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1]);
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});
796	$self->add ($self->{vp});	832	$self->add ($self->{vp});
797	$self->add ($self->{slider});	833	$self->add ($self->{slider});
798		834
799	$self	835	$self
		836	}
		837
		838	sub size_allocate {
		839	my ($self, $w, $h) = @_;
		840
		841	$self->SUPER::size_allocate ($w, $h);
		842
		843	my $child = $self->{vp}->child;
		844	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	845	}
801		846
802	#TODO# update range on size_allocate depending on child	847	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	848	# update viewport offset on scroll
804		849
…		…
896	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
897		942
898	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
900		945
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	946	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	947	if $self->{title};
903		948
904	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	950	}
906		951
…		…
1267		1312
1268	#############################################################################	1313	#############################################################################
1269		1314
1270	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1271		1316
1272	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1273		1318
1274	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1275		1320
1276	sub new {	1321	sub new {
1277	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1278		1323
1279	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1281	#font => default_font	1328	#font => default_font
1282	#text => initial text	1329	#text => initial text
1283	#markup => initial narkup	1330	#markup => initial narkup
		1331	#max_w => maximum pixel width
		1332	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1333	layout => (new CFClient::Layout),
1285	fontsize => 1,	1334	fontsize => 1,
1286	align => -1,	1335	align => -1,
1287	valign => -1,	1336	valign => -1,
1288	padding => 2,	1337	padding => 2,
…		…
1303	}	1352	}
1304		1353
1305	$self	1354	$self
1306	}	1355	}
1307		1356
1308	sub escape {	1357	sub escape($) {
1309	local $_ = $_[1];	1358	local $_ = $_[0];
1310		1359
1311	s/&/&/g;	1360	s/&/&/g;
1312	s/>/>/g;	1361	s/>/>/g;
1313	s/</</g;	1362	s/</</g;
1314		1363
1315	$_[1]	1364	$_
1316	}	1365	}
1317		1366
1318	sub update {	1367	sub update {
1319	my ($self) = @_;	1368	my ($self) = @_;
1320		1369
…		…
1353	sub size_request {	1402	sub size_request {
1354	my ($self) = @_;	1403	my ($self) = @_;
1355		1404
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1406	$self->{layout}->set_width ($self->{max_w} \|\| -1);
		1407	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1408	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1410
1360	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1361		1412
1362	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1392	}	1443	}
1393		1444
1394	sub _draw {	1445	sub _draw {
1395	my ($self) = @_;	1446	my ($self) = @_;
1396		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1397	my $tex = $self->{texture} \|\|= do {	1450	my $tex = $self->{texture} \|\|= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1451	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1453	$self->{layout}->set_width ($self->{w});
		1454	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1455	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1457
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1458	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1459
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1460	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1461	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1462	: ($self->{w} - $tex->{w}) * 0.5);
1408		1463
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1464	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1465	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1466	: ($self->{h} - $tex->{h}) * 0.5);
1412		1467
1413	$tex	1468	$tex
1414	};	1469	};
1415		1470
1416	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1445	can_hover => 1,	1500	can_hover => 1,
1446	can_focus => 1,	1501	can_focus => 1,
1447	valign => 0,	1502	valign => 0,
1448	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1449	@_	1505	@_
1450	)	1506	)
1451	}	1507	}
1452		1508
1453	sub _set_text {	1509	sub _set_text {
…		…
1471	sub set_text {	1527	sub set_text {
1472	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1473		1529
1474	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1531	$self->_set_text ($text);
		1532	$self->update;
1476	$self->check_size;	1533	$self->check_size;
1477	$self->update;
1478	}	1534	}
1479		1535
1480	sub get_text {	1536	sub get_text {
1481	$_[0]{text}	1537	$_[0]{text}
1482	}	1538	}
…		…
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1579	}
1524		1580
1525	$self->_set_text ($text);	1581	$self->_set_text ($text);
1526	$self->update;	1582	$self->update;
		1583	$self->check_size;
1527	}	1584	}
1528		1585
1529	sub focus_in {	1586	sub focus_in {
1530	my ($self) = @_;	1587	my ($self) = @_;
1531		1588
…		…
1660	my $class = shift;	1717	my $class = shift;
1661		1718
1662	$class->SUPER::new (	1719	$class->SUPER::new (
1663	padding => 4,	1720	padding => 4,
1664	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1667	can_hover => 1,	1723	can_hover => 1,
1668	align => 0,	1724	align => 0,
1669	valign => 0,	1725	valign => 0,
1670	can_events => 1,	1726	can_events => 1,
…		…
1718		1774
1719	$class->SUPER::new (	1775	$class->SUPER::new (
1720	padding => 2,	1776	padding => 2,
1721	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1778	active_fg => [1, 1, 0],
		1779	bg => [0, 0, 0, 0.2],
		1780	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1781	state => 0,
1724	can_hover => 1,	1782	can_hover => 1,
1725	@_	1783	@_
1726	)	1784	)
1727	}	1785	}
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
2012		2070
2013	sub new {	2071	sub new {
2014	my $class = shift;	2072	my $class = shift;
2015		2073
2016	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
2017		2075
2018	# TODO: 0-width page	2076	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2078	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2081	active_fg => [0, 0, 0],
		2082	bg => [0, 0, 0, 0.2],
		2083	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2085	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2086	req_h => $::WIDTH / 80,
2027	vertical => 0,	2087	vertical => 0,
2028	can_hover => 1,	2088	can_hover => 1,
2029	inner_pad => 5,	2089	inner_pad => 0.02,
2030	@_	2090	@_
2031	);	2091	);
2032		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
2033	$self	2096	$self
		2097	}
		2098
		2099	sub set_range {
		2100	my ($self, $range) = @_;
		2101
		2102	$self->{range} = $range;
		2103
		2104	$self->update;
		2105	}
		2106
		2107	sub set_value {
		2108	my ($self, $value) = @_;
		2109
		2110	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2111
		2112	$hi = $lo + 1 if $hi <= $lo;
		2113
		2114	$page = $hi - $lo if $page > $hi - $lo;
		2115
		2116	$value = $lo if $value < $lo;
		2117	$value = $hi - $page if $value > $hi - $page;
		2118
		2119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2120	if $unit;
		2121
		2122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2123
		2124	if ($value != $old_value) {
		2125	$self->emit (changed => $value);
		2126	$self->update;
		2127	}
2034	}	2128	}
2035		2129
2036	sub size_request {	2130	sub size_request {
2037	my ($self) = @_;	2131	my ($self) = @_;
2038		2132
…		…
2044		2138
2045	sub button_down {	2139	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
2047		2141
2048	$self->SUPER::button_down ($ev, $x, $y);	2142	$self->SUPER::button_down ($ev, $x, $y);
		2143
		2144	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2145
2049	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
2050	}	2147	}
2051		2148
2052	sub mouse_motion {	2149	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
2054		2151
2055	if ($GRAB == $self) {	2152	if ($GRAB == $self) {
		2153	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2154
		2155	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2156
		2157	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2158
		2159	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2160	}
		2161	}
		2162
		2163	sub update {
		2164	my ($self) = @_;
		2165
		2166	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2167	$self->set_value ($self->{range}[0]);
		2168
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) \|\| 1e-100;
2057		2171
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) \|\| 0.1;
2059		2173
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2175	$self->{scale} = 1 - 2 * $self->{offset} \|\| 1e-100;
2062		2176
2063	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2179
2069	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2181	$self->{knob_w} = $knob_w;
2071	}	2182	});
2072	}
2073		2183
2074	# the inner_* stuff is for generating a padding for the slider handle,	2184	$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	}	2185	}
2081		2186
2082	sub _draw {	2187	sub _draw {
2083	my ($self) = @_;	2188	my ($self) = @_;
2084		2189
2085	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
2086		2191
2087	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
2088		2193
2089	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
2091		2196
		2197	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2199	}
2097		2200
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2203
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;	2204	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2206
2122	# draw background	2207	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2209
2125	# draw handle	2210	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2211	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2212
2128	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2129	}	2214	}
		2215
		2216	#############################################################################
		2217
		2218	package CFClient::UI::ValSlider;
		2219
		2220	our @ISA = CFClient::UI::HBox::;
		2221
		2222	sub new {
		2223	my ($class, %arg) = @_;
		2224
		2225	my $range = delete $arg{range};
		2226
		2227	my $self = $class->SUPER::new (
		2228	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2229	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2230	to_value => sub { shift },
		2231	from_value => sub { shift },
		2232	%arg,
		2233	);
		2234
		2235	$self->{slider}->connect (changed => sub {
		2236	my ($self, $value) = @_;
		2237	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2238	$self->{parent}->emit (changed => $value);
		2239	});
		2240
		2241	# $self->{entry}->connect (changed => sub {
		2242	# my ($self, $value) = @_;
		2243	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2244	# $self->{parent}->emit (changed => $value);
		2245	# });
		2246
		2247	$self->add ($self->{slider}, $self->{entry});
		2248
		2249	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2250
		2251	$self
		2252	}
		2253
		2254	sub set_range { shift->{slider}->set_range (@_) }
		2255	sub set_value { shift->{slider}->set_value (@_) }
2130		2256
2131	#############################################################################	2257	#############################################################################
2132		2258
2133	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2134		2260
…		…
2164		2290
2165	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2292	$self->reflow;
2167	}	2293	}
2168		2294
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2295	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2190		2297
2191	$self->SUPER::size_allocate ($w, $h);	2298	$self->SUPER::size_allocate ($w, $h);
2192		2299
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2303
2197	$self->reflow;	2304	$self->reflow;
2198	}	2305	}
2199		2306
		2307	sub text_size {
		2308	my ($self, $text, $indent) = @_;
		2309
		2310	my $layout = $self->{layout};
		2311
		2312	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2313	$layout->set_width ($self->{children}[0]{w} - $indent);
		2314	$layout->set_markup ($text);
		2315
		2316	$layout->size
		2317	}
		2318
		2319	sub reflow {
		2320	my ($self) = @_;
		2321
		2322	$self->{need_reflow}++;
		2323	$self->update;
		2324	}
		2325
		2326	sub set_offset {
		2327	my ($self, $offset) = @_;
		2328
		2329	# todo: base offset on lines or so, not on pixels
		2330	$self->{children}[1]->set_value ($offset);
		2331	}
		2332
		2333	sub clear {
		2334	my ($self) = @_;
		2335
		2336	$self->{par} = [];
		2337	$self->{height} = 0;
		2338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2339	}
		2340
2200	sub add_paragraph {	2341	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2202		2343
2203	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2204		2345	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2208		2349
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2350	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2351	}
2214		2352
2215	sub update {	2353	sub update {
2216	my ($self) = @_;	2354	my ($self) = @_;
2217		2355
…		…
2220	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2221		2359
2222	delete $self->{texture};	2360	delete $self->{texture};
2223		2361
2224	$ROOT->on_post_alloc ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2225	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2366	my $height = 0;
2227		2367
2228	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2229	for @{$self->{par}};	2372	for (@{$self->{par}}) {
		2373	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2374	$layout->set_width ($W - $_->[3]);
		2375	$layout->set_markup ($_->[4]);
		2376	my ($w, $h) = $layout->size;
		2377	$_->[0] = $w + $_->[3];
		2378	$_->[1] = $h;
		2379	}
		2380
		2381	$height += $_->[1];
		2382	}
2230		2383
2231	$self->{height} = $height;	2384	$self->{height} = $height;
2232		2385
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2387
2235	delete $self->{texture};	2388	delete $self->{texture};
2236	}	2389	}
2237		2390
2238	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2391	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2241		2394
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2395	my $top = int $self->{children}[1]{range}[0];
2246		2396
2247	my $y0 = $top;	2397	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2398	my $y1 = $top + $H;
2249		2399
2250	my $y = 0;	2400	my $y = 0;
2251		2401
2252	my $layout = $self->{layout};	2402	my $layout = $self->{layout};
2253		2403
2254	$layout->set_font ($self->{font}) if $self->{font};	2404	$layout->set_font ($self->{font}) if $self->{font};
2255		2405
		2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
		2408	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2409
2256	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2411	my $h = $par->[1];
2258		2412
2259	if ($y0 < $y + $h && $y < $y1) {	2413	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2414	$layout->set_foreground (@{ $par->[2] });
		2415	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2262		2417
2263	my ($W, $H) = $layout->size;	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2419
		2420	glRasterPos $par->[3], $y - $y0;
		2421	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2422	}
2266		2423
2267	$y += $h;	2424	$y += $h;
2268	}	2425	}
2269		2426
2270	glDisable GL_TEXTURE_2D;	2427	glDisable GL_BLEND;
2271	};	2428	};
2272	});	2429	});
2273	}	2430	}
2274		2431
2275	sub _draw {	2432	sub _draw {
2276	my ($self) = @_;	2433	my ($self) = @_;
2277		2434
2278	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2438	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2283		2440
2284	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2285		2442
2286	}	2443	}
…		…
2385		2542
2386	sub set_tooltip_from {	2543	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2544	my ($self, $widget) = @_;
2388		2545
2389	$self->add (new CFClient::UI::Label	2546	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2547	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2548	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2549	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2550	fg => [0, 0, 0, 1],
		2551	ellipsise => 0,
2394	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2552	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
2395	);	2553	);
2396	}	2554	}
2397		2555
2398	sub size_request {	2556	sub size_request {
2399	my ($self) = @_;	2557	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2446		2604
2447	sub new {	2605	sub new {
2448	my $class = shift;	2606	my $class = shift;
2449		2607
2450	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2451	aspect => 1,	2609	aspect => 1,
2452	@_,	2610	@_,
2453	)	2611	);
		2612
		2613	if ($self->{anim} && $self->{animspeed}) {
		2614	Scalar::Util::weaken (my $widget = $self);
		2615
		2616	$self->{timer} = Event->timer (
		2617	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2618	hard => 1,
		2619	interval => $self->{animspeed},
		2620	cb => sub {
		2621	++$widget->{frame};
		2622	$widget->update;
		2623	},
		2624	);
		2625	}
		2626
		2627	$self
2454	}	2628	}
2455		2629
2456	sub size_request {	2630	sub size_request {
2457	(32, 8)	2631	(32, 8)
2458	}	2632	}
2459		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2460	sub _draw {	2642	sub _draw {
2461	my ($self) = @_;	2643	my ($self) = @_;
2462		2644
2463	return unless $::CONN;#d# manage and cache textures differently	2645	return unless $::CONN;
		2646
		2647	my $face;
		2648
		2649	if ($self->{frame}) {
		2650	my $anim = $::CONN->{anim}[$self->{anim}];
		2651
		2652	$face = $anim->[ $self->{frame} % @$anim ]
		2653	if $anim && @$anim;
		2654	}
		2655
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2465		2657
2466	# TODO animation
2467	if ($tex) {	2658	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2473	}	2664	}
2474	}	2665	}
2475		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
		2674	}
		2675
2476	#############################################################################	2676	#############################################################################
2477		2677
2478	package CFClient::UI::InventoryItem;	2678	package CFClient::UI::InventoryItem;
2479		2679
2480	our @ISA = CFClient::UI::HBox::;	2680	our @ISA = CFClient::UI::HBox::;
		2681
		2682	sub _item_to_desc {
		2683	my ($item) = @_;
		2684
		2685	my $desc =
		2686	$item->{nrof} < 2
		2687	? $item->{name}
		2688	: "$item->{nrof} × $item->{name_pl}";
		2689
		2690	$item->{flags} & Crossfire::Protocol::F_OPEN
		2691	and $desc .= " (open)";
		2692	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2693	and $desc .= " (applied)";
		2694	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2695	and $desc .= " (unpaid)";
		2696	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2697	and $desc .= " (magic)";
		2698	$item->{flags} & Crossfire::Protocol::F_CURSED
		2699	and $desc .= " (cursed)";
		2700	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2701	and $desc .= " (damned)";
		2702	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2703	and $desc .= " *";
		2704
		2705	$desc
		2706	}
2481		2707
2482	sub new {	2708	sub new {
2483	my $class = shift;	2709	my $class = shift;
2484		2710
2485	my %args = @_;	2711	my %args = @_;
2486		2712
2487	my $item = delete $args{item};	2713	my $item = delete $args{item};
2488		2714
2489	my $desc = $item->{nrof} < 2	2715	my $desc = _item_to_desc ($item);
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493		2716
2494	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2495	can_hover => 1,	2718	can_hover => 1,
2496	can_events => 1,	2719	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)	2720	tooltip => ((CFClient::UI::Label::escape $desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2721	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {	2722	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;	2723	my ($self, $ev, $x, $y) = @_;
2501		2724
2502	# todo: maybe put examine on 1? but should just be a tooltip :(	2725	# todo: maybe put examine on 1? but should just be a tooltip :(
		2726	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2727	my $targ = $::CONN->{player}{tag};
		2728
		2729	if ($item->{container} == $::CONN->{player}{tag}) {
		2730	$targ = $main::OPENCONT;
		2731	}
		2732
		2733	$::CONN->send ("move $targ $item->{tag} 0");
2503	if ($ev->{button} == 1) {	2734	} elsif ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2735	$::CONN->send ("examine $item->{tag}");
2505	} elsif ($ev->{button} == 2) {	2736	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");	2737	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {	2738	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (	2739	my @menu_items = (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2740	["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}") }],	2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2742	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2743	(
		2744	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2745	? (
		2746	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2747	)
		2748	: (
		2749	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
2518	],	2752	),
2519	)->popup ($ev);	2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520	}	2756	}
2521		2757
2522	1	2758	1
2523	},	2759	},
2524	%args	2760	%args
2525	);	2761	);
		2762
2526		2763
2527	$self->add (new CFClient::UI::Face	2764	$self->add (new CFClient::UI::Face
2528	can_events => 0,	2765	can_events => 0,
2529	face => $item->{face},	2766	face => $item->{face},
2530	anim => $item->{anim},	2767	anim => $item->{anim},
2531	animspeed => $item->{animspeed},	2768	animspeed => $item->{animspeed},
2532	);	2769	);
2533		2770
2534	$self->add (new CFClient::UI::Label	2771	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535	can_events => 0,	2772
2536	text => $desc,	2773	$self->{item} = $item;
2537	);	2774
		2775	$self->update_item;
2538		2776
2539	$self	2777	$self
		2778	}
		2779
		2780	sub update_item {
		2781	my ($self) = @_;
		2782
		2783	my $desc = _item_to_desc ($self->{item});
		2784
		2785	$self->{name_lbl}->set_text ($desc);
2540	}	2786	}
2541		2787
2542	#############################################################################	2788	#############################################################################
2543		2789
2544	package CFClient::UI::Inventory;	2790	package CFClient::UI::Inventory;
…		…
2547		2793
2548	sub new {	2794	sub new {
2549	my $class = shift;	2795	my $class = shift;
2550		2796
2551	my $self = $class->SUPER::new (	2797	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),	2798	scrolled => (new CFClient::UI::Table),
2553	@_,	2799	@_,
2554	);	2800	);
2555		2801
2556	$self	2802	$self
2557	}	2803	}
…		…
2568	} @$items;	2814	} @$items;
2569		2815
2570	$self->{real_items} = \@items;	2816	$self->{real_items} = \@items;
2571		2817
2572	for my $item (@items) {	2818	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2819	$item->{item} = $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576
2577	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;	2820	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
		2821	$item->update_item ();
2578	}	2822	}
2579		2823
		2824	my $i = 0;
		2825	for (@items) {
2580	$self->{scrolled}->add (@items);	2826	$self->{scrolled}->add (0, $i, $_);
		2827	my $nrof = $_->{item}->{nrof} \|\| 1;
		2828	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2829	}
2581		2830
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2832	}
2584		2833
2585	sub size_request {	2834	sub size_request {
…		…
2663		2912
2664	package CFClient::UI::Statusbox;	2913	package CFClient::UI::Statusbox;
2665		2914
2666	our @ISA = CFClient::UI::VBox::;	2915	our @ISA = CFClient::UI::VBox::;
2667		2916
		2917	sub new {
		2918	my $class = shift;
		2919
		2920	$class->SUPER::new (
		2921	fontsize => 0.8,
		2922	@_,
		2923	)
		2924	}
		2925
2668	sub reorder {	2926	sub reorder {
2669	my ($self) = @_;	2927	my ($self) = @_;
2670	my $NOW = time;	2928	my $NOW = time;
2671		2929
2672	while (my ($k, $v) = each %{ $self->{item} }) {	2930	while (my ($k, $v) = each %{ $self->{item} }) {
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2948	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2949	: $item->{text};
2692		2950
2693	for ($short) {	2951	for ($short) {
2694	s/^\s+//;	2952	s/^\s+//;
2695	s/\012.*/…/s;	2953	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2954	}
2699		2955
2700	new CFClient::UI::Label	2956	new CFClient::UI::Label
2701	markup => $short,	2957	markup => $short,
2702	tooltip => $item->{tooltip},	2958	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2959	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2960	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2961	fontsize => $item->{fontsize} \|\| $self->{fontsize},
		2962	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2963	fg => $item->{fg},
2707	can_events => 1,	2964	can_events => 1,
2708	can_hover => 1	2965	can_hover => 1
2709	};	2966	};
2710	}	2967	}
2711		2968
…		…
2737	$self->{item}{$group} = {	2994	$self->{item}{$group} = {
2738	id => ++$self->{id},	2995	id => ++$self->{id},
2739	text => $text,	2996	text => $text,
2740	timeout => $timeout,	2997	timeout => $timeout,
2741	tooltip => $text,	2998	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2999	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	3000	pri => 0,
2745	count => 1,	3001	count => 1,
2746	%arg,	3002	%arg,
2747	};	3003	};
2748	}	3004	}
2749		3005
2750	$self->reorder;	3006	$self->reorder;
2751	}	3007	}
2752		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	delete $_->{label}
		3013	for values %{ $self->{item} \|\| {} };
		3014
		3015	$self->reorder;
		3016	$self->SUPER::reconfigure;
		3017	}
		3018
2753	#############################################################################	3019	#############################################################################
2754		3020
2755	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2756		3022
2757	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
…		…
2796	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);	3062	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2797		3063
2798	for my $child ($self->children) {	3064	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3066
		3067	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3068	if exists $child->{req_x};
		3069
		3070	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3071	if exists $child->{req_y};
		3072
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3073	$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;	3074	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3075
2803	$child->configure ($X, $Y, $W, $H);	3076	$child->configure ($X, $Y, $W, $H);
2804	}	3077	}
2805	}	3078	}
2806		3079
2807	sub coord2local {	3080	sub coord2local {
…		…
2823	$::WANT_REFRESH++;	3096	$::WANT_REFRESH++;
2824	}	3097	}
2825		3098
2826	sub add {	3099	sub add {
2827	my ($self, @children) = @_;	3100	my ($self, @children) = @_;
		3101
		3102	for (my @widgets = @children; my $w = pop @widgets; ) {
		3103	push @widgets, $w->children;
		3104	$w->{root} = $self;
		3105	$w->{visible} = 1;
		3106	}
2828		3107
2829	for my $child (@children) {	3108	for my $child (@children) {
2830	$child->{toplevel} = 1;	3109	$child->{toplevel} = 1;
2831		3110
2832	# integerise window positions	3111	# integerise window positions
2833	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
2835	}	3114	}
2836		3115
2837	$self->SUPER::add (@children);	3116	$self->SUPER::add (@children);
		3117	}
		3118
		3119	sub remove {
		3120	my ($self, @children) = @_;
		3121
		3122	$self->SUPER::remove (@children);
		3123
		3124	while (@children) {
		3125	my $w = pop @children;
		3126	push @children, $w->children;
		3127	delete $w->{visible};
		3128	}
2838	}	3129	}
2839		3130
2840	sub on_refresh {	3131	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2842		3133
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2913		3204
2914	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3206	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3209	glLoadIdentity;
2919		3210
2920	$self->_draw;	3211	$self->_draw;
2921	}	3212	}
…		…
2923	#############################################################################	3214	#############################################################################
2924		3215
2925	package CFClient::UI;	3216	package CFClient::UI;
2926		3217
2927	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3220
2930	1	3221	1
2931		3222

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.229 by root, Wed May 24 21:49:58 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.229 by root, Wed May 24 21:49:58 2006 UTC