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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->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 && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_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->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for ($vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
…		…
220		249
221	()	250	()
222	}	251	}
223		252
224	sub set_parent {	253	sub set_parent {
225	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
226		255
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
229	}
230
231	sub get_parent {
232	$_[0]->{parent}
233	}	257	}
234		258
235	sub update {	259	sub update {
236	my ($self) = @_;	260	my ($self) = @_;
237		261
…		…
326		350
327	$self	351	$self
328	}	352	}
329		353
330	sub add {	354	sub add {
331	my ($self, $chld) = @_;	355	my ($self, $child) = @_;
332		356
333	$chld->set_parent ($self);	357	$child->set_parent ($self);
		358
		359	use sort 'stable';
334		360
335	$self->{children} = [	361	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	363	@{$self->{children}}, $child
338	];	364	];
339		365
340	$self->{w} = $self->{h} = -1;	366	$self->{w} = $self->{h} = -1;
341	$self->update;	367	$self->update;
342	}	368	}
…		…
672	@_	698	@_
673	)	699	)
674	}	700	}
675		701
676	sub add {	702	sub add {
677	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
678		704
		705	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		707
682	$self->{w} = $self->{h} = -1;	708	$self->{w} = $self->{h} = -1;
683	$self->update;	709	$self->update;
684	}	710	}
685		711
…		…
732	my $col_expand = (sum @col_expand) \|\| 1;	758	my $col_expand = (sum @col_expand) \|\| 1;
733		759
734	# linearly scale sizes	760	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	761	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	762	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		763
		764	CFClient::UI::harmonize $ws;
		765	CFClient::UI::harmonize $hs;
737		766
738	my $y;	767	my $y;
739		768
740	for my $r (0 .. $#{$self->{children}}) {	769	for my $r (0 .. $#{$self->{children}}) {
741	my $row = $self->{children}[$r]	770	my $row = $self->{children}[$r]
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	858	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	859	$h[$_] = $alloc_h;
831	}	860	}
832	}	861	}
833		862
		863	CFClient::UI::harmonize \@h;
		864
834	my $y = 0;	865	my $y = 0;
835	for (0 .. $#$children) {	866	for (0 .. $#$children) {
836	my $child = $children->[$_];	867	my $child = $children->[$_];
837	my $h = int $h[$_];	868	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	869	$child->size_allocate ($y, 0, $h, $w);
839		870
840	$y += $h;	871	$y += $h;
841	}	872	}
842	}	873	}
…		…
883		914
884	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	915	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885	}	916	}
886	}	917	}
887		918
		919	CFClient::UI::harmonize \@h;
		920
888	my $y = 0;	921	my $y = 0;
889	for (0 .. $#$children) {	922	for (0 .. $#$children) {
890	my $child = $children->[$_];	923	my $child = $children->[$_];
891	my $h = int $h[$_];	924	my $h = $h[$_];
892	$child->size_allocate (0, $y, $w, $h);	925	$child->size_allocate (0, $y, $w, $h);
893		926
894	$y += $h;	927	$y += $h;
895	}	928	}
896	}	929	}
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1457	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1458	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1459
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1460	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1461
		1462	$hi = $value + 1 if $lo == $hi;
		1463
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1464	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1465	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1466
1432	$page = int $page * $inner_w / ($hi - $lo);	1467	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1468	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1479	(new CFClient::UI::Empty expand => 1),	1514	(new CFClient::UI::Empty expand => 1),
1480	(new CFClient::UI::Slider vertical => 1),	1515	(new CFClient::UI::Slider vertical => 1),
1481	],	1516	],
1482	);	1517	);
1483		1518
		1519	$self->{children}[1]->connect (changed => sub {
		1520	$self->update;
		1521	});
		1522
1484	$self	1523	$self
		1524	}
		1525
		1526	sub set_fontsize {
		1527	my ($self, $fontsize) = @_;
		1528
		1529	$self->{fontsize} = $fontsize;
		1530	$self->reflow;
1485	}	1531	}
1486		1532
1487	sub text_height {	1533	sub text_height {
1488	my ($self, $text) = @_;	1534	my ($self, $text) = @_;
1489		1535
…		…
1497	}	1543	}
1498		1544
1499	sub reflow {	1545	sub reflow {
1500	my ($self) = @_;	1546	my ($self) = @_;
1501		1547
1502	my $height = 0;	1548	$self->{need_reflow}++;
1503		1549	$self->update;
1504	for (@{$self->{par}}) {
1505	$height += $_->[0] = $self->text_height ($_->[2]);
1506	}
1507
1508	$self->{height} = $height;
1509
1510	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511	}	1550	}
1512		1551
1513	sub size_request {	1552	sub size_request {
1514	my ($self) = @_;	1553	my ($self) = @_;
1515		1554
…		…
1523		1562
1524	$self->{layout}->set_height ($self->{fontsize});	1563	$self->{layout}->set_height ($self->{fontsize});
1525	$self->{layout}->set_width ($self->{w});	1564	$self->{layout}->set_width ($self->{w});
1526		1565
1527	$self->reflow;	1566	$self->reflow;
1528	$self->update;
1529	}	1567	}
1530		1568
1531	sub add_paragraph {	1569	sub add_paragraph {
1532	my ($self, $color, $text) = @_;	1570	my ($self, $color, $text) = @_;
1533		1571
…		…
1548		1586
1549	$self->SUPER::update;	1587	$self->SUPER::update;
1550		1588
1551	return unless $self->{h} > 0;	1589	return unless $self->{h} > 0;
1552		1590
		1591	delete $self->{texture};
		1592
		1593	$ROOT->on_refresh ($self, sub {
		1594	if (delete $self->{need_reflow}) {
		1595	my $height = 0;
		1596
		1597	$height += $_->[0] = $self->text_height ($_->[2])
		1598	for @{$self->{par}};
		1599
		1600	$self->{height} = $height;
		1601
		1602	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1603
		1604	delete $self->{texture};
		1605	}
		1606
1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1607	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554	glClearColor 0, 0, 0, 1;	1608	glClearColor 0, 0, 0, 1;
1555	glClear GL_COLOR_BUFFER_BIT;	1609	glClear GL_COLOR_BUFFER_BIT;
1556		1610
1557	my $y0 = $self->{height} - $self->{h};
1558	my $y1 = $self->{height};
1559
1560	glEnable GL_BLEND;	1611	glEnable GL_BLEND;
1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562	glEnable GL_TEXTURE_2D;	1613	glEnable GL_TEXTURE_2D;
1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564		1615
		1616	my $top = int $self->{children}[1]{range}[0];
		1617
		1618	my $y0 = $top;
		1619	my $y1 = $top + $self->{h};
		1620
1565	my $y = 0;	1621	my $y = 0;
1566		1622
1567	my $layout = $self->{layout};	1623	my $layout = $self->{layout};
1568		1624
1569	for my $par (@{$self->{par}}) {	1625	for my $par (@{$self->{par}}) {
1570	my $h = $par->[0];	1626	my $h = $par->[0];
1571		1627
1572	if ($y0 < $y + $h && $y < $y1) {	1628	if ($y0 < $y + $h && $y < $y1) {
1573	$layout->set_text ($par->[2]);	1629	$layout->set_text ($par->[2]);
1574		1630
1575	glColor @{ $par->[1] };	1631	glColor @{ $par->[1] };
1576	my ($W, $H) = $layout->size;	1632	my ($W, $H) = $layout->size;
1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1633	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1634	}
		1635
		1636	$y += $h;
1578	}	1637	}
1579		1638
1580	$y += $h;
1581	}
1582
1583	glDisable GL_TEXTURE_2D;	1639	glDisable GL_TEXTURE_2D;
1584	glDisable GL_BLEND;	1640	glDisable GL_BLEND;
		1641	};
1585	};	1642	});
1586	}	1643	}
1587		1644
1588	sub _draw {	1645	sub _draw {
1589	my ($self) = @_;	1646	my ($self) = @_;
1590		1647
…		…
1592	glEnable GL_TEXTURE_2D;	1649	glEnable GL_TEXTURE_2D;
1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1650	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	1651	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595	glDisable GL_TEXTURE_2D;	1652	glDisable GL_TEXTURE_2D;
1596	}	1653	}
		1654
		1655	$self->{children}[1]->draw;
1597		1656
1598	}	1657	}
1599		1658
1600	#############################################################################	1659	#############################################################################
1601		1660
…		…
1626	}	1685	}
1627		1686
1628	sub key_up {	1687	sub key_up {
1629	}	1688	}
1630		1689
		1690	sub button_down {
		1691	my ($self, $ev, $x, $y) = @_;
		1692
		1693	$self->focus_in;
		1694
		1695	if ($ev->button == 2) {
		1696	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1697	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1698
		1699	$self->{motion} = sub {
		1700	my ($ev, $x, $y) = @_;
		1701
		1702	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1703
		1704	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1705	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1706
		1707	$self->update;
		1708	};
		1709	}
		1710	}
		1711
		1712	sub button_up {
		1713	my ($self, $ev, $x, $y) = @_;
		1714
		1715	delete $self->{motion};
		1716	}
		1717
		1718	sub mouse_motion {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1722	}
		1723
1631	sub size_request {	1724	sub size_request {
1632	(	1725	(
1633	1 + 32 * int $::WIDTH / 32,	1726	1 + 32 * int $::WIDTH / 32,
1634	1 + 32 * int $::HEIGHT / 32,	1727	1 + 32 * int $::HEIGHT / 32,
1635	)	1728	)
…		…
1643	}	1736	}
1644		1737
1645	sub draw {	1738	sub draw {
1646	my ($self) = @_;	1739	my ($self) = @_;
1647		1740
1648	$self->{need_update}++;#d#
1649	if (delete $self->{need_update}) {	1741	if (delete $self->{need_update}) {
1650	glNewList $self->{list}, GL_COMPILE;	1742	glNewList $self->{list}, GL_COMPILE;
1651		1743
1652	my $sw = int $::WIDTH / 32;
1653	my $sh = int $::HEIGHT / 32;
1654
1655	if ($::MAP) {	1744	if ($::MAP) {
		1745	my $sw = int $::WIDTH / 32;
		1746	my $sh = int $::HEIGHT / 32;
		1747
		1748	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1749	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1750
		1751	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1752
1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1753	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657		1754
1658	if ($::CFG->{fow_enable}) {	1755	if ($::CFG->{fow_enable}) {
1659	if ($::CFG->{fow_smooth}) { # smooth fog of war	1756	if ($::CFG->{fow_smooth}) { # smooth fog of war
1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1757	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661	glConvolutionFilter2D	1758	glConvolutionFilter2D
…		…
1679	format => GL_ALPHA;	1776	format => GL_ALPHA;
1680		1777
1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1778	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682		1779
1683	glEnable GL_BLEND;	1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684	glEnable GL_TEXTURE_2D;	1782	glEnable GL_TEXTURE_2D;
1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686		1784
1687	glColor +($::CFG->{fow_intensity}) x 3, 1;	1785	glColor +($::CFG->{fow_intensity}) x 3, 1;
1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1786	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1689		1787
1690	glDisable GL_TEXTURE_2D;	1788	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;	1789	glDisable GL_BLEND;
1692	}	1790	}
		1791
		1792	# HACK BEGIN
		1793	{
		1794	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1795	my ($w, $h) = (250, 250);
		1796
		1797	glEnable GL_BLEND;
		1798	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1799	glEnable GL_TEXTURE_2D;
		1800	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1801
		1802	CFClient::Texture->new (
		1803	w => $w,
		1804	h => $h,
		1805	data => $::MAP->mapmap ($w, $h),
		1806	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1807	)->draw_quad (100, 100);
		1808
		1809	glDisable GL_TEXTURE_2D;
		1810	glDisable GL_BLEND;
		1811	}
		1812	# HACK END
1693	}	1813	}
1694		1814
1695	glEndList;	1815	glEndList;
1696	}	1816	}
1697		1817
		1818	glPushMatrix;
1698	glCallList $self->{list};	1819	glCallList $self->{list};
		1820	glPopMatrix;
1699		1821
1700	if ($FOCUS != $self) {	1822	if ($FOCUS != $self) {
1701	glColor 64/255, 64/255, 64/255;	1823	glColor 64/255, 64/255, 64/255;
1702	glLogicOp GL_AND;	1824	glLogicOp GL_AND;
1703	glEnable GL_COLOR_LOGIC_OP;	1825	glEnable GL_COLOR_LOGIC_OP;
…		…
1836	sub toggle_flopper {	1958	sub toggle_flopper {
1837	my ($self) = @_;	1959	my ($self) = @_;
1838		1960
1839	# TODO: use animation	1961	# TODO: use animation
1840	if ($self->{state} = !$self->{state}) {	1962	if ($self->{state} = !$self->{state}) {
1841	$CFClient::UI::TOPLEVEL->add ($self->{other});	1963	$CFClient::UI::ROOT->add ($self->{other});
1842	$self->{other}->move (	1964	$self->{other}->move ($self->coord2global (0, $self->{h}));
1843	($::WIDTH - $self->{other}{w}) * 0.5,
1844	($::HEIGHT - $self->{other}{h}) * 0.5,
1845	);
1846	} else {	1965	} else {
1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1966	$CFClient::UI::ROOT->remove ($self->{other});
1848	}	1967	}
1849	}	1968	}
1850		1969
1851	#############################################################################	1970	#############################################################################
1852		1971
1853	package CFClient::UI::Toplevel;	1972	package CFClient::UI::Root;
1854		1973
1855	our @ISA = CFClient::UI::Container::;	1974	our @ISA = CFClient::UI::Container::;
		1975
		1976	use SDL::OpenGL;
1856		1977
1857	sub size_request {	1978	sub size_request {
1858	($::WIDTH, $::HEIGHT)	1979	($::WIDTH, $::HEIGHT)
1859	}	1980	}
1860		1981
…		…
1865		1986
1866	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1987	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867	for @{$self->{children}};	1988	for @{$self->{children}};
1868	}	1989	}
1869		1990
1870	sub translate {	1991	sub _topleft {
1871	my ($self, $x, $y) = @_;	1992	my ($self, $x, $y) = @_;
1872		1993
1873	($x, $y)	1994	($x, $y)
1874	}	1995	}
1875		1996
…		…
1886	$self->SUPER::add ($widget);	2007	$self->SUPER::add ($widget);
1887		2008
1888	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2009	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1889	}	2010	}
1890		2011
		2012	sub on_refresh {
		2013	my ($self, $id, $cb) = @_;
		2014
		2015	$self->{refresh_hook}{$id} = $cb;
		2016	}
		2017
1891	sub draw {	2018	sub draw {
1892	my ($self) = @_;	2019	my ($self) = @_;
1893		2020
		2021	while (my $rcb = delete $self->{refresh_hook}) {
		2022	$_->() for values %$rcb;
		2023	}
		2024
		2025	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2026	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2027	glClear GL_COLOR_BUFFER_BIT;
		2028
		2029	glMatrixMode GL_PROJECTION;
		2030	glLoadIdentity;
		2031	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2032	glMatrixMode GL_MODELVIEW;
		2033	glLoadIdentity;
		2034
1894	$self->_draw;	2035	$self->_draw;
1895	}	2036	}
1896		2037
1897	#############################################################################	2038	#############################################################################
1898		2039
1899	package CFClient::UI;	2040	package CFClient::UI;
1900		2041
1901	$TOPLEVEL = new CFClient::UI::Toplevel;	2042	$ROOT = new CFClient::UI::Root;
1902		2043
1903	1	2044	1
1904		2045

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs. Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC