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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.124 by elmex, Mon Apr 17 20:29:37 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

…		…
112	$self	112	$self
113	}	113	}
114		114
115	sub move {	115	sub move {
116	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
		117
117	$self->{x} = int $x;	118	$self->{x} = int $x;
118	$self->{y} = int $y;	119	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	120	$self->{z} = $z if defined $z;
		121
		122	$self->update;
120	}	123	}
121		124
122	sub needs_redraw {	125	sub needs_redraw {
123	0	126	0
124	}	127	}
…		…
126	sub size_request {	129	sub size_request {
127	require Carp;	130	require Carp;
128	Carp::confess "size_request is abtract";	131	Carp::confess "size_request is abtract";
129	}	132	}
130		133
131	sub _size_allocate {	134	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	135	my ($self, $x, $y, $w, $h) = @_;
133		136
134	$self->{x} = $x;	137	$self->{x} = $x;
135	$self->{y} = $y;	138	$self->{y} = $y;
136		139
137	return unless $self->{w} != $w \|\| $self->{h} != $h;	140	return unless $self->{w} != $w \|\| $self->{h} != $h;
138		141
139	$self->{w} = $w;	142	$self->{w} = $w;
140	$self->{h} = $h;	143	$self->{h} = $h;
141		144
142	1	145	$self->size_allocate ($w, $h);
143	}	146	}
144		147
145	sub size_allocate {	148	sub size_allocate {
146	my ($self, $x, $y, $w, $h) = @_;	149	# nothing to be done
147
148	$self->_size_allocate ($x, $y, $w, $h);
149	}	150	}
150		151
151	# return top left coordinates	152	# return top left coordinates
152	sub _topleft {	153	sub _topleft {
153	my ($self, $x, $y) = @_;	154	my ($self, $x, $y) = @_;
…		…
260	my ($self, $parent) = @_;	261	my ($self, $parent) = @_;
261		262
262	Scalar::Util::weaken ($self->{parent} = $parent);	263	Scalar::Util::weaken ($self->{parent} = $parent);
263	}	264	}
264		265
		266	sub check_size {
		267	my ($self) = @_;
		268
		269	my ($w, $h) = $self->size_request;
		270
		271	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
		272	$self->{req_w} = $w;
		273	$self->{req_h} = $h;
		274
		275	$self->{parent}->check_size
		276	if $self->{parent};
		277
		278	$self->size_allocate ($w, $h);
		279	$self->update;
		280	}
		281	}
		282
265	sub update {	283	sub update {
266	my ($self) = @_;	284	my ($self) = @_;
267		285
268	$self->{parent}->update	286	$self->{parent}->update
269	if $self->{parent};	287	if $self->{parent};
…		…
368	sort { $a->{z} <=> $b->{z} }	386	sort { $a->{z} <=> $b->{z} }
369	@{$self->{children}}, $child	387	@{$self->{children}}, $child
370	];	388	];
371		389
372	$self->{w} = $self->{h} = -1;	390	$self->{w} = $self->{h} = -1;
373	$self->update;	391
		392	$child->check_size;
374	}	393	}
375		394
376	sub remove {	395	sub remove {
377	my ($self, $widget) = @_;	396	my ($self, $widget) = @_;
378		397
379	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
380		399
381	$self->size_allocate (0, 0, $self->{w}, $self->{h});	400	$self->check_size;
382	}	401	}
383		402
384	sub find_widget {	403	sub find_widget {
385	my ($self, $x, $y) = @_;	404	my ($self, $x, $y) = @_;
386		405
…		…
439	sub size_request {	458	sub size_request {
440	$_[0]{children}[0]->size_request	459	$_[0]{children}[0]->size_request
441	}	460	}
442		461
443	sub size_allocate {	462	sub size_allocate {
444	my ($self, $x, $y, $w, $h) = @_;	463	my ($self, $w, $h) = @_;
445		464
446	$self->_size_allocate ($x, $y, $w, $h) or return;
447
448	$self->{children}[0]->size_allocate (0, 0, $w, $h);	465	$self->{children}[0]->configure (0, 0, $w, $h);
449	}	466	}
450		467
451	#############################################################################	468	#############################################################################
452		469
453	package CFClient::UI::Window;	470	package CFClient::UI::Window;
…		…
479	$self->child->draw;	496	$self->child->draw;
480	};	497	};
481	}	498	}
482		499
483	sub size_allocate {	500	sub size_allocate {
484	my ($self, $x, $y, $w, $h) = @_;	501	my ($self, $w, $h) = @_;
485		502
486	$self->_size_allocate ($x, $y, $w, $h) or return;
487
488	$self->child->size_allocate (0, 0, $w, $h);	503	$self->child->configure (0, 0, $w, $h);
489		504
490	$self->render_chld;	505	$self->render_chld;
491	}	506	}
492		507
493	sub _draw {	508	sub _draw {
…		…
509	glDisable GL_TEXTURE_2D;	524	glDisable GL_TEXTURE_2D;
510	}	525	}
511		526
512	#############################################################################	527	#############################################################################
513		528
		529	package CFClient::UI::ViewPort;
		530
		531	our @ISA = CFClient::UI::Window::;
		532
		533	sub new { die }
		534
		535	sub size_request {
		536	my ($self) = @_;
		537
		538	@$self{qw(child_w child_h)} = $self->child->size_request;
		539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		540
		541	@$self{qw(child_w child_h)}
		542	}
		543
		544	sub _draw {
		545	my ($self) = @_;
		546
		547	$self->{children}[1]->draw;
		548	}
		549
		550
		551	#############################################################################
		552
514	package CFClient::UI::Frame;	553	package CFClient::UI::Frame;
515		554
516	our @ISA = CFClient::UI::Bin::;	555	our @ISA = CFClient::UI::Bin::;
517		556
518	use SDL::OpenGL;	557	use SDL::OpenGL;
…		…
528	}	567	}
529		568
530	sub size_allocate {	569	sub size_allocate {
531	my ($self, $x, $y, $w, $h) = @_;	570	my ($self, $x, $y, $w, $h) = @_;
532		571
533	$self->_size_allocate ($x, $y, $w, $h) or return;
534
535	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	572	$self->child->configure (2, 2, $w - 4, $h - 4);
536	}	573	}
537		574
538	sub _draw {	575	sub _draw {
539	my ($self) = @_;	576	my ($self) = @_;
540		577
…		…
590	$h + $self->{border} * 2,	627	$h + $self->{border} * 2,
591	)	628	)
592	}	629	}
593		630
594	sub size_allocate {	631	sub size_allocate {
595	my ($self, $x, $y, $w, $h) = @_;	632	my ($self, $w, $h) = @_;
596
597	$self->_size_allocate ($x, $y, $w, $h) or return;
598		633
599	$h -= List::Util::max 0, $self->{border} * 2;	634	$h -= List::Util::max 0, $self->{border} * 2;
600	$w -= List::Util::max 0, $self->{border} * 2;	635	$w -= List::Util::max 0, $self->{border} * 2;
601		636
602	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);
603	}	638	}
604		639
605	sub button_down {	640	sub button_down {
606	my ($self, $ev, $x, $y) = @_;	641	my ($self, $ev, $x, $y) = @_;
607		642
…		…
616		651
617	($x, $y) = ($ev->motion_x, $ev->motion_y);	652	($x, $y) = ($ev->motion_x, $ev->motion_y);
618		653
619	$self->{user_w} = $bw + $x - $ox;	654	$self->{user_w} = $bw + $x - $ox;
620	$self->{user_h} = $bh + $y - $oy;	655	$self->{user_h} = $bh + $y - $oy;
621	$self->update;	656	$self->check_size;
622	};	657	};
623		658
624	} elsif ($x >= 0 && $x < $self->{w}	659	} elsif ($x >= 0 && $x < $self->{w}
625	&& $y >= 0 && $y < $self->{border}) {	660	&& $y >= 0 && $y < $self->{border}) {
626		661
…		…
710		745
711	$child->set_parent ($self);	746	$child->set_parent ($self);
712	$self->{children}[$y][$x] = $child;	747	$self->{children}[$y][$x] = $child;
713		748
714	$self->{w} = $self->{h} = -1;	749	$self->{w} = $self->{h} = -1;
715	$self->update;	750
		751	$child->check_size;
716	}	752	}
717		753
718	# TODO: move to container class maybe? send childs a signal on removal?	754	# TODO: move to container class maybe? send childs a signal on removal?
719	sub clear {	755	sub clear {
720	my ($self) = @_;	756	my ($self) = @_;
…		…
755	(sum @$hs),	791	(sum @$hs),
756	)	792	)
757	}	793	}
758		794
759	sub size_allocate {	795	sub size_allocate {
760	my ($self, $x, $y, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
761
762	$self->_size_allocate ($x, $y, $w, $h) or return;
763		797
764	my ($ws, $hs) = $self->get_wh;	798	my ($ws, $hs) = $self->get_wh;
765		799
766	my $req_w = sum @$ws;	800	my $req_w = sum @$ws;
767	my $req_h = sum @$hs;	801	my $req_h = sum @$hs;
…		…
789		823
790	for my $c (0 .. $#$row) {	824	for my $c (0 .. $#$row) {
791	my $col_w = $ws->[$c];	825	my $col_w = $ws->[$c];
792		826
793	if (my $widget = $row->[$c]) {	827	if (my $widget = $row->[$c]) {
794	$widget->size_allocate ($x, $y, $col_w, $row_h);	828	$widget->configure ($x, $y, $col_w, $row_h);
795	}	829	}
796		830
797	$x += $col_w;	831	$x += $col_w;
798	}	832	}
799		833
…		…
844	(List::Util::max map $_->[1], @alloc),	878	(List::Util::max map $_->[1], @alloc),
845	)	879	)
846	}	880	}
847		881
848	sub size_allocate {	882	sub size_allocate {
849	my ($self, $x, $y, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
850
851	$self->_size_allocate ($x, $y, $w, $h);
852		884
853	($h, $w) = ($w, $h);	885	($h, $w) = ($w, $h);
854		886
855	my $children = $self->{children};	887	my $children = $self->{children};
856		888
…		…
878		910
879	my $y = 0;	911	my $y = 0;
880	for (0 .. $#$children) {	912	for (0 .. $#$children) {
881	my $child = $children->[$_];	913	my $child = $children->[$_];
882	my $h = $h[$_];	914	my $h = $h[$_];
883	$child->size_allocate ($y, 0, $h, $w);	915	$child->configure ($y, 0, $h, $w);
884		916
885	$y += $h;	917	$y += $h;
886	}	918	}
		919
		920	1
887	}	921	}
888		922
889	#############################################################################	923	#############################################################################
890		924
891	package CFClient::UI::VBox;	925	package CFClient::UI::VBox;
…		…
904	(List::Util::sum map $_->[1], @alloc),	938	(List::Util::sum map $_->[1], @alloc),
905	)	939	)
906	}	940	}
907		941
908	sub size_allocate {	942	sub size_allocate {
909	my ($self, $x, $y, $w, $h) = @_;	943	my ($self, $w, $h) = @_;
910
911	$self->_size_allocate ($x, $y, $w, $h);
912		944
913	my $children = $self->{children};	945	my $children = $self->{children};
914		946
915	my @h = map +($_->size_request)[1], @$children;	947	my @h = map +($_->size_request)[1], @$children;
916		948
…		…
934		966
935	my $y = 0;	967	my $y = 0;
936	for (0 .. $#$children) {	968	for (0 .. $#$children) {
937	my $child = $children->[$_];	969	my $child = $children->[$_];
938	my $h = $h[$_];	970	my $h = $h[$_];
939	$child->size_allocate (0, $y, $w, $h);	971	$child->configure (0, $y, $w, $h);
940		972
941	$y += $h;	973	$y += $h;
942	}	974	}
		975
		976	1
943	}	977	}
944		978
945	#############################################################################	979	#############################################################################
946		980
947	package CFClient::UI::Label;	981	package CFClient::UI::Label;
…		…
1013	$h + $self->{padding} * 2,	1047	$h + $self->{padding} * 2,
1014	)	1048	)
1015	}	1049	}
1016		1050
1017	sub size_allocate {	1051	sub size_allocate {
1018	my ($self, $x, $y, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
1019
1020	$self->_size_allocate ($x, $y, $w, $h) or return;
1021		1053
1022	delete $self->{texture};	1054	delete $self->{texture};
1023	}	1055	}
1024		1056
1025	sub update {	1057	sub update {
…		…
1114		1146
1115	($w + 1, $h) # add 1 for cursor	1147	($w + 1, $h) # add 1 for cursor
1116	}	1148	}
1117		1149
1118	sub size_allocate {	1150	sub size_allocate {
1119	my ($self, $x, $y, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1120
1121	$self->SUPER::size_allocate ($x, $y, $w, $h);
1122		1152
1123	$self->_set_text ($self->{text});	1153	$self->_set_text ($self->{text});
1124	}	1154	}
1125		1155
1126	sub set_text {	1156	sub set_text {
…		…
1276	padding => 4,	1306	padding => 4,
1277	fg => [1, 1, 1],	1307	fg => [1, 1, 1],
1278	bg => [1, 1, 1, 0.2],	1308	bg => [1, 1, 1, 0.2],
1279	active_fg => [0, 0, 1],	1309	active_fg => [0, 0, 1],
1280	can_hover => 1,	1310	can_hover => 1,
		1311	align => 0,
		1312	valign => 0,
1281	@_	1313	@_
1282	)	1314	)
1283	}	1315	}
1284		1316
1285	sub button_up {	1317	sub button_up {
…		…
1342		1374
1343	sub size_request {	1375	sub size_request {
1344	my ($self) = @_;	1376	my ($self) = @_;
1345		1377
1346	($self->{padding} * 2 + 6) x 2	1378	($self->{padding} * 2 + 6) x 2
1347	}
1348
1349	sub size_allocate {
1350	my ($self, $x, $y, $w, $h) = @_;
1351
1352	$self->_size_allocate ($x, $y, $w, $h);
1353	}	1379	}
1354		1380
1355	sub button_down {	1381	sub button_down {
1356	my ($self, $ev, $x, $y) = @_;	1382	my ($self, $ev, $x, $y) = @_;
1357		1383
…		…
1422	}	1448	}
1423		1449
1424	sub size_request {	1450	sub size_request {
1425	my ($self) = @_;	1451	my ($self) = @_;
1426		1452
1427	($self->{w}, $self->{h})	1453	my $tex = $tex{$self->{gauge}}[0];
		1454
		1455	@$tex{qw(w h)}
1428	}	1456	}
1429		1457
1430	sub set_max {	1458	sub set_max {
1431	my ($self, $max) = @_;	1459	my ($self, $max) = @_;
		1460
1432	$self->{max_val} = $max;	1461	$self->{max_val} = $max;
1433	}	1462	}
1434		1463
1435	sub set_value {	1464	sub set_value {
1436	my ($self, $val, $max) = @_;	1465	my ($self, $val, $max) = @_;
…		…
1688		1717
1689	($self->{req_w}, $self->{req_h})	1718	($self->{req_w}, $self->{req_h})
1690	}	1719	}
1691		1720
1692	sub size_allocate {	1721	sub size_allocate {
1693	my ($self, $x, $y, $w, $h) = @_;	1722	my ($self, $w, $h) = @_;
1694
1695	$self->SUPER::size_allocate ($x, $y, $w, $h);
1696		1723
1697	$self->{layout}->set_height ($self->{fontsize});	1724	$self->{layout}->set_height ($self->{fontsize});
1698	$self->{layout}->set_width ($self->{w});	1725	$self->{layout}->set_width ($self->{w});
1699		1726
1700	$self->reflow;	1727	$self->reflow;
		1728	$self->update;
1701	}	1729	}
1702		1730
1703	sub add_paragraph {	1731	sub add_paragraph {
1704	my ($self, $color, $text) = @_;	1732	my ($self, $color, $text) = @_;
1705		1733
…		…
1886		1914
1887	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1888		1916
1889	if ($::CFG->{fow_enable}) {	1917	if ($::CFG->{fow_enable}) {
1890	if ($::CFG->{fow_smooth}) { # smooth fog of war	1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
1891	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1892	glConvolutionFilter2D	1920	glConvolutionFilter2D (
1893	GL_CONVOLUTION_2D,	1921	GL_CONVOLUTION_2D,
1894	GL_ALPHA,	1922	GL_ALPHA,
1895	3, 3,	1923	3, 3,
1896	GL_ALPHA, GL_FLOAT,	1924	GL_ALPHA, GL_FLOAT,
1897	pack "f*",	1925	pack "f*",
1898	0.1, 0.1, 0.1,	1926	0.1, 0.1, 0.1,
1899	0.1, 0.2, 0.1,	1927	0.1, 0.2, 0.1,
1900	0.1, 0.1, 0.1,	1928	0.1, 0.1, 0.1,
1901	;	1929	);
1902	glEnable GL_CONVOLUTION_2D;	1930	glEnable GL_CONVOLUTION_2D;
1903	}	1931	}
1904		1932
1905	$self->{fow_texture} = new CFClient::Texture	1933	$self->{fow_texture} = new CFClient::Texture
1906	w => $w,	1934	w => $w,
…		…
1936	$self->{mapmap_texture} =	1964	$self->{mapmap_texture} =
1937	new CFClient::Texture	1965	new CFClient::Texture
1938	w => $w,	1966	w => $w,
1939	h => $h,	1967	h => $h,
1940	data => $::MAP->mapmap ($w, $h),	1968	data => $::MAP->mapmap ($w, $h),
1941	type => GL_UNSIGNED_INT_8_8_8_8_REV;	1969	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1942		1970
1943	$self->{mapmap_texture}->draw_quad (100, 100);	1971	$self->{mapmap_texture}->draw_quad (100, 100);
1944		1972
1945	glDisable GL_TEXTURE_2D;	1973	glDisable GL_TEXTURE_2D;
1946	glDisable GL_BLEND;	1974	glDisable GL_BLEND;
…		…
2113		2141
2114	our @ISA = CFClient::UI::Container::;	2142	our @ISA = CFClient::UI::Container::;
2115		2143
2116	use SDL::OpenGL;	2144	use SDL::OpenGL;
2117		2145
		2146	sub check_size {
		2147	my ($self) = @_;
		2148
		2149	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2150	}
		2151
2118	sub size_request {	2152	sub size_request {
2119	($::WIDTH, $::HEIGHT)	2153	($::WIDTH, $::HEIGHT)
2120	}	2154	}
2121		2155
2122	sub size_allocate {	2156	sub configure {
2123	my ($self, $x, $y, $w, $h) = @_;	2157	my ($self, $x, $y, $w, $h) = @_;
2124		2158
2125	$self->_size_allocate ($x, $y, $w, $h);	2159	$self->SUPER::configure ($x, $y, $w, $h);
2126		2160
2127	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2128	for @{$self->{children}};	2162	for @{$self->{children}};
2129	}	2163	}
2130		2164
2131	sub _topleft {	2165	sub _topleft {
2132	my ($self, $x, $y) = @_;	2166	my ($self, $x, $y) = @_;
…		…
2135	}	2169	}
2136		2170
2137	sub update {	2171	sub update {
2138	my ($self) = @_;	2172	my ($self) = @_;
2139		2173
2140	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2174	$self->check_size;
2141	::refresh ();	2175	::refresh ();
2142	}	2176	}
2143		2177
2144	sub add {	2178	sub add {
2145	my ($self, $widget) = @_;	2179	my ($self, $child) = @_;
2146		2180
2147	$self->SUPER::add ($widget);	2181	$self->SUPER::add ($child);
2148
2149	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2150	}	2182	}
2151		2183
2152	sub on_refresh {	2184	sub on_refresh {
2153	my ($self, $id, $cb) = @_;	2185	my ($self, $id, $cb) = @_;
2154		2186

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.124 by elmex, Mon Apr 17 20:29:37 2006 UTC vs. Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.124 by elmex, Mon Apr 17 20:29:37 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC