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

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.230 by root, Wed May 24 21:59:54 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.230 by root, Wed May 24 21:59:54 2006 UTC