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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC vs.
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC

…		…
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71	}	71	}
72		72
…		…
439	}	439	}
440		440
441	sub render_chld {	441	sub render_chld {
442	my ($self) = @_;	442	my ($self) = @_;
443		443
444	$self->{texture} =	444	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	445	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	446	glClear GL_COLOR_BUFFER_BIT;
447	);	447	$self->child->draw;
		448	};
448	}	449	}
449		450
450	sub size_allocate {	451	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	452	my ($self, $x, $y, $w, $h) = @_;
452		453
…		…
731	my $col_expand = (sum @col_expand) \|\| 1;	732	my $col_expand = (sum @col_expand) \|\| 1;
732		733
733	# linearly scale sizes	734	# linearly scale sizes
734	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		737
		738	$_ = int $_ for @$ws; #TODO: avoid rounding problems
		739	$_ = int $_ for @$hs; #TODO: avoid rounding problems
736		740
737	my $y;	741	my $y;
738		742
739	for my $r (0 .. $#{$self->{children}}) {	743	for my $r (0 .. $#{$self->{children}}) {
740	my $row = $self->{children}[$r]	744	my $row = $self->{children}[$r]
…		…
831	}	835	}
832		836
833	my $y = 0;	837	my $y = 0;
834	for (0 .. $#$children) {	838	for (0 .. $#$children) {
835	my $child = $children->[$_];	839	my $child = $children->[$_];
836	my $h = $h[$_];	840	my $h = int $h[$_];
837	$child->size_allocate ($y, 0, $h, $w);	841	$child->size_allocate ($y, 0, $h, $w);
838		842
839	$y += $h;	843	$y += $h;
840	}	844	}
841	}	845	}
…		…
885	}	889	}
886		890
887	my $y = 0;	891	my $y = 0;
888	for (0 .. $#$children) {	892	for (0 .. $#$children) {
889	my $child = $children->[$_];	893	my $child = $children->[$_];
890	my $h = $h[$_];	894	my $h = int $h[$_];
891	$child->size_allocate (0, $y, $w, $h);	895	$child->size_allocate (0, $y, $w, $h);
892		896
893	$y += $h;	897	$y += $h;
894	}	898	}
895	}	899	}
…		…
904		908
905	sub new {	909	sub new {
906	my ($class, %arg) = @_;	910	my ($class, %arg) = @_;
907		911
908	my $self = $class->SUPER::new (	912	my $self = $class->SUPER::new (
909	fg => [1, 1, 1],	913	fg => [1, 1, 1],
910	height => $::FONTSIZE,	914	fontsize => $::FONTSIZE,
911	text => "",	915	text => "",
912	align => -1,	916	align => -1,
913	padding => 2,	917	padding => 2,
914	layout => new CFClient::Layout,	918	layout => new CFClient::Layout,
915	%arg	919	%arg
916	);	920	);
917		921
918	$self->set_text ($self->{text});	922	$self->set_text ($self->{text});
919		923
…		…
949		953
950	sub size_request {	954	sub size_request {
951	my ($self) = @_;	955	my ($self) = @_;
952		956
953	$self->{layout}->set_width;	957	$self->{layout}->set_width;
954	$self->{layout}->set_height ($self->{height});	958	$self->{layout}->set_height ($self->{fontsize});
955	my ($w, $h) = $self->{layout}->size;	959	my ($w, $h) = $self->{layout}->size;
956		960
957	(	961	(
958	$w + $self->{padding} * 2,	962	$w + $self->{padding} * 2,
959	$h + $self->{padding} * 2,	963	$h + $self->{padding} * 2,
…		…
978	sub _draw {	982	sub _draw {
979	my ($self) = @_;	983	my ($self) = @_;
980		984
981	my $tex = $self->{texture} \|\|= do {	985	my $tex = $self->{texture} \|\|= do {
982	$self->{layout}->set_width ($self->{w});	986	$self->{layout}->set_width ($self->{w});
983	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	987	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
984	new_from_layout CFClient::Texture $self->{layout}	988	new_from_layout CFClient::Texture $self->{layout}
985	};	989	};
986		990
987	glEnable GL_BLEND;	991	glEnable GL_BLEND;
988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989	glEnable GL_TEXTURE_2D;	993	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991		995
992	glColor @{$self->{fg}};	996	glColor @{$self->{fg}};
993		997
994	my $x =	998	my $x =
995	$self->{align} < 0 ? $self->{padding}	999	$self->{align} < 0 ? $self->{padding}
996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997	: ($self->{w} - $tex->{w}) * 0.5;	1001	: ($self->{w} - $tex->{w}) * 0.5;
998		1002
999	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1000	$tex->draw_quad (0, 0);
1001		1004
1002	glDisable GL_TEXTURE_2D;	1005	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1006	glDisable GL_BLEND;
1004	}	1007	}
1005		1008
…		…
1033		1036
1034	$self->{last_activity} = $::NOW;	1037	$self->{last_activity} = $::NOW;
1035		1038
1036	$self->{text} = $text;	1039	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});	1040	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1041	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1042
1040	$text =~ s/./*/g if $self->{hidden};	1043	$text =~ s/./*/g if $self->{hidden};
1041		1044
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1045	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043		1046
…		…
1255		1258
1256	package CFClient::UI::CheckBox;	1259	package CFClient::UI::CheckBox;
1257		1260
1258	our @ISA = CFClient::UI::DrawBG::;	1261	our @ISA = CFClient::UI::DrawBG::;
1259		1262
		1263	my @tex =
		1264	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1265	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1266
1260	use SDL;	1267	use SDL;
1261	use SDL::OpenGL;	1268	use SDL::OpenGL;
1262		1269
1263	sub new {	1270	sub new {
1264	my $class = shift;	1271	my $class = shift;
…		…
1301	$self->SUPER::_draw;	1308	$self->SUPER::_draw;
1302		1309
1303	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1310	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304		1311
1305	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1312	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1306		1313
1307	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1314	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1308		1315
1309	glBegin GL_LINE_LOOP;	1316	glEnable GL_BLEND;
1310	glVertex 0 , 0;	1317	glEnable GL_TEXTURE_2D;
1311	glVertex 0 , $s;	1318	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1312	glVertex $s, $s;
1313	glVertex $s, 0;
1314	glEnd;
1315		1319
1316	if ($self->{state}) {	1320	my $tex = $self->{state} ? $tex[1] : $tex[0];
1317	glBegin GL_LINES;	1321
1318	glVertex 0 , 0;	1322	$tex->draw_quad (0, 0, $s, $s);
1319	glVertex $s, $s;	1323
1320	glVertex $s, 0;	1324	glDisable GL_TEXTURE_2D;
1321	glVertex 0 , $s;	1325	glDisable GL_BLEND;
1322	glEnd;
1323	}
1324	}	1326	}
1325		1327
1326	#############################################################################	1328	#############################################################################
1327		1329
1328	package CFClient::UI::Slider;	1330	package CFClient::UI::Slider;
…		…
1351	range => [0, 0, 100, 10],	1353	range => [0, 0, 100, 10],
1352	req_w => 40,	1354	req_w => 40,
1353	req_h => 13,	1355	req_h => 13,
1354	vertical => 0,	1356	vertical => 0,
1355	can_hover => 1,	1357	can_hover => 1,
		1358	inner_pad => 5,
1356	@_	1359	@_
1357	);	1360	);
1358		1361
1359	$self	1362	$self
1360	}	1363	}
…		…
1381	if ($GRAB == $self) {	1384	if ($GRAB == $self) {
1382	my ($value, $lo, $hi, $page) = @{$self->{range}};	1385	my ($value, $lo, $hi, $page) = @{$self->{range}};
1383		1386
1384	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1387	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385		1388
		1389	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1390	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1391
		1392	$x -= $inner_pad_px; # substract the padding
1386	$x = $x * ($hi - $lo) / $w + $lo;	1393	$x = $x * ($hi - $lo) / $inner_w + $lo;
1387	$x = $lo if $x < $lo;	1394	$x = $lo if $x < $lo;
1388	$x = $hi - $page if $x > $hi - $page;	1395	$x = $hi - $page if $x > $hi - $page;
1389	$self->{range}[0] = $x;	1396	$self->{range}[0] = $x;
1390		1397
1391	$self->emit (changed => $x);	1398	$self->emit (changed => $x);
1392	$self->update;	1399	$self->update;
1393	}	1400	}
		1401	}
		1402
		1403	# the inner_* stuff is for generating a padding for the slider handle,
		1404	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1405	# correct propably, but it does the job for now
		1406	sub _calc_inner_pad_px {
		1407	my ($self, $w) = @_;
		1408	($w / 100) * $self->{inner_pad} # % to pixels
1394	}	1409	}
1395		1410
1396	sub _draw {	1411	sub _draw {
1397	my ($self) = @_;	1412	my ($self) = @_;
1398		1413
…		…
1412	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1413	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1414		1429
1415	my ($value, $lo, $hi, $page) = @{$self->{range}};	1430	my ($value, $lo, $hi, $page) = @{$self->{range}};
1416		1431
1417	# the inner_* stuff is for generating a padding for the slider handle,	1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1418	# so that the handle doesn't leave the texture. This calculation isn't 100%
1419	# correct propably, but it does the job for now
1420	my $inner_pad = 5; # 5% of width for slider bg texture border
1421	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1422	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423		1434
1424	$page = int $page * $inner_w / ($hi - $lo);	1435	$page = int $page * $inner_w / ($hi - $lo);
1425	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1426		1437
1427	$w -= $page;	1438	$w -= $page;
…		…
1457		1468
1458	sub new {	1469	sub new {
1459	my $class = shift;	1470	my $class = shift;
1460		1471
1461	my $self = $class->SUPER::new (	1472	my $self = $class->SUPER::new (
		1473	req_w => $::WIDTH / 6,
		1474	req_h => $::HEIGHT / 6,
		1475	fontsize => $::FONTSIZE,
		1476	@_,
		1477
		1478	layout => (new CFClient::Layout),
1462	par => [],	1479	par => [],
1463	@_,	1480	height => 0,
1464	children => [	1481	children => [
1465	(new CFClient::UI::Empty expand => 1),	1482	(new CFClient::UI::Empty expand => 1),
1466	(new CFClient::UI::Slider vertical => 1),	1483	(new CFClient::UI::Slider vertical => 1),
1467	],	1484	],
1468	);	1485	);
1469		1486
1470	$self	1487	$self
1471	}	1488	}
1472		1489
		1490	sub text_height {
		1491	my ($self, $text) = @_;
		1492
		1493	my $layout = $self->{layout};
		1494
		1495	$layout->set_height ($self->{fontsize});
		1496	$layout->set_width ($self->{w});
		1497	$layout->set_text ($text);
		1498
		1499	($layout->size)[1]
		1500	}
		1501
		1502	sub reflow {
		1503	my ($self) = @_;
		1504
		1505	my $height = 0;
		1506
		1507	for (@{$self->{par}}) {
		1508	$height += $_->[0] = $self->text_height ($_->[2]);
		1509	}
		1510
		1511	$self->{height} = $height;
		1512
		1513	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1514	}
		1515
		1516	sub size_request {
		1517	my ($self) = @_;
		1518
		1519	($self->{req_w}, $self->{req_h})
		1520	}
		1521
		1522	sub size_allocate {
		1523	my ($self, $x, $y, $w, $h) = @_;
		1524
		1525	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1526
		1527	$self->{layout}->set_height ($self->{fontsize});
		1528	$self->{layout}->set_width ($self->{w});
		1529
		1530	$self->reflow;
		1531	$self->update;
		1532	}
		1533
1473	sub add_paragraph {	1534	sub add_paragraph {
1474	my ($self, $color, $text) = @_;	1535	my ($self, $color, $text) = @_;
1475		1536
		1537	#TODO: intelligently "reformat" paragraph
		1538
		1539	my $height = $self->text_height ($text);
		1540
		1541	$self->{height} += $height;
		1542
1476	push @{$self->{par}}, [$color, $text];	1543	push @{$self->{par}}, [$height, $color, $text];
1477	my $count = scalar @{$self->{par}};	1544
1478	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1545	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1479	$self->{children}[1]->update;	1546	$self->{children}[1]->update;
1480	}	1547	}
1481		1548
		1549	sub update {
		1550	my ($self) = @_;
		1551
		1552	$self->SUPER::update;
		1553
		1554	return unless $self->{h} > 0;
		1555
		1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1557	glClearColor 0, 0, 0, 1;
		1558	glClear GL_COLOR_BUFFER_BIT;
		1559
		1560	my $y0 = $self->{height} - $self->{h};
		1561	my $y1 = $self->{height};
		1562
		1563	glEnable GL_BLEND;
		1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1565	glEnable GL_TEXTURE_2D;
		1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1567
		1568	my $y = 0;
		1569
		1570	my $layout = $self->{layout};
		1571
		1572	for my $par (@{$self->{par}}) {
		1573	my $h = $par->[0];
		1574
		1575	if ($y0 < $y + $h && $y < $y1) {
		1576	$layout->set_text ($par->[2]);
		1577
		1578	glColor @{ $par->[1] };
		1579	my ($W, $H) = $layout->size;
		1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1581	}
		1582
		1583	$y += $h;
		1584	}
		1585
		1586	glDisable GL_TEXTURE_2D;
		1587	glDisable GL_BLEND;
		1588	};
		1589	}
		1590
1482	sub _draw {	1591	sub _draw {
1483	my ($self) = @_;	1592	my ($self) = @_;
1484		1593
1485	my $par = $self->{par};	1594	if ($self->{texture}) {
1486
1487	my $bottom = (scalar @$par) - 1;
1488
1489	my $w = $self->{children}[0]{w};
1490	my $y = $self->{h};
1491
1492	glEnable GL_BLEND;
1493	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1494	glEnable GL_TEXTURE_2D;	1595	glEnable GL_TEXTURE_2D;
1495	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1496		1597	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1497	# TODO: everything!
1498	while ($y > 0 && $bottom >= 0) {
1499	my $par = $par->[$bottom--];
1500
1501	my $layout = new CFClient::Layout;
1502
1503	$layout->set_height ($::FONTSIZE);
1504	$layout->set_width ($w);
1505	$layout->set_text ($par->[1]);
1506	my $tex = new_from_layout CFClient::Texture $layout;
1507	$y -= $tex->{h};
1508
1509	glColor @{ $par->[0] };
1510	$tex->draw_quad (0, $y);
1511	}
1512
1513	glDisable GL_TEXTURE_2D;	1598	glDisable GL_TEXTURE_2D;
1514	glDisable GL_BLEND;	1599	}
		1600
		1601	$self->{children}[1]->draw;
		1602
1515	}	1603	}
1516		1604
1517	#############################################################################	1605	#############################################################################
1518		1606
1519	package CFClient::UI::MapWidget;	1607	package CFClient::UI::MapWidget;
…		…
1654	$::CONN->user_send ("command stay fire");	1742	$::CONN->user_send ("command stay fire");
1655	} elsif ($sym == SDLK_a) {	1743	} elsif ($sym == SDLK_a) {
1656	$::CONN->user_send ("command apply");	1744	$::CONN->user_send ("command apply");
1657	} elsif ($sym == SDLK_QUOTE) {	1745	} elsif ($sym == SDLK_QUOTE) {
1658	$self->emit ('activate_console');	1746	$self->emit ('activate_console');
		1747	} elsif ($sym == SDLK_SLASH) {
		1748	$self->emit ('activate_console' => '/');
1659	} elsif (exists $DIR{$sym}) {	1749	} elsif (exists $DIR{$sym}) {
1660	if ($mod & KMOD_SHIFT) {	1750	if ($mod & KMOD_SHIFT) {
1661	$self->{shft}++;	1751	$self->{shft}++;
1662	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1752	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1663	} elsif ($mod & KMOD_CTRL) {	1753	} elsif ($mod & KMOD_CTRL) {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC vs. Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.101 by elmex, Fri Apr 14 11:43:51 2006 UTC vs.
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC