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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC

…		…
116	}	116	}
117		117
118	sub _size_allocate {	118	sub _size_allocate {
119	my ($self, $x, $y, $w, $h) = @_;	119	my ($self, $x, $y, $w, $h) = @_;
120		120
121	$self->{x} = $x;	121	$self->{x} = int $x;
122	$self->{y} = $y;	122	$self->{y} = int $y;
123		123
124	return unless $self->{w} != $w \|\| $self->{h} != $h;	124	return unless $self->{w} != $w \|\| $self->{h} != $h;
125		125
126	$self->{w} = $w;	126	$self->{w} = int $w;
127	$self->{h} = $h;	127	$self->{h} = int $h;
128		128
129	1	129	1
130	}	130	}
131		131
132	sub size_allocate {	132	sub size_allocate {
…		…
144		144
145	sub focus_in {	145	sub focus_in {
146	my ($self) = @_;	146	my ($self) = @_;
147		147
148	return if $FOCUS == $self;	148	return if $FOCUS == $self;
		149	return unless $self->{can_focus};
149		150
150	my $focus = $FOCUS; $FOCUS = $self;	151	my $focus = $FOCUS; $FOCUS = $self;
151	$focus->update if $focus;	152	$focus->update if $focus;
152	$FOCUS->update;	153	$FOCUS->update;
153	}	154	}
…		…
186	glPushMatrix;	187	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	188	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	189	$self->_draw;
189	glPopMatrix;	190	glPopMatrix;
190		191
191	if ($self == $HOVER) {	192	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	193	my ($x, $y) = @$self{qw(x y)};
193		194
194	glColor 0, 0, 1, 0.2;	195	glColor 0, 0, 1, 0.2;
195	glEnable GL_BLEND;	196	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
529		530
530	my @tex =	531	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	533	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		534
		535	sub new {
		536	my $class = shift;
		537
		538	# TODO: user_x, user_y, overwrite moveto?
		539
		540	$class->SUPER::new (
		541	bg => [1, 1, 1, 1],
		542	border_bg => [1, 1, 1, 1],
		543	border => $::FONTSIZE * 0.8,
		544	@_
		545	)
		546	}
		547
534	sub size_request {	548	sub size_request {
535	my ($self) = @_;	549	my ($self) = @_;
536		550
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	551	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		552
539	my ($w, $h) = $self->SUPER::size_request;	553	my ($w, $h) = $self->SUPER::size_request;
540		554
541	$h += $tex[1]->{h};	555	(
542	$h += $tex[4]->{h};	556	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	557	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	558	)
545
546	($w, $h)
547	}	559	}
548		560
549	sub size_allocate {	561	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	562	my ($self, $x, $y, $w, $h) = @_;
551		563
552	$self->_size_allocate ($x, $y, $w, $h) or return;	564	$self->_size_allocate ($x, $y, $w, $h) or return;
553		565
554	$h -= $tex[1]{h};	566	$h -= List::Util::max 0, $self->{border} * 2;
555	$h -= $tex[4]{h};	567	$w -= List::Util::max 0, $self->{border} * 2;
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558		568
559	$h = $h < 0 ? 0 : $h;	569	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560	$w = $w < 0 ? 0 : $w;
561
562	my $child = $self->child;
563
564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565	}	570	}
566		571
567	sub button_down {	572	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	573	my ($self, $ev, $x, $y) = @_;
569		574
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	575	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	576	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		577
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	578	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	579	my ($bw, $bh) = ($self->{w}, $self->{h});
575		580
576	$self->{motion} = sub {	581	$self->{motion} = sub {
…		…
582	$self->{user_h} = $bh + $y - $oy;	587	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	588	$self->update;
584	};	589	};
585		590
586	} elsif ($x >= 0 && $x < $self->{w}	591	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	592	&& $y >= 0 && $y < $self->{border}) {
588		593
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	594	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	595	my ($bx, $by) = ($self->{x}, $self->{y});
591		596
592	$self->{motion} = sub {	597	$self->{motion} = sub {
…		…
613	}	618	}
614		619
615	sub _draw {	620	sub _draw {
616	my ($self) = @_;	621	my ($self) = @_;
617		622
618	my ($w, $h) = ($self->{w}, $self->{h});	623	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	624	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		625
621	glEnable GL_BLEND;	626	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	628	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		630
626	my $top = $tex[1];	631	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	632	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		633	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	634	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	635	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632	my $right = $tex[2];
633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635	my $bottom = $tex[4];
636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637		636
638	my $bg = $tex[0];	637	my $bg = $tex[0];
639		638
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	639	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	640	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	641	my $rep_y = $ch / $bg->{h};
645		642
		643	glColor @{ $self->{bg} };
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		645
648	glDisable GL_TEXTURE_2D;	646	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	647	glDisable GL_BLEND;
650		648
651	$self->child->draw;	649	$self->child->draw;
652
653	}	650	}
654		651
655	#############################################################################	652	#############################################################################
656		653
657	package CFClient::UI::Table;	654	package CFClient::UI::Table;
…		…
993	my $x =	990	my $x =
994	$self->{align} < 0 ? $self->{padding}	991	$self->{align} < 0 ? $self->{padding}
995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996	: ($self->{w} - $tex->{w}) * 0.5;	993	: ($self->{w} - $tex->{w}) * 0.5;
997		994
998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
999	$tex->draw_quad (0, 0);	996	$tex->draw_quad (0, 0);
1000		997
1001	glDisable GL_TEXTURE_2D;	998	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;	999	glDisable GL_BLEND;
1003	}	1000	}
…		…
1017	$class->SUPER::new (	1014	$class->SUPER::new (
1018	fg => [1, 1, 1],	1015	fg => [1, 1, 1],
1019	bg => [0, 0, 0, 0.2],	1016	bg => [0, 0, 0, 0.2],
1020	active_bg => [1, 1, 1, 0.5],	1017	active_bg => [1, 1, 1, 0.5],
1021	active_fg => [0, 0, 0],	1018	active_fg => [0, 0, 0],
		1019	can_hover => 1,
		1020	can_focus => 1,
1022	@_	1021	@_
1023	)	1022	)
1024	}	1023	}
1025		1024
1026	sub _set_text {	1025	sub _set_text {
…		…
1178	$class->SUPER::new (	1177	$class->SUPER::new (
1179	padding => 4,	1178	padding => 4,
1180	fg => [1, 1, 1],	1179	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1180	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],	1181	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1182	can_hover => 1,
1184	# border_fg => [1, 1, 0],
1185	@_	1183	@_
1186	)	1184	)
1187	}	1185	}
1188		1186
1189	sub button_up {	1187	sub button_up {
…		…
1235	$class->SUPER::new (	1233	$class->SUPER::new (
1236	padding => 2,	1234	padding => 2,
1237	fg => [1, 1, 1],	1235	fg => [1, 1, 1],
1238	active_fg => [1, 1, 0],	1236	active_fg => [1, 1, 0],
1239	state => 0,	1237	state => 0,
		1238	can_hover => 1,
1240	@_	1239	@_
1241	)	1240	)
1242	}	1241	}
1243		1242
1244	sub size_request {	1243	sub size_request {
…		…
1304	sub new {	1303	sub new {
1305	my $class = shift;	1304	my $class = shift;
1306		1305
1307	# range [value, low, high, page]	1306	# range [value, low, high, page]
1308		1307
		1308	# TODO: 0-width page
		1309	# TODO: req_w/h are wrong with vertical
		1310	# TODO: calculations are off
1309	my $self = $class->SUPER::new (	1311	my $self = $class->SUPER::new (
1310	fg => [1, 1, 1],	1312	fg => [1, 1, 1],
1311	active_fg => [0, 0, 0],	1313	active_fg => [0, 0, 0],
1312	range => [0, 0, 100, 10],	1314	range => [0, 0, 100, 10],
1313	req_w => 40,	1315	req_w => 40,
1314	req_h => 10,	1316	req_h => 13,
1315	vertical => 0,	1317	vertical => 0,
		1318	can_hover => 1,
1316	@_	1319	@_
1317	);	1320	);
1318		1321
1319	$self	1322	$self
1320	}	1323	}
…		…
1409	glEnd;	1412	glEnd;
1410	}	1413	}
1411		1414
1412	#############################################################################	1415	#############################################################################
1413		1416
		1417	package CFClient::UI::TextView;
		1418
		1419	our @ISA = CFClient::UI::HBox::;
		1420
		1421	use SDL::OpenGL;
		1422
		1423	sub new {
		1424	my $class = shift;
		1425
		1426	my $self = $class->SUPER::new (
		1427	par => [],
		1428	@_,
		1429	children => [
		1430	(new CFClient::UI::Empty expand => 1),
		1431	(new CFClient::UI::Slider vertical => 1),
		1432	],
		1433	);
		1434
		1435	$self
		1436	}
		1437
		1438	sub add_paragraph {
		1439	my ($self, $color, $text) = @_;
		1440
		1441	push @{$self->{par}}, [$color, $text];
		1442	my $count = scalar @{$self->{par}};
		1443	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1444	$self->{children}[1]->update;
		1445	}
		1446
		1447	sub _draw {
		1448	my ($self) = @_;
		1449
		1450	my $par = $self->{par};
		1451
		1452	my $bottom = (scalar @$par) - 1;
		1453
		1454	my $w = $self->{children}[0]{w};
		1455	my $y = $self->{h};
		1456
		1457	glEnable GL_BLEND;
		1458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1459	glEnable GL_TEXTURE_2D;
		1460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1461
		1462	# TODO: everything!
		1463	while ($y > 0 && $bottom >= 0) {
		1464	my $par = $par->[$bottom--];
		1465
		1466	my $layout = new CFClient::Layout;
		1467
		1468	$layout->set_height ($::FONTSIZE);
		1469	$layout->set_width ($w);
		1470	$layout->set_text ($par->[1]);
		1471	my $tex = new_from_layout CFClient::Texture $layout;
		1472	$y -= $tex->{h};
		1473
		1474	glColor @{ $par->[0] };
		1475	$tex->draw_quad (0, $y);
		1476	}
		1477
		1478	glDisable GL_TEXTURE_2D;
		1479	glDisable GL_BLEND;
		1480	}
		1481
		1482	#############################################################################
		1483
1414	package CFClient::UI::MapWidget;	1484	package CFClient::UI::MapWidget;
1415		1485
1416	use strict;	1486	use strict;
1417		1487
1418	use List::Util qw(min max);	1488	use List::Util qw(min max);
…		…
1424		1494
1425	sub new {	1495	sub new {
1426	my $class = shift;	1496	my $class = shift;
1427		1497
1428	$class->SUPER::new (	1498	$class->SUPER::new (
1429	z => -1,	1499	z => -1,
		1500	can_focus => 1,
1430	list => (glGenLists 1),	1501	list => (glGenLists 1),
1431	@_	1502	@_
1432	)	1503	)
1433	}	1504	}
1434		1505
1435	sub key_down {	1506	sub key_down {
…		…
1507	}	1578	}
1508		1579
1509	glCallList $self->{list};	1580	glCallList $self->{list};
1510		1581
1511	if ($FOCUS != $self) {	1582	if ($FOCUS != $self) {
1512	glEnable GL_BLEND;	1583	glColor 64/255, 64/255, 64/255;
1513	glColor 0, 0, 1, 0.4;	1584	glLogicOp GL_AND;
		1585	glEnable GL_COLOR_LOGIC_OP;
1514	glBegin GL_QUADS;	1586	glBegin GL_QUADS;
1515	glVertex 0, 0;	1587	glVertex 0, 0;
1516	glVertex 0, $::HEIGHT;	1588	glVertex 0, $::HEIGHT;
1517	glVertex $::WIDTH, $::HEIGHT;	1589	glVertex $::WIDTH, $::HEIGHT;
1518	glVertex $::WIDTH, 0;	1590	glVertex $::WIDTH, 0;
1519	glEnd;	1591	glEnd;
1520	glDisable GL_BLEND;	1592	glDisable GL_COLOR_LOGIC_OP;
1521	}	1593	}
1522	}	1594	}
1523		1595
1524	my %DIR = (	1596	my %DIR = (
1525	SDLK_KP8, [1, "north"],	1597	SDLK_KP8, [1, "north"],
…		…
1640	}	1712	}
1641		1713
1642	sub toggle_flopper {	1714	sub toggle_flopper {
1643	my ($self) = @_;	1715	my ($self) = @_;
1644		1716
		1717	# TODO: use animation
1645	if ($self->{state} = !$self->{state}) {	1718	if ($self->{state} = !$self->{state}) {
1646	$CFClient::UI::TOPLEVEL->add ($self->{other});	1719	$CFClient::UI::TOPLEVEL->add ($self->{other});
1647	$self->{other}->move (	1720	$self->{other}->move (
1648	($::WIDTH - $self->{other}{w}) * 0.5,	1721	($::WIDTH - $self->{other}{w}) * 0.5,
1649	($::HEIGHT - $self->{other}{h}) * 0.5,	1722	($::HEIGHT - $self->{other}{h}) * 0.5,

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC vs. Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.96 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC