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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 $self->focus_out;
239}
240
241sub hide {
242 my ($self) = @_;
243
244 $self->set_invisible;
234 245
235 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
236 if $self->{parent}; 247 if $self->{parent};
237} 248}
238 249
… …
338 return if $FOCUS == $self; 349 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
340 351
341 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
342 353
343 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
344 355
345 $focus->update if $focus; 356 $focus->update if $focus;
346 $FOCUS->update; 357 $FOCUS->update;
347} 358}
348 359
… …
351 362
352 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
353 364
354 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
355 366
356 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
357 368
358 $focus->update if $focus; #? 369 $focus->update if $focus; #?
370
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS;
359} 373}
360 374
361sub mouse_motion { } 375sub mouse_motion { }
362sub button_up { } 376sub button_up { }
363sub key_down { } 377sub key_down { }
364sub key_up { } 378sub key_up { }
365 379
366sub button_down { 380sub button_down {
367 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
368 382
369 $self->focus_in; 383 $self->focus_in;
… …
463 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
464 478
465 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 480}
467 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
468sub emit { 488sub emit {
469 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
470 490
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
472} 493}
473 494
474sub DESTROY { 495sub DESTROY {
475 my ($self) = @_; 496 my ($self) = @_;
476 497
… …
743 764
744sub size_request { 765sub size_request {
745 my ($self) = @_; 766 my ($self) = @_;
746 767
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 769
750 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
751} 771}
752 772
753sub size_allocate { 773sub size_allocate {
754 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
755 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
756 $self->update; 779 $self->update;
757} 780}
758 781
759sub set_offset { 782sub set_offset {
760 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
814 837
815 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
816 vertical => 1, 839 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 841 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
820 }, 843 },
821 ; 844 ;
822 845
823 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 847 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 853 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
832 855
833 $self 856 $self
857}
858
859sub size_allocate {
860 my ($self, $w, $h) = @_;
861
862 $self->SUPER::size_allocate ($w, $h);
863
864 my $child = $self->{vp}->child;
865 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 866}
835 867
836#TODO# update range on size_allocate depending on child 868#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 869# update viewport offset on scroll
838 870
… …
892 my $class = shift; 924 my $class = shift;
893 925
894 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
895 927
896 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
899 border => 0.6, 931 border => 0.6,
900 toplevel => 1, 932 is_toplevel => 1,
901 can_events => 1, 933 can_events => 1,
902 @_ 934 @_
903 ); 935 );
904 936
905 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 938 align => 0,
… …
1488 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1489 can_hover => 1, 1521 can_hover => 1,
1490 can_focus => 1, 1522 can_focus => 1,
1491 valign => 0, 1523 valign => 0,
1492 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1493 @_ 1526 @_
1494 ) 1527 )
1495} 1528}
1496 1529
1497sub _set_text { 1530sub _set_text {
… …
1507 $self->{text} = $text; 1540 $self->{text} = $text;
1508 1541
1509 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1511 1544
1512 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1513} 1546}
1514 1547
1515sub set_text { 1548sub set_text {
1516 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1517 1550
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1596 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1597 $self->_emit ('escape');
1565 } elsif ($uni) { 1598 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1600 }
1568 1601
1569 $self->_set_text ($text); 1602 $self->_set_text ($text);
… …
1656 if ($sym == 13) { 1689 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1662 $self->update; 1695 $self->update;
1663 1696
1664 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1714 can_events => 1, 1747 can_events => 1,
1715 @_ 1748 @_
1716 ) 1749 )
1717} 1750}
1718 1751
1752sub activate { }
1753
1719sub button_up { 1754sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1721 1756
1757 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1760}
1727 1761
1728sub _draw { 1762sub _draw {
1729 my ($self) = @_; 1763 my ($self) = @_;
1730 1764
… …
1782 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1783 1817
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1788 } 1822 }
1789} 1823}
1790 1824
1791sub _draw { 1825sub _draw {
1792 my ($self) = @_; 1826 my ($self) = @_;
… …
2067 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2104 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2105 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2075 vertical => 0, 2109 vertical => 0,
2076 can_hover => 1, 2110 can_hover => 1,
2077 inner_pad => 0.02, 2111 inner_pad => 0.02,
… …
2082 $self->update; 2116 $self->update;
2083 2117
2084 $self 2118 $self
2085} 2119}
2086 2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2087sub set_value { 2129sub set_value {
2088 my ($self, $value) = @_; 2130 my ($self, $value) = @_;
2089 2131
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2133
2092 $hi = $lo + 1 if $hi <= $lo; 2134 $hi = $lo + 1 if $hi <= $lo;
2093 2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2094 $value = $lo if $value < $lo; 2138 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2139 $value = $hi - $page if $value > $hi - $page;
2096 2140
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2142 if $unit;
2099 2143
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2145
2104 if ($value != $old_value) { 2146 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2147 $self->_emit (changed => $value);
2106 $self->update; 2148 $self->update;
2107 } 2149 }
2108} 2150}
2109 2151
2110sub size_request { 2152sub size_request {
… …
2118 2160
2119sub button_down { 2161sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2121 2163
2122 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::button_down ($ev, $x, $y);
2165
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167
2123 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2124} 2169}
2125 2170
2126sub mouse_motion { 2171sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2176
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2178
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2180
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2182 }
2138} 2183}
2139 2184
2140sub update { 2185sub update {
2141 my ($self) = @_; 2186 my ($self) = @_;
2142 2187
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2189 $self->set_value ($self->{range}[0]);
2145 2190
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2147 2193
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2195
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2198
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2199 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2200 $value = $value * $self->{scale} + $self->{offset};
2154 2201
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2203 $self->{knob_w} = $knob_w;
2162 }); 2204 });
2163 2205
2164 $self->SUPER::update; 2206 $self->SUPER::update;
2165} 2207}
2166 2208
… …
2190 # draw handle 2232 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2233 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2234
2193 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2194} 2236}
2237
2238#############################################################################
2239
2240package CFClient::UI::ValSlider;
2241
2242our @ISA = CFClient::UI::HBox::;
2243
2244sub new {
2245 my ($class, %arg) = @_;
2246
2247 my $range = delete $arg{range};
2248
2249 my $self = $class->SUPER::new (
2250 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2251 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2252 to_value => sub { shift },
2253 from_value => sub { shift },
2254 %arg,
2255 );
2256
2257 $self->{slider}->connect (changed => sub {
2258 my ($self, $value) = @_;
2259 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2260 $self->{parent}->emit (changed => $value);
2261 });
2262
2263# $self->{entry}->connect (changed => sub {
2264# my ($self, $value) = @_;
2265# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2266# $self->{parent}->emit (changed => $value);
2267# });
2268
2269 $self->add ($self->{slider}, $self->{entry});
2270
2271 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2272
2273 $self
2274}
2275
2276sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) }
2195 2278
2196############################################################################# 2279#############################################################################
2197 2280
2198package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2199 2282
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2325
2243 $self->reflow; 2326 $self->reflow;
2244} 2327}
2245 2328
2246sub text_height { 2329sub text_size {
2247 my ($self, $text, $indent) = @_; 2330 my ($self, $text, $indent) = @_;
2248 2331
2249 my $layout = $self->{layout}; 2332 my $layout = $self->{layout};
2250 2333
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2335 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2336 $layout->set_markup ($text);
2254 2337
2255 ($layout->size)[1] 2338 $layout->size
2256} 2339}
2257 2340
2258sub reflow { 2341sub reflow {
2259 my ($self) = @_; 2342 my ($self) = @_;
2260 2343
2261 $self->{need_reflow}++; 2344 $self->{need_reflow}++;
2262 $self->update; 2345 $self->update;
2263} 2346}
2264 2347
2348sub set_offset {
2349 my ($self, $offset) = @_;
2350
2351 # todo: base offset on lines or so, not on pixels
2352 $self->{children}[1]->set_value ($offset);
2353}
2354
2355sub clear {
2356 my ($self) = @_;
2357
2358 $self->{par} = [];
2359 $self->{height} = 0;
2360 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2361}
2362
2265sub add_paragraph { 2363sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2267 2365
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2366 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2367 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2368 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2370 }
2275 2371
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2372 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2373}
2279 2374
2280sub update { 2375sub update {
2281 my ($self) = @_; 2376 my ($self) = @_;
2282 2377
… …
2285 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2286 2381
2287 delete $self->{texture}; 2382 delete $self->{texture};
2288 2383
2289 $ROOT->on_post_alloc ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2290 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2388 my $height = 0;
2292 2389
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2294 for @{$self->{par}}; 2394 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]);
2397 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h;
2401 }
2402
2403 $height += $_->[1];
2404 }
2295 2405
2296 $self->{height} = $height; 2406 $self->{height} = $height;
2297 2407
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2409
2301 delete $self->{texture}; 2410 delete $self->{texture};
2302 } 2411 }
2303 2412
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2307 2416
2308 my $top = int $self->{children}[1]{range}[0]; 2417 my $top = int $self->{children}[1]{range}[0];
2309 2418
2310 my $y0 = $top; 2419 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2420 my $y1 = $top + $H;
2312 2421
2313 my $y = 0; 2422 my $y = 0;
2314 2423
2315 my $layout = $self->{layout}; 2424 my $layout = $self->{layout};
2316 2425
2317 $layout->set_font ($self->{font}) if $self->{font}; 2426 $layout->set_font ($self->{font}) if $self->{font};
2318 2427
2319 glEnable GL_BLEND; 2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2431
2322 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2433 my $h = $par->[1];
2324 2434
2325 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2436 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2437 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2438 $layout->set_markup ($par->[4]);
2329 2439
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2441
2332 glRasterPos $par->[2], $y - $y0; 2442 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2443 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2444 }
2335 2445
2336 $y += $h; 2446 $y += $h;
2337 } 2447 }
… …
2424 2534
2425 # TODO: use animation 2535 # TODO: use animation
2426 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open"); 2539 $self->_emit ("open");
2430 } else { 2540 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close"); 2542 $self->_emit ("close");
2433 } 2543 }
2434 2544
2435 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2436} 2546}
2437 2547
2438############################################################################# 2548#############################################################################
2439 2549
2440package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2552} 2662}
2553 2663
2554sub _draw { 2664sub _draw {
2555 my ($self) = @_; 2665 my ($self) = @_;
2556 2666
2557 return unless $::CONN;#d# manage and cache textures differently 2667 return unless $::CONN;
2558 2668
2559 my $face; 2669 my $face;
2560 2670
2561 if ($self->{frame}) { 2671 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2672 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2628 2738
2629 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2630 can_hover => 1, 2740 can_hover => 1,
2631 can_events => 1, 2741 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub { 2744 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2636 2746
2637 # todo: maybe put examine on 1? but should just be a tooltip :( 2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) { 2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag}; 2749 my $targ = $::CONN->{player}{tag};
2640 2750
2641 if ($item->{container} == $::CONN->{player}{tag}) { 2751 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT; 2752 $targ = $main::OPENCONT;
2643 } 2753 }
2644 2754
2645 $::CONN->send ("move $targ $item->{tag} 0"); 2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2646 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2649 my @menu_items = ( 2761 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2703 2815
2704sub new { 2816sub new {
2705 my $class = shift; 2817 my $class = shift;
2706 2818
2707 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2709 @_, 2821 @_,
2710 ); 2822 );
2711 2823
2712 $self 2824 $self
2713} 2825}
… …
2724 } @$items; 2836 } @$items;
2725 2837
2726 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2727 2839
2728 for my $item (@items) { 2840 for my $item (@items) {
2841 $item->{item} = $item;
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2730 $item->update_item (); 2843 $item->update_item ();
2731 } 2844 }
2732 2845
2846 my $i = 0;
2847 for (@items) {
2733 $self->{scrolled}->add (@items); 2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2734 2852
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736} 2854}
2737 2855
2738sub size_request { 2856sub size_request {
… …
2780 2898
2781# popup given the event (must be a mouse button down event currently) 2899# popup given the event (must be a mouse button down event currently)
2782sub popup { 2900sub popup {
2783 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2784 2902
2785 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2786 2904
2787 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2906 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2790 2908
… …
2805 2923
2806 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2925 undef $GRAB;
2808 $self->hide; 2926 $self->hide;
2809 2927
2810 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2812 } 2930 }
2813} 2931}
2814 2932
2815############################################################################# 2933#############################################################################
… …
2957} 3075}
2958 3076
2959sub size_allocate { 3077sub size_allocate {
2960 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2961 3079
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 3080 for my $child ($self->children) {
2969 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970 3082
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2972 if exists $child->{req_x}; 3084 if exists $child->{req_x};
… …
3001} 3113}
3002 3114
3003sub add { 3115sub add {
3004 my ($self, @children) = @_; 3116 my ($self, @children) = @_;
3005 3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3006 for my $child (@children) { 3124 for my $child (@children) {
3007 $child->{toplevel} = 1; 3125 $child->{is_toplevel} = 1;
3008 3126
3009 # integerise window positions 3127 # integerise window positions
3010 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
3012 } 3130 }
3013 3131
3014 $self->SUPER::add (@children); 3132 $self->SUPER::add (@children);
3133}
3134
3135sub remove {
3136 my ($self, @children) = @_;
3137
3138 $self->SUPER::remove (@children);
3015 3139
3016 while (@children) { 3140 while (@children) {
3017 my $w = pop @children; 3141 my $w = pop @children;
3018 push @children, $w->children; 3142 push @children, $w->children;
3019 $w->{visible} = 1; 3143 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3144 }
3033} 3145}
3034 3146
3035sub on_refresh { 3147sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
… …
3090 $w = 0 if $w < 0; 3202 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3203 $h = 0 if $h < 0;
3092 3204
3093 $widget->{w} = $w; 3205 $widget->{w} = $w;
3094 $widget->{h} = $h; 3206 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h);
3096 $widget->emit (size_allocate => $w, $h); 3207 $widget->emit (size_allocate => $w, $h);
3097 } 3208 }
3098 } 3209 }
3099 3210
3100 while ($self->{post_alloc_hook}) { 3211 while ($self->{post_alloc_hook}) {

Diff Legend

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