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

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.195 by root, Thu May 11 23:54:31 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.195 by root, Thu May 11 23:54:31 2006 UTC