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.219 by root, Sun May 21 00:34:59 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) = @_;
… …
136 $rem += $_ - $i; 130 $rem += $_ - $i;
137 $_ = $i; 131 $_ = $i;
138 } 132 }
139} 133}
140 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
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
141# call when resolution changes etc. 151# call when resolution changes etc.
142sub rescale_widgets { 152sub rescale_widgets {
143 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
144 154
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
150 $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};
151 $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};
152 $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};
153 $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};
154 $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};
155 $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};
156 $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};
157 $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};
158 } 165 }
159
160 $widget->reconfigure;
161 } 166 }
167
168 reconfigure_widgets;
162} 169}
163 170
164############################################################################# 171#############################################################################
165 172
166package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
198 %$self = (); 205 %$self = ();
199} 206}
200 207
201sub show { 208sub show {
202 my ($self) = @_; 209 my ($self) = @_;
203
204 return if $self->{parent}; 210 return if $self->{parent};
205 211
206 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
207} 213}
208 214
209sub hide { 215sub show_centered {
210 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
211 234
212 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
213 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;
214 245
215 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
216 if $self->{parent}; 247 if $self->{parent};
217} 248}
218 249
… …
318 return if $FOCUS == $self; 349 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
320 351
321 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
322 353
323 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
324 355
325 $focus->update if $focus; 356 $focus->update if $focus;
326 $FOCUS->update; 357 $FOCUS->update;
327} 358}
328 359
… …
331 362
332 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
333 364
334 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
335 366
336 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
337 368
338 $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;
339} 373}
340 374
341sub mouse_motion { } 375sub mouse_motion { }
342sub button_up { } 376sub button_up { }
343sub key_down { } 377sub key_down { }
344sub key_up { } 378sub key_up { }
345 379
346sub button_down { 380sub button_down {
347 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
348 382
349 $self->focus_in; 383 $self->focus_in;
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 453 Scalar::Util::weaken ($self->{parent} = $parent);
420 454
421 # TODO: req_w _does_change after ->reconfigure 455 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 456 $self->check_size
423 unless exists $self->{req_w}; 457 unless exists $self->{req_w};
458
459 $self->show;
424} 460}
425 461
426sub check_size { 462sub check_size {
427 my ($self, $forced) = @_; 463 my ($self, $forced) = @_;
428 464
… …
441 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
442 478
443 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 480}
445 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
446sub emit { 488sub emit {
447 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
448 490
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
450} 493}
451 494
452sub DESTROY { 495sub DESTROY {
453 my ($self) = @_; 496 my ($self) = @_;
454 497
… …
721 764
722sub size_request { 765sub size_request {
723 my ($self) = @_; 766 my ($self) = @_;
724 767
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 769
728 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
729} 771}
730 772
731sub size_allocate { 773sub size_allocate {
732 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
733 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 779 $self->update;
735} 780}
736 781
737sub set_offset { 782sub set_offset {
738 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
792 837
793 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
794 vertical => 1, 839 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 841 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
798 }, 843 },
799 ; 844 ;
800 845
801 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 847 vp => (new CFClient::UI::ViewPort expand => 1),
… …
807 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 853 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
810 855
811 $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]);
812} 866}
813 867
814#TODO# update range on size_allocate depending on child 868#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 869# update viewport offset on scroll
816 870
… …
870 my $class = shift; 924 my $class = shift;
871 925
872 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
873 927
874 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
877 border => 0.6, 931 border => 0.6,
878 toplevel => 1, 932 is_toplevel => 1,
879 can_events => 1, 933 can_events => 1,
880 @_ 934 @_
881 ); 935 );
882 936
883 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 938 align => 0,
… …
1466 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1467 can_hover => 1, 1521 can_hover => 1,
1468 can_focus => 1, 1522 can_focus => 1,
1469 valign => 0, 1523 valign => 0,
1470 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1471 @_ 1526 @_
1472 ) 1527 )
1473} 1528}
1474 1529
1475sub _set_text { 1530sub _set_text {
… …
1485 $self->{text} = $text; 1540 $self->{text} = $text;
1486 1541
1487 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1489 1544
1490 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1491} 1546}
1492 1547
1493sub set_text { 1548sub set_text {
1494 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1495 1550
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1596 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1597 $self->_emit ('escape');
1543 } elsif ($uni) { 1598 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1600 }
1546 1601
1547 $self->_set_text ($text); 1602 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1689 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1640 $self->update; 1695 $self->update;
1641 1696
1642 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1747 can_events => 1,
1693 @_ 1748 @_
1694 ) 1749 )
1695} 1750}
1696 1751
1752sub activate { }
1753
1697sub button_up { 1754sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1699 1756
1757 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1760}
1705 1761
1706sub _draw { 1762sub _draw {
1707 my ($self) = @_; 1763 my ($self) = @_;
1708 1764
… …
1760 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1761 1817
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1766 } 1822 }
1767} 1823}
1768 1824
1769sub _draw { 1825sub _draw {
1770 my ($self) = @_; 1826 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2104 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2105 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2053 vertical => 0, 2109 vertical => 0,
2054 can_hover => 1, 2110 can_hover => 1,
2055 inner_pad => 0.02, 2111 inner_pad => 0.02,
… …
2060 $self->update; 2116 $self->update;
2061 2117
2062 $self 2118 $self
2063} 2119}
2064 2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2065sub set_value { 2129sub set_value {
2066 my ($self, $value) = @_; 2130 my ($self, $value) = @_;
2067 2131
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2133
2070 $hi = $lo + 1 if $hi <= $lo; 2134 $hi = $lo + 1 if $hi <= $lo;
2071 2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2072 $value = $lo if $value < $lo; 2138 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2139 $value = $hi - $page if $value > $hi - $page;
2074 2140
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2142 if $unit;
2077 2143
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2145
2082 if ($value != $old_value) { 2146 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2147 $self->_emit (changed => $value);
2084 $self->update; 2148 $self->update;
2085 } 2149 }
2086} 2150}
2087 2151
2088sub size_request { 2152sub size_request {
… …
2096 2160
2097sub button_down { 2161sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2099 2163
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2102} 2169}
2103 2170
2104sub mouse_motion { 2171sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2176
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2178
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2180
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2182 }
2116} 2183}
2117 2184
2118sub update { 2185sub update {
2119 my ($self) = @_; 2186 my ($self) = @_;
2120 2187
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2189 $self->set_value ($self->{range}[0]);
2123 2190
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2125 2193
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2195
2128 $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;
2129 2198
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2199 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2200 $value = $value * $self->{scale} + $self->{offset};
2132 2201
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2203 $self->{knob_w} = $knob_w;
2140 }); 2204 });
2141 2205
2142 $self->SUPER::update; 2206 $self->SUPER::update;
2143} 2207}
2144 2208
… …
2168 # draw handle 2232 # draw handle
2169 $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);
2170 2234
2171 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2278
2174############################################################################# 2279#############################################################################
2175 2280
2176package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2177 2282
… …
2207 2312
2208 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2314 $self->reflow;
2210} 2315}
2211 2316
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2317sub size_allocate {
2232 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2233 2319
2234 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2235 2321
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2325
2240 $self->reflow; 2326 $self->reflow;
2241} 2327}
2242 2328
2329sub text_size {
2330 my ($self, $text, $indent) = @_;
2331
2332 my $layout = $self->{layout};
2333
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent);
2336 $layout->set_markup ($text);
2337
2338 $layout->size
2339}
2340
2341sub reflow {
2342 my ($self) = @_;
2343
2344 $self->{need_reflow}++;
2345 $self->update;
2346}
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
2243sub add_paragraph { 2363sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2245 2365
2246 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2247 2367 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2251 2371
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2373}
2257 2374
2258sub update { 2375sub update {
2259 my ($self) = @_; 2376 my ($self) = @_;
2260 2377
… …
2263 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2264 2381
2265 delete $self->{texture}; 2382 delete $self->{texture};
2266 2383
2267 $ROOT->on_post_alloc ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2268 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2388 my $height = 0;
2270 2389
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2272 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 }
2273 2405
2274 $self->{height} = $height; 2406 $self->{height} = $height;
2275 2407
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2409
2278 delete $self->{texture}; 2410 delete $self->{texture};
2279 } 2411 }
2280 2412
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2284 2416
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2417 my $top = int $self->{children}[1]{range}[0];
2289 2418
2290 my $y0 = $top; 2419 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2420 my $y1 = $top + $H;
2292 2421
2293 my $y = 0; 2422 my $y = 0;
2294 2423
2295 my $layout = $self->{layout}; 2424 my $layout = $self->{layout};
2296 2425
2297 $layout->set_font ($self->{font}) if $self->{font}; 2426 $layout->set_font ($self->{font}) if $self->{font};
2298 2427
2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2431
2299 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2433 my $h = $par->[1];
2301 2434
2302 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2436 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2305 2439
2306 my ($W, $H) = $layout->size; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2441
2442 glRasterPos $par->[3], $y - $y0;
2443 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2444 }
2309 2445
2310 $y += $h; 2446 $y += $h;
2311 } 2447 }
2312 2448
2313 glDisable GL_TEXTURE_2D; 2449 glDisable GL_BLEND;
2314 }; 2450 };
2315 }); 2451 });
2316} 2452}
2317 2453
2318sub _draw { 2454sub _draw {
… …
2398 2534
2399 # TODO: use animation 2535 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2539 $self->_emit ("open");
2404 } else { 2540 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2542 $self->_emit ("close");
2407 } 2543 }
2408 2544
2409 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2410} 2546}
2411 2547
2412############################################################################# 2548#############################################################################
2413 2549
2414package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2515 2651
2516sub size_request { 2652sub size_request {
2517 (32, 8) 2653 (32, 8)
2518} 2654}
2519 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2520sub _draw { 2664sub _draw {
2521 my ($self) = @_; 2665 my ($self) = @_;
2522 2666
2523 return unless $::CONN;#d# manage and cache textures differently 2667 return unless $::CONN;
2524 2668
2525 my $face; 2669 my $face;
2526 2670
2527 if ($self->{frame}) { 2671 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2672 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2594 2738
2595 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2596 can_hover => 1, 2740 can_hover => 1,
2597 can_events => 1, 2741 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\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>"),
2600 connect_button_down => sub { 2744 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2602 2746
2603 # 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 :(
2604 if ($ev->{button} == 1) { 2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag}; 2749 my $targ = $::CONN->{player}{tag};
2606 2750
2607 if ($item->{container} == $::CONN->{player}{tag}) { 2751 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT; 2752 $targ = $main::OPENCONT;
2609 } 2753 }
2610 2754
2611 $::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}");
2612 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2615 my @menu_items = ( 2761 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2669 2815
2670sub new { 2816sub new {
2671 my $class = shift; 2817 my $class = shift;
2672 2818
2673 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2675 @_, 2821 @_,
2676 ); 2822 );
2677 2823
2678 $self 2824 $self
2679} 2825}
… …
2690 } @$items; 2836 } @$items;
2691 2837
2692 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2693 2839
2694 for my $item (@items) { 2840 for my $item (@items) {
2841 $item->{item} = $item;
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item (); 2843 $item->update_item ();
2697 } 2844 }
2698 2845
2846 my $i = 0;
2847 for (@items) {
2699 $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 }
2700 2852
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702} 2854}
2703 2855
2704sub size_request { 2856sub size_request {
… …
2746 2898
2747# 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)
2748sub popup { 2900sub popup {
2749 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2750 2902
2751 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2752 2904
2753 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2754 $GRAB = $self; 2906 $GRAB = $self;
2755 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2756 2908
… …
2771 2923
2772 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2773 undef $GRAB; 2925 undef $GRAB;
2774 $self->hide; 2926 $self->hide;
2775 2927
2776 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2777 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2778 } 2930 }
2779} 2931}
2780 2932
2781############################################################################# 2933#############################################################################
… …
2923} 3075}
2924 3076
2925sub size_allocate { 3077sub size_allocate {
2926 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2927 3079
2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2930
2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2933
2934 for my $child ($self->children) { 3080 for my $child ($self->children) {
2935 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)};
2936 3082
2937 $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
2938 if exists $child->{req_x}; 3084 if exists $child->{req_x};
… …
2967} 3113}
2968 3114
2969sub add { 3115sub add {
2970 my ($self, @children) = @_; 3116 my ($self, @children) = @_;
2971 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
2972 for my $child (@children) { 3124 for my $child (@children) {
2973 $child->{toplevel} = 1; 3125 $child->{is_toplevel} = 1;
2974 3126
2975 # integerise window positions 3127 # integerise window positions
2976 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
2978 } 3130 }
2979 3131
2980 $self->SUPER::add (@children); 3132 $self->SUPER::add (@children);
3133}
3134
3135sub remove {
3136 my ($self, @children) = @_;
3137
3138 $self->SUPER::remove (@children);
3139
3140 while (@children) {
3141 my $w = pop @children;
3142 push @children, $w->children;
3143 $w->set_invisible;
3144 }
2981} 3145}
2982 3146
2983sub on_refresh { 3147sub on_refresh {
2984 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2985 3149
… …
3038 $w = 0 if $w < 0; 3202 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0; 3203 $h = 0 if $h < 0;
3040 3204
3041 $widget->{w} = $w; 3205 $widget->{w} = $w;
3042 $widget->{h} = $h; 3206 $widget->{h} = $h;
3043 $widget->size_allocate ($w, $h);
3044 $widget->emit (size_allocate => $w, $h); 3207 $widget->emit (size_allocate => $w, $h);
3045 } 3208 }
3046 } 3209 }
3047 3210
3048 while ($self->{post_alloc_hook}) { 3211 while ($self->{post_alloc_hook}) {

Diff Legend

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