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.120 by elmex, Sun Apr 16 17:43:17 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
148 return if $FOCUS == $self; 177 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 178 return unless $self->{can_focus};
150 179
151 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
152 $focus->update if $focus; 184 $focus->update if $focus;
153 $FOCUS->update; 185 $FOCUS->update;
154} 186}
155 187
156sub focus_out { 188sub focus_out {
157 my ($self) = @_; 189 my ($self) = @_;
158 190
159 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
160 192
161 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
162 $focus->update if $focus; #? 197 $focus->update if $focus; #?
163} 198}
164 199
165sub mouse_motion { } 200sub mouse_motion { }
166sub button_up { } 201sub button_up { }
… …
220 255
221 () 256 ()
222} 257}
223 258
224sub set_parent { 259sub set_parent {
225 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
226 261
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
229}
230
231sub get_parent {
232 $_[0]->{parent}
233} 263}
234 264
235sub update { 265sub update {
236 my ($self) = @_; 266 my ($self) = @_;
237 267
… …
326 356
327 $self 357 $self
328} 358}
329 359
330sub add { 360sub add {
331 my ($self, $chld) = @_; 361 my ($self, $child) = @_;
332 362
333 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
334 366
335 $self->{children} = [ 367 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
338 ]; 370 ];
339 371
340 $self->{w} = $self->{h} = -1; 372 $self->{w} = $self->{h} = -1;
341 $self->update; 373 $self->update;
342} 374}
… …
539 # TODO: user_x, user_y, overwrite moveto? 571 # TODO: user_x, user_y, overwrite moveto?
540 572
541 $class->SUPER::new ( 573 $class->SUPER::new (
542 bg => [1, 1, 1, 1], 574 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 575 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 576 border => int $::FONTSIZE * 0.8,
545 @_ 577 @_
546 ) 578 )
547} 579}
548 580
549sub size_request { 581sub size_request {
… …
672 @_ 704 @_
673 ) 705 )
674} 706}
675 707
676sub add { 708sub add {
677 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
678 710
711 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 713
682 $self->{w} = $self->{h} = -1; 714 $self->{w} = $self->{h} = -1;
715 $self->update;
716}
717
718# TODO: move to container class maybe? send childs a signal on removal?
719sub clear {
720 my ($self) = @_;
721
722 delete $self->{children};
683 $self->update; 723 $self->update;
684} 724}
685 725
686sub get_wh { 726sub get_wh {
687 my ($self) = @_; 727 my ($self) = @_;
… …
732 my $col_expand = (sum @col_expand) || 1; 772 my $col_expand = (sum @col_expand) || 1;
733 773
734 # linearly scale sizes 774 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
737 780
738 my $y; 781 my $y;
739 782
740 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
… …
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
831 } 874 }
832 } 875 }
833 876
877 CFClient::UI::harmonize \@h;
878
834 my $y = 0; 879 my $y = 0;
835 for (0 .. $#$children) { 880 for (0 .. $#$children) {
836 my $child = $children->[$_]; 881 my $child = $children->[$_];
837 my $h = int $h[$_]; 882 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w); 883 $child->size_allocate ($y, 0, $h, $w);
839 884
840 $y += $h; 885 $y += $h;
841 } 886 }
842} 887}
… …
883 928
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885 } 930 }
886 } 931 }
887 932
933 CFClient::UI::harmonize \@h;
934
888 my $y = 0; 935 my $y = 0;
889 for (0 .. $#$children) { 936 for (0 .. $#$children) {
890 my $child = $children->[$_]; 937 my $child = $children->[$_];
891 my $h = int $h[$_]; 938 my $h = $h[$_];
892 $child->size_allocate (0, $y, $w, $h); 939 $child->size_allocate (0, $y, $w, $h);
893 940
894 $y += $h; 941 $y += $h;
895 } 942 }
896} 943}
… …
909 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
910 fg => [1, 1, 1], 957 fg => [1, 1, 1],
911 fontsize => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
912 text => "", 959 text => "",
913 align => -1, 960 align => -1,
961 valign => -1,
914 padding => 2, 962 padding => 2,
915 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
916 %arg 964 %arg
917 ); 965 );
918 966
… …
995 my $x = 1043 my $x =
996 $self->{align} < 0 ? $self->{padding} 1044 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1045 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5; 1046 : ($self->{w} - $tex->{w}) * 0.5;
999 1047
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1048 my $y =
1049 $self->{valign} < 0 ? $self->{padding}
1050 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1051 : ($self->{h} - $tex->{h}) * 0.5;
1052
1053 $tex->draw_quad (int $x, int $y);
1001 1054
1002 glDisable GL_TEXTURE_2D; 1055 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1056 glDisable GL_BLEND;
1004} 1057}
1005 1058
… …
1020 bg => [0, 0, 0, 0.2], 1073 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1074 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1075 active_fg => [0, 0, 0],
1023 can_hover => 1, 1076 can_hover => 1,
1024 can_focus => 1, 1077 can_focus => 1,
1078 valign => 0,
1025 @_ 1079 @_
1026 ) 1080 )
1027} 1081}
1028 1082
1029sub _set_text { 1083sub _set_text {
… …
1228 1282
1229sub _draw { 1283sub _draw {
1230 my ($self) = @_; 1284 my ($self) = @_;
1231 1285
1232 local $self->{fg} = $self->{fg}; 1286 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 1287
1239 if ($GRAB == $self) { 1288 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1289 $self->{fg} = $self->{active_fg};
1241 } 1290 }
1242 1291
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1292 glEnable GL_BLEND;
1293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1294 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1296 glColor 0, 0, 0, 1;
1245 1297
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1298 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1299
1248 glDisable GL_TEXTURE_2D; 1300 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1301 glDisable GL_BLEND;
1250 1302
1251 $self->SUPER::_draw; 1303 $self->SUPER::_draw;
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1476 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1477 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1478
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1479 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1480
1481 $hi = $value + 1 if $lo == $hi;
1482
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1483 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1484 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1485
1432 $page = int $page * $inner_w / ($hi - $lo); 1486 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1487 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1479 (new CFClient::UI::Empty expand => 1), 1533 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1), 1534 (new CFClient::UI::Slider vertical => 1),
1481 ], 1535 ],
1482 ); 1536 );
1483 1537
1538 $self->{children}[1]->connect (changed => sub {
1539 $self->update;
1540 });
1541
1484 $self 1542 $self
1543}
1544
1545sub set_fontsize {
1546 my ($self, $fontsize) = @_;
1547
1548 $self->{fontsize} = $fontsize;
1549 $self->reflow;
1485} 1550}
1486 1551
1487sub text_height { 1552sub text_height {
1488 my ($self, $text) = @_; 1553 my ($self, $text) = @_;
1489 1554
… …
1497} 1562}
1498 1563
1499sub reflow { 1564sub reflow {
1500 my ($self) = @_; 1565 my ($self) = @_;
1501 1566
1502 my $height = 0; 1567 $self->{need_reflow}++;
1503 1568 $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} 1569}
1512 1570
1513sub size_request { 1571sub size_request {
1514 my ($self) = @_; 1572 my ($self) = @_;
1515 1573
… …
1523 1581
1524 $self->{layout}->set_height ($self->{fontsize}); 1582 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w}); 1583 $self->{layout}->set_width ($self->{w});
1526 1584
1527 $self->reflow; 1585 $self->reflow;
1528 $self->update;
1529} 1586}
1530 1587
1531sub add_paragraph { 1588sub add_paragraph {
1532 my ($self, $color, $text) = @_; 1589 my ($self, $color, $text) = @_;
1533 1590
… …
1548 1605
1549 $self->SUPER::update; 1606 $self->SUPER::update;
1550 1607
1551 return unless $self->{h} > 0; 1608 return unless $self->{h} > 0;
1552 1609
1610 delete $self->{texture};
1611
1612 $ROOT->on_refresh ($self, sub {
1613 if (delete $self->{need_reflow}) {
1614 my $height = 0;
1615
1616 $height += $_->[0] = $self->text_height ($_->[2])
1617 for @{$self->{par}};
1618
1619 $self->{height} = $height;
1620
1621 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1622
1623 delete $self->{texture};
1624 }
1625
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 1626 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1; 1627 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT; 1628 glClear GL_COLOR_BUFFER_BIT;
1556 1629
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND; 1630 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D; 1632 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 1634
1635 my $top = int $self->{children}[1]{range}[0];
1636
1637 my $y0 = $top;
1638 my $y1 = $top + $self->{h};
1639
1565 my $y = 0; 1640 my $y = 0;
1566 1641
1567 my $layout = $self->{layout}; 1642 my $layout = $self->{layout};
1568 1643
1569 for my $par (@{$self->{par}}) { 1644 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0]; 1645 my $h = $par->[0];
1571 1646
1572 if ($y0 < $y + $h && $y < $y1) { 1647 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]); 1648 $layout->set_text ($par->[2]);
1574 1649
1575 glColor @{ $par->[1] }; 1650 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size; 1651 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 1652 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1653 }
1654
1655 $y += $h;
1578 } 1656 }
1579 1657
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D; 1658 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND; 1659 glDisable GL_BLEND;
1660 };
1585 }; 1661 });
1586} 1662}
1587 1663
1588sub _draw { 1664sub _draw {
1589 my ($self) = @_; 1665 my ($self) = @_;
1590 1666
… …
1592 glEnable GL_TEXTURE_2D; 1668 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1669 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 1670 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D; 1671 glDisable GL_TEXTURE_2D;
1596 } 1672 }
1673
1674 $self->{children}[1]->draw;
1597 1675
1598} 1676}
1599 1677
1600############################################################################# 1678#############################################################################
1601 1679
… …
1626} 1704}
1627 1705
1628sub key_up { 1706sub key_up {
1629} 1707}
1630 1708
1709sub button_down {
1710 my ($self, $ev, $x, $y) = @_;
1711
1712 $self->focus_in;
1713
1714 if ($ev->button == 2) {
1715 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1716 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1717
1718 $self->{motion} = sub {
1719 my ($ev, $x, $y) = @_;
1720
1721 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1722
1723 $::CFG->{map_shift_x} = $bw + $x - $ox;
1724 $::CFG->{map_shift_y} = $bh + $y - $oy;
1725
1726 $self->update;
1727 };
1728 }
1729}
1730
1731sub button_up {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 delete $self->{motion};
1735}
1736
1737sub mouse_motion {
1738 my ($self, $ev, $x, $y) = @_;
1739
1740 $self->{motion}->($ev, $x, $y) if $self->{motion};
1741}
1742
1631sub size_request { 1743sub size_request {
1632 ( 1744 (
1633 1 + 32 * int $::WIDTH / 32, 1745 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32, 1746 1 + 32 * int $::HEIGHT / 32,
1635 ) 1747 )
… …
1643} 1755}
1644 1756
1645sub draw { 1757sub draw {
1646 my ($self) = @_; 1758 my ($self) = @_;
1647 1759
1648 $self->{need_update}++;#d#
1649 if (delete $self->{need_update}) { 1760 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE; 1761 glNewList $self->{list}, GL_COMPILE;
1651 1762
1652 my $sw = int $::WIDTH / 32;
1653 my $sh = int $::HEIGHT / 32;
1654
1655 if ($::MAP) { 1763 if ($::MAP) {
1764 my $sw = int $::WIDTH / 32;
1765 my $sh = int $::HEIGHT / 32;
1766
1767 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1768 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1769
1770 glTranslate $sx0 - 32, $sy0 - 32, 0;
1771
1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1772 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657 1773
1658 if ($::CFG->{fow_enable}) { 1774 if ($::CFG->{fow_enable}) {
1659 if ($::CFG->{fow_smooth}) { # smooth fog of war 1775 if ($::CFG->{fow_smooth}) { # smooth fog of war
1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1776 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661 glConvolutionFilter2D 1777 glConvolutionFilter2D
… …
1669 0.1, 0.1, 0.1, 1785 0.1, 0.1, 0.1,
1670 ; 1786 ;
1671 glEnable GL_CONVOLUTION_2D; 1787 glEnable GL_CONVOLUTION_2D;
1672 } 1788 }
1673 1789
1674 my $tex = new CFClient::Texture 1790 $self->{fow_texture} = new CFClient::Texture
1675 w => $w, 1791 w => $w,
1676 h => $h, 1792 h => $h,
1677 data => $data, 1793 data => $data,
1678 internalformat => GL_ALPHA, 1794 internalformat => GL_ALPHA,
1679 format => GL_ALPHA; 1795 format => GL_ALPHA;
1680 1796
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1797 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682 1798
1683 glEnable GL_BLEND; 1799 glEnable GL_BLEND;
1800 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684 glEnable GL_TEXTURE_2D; 1801 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1802 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686 1803
1687 glColor +($::CFG->{fow_intensity}) x 3, 1; 1804 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1805 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1689 1806
1690 glDisable GL_TEXTURE_2D; 1807 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND; 1808 glDisable GL_BLEND;
1692 } 1809 }
1810
1811 # HACK BEGIN
1812 {
1813 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1814 my ($w, $h) = (250, 250);
1815
1816 glEnable GL_BLEND;
1817 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1818 glEnable GL_TEXTURE_2D;
1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1820
1821 $self->{mapmap_texture} =
1822 new CFClient::Texture
1823 w => $w,
1824 h => $h,
1825 data => $::MAP->mapmap ($w, $h),
1826 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1827
1828 $self->{mapmap_texture}->draw_quad (100, 100);
1829
1830 glDisable GL_TEXTURE_2D;
1831 glDisable GL_BLEND;
1832 }
1833 # HACK END
1693 } 1834 }
1694 1835
1695 glEndList; 1836 glEndList;
1696 } 1837 }
1697 1838
1839 glPushMatrix;
1698 glCallList $self->{list}; 1840 glCallList $self->{list};
1841 glPopMatrix;
1699 1842
1700 if ($FOCUS != $self) { 1843 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255; 1844 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND; 1845 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP; 1846 glEnable GL_COLOR_LOGIC_OP;
… …
1836sub toggle_flopper { 1979sub toggle_flopper {
1837 my ($self) = @_; 1980 my ($self) = @_;
1838 1981
1839 # TODO: use animation 1982 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) { 1983 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1984 $CFClient::UI::ROOT->add ($self->{other});
1842 $self->{other}->move ( 1985 $self->{other}->move ($self->coord2global (0, $self->{h}));
1843 ($::WIDTH - $self->{other}{w}) * 0.5, 1986 $self->emit ("open");
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else { 1987 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1988 $CFClient::UI::ROOT->remove ($self->{other});
1989 $self->emit ("close");
1848 } 1990 }
1849}
1850 1991
1851############################################################################# 1992 $self->emit (changed => $self->{state});
1993}
1852 1994
1995#############################################################################
1996
1853package CFClient::UI::Toplevel; 1997package CFClient::UI::Root;
1854 1998
1855our @ISA = CFClient::UI::Container::; 1999our @ISA = CFClient::UI::Container::;
2000
2001use SDL::OpenGL;
1856 2002
1857sub size_request { 2003sub size_request {
1858 ($::WIDTH, $::HEIGHT) 2004 ($::WIDTH, $::HEIGHT)
1859} 2005}
1860 2006
… …
1865 2011
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2012 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}}; 2013 for @{$self->{children}};
1868} 2014}
1869 2015
1870sub translate { 2016sub _topleft {
1871 my ($self, $x, $y) = @_; 2017 my ($self, $x, $y) = @_;
1872 2018
1873 ($x, $y) 2019 ($x, $y)
1874} 2020}
1875 2021
… …
1883sub add { 2029sub add {
1884 my ($self, $widget) = @_; 2030 my ($self, $widget) = @_;
1885 2031
1886 $self->SUPER::add ($widget); 2032 $self->SUPER::add ($widget);
1887 2033
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2034 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2035}
2036
2037sub on_refresh {
2038 my ($self, $id, $cb) = @_;
2039
2040 $self->{refresh_hook}{$id} = $cb;
1889} 2041}
1890 2042
1891sub draw { 2043sub draw {
1892 my ($self) = @_; 2044 my ($self) = @_;
1893 2045
2046 while (my $rcb = delete $self->{refresh_hook}) {
2047 $_->() for values %$rcb;
2048 }
2049
2050 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2051 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2052 glClear GL_COLOR_BUFFER_BIT;
2053
2054 glMatrixMode GL_PROJECTION;
2055 glLoadIdentity;
2056 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2057 glMatrixMode GL_MODELVIEW;
2058 glLoadIdentity;
2059
1894 $self->_draw; 2060 $self->_draw;
1895} 2061}
1896 2062
1897############################################################################# 2063#############################################################################
1898 2064
1899package CFClient::UI; 2065package CFClient::UI;
1900 2066
1901$TOPLEVEL = new CFClient::UI::Toplevel; 2067$ROOT = new CFClient::UI::Root;
1902 2068
19031 20691
1904 2070

Diff Legend

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