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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC

…		…
136	$rem += $_ - $i;	136	$rem += $_ - $i;
137	$_ = $i;	137	$_ = $i;
138	}	138	}
139	}	139	}
140		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
		149	sub reconfigure_widgets {
		150	# make a copy, otherwise C<for> complains about freed values.
		151	my @widgets = values %WIDGET;
		152
		153	$_->reconfigure
		154	for @widgets;
		155	}
		156
141	# call when resolution changes etc.	157	# call when resolution changes etc.
142	sub rescale_widgets {	158	sub rescale_widgets {
143	my ($sx, $sy) = @_;	159	my ($sx, $sy) = @_;
144		160
145	for my $widget (values %WIDGET) {	161	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	162	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	163	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	164	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	165	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	166	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	167	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	168	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	169	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	170	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	171	}
156
157	$widget->reconfigure;
158	}	172	}
		173
		174	reconfigure_widgets;
159	}	175	}
160		176
161	#############################################################################	177	#############################################################################
162		178
163	package CFClient::UI::Base;	179	package CFClient::UI::Base;
…		…
195	%$self = ();	211	%$self = ();
196	}	212	}
197		213
198	sub show {	214	sub show {
199	my ($self) = @_;	215	my ($self) = @_;
200
201	return if $self->{parent};	216	return if $self->{parent};
202		217
203	$CFClient::UI::ROOT->add ($self);	218	$CFClient::UI::ROOT->add ($self);
		219	}
		220
		221	sub show_centered {
		222	my ($self) = @_;
		223	return if $self->{parent};
		224
		225	$self->show;
		226
		227	$CFClient::UI::ROOT->on_post_alloc (
		228	"centered $self" => sub {
		229	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		230	},
		231	);
204	}	232	}
205		233
206	sub hide {	234	sub hide {
207	my ($self) = @_;	235	my ($self) = @_;
208		236
…		…
280	sub set_max_size {	308	sub set_max_size {
281	my ($self, $w, $h) = @_;	309	my ($self, $w, $h) = @_;
282		310
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	311	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	312	delete $self->{max_h}; $self->{max_h} = $h if $h;
		313	}
		314
		315	sub set_tooltip {
		316	my ($self, $tooltip) = @_;
		317
		318	$self->{tooltip} = $tooltip;
		319
		320	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		321	delete $CFClient::UI::TOOLTIP->{owner};
		322	CFClient::UI::check_tooltip;
		323	}
285	}	324	}
286		325
287	# translate global coordinates to local coordinate system	326	# translate global coordinates to local coordinate system
288	sub coord2local {	327	sub coord2local {
289	my ($self, $x, $y) = @_;	328	my ($self, $x, $y) = @_;
…		…
375	glVertex $self->{w}, 0;	414	glVertex $self->{w}, 0;
376	glVertex $self->{w}, $self->{h};	415	glVertex $self->{w}, $self->{h};
377	glVertex 0 , $self->{h};	416	glVertex 0 , $self->{h};
378	glEnd;	417	glEnd;
379	glPopMatrix;	418	glPopMatrix;
380	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	419	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	420	}
382	}	421	}
383		422
384	sub _draw {	423	sub _draw {
385	my ($self) = @_;	424	my ($self) = @_;
…		…
405	Scalar::Util::weaken ($self->{parent} = $parent);	444	Scalar::Util::weaken ($self->{parent} = $parent);
406		445
407	# TODO: req_w _does_change after ->reconfigure	446	# TODO: req_w _does_change after ->reconfigure
408	$self->check_size	447	$self->check_size
409	unless exists $self->{req_w};	448	unless exists $self->{req_w};
		449
		450	$self->show;
410	}	451	}
411		452
412	sub check_size {	453	sub check_size {
413	my ($self, $forced) = @_;	454	my ($self, $forced) = @_;
414		455
…		…
455	my $class = shift;	496	my $class = shift;
456		497
457	# range [value, low, high, page]	498	# range [value, low, high, page]
458		499
459	$class->SUPER::new (	500	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	501	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	502	#active_bg => [1, 1, 1, 0.5],
462	@_	503	@_
463	)	504	)
464	}	505	}
465		506
466	sub _draw {	507	sub _draw {
467	my ($self) = @_;	508	my ($self) = @_;
468		509
		510	my $color = $FOCUS == $self && $self->{active_bg}
		511	? $self->{active_bg}
		512	: $self->{bg};
		513
		514	if ($color && (@$color < 4 \|\| $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	515	my ($w, $h) = @$self{qw(w h)};
470		516
471	glEnable GL_BLEND;	517	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	519	glColor @$color;
474		520
475	glBegin GL_QUADS;	521	glBegin GL_QUADS;
476	glVertex 0 , 0;	522	glVertex 0 , 0;
477	glVertex 0 , $h;	523	glVertex 0 , $h;
478	glVertex $w, $h;	524	glVertex $w, $h;
479	glVertex $w, 0;	525	glVertex $w, 0;
480	glEnd;	526	glEnd;
481		527
482	glDisable GL_BLEND;	528	glDisable GL_BLEND;
		529	}
483	}	530	}
484		531
485	#############################################################################	532	#############################################################################
486		533
487	package CFClient::UI::Empty;	534	package CFClient::UI::Empty;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	718	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	719	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	720	glClear GL_COLOR_BUFFER_BIT;
674		721
675	$self->_render;	722	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	723	};
684	}	724	}
685		725
686	sub _draw {	726	sub _draw {
687	my ($self) = @_;	727	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	731	my $tex = $self->{texture}
692	or return;	732	or return;
693		733
694	glEnable GL_TEXTURE_2D;	734	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	736	glColor 1, 1, 1, 1;
697		737
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	738	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		739
700	glDisable GL_TEXTURE_2D;	740	glDisable GL_TEXTURE_2D;
701	}	741	}
…		…
708		748
709	sub size_request {	749	sub size_request {
710	my ($self) = @_;	750	my ($self) = @_;
711		751
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	752	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		753
715	@$self{qw(child_w child_h)}	754	@$self{qw(child_w child_h)}
716	}	755	}
717		756
718	sub size_allocate {	757	sub size_allocate {
719	my ($self, $w, $h) = @_;	758	my ($self, $w, $h) = @_;
720		759
		760	my ($cw, $ch) = @$self{qw(child_w child_h)};
		761	# $w = $self->{w};
		762	$self->child->configure (0, 0, $cw, $ch);
721	$self->update;	763	$self->update;
722	}	764	}
723		765
724	sub set_offset {	766	sub set_offset {
725	my ($self, $x, $y) = @_;	767	my ($self, $x, $y) = @_;
…		…
779		821
780	my $slider = new CFClient::UI::Slider	822	my $slider = new CFClient::UI::Slider
781	vertical => 1,	823	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	824	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	825	connect_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	826	$self->{vp}->set_offset (0, $_[1]);
785	},	827	},
786	;	828	;
787		829
788	$self = $class->SUPER::new (	830	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	831	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	832	slider => $slider,
791	@_,	833	@_,
792	);	834	);
793		835
794	$self->{vp}->add ($self->{scrolled});	836	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	837	$self->add ($self->{vp});
796	$self->add ($self->{slider});	838	$self->add ($self->{slider});
797		839
798	$self	840	$self
		841	}
		842
		843	sub size_allocate {
		844	my ($self, $w, $h) = @_;
		845
		846	$self->SUPER::size_allocate ($w, $h);
		847
		848	my $child = $self->{vp}->child;
		849	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	850	}
800		851
801	#TODO# update range on size_allocate depending on child	852	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	853	# update viewport offset on scroll
803		854
…		…
857	my $class = shift;	908	my $class = shift;
858		909
859	# TODO: user_x, user_y, overwrite moveto?	910	# TODO: user_x, user_y, overwrite moveto?
860		911
861	my $self = $class->SUPER::new (	912	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	913	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	914	border_bg => [1, 1, 1, 1],
864	border => 0.6,	915	border => 0.6,
865	toplevel => 1,	916	is_toplevel => 1,
866	can_events => 1,	917	can_events => 1,
867	@_	918	@_
868	);	919	);
869		920
870	$self->{title} &&= new CFClient::UI::Label	921	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	922	align => 0,
…		…
895	my ($self, $w, $h) = @_;	946	my ($self, $w, $h) = @_;
896		947
897	$h -= List::Util::max 0, $self->border * 2;	948	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	949	$w -= List::Util::max 0, $self->border * 2;
899		950
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	951	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	952	if $self->{title};
902		953
903	$self->child->configure ($self->border, $self->border, $w, $h);	954	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	955	}
905		956
…		…
1266		1317
1267	#############################################################################	1318	#############################################################################
1268		1319
1269	package CFClient::UI::Label;	1320	package CFClient::UI::Label;
1270		1321
1271	our @ISA = CFClient::UI::Base::;	1322	our @ISA = CFClient::UI::DrawBG::;
1272		1323
1273	use CFClient::OpenGL;	1324	use CFClient::OpenGL;
1274		1325
1275	sub new {	1326	sub new {
1276	my ($class, %arg) = @_;	1327	my ($class, %arg) = @_;
1277		1328
1278	my $self = $class->SUPER::new (	1329	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1330	fg => [1, 1, 1],
		1331	#bg => none
		1332	#active_bg => none
1280	#font => default_font	1333	#font => default_font
1281	#text => initial text	1334	#text => initial text
1282	#markup => initial narkup	1335	#markup => initial narkup
		1336	#max_w => maximum pixel width
		1337	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1338	layout => (new CFClient::Layout),
1284	fontsize => 1,	1339	fontsize => 1,
1285	align => -1,	1340	align => -1,
1286	valign => -1,	1341	valign => -1,
1287	padding => 2,	1342	padding => 2,
…		…
1302	}	1357	}
1303		1358
1304	$self	1359	$self
1305	}	1360	}
1306		1361
1307	sub escape {	1362	sub escape($) {
1308	local $_ = $_[1];	1363	local $_ = $_[0];
1309		1364
1310	s/&/&/g;	1365	s/&/&/g;
1311	s/>/>/g;	1366	s/>/>/g;
1312	s/</</g;	1367	s/</</g;
1313		1368
1314	$_[1]	1369	$_
1315	}	1370	}
1316		1371
1317	sub update {	1372	sub update {
1318	my ($self) = @_;	1373	my ($self) = @_;
1319		1374
…		…
1352	sub size_request {	1407	sub size_request {
1353	my ($self) = @_;	1408	my ($self) = @_;
1354		1409
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1410	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1411	$self->{layout}->set_width ($self->{max_w} \|\| -1);
		1412	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1413	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1415
1359	my ($w, $h) = $self->{layout}->size;	1416	my ($w, $h) = $self->{layout}->size;
1360		1417
1361	if (exists $self->{template}) {	1418	if (exists $self->{template}) {
…		…
1391	}	1448	}
1392		1449
1393	sub _draw {	1450	sub _draw {
1394	my ($self) = @_;	1451	my ($self) = @_;
1395		1452
		1453	$self->SUPER::_draw; # draw background, if applicable
		1454
1396	my $tex = $self->{texture} \|\|= do {	1455	my $tex = $self->{texture} \|\|= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1456	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1457	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1458	$self->{layout}->set_width ($self->{w});
		1459	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1460	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1461	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1462
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1463	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1464
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1465	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1466	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1467	: ($self->{w} - $tex->{w}) * 0.5);
1407		1468
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1469	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1470	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1471	: ($self->{h} - $tex->{h}) * 0.5);
1411		1472
1412	$tex	1473	$tex
1413	};	1474	};
1414		1475
1415	glEnable GL_TEXTURE_2D;	1476	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1504	active_fg => [0, 0, 0],
1444	can_hover => 1,	1505	can_hover => 1,
1445	can_focus => 1,	1506	can_focus => 1,
1446	valign => 0,	1507	valign => 0,
1447	can_events => 1,	1508	can_events => 1,
		1509	#text => ...
1448	@_	1510	@_
1449	)	1511	)
1450	}	1512	}
1451		1513
1452	sub _set_text {	1514	sub _set_text {
…		…
1470	sub set_text {	1532	sub set_text {
1471	my ($self, $text) = @_;	1533	my ($self, $text) = @_;
1472		1534
1473	$self->{cursor} = length $text;	1535	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1536	$self->_set_text ($text);
		1537	$self->update;
1475	$self->check_size;	1538	$self->check_size;
1476	$self->update;
1477	}	1539	}
1478		1540
1479	sub get_text {	1541	sub get_text {
1480	$_[0]{text}	1542	$_[0]{text}
1481	}	1543	}
…		…
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1583	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1584	}
1523		1585
1524	$self->_set_text ($text);	1586	$self->_set_text ($text);
1525	$self->update;	1587	$self->update;
		1588	$self->check_size;
1526	}	1589	}
1527		1590
1528	sub focus_in {	1591	sub focus_in {
1529	my ($self) = @_;	1592	my ($self) = @_;
1530		1593
…		…
1659	my $class = shift;	1722	my $class = shift;
1660		1723
1661	$class->SUPER::new (	1724	$class->SUPER::new (
1662	padding => 4,	1725	padding => 4,
1663	fg => [1, 1, 1],	1726	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1727	active_fg => [0, 0, 1],
1666	can_hover => 1,	1728	can_hover => 1,
1667	align => 0,	1729	align => 0,
1668	valign => 0,	1730	valign => 0,
1669	can_events => 1,	1731	can_events => 1,
…		…
1717		1779
1718	$class->SUPER::new (	1780	$class->SUPER::new (
1719	padding => 2,	1781	padding => 2,
1720	fg => [1, 1, 1],	1782	fg => [1, 1, 1],
1721	active_fg => [1, 1, 0],	1783	active_fg => [1, 1, 0],
		1784	bg => [0, 0, 0, 0.2],
		1785	active_bg => [1, 1, 1, 0.5],
1722	state => 0,	1786	state => 0,
1723	can_hover => 1,	1787	can_hover => 1,
1724	@_	1788	@_
1725	)	1789	)
1726	}	1790	}
…		…
2010	qw(s1_slider.png s1_slider_bg.png);	2074	qw(s1_slider.png s1_slider_bg.png);
2011		2075
2012	sub new {	2076	sub new {
2013	my $class = shift;	2077	my $class = shift;
2014		2078
2015	# range [value, low, high, page]	2079	# range [value, low, high, page, unit]
2016		2080
2017	# TODO: 0-width page	2081	# TODO: 0-width page
2018	# TODO: req_w/h are wrong with vertical	2082	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2083	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2084	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
2022	active_fg => [0, 0, 0],	2086	active_fg => [0, 0, 0],
		2087	bg => [0, 0, 0, 0.2],
		2088	active_bg => [1, 1, 1, 0.5],
2023	range => [0, 0, 100, 10],	2089	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2090	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2091	req_h => $::WIDTH / 80,
2026	vertical => 0,	2092	vertical => 0,
2027	can_hover => 1,	2093	can_hover => 1,
2028	inner_pad => 5,	2094	inner_pad => 0.02,
2029	@_	2095	@_
2030	);	2096	);
2031		2097
		2098	$self->set_value ($self->{range}[0]);
		2099	$self->update;
		2100
2032	$self	2101	$self
		2102	}
		2103
		2104	sub set_range {
		2105	my ($self, $range) = @_;
		2106
		2107	$self->{range} = $range;
		2108
		2109	$self->update;
		2110	}
		2111
		2112	sub set_value {
		2113	my ($self, $value) = @_;
		2114
		2115	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2116
		2117	$hi = $lo + 1 if $hi <= $lo;
		2118
		2119	$page = $hi - $lo if $page > $hi - $lo;
		2120
		2121	$value = $lo if $value < $lo;
		2122	$value = $hi - $page if $value > $hi - $page;
		2123
		2124	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2125	if $unit;
		2126
		2127	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2128
		2129	if ($value != $old_value) {
		2130	$self->emit (changed => $value);
		2131	$self->update;
		2132	}
2033	}	2133	}
2034		2134
2035	sub size_request {	2135	sub size_request {
2036	my ($self) = @_;	2136	my ($self) = @_;
2037		2137
…		…
2043		2143
2044	sub button_down {	2144	sub button_down {
2045	my ($self, $ev, $x, $y) = @_;	2145	my ($self, $ev, $x, $y) = @_;
2046		2146
2047	$self->SUPER::button_down ($ev, $x, $y);	2147	$self->SUPER::button_down ($ev, $x, $y);
		2148
		2149	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2150
2048	$self->mouse_motion ($ev, $x, $y);	2151	$self->mouse_motion ($ev, $x, $y);
2049	}	2152	}
2050		2153
2051	sub mouse_motion {	2154	sub mouse_motion {
2052	my ($self, $ev, $x, $y) = @_;	2155	my ($self, $ev, $x, $y) = @_;
2053		2156
2054	if ($GRAB == $self) {	2157	if ($GRAB == $self) {
		2158	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2159
		2160	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2161
		2162	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2163
		2164	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2165	}
		2166	}
		2167
		2168	sub update {
		2169	my ($self) = @_;
		2170
		2171	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2172	$self->set_value ($self->{range}[0]);
		2173
2055	my ($value, $lo, $hi, $page) = @{$self->{range}};	2174	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2175	my $range = ($hi - $page - $lo) \|\| 1e-100;
2056		2176
2057	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2177	my $knob_w = List::Util::min 1, $page / ($hi - $lo) \|\| 0.1;
2058		2178
2059	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2179	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2060	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2180	$self->{scale} = 1 - 2 * $self->{offset} \|\| 1e-100;
2061		2181
2062	$x -= $inner_pad_px; # substract the padding	2182	$value = ($value - $lo) / $range;
2063	$x = $x * ($hi - $lo) / $inner_w + $lo;	2183	$value = $value * $self->{scale} + $self->{offset};
2064	$x = $lo if $x < $lo;
2065	$x = $hi - $page if $x > $hi - $page;
2066	$self->{range}[0] = $x;
2067		2184
2068	$self->emit (changed => $x);	2185	$self->{knob_x} = $value - $knob_w * 0.5;
2069	$self->update;	2186	$self->{knob_w} = $knob_w;
2070	}	2187	});
2071	}
2072		2188
2073	# the inner_* stuff is for generating a padding for the slider handle,	2189	$self->SUPER::update;
2074	# so that the handle doesn't leave the texture. This calculation isn't 100%
2075	# correct propably, but it does the job for now
2076	sub _calc_inner_pad_px {
2077	my ($self, $w) = @_;
2078	($w / 100) * $self->{inner_pad} # % to pixels
2079	}	2190	}
2080		2191
2081	sub _draw {	2192	sub _draw {
2082	my ($self) = @_;	2193	my ($self) = @_;
2083		2194
2084	$self->SUPER::_draw ();	2195	$self->SUPER::_draw ();
2085		2196
2086	my ($w, $h) = @$self{qw(w h)};	2197	glScale $self->{w}, $self->{h};
2087		2198
2088	if ($self->{vertical}) {	2199	if ($self->{vertical}) {
2089	# draw a vertical slider like a rotated horizontal slider	2200	# draw a vertical slider like a rotated horizontal slider
2090		2201
		2202	glTranslate 1, 0, 0;
2091	glRotate 90, 0, 0, 1;	2203	glRotate 90, 0, 0, 1;
2092	glTranslate 0, -$self->{w}, 0;
2093
2094	($w, $h) = ($h, $w);
2095	}	2204	}
2096		2205
2097	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2206	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2207	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099		2208
2100	my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102	$hi = $value + 1 if $lo == $hi;
2103
2104	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107	$page = int $page * $inner_w / ($hi - $lo);
2108	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110	$w -= $page;
2111	$page &= ~1;
2112	glTranslate $page * 0.5, 0, 0;
2113	$page \|\|= 2;
2114
2115	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118	glEnable GL_TEXTURE_2D;	2209	glEnable GL_TEXTURE_2D;
2119	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120		2211
2121	# draw background	2212	# draw background
2122	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2213	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123		2214
2124	# draw handle	2215	# draw handle
2125	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2216	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2126		2217
2127	glDisable GL_TEXTURE_2D;	2218	glDisable GL_TEXTURE_2D;
2128	}	2219	}
		2220
		2221	#############################################################################
		2222
		2223	package CFClient::UI::ValSlider;
		2224
		2225	our @ISA = CFClient::UI::HBox::;
		2226
		2227	sub new {
		2228	my ($class, %arg) = @_;
		2229
		2230	my $range = delete $arg{range};
		2231
		2232	my $self = $class->SUPER::new (
		2233	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2234	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2235	to_value => sub { shift },
		2236	from_value => sub { shift },
		2237	%arg,
		2238	);
		2239
		2240	$self->{slider}->connect (changed => sub {
		2241	my ($self, $value) = @_;
		2242	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2243	$self->{parent}->emit (changed => $value);
		2244	});
		2245
		2246	# $self->{entry}->connect (changed => sub {
		2247	# my ($self, $value) = @_;
		2248	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2249	# $self->{parent}->emit (changed => $value);
		2250	# });
		2251
		2252	$self->add ($self->{slider}, $self->{entry});
		2253
		2254	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2255
		2256	$self
		2257	}
		2258
		2259	sub set_range { shift->{slider}->set_range (@_) }
		2260	sub set_value { shift->{slider}->set_value (@_) }
2129		2261
2130	#############################################################################	2262	#############################################################################
2131		2263
2132	package CFClient::UI::TextView;	2264	package CFClient::UI::TextView;
2133		2265
…		…
2163		2295
2164	$self->{fontsize} = $fontsize;	2296	$self->{fontsize} = $fontsize;
2165	$self->reflow;	2297	$self->reflow;
2166	}	2298	}
2167		2299
2168	sub text_height {
2169	my ($self, $text) = @_;
2170
2171	my $layout = $self->{layout};
2172
2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174	$layout->set_width ($self->{children}[0]{w});
2175	$layout->set_markup ($text);
2176
2177	($layout->size)[1]
2178	}
2179
2180	sub reflow {
2181	my ($self) = @_;
2182
2183	$self->{need_reflow}++;
2184	$self->update;
2185	}
2186
2187	sub size_allocate {	2300	sub size_allocate {
2188	my ($self, $w, $h) = @_;	2301	my ($self, $w, $h) = @_;
2189		2302
2190	$self->SUPER::size_allocate ($w, $h);	2303	$self->SUPER::size_allocate ($w, $h);
2191		2304
…		…
2194	$self->{layout}->set_width ($self->{children}[0]{w});	2307	$self->{layout}->set_width ($self->{children}[0]{w});
2195		2308
2196	$self->reflow;	2309	$self->reflow;
2197	}	2310	}
2198		2311
		2312	sub text_size {
		2313	my ($self, $text, $indent) = @_;
		2314
		2315	my $layout = $self->{layout};
		2316
		2317	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2318	$layout->set_width ($self->{children}[0]{w} - $indent);
		2319	$layout->set_markup ($text);
		2320
		2321	$layout->size
		2322	}
		2323
		2324	sub reflow {
		2325	my ($self) = @_;
		2326
		2327	$self->{need_reflow}++;
		2328	$self->update;
		2329	}
		2330
		2331	sub set_offset {
		2332	my ($self, $offset) = @_;
		2333
		2334	# todo: base offset on lines or so, not on pixels
		2335	$self->{children}[1]->set_value ($offset);
		2336	}
		2337
		2338	sub clear {
		2339	my ($self) = @_;
		2340
		2341	$self->{par} = [];
		2342	$self->{height} = 0;
		2343	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2344	}
		2345
2199	sub add_paragraph {	2346	sub add_paragraph {
2200	my ($self, $color, $text) = @_;	2347	my ($self, $color, $text, $indent) = @_;
2201		2348
2202	#TODO: intelligently "reformat" paragraph	2349	for my $line (split /\n/, $text) {
2203		2350	my ($w, $h) = $self->text_size ($line);
2204	my $height = $self->text_height ($text);
2205
2206	$self->{height} += $height;	2351	$self->{height} += $h;
		2352	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2353	}
2207		2354
2208	push @{$self->{par}}, [$height, $color, $text];
2209
2210	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2355	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211	$self->{children}[1]->update;
2212	}	2356	}
2213		2357
2214	sub update {	2358	sub update {
2215	my ($self) = @_;	2359	my ($self) = @_;
2216		2360
…		…
2219	return unless $self->{h} > 0;	2363	return unless $self->{h} > 0;
2220		2364
2221	delete $self->{texture};	2365	delete $self->{texture};
2222		2366
2223	$ROOT->on_post_alloc ($self, sub {	2367	$ROOT->on_post_alloc ($self, sub {
		2368	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2369
2224	if (delete $self->{need_reflow}) {	2370	if (delete $self->{need_reflow}) {
2225	my $height = 0;	2371	my $height = 0;
2226		2372
2227	$height += $_->[0] = $self->text_height ($_->[2])	2373	my $layout = $self->{layout};
		2374
		2375	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2376
2228	for @{$self->{par}};	2377	for (@{$self->{par}}) {
		2378	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2379	$layout->set_width ($W - $_->[3]);
		2380	$layout->set_markup ($_->[4]);
		2381	my ($w, $h) = $layout->size;
		2382	$_->[0] = $w + $_->[3];
		2383	$_->[1] = $h;
		2384	}
		2385
		2386	$height += $_->[1];
		2387	}
2229		2388
2230	$self->{height} = $height;	2389	$self->{height} = $height;
2231		2390
2232	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2391	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233		2392
2234	delete $self->{texture};	2393	delete $self->{texture};
2235	}	2394	}
2236		2395
2237	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2396	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2238	glClearColor 0, 0, 0, 0;	2397	glClearColor 0.5, 0.5, 0.5, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2398	glClear GL_COLOR_BUFFER_BIT;
2240		2399
2241	glEnable GL_TEXTURE_2D;
2242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2243
2244	my $top = int $self->{children}[1]{range}[0];	2400	my $top = int $self->{children}[1]{range}[0];
2245		2401
2246	my $y0 = $top;	2402	my $y0 = $top;
2247	my $y1 = $top + $self->{h};	2403	my $y1 = $top + $H;
2248		2404
2249	my $y = 0;	2405	my $y = 0;
2250		2406
2251	my $layout = $self->{layout};	2407	my $layout = $self->{layout};
2252		2408
2253	$layout->set_font ($self->{font}) if $self->{font};	2409	$layout->set_font ($self->{font}) if $self->{font};
2254		2410
		2411	glEnable GL_BLEND;
		2412	#TODO# not correct in windows where rgba is forced off
		2413	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2414
2255	for my $par (@{$self->{par}}) {	2415	for my $par (@{$self->{par}}) {
2256	my $h = $par->[0];	2416	my $h = $par->[1];
2257		2417
2258	if ($y0 < $y + $h && $y < $y1) {	2418	if ($y0 < $y + $h && $y < $y1) {
2259	$layout->set_foreground (@{ $par->[1] });	2419	$layout->set_foreground (@{ $par->[2] });
		2420	$layout->set_width ($W - $par->[3]);
2260	$layout->set_markup ($par->[2]);	2421	$layout->set_markup ($par->[4]);
2261		2422
2262	my ($W, $H) = $layout->size;	2423	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2424
		2425	glRasterPos $par->[3], $y - $y0;
		2426	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2264	}	2427	}
2265		2428
2266	$y += $h;	2429	$y += $h;
2267	}	2430	}
2268		2431
2269	glDisable GL_TEXTURE_2D;	2432	glDisable GL_BLEND;
2270	};	2433	};
2271	});	2434	});
2272	}	2435	}
2273		2436
2274	sub _draw {	2437	sub _draw {
2275	my ($self) = @_;	2438	my ($self) = @_;
2276		2439
2277	glEnable GL_TEXTURE_2D;	2440	glEnable GL_TEXTURE_2D;
2278	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2279	glColor 1, 1, 1, 1;	2442	glColor 1, 1, 1, 1;
2280	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2443	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2281	glDisable GL_TEXTURE_2D;	2444	glDisable GL_TEXTURE_2D;
2282		2445
2283	$self->{children}[1]->draw;	2446	$self->{children}[1]->draw;
2284		2447
2285	}	2448	}
…		…
2384		2547
2385	sub set_tooltip_from {	2548	sub set_tooltip_from {
2386	my ($self, $widget) = @_;	2549	my ($self, $widget) = @_;
2387		2550
2388	$self->add (new CFClient::UI::Label	2551	$self->add (new CFClient::UI::Label
2389	markup => $widget->{tooltip},	2552	markup => $widget->{tooltip},
2390	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2553	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2391	fontsize => 0.8,	2554	fontsize => 0.8,
2392	fg => [0, 0, 0, 1],	2555	fg => [0, 0, 0, 1],
		2556	ellipsise => 0,
2393	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2557	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
2394	);	2558	);
2395	}	2559	}
2396		2560
2397	sub size_request {	2561	sub size_request {
2398	my ($self) = @_;	2562	my ($self) = @_;
…		…
2444	use CFClient::OpenGL;	2608	use CFClient::OpenGL;
2445		2609
2446	sub new {	2610	sub new {
2447	my $class = shift;	2611	my $class = shift;
2448		2612
2449	$class->SUPER::new (	2613	my $self = $class->SUPER::new (
2450	aspect => 1,	2614	aspect => 1,
2451	@_,	2615	@_,
2452	)	2616	);
		2617
		2618	if ($self->{anim} && $self->{animspeed}) {
		2619	Scalar::Util::weaken (my $widget = $self);
		2620
		2621	$self->{timer} = Event->timer (
		2622	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2623	hard => 1,
		2624	interval => $self->{animspeed},
		2625	cb => sub {
		2626	++$widget->{frame};
		2627	$widget->update;
		2628	},
		2629	);
		2630	}
		2631
		2632	$self
2453	}	2633	}
2454		2634
2455	sub size_request {	2635	sub size_request {
2456	(32, 8)	2636	(32, 8)
2457	}	2637	}
2458		2638
		2639	sub update {
		2640	my ($self) = @_;
		2641
		2642	return unless $self->{visible};
		2643
		2644	$self->SUPER::update;
		2645	}
		2646
2459	sub _draw {	2647	sub _draw {
2460	my ($self) = @_;	2648	my ($self) = @_;
2461		2649
2462	return unless $::CONN;#d# manage and cache textures differently	2650	return unless $::CONN;
		2651
		2652	my $face;
		2653
		2654	if ($self->{frame}) {
		2655	my $anim = $::CONN->{anim}[$self->{anim}];
		2656
		2657	$face = $anim->[ $self->{frame} % @$anim ]
		2658	if $anim && @$anim;
		2659	}
		2660
2463	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2661	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2464		2662
2465	# TODO animation
2466	if ($tex) {	2663	if ($tex) {
2467	glEnable GL_TEXTURE_2D;	2664	glEnable GL_TEXTURE_2D;
2468	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2469	glColor 1, 1, 1, 1;	2666	glColor 1, 1, 1, 1;
2470	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2667	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2471	glDisable GL_TEXTURE_2D;	2668	glDisable GL_TEXTURE_2D;
2472	}	2669	}
2473	}	2670	}
2474		2671
		2672	sub DESTROY {
		2673	my ($self) = @_;
		2674
		2675	$self->{timer}->cancel
		2676	if $self->{timer};
		2677
		2678	$self->SUPER::DESTROY;
		2679	}
		2680
2475	#############################################################################	2681	#############################################################################
2476		2682
2477	package CFClient::UI::InventoryItem;	2683	package CFClient::UI::InventoryItem;
2478		2684
2479	our @ISA = CFClient::UI::HBox::;	2685	our @ISA = CFClient::UI::HBox::;
		2686
		2687	sub _item_to_desc {
		2688	my ($item) = @_;
		2689
		2690	my $desc =
		2691	$item->{nrof} < 2
		2692	? $item->{name}
		2693	: "$item->{nrof} × $item->{name_pl}";
		2694
		2695	$item->{flags} & Crossfire::Protocol::F_OPEN
		2696	and $desc .= " (open)";
		2697	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2698	and $desc .= " (applied)";
		2699	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2700	and $desc .= " (unpaid)";
		2701	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2702	and $desc .= " (magic)";
		2703	$item->{flags} & Crossfire::Protocol::F_CURSED
		2704	and $desc .= " (cursed)";
		2705	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2706	and $desc .= " (damned)";
		2707	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2708	and $desc .= " *";
		2709
		2710	$desc
		2711	}
2480		2712
2481	sub new {	2713	sub new {
2482	my $class = shift;	2714	my $class = shift;
2483		2715
2484	my %args = @_;	2716	my %args = @_;
2485		2717
2486	my $item = delete $args{item};	2718	my $item = delete $args{item};
2487		2719
2488	my $desc = $item->{nrof} < 2	2720	my $desc = _item_to_desc ($item);
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2721
2493	my $self = $class->SUPER::new (	2722	my $self = $class->SUPER::new (
2494	can_hover => 1,	2723	can_hover => 1,
2495	can_events => 1,	2724	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2725	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2726	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {	2727	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2728	my ($self, $ev, $x, $y) = @_;
2500		2729
2501	# todo: maybe put examine on 1? but should just be a tooltip :(	2730	# todo: maybe put examine on 1? but should just be a tooltip :(
		2731	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2732	my $targ = $::CONN->{player}{tag};
		2733
		2734	if ($item->{container} == $::CONN->{player}{tag}) {
		2735	$targ = $main::OPENCONT;
		2736	}
		2737
		2738	$::CONN->send ("move $targ $item->{tag} 0");
2502	if ($ev->{button} == 1) {	2739	} elsif ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2740	$::CONN->send ("examine $item->{tag}");
2504	} elsif ($ev->{button} == 2) {	2741	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2742	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2743	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2744	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2745	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510	[
2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512	sub { $::CONN->send ("lock $item->{tag}") },
2513	],
2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2746	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2747	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2748	(
		2749	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2750	? (
		2751	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2752	)
		2753	: (
		2754	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2755	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2756	)
2517	],	2757	),
2518	)->popup ($ev);	2758	);
		2759
		2760	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2761	}
2520		2762
2521	1	2763	1
2522	},	2764	},
2523	%args	2765	%args
2524	);	2766	);
		2767
2525		2768
2526	$self->add (new CFClient::UI::Face	2769	$self->add (new CFClient::UI::Face
2527	can_events => 0,	2770	can_events => 0,
2528	face => $item->{face},	2771	face => $item->{face},
2529	anim => $item->{anim},	2772	anim => $item->{anim},
2530	animspeed => $item->{animspeed},	2773	animspeed => $item->{animspeed},
2531	);	2774	);
2532		2775
2533	$self->add (new CFClient::UI::Label	2776	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2534	can_events => 0,	2777
2535	text => $desc,	2778	$self->{item} = $item;
2536	);	2779
		2780	$self->update_item;
2537		2781
2538	$self	2782	$self
		2783	}
		2784
		2785	sub update_item {
		2786	my ($self) = @_;
		2787
		2788	my $desc = _item_to_desc ($self->{item});
		2789
		2790	$self->{name_lbl}->set_text ($desc);
2539	}	2791	}
2540		2792
2541	#############################################################################	2793	#############################################################################
2542		2794
2543	package CFClient::UI::Inventory;	2795	package CFClient::UI::Inventory;
…		…
2546		2798
2547	sub new {	2799	sub new {
2548	my $class = shift;	2800	my $class = shift;
2549		2801
2550	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2551	scrolled => (new CFClient::UI::VBox),	2803	scrolled => (new CFClient::UI::Table),
2552	@_,	2804	@_,
2553	);	2805	);
2554		2806
2555	$self	2807	$self
2556	}	2808	}
…		…
2567	} @$items;	2819	} @$items;
2568		2820
2569	$self->{real_items} = \@items;	2821	$self->{real_items} = \@items;
2570		2822
2571	for my $item (@items) {	2823	for my $item (@items) {
2572	my $desc = $item->{nrof} < 2	2824	$item->{item} = $item;
2573	? $item->{name}
2574	: "$item->{nrof} $item->{name_pl}";
2575
2576	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;	2825	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
		2826	$item->update_item ();
2577	}	2827	}
2578		2828
		2829	my $i = 0;
		2830	for (@items) {
2579	$self->{scrolled}->add (@items);	2831	$self->{scrolled}->add (0, $i, $_);
		2832	my $nrof = $_->{item}->{nrof} \|\| 1;
		2833	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2834	}
2580		2835
2581	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2836	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2582	}	2837	}
2583		2838
2584	sub size_request {	2839	sub size_request {
…		…
2662		2917
2663	package CFClient::UI::Statusbox;	2918	package CFClient::UI::Statusbox;
2664		2919
2665	our @ISA = CFClient::UI::VBox::;	2920	our @ISA = CFClient::UI::VBox::;
2666		2921
		2922	sub new {
		2923	my $class = shift;
		2924
		2925	$class->SUPER::new (
		2926	fontsize => 0.8,
		2927	@_,
		2928	)
		2929	}
		2930
2667	sub reorder {	2931	sub reorder {
2668	my ($self) = @_;	2932	my ($self) = @_;
2669	my $NOW = time;	2933	my $NOW = time;
2670		2934
2671	while (my ($k, $v) = each %{ $self->{item} }) {	2935	while (my ($k, $v) = each %{ $self->{item} }) {
…		…
2689	? "<b>$item->{count} ×</b> $item->{text}"	2953	? "<b>$item->{count} ×</b> $item->{text}"
2690	: $item->{text};	2954	: $item->{text};
2691		2955
2692	for ($short) {	2956	for ($short) {
2693	s/^\s+//;	2957	s/^\s+//;
2694	s/\012.*/…/s;	2958	s/\s+/ /g;
2695	my $len = int 40 / $item->{fontsize};
2696	substr $_, $len, length, "…" if $len < length;
2697	}	2959	}
2698		2960
2699	new CFClient::UI::Label	2961	new CFClient::UI::Label
2700	markup => $short,	2962	markup => $short,
2701	tooltip => $item->{tooltip},	2963	tooltip => $item->{tooltip},
2702	tooltip_font => $::FONT_PROP,	2964	tooltip_font => $::FONT_PROP,
2703	tooltip_width => 0.67,	2965	tooltip_width => 0.67,
2704	fontsize => $item->{fontsize},	2966	fontsize => $item->{fontsize} \|\| $self->{fontsize},
		2967	max_w => $::WIDTH * 0.44,
2705	color => $item->{color},	2968	fg => $item->{fg},
2706	can_events => 1,	2969	can_events => 1,
2707	can_hover => 1	2970	can_hover => 1
2708	};	2971	};
2709	}	2972	}
2710		2973
…		…
2736	$self->{item}{$group} = {	2999	$self->{item}{$group} = {
2737	id => ++$self->{id},	3000	id => ++$self->{id},
2738	text => $text,	3001	text => $text,
2739	timeout => $timeout,	3002	timeout => $timeout,
2740	tooltip => $text,	3003	tooltip => $text,
2741	fontsize => 0.8,
2742	color => [0.8, 0.8, 0.8, 0.8],	3004	fg => [0.8, 0.8, 0.8, 0.8],
2743	pri => 0,	3005	pri => 0,
2744	count => 1,	3006	count => 1,
2745	%arg,	3007	%arg,
2746	};	3008	};
2747	}	3009	}
2748		3010
2749	$self->reorder;	3011	$self->reorder;
2750	}	3012	}
2751		3013
		3014	sub reconfigure {
		3015	my ($self) = @_;
		3016
		3017	delete $_->{label}
		3018	for values %{ $self->{item} \|\| {} };
		3019
		3020	$self->reorder;
		3021	$self->SUPER::reconfigure;
		3022	}
		3023
2752	#############################################################################	3024	#############################################################################
2753		3025
2754	package CFClient::UI::Root;	3026	package CFClient::UI::Root;
2755		3027
2756	our @ISA = CFClient::UI::Container::;	3028	our @ISA = CFClient::UI::Container::;
…		…
2786	}	3058	}
2787		3059
2788	sub size_allocate {	3060	sub size_allocate {
2789	my ($self, $w, $h) = @_;	3061	my ($self, $w, $h) = @_;
2790		3062
2791	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2792	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2793
2794	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2795	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2796
2797	for my $child ($self->children) {	3063	for my $child ($self->children) {
2798	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3064	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2799		3065
		3066	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3067	if exists $child->{req_x};
		3068
		3069	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3070	if exists $child->{req_y};
		3071
2800	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3072	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2801	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3073	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3074
2802	$child->configure ($X, $Y, $W, $H);	3075	$child->configure ($X, $Y, $W, $H);
2803	}	3076	}
2804	}	3077	}
2805		3078
2806	sub coord2local {	3079	sub coord2local {
…		…
2823	}	3096	}
2824		3097
2825	sub add {	3098	sub add {
2826	my ($self, @children) = @_;	3099	my ($self, @children) = @_;
2827		3100
		3101	for (my @widgets = @children; my $w = pop @widgets; ) {
		3102	push @widgets, $w->children;
		3103	$w->{root} = $self;
		3104	$w->{visible} = 1;
		3105	}
		3106
2828	for my $child (@children) {	3107	for my $child (@children) {
2829	$child->{toplevel} = 1;	3108	$child->{is_toplevel} = 1;
2830		3109
2831	# integerise window positions	3110	# integerise window positions
2832	$child->{x} = int $child->{x};	3111	$child->{x} = int $child->{x};
2833	$child->{y} = int $child->{y};	3112	$child->{y} = int $child->{y};
2834	}	3113	}
2835		3114
2836	$self->SUPER::add (@children);	3115	$self->SUPER::add (@children);
		3116	}
		3117
		3118	sub remove {
		3119	my ($self, @children) = @_;
		3120
		3121	$self->SUPER::remove (@children);
		3122
		3123	while (@children) {
		3124	my $w = pop @children;
		3125	push @children, $w->children;
		3126	delete $w->{visible};
		3127	}
2837	}	3128	}
2838		3129
2839	sub on_refresh {	3130	sub on_refresh {
2840	my ($self, $id, $cb) = @_;	3131	my ($self, $id, $cb) = @_;
2841		3132
…		…
2910	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2911	glClear GL_COLOR_BUFFER_BIT;	3202	glClear GL_COLOR_BUFFER_BIT;
2912		3203
2913	glMatrixMode GL_PROJECTION;	3204	glMatrixMode GL_PROJECTION;
2914	glLoadIdentity;	3205	glLoadIdentity;
2915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2916	glMatrixMode GL_MODELVIEW;	3207	glMatrixMode GL_MODELVIEW;
2917	glLoadIdentity;	3208	glLoadIdentity;
2918		3209
2919	$self->_draw;	3210	$self->_draw;
2920	}	3211	}
…		…
2922	#############################################################################	3213	#############################################################################
2923		3214
2924	package CFClient::UI;	3215	package CFClient::UI;
2925		3216
2926	$ROOT = new CFClient::UI::Root;	3217	$ROOT = new CFClient::UI::Root;
2927	$TOOLTIP = new CFClient::UI::Tooltip;	3218	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2928		3219
2929	1	3220	1
2930		3221

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs. Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC