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.119 by root, Sun Apr 16 07:25:30 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;
… …
99 $self 112 $self
100} 113}
101 114
102sub move { 115sub move {
103 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
104 $self->{x} = $x; 117 $self->{x} = int $x;
105 $self->{y} = $y; 118 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
107} 120}
108 121
109sub needs_redraw { 122sub needs_redraw {
110 0 123 0
… …
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}
… …
539 # TODO: user_x, user_y, overwrite moveto? 565 # TODO: user_x, user_y, overwrite moveto?
540 566
541 $class->SUPER::new ( 567 $class->SUPER::new (
542 bg => [1, 1, 1, 1], 568 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 569 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 570 border => int $::FONTSIZE * 0.8,
545 @_ 571 @_
546 ) 572 )
547} 573}
548 574
549sub size_request { 575sub size_request {
… …
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}
… …
909 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
910 fg => [1, 1, 1], 951 fg => [1, 1, 1],
911 fontsize => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
912 text => "", 953 text => "",
913 align => -1, 954 align => -1,
955 valign => -1,
914 padding => 2, 956 padding => 2,
915 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
916 %arg 958 %arg
917 ); 959 );
918 960
… …
995 my $x = 1037 my $x =
996 $self->{align} < 0 ? $self->{padding} 1038 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
999 1041
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
1001 1048
1002 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
1004} 1051}
1005 1052
… …
1020 bg => [0, 0, 0, 0.2], 1067 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1068 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1023 can_hover => 1, 1070 can_hover => 1,
1024 can_focus => 1, 1071 can_focus => 1,
1072 valign => 0,
1025 @_ 1073 @_
1026 ) 1074 )
1027} 1075}
1028 1076
1029sub _set_text { 1077sub _set_text {
… …
1228 1276
1229sub _draw { 1277sub _draw {
1230 my ($self) = @_; 1278 my ($self) = @_;
1231 1279
1232 local $self->{fg} = $self->{fg}; 1280 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238 1281
1239 if ($GRAB == $self) { 1282 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1283 $self->{fg} = $self->{active_fg};
1241 } 1284 }
1242 1285
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1286 glEnable GL_BLEND;
1287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1288 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1289 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1290 glColor 0, 0, 0, 1;
1245 1291
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1292 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1293
1248 glDisable GL_TEXTURE_2D; 1294 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1295 glDisable GL_BLEND;
1250 1296
1251 $self->SUPER::_draw; 1297 $self->SUPER::_draw;
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1470 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1471 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1472
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1473 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1474
1475 $hi = $value + 1 if $lo == $hi;
1476
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1477 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1478 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1479
1432 $page = int $page * $inner_w / ($hi - $lo); 1480 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1481 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1479 (new CFClient::UI::Empty expand => 1), 1527 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1), 1528 (new CFClient::UI::Slider vertical => 1),
1481 ], 1529 ],
1482 ); 1530 );
1483 1531
1532 $self->{children}[1]->connect (changed => sub {
1533 $self->update;
1534 });
1535
1484 $self 1536 $self
1537}
1538
1539sub set_fontsize {
1540 my ($self, $fontsize) = @_;
1541
1542 $self->{fontsize} = $fontsize;
1543 $self->reflow;
1485} 1544}
1486 1545
1487sub text_height { 1546sub text_height {
1488 my ($self, $text) = @_; 1547 my ($self, $text) = @_;
1489 1548
… …
1497} 1556}
1498 1557
1499sub reflow { 1558sub reflow {
1500 my ($self) = @_; 1559 my ($self) = @_;
1501 1560
1502 my $height = 0; 1561 $self->{need_reflow}++;
1503 1562 $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} 1563}
1512 1564
1513sub size_request { 1565sub size_request {
1514 my ($self) = @_; 1566 my ($self) = @_;
1515 1567
… …
1523 1575
1524 $self->{layout}->set_height ($self->{fontsize}); 1576 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w}); 1577 $self->{layout}->set_width ($self->{w});
1526 1578
1527 $self->reflow; 1579 $self->reflow;
1528 $self->update;
1529} 1580}
1530 1581
1531sub add_paragraph { 1582sub add_paragraph {
1532 my ($self, $color, $text) = @_; 1583 my ($self, $color, $text) = @_;
1533 1584
… …
1548 1599
1549 $self->SUPER::update; 1600 $self->SUPER::update;
1550 1601
1551 return unless $self->{h} > 0; 1602 return unless $self->{h} > 0;
1552 1603
1604 delete $self->{texture};
1605
1606 $ROOT->on_refresh ($self, sub {
1607 if (delete $self->{need_reflow}) {
1608 my $height = 0;
1609
1610 $height += $_->[0] = $self->text_height ($_->[2])
1611 for @{$self->{par}};
1612
1613 $self->{height} = $height;
1614
1615 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1616
1617 delete $self->{texture};
1618 }
1619
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 1620 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1; 1621 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT; 1622 glClear GL_COLOR_BUFFER_BIT;
1556 1623
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND; 1624 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D; 1626 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 1628
1629 my $top = int $self->{children}[1]{range}[0];
1630
1631 my $y0 = $top;
1632 my $y1 = $top + $self->{h};
1633
1565 my $y = 0; 1634 my $y = 0;
1566 1635
1567 my $layout = $self->{layout}; 1636 my $layout = $self->{layout};
1568 1637
1569 for my $par (@{$self->{par}}) { 1638 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0]; 1639 my $h = $par->[0];
1571 1640
1572 if ($y0 < $y + $h && $y < $y1) { 1641 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]); 1642 $layout->set_text ($par->[2]);
1574 1643
1575 glColor @{ $par->[1] }; 1644 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size; 1645 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 1646 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1647 }
1648
1649 $y += $h;
1578 } 1650 }
1579 1651
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D; 1652 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND; 1653 glDisable GL_BLEND;
1654 };
1585 }; 1655 });
1586} 1656}
1587 1657
1588sub _draw { 1658sub _draw {
1589 my ($self) = @_; 1659 my ($self) = @_;
1590 1660
… …
1592 glEnable GL_TEXTURE_2D; 1662 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 1664 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D; 1665 glDisable GL_TEXTURE_2D;
1596 } 1666 }
1667
1668 $self->{children}[1]->draw;
1597 1669
1598} 1670}
1599 1671
1600############################################################################# 1672#############################################################################
1601 1673
… …
1626} 1698}
1627 1699
1628sub key_up { 1700sub key_up {
1629} 1701}
1630 1702
1703sub button_down {
1704 my ($self, $ev, $x, $y) = @_;
1705
1706 $self->focus_in;
1707
1708 if ($ev->button == 2) {
1709 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1710 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1711
1712 $self->{motion} = sub {
1713 my ($ev, $x, $y) = @_;
1714
1715 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1716
1717 $::CFG->{map_shift_x} = $bw + $x - $ox;
1718 $::CFG->{map_shift_y} = $bh + $y - $oy;
1719
1720 $self->update;
1721 };
1722 }
1723}
1724
1725sub button_up {
1726 my ($self, $ev, $x, $y) = @_;
1727
1728 delete $self->{motion};
1729}
1730
1731sub mouse_motion {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 $self->{motion}->($ev, $x, $y) if $self->{motion};
1735}
1736
1631sub size_request { 1737sub size_request {
1632 ( 1738 (
1633 1 + 32 * int $::WIDTH / 32, 1739 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32, 1740 1 + 32 * int $::HEIGHT / 32,
1635 ) 1741 )
… …
1643} 1749}
1644 1750
1645sub draw { 1751sub draw {
1646 my ($self) = @_; 1752 my ($self) = @_;
1647 1753
1648 $self->{need_update}++;#d#
1649 if (delete $self->{need_update}) { 1754 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE; 1755 glNewList $self->{list}, GL_COMPILE;
1651 1756
1652 my $sw = int $::WIDTH / 32;
1653 my $sh = int $::HEIGHT / 32;
1654
1655 if ($::MAP) { 1757 if ($::MAP) {
1758 my $sw = int $::WIDTH / 32;
1759 my $sh = int $::HEIGHT / 32;
1760
1761 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1762 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1763
1764 glTranslate $sx0 - 32, $sy0 - 32, 0;
1765
1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1766 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657 1767
1658 if ($::CFG->{fow_enable}) { 1768 if ($::CFG->{fow_enable}) {
1659 if ($::CFG->{fow_smooth}) { # smooth fog of war 1769 if ($::CFG->{fow_smooth}) { # smooth fog of war
1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1770 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661 glConvolutionFilter2D 1771 glConvolutionFilter2D
… …
1669 0.1, 0.1, 0.1, 1779 0.1, 0.1, 0.1,
1670 ; 1780 ;
1671 glEnable GL_CONVOLUTION_2D; 1781 glEnable GL_CONVOLUTION_2D;
1672 } 1782 }
1673 1783
1674 my $tex = new CFClient::Texture 1784 $self->{fow_texture} = new CFClient::Texture
1675 w => $w, 1785 w => $w,
1676 h => $h, 1786 h => $h,
1677 data => $data, 1787 data => $data,
1678 internalformat => GL_ALPHA, 1788 internalformat => GL_ALPHA,
1679 format => GL_ALPHA; 1789 format => GL_ALPHA;
1680 1790
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1791 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682 1792
1683 glEnable GL_BLEND; 1793 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684 glEnable GL_TEXTURE_2D; 1795 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686 1797
1687 glColor +($::CFG->{fow_intensity}) x 3, 1; 1798 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1799 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1689 1800
1690 glDisable GL_TEXTURE_2D; 1801 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND; 1802 glDisable GL_BLEND;
1692 } 1803 }
1804
1805 # HACK BEGIN
1806 {
1807 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1808 my ($w, $h) = (250, 250);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $self->{mapmap_texture} =
1816 new CFClient::Texture
1817 w => $w,
1818 h => $h,
1819 data => $::MAP->mapmap ($w, $h),
1820 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1821
1822 $self->{mapmap_texture}->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1693 } 1828 }
1694 1829
1695 glEndList; 1830 glEndList;
1696 } 1831 }
1697 1832
1833 glPushMatrix;
1698 glCallList $self->{list}; 1834 glCallList $self->{list};
1835 glPopMatrix;
1699 1836
1700 if ($FOCUS != $self) { 1837 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255; 1838 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND; 1839 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP; 1840 glEnable GL_COLOR_LOGIC_OP;
… …
1836sub toggle_flopper { 1973sub toggle_flopper {
1837 my ($self) = @_; 1974 my ($self) = @_;
1838 1975
1839 # TODO: use animation 1976 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) { 1977 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1978 $CFClient::UI::ROOT->add ($self->{other});
1842 $self->{other}->move ( 1979 $self->{other}->move ($self->coord2global (0, $self->{h}));
1843 ($::WIDTH - $self->{other}{w}) * 0.5, 1980 $self->emit ("open");
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else { 1981 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1982 $CFClient::UI::ROOT->remove ($self->{other});
1983 $self->emit ("close");
1848 } 1984 }
1849}
1850 1985
1851############################################################################# 1986 $self->emit (changed => $self->{state});
1987}
1852 1988
1989#############################################################################
1990
1853package CFClient::UI::Toplevel; 1991package CFClient::UI::Root;
1854 1992
1855our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
1994
1995use SDL::OpenGL;
1856 1996
1857sub size_request { 1997sub size_request {
1858 ($::WIDTH, $::HEIGHT) 1998 ($::WIDTH, $::HEIGHT)
1859} 1999}
1860 2000
… …
1865 2005
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}}; 2007 for @{$self->{children}};
1868} 2008}
1869 2009
1870sub translate { 2010sub _topleft {
1871 my ($self, $x, $y) = @_; 2011 my ($self, $x, $y) = @_;
1872 2012
1873 ($x, $y) 2013 ($x, $y)
1874} 2014}
1875 2015
… …
1883sub add { 2023sub add {
1884 my ($self, $widget) = @_; 2024 my ($self, $widget) = @_;
1885 2025
1886 $self->SUPER::add ($widget); 2026 $self->SUPER::add ($widget);
1887 2027
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2028 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2029}
2030
2031sub on_refresh {
2032 my ($self, $id, $cb) = @_;
2033
2034 $self->{refresh_hook}{$id} = $cb;
1889} 2035}
1890 2036
1891sub draw { 2037sub draw {
1892 my ($self) = @_; 2038 my ($self) = @_;
1893 2039
2040 while (my $rcb = delete $self->{refresh_hook}) {
2041 $_->() for values %$rcb;
2042 }
2043
2044 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2045 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2046 glClear GL_COLOR_BUFFER_BIT;
2047
2048 glMatrixMode GL_PROJECTION;
2049 glLoadIdentity;
2050 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2051 glMatrixMode GL_MODELVIEW;
2052 glLoadIdentity;
2053
1894 $self->_draw; 2054 $self->_draw;
1895} 2055}
1896 2056
1897############################################################################# 2057#############################################################################
1898 2058
1899package CFClient::UI; 2059package CFClient::UI;
1900 2060
1901$TOPLEVEL = new CFClient::UI::Toplevel; 2061$ROOT = new CFClient::UI::Root;
1902 2062
19031 20631
1904 2064

Diff Legend

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