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.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 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;
709 $self->update;
710}
711
712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
714 my ($self) = @_;
715
716 delete $self->{children};
683 $self->update; 717 $self->update;
684} 718}
685 719
686sub get_wh { 720sub get_wh {
687 my ($self) = @_; 721 my ($self) = @_;
… …
732 my $col_expand = (sum @col_expand) || 1; 766 my $col_expand = (sum @col_expand) || 1;
733 767
734 # linearly scale sizes 768 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
737 774
738 my $y; 775 my $y;
739 776
740 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
… …
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h; 867 $h[$_] = $alloc_h;
831 } 868 }
832 } 869 }
833 870
871 CFClient::UI::harmonize \@h;
872
834 my $y = 0; 873 my $y = 0;
835 for (0 .. $#$children) { 874 for (0 .. $#$children) {
836 my $child = $children->[$_]; 875 my $child = $children->[$_];
837 my $h = int $h[$_]; 876 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w); 877 $child->size_allocate ($y, 0, $h, $w);
839 878
840 $y += $h; 879 $y += $h;
841 } 880 }
842} 881}
… …
883 922
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885 } 924 }
886 } 925 }
887 926
927 CFClient::UI::harmonize \@h;
928
888 my $y = 0; 929 my $y = 0;
889 for (0 .. $#$children) { 930 for (0 .. $#$children) {
890 my $child = $children->[$_]; 931 my $child = $children->[$_];
891 my $h = int $h[$_]; 932 my $h = $h[$_];
892 $child->size_allocate (0, $y, $w, $h); 933 $child->size_allocate (0, $y, $w, $h);
893 934
894 $y += $h; 935 $y += $h;
895 } 936 }
896} 937}
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1465 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1466 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1467
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1468 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1469
1470 $hi = $value + 1 if $lo == $hi;
1471
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1472 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1473 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1474
1432 $page = int $page * $inner_w / ($hi - $lo); 1475 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1476 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1479 (new CFClient::UI::Empty expand => 1), 1522 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1), 1523 (new CFClient::UI::Slider vertical => 1),
1481 ], 1524 ],
1482 ); 1525 );
1483 1526
1527 $self->{children}[1]->connect (changed => sub {
1528 $self->update;
1529 });
1530
1484 $self 1531 $self
1532}
1533
1534sub set_fontsize {
1535 my ($self, $fontsize) = @_;
1536
1537 $self->{fontsize} = $fontsize;
1538 $self->reflow;
1485} 1539}
1486 1540
1487sub text_height { 1541sub text_height {
1488 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1489 1543
… …
1497} 1551}
1498 1552
1499sub reflow { 1553sub reflow {
1500 my ($self) = @_; 1554 my ($self) = @_;
1501 1555
1502 my $height = 0; 1556 $self->{need_reflow}++;
1503 1557 $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} 1558}
1512 1559
1513sub size_request { 1560sub size_request {
1514 my ($self) = @_; 1561 my ($self) = @_;
1515 1562
… …
1523 1570
1524 $self->{layout}->set_height ($self->{fontsize}); 1571 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w}); 1572 $self->{layout}->set_width ($self->{w});
1526 1573
1527 $self->reflow; 1574 $self->reflow;
1528 $self->update;
1529} 1575}
1530 1576
1531sub add_paragraph { 1577sub add_paragraph {
1532 my ($self, $color, $text) = @_; 1578 my ($self, $color, $text) = @_;
1533 1579
… …
1548 1594
1549 $self->SUPER::update; 1595 $self->SUPER::update;
1550 1596
1551 return unless $self->{h} > 0; 1597 return unless $self->{h} > 0;
1552 1598
1599 delete $self->{texture};
1600
1601 $ROOT->on_refresh ($self, sub {
1602 if (delete $self->{need_reflow}) {
1603 my $height = 0;
1604
1605 $height += $_->[0] = $self->text_height ($_->[2])
1606 for @{$self->{par}};
1607
1608 $self->{height} = $height;
1609
1610 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1611
1612 delete $self->{texture};
1613 }
1614
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 1615 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1; 1616 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT; 1617 glClear GL_COLOR_BUFFER_BIT;
1556 1618
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND; 1619 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D; 1621 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 1623
1624 my $top = int $self->{children}[1]{range}[0];
1625
1626 my $y0 = $top;
1627 my $y1 = $top + $self->{h};
1628
1565 my $y = 0; 1629 my $y = 0;
1566 1630
1567 my $layout = $self->{layout}; 1631 my $layout = $self->{layout};
1568 1632
1569 for my $par (@{$self->{par}}) { 1633 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0]; 1634 my $h = $par->[0];
1571 1635
1572 if ($y0 < $y + $h && $y < $y1) { 1636 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]); 1637 $layout->set_text ($par->[2]);
1574 1638
1575 glColor @{ $par->[1] }; 1639 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size; 1640 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 1641 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1642 }
1643
1644 $y += $h;
1578 } 1645 }
1579 1646
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND; 1648 glDisable GL_BLEND;
1649 };
1585 }; 1650 });
1586} 1651}
1587 1652
1588sub _draw { 1653sub _draw {
1589 my ($self) = @_; 1654 my ($self) = @_;
1590 1655
… …
1592 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 1659 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1596 } 1661 }
1662
1663 $self->{children}[1]->draw;
1597 1664
1598} 1665}
1599 1666
1600############################################################################# 1667#############################################################################
1601 1668
… …
1626} 1693}
1627 1694
1628sub key_up { 1695sub key_up {
1629} 1696}
1630 1697
1698sub button_down {
1699 my ($self, $ev, $x, $y) = @_;
1700
1701 $self->focus_in;
1702
1703 if ($ev->button == 2) {
1704 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1705 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1706
1707 $self->{motion} = sub {
1708 my ($ev, $x, $y) = @_;
1709
1710 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1711
1712 $::CFG->{map_shift_x} = $bw + $x - $ox;
1713 $::CFG->{map_shift_y} = $bh + $y - $oy;
1714
1715 $self->update;
1716 };
1717 }
1718}
1719
1720sub button_up {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 delete $self->{motion};
1724}
1725
1726sub mouse_motion {
1727 my ($self, $ev, $x, $y) = @_;
1728
1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
1730}
1731
1631sub size_request { 1732sub size_request {
1632 ( 1733 (
1633 1 + 32 * int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
1635 ) 1736 )
… …
1643} 1744}
1644 1745
1645sub draw { 1746sub draw {
1646 my ($self) = @_; 1747 my ($self) = @_;
1647 1748
1648 $self->{need_update}++;#d#
1649 if (delete $self->{need_update}) { 1749 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE; 1750 glNewList $self->{list}, GL_COMPILE;
1651 1751
1652 my $sw = int $::WIDTH / 32;
1653 my $sh = int $::HEIGHT / 32;
1654
1655 if ($::MAP) { 1752 if ($::MAP) {
1753 my $sw = int $::WIDTH / 32;
1754 my $sh = int $::HEIGHT / 32;
1755
1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1758
1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
1760
1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1761 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657 1762
1658 if ($::CFG->{fow_enable}) { 1763 if ($::CFG->{fow_enable}) {
1659 if ($::CFG->{fow_smooth}) { # smooth fog of war 1764 if ($::CFG->{fow_smooth}) { # smooth fog of war
1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1765 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661 glConvolutionFilter2D 1766 glConvolutionFilter2D
… …
1679 format => GL_ALPHA; 1784 format => GL_ALPHA;
1680 1785
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1786 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682 1787
1683 glEnable GL_BLEND; 1788 glEnable GL_BLEND;
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686 1792
1687 glColor +($::CFG->{fow_intensity}) x 3, 1; 1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1689 1795
1690 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND; 1797 glDisable GL_BLEND;
1692 } 1798 }
1799
1800 # HACK BEGIN
1801 {
1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1803 my ($w, $h) = (250, 250);
1804
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809
1810 CFClient::Texture->new (
1811 w => $w,
1812 h => $h,
1813 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV
1815 )->draw_quad (100, 100);
1816
1817 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND;
1819 }
1820 # HACK END
1693 } 1821 }
1694 1822
1695 glEndList; 1823 glEndList;
1696 } 1824 }
1697 1825
1826 glPushMatrix;
1698 glCallList $self->{list}; 1827 glCallList $self->{list};
1828 glPopMatrix;
1699 1829
1700 if ($FOCUS != $self) { 1830 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255; 1831 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND; 1832 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP; 1833 glEnable GL_COLOR_LOGIC_OP;
… …
1836sub toggle_flopper { 1966sub toggle_flopper {
1837 my ($self) = @_; 1967 my ($self) = @_;
1838 1968
1839 # TODO: use animation 1969 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) { 1970 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1971 $CFClient::UI::ROOT->add ($self->{other});
1842 $self->{other}->move ( 1972 $self->{other}->move ($self->coord2global (0, $self->{h}));
1843 ($::WIDTH - $self->{other}{w}) * 0.5, 1973 $self->emit ("open");
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else { 1974 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1975 $CFClient::UI::ROOT->remove ($self->{other});
1976 $self->emit ("close");
1848 } 1977 }
1849}
1850 1978
1851############################################################################# 1979 $self->emit (changed => $self->{state});
1980}
1852 1981
1982#############################################################################
1983
1853package CFClient::UI::Toplevel; 1984package CFClient::UI::Root;
1854 1985
1855our @ISA = CFClient::UI::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
1856 1989
1857sub size_request { 1990sub size_request {
1858 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
1859} 1992}
1860 1993
… …
1865 1998
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}}; 2000 for @{$self->{children}};
1868} 2001}
1869 2002
1870sub translate { 2003sub _topleft {
1871 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1872 2005
1873 ($x, $y) 2006 ($x, $y)
1874} 2007}
1875 2008
… …
1886 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
1887 2020
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1889} 2022}
1890 2023
2024sub on_refresh {
2025 my ($self, $id, $cb) = @_;
2026
2027 $self->{refresh_hook}{$id} = $cb;
2028}
2029
1891sub draw { 2030sub draw {
1892 my ($self) = @_; 2031 my ($self) = @_;
1893 2032
2033 while (my $rcb = delete $self->{refresh_hook}) {
2034 $_->() for values %$rcb;
2035 }
2036
2037 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2038 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2039 glClear GL_COLOR_BUFFER_BIT;
2040
2041 glMatrixMode GL_PROJECTION;
2042 glLoadIdentity;
2043 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2044 glMatrixMode GL_MODELVIEW;
2045 glLoadIdentity;
2046
1894 $self->_draw; 2047 $self->_draw;
1895} 2048}
1896 2049
1897############################################################################# 2050#############################################################################
1898 2051
1899package CFClient::UI; 2052package CFClient::UI;
1900 2053
1901$TOPLEVEL = new CFClient::UI::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1902 2055
19031 20561
1904 2057

Diff Legend

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