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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

…		…
944		944
945	#############################################################################	945	#############################################################################
946		946
947	package CFPlus::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
948		948
		949	use List::Util qw(min max);
		950
949	our @ISA = CFPlus::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
950		952
951	sub new {	953	sub new {
952	my $class = shift;	954	my $class = shift;
953		955
…		…
984	}	986	}
985		987
986	sub set_offset {	988	sub set_offset {
987	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
988		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
991		997
		998	$self->emit (changed => $x, $y);
992	$self->update;	999	$self->update;
		1000	}
993	}	1001	}
994		1002
995	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	1004	sub coord2local {
997	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
1072	row_expand => [1, 0],	1080	row_expand => [1, 0],
1073	%arg,	1081	%arg,
1074	);	1082	);
1075		1083
1076	$self->{vp} = new CFPlus::UI::ViewPort	1084	$self->{vp} = new CFPlus::UI::ViewPort
1077	expand => 1,	1085	expand => 1,
1078	scroll_x => $self->{scroll_x},	1086	scroll_x => $self->{scroll_x},
1079	scroll_y => $self->{scroll_y},	1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
1080	;	1096	;
1081		1097
1082	$self->SUPER::add (0, 0, $self->{vp});	1098	$self->SUPER::add_at (0, 0, $self->{vp});
1083	$self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084	$self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085		1099
1086	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1087		1101
1088	$self	1102	$self
1089	}	1103	}
…		…
1094	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1095		1109
1096	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1097	}	1111	}
1098		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
1099	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1100	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1101		1146
1102	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1103		1148
1104	$self->{vslider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1105		1150
1106	1	1151	1
1107	}	1152	}
1108		1153
1109	sub update_slider {	1154	sub invoke_button_down {
1110	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1111		1156
1112	my $child = ($self->{vp} or return)->child;	1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
1113		1159
1114	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1115	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
1116	#$self->{hslider}->set_visibility ($w1 != $w2);	1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1117		1165
1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1167	$self->update;
1120	#$self->{vslider}->set_visibility ($h1 != $h2);	1168	};
1121	}
1122		1169
1123	sub update {	1170	return 1;
1124	my ($self) = @_;	1171	}
1125		1172
1126	$self->SUPER::update;	1173	0
1127	$self->update_slider;	1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1128	}	1195	}
1129		1196
1130	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1131	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1132		1199
…		…
1288		1355
1289	my @border =	1356	my @border =
1290	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
		1363
1293	sub new {	1364	sub new {
1294	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1295		1366
1296	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1297	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
…		…
1465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466		1537
1467	my $border = $self->border;	1538	my $border = $self->border;
1468		1539
1469	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1470	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1474		1559
1475	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1476	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1477		1562
1478	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1509		1594
1510	sub new {	1595	sub new {
1511	my $class = shift;	1596	my $class = shift;
1512		1597
1513	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1514	col_expand => [],	1600	col_expand => [],
1515	row_expand => [],	1601	row_expand => [],
1516	@_,	1602	@_,
1517	)	1603	)
1518	}	1604	}
1519		1605
1520	sub children {	1606	sub children {
1521	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522	}	1608	}
1523		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1524	sub add {	1611	sub add {
1525	my ($self) = shift;	1612	my $self = shift;
		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
1526		1620
1527	while (@_) {	1621	while (@_) {
1528	my ($x, $y, $child) = splice @_, 0, 3, ();	1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1529	$child->set_parent ($self);	1624	$child->set_parent ($self);
1530	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
1531	}	1626	}
1532		1627
1533	$self->{force_realloc} = 1;	1628	$self->{force_realloc} = 1;
1534	$self->{force_size_alloc} = 1;	1629	$self->{force_size_alloc} = 1;
1535	$self->realloc;	1630	$self->realloc;
1536	}	1631	}
1537		1632
1538	sub remove {	1633	sub remove {
1539	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1540		1635
1541	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ \|\| [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1542	}	1641	}
1543		1642
1544	# TODO: move to container class maybe? send children a signal on removal?	1643	# TODO: move to container class maybe? send children a signal on removal?
1545	sub clear {	1644	sub clear {
1546	my ($self) = @_;	1645	my ($self) = @_;
…		…
1659	my ($self) = @_;	1758	my ($self) = @_;
1660		1759
1661	for (grep $_, @{$self->{children}}) {	1760	for (grep $_, @{$self->{children}}) {
1662	$_->draw for grep $_, @$_;	1761	$_->draw for grep $_, @$_;
1663	}	1762	}
		1763	}
		1764
		1765	#############################################################################
		1766
		1767	package CFPlus::UI::Fixed;
		1768
		1769	use List::Util qw(min max);
		1770
		1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub add {
		1774	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1775
		1776	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1777	$self->SUPER::add ($child);
		1778	}
		1779
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub size_request {
		1789	my ($self) = @_;
		1790
		1791	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1792
		1793	# determine overall size by querying abs widgets
		1794	for my $child ($self->visible_children) {
		1795	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1796
		1797	if ($pos eq "abs") {
		1798	$w = _scale $size, $w, $child->{req_w};
		1799	$h = _scale $size, $h, $child->{req_h};
		1800
		1801	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1802	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1803	}
		1804	}
		1805
		1806	my $W = $x2 - $x1;
		1807	my $H = $y2 - $y1;
		1808
		1809	# now layout remaining widgets
		1810	for my $child ($self->visible_children) {
		1811	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1812
		1813	if ($pos ne "abs") {
		1814	$x = _scale $pos, $x, $W;
		1815	$y = _scale $pos, $x, $H;
		1816	$w = _scale $size, $w, $child->{req_w};
		1817	$h = _scale $size, $h, $child->{req_h};
		1818
		1819	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1820	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1821	}
		1822	}
		1823
		1824	my $W = $x2 - $x1;
		1825	my $H = $y2 - $y1;
		1826
		1827	($W, $H)
		1828	}
		1829
		1830	sub invoke_size_allocate {
		1831	my ($self, $W, $H) = @_;
		1832
		1833	for my $child ($self->visible_children) {
		1834	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1835
		1836	$x = _scale $pos, $x, $W;
		1837	$y = _scale $pos, $x, $H;
		1838	$w = _scale $size, $w, $child->{req_w};
		1839	$h = _scale $size, $h, $child->{req_h};
		1840
		1841	$child->configure ($x, $y, $w, $h);
		1842	}
		1843
		1844	1
1664	}	1845	}
1665		1846
1666	#############################################################################	1847	#############################################################################
1667		1848
1668	package CFPlus::UI::Box;	1849	package CFPlus::UI::Box;
…		…
2226		2407
2227	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
2228		2409
2229	my @tex =	2410	my @tex =
2230	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
2232		2413
2233	sub new {	2414	sub new {
2234	my $class = shift;	2415	my $class = shift;
2235		2416
2236	$class->SUPER::new (	2417	$class->SUPER::new (
2237	padding_x => 4,	2418	padding_x => 4,
2238	padding_y => 4,	2419	padding_y => 4,
2239	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
2240	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
2241	can_hover => 1,	2422	can_hover => 1,
2242	align => 0,	2423	align => 0,
2243	valign => 0,	2424	valign => 0,
2244	can_events => 1,	2425	can_events => 1,
2245	@_	2426	@_
…		…
2263		2444
2264	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
2265	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
2267		2448
		2449	my $tex = $tex[$GRAB == $self];
2268	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2269		2451
2270	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2271		2453
2272	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2273	}	2455	}
…		…
3338	);	3520	);
3339		3521
3340	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
3341	CFPlus::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
3342		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3343	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
3344	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3345	hard => 1,	3528	parked => 1,
3346	interval => $self->{animspeed},
3347	cb => sub {	3529	cb => sub {
3348	return unless $::CONN;	3530	return unless $::CONN && $widget;
3349		3531
3350	++$widget->{frame};	3532	++$widget->{frame};
3351	$self->update_face;	3533	$widget->update_face;
3352	$self->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
3353	},	3537	},
3354	);	3538	);
3355		3539
3356	$self->update_face;	3540	$self->update_face;
		3541	$self->update_timer;
3357	}	3542	}
3358		3543
3359	$self	3544	$self
		3545	}
		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
3360	}	3562	}
3361		3563
3362	sub update_face {	3564	sub update_face {
3363	my ($self) = @_;	3565	my ($self) = @_;
3364		3566
…		…
3396	return unless $self->{visible};	3598	return unless $self->{visible};
3397		3599
3398	$self->SUPER::update;	3600	$self->SUPER::update;
3399	}	3601	}
3400		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
3401	sub _draw {	3611	sub _draw {
3402	my ($self) = @_;	3612	my ($self) = @_;
3403		3613
3404	return unless $::CONN;	3614	return unless $::CONN;
3405		3615
…		…
3420	}	3630	}
3421		3631
3422	sub destroy {	3632	sub destroy {
3423	my ($self) = @_;	3633	my ($self) = @_;
3424		3634
3425	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3426	if $self->{timer};	3636	if $self->{timer};
3427		3637
3428	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3429	}	3639	}
3430		3640
…		…
4074	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
4075	$_->()	4285	$_->()
4076	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
4077	}	4287	}
4078		4288
4079
4080	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4081	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4082	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
4083		4292
4084	glMatrixMode GL_PROJECTION;	4293	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs. Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC