ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub 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
40sub feed_sdl_button_up_event { 40sub 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
57sub feed_sdl_motion_event { 57sub 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
74sub 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
75package CFClient::UI::Base; 88package 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
152sub _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
139sub translate { 159sub 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
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
143} 172}
144 173
145sub focus_in { 174sub focus_in {
146 my ($self) = @_; 175 my ($self) = @_;
147 176
… …
220 249
221 () 250 ()
222} 251}
223 252
224sub set_parent { 253sub 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
231sub get_parent {
232 $_[0]->{parent}
233} 257}
234 258
235sub update { 259sub update {
236 my ($self) = @_; 260 my ($self) = @_;
237 261
… …
326 350
327 $self 351 $self
328} 352}
329 353
330sub add { 354sub 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
676sub add { 702sub 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
… …
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;
737 763
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 764 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 765 CFClient::UI::harmonize $hs;
740 766
741 my $y; 767 my $y;
742 768
743 for my $r (0 .. $#{$self->{children}}) { 769 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 770 my $row = $self->{children}[$r]
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 858 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 859 $h[$_] = $alloc_h;
834 } 860 }
835 } 861 }
836 862
863 CFClient::UI::harmonize \@h;
864
837 my $y = 0; 865 my $y = 0;
838 for (0 .. $#$children) { 866 for (0 .. $#$children) {
839 my $child = $children->[$_]; 867 my $child = $children->[$_];
840 my $h = int $h[$_]; 868 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 869 $child->size_allocate ($y, 0, $h, $w);
842 870
843 $y += $h; 871 $y += $h;
844 } 872 }
845} 873}
… …
886 914
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 915 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 916 }
889 } 917 }
890 918
919 CFClient::UI::harmonize \@h;
920
891 my $y = 0; 921 my $y = 0;
892 for (0 .. $#$children) { 922 for (0 .. $#$children) {
893 my $child = $children->[$_]; 923 my $child = $children->[$_];
894 my $h = int $h[$_]; 924 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 925 $child->size_allocate (0, $y, $w, $h);
896 926
897 $y += $h; 927 $y += $h;
898 } 928 }
899} 929}
… …
1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1457 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1458 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429 1459
1430 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1460 my ($value, $lo, $hi, $page) = @{$self->{range}};
1431 1461
1462 $hi = $value + 1 if $lo == $hi;
1463
1432 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1464 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433 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
1434 1466
1435 $page = int $page * $inner_w / ($hi - $lo); 1467 $page = int $page * $inner_w / ($hi - $lo);
1436 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1468 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1482 (new CFClient::UI::Empty expand => 1), 1514 (new CFClient::UI::Empty expand => 1),
1483 (new CFClient::UI::Slider vertical => 1), 1515 (new CFClient::UI::Slider vertical => 1),
1484 ], 1516 ],
1485 ); 1517 );
1486 1518
1519 $self->{children}[1]->connect (changed => sub {
1520 $self->update;
1521 });
1522
1487 $self 1523 $self
1524}
1525
1526sub set_fontsize {
1527 my ($self, $fontsize) = @_;
1528
1529 $self->{fontsize} = $fontsize;
1530 $self->reflow;
1488} 1531}
1489 1532
1490sub text_height { 1533sub text_height {
1491 my ($self, $text) = @_; 1534 my ($self, $text) = @_;
1492 1535
… …
1500} 1543}
1501 1544
1502sub reflow { 1545sub reflow {
1503 my ($self) = @_; 1546 my ($self) = @_;
1504 1547
1505 my $height = 0; 1548 $self->{need_reflow}++;
1506 1549 $self->update;
1507 for (@{$self->{par}}) {
1508 $height += $_->[0] = $self->text_height ($_->[2]);
1509 }
1510
1511 $self->{height} = $height;
1512
1513 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514} 1550}
1515 1551
1516sub size_request { 1552sub size_request {
1517 my ($self) = @_; 1553 my ($self) = @_;
1518 1554
… …
1526 1562
1527 $self->{layout}->set_height ($self->{fontsize}); 1563 $self->{layout}->set_height ($self->{fontsize});
1528 $self->{layout}->set_width ($self->{w}); 1564 $self->{layout}->set_width ($self->{w});
1529 1565
1530 $self->reflow; 1566 $self->reflow;
1531 $self->update;
1532} 1567}
1533 1568
1534sub add_paragraph { 1569sub add_paragraph {
1535 my ($self, $color, $text) = @_; 1570 my ($self, $color, $text) = @_;
1536 1571
… …
1551 1586
1552 $self->SUPER::update; 1587 $self->SUPER::update;
1553 1588
1554 return unless $self->{h} > 0; 1589 return unless $self->{h} > 0;
1555 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
1556 $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 {
1557 glClearColor 0, 0, 0, 1; 1608 glClearColor 0, 0, 0, 1;
1558 glClear GL_COLOR_BUFFER_BIT; 1609 glClear GL_COLOR_BUFFER_BIT;
1559 1610
1560 my $y0 = $self->{height} - $self->{h};
1561 my $y1 = $self->{height};
1562
1563 glEnable GL_BLEND; 1611 glEnable GL_BLEND;
1564 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1612 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565 glEnable GL_TEXTURE_2D; 1613 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1614 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 1615
1616 my $top = int $self->{children}[1]{range}[0];
1617
1618 my $y0 = $top;
1619 my $y1 = $top + $self->{h};
1620
1568 my $y = 0; 1621 my $y = 0;
1569 1622
1570 my $layout = $self->{layout}; 1623 my $layout = $self->{layout};
1571 1624
1572 for my $par (@{$self->{par}}) { 1625 for my $par (@{$self->{par}}) {
1573 my $h = $par->[0]; 1626 my $h = $par->[0];
1574 1627
1575 if ($y0 < $y + $h && $y < $y1) { 1628 if ($y0 < $y + $h && $y < $y1) {
1576 $layout->set_text ($par->[2]); 1629 $layout->set_text ($par->[2]);
1577 1630
1578 glColor @{ $par->[1] }; 1631 glColor @{ $par->[1] };
1579 my ($W, $H) = $layout->size; 1632 my ($W, $H) = $layout->size;
1580 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;
1581 } 1637 }
1582 1638
1583 $y += $h;
1584 }
1585
1586 glDisable GL_TEXTURE_2D; 1639 glDisable GL_TEXTURE_2D;
1587 glDisable GL_BLEND; 1640 glDisable GL_BLEND;
1641 };
1588 }; 1642 });
1589} 1643}
1590 1644
1591sub _draw { 1645sub _draw {
1592 my ($self) = @_; 1646 my ($self) = @_;
1593 1647
… …
1631} 1685}
1632 1686
1633sub key_up { 1687sub key_up {
1634} 1688}
1635 1689
1690sub 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
1712sub button_up {
1713 my ($self, $ev, $x, $y) = @_;
1714
1715 delete $self->{motion};
1716}
1717
1718sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_;
1720
1721 $self->{motion}->($ev, $x, $y) if $self->{motion};
1722}
1723
1636sub size_request { 1724sub size_request {
1637 ( 1725 (
1638 1 + 32 * int $::WIDTH / 32, 1726 1 + 32 * int $::WIDTH / 32,
1639 1 + 32 * int $::HEIGHT / 32, 1727 1 + 32 * int $::HEIGHT / 32,
1640 ) 1728 )
… …
1648} 1736}
1649 1737
1650sub draw { 1738sub draw {
1651 my ($self) = @_; 1739 my ($self) = @_;
1652 1740
1653 $self->{need_update}++;#d#
1654 if (delete $self->{need_update}) { 1741 if (delete $self->{need_update}) {
1655 glNewList $self->{list}, GL_COMPILE; 1742 glNewList $self->{list}, GL_COMPILE;
1656 1743
1657 my $sw = int $::WIDTH / 32;
1658 my $sh = int $::HEIGHT / 32;
1659
1660 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
1661 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);
1662 1754
1663 if ($::CFG->{fow_enable}) { 1755 if ($::CFG->{fow_enable}) {
1664 if ($::CFG->{fow_smooth}) { # smooth fog of war 1756 if ($::CFG->{fow_smooth}) { # smooth fog of war
1665 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1757 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1666 glConvolutionFilter2D 1758 glConvolutionFilter2D
… …
1684 format => GL_ALPHA; 1776 format => GL_ALPHA;
1685 1777
1686 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1778 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687 1779
1688 glEnable GL_BLEND; 1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1690 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691 1784
1692 glColor +($::CFG->{fow_intensity}) x 3, 1; 1785 glColor +($::CFG->{fow_intensity}) x 3, 1;
1693 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1786 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1694 1787
1695 glDisable GL_TEXTURE_2D; 1788 glDisable GL_TEXTURE_2D;
1696 glDisable GL_BLEND; 1789 glDisable GL_BLEND;
1697 } 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
1698 } 1813 }
1699 1814
1700 glEndList; 1815 glEndList;
1701 } 1816 }
1702 1817
1818 glPushMatrix;
1703 glCallList $self->{list}; 1819 glCallList $self->{list};
1820 glPopMatrix;
1704 1821
1705 if ($FOCUS != $self) { 1822 if ($FOCUS != $self) {
1706 glColor 64/255, 64/255, 64/255; 1823 glColor 64/255, 64/255, 64/255;
1707 glLogicOp GL_AND; 1824 glLogicOp GL_AND;
1708 glEnable GL_COLOR_LOGIC_OP; 1825 glEnable GL_COLOR_LOGIC_OP;
… …
1841sub toggle_flopper { 1958sub toggle_flopper {
1842 my ($self) = @_; 1959 my ($self) = @_;
1843 1960
1844 # TODO: use animation 1961 # TODO: use animation
1845 if ($self->{state} = !$self->{state}) { 1962 if ($self->{state} = !$self->{state}) {
1846 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1963 $CFClient::UI::ROOT->add ($self->{other});
1847 $self->{other}->move ( 1964 $self->{other}->move ($self->coord2global (0, $self->{h}));
1848 ($::WIDTH - $self->{other}{w}) * 0.5,
1849 ($::HEIGHT - $self->{other}{h}) * 0.5,
1850 );
1851 } else { 1965 } else {
1852 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1966 $CFClient::UI::ROOT->remove ($self->{other});
1853 } 1967 }
1854} 1968}
1855 1969
1856############################################################################# 1970#############################################################################
1857 1971
1858package CFClient::UI::Toplevel; 1972package CFClient::UI::Root;
1859 1973
1860our @ISA = CFClient::UI::Container::; 1974our @ISA = CFClient::UI::Container::;
1975
1976use SDL::OpenGL;
1861 1977
1862sub size_request { 1978sub size_request {
1863 ($::WIDTH, $::HEIGHT) 1979 ($::WIDTH, $::HEIGHT)
1864} 1980}
1865 1981
… …
1870 1986
1871 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1987 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1872 for @{$self->{children}}; 1988 for @{$self->{children}};
1873} 1989}
1874 1990
1875sub translate { 1991sub _topleft {
1876 my ($self, $x, $y) = @_; 1992 my ($self, $x, $y) = @_;
1877 1993
1878 ($x, $y) 1994 ($x, $y)
1879} 1995}
1880 1996
… …
1891 $self->SUPER::add ($widget); 2007 $self->SUPER::add ($widget);
1892 2008
1893 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2009 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1894} 2010}
1895 2011
2012sub on_refresh {
2013 my ($self, $id, $cb) = @_;
2014
2015 $self->{refresh_hook}{$id} = $cb;
2016}
2017
1896sub draw { 2018sub draw {
1897 my ($self) = @_; 2019 my ($self) = @_;
1898 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
1899 $self->_draw; 2035 $self->_draw;
1900} 2036}
1901 2037
1902############################################################################# 2038#############################################################################
1903 2039
1904package CFClient::UI; 2040package CFClient::UI;
1905 2041
1906$TOPLEVEL = new CFClient::UI::Toplevel; 2042$ROOT = new CFClient::UI::Root;
1907 2043
19081 20441
1909 2045

Diff Legend

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