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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.179 by elmex, Fri Apr 28 05:17:21 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
…		…
1157	}	1210	}
1158		1211
1159	sub size_allocate {	1212	sub size_allocate {
1160	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1161		1214
		1215	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1216
1162	my $children = $self->{children};	1217	my $children = $self->{children};
1163		1218
1164	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1165		1220
1166	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1205	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1206		1261
1207	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1208	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1209	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1210	fontsize => 1,	1268	fontsize => 1,
1211	text => "",
1212	align => -1,	1269	align => -1,
1213	valign => -1,	1270	valign => -1,
1214	padding => 2,	1271	padding => 2,
1215	layout => new CFClient::Layout,
1216	can_events => 0,	1272	can_events => 0,
1217	%arg	1273	%arg
1218	);	1274	);
1219		1275
1220	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1221	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1222	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1223	$self->{template} = $layout;	1279	$self->{template} = $layout;
1224	}	1280	}
1225		1281
1226	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1227	$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	}
1228		1287
1229	$self	1288	$self
1230	}	1289	}
1231		1290
1232	sub escape {	1291	sub escape {
…		…
1244		1303
1245	delete $self->{texture};	1304	delete $self->{texture};
1246	$self->SUPER::update;	1305	$self->SUPER::update;
1247	}	1306	}
1248		1307
1249	sub reconfigure {
1250	my ($self) = @_;
1251
1252	delete $self->{texture};
1253	}
1254
1255	sub set_text {	1308	sub set_text {
1256	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1257		1310
1258	return if $self->{text} eq "T$text";	1311	return if $self->{text} eq "T$text";
1259	$self->{text} = "T$text";	1312	$self->{text} = "T$text";
1260		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1262		1316
1263	delete $self->{texture};
1264	$self->update;	1317	$self->update;
1265	$self->check_size;	1318	$self->check_size;
1266	}	1319	}
1267		1320
1268	sub set_markup {	1321	sub set_markup {
1269	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1270		1323
1271	return if $self->{text} eq "M$markup";	1324	return if $self->{text} eq "M$markup";
1272	$self->{text} = "M$markup";	1325	$self->{text} = "M$markup";
1273		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1275		1331
1276	delete $self->{texture};
1277	$self->update;	1332	$self->update;
1278	$self->check_size;	1333	$self->check_size;
1279	}	1334	}
1280		1335
1281	sub size_request {	1336	sub size_request {
…		…
1312	sub set_fontsize {	1367	sub set_fontsize {
1313	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1314		1369
1315	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1316	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1317	$self->check_size;	1374	$self->check_size;
1318	$self->update;
1319	}	1375	}
1320		1376
1321	sub _draw {	1377	sub _draw {
1322	my ($self) = @_;	1378	my ($self) = @_;
1323		1379
1324	my $tex = $self->{texture} \|\|= do {	1380	my $tex = $self->{texture} \|\|= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1325	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1326	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1327	$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
1328	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
1329	};	1397	};
1330		1398
1331	glEnable GL_BLEND;
1332	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1336	glColor @{$self->{fg}};	1403	glColor @{$self->{fg}};
1337
1338	$self->{ox} = int (
1339	$self->{align} < 0 ? $self->{padding}
1340	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341	: ($self->{w} - $tex->{w}) * 0.5
1342	);
1343
1344	$self->{oy} = int (
1345	$self->{valign} < 0 ? $self->{padding}
1346	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347	: ($self->{h} - $tex->{h}) * 0.5
1348	);
1349
1350	$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	}
1351		1408
1352	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1353	glDisable GL_BLEND;
1354	}	1410	}
1355		1411
1356	#############################################################################	1412	#############################################################################
1357		1413
1358	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1393	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1394		1450
1395	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1396	}	1452	}
1397		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
1398	sub get_text {	1463	sub get_text {
1399	$_[0]{text}	1464	$_[0]{text}
1400	}	1465	}
1401		1466
1402	sub size_request {	1467	sub size_request {
…		…
1409		1474
1410	sub size_allocate {	1475	sub size_allocate {
1411	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1412		1477
1413	$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
1414	}
1415
1416	sub set_text {
1417	my ($self, $text) = @_;
1418
1419	$self->{cursor} = length $text;
1420	$self->_set_text ($text);
1421	$self->update;
1422	}	1479	}
1423		1480
1424	sub key_down {	1481	sub key_down {
1425	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1426		1483
…		…
1614		1671
1615	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1616	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1617	}	1674	}
1618		1675
1619	glEnable GL_BLEND;
1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1624		1679
1625	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626		1681
1627	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1628	glDisable GL_BLEND;
1629		1683
1630	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1631	}	1685	}
1632		1686
1633	#############################################################################	1687	#############################################################################
…		…
1680		1734
1681	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;
1682		1736
1683	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684		1738
1685	glEnable GL_BLEND;
1686	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1687	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688		1740
1689	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1690		1742
1691	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1692		1744
1693	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1694	glDisable GL_BLEND;
1695	}	1746	}
1696		1747
1697	#############################################################################	1748	#############################################################################
1698		1749
1699	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1742	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1743		1794
1744	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1745	}	1796	}
1746		1797
1747	glEnable GL_BLEND;
1748	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751		1800
1752	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1753		1802
1754	glDisable GL_BLEND;
1755	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1756	}	1804	}
1757		1805
1758	#############################################################################	1806	#############################################################################
1759		1807
…		…
1957	# TODO: calculations are off	2005	# TODO: calculations are off
1958	my $self = $class->SUPER::new (	2006	my $self = $class->SUPER::new (
1959	fg => [1, 1, 1],	2007	fg => [1, 1, 1],
1960	active_fg => [0, 0, 0],	2008	active_fg => [0, 0, 0],
1961	range => [0, 0, 100, 10],	2009	range => [0, 0, 100, 10],
1962	req_w => 20,	2010	req_w => $::WIDTH / 80,
1963	req_h => 20,	2011	req_h => $::WIDTH / 80,
1964	vertical => 0,	2012	vertical => 0,
1965	can_hover => 1,	2013	can_hover => 1,
1966	inner_pad => 5,	2014	inner_pad => 5,
1967	@_	2015	@_
1968	);	2016	);
…		…
2051	$page \|\|= 2;	2099	$page \|\|= 2;
2052		2100
2053	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055		2103
2056	glEnable GL_BLEND;
2057	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2106
2061	# draw background	2107	# draw background
2062	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2063		2109
2064	# draw handle	2110	# draw handle
2065	$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);
2066		2112
2067	glDisable GL_BLEND;
2068	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
2069	}	2114	}
2070		2115
2071	#############################################################################	2116	#############################################################################
2072		2117
…		…
2083	fontsize => 1,	2128	fontsize => 1,
2084	can_events => 0,	2129	can_events => 0,
2085	#font => default_font	2130	#font => default_font
2086	@_,	2131	@_,
2087		2132
2088	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
2089	par => [],	2134	par => [],
2090	height => 0,	2135	height => 0,
2091	children => [	2136	children => [
2092	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
2093	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
…		…
2111		2156
2112	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2113		2158
2114	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115	$layout->set_width ($self->{children}[0]{w});	2160	$layout->set_width ($self->{children}[0]{w});
2116	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2117		2162
2118	($layout->size)[1]	2163	($layout->size)[1]
2119	}	2164	}
2120		2165
2121	sub reflow {	2166	sub reflow {
…		…
2177		2222
2178	$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 {
2179	glClearColor 0, 0, 0, 0;	2224	glClearColor 0, 0, 0, 0;
2180	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2181		2226
2182	glEnable GL_BLEND;
2183	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186		2229
2187	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2188		2231
…		…
2197		2240
2198	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2199	my $h = $par->[0];	2242	my $h = $par->[0];
2200		2243
2201	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2202	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2203		2247
2204	glColor @{ $par->[1] };
2205	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2206	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);
2207	}	2250	}
2208		2251
2209	$y += $h;	2252	$y += $h;
2210	}	2253	}
2211		2254
2212	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2213	glDisable GL_BLEND;
2214	};	2256	};
2215	});	2257	});
2216	}	2258	}
2217		2259
2218	sub _draw {	2260	sub _draw {
2219	my ($self) = @_;	2261	my ($self) = @_;
2220		2262
2221	glEnable GL_BLEND;
2222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 1, 1, 1, 1;	2265	glColor 1, 1, 1, 1;
2226	$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});
2227	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2228	glDisable GL_BLEND;
2229		2268
2230	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2231		2270
2232	}	2271	}
2233		2272
…		…
2327	@_,	2366	@_,
2328	can_events => 0,	2367	can_events => 0,
2329	)	2368	)
2330	}	2369	}
2331		2370
2332	sub set_markup {	2371	sub set_tooltip_from {
2333	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2334		2373
2335	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2336	$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
2337	$self->add ($self->{label});	2381	$self->add ($self->{label});
2338	}	2382	}
2339		2383
2340	sub size_request {	2384	sub size_request {
2341	my ($self) = @_;	2385	my ($self) = @_;
2342
2343	$self->child->set_max_size ($::WIDTH * 0.3);
2344		2386
2345	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346		2388
2347	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2348	}	2390	}
…		…
2405	}	2447	}
2406		2448
2407	sub _draw {	2449	sub _draw {
2408	my ($self) = @_;	2450	my ($self) = @_;
2409		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411		2454
2412	# TODO animation	2455	# TODO animation
2413	if ($tex) {	2456	if ($tex) {
2414	glEnable GL_BLEND;
2415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2419	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2421	glDisable GL_BLEND;
2422	}	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});
2423	}	2572	}
2424		2573
2425	#############################################################################	2574	#############################################################################
2426		2575
2427	package CFClient::UI::Menu;	2576	package CFClient::UI::Menu;
…		…
2475	}	2624	}
2476		2625
2477	sub mouse_motion {	2626	sub mouse_motion {
2478	my ($self, $ev, $x, $y) = @_;	2627	my ($self, $ev, $x, $y) = @_;
2479		2628
2480	# TODO: should use vbox->fdind_widget or so	2629	# TODO: should use vbox->find_widget or so
2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2630	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482	$self->{hover} = $self->{item}{$HOVER};	2631	$self->{hover} = $self->{item}{$HOVER};
2483	}	2632	}
2484		2633
2485	sub button_up {	2634	sub button_up {
…		…
2494	}	2643	}
2495	}	2644	}
2496		2645
2497	#############################################################################	2646	#############################################################################
2498		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,
		2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} \|\|= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} \|\|= $item;
		2709
		2710	$self->reorder;
		2711	}
		2712
		2713	#############################################################################
		2714
2499	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2500		2716
2501	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2502		2718
2503	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2504		2720
2505	sub check_size {	2721	sub new {
2506	my ($self) = @_;	2722	my $class = shift;
2507		2723
2508	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2509	}	2725	@_,
2510		2726	)
2511	sub size_request {
2512	($::WIDTH, $::HEIGHT)
2513	}	2727	}
2514		2728
2515	sub configure {	2729	sub configure {
2516	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2517		2731
2518	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2519		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
2520	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2521	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)};
2522		2770
2523	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2524	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2525	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2526	}	2774	}
2527	}
2528		2775
2529	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2530	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2531		2782
2532	($x, $y)	2783	($x, $y)
2533	}	2784	}
2534		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2535	sub update {	2792	sub update {
2536	my ($self) = @_;	2793	my ($self) = @_;
2537		2794
2538	$self->check_size;	2795	$self->check_size;
2539	::refresh ();	2796	$::WANT_REFRESH++;
2540	}	2797	}
2541		2798
2542	sub add {	2799	sub add {
2543	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2544		2801
2545	# integerize window positions	2802	# integerise window positions
2546	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2547	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2548		2805
2549	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2550	}	2807	}
…		…
2553	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2554		2811
2555	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2556	}	2813	}
2557		2814
2558	sub draw {	2815	sub draw {
2559	my ($self) = @_;	2816	my ($self) = @_;
2560		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
2561	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2562	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2563	}	2865	}
2564		2866
2565	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567	glClear GL_COLOR_BUFFER_BIT;	2869	glClear GL_COLOR_BUFFER_BIT;
…		…
2575	$self->_draw;	2877	$self->_draw;
2576	}	2878	}
2577		2879
2578	#############################################################################	2880	#############################################################################
2579		2881
2580	package CFClient::UI::Inventory;
2581
2582	our @ISA = CFClient::UI::Container::;
2583
2584	use CFClient::OpenGL;
2585
2586	sub new {
2587	my $class = shift;
2588
2589	my $self = $class->SUPER::new (@_);
2590
2591	$self
2592	}
2593
2594	sub size_allocate {
2595	my ($self, $w, $h) = @_;
2596
2597	$self->{w} = $w;
2598	$self->{h} = $h;
2599
2600	$self->check_size;
2601	}
2602
2603	sub set_items {
2604	my ($self, $items) = @_;
2605	my @items = values %{$items};
2606	@items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608	$self->{real_items} = \@items;
2609
2610	for my $item (@items) {
2611	my $desc = $item->{nrof} < 2
2612	? $item->{name}
2613	: "$item->{nrof} $item->{name_pl}";
2614
2615	$self->add (my $hb = new CFClient::UI::HBox);
2616
2617	$hb->add (my $f = new CFClient::UI::Face
2618	can_events => 0,
2619	face => $item->{face},
2620	anim => $item->{anim},
2621	animspeed => $item->{animspeed},
2622	expand => 1
2623	);
2624	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625	}
2626
2627	$self->{max_pos} = (scalar @items) - 1;
2628
2629	my $range = $self->{range};
2630	my $page = $self->{h} / 32; # waht information souce to use for face size?
2631	# it should be configurable i guess...
2632	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	$range->update;
2634	}
2635
2636	sub size_request {
2637	my ($self) = @_;
2638	(100, 200)
2639	}
2640
2641	sub set_range {
2642	my ($self, $range) = @_;
2643
2644	$self->{range} = $range;
2645	$range->connect (changed => sub { $self->update });
2646
2647	my $page = $self->{h} / 32; # waht information souce to use for face size?
2648	# it should be configurable i guess...
2649
2650	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651	$range->update;
2652
2653	$self->update;
2654	}
2655
2656	sub _draw {
2657	my ($self) = @_;
2658
2659	my ($w, $h) = ($self->{w}, $self->{h});
2660
2661	$self->{pos} = int $self->{range}{range}[0];
2662
2663	my $y = 0;
2664	my $cnt = 0;
2665	my $hrem = $self->{h}; # horiz. remaining space
2666
2667	for (my $i = $self->{pos}; $i < @{$self->{children} \|\| []}; $i++) {
2668	my $chld = $self->{children}->[$i];
2669
2670	if ($hrem >= $chld->{h}) {
2671	$chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673	$chld->show;
2674	$chld->draw;
2675
2676	$hrem -= $chld->{h};
2677	$y += $chld->{h};
2678	} else {
2679	last
2680	}
2681	}
2682	}
2683
2684
2685	#############################################################################
2686
2687	package CFClient::UI;	2882	package CFClient::UI;
2688		2883
2689	$ROOT = new CFClient::UI::Root;	2884	$ROOT = new CFClient::UI::Root;
2690	$TOOLTIP = new CFClient::UI::Tooltip;	2885	$TOOLTIP = new CFClient::UI::Tooltip;
2691		2886

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.179 by elmex, Fri Apr 28 05:17:21 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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC