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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

…		…
268	$self->hide;	268	$self->hide;
269	$self->emit ("destroy");	269	$self->emit ("destroy");
270	%$self = ();	270	%$self = ();
271	}	271	}
272		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
273	sub show {	277	sub show {
274	my ($self) = @_;	278	my ($self) = @_;
275		279
276	return if $self->{parent};	280	return if $self->{parent};
277		281
…		…
316	sub set_visibility {	320	sub set_visibility {
317	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
318		322
319	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
320		324
321	$visible ? $self->hide	325	$visible ? $self->show
322	: $self->show;	326	: $self->hide;
323	}	327	}
324		328
325	sub toggle_visibility {	329	sub toggle_visibility {
326	my ($self) = @_;	330	my ($self) = @_;
327		331
…		…
940		944
941	#############################################################################	945	#############################################################################
942		946
943	package CFPlus::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
944		948
		949	use List::Util qw(min max);
		950
945	our @ISA = CFPlus::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
946		952
947	sub new {	953	sub new {
948	my $class = shift;	954	my $class = shift;
949		955
…		…
980	}	986	}
981		987
982	sub set_offset {	988	sub set_offset {
983	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
984		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}) {
985	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
986	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
987		997
		998	$self->emit (changed => $x, $y);
988	$self->update;	999	$self->update;
		1000	}
989	}	1001	}
990		1002
991	# 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
992	sub coord2local {	1004	sub coord2local {
993	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
1029		1041
1030	#############################################################################	1042	#############################################################################
1031		1043
1032	package CFPlus::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
1033		1045
1034	our @ISA = CFPlus::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
1035		1047
1036	sub new {	1048	sub new {
1037	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
1038		1050
1039	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
1040		1052
1041	my $self;	1053	my $self;
1042		1054
1043	my $slider = new CFPlus::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
1044	vertical => 1,	1065	vertical => 1,
1045	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1046	on_changed => sub {	1067	on_changed => sub {
1047	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048	},	1070	},
1049	;	1071	;
1050		1072
1051	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1052	vp => (new CFPlus::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1053	can_events => 1,	1076	can_events => 1,
1054	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1055	%arg,	1081	%arg,
1056	);	1082	);
1057		1083
1058	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		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	},
		1096	;
		1097
		1098	$self->SUPER::add_at (0, 0, $self->{vp});
		1099
1059	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1060		1101
1061	$self	1102	$self
1062	}	1103	}
1063		1104
…		…
1067	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1068		1109
1069	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1070	}	1111	}
1071		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
1072	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1073	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1074		1146
1075	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1076		1148
1077	$self->{slider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1078		1150
1079	1	1151	1
1080	}	1152	}
1081		1153
1082	sub update_slider {	1154	sub invoke_button_down {
1083	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1084		1156
1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1157	if ($ev->{button} == 2) {
1086	}	1158	$self->grab_focus;
1087		1159
1088	sub update {	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1089	my ($self) = @_;	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1090		1165
1091	$self->SUPER::update;	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
1092		1169
1093	$self->update_slider;	1170	return 1;
		1171	}
		1172
		1173	0
		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
1094	}	1195	}
1095		1196
1096	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1097	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1098		1199
1099	$self->update_slider;	1200	$self->update_slider;
1100
1101	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1102	}	1202	}
1103		1203
1104	#############################################################################	1204	#############################################################################
1105		1205
…		…
1255		1355
1256	my @border =	1356	my @border =
1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258	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);
1259		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
1260	sub new {	1364	sub new {
1261	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1262		1366
1263	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1264	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
…		…
1432	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433		1537
1434	my $border = $self->border;	1538	my $border = $self->border;
1435		1539
1436	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1437	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440	$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);
1441		1559
1442	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1443	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1444		1562
1445	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1476		1594
1477	sub new {	1595	sub new {
1478	my $class = shift;	1596	my $class = shift;
1479		1597
1480	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1481	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1482	@_,	1602	@_,
1483	)	1603	)
1484	}	1604	}
1485		1605
1486	sub children {	1606	sub children {
1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488	}	1608	}
1489		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1490	sub add {	1611	sub add {
1491	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;
1492		1620
1493	while (@_) {	1621	while (@_) {
1494	my ($x, $y, $child) = splice @_, 0, 3, ();	1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1495	$child->set_parent ($self);	1624	$child->set_parent ($self);
1496	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
1497	}	1626	}
1498		1627
1499	$self->{force_realloc} = 1;	1628	$self->{force_realloc} = 1;
1500	$self->{force_size_alloc} = 1;	1629	$self->{force_size_alloc} = 1;
1501	$self->realloc;	1630	$self->realloc;
1502	}	1631	}
1503		1632
1504	sub remove {	1633	sub remove {
1505	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1506		1635
1507	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ \|\| [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1508	}	1641	}
1509		1642
1510	# 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?
1511	sub clear {	1644	sub clear {
1512	my ($self) = @_;	1645	my ($self) = @_;
…		…
1561	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1562		1695
1563	my $req_w = (sum @$ws) \|\| 1;	1696	my $req_w = (sum @$ws) \|\| 1;
1564	my $req_h = (sum @$hs) \|\| 1;	1697	my $req_h = (sum @$hs) \|\| 1;
1565		1698
1566	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1567	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1568	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1569	my $col_expand = (sum @col_expand) \|\| 1;	1702	my $col_expand = (sum @col_expand) \|\| 1;
1570		1703
1571	# linearly scale sizes
1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
1574		1705
1575	CFPlus::UI::harmonize $ws;	1706	CFPlus::UI::harmonize $ws;
		1707
		1708	my @row_expand = @{$self->{row_expand}};
		1709	@row_expand = (1) x @$ws unless @row_expand;
		1710	my $row_expand = (sum @row_expand) \|\| 1;
		1711
		1712	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1713
1576	CFPlus::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1577		1715
1578	my $y;	1716	my $y;
1579		1717
1580	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
…		…
1620	my ($self) = @_;	1758	my ($self) = @_;
1621		1759
1622	for (grep $_, @{$self->{children}}) {	1760	for (grep $_, @{$self->{children}}) {
1623	$_->draw for grep $_, @$_;	1761	$_->draw for grep $_, @$_;
1624	}	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
1625	}	1845	}
1626		1846
1627	#############################################################################	1847	#############################################################################
1628		1848
1629	package CFPlus::UI::Box;	1849	package CFPlus::UI::Box;
…		…
1969	my $mod = $ev->{mod};	2189	my $mod = $ev->{mod};
1970	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1971	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1972		2192
1973	my $text = $self->get_text;	2193	my $text = $self->get_text;
		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974		2196
1975	if ($uni == 8) {	2197	if ($uni == 8) {
1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1978	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
…		…
2185		2407
2186	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
2187		2409
2188	my @tex =	2410	my @tex =
2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
2191		2413
2192	sub new {	2414	sub new {
2193	my $class = shift;	2415	my $class = shift;
2194		2416
2195	$class->SUPER::new (	2417	$class->SUPER::new (
2196	padding_x => 4,	2418	padding_x => 4,
2197	padding_y => 4,	2419	padding_y => 4,
2198	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
2199	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
2200	can_hover => 1,	2422	can_hover => 1,
2201	align => 0,	2423	align => 0,
2202	valign => 0,	2424	valign => 0,
2203	can_events => 1,	2425	can_events => 1,
2204	@_	2426	@_
…		…
2222		2444
2223	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
2226		2448
		2449	my $tex = $tex[$GRAB == $self];
2227	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228		2451
2229	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2230		2453
2231	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2232	}	2455	}
…		…
3287		3510
3288	sub new {	3511	sub new {
3289	my $class = shift;	3512	my $class = shift;
3290		3513
3291	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
3292	aspect => 1,	3517	aspect => 1,
3293	can_events => 0,	3518	can_events => 0,
3294	@_,	3519	@_,
3295	);	3520	);
3296		3521
3297	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
3298	CFPlus::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
3299		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3300	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302	hard => 1,	3528	parked => 1,
3303	interval => $self->{animspeed},
3304	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
3305	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
3306	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
3307	},	3537	},
3308	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
3309	}	3542	}
3310		3543
3311	$self	3544	$self
3312	}	3545	}
3313		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	}
		3562	}
		3563
		3564	sub update_face {
		3565	my ($self) = @_;
		3566
		3567	return unless $::CONN;
		3568
		3569	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3570	if ($anim && @$anim) {
		3571	delete $self->{wait_face};
		3572	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3573	}
		3574	}
		3575	}
		3576
3314	sub size_request {	3577	sub size_request {
3315	(32, 8)	3578	my ($self) = @_;
		3579
		3580	if ($::CONN) {
		3581	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3582	if (my $tex = $::CONN->{texture}[$faceid]) {
		3583	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3584	} else {
		3585	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {
		3586	$self->realloc;
		3587	});
		3588	}
		3589	}
		3590	}
		3591
		3592	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3316	}	3593	}
3317		3594
3318	sub update {	3595	sub update {
3319	my ($self) = @_;	3596	my ($self) = @_;
3320		3597
3321	return unless $self->{visible};	3598	return unless $self->{visible};
3322		3599
3323	$self->SUPER::update;	3600	$self->SUPER::update;
3324	}	3601	}
3325		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
3326	sub _draw {	3611	sub _draw {
3327	my ($self) = @_;	3612	my ($self) = @_;
3328		3613
3329	return unless $::CONN;	3614	return unless $::CONN;
3330		3615
3331	$self->SUPER::_draw;	3616	$self->SUPER::_draw;
3332		3617
3333	my $face;
3334
3335	if ($self->{frame}) {
3336	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
3337		3619	or return;
3338	$face = $anim->[ $self->{frame} % @$anim ]
3339	if $anim && @$anim;
3340	}
3341		3620
3342	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
3343		3622
3344	if ($tex) {	3623	if ($tex) {
3345	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
3346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
3351	}	3630	}
3352		3631
3353	sub destroy {	3632	sub destroy {
3354	my ($self) = @_;	3633	my ($self) = @_;
3355		3634
3356	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3357	if $self->{timer};	3636	if $self->{timer};
3358		3637
3359	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3360	}	3639	}
3361		3640
…		…
4005	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
4006	$_->()	4285	$_->()
4007	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
4008	}	4287	}
4009		4288
4010
4011	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
4014		4292
4015	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.366 by root, Mon Apr 23 19:17:41 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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC