[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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

…		…
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 {
…		…
1157	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1156	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158	glEnd;	1157	glEnd;
1159	}	1158	}
1160	}	1159	}
1161		1160
		1161	package CFClient::UI::LineEntry;
		1162
		1163	our @ISA = CFClient::UI::Entry::;
		1164
		1165	use SDL;
		1166	use SDL::OpenGL;
		1167
		1168	sub key_down {
		1169	my ($self, $ev) = @_;
		1170
		1171	my $sym = $ev->key_sym;
		1172
		1173	if ($sym == SDLK_RETURN) {
		1174	$self->emit (activate => $self->get_text);
		1175	$self->update;
		1176
		1177	} else {
		1178	$self->SUPER::key_down ($ev);
		1179	}
		1180
		1181	}
		1182
1162	#############################################################################	1183	#############################################################################
1163		1184
1164	package CFClient::UI::Button;	1185	package CFClient::UI::Button;
1165		1186
1166	our @ISA = CFClient::UI::Label::;	1187	our @ISA = CFClient::UI::Label::;
…		…
1178	$class->SUPER::new (	1199	$class->SUPER::new (
1179	padding => 4,	1200	padding => 4,
1180	fg => [1, 1, 1],	1201	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1202	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],	1203	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1204	can_hover => 1,
1184	# border_fg => [1, 1, 0],
1185	@_	1205	@_
1186	)	1206	)
1187	}	1207	}
1188		1208
1189	sub button_up {	1209	sub button_up {
…		…
1235	$class->SUPER::new (	1255	$class->SUPER::new (
1236	padding => 2,	1256	padding => 2,
1237	fg => [1, 1, 1],	1257	fg => [1, 1, 1],
1238	active_fg => [1, 1, 0],	1258	active_fg => [1, 1, 0],
1239	state => 0,	1259	state => 0,
		1260	can_hover => 1,
1240	@_	1261	@_
1241	)	1262	)
1242	}	1263	}
1243		1264
1244	sub size_request {	1265	sub size_request {
…		…
1299		1320
1300	use SDL::OpenGL;	1321	use SDL::OpenGL;
1301		1322
1302	our @ISA = CFClient::UI::DrawBG::;	1323	our @ISA = CFClient::UI::DrawBG::;
1303		1324
		1325	my @tex =
		1326	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1327	qw(s1_slider.png s1_slider_bg.png);
		1328
1304	sub new {	1329	sub new {
1305	my $class = shift;	1330	my $class = shift;
1306		1331
1307	# range [value, low, high, page]	1332	# range [value, low, high, page]
1308		1333
		1334	# TODO: 0-width page
		1335	# TODO: req_w/h are wrong with vertical
		1336	# TODO: calculations are off
1309	my $self = $class->SUPER::new (	1337	my $self = $class->SUPER::new (
1310	fg => [1, 1, 1],	1338	fg => [1, 1, 1],
1311	active_fg => [0, 0, 0],	1339	active_fg => [0, 0, 0],
1312	range => [0, 0, 100, 10],	1340	range => [0, 0, 100, 10],
1313	req_w => 40,	1341	req_w => 40,
1314	req_h => 10,	1342	req_h => 13,
1315	vertical => 0,	1343	vertical => 0,
		1344	can_hover => 1,
1316	@_	1345	@_
1317	);	1346	);
1318		1347
1319	$self	1348	$self
1320	}	1349	}
…		…
1372	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374		1403
1375	my ($value, $lo, $hi, $page) = @{$self->{range}};	1404	my ($value, $lo, $hi, $page) = @{$self->{range}};
1376		1405
		1406	# the inner_* stuff is for generating a padding for the slider handle,
		1407	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1408	# correct propably, but it does the job for now
		1409	my $inner_pad = 5; # 5% of width for slider bg texture border
		1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
		1411	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1412
1377	$page = int $page * $w / ($hi - $lo);	1413	$page = int $page * $inner_w / ($hi - $lo);
1378	$value = int +($value - $lo) * $w / ($hi - $lo);	1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379		1415
1380	$w -= $page;	1416	$w -= $page;
1381	$page &= ~1;	1417	$page &= ~1;
1382	glTranslate $page * 0.5, 0, 0;	1418	glTranslate $page * 0.5, 0, 0;
1383	$page \|\|= 2;	1419	$page \|\|= 2;
1384		1420
1385	glColor @$fg;
1386	glBegin GL_LINES;
1387	glVertex 0, 0; glVertex 0, $h;
1388	glVertex $w - 1, 0; glVertex $w - 1, $h;
1389	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390	glEnd;
1391
1392	my $knob_a = $value - $page * 0.5;	1421	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393	my $knob_b = $value + $page * 0.5;	1422	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394		1423
1395	glBegin GL_QUADS;	1424	glEnable GL_BLEND;
1396	glColor @$fg;	1425	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397	glVertex $knob_a, 0;	1426	glEnable GL_TEXTURE_2D;
1398	glVertex $knob_a, $h;	1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399	glVertex $knob_b, $h;
1400	glVertex $knob_b, 0;
1401		1428
1402	if ($knob_a < $knob_b - 2) {	1429	# draw background
1403	glColor @$bg;	1430	$tex[1]->draw_quad (0, 0, $w, $h);
1404	glVertex $knob_a + 1, 1;	1431
1405	glVertex $knob_a + 1, $h - 1;	1432	# draw handle
1406	glVertex $knob_b - 1, $h - 1;	1433	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407	glVertex $knob_b - 1, 1;	1434
		1435	glDisable GL_BLEND;
		1436	glDisable GL_TEXTURE_2D;
		1437	}
		1438
		1439	#############################################################################
		1440
		1441	package CFClient::UI::TextView;
		1442
		1443	our @ISA = CFClient::UI::HBox::;
		1444
		1445	use SDL::OpenGL;
		1446
		1447	sub new {
		1448	my $class = shift;
		1449
		1450	my $self = $class->SUPER::new (
		1451	par => [],
		1452	@_,
		1453	children => [
		1454	(new CFClient::UI::Empty expand => 1),
		1455	(new CFClient::UI::Slider vertical => 1),
		1456	],
		1457	);
		1458
		1459	$self
		1460	}
		1461
		1462	sub add_paragraph {
		1463	my ($self, $color, $text) = @_;
		1464
		1465	push @{$self->{par}}, [$color, $text];
		1466	my $count = scalar @{$self->{par}};
		1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1468	$self->{children}[1]->update;
		1469	}
		1470
		1471	sub _draw {
		1472	my ($self) = @_;
		1473
		1474	my $par = $self->{par};
		1475
		1476	my $bottom = (scalar @$par) - 1;
		1477
		1478	my $w = $self->{children}[0]{w};
		1479	my $y = $self->{h};
		1480
		1481	glEnable GL_BLEND;
		1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1483	glEnable GL_TEXTURE_2D;
		1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1485
		1486	# TODO: everything!
		1487	while ($y > 0 && $bottom >= 0) {
		1488	my $par = $par->[$bottom--];
		1489
		1490	my $layout = new CFClient::Layout;
		1491
		1492	$layout->set_height ($::FONTSIZE);
		1493	$layout->set_width ($w);
		1494	$layout->set_text ($par->[1]);
		1495	my $tex = new_from_layout CFClient::Texture $layout;
		1496	$y -= $tex->{h};
		1497
		1498	glColor @{ $par->[0] };
		1499	$tex->draw_quad (0, $y);
1408	}	1500	}
1409	glEnd;	1501
		1502	glDisable GL_TEXTURE_2D;
		1503	glDisable GL_BLEND;
1410	}	1504	}
1411		1505
1412	#############################################################################	1506	#############################################################################
1413		1507
1414	package CFClient::UI::MapWidget;	1508	package CFClient::UI::MapWidget;
…		…
1424		1518
1425	sub new {	1519	sub new {
1426	my $class = shift;	1520	my $class = shift;
1427		1521
1428	$class->SUPER::new (	1522	$class->SUPER::new (
1429	z => -1,	1523	z => -1,
		1524	can_focus => 1,
1430	list => (glGenLists 1),	1525	list => (glGenLists 1),
1431	@_	1526	@_
1432	)	1527	)
1433	}	1528	}
1434		1529
1435	sub key_down {	1530	sub key_down {
…		…
1507	}	1602	}
1508		1603
1509	glCallList $self->{list};	1604	glCallList $self->{list};
1510		1605
1511	if ($FOCUS != $self) {	1606	if ($FOCUS != $self) {
1512	glEnable GL_BLEND;	1607	glColor 64/255, 64/255, 64/255;
1513	glColor 0, 0, 1, 0.4;	1608	glLogicOp GL_AND;
		1609	glEnable GL_COLOR_LOGIC_OP;
1514	glBegin GL_QUADS;	1610	glBegin GL_QUADS;
1515	glVertex 0, 0;	1611	glVertex 0, 0;
1516	glVertex 0, $::HEIGHT;	1612	glVertex 0, $::HEIGHT;
1517	glVertex $::WIDTH, $::HEIGHT;	1613	glVertex $::WIDTH, $::HEIGHT;
1518	glVertex $::WIDTH, 0;	1614	glVertex $::WIDTH, 0;
1519	glEnd;	1615	glEnd;
1520	glDisable GL_BLEND;	1616	glDisable GL_COLOR_LOGIC_OP;
1521	}	1617	}
1522	}	1618	}
1523		1619
1524	my %DIR = (	1620	my %DIR = (
1525	SDLK_KP8, [1, "north"],	1621	SDLK_KP8, [1, "north"],
…		…
1640	}	1736	}
1641		1737
1642	sub toggle_flopper {	1738	sub toggle_flopper {
1643	my ($self) = @_;	1739	my ($self) = @_;
1644		1740
		1741	# TODO: use animation
1645	if ($self->{state} = !$self->{state}) {	1742	if ($self->{state} = !$self->{state}) {
1646	$CFClient::UI::TOPLEVEL->add ($self->{other});	1743	$CFClient::UI::TOPLEVEL->add ($self->{other});
1647	$self->{other}->move (	1744	$self->{other}->move (
1648	($::WIDTH - $self->{other}{w}) * 0.5,	1745	($::WIDTH - $self->{other}{w}) * 0.5,
1649	($::HEIGHT - $self->{other}{h}) * 0.5,	1746	($::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.99 by elmex, Fri Apr 14 10:57:35 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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC