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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w \|\| $self->{h} != $h) {	361	if ($self->{alloc_w} != $w \|\| $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
…		…
463		472
464	sub set_parent {	473	sub set_parent {
465	my ($self, $parent) = @_;	474	my ($self, $parent) = @_;
466		475
467	Scalar::Util::weaken ($self->{parent} = $parent);	476	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	477	$self->set_visible if $parent->{visible};
470	}	478	}
471		479
472	sub connect {	480	sub connect {
473	my ($self, $signal, $cb) = @_;	481	my ($self, $signal, $cb) = @_;
…		…
494		502
495	sub realloc {	503	sub realloc {
496	my ($self) = @_;	504	my ($self) = @_;
497		505
498	if ($self->{visible}) {	506	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	507	return if $self->{root}{realloc}{$self+0};
500		508
501	$self->{root}{realloc}{$self} = $self;	509	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	510	$self->{root}->update;
503	} else {	511	} else {
504	delete $self->{req_w};	512	delete $self->{req_w};
		513	delete $self->{req_h};
505	}	514	}
506	}	515	}
507		516
508	sub update {	517	sub update {
509	my ($self) = @_;	518	my ($self) = @_;
…		…
542	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
543	glEnd;	552	glEnd;
544	glDisable GL_BLEND;	553	glDisable GL_BLEND;
545	}	554	}
546		555
547	if ($ENV{CFPLUS_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	557	glPushMatrix;
549	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	561	glVertex 0 , 0;
…		…
761	sub size_request {	770	sub size_request {
762	$_[0]{children}[0]->size_request	771	$_[0]{children}[0]->size_request
763	}	772	}
764		773
765	sub size_allocate {	774	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	775	my ($self, $w, $h) = @_;
767		776
768	$self->{children}[0]->configure (0, 0, $w, $h);	777	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	778	}
770		779
771	#############################################################################	780	#############################################################################
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	797	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	798	$self->SUPER::update;
790	}	799	}
791		800
792	sub size_allocate {	801	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	802	my ($self, $w, $h) = @_;
794		803
795	$self->SUPER::size_allocate ($w, $h, $changed);	804	$self->SUPER::size_allocate ($w, $h);
796	$self->update	805	$self->update;
797	if $changed;
798	}	806	}
799		807
800	sub _render {	808	sub _render {
801	$_[0]{children}[0]->draw;	809	$_[0]{children}[0]->draw;
802	}	810	}
…		…
846	}	854	}
847		855
848	sub size_request {	856	sub size_request {
849	my ($self) = @_;	857	my ($self) = @_;
850		858
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		860
853	$w = 10 if $self->{scroll_x};	861	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	862	$h = 10 if $self->{scroll_y};
855		863
856	($w, $h)	864	($w, $h)
857	}	865	}
858		866
859	sub size_allocate {	867	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	868	my ($self, $w, $h) = @_;
861		869
		870	my $child = $self->child;
		871
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		874
865	$self->child->configure (0, 0, $w, $h);	875	$self->child->configure (0, 0, $w, $h);
866	$self->update;	876	$self->update;
867	}	877	}
868		878
…		…
952	my $child = $self->{vp}->child;	962	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	963	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	964	}
955		965
956	sub size_allocate {	966	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	967	my ($self, $w, $h) = @_;
958		968
959	$self->SUPER::size_allocate ($w, $h, $changed);	969	$self->SUPER::size_allocate ($w, $h);
960		970
961	my $child = $self->{vp}->child;	971	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	972	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	973	}
964		974
…		…
1026		1036
1027	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1040	border => 0.6,
1031	is_toplevel => 1,
1032	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
1033	@_	1044	@_
1034	);	1045	);
1035		1046
1036	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
1037	align => 0,	1048	align => 0,
…		…
1056	$h + $self->border * 2,	1067	$h + $self->border * 2,
1057	)	1068	)
1058	}	1069	}
1059		1070
1060	sub size_allocate {	1071	sub size_allocate {
1061	my ($self, $w, $h, $changed) = @_;	1072	my ($self, $w, $h) = @_;
1062
1063	return unless $changed;
1064		1073
1065	$h -= List::Util::max 0, $self->border * 2;	1074	$h -= List::Util::max 0, $self->border * 2;
1066	$w -= List::Util::max 0, $self->border * 2;	1075	$w -= List::Util::max 0, $self->border * 2;
1067		1076
1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1077	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
1240	(sum @$hs),	1249	(sum @$hs),
1241	)	1250	)
1242	}	1251	}
1243		1252
1244	sub size_allocate {	1253	sub size_allocate {
1245	my ($self, $w, $h, $changed) = @_;	1254	my ($self, $w, $h) = @_;
1246		1255
1247	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1248		1257
1249	my $req_w = (sum @$ws) \|\| 1;	1258	my $req_w = (sum @$ws) \|\| 1;
1250	my $req_h = (sum @$hs) \|\| 1;	1259	my $req_h = (sum @$hs) \|\| 1;
…		…
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1338	)
1330	}	1339	}
1331		1340
1332	sub size_allocate {	1341	sub size_allocate {
1333	my ($self, $w, $h, $changed) = @_;	1342	my ($self, $w, $h) = @_;
1334		1343
1335	my $space = $self->{vertical} ? $h : $w;	1344	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1345	my $children = $self->{children};
1337		1346
1338	my @req;	1347	my @req;
…		…
1421	ellipsise => 3, # end	1430	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1423	fontsize => 1,	1432	fontsize => 1,
1424	align => -1,	1433	align => -1,
1425	valign => -1,	1434	valign => -1,
1426	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1427	can_events => 0,	1437	can_events => 0,
1428	%arg	1438	%arg
1429	);	1439	);
1430		1440
1431	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1507		1517
1508	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1510	}	1520	}
1511		1521
1512	(	1522	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1523	}
1517		1524
1518	sub size_allocate {	1525	sub size_allocate {
1519	my ($self, $w, $h, $changed) = @_;	1526	my ($self, $w, $h) = @_;
1520		1527
1521	delete $self->{texture}	1528	delete $self->{texture}
1522	if $changed;	1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523	}	1530	}
1524		1531
1525	sub set_fontsize {	1532	sub set_fontsize {
1526	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1527		1534
…		…
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1553
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1548		1555
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1552		1559
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1556		1563
1557	$tex	1564	$tex
1558	};	1565	};
1559		1566
…		…
1798		1805
1799	sub new {	1806	sub new {
1800	my $class = shift;	1807	my $class = shift;
1801		1808
1802	$class->SUPER::new (	1809	$class->SUPER::new (
1803	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1804	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1806	can_hover => 1,	1814	can_hover => 1,
1807	align => 0,	1815	align => 0,
1808	valign => 0,	1816	valign => 0,
…		…
1855		1863
1856	sub new {	1864	sub new {
1857	my $class = shift;	1865	my $class = shift;
1858		1866
1859	$class->SUPER::new (	1867	$class->SUPER::new (
1860	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1861	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1874	state => 0,
…		…
1869	}	1878	}
1870		1879
1871	sub size_request {	1880	sub size_request {
1872	my ($self) = @_;	1881	my ($self) = @_;
1873		1882
1874	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1875	}	1884	}
1876		1885
1877	sub button_down {	1886	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1879		1888
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1884	}	1893	}
1885	}	1894	}
1886		1895
1887	sub _draw {	1896	sub _draw {
1888	my ($self) = @_;	1897	my ($self) = @_;
1889		1898
1890	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1891		1900
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1902
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1903	my ($w, $h) = @$self{qw(w h)};
		1904
		1905	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1906
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1908
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1910
…		…
2164	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2171	vertical => 0,	2182	vertical => 0,
2172	can_hover => 1,	2183	can_hover => 1,
2173	inner_pad => 0.02,	2184	inner_pad => 0.02,
2174	@_	2185	@_
2175	);	2186	);
…		…
2215	}	2226	}
2216		2227
2217	sub size_request {	2228	sub size_request {
2218	my ($self) = @_;	2229	my ($self) = @_;
2219		2230
2220	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2221	my $h = $self->{req_h};
2222
2223	$self->{vertical} ? ($h, $w) : ($w, $h)
2224	}	2232	}
2225		2233
2226	sub button_down {	2234	sub button_down {
2227	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2228		2236
…		…
2378	$self->{fontsize} = $fontsize;	2386	$self->{fontsize} = $fontsize;
2379	$self->reflow;	2387	$self->reflow;
2380	}	2388	}
2381		2389
2382	sub size_allocate {	2390	sub size_allocate {
2383	my ($self, $w, $h, $changed) = @_;	2391	my ($self, $w, $h) = @_;
2384		2392
2385	$self->SUPER::size_allocate ($w, $h, $changed);	2393	$self->SUPER::size_allocate ($w, $h);
2386
2387	return unless $changed;
2388		2394
2389	$self->{layout}->set_font ($self->{font}) if $self->{font};	2395	$self->{layout}->set_font ($self->{font}) if $self->{font};
2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2396	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$self->{layout}->set_width ($self->{children}[0]{w});	2397	$self->{layout}->set_width ($self->{children}[0]{w});
2392		2398
…		…
2615	}	2621	}
2616		2622
2617	sub set_tooltip_from {	2623	sub set_tooltip_from {
2618	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2619		2625
		2626	my $tooltip = $widget->{tooltip};
		2627
		2628	if ($ENV{CFPLUS_DEBUG} & 2) {
		2629	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2630	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2631	. "req $widget->{req_w} $widget->{req_h}\n"
		2632	. "visible $widget->{visible}";
		2633	}
		2634
2620	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2621	markup => $widget->{tooltip},	2636	markup => $tooltip,
2622	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2623	fontsize => 0.8,	2638	fontsize => 0.8,
2624	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2625	ellipsise => 0,	2640	ellipsise => 0,
2626	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2641	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
2634		2649
2635	($w + 4, $h + 4)	2650	($w + 4, $h + 4)
2636	}	2651	}
2637		2652
2638	sub size_allocate {	2653	sub size_allocate {
2639	my ($self, $w, $h, $changed) = @_;	2654	my ($self, $w, $h) = @_;
2640		2655
2641	return unless $changed;
2642
2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2656	$self->SUPER::size_allocate ($w - 4, $h - 4);
2644	}	2657	}
2645		2658
2646	sub visibility_change {	2659	sub visibility_change {
2647	my ($self, $visible) = @_;	2660	my ($self, $visible) = @_;
2648		2661
…		…
2769	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2770	}	2783	}
2771		2784
2772	#############################################################################	2785	#############################################################################
2773		2786
2774	package CFClient::UI::Inventory;
2775
2776	our @ISA = CFClient::UI::ScrolledWindow::;
2777
2778	sub new {
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813
2814	#############################################################################
2815
2816	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2817		2788
2818	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2819		2790
2820	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2858	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2830	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2861		2832
2862	$self->show;	2833	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2834	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2835	}
2865		2836
2866	sub mouse_motion {	2837	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2868		2839
…		…
2993	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
2994	}	2965	}
2995		2966
2996	#############################################################################	2967	#############################################################################
2997		2968
		2969	package CFClient::UI::Inventory;
		2970
		2971	our @ISA = CFClient::UI::ScrolledWindow::;
		2972
		2973	sub new {
		2974	my $class = shift;
		2975
		2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2978	@_,
		2979	);
		2980
		2981	$self
		2982	}
		2983
		2984	sub set_items {
		2985	my ($self, $items) = @_;
		2986
		2987	$self->{scrolled}->clear;
		2988	return unless $items;
		2989
		2990	my @items = sort {
		2991	($a->{type} <=> $b->{type})
		2992	or ($a->{name} cmp $b->{name})
		2993	} @$items;
		2994
		2995	$self->{real_items} = \@items;
		2996
		2997	my $row = 0;
		2998	for my $item (@items) {
		2999	CFClient::Item::update_widgets $item;
		3000
		3001	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3004
		3005	$row++;
		3006	}
		3007	}
		3008
		3009	#############################################################################
		3010
		3011	package CFClient::UI::BindEditor;
		3012
		3013	our @ISA = CFClient::UI::FancyFrame::;
		3014
		3015	sub new {
		3016	my $class = shift;
		3017
		3018	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3019
		3020	$self->add (my $vb = new CFClient::UI::VBox);
		3021
		3022
		3023	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3024	text => "start recording",
		3025	tooltip => "Start/Stops recording of actions."
		3026	."All subsequent actions after the recording started will be captured."
		3027	."The actions are displayed after the record was stopped."
		3028	."To bind the action you have to click on the 'Bind' button",
		3029	on_activate => sub {
		3030	unless ($self->{recording}) {
		3031	$self->start;
		3032	} else {
		3033	$self->stop;
		3034	}
		3035	});
		3036
		3037	$vb->add (new CFClient::UI::Label text => "Actions:");
		3038	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3039
		3040	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3041	$vb->add (my $hb = new CFClient::UI::HBox);
		3042	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3043	$hb->add (new CFClient::UI::Button
		3044	text => "bind",
		3045	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3046	on_activate => sub {
		3047	$self->ask_for_bind;
		3048	});
		3049
		3050	$vb->add (my $hb = new CFClient::UI::HBox);
		3051	$hb->add (new CFClient::UI::Button
		3052	text => "ok",
		3053	expand => 1,
		3054	tooltip => "This closes the binding editor and saves the binding",
		3055	on_activate => sub {
		3056	$self->hide;
		3057	$self->commit;
		3058	});
		3059
		3060	$hb->add (new CFClient::UI::Button
		3061	text => "cancel",
		3062	expand => 1,
		3063	tooltip => "This closes the binding editor without saving",
		3064	on_activate => sub {
		3065	$self->hide;
		3066	$self->{binding_cancel}->()
		3067	if $self->{binding_cancel};
		3068	});
		3069
		3070	$self->update_binding_widgets;
		3071
		3072	$self
		3073	}
		3074
		3075	sub commit {
		3076	my ($self) = @_;
		3077	my ($mod, $sym, $cmds) = $self->get_binding;
		3078	if ($sym != 0 && @$cmds > 0) {
		3079	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3080	."'. Don't forget 'Save Config'!");
		3081	$self->{binding_change}->($mod, $sym, $cmds)
		3082	if $self->{binding_change};
		3083	} else {
		3084	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3085	$self->{binding_cancel}->()
		3086	if $self->{binding_cancel};
		3087	}
		3088	}
		3089
		3090	sub start {
		3091	my ($self) = @_;
		3092
		3093	$self->{rec_btn}->set_text ("stop recording");
		3094	$self->{recording} = 1;
		3095	$self->clear_command_list;
		3096	$::CONN->start_record if $::CONN;
		3097	}
		3098
		3099	sub stop {
		3100	my ($self) = @_;
		3101
		3102	$self->{rec_btn}->set_text ("start recording");
		3103	$self->{recording} = 0;
		3104
		3105	my $rec;
		3106	$rec = $::CONN->stop_record if $::CONN;
		3107	return unless ref $rec eq 'ARRAY';
		3108	$self->set_command_list ($rec);
		3109	}
		3110
		3111	# if $commit is true, the binding will be set after the user entered a key combo
		3112	sub ask_for_bind {
		3113	my ($self, $commit) = @_;
		3114
		3115	CFClient::Binder::open_binding_dialog (sub {
		3116	my ($mod, $sym) = @_;
		3117	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3118	$self->update_binding_widgets;
		3119	$self->commit if $commit;
		3120	});
		3121	}
		3122
		3123	# $mod and $sym are the modifiers and key symbol
		3124	# $cmds is a array ref of strings (the commands)
		3125	# $cb is the callback that is executed on OK
		3126	# $ccb is the callback that is executed on CANCEL and
		3127	# when the binding was unsuccessful on OK
		3128	sub set_binding {
		3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3130
		3131	$self->clear_command_list;
		3132	$self->{recording} = 0;
		3133	$self->{rec_btn}->set_text ("start recording");
		3134
		3135	$self->{binding} = [$mod, $sym];
		3136	$self->{commands} = $cmds;
		3137
		3138	$self->{binding_change} = $cb;
		3139	$self->{binding_cancel} = $ccb;
		3140
		3141	$self->update_binding_widgets;
		3142	}
		3143
		3144	# this is a shortcut method that asks for a binding
		3145	# and then just binds it.
		3146	sub do_quick_binding {
		3147	my ($self, $cmds) = @_;
		3148	$self->set_binding (undef, undef, $cmds, sub {
		3149	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3150	});
		3151	$self->ask_for_bind (1);
		3152	}
		3153
		3154	sub update_binding_widgets {
		3155	my ($self) = @_;
		3156	my ($mod, $sym, $cmds) = $self->get_binding;
		3157	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3158	$self->set_command_list ($cmds);
		3159	}
		3160
		3161	sub get_binding {
		3162	my ($self) = @_;
		3163	return (
		3164	$self->{binding}->[0],
		3165	$self->{binding}->[1],
		3166	[ grep { defined $_ } @{$self->{commands}} ]
		3167	);
		3168	}
		3169
		3170	sub clear_command_list {
		3171	my ($self) = @_;
		3172	$self->{cmdbox}->clear ();
		3173	}
		3174
		3175	sub set_command_list {
		3176	my ($self, $cmds) = @_;
		3177
		3178	$self->{cmdbox}->clear ();
		3179	$self->{commands} = $cmds;
		3180
		3181	my $idx = 0;
		3182
		3183	for (@$cmds) {
		3184	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3185
		3186	my $i = $idx;
		3187	$hb->add (new CFClient::UI::Label text => $_);
		3188	$hb->add (new CFClient::UI::Button
		3189	text => "delete",
		3190	tooltip => "Deletes the action from the record",
		3191	on_activate => sub {
		3192	$self->{cmdbox}->remove ($hb);
		3193	$cmds->[$i] = undef;
		3194	});
		3195
		3196
		3197	$idx++
		3198	}
		3199	}
		3200
		3201	#############################################################################
		3202
		3203	package CFClient::UI::SpellList;
		3204
		3205	our @ISA = CFClient::UI::FancyFrame::;
		3206
		3207	sub new {
		3208	my $class = shift;
		3209
		3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3211
		3212	$self->add (new CFClient::UI::ScrolledWindow
		3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3214
		3215	$self;
		3216	}
		3217
		3218	# XXX: Do sorting? Argl...
		3219	sub add_spell {
		3220	my ($self, $spell) = @_;
		3221	$self->{spells}->{$spell->{name}} = $spell;
		3222
		3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3224	face => $spell->{face},
		3225	can_hover => 1,
		3226	can_events => 1,
		3227	tooltip => $spell->{message});
		3228
		3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3230	text => $spell->{name},
		3231	can_hover => 1,
		3232	can_events => 1,
		3233	tooltip => $spell->{message},
		3234	expand => 1);
		3235
		3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3238	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
		3239	expand => 1);
		3240
		3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3242	text => "bind to key",
		3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3244	}
		3245
		3246	sub rebuild_spell_list {
		3247	my ($self) = @_;
		3248	$self->{tbl_idx} = 0;
		3249	$self->add_spell ($_) for values %{$self->{spells}};
		3250	}
		3251
		3252	sub remove_spell {
		3253	my ($self, $spell) = @_;
		3254	delete $self->{spells}->{$spell->{name}};
		3255	$self->rebuild_spell_list;
		3256	}
		3257
		3258	#############################################################################
		3259
2998	package CFClient::UI::Root;	3260	package CFClient::UI::Root;
2999		3261
3000	our @ISA = CFClient::UI::Container::;	3262	our @ISA = CFClient::UI::Container::;
3001		3263
3002	use CFClient::OpenGL;	3264	use CFClient::OpenGL;
…		…
3012	Scalar::Util::weaken ($self->{root} = $self);	3274	Scalar::Util::weaken ($self->{root} = $self);
3013		3275
3014	$self	3276	$self
3015	}	3277	}
3016		3278
3017	sub configure {
3018	my ($self, $x, $y, $w, $h) = @_;
3019
3020	$self->{w} = $w;
3021	$self->{h} = $h;
3022	}
3023
3024	sub reconfigure {
3025	my ($self) = @_;
3026
3027	$self->SUPER::reconfigure;
3028
3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3030	if $self->{w};
3031	}
3032
3033	sub size_request {	3279	sub size_request {
3034	my ($self) = @_;	3280	my ($self) = @_;
3035		3281
3036	($self->{w}, $self->{h})	3282	($self->{w}, $self->{h})
3037	}	3283	}
…		…
3049		3295
3050	int $coord + 0.5	3296	int $coord + 0.5
3051	}	3297	}
3052		3298
3053	sub size_allocate {	3299	sub size_allocate {
3054	my ($self, $w, $h, $changed) = @_;	3300	my ($self, $w, $h) = @_;
3055		3301
3056	for my $child ($self->children) {	3302	for my $child ($self->children) {
3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3303	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058		3304
3059	$X = $child->{force_x} if exists $child->{force_x};	3305	$X = $child->{force_x} if exists $child->{force_x};
…		…
3127	$_->()	3373	$_->()
3128	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3129	}	3375	}
3130		3376
3131	if ($self->{realloc}) {	3377	if ($self->{realloc}) {
		3378	my %queue;
3132	my @queue;	3379	my @queue;
		3380	my $widget;
3133		3381
		3382	outer:
3134	while () {	3383	while () {
3135	if ($self->{realloc}) {	3384	if (my $realloc = delete $self->{realloc}) {
3136	#TODO use array-of-depth approach	3385	for $widget (values %$realloc) {
		3386	$widget->{visible} or next; # do not resize invisible widgets
3137		3387
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3388	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{realloc}};	3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3140	}	3392	}
3141		3393
		3394	while () {
		3395	@queue or last outer;
		3396
		3397	$widget = pop @{ $queue[-1] \|\| [] }
		3398	and last;
		3399
		3400	pop @queue;
		3401	}
		3402
		3403	delete $queue{$widget+0};
		3404
		3405	my ($w, $h) = $widget->size_request;
		3406
		3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3409
		3410	$w = $widget->{force_w} if exists $widget->{force_w};
		3411	$h = $widget->{force_h} if exists $widget->{force_h};
		3412
		3413	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h
		3414	\|\| delete $widget->{force_realloc}) {
		3415	$widget->{req_w} = $w;
		3416	$widget->{req_h} = $h;
		3417
		3418	$self->{size_alloc}{$widget+0} = $widget;
		3419
		3420	if (my $parent = $widget->{parent}) {
		3421	$self->{realloc}{$parent+0} = $parent
		3422	unless $queue{$parent+0};
		3423
		3424	$parent->{force_size_alloc} = 1;
		3425	$self->{size_alloc}{$parent+0} = $parent;
		3426	}
		3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
		3430	}
		3431	}
		3432
		3433	while (my $size_alloc = delete $self->{size_alloc}) {
		3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3435	values %$size_alloc;
		3436
		3437	while () {
3142	my $widget = pop @queue \|\| last;	3438	my $widget = pop @queue \|\| last;
3143		3439
3144	$widget->{visible} or last; # do not resize invisible widgets	3440	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147	? @$widget{qw(force_w force_h)}
3148	: $widget->size_request;
3149
3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152	$w = $min_size if $w < $min_size;
3153	$h = $min_size if $h < $min_size;
3154
3155	$widget->{req_w} = $w;
3156	$widget->{req_h} = $h;
3157
3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160	push @queue, $widget->{parent}
3161	if $widget->{parent};
3162	}
3163	}
3164
3165	while (my $size_alloc = delete $self->{size_alloc}) {
3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167	values %$size_alloc;
3168
3169	while () {
3170	my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172	$w = $widget->{w} \|\| $widget->{req_w} unless defined $w;
3173	$h = $widget->{h} \|\| $widget->{req_h} unless defined $h;
3174		3441
3175	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3176	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3177		3444
3178	$w = int $w + 0.5;	3445	$w = int $w + 0.5;
3179	$h = int $h + 0.5;	3446	$h = int $h + 0.5;
3180		3447
3181	my $changed = $widget->{w} != $w \|\| $widget->{h} != $h;	3448	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
		3449	$widget->{old_w} = $widget->{w};
		3450	$widget->{old_h} = $widget->{h};
3182		3451
3183	$widget->{w} = $w;	3452	$widget->{w} = $w;
3184	$widget->{h} = $h;	3453	$widget->{h} = $h;
3185		3454
3186	$widget->emit (size_allocate => $w, $h, $changed);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3187	}	3457	}
3188	}	3458	}
3189		3459
3190	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3191	$_->()	3461	$_->()
3192	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3193	}	3463	}
		3464
3194		3465
3195	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3198		3469

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs. Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC