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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC

…		…
1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_markup ($widget->{tooltip});	29	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	30	$TOOLTIP->show;
31		31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {	34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
…		…
232	$self->{y} = $y;	232	$self->{y} = $y;
233	$self->update;	233	$self->update;
234	}	234	}
235		235
236	if ($self->{w} != $w \|\| $self->{h} != $h) {	236	if ($self->{w} != $w \|\| $self->{h} != $h) {
237	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	}	238	}
243	}	239	}
244		240
245	sub size_allocate {	241	sub size_allocate {
246	# nothing to be done	242	# nothing to be done
247	}	243	}
248		244
249	sub children {	245	sub children {
250	}	246	}
251		247
252	# call when resoltuion changes etc.	248	# call when resolution changes etc.
253	sub reconfigure {	249	sub reconfigure {
254	my ($self) = @_;	250	my ($self) = @_;
255		251
256	$_->reconfigure	252	$_->reconfigure
257	for $self->children;	253	for $self->children;
258		254
259	$_->check_size;	255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
260	}	258	}
261		259
262	sub set_max_size {	260	sub set_max_size {
263	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
264		262
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}
268
269	# return top left coordinates
270	sub _topleft {
271	my ($self, $x, $y) = @_;
272
273	$self->{parent}
274	or Carp::confess "no parent widget in _topleft\n";#d#
275
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277	}	265	}
278		266
279	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
280	sub coord2local {	268	sub coord2local {
281	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
282		270
283	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	272	}
286		273
287	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
288	sub coord2global {	275	sub coord2global {
289	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
290		277
291	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	279	}
294		280
295	sub focus_in {	281	sub focus_in {
296	my ($self) = @_;	282	my ($self) = @_;
297		283
…		…
395		381
396	sub set_parent {	382	sub set_parent {
397	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
398		384
399	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
400	}	389	}
401		390
402	sub check_size {	391	sub check_size {
403	my ($self) = @_;	392	my ($self) = @_;
404		393
405	$self->{parent}	394	$CFClient::UI::ROOT->{check_size}{$self} = $self;
406	or return 1;
407
408	my ($w, $h) = $self->{user_w} && $self->{user_h}
409	? @$self{qw(user_w user_h)}
410	: $self->size_request;
411
412	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
413	$self->{req_w} = $w;
414	$self->{req_h} = $h;
415
416	$self->{parent}->check_size
417	or $self->size_allocate (
418	(List::Util::max $self->{w}, $w),
419	(List::Util::max $self->{h}, $h),
420	);
421
422	1
423	} else {
424	0
425	}
426	}	395	}
427		396
428	sub update {	397	sub update {
429	my ($self) = @_;	398	my ($self) = @_;
430		399
…		…
527		496
528	$self	497	$self
529	}	498	}
530		499
531	sub add {	500	sub add {
532	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
533		502
534	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
535		505
536	use sort 'stable';	506	use sort 'stable';
537		507
538	$self->{children} = [	508	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
541	];	511	];
542		512
543	$child->check_size;	513	$self->check_size;
		514	$self->update;
544	}	515	}
545		516
546	sub children {	517	sub children {
547	@{ $_[0]{children} }	518	@{ $_[0]{children} }
548	}	519	}
…		…
567		538
568	for (@$children) {	539	for (@$children) {
569	delete $_->{parent};	540	delete $_->{parent};
570	$_->hide;	541	$_->hide;
571	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
572	}	546	}
573		547
574	sub find_widget {	548	sub find_widget {
575	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
576		550
…		…
662		636
663	$self->SUPER::size_allocate ($w, $h);	637	$self->SUPER::size_allocate ($w, $h);
664	$self->update;	638	$self->update;
665	}	639	}
666		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
667	sub render_child {	645	sub render_child {
668	my ($self) = @_;	646	my ($self) = @_;
669		647
670	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671	glClearColor 0, 0, 0, 0;	649	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	650	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	651
		652	$self->_render;
674	# glColorMask 1, 1, 1, 0;	653	# glColorMask 1, 1, 1, 0;
675	# glEnable GL_BLEND;	654	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;	655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;	656	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};	657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
…		…
687	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
688		667
689	my $tex = $self->{texture}	668	my $tex = $self->{texture}
690	or return;	669	or return;
691		670
692	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glEnable GL_TEXTURE_2D;	671	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	673	glColor 0, 0, 0, 1;
697		674
698	$tex->draw_quad (0, 0, $w, $h);	675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		676
700	glDisable GL_BLEND;
701	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
702	}	678	}
703		679
704	#############################################################################	680	#############################################################################
705		681
706	package CFClient::UI::ViewPort;	682	package CFClient::UI::ViewPort;
707		683
708	our @ISA = CFClient::UI::Window::;	684	our @ISA = CFClient::UI::Window::;
709		685
710	sub new { die }
711
712	sub size_request {	686	sub size_request {
713	my ($self) = @_;	687	my ($self) = @_;
714		688
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	689	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
717		691
718	@$self{qw(child_w child_h)}	692	@$self{qw(child_w child_h)}
719	}	693	}
720		694
721	sub _draw {	695	sub size_allocate {
722	my ($self) = @_;	696	my ($self, $w, $h) = @_;
723		697
724	$self->{children}[1]->draw;	698	$self->update;
725	}	699	}
726		700
		701	sub set_offset {
		702	my ($self, $x, $y) = @_;
		703
		704	$self->{view_x} = int $x;
		705	$self->{view_y} = int $y;
		706
		707	$self->update;
		708	}
		709
		710	# hmm, this does not work for topleft of $self... but we should not ask for that
		711	sub coord2local {
		712	my ($self, $x, $y) = @_;
		713
		714	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		715	}
		716
		717	sub coord2global {
		718	my ($self, $x, $y) = @_;
		719
		720	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		721	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		722
		723	$self->SUPER::coord2global ($x, $y)
		724	}
		725
		726	sub find_widget {
		727	my ($self, $x, $y) = @_;
		728
		729	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		730	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		731	) {
		732	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		733	} else {
		734	$self->CFClient::UI::Base::find_widget ($x, $y)
		735	}
		736	}
		737
		738	sub _render {
		739	my ($self) = @_;
		740
		741	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		742
		743	$self->SUPER::_render;
		744	}
		745
		746	#############################################################################
		747
		748	package CFClient::UI::ScrolledWindow;
		749
		750	our @ISA = CFClient::UI::HBox::;
		751
		752	sub new {
		753	my $class = shift;
		754
		755	my $self;
		756
		757	my $slider = new CFClient::UI::Slider
		758	vertical => 1,
		759	range => [0, 0, 1, 0.01], # HACK fix
		760	connect_changed => sub {
		761	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		762	},
		763	;
		764
		765	$self = $class->SUPER::new (
		766	vp => (new CFClient::UI::ViewPort),
		767	slider => $slider,
		768	@_,
		769	);
		770
		771	$self->{vp}->add ($self->{scrolled});
		772	$self->add ($self->{vp});
		773	$self->add ($self->{slider});
		774
		775	$self
		776	}
		777
		778	#TODO# update range on size_allocate depeneing on child
		779	# update viewport offset on scroll
727		780
728	#############################################################################	781	#############################################################################
729		782
730	package CFClient::UI::Frame;	783	package CFClient::UI::Frame;
731		784
…		…
904	$tex[1]->draw_quad (0, 0, $w, $border);	957	$tex[1]->draw_quad (0, 0, $w, $border);
905	$tex[3]->draw_quad (0, $border, $border, $ch);	958	$tex[3]->draw_quad (0, $border, $border, $ch);
906	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
907	$tex[4]->draw_quad (0, $h - $border, $w, $border);	960	$tex[4]->draw_quad (0, $h - $border, $w, $border);
908		961
		962	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
909	my $bg = $tex[0];	963	my $bg = $tex[0];
910		964
911	# TODO: repeat texture not scale	965	# TODO: repeat texture not scale
912	my $rep_x = $cw / $bg->{w};	966	my $rep_x = $cw / $bg->{w};
913	my $rep_y = $ch / $bg->{h};	967	my $rep_y = $ch / $bg->{h};
914		968
915	glColor @{ $self->{bg} };	969	glColor @{ $self->{bg} };
916		970
917	$bg->{s} = $rep_x;	971	$bg->{s} = $rep_x;
918	$bg->{t} = $rep_y;	972	$bg->{t} = $rep_y;
919	$bg->{wrap_mode} = 1;	973	$bg->{wrap_mode} = 1;
920	$bg->draw_quad ($border, $border, $cw, $ch);	974	$bg->draw_quad ($border, $border, $cw, $ch);
921		975
922	glDisable GL_TEXTURE_2D;	976	glDisable GL_TEXTURE_2D;
923	glDisable GL_BLEND;	977	glDisable GL_BLEND;
		978	}
924		979
925	$self->{title}->draw if $self->{title};	980	$self->{title}->draw if $self->{title};
		981
926	$self->child->draw;	982	$self->child->draw;
927	}	983	}
928		984
929	#############################################################################	985	#############################################################################
930		986
…		…
1154	}	1210	}
1155		1211
1156	sub size_allocate {	1212	sub size_allocate {
1157	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1158		1214
		1215	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1216
1159	my $children = $self->{children};	1217	my $children = $self->{children};
1160		1218
1161	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1162		1220
1163	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1202	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1203		1261
1204	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1205	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1206	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1207	fontsize => 1,	1268	fontsize => 1,
1208	text => "",
1209	align => -1,	1269	align => -1,
1210	valign => -1,	1270	valign => -1,
1211	padding => 2,	1271	padding => 2,
1212	layout => new CFClient::Layout,
1213	can_events => 0,	1272	can_events => 0,
1214	%arg	1273	%arg
1215	);	1274	);
1216		1275
1217	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1218	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1219	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1220	$self->{template} = $layout;	1279	$self->{template} = $layout;
1221	}	1280	}
1222		1281
1223	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1224	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1283	$self->set_markup (delete $self->{markup});
		1284	} else {
		1285	$self->set_text (delete $self->{text});
		1286	}
1225		1287
1226	$self	1288	$self
1227	}	1289	}
1228		1290
1229	sub escape {	1291	sub escape {
…		…
1241		1303
1242	delete $self->{texture};	1304	delete $self->{texture};
1243	$self->SUPER::update;	1305	$self->SUPER::update;
1244	}	1306	}
1245		1307
1246	sub reconfigure {
1247	my ($self) = @_;
1248
1249	delete $self->{texture};
1250	}
1251
1252	sub set_text {	1308	sub set_text {
1253	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1254		1310
1255	return if $self->{text} eq "T$text";	1311	return if $self->{text} eq "T$text";
1256	$self->{text} = "T$text";	1312	$self->{text} = "T$text";
1257		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1258	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1259		1316
1260	delete $self->{texture};
1261	$self->update;	1317	$self->update;
1262	$self->check_size;	1318	$self->check_size;
1263	}	1319	}
1264		1320
1265	sub set_markup {	1321	sub set_markup {
1266	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1267		1323
1268	return if $self->{text} eq "M$markup";	1324	return if $self->{text} eq "M$markup";
1269	$self->{text} = "M$markup";	1325	$self->{text} = "M$markup";
1270		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1271	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1272		1331
1273	delete $self->{texture};
1274	$self->update;	1332	$self->update;
1275	$self->check_size;	1333	$self->check_size;
1276	}	1334	}
1277		1335
1278	sub size_request {	1336	sub size_request {
…		…
1309	sub set_fontsize {	1367	sub set_fontsize {
1310	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1311		1369
1312	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1313	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1314	$self->check_size;	1374	$self->check_size;
1315	$self->update;
1316	}	1375	}
1317		1376
1318	sub _draw {	1377	sub _draw {
1319	my ($self) = @_;	1378	my ($self) = @_;
1320		1379
1321	my $tex = $self->{texture} \|\|= do {	1380	my $tex = $self->{texture} \|\|= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1322	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1323	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1324	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1385
1325	new_from_layout CFClient::Texture $self->{layout}	1386	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1387
		1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1390	: ($self->{w} - $tex->{w}) * 0.5;
		1391
		1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1394	: ($self->{h} - $tex->{h}) * 0.5;
		1395
		1396	$tex
1326	};	1397	};
1327		1398
1328	glEnable GL_BLEND;
1329	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1331	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1333	glColor @{$self->{fg}};	1403	glColor @{$self->{fg}};
1334
1335	$self->{ox} = int (
1336	$self->{align} < 0 ? $self->{padding}
1337	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1338	: ($self->{w} - $tex->{w}) * 0.5
1339	);
1340
1341	$self->{oy} = int (
1342	$self->{valign} < 0 ? $self->{padding}
1343	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344	: ($self->{h} - $tex->{h}) * 0.5
1345	);
1346
1347	$tex->draw_quad ($self->{ox}, $self->{oy});	1404	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1405	} else {
		1406	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1407	}
1348		1408
1349	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1350	glDisable GL_BLEND;
1351	}	1410	}
1352		1411
1353	#############################################################################	1412	#############################################################################
1354		1413
1355	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1390	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1391		1450
1392	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1393	}	1452	}
1394		1453
		1454	sub set_text {
		1455	my ($self, $text) = @_;
		1456
		1457	$self->{cursor} = length $text;
		1458	$self->_set_text ($text);
		1459	$self->check_size;
		1460	$self->update;
		1461	}
		1462
1395	sub get_text {	1463	sub get_text {
1396	$_[0]{text}	1464	$_[0]{text}
1397	}	1465	}
1398		1466
1399	sub size_request {	1467	sub size_request {
…		…
1406		1474
1407	sub size_allocate {	1475	sub size_allocate {
1408	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1409		1477
1410	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1411	}
1412
1413	sub set_text {
1414	my ($self, $text) = @_;
1415
1416	$self->{cursor} = length $text;
1417	$self->_set_text ($text);
1418	$self->update;
1419	}	1479	}
1420		1480
1421	sub key_down {	1481	sub key_down {
1422	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1423		1483
…		…
1611		1671
1612	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1613	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1614	}	1674	}
1615		1675
1616	glEnable GL_BLEND;
1617	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1621		1679
1622	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1623		1681
1624	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1625	glDisable GL_BLEND;
1626		1683
1627	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1628	}	1685	}
1629		1686
1630	#############################################################################	1687	#############################################################################
…		…
1677		1734
1678	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1679		1736
1680	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681		1738
1682	glEnable GL_BLEND;
1683	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1684	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685		1740
1686	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1687		1742
1688	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1689		1744
1690	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;
1692	}	1746	}
1693		1747
1694	#############################################################################	1748	#############################################################################
1695		1749
1696	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1739	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1740		1794
1741	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1742	}	1796	}
1743		1797
1744	glEnable GL_BLEND;
1745	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1747	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748		1800
1749	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1750		1802
1751	glDisable GL_BLEND;
1752	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1753	}	1804	}
1754		1805
1755	#############################################################################	1806	#############################################################################
1756		1807
…		…
1954	# TODO: calculations are off	2005	# TODO: calculations are off
1955	my $self = $class->SUPER::new (	2006	my $self = $class->SUPER::new (
1956	fg => [1, 1, 1],	2007	fg => [1, 1, 1],
1957	active_fg => [0, 0, 0],	2008	active_fg => [0, 0, 0],
1958	range => [0, 0, 100, 10],	2009	range => [0, 0, 100, 10],
1959	req_w => 20,	2010	req_w => $::WIDTH / 80,
1960	req_h => 20,	2011	req_h => $::WIDTH / 80,
1961	vertical => 0,	2012	vertical => 0,
1962	can_hover => 1,	2013	can_hover => 1,
1963	inner_pad => 5,	2014	inner_pad => 5,
1964	@_	2015	@_
1965	);	2016	);
…		…
2048	$page \|\|= 2;	2099	$page \|\|= 2;
2049		2100
2050	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2051	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2052		2103
2053	glEnable GL_BLEND;
2054	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2055	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057		2106
2058	# draw background	2107	# draw background
2059	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2060		2109
2061	# draw handle	2110	# draw handle
2062	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2063		2112
2064	glDisable GL_BLEND;
2065	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
2066	}	2114	}
2067		2115
2068	#############################################################################	2116	#############################################################################
2069		2117
…		…
2080	fontsize => 1,	2128	fontsize => 1,
2081	can_events => 0,	2129	can_events => 0,
2082	#font => default_font	2130	#font => default_font
2083	@_,	2131	@_,
2084		2132
2085	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
2086	par => [],	2134	par => [],
2087	height => 0,	2135	height => 0,
2088	children => [	2136	children => [
2089	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
2090	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
…		…
2108		2156
2109	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2110		2158
2111	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112	$layout->set_width ($self->{children}[0]{w});	2160	$layout->set_width ($self->{children}[0]{w});
2113	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2114		2162
2115	($layout->size)[1]	2163	($layout->size)[1]
2116	}	2164	}
2117		2165
2118	sub reflow {	2166	sub reflow {
…		…
2174		2222
2175	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2223	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2176	glClearColor 0, 0, 0, 0;	2224	glClearColor 0, 0, 0, 0;
2177	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2178		2226
2179	glEnable GL_BLEND;
2180	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2181	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2182	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2183		2229
2184	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2185		2231
…		…
2194		2240
2195	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2196	my $h = $par->[0];	2242	my $h = $par->[0];
2197		2243
2198	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2199	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2200		2247
2201	glColor @{ $par->[1] };
2202	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2203	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2204	}	2250	}
2205		2251
2206	$y += $h;	2252	$y += $h;
2207	}	2253	}
2208		2254
2209	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2210	glDisable GL_BLEND;
2211	};	2256	};
2212	});	2257	});
2213	}	2258	}
2214		2259
2215	sub _draw {	2260	sub _draw {
2216	my ($self) = @_;	2261	my ($self) = @_;
2217		2262
2218	glEnable GL_BLEND;
2219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222	glColor 1, 1, 1, 1;	2265	glColor 1, 1, 1, 1;
2223	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2225	glDisable GL_BLEND;
2226		2268
2227	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2228		2270
2229	}	2271	}
2230		2272
…		…
2324	@_,	2366	@_,
2325	can_events => 0,	2367	can_events => 0,
2326	)	2368	)
2327	}	2369	}
2328		2370
2329	sub set_markup {	2371	sub set_tooltip_from {
2330	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2331		2373
2332	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2333	$self->{label}->set_markup ($text);	2375	markup => $widget->{tooltip},
		2376	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2377	fontsize => 0.8,
		2378	fg => [0, 0, 0, 1],
		2379	font => ($widget->{tooltip_font} \|\| $::FONT_PROP);
		2380
2334	$self->add ($self->{label});	2381	$self->add ($self->{label});
2335	}	2382	}
2336		2383
2337	sub size_request {	2384	sub size_request {
2338	my ($self) = @_;	2385	my ($self) = @_;
2339
2340	$self->child->set_max_size ($::WIDTH * 0.3);
2341		2386
2342	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343		2388
2344	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2345	}	2390	}
…		…
2399		2444
2400	sub size_request {	2445	sub size_request {
2401	(32, 8)	2446	(32, 8)
2402	}	2447	}
2403		2448
2404	sub draw {	2449	sub _draw {
2405	my ($self) = @_;	2450	my ($self) = @_;
2406		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2407	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408		2454
		2455	# TODO animation
2409	if ($tex) {	2456	if ($tex) {
2410	glEnable GL_BLEND;
2411	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2413	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2415	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2416	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2417	glDisable GL_BLEND;	2462	}
		2463	}
		2464
		2465	#############################################################################
		2466
		2467	package CFClient::UI::InventoryItem;
		2468
		2469	our @ISA = CFClient::UI::HBox::;
		2470
		2471	sub new {
		2472	my $class = shift;
		2473
		2474	my %args = @_;
		2475
		2476	my $item = delete $args{item};
		2477
		2478	my $desc = $item->{nrof} < 2
		2479	? $item->{name}
		2480	: "$item->{nrof} $item->{name_pl}";
		2481
		2482
		2483	my $self = $class->SUPER::new (
		2484	can_hover => 1,
		2485	can_events => 1,
		2486	tooltip => (CFClient::UI::Label->escape ($desc)
		2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2488	connect_button_down => sub {
		2489	my ($self, $ev, $x, $y) = @_;
		2490
		2491	# todo: maybe put examine on 1? but should just be a tooltip :(
		2492	if ($ev->{button} == 1) {
		2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2494	} elsif ($ev->{button} == 2) {
		2495	$::CONN->send ("apply $item->{tag}");
		2496	} elsif ($ev->{button} == 3) {
		2497	CFClient::UI::Menu->new (
		2498	items => [
		2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2500	[
		2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2502	sub { $::CONN->send ("lock $item->{tag}") },
		2503	],
		2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2507	],
		2508	)->popup ($ev);
		2509	}
		2510
		2511	1
		2512	},
		2513	%args
		2514	);
		2515
		2516	$self->add (new CFClient::UI::Face
		2517	can_events => 0,
		2518	face => $item->{face},
		2519	anim => $item->{anim},
		2520	animspeed => $item->{animspeed},
		2521	);
		2522
		2523	$self->add (new CFClient::UI::Label
		2524	can_events => 0,
		2525	text => $desc,
		2526	);
		2527
		2528	$self
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Inventory;
		2534
		2535	our @ISA = CFClient::UI::ScrolledWindow::;
		2536
		2537	sub new {
		2538	my $class = shift;
		2539
		2540	my $self = $class->SUPER::new (
		2541	scrolled => (new CFClient::UI::VBox),
		2542	@_,
		2543	);
		2544
		2545	$self
		2546	}
		2547
		2548	sub set_items {
		2549	my ($self, $items) = @_;
		2550
		2551	$self->{scrolled}->clear;
		2552	return unless $items;
		2553
		2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2555
		2556	$self->{real_items} = \@items;
		2557
		2558	for my $item (@items) {
		2559	my $desc = $item->{nrof} < 2
		2560	? $item->{name}
		2561	: "$item->{nrof} $item->{name_pl}";
		2562
		2563	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
		2564	}
		2565
		2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571	($self->{req_w}, $self->{req_h});
		2572	}
		2573
		2574	#############################################################################
		2575
		2576	package CFClient::UI::Menu;
		2577
		2578	our @ISA = CFClient::UI::FancyFrame::;
		2579
		2580	use CFClient::OpenGL;
		2581
		2582	sub new {
		2583	my $class = shift;
		2584
		2585	my $self = $class->SUPER::new (
		2586	items => [],
		2587	z => 100,
		2588	@_,
		2589	);
		2590
		2591	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2592
		2593	for my $item (@{ $self->{items} }) {
		2594	my ($widget, $cb) = @$item;
		2595
		2596	# handle various types of items, only text for now
		2597	if (!ref $widget) {
		2598	$widget = new CFClient::UI::Label
		2599	can_hover => 1,
		2600	can_events => 1,
		2601	text => $widget;
		2602	}
		2603
		2604	$self->{item}{$widget} = $item;
		2605
		2606	$self->{vbox}->add ($widget);
		2607	}
		2608
		2609	$self
		2610	}
		2611
		2612	# popup given the event (must be a mouse button down event currently)
		2613	sub popup {
		2614	my ($self, $ev) = @_;
		2615
		2616	$self->emit ("popdown");
		2617
		2618	# maybe save $GRAB? must be careful about events...
		2619	$GRAB = $self;
		2620	$self->{button} = $ev->{button};
		2621
		2622	$self->show;
		2623	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2624	}
		2625
		2626	sub mouse_motion {
		2627	my ($self, $ev, $x, $y) = @_;
		2628
		2629	# TODO: should use vbox->find_widget or so
		2630	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2631	$self->{hover} = $self->{item}{$HOVER};
		2632	}
		2633
		2634	sub button_up {
		2635	my ($self, $ev, $x, $y) = @_;
		2636
		2637	if ($ev->{button} == $self->{button}) {
		2638	undef $GRAB;
		2639	$self->hide;
		2640
		2641	$self->emit ("popdown");
		2642	$self->{hover}[1]->() if $self->{hover};
		2643	}
		2644	}
		2645
		2646	#############################################################################
		2647
		2648	package CFClient::UI::Statusbox;
		2649
		2650	our @ISA = CFClient::UI::VBox::;
		2651
		2652	sub reorder {
		2653	my ($self) = @_;
		2654	my $NOW = time;
		2655
		2656	while (my ($k, $v) = each %{ $self->{item} }) {
		2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2658	}
		2659
		2660	my @widgets;
		2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
		2662	my $count = 10 + 1;
		2663	for my $item (@items) {
		2664	last unless --$count;
		2665
		2666	push @widgets, $item->{label} \|\|= do {
		2667	# TODO: doesn't handle markup well (read as: at all)
		2668	my $short = delete $item->{text};
		2669	for ($short) {
		2670	s/^\s+//;
		2671	s/\012.*//s;
		2672	my $len = int 30 / $item->{fontsize};
		2673	substr $_, $len, length, "…" if $len < length;
		2674	}
		2675
		2676	new CFClient::UI::Label
		2677	markup => $short,
		2678	tooltip => delete $item->{tooltip},
		2679	tooltip_font => $::FONT_PROP,
		2680	tooltip_width => 0.75,
		2681	fontsize => delete $item->{fontsize},
		2682	color => delete $item->{color},
		2683	can_events => 1,
		2684	can_hover => 1,
		2685	};
		2686	}
		2687
		2688	$self->clear;
		2689	$self->SUPER::add (@widgets);
		2690	}
		2691
		2692	sub add {
		2693	my ($self, $text, %arg) = @_;
		2694
		2695	my $item = {
		2696	time => time,
		2697	text => $text,
		2698	timeout => 60,
		2699	tooltip => $text,
		2700	fontsize => 0.8,
		2701	color => [0.8, 0.8, 0.8, 0.8],
		2702	%arg,
2418	}	2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} \|\|= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} \|\|= $item;
		2709
		2710	$self->reorder;
2419	}	2711	}
2420		2712
2421	#############################################################################	2713	#############################################################################
2422		2714
2423	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2424		2716
2425	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2426		2718
2427	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2428		2720
2429	sub check_size {	2721	sub new {
2430	my ($self) = @_;	2722	my $class = shift;
2431		2723
2432	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2433	}	2725	@_,
2434		2726	)
2435	sub size_request {
2436	($::WIDTH, $::HEIGHT)
2437	}	2727	}
2438		2728
2439	sub configure {	2729	sub configure {
2440	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2441		2731
2442	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2443		2735
		2736	sub check_size {
		2737	my ($self) = @_;
		2738
		2739	$self->size_allocate ($self->{w}, $self->{h})
		2740	if $self->{w};
		2741	}
		2742
		2743	sub size_request {
		2744	my ($self) = @_;
		2745
		2746	($self->{w}, $self->{h})
		2747	}
		2748
		2749	sub size_allocate {
		2750	my ($self, $w, $h) = @_;
		2751
		2752	my $old_w = $self->{old_w};
		2753	my $old_h = $self->{old_h};
		2754
		2755	if ($old_w && $old_h) {
		2756	for my $child ($self->children) {
		2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2765	}
		2766	}
		2767
2444	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2445	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446		2770
2447	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2448	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2450	}	2774	}
2451	}
2452		2775
2453	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2454	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2455		2782
2456	($x, $y)	2783	($x, $y)
2457	}	2784	}
2458		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2459	sub update {	2792	sub update {
2460	my ($self) = @_;	2793	my ($self) = @_;
2461		2794
2462	$self->check_size;	2795	$self->check_size;
2463	::refresh ();	2796	$::WANT_REFRESH++;
2464	}	2797	}
2465		2798
2466	sub add {	2799	sub add {
2467	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2468		2801
2469	# integerize window positions	2802	# integerise window positions
2470	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2471	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2472		2805
2473	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2474	}	2807	}
…		…
2477	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2478		2811
2479	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2480	}	2813	}
2481		2814
2482	sub draw {	2815	sub draw {
2483	my ($self) = @_;	2816	my ($self) = @_;
2484		2817
		2818	if ($self->{check_size}) {
		2819	my @queue = ([], []);
		2820
		2821	for (;;) {
		2822	if ($self->{check_size}) {
		2823	# heuristic: check containers last
		2824	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2825	for values %{delete $self->{check_size}}
		2826	}
		2827
		2828	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2829
		2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2831	? @$widget{qw(user_w user_h)}
		2832	: $widget->size_request;
		2833
		2834	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {
		2835	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2836
		2837	$widget->{req_w} = $w;
		2838	$widget->{req_h} = $h;
		2839
		2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2841
		2842	$widget->{parent}->check_size
		2843	if $widget->{parent};
		2844	}
		2845	}
		2846	}
		2847
		2848	while ($self->{size_alloc}) {
		2849	for (values %{delete $self->{size_alloc}}) {
		2850	my ($widget, $w, $h) = @$_;
		2851
		2852	$w = 0 if $w < 0;
		2853	$h = 0 if $h < 0;
		2854
		2855	$widget->{w} = $w;
		2856	$widget->{h} = $h;
		2857	$widget->size_allocate ($w, $h);
		2858	$widget->emit (size_allocate => $w, $h);
		2859	}
		2860	}
		2861
2485	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2486	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2487	}	2865	}
2488		2866
2489	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491	glClear GL_COLOR_BUFFER_BIT;	2869	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC vs. Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC