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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 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;
… …
206 %$self = (); 205 %$self = ();
207} 206}
208 207
209sub show { 208sub show {
210 my ($self) = @_; 209 my ($self) = @_;
211
212 return if $self->{parent}; 210 return if $self->{parent};
213 211
214 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
215} 213}
216 214
217sub hide { 215sub show_centered {
218 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};
219 234
220 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
222 248
223 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
224 if $self->{parent}; 250 if $self->{parent};
225} 251}
226 252
… …
326 return if $FOCUS == $self; 352 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
328 354
329 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
330 356
331 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
332 358
333 $focus->update if $focus; 359 $focus->update if $focus;
334 $FOCUS->update; 360 $FOCUS->update;
335} 361}
336 362
… …
339 365
340 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
341 367
342 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
343 369
344 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
345 371
346 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
347} 376}
348 377
349sub mouse_motion { } 378sub mouse_motion { }
350sub button_up { } 379sub button_up { }
351sub key_down { } 380sub key_down { }
352sub key_up { } 381sub key_up { }
353 382
354sub button_down { 383sub button_down {
355 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
356 385
357 $self->focus_in; 386 $self->focus_in;
… …
427 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
428 457
429 # TODO: req_w _does_change after ->reconfigure 458 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 459 $self->check_size
431 unless exists $self->{req_w}; 460 unless exists $self->{req_w};
461
462 $self->show;
432} 463}
433 464
434sub check_size { 465sub check_size {
435 my ($self, $forced) = @_; 466 my ($self, $forced) = @_;
436 467
… …
449 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
450 481
451 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
452} 483}
453 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
454sub emit { 491sub emit {
455 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
456 493
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
458} 496}
459 497
460sub DESTROY { 498sub DESTROY {
461 my ($self) = @_; 499 my ($self) = @_;
462 500
… …
729 767
730sub size_request { 768sub size_request {
731 my ($self) = @_; 769 my ($self) = @_;
732 770
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 772
736 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
737} 774}
738 775
739sub size_allocate { 776sub size_allocate {
740 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
741 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
742 $self->update; 782 $self->update;
743} 783}
744 784
745sub set_offset { 785sub set_offset {
746 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
800 840
801 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
802 vertical => 1, 842 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 844 connect_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
806 }, 846 },
807 ; 847 ;
808 848
809 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 850 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 856 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
818 858
819 $self 859 $self
860}
861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 869}
821 870
822#TODO# update range on size_allocate depending on child 871#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 872# update viewport offset on scroll
824 873
… …
878 my $class = shift; 927 my $class = shift;
879 928
880 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
881 930
882 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
885 border => 0.6, 934 border => 0.6,
886 toplevel => 1, 935 is_toplevel => 1,
887 can_events => 1, 936 can_events => 1,
888 @_ 937 @_
889 ); 938 );
890 939
891 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 941 align => 0,
… …
1474 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1475 can_hover => 1, 1524 can_hover => 1,
1476 can_focus => 1, 1525 can_focus => 1,
1477 valign => 0, 1526 valign => 0,
1478 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1479 @_ 1529 @_
1480 ) 1530 )
1481} 1531}
1482 1532
1483sub _set_text { 1533sub _set_text {
… …
1493 $self->{text} = $text; 1543 $self->{text} = $text;
1494 1544
1495 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1497 1547
1498 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1499} 1549}
1500 1550
1501sub set_text { 1551sub set_text {
1502 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1503 1553
… …
1515 my ($self) = @_; 1565 my ($self) = @_;
1516 1566
1517 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1518 1568
1519 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1570}
1527 1571
1528sub key_down { 1572sub key_down {
1529 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1530 1574
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1593 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1594 $self->_emit ('escape');
1551 } elsif ($uni) { 1595 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1597 }
1554 1598
1555 $self->_set_text ($text); 1599 $self->_set_text ($text);
… …
1642 if ($sym == 13) { 1686 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1648 $self->update; 1692 $self->update;
1649 1693
1650 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1700 can_events => 1, 1744 can_events => 1,
1701 @_ 1745 @_
1702 ) 1746 )
1703} 1747}
1704 1748
1749sub activate { }
1750
1705sub button_up { 1751sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1707 1753
1754 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1757}
1713 1758
1714sub _draw { 1759sub _draw {
1715 my ($self) = @_; 1760 my ($self) = @_;
1716 1761
… …
1768 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1769 1814
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1774 } 1819 }
1775} 1820}
1776 1821
1777sub _draw { 1822sub _draw {
1778 my ($self) = @_; 1823 my ($self) = @_;
… …
2053 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2102 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2061 vertical => 0, 2106 vertical => 0,
2062 can_hover => 1, 2107 can_hover => 1,
2063 inner_pad => 0.02, 2108 inner_pad => 0.02,
… …
2068 $self->update; 2113 $self->update;
2069 2114
2070 $self 2115 $self
2071} 2116}
2072 2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2073sub set_value { 2126sub set_value {
2074 my ($self, $value) = @_; 2127 my ($self, $value) = @_;
2075 2128
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2130
2078 $hi = $lo + 1 if $hi <= $lo; 2131 $hi = $lo + 1 if $hi <= $lo;
2079 2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2080 $value = $lo if $value < $lo; 2135 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2136 $value = $hi - $page if $value > $hi - $page;
2082 2137
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2139 if $unit;
2085 2140
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2142
2090 if ($value != $old_value) { 2143 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2144 $self->_emit (changed => $value);
2092 $self->update; 2145 $self->update;
2093 } 2146 }
2094} 2147}
2095 2148
2096sub size_request { 2149sub size_request {
… …
2104 2157
2105sub button_down { 2158sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2107 2160
2108 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2109 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2110} 2166}
2111 2167
2112sub mouse_motion { 2168sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2173
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2175
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2177
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2179 }
2124} 2180}
2125 2181
2126sub update { 2182sub update {
2127 my ($self) = @_; 2183 my ($self) = @_;
2128 2184
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2131 2187
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2133 2190
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2192
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2195
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2196 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2197 $value = $value * $self->{scale} + $self->{offset};
2140 2198
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2200 $self->{knob_w} = $knob_w;
2148 }); 2201 });
2149 2202
2150 $self->SUPER::update; 2203 $self->SUPER::update;
2151} 2204}
2152 2205
… …
2176 # draw handle 2229 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2231
2179 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2180} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2181 2275
2182############################################################################# 2276#############################################################################
2183 2277
2184package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2185 2279
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2322
2229 $self->reflow; 2323 $self->reflow;
2230} 2324}
2231 2325
2232sub text_height { 2326sub text_size {
2233 my ($self, $text, $indent) = @_; 2327 my ($self, $text, $indent) = @_;
2234 2328
2235 my $layout = $self->{layout}; 2329 my $layout = $self->{layout};
2236 2330
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2333 $layout->set_markup ($text);
2240 2334
2241 ($layout->size)[1] 2335 $layout->size
2242} 2336}
2243 2337
2244sub reflow { 2338sub reflow {
2245 my ($self) = @_; 2339 my ($self) = @_;
2246 2340
2247 $self->{need_reflow}++; 2341 $self->{need_reflow}++;
2248 $self->update; 2342 $self->update;
2249} 2343}
2250 2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2251sub add_paragraph { 2360sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2253 2362
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2363 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2364 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2365 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2367 }
2261 2368
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2370}
2265 2371
2266sub update { 2372sub update {
2267 my ($self) = @_; 2373 my ($self) = @_;
2268 2374
… …
2271 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2272 2378
2273 delete $self->{texture}; 2379 delete $self->{texture};
2274 2380
2275 $ROOT->on_post_alloc ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2276 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2385 my $height = 0;
2278 2386
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2280 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2281 2402
2282 $self->{height} = $height; 2403 $self->{height} = $height;
2283 2404
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2406
2287 delete $self->{texture}; 2407 delete $self->{texture};
2288 } 2408 }
2289 2409
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2293 2413
2294 my $top = int $self->{children}[1]{range}[0]; 2414 my $top = int $self->{children}[1]{range}[0];
2295 2415
2296 my $y0 = $top; 2416 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2298 2418
2299 my $y = 0; 2419 my $y = 0;
2300 2420
2301 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2302 2422
2303 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2304 2424
2305 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2428
2308 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2430 my $h = $par->[1];
2310 2431
2311 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2434 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2435 $layout->set_markup ($par->[4]);
2315 2436
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2438
2318 glRasterPos $par->[2], $y - $y0; 2439 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2441 }
2321 2442
2322 $y += $h; 2443 $y += $h;
2323 } 2444 }
… …
2410 2531
2411 # TODO: use animation 2532 # TODO: use animation
2412 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open"); 2536 $self->_emit ("open");
2416 } else { 2537 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close"); 2539 $self->_emit ("close");
2419 } 2540 }
2420 2541
2421 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2422} 2543}
2423 2544
2424############################################################################# 2545#############################################################################
2425 2546
2426package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2527 2648
2528sub size_request { 2649sub size_request {
2529 (32, 8) 2650 (32, 8)
2530} 2651}
2531 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2532sub _draw { 2661sub _draw {
2533 my ($self) = @_; 2662 my ($self) = @_;
2534 2663
2535 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2536 2665
2537 my $face; 2666 my $face;
2538 2667
2539 if ($self->{frame}) { 2668 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2669 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2606 2735
2607 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2608 can_hover => 1, 2737 can_hover => 1,
2609 can_events => 1, 2738 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub { 2741 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2614 2743
2615 # todo: maybe put examine on 1? but should just be a tooltip :( 2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) { 2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag}; 2746 my $targ = $::CONN->{player}{tag};
2618 2747
2619 if ($item->{container} == $::CONN->{player}{tag}) { 2748 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT; 2749 $targ = $main::OPENCONT;
2621 } 2750 }
2622 2751
2623 $::CONN->send ("move $targ $item->{tag} 0"); 2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2624 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2627 my @menu_items = ( 2758 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2681 2812
2682sub new { 2813sub new {
2683 my $class = shift; 2814 my $class = shift;
2684 2815
2685 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2687 @_, 2818 @_,
2688 ); 2819 );
2689 2820
2690 $self 2821 $self
2691} 2822}
… …
2702 } @$items; 2833 } @$items;
2703 2834
2704 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2705 2836
2706 for my $item (@items) { 2837 for my $item (@items) {
2838 $item->{item} = $item;
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item (); 2840 $item->update_item ();
2709 } 2841 }
2710 2842
2843 my $i = 0;
2844 for (@items) {
2711 $self->{scrolled}->add (@items); 2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2712 2849
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714} 2851}
2715 2852
2716sub size_request { 2853sub size_request {
… …
2758 2895
2759# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2760sub popup { 2897sub popup {
2761 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2762 2899
2763 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2764 2901
2765 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2903 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2768 2905
… …
2783 2920
2784 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2922 undef $GRAB;
2786 $self->hide; 2923 $self->hide;
2787 2924
2788 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2790 } 2927 }
2791} 2928}
2792 2929
2793############################################################################# 2930#############################################################################
… …
2935} 3072}
2936 3073
2937sub size_allocate { 3074sub size_allocate {
2938 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
2939 3076
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3077 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3079
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2950 if exists $child->{req_x}; 3081 if exists $child->{req_x};
… …
2979} 3110}
2980 3111
2981sub add { 3112sub add {
2982 my ($self, @children) = @_; 3113 my ($self, @children) = @_;
2983 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
2984 for my $child (@children) { 3121 for my $child (@children) {
2985 $child->{toplevel} = 1; 3122 $child->{is_toplevel} = 1;
2986 3123
2987 # integerise window positions 3124 # integerise window positions
2988 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
2990 } 3127 }
2991 3128
2992 $self->SUPER::add (@children); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2993} 3142}
2994 3143
2995sub on_refresh { 3144sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2997 3146
… …
3050 $w = 0 if $w < 0; 3199 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3200 $h = 0 if $h < 0;
3052 3201
3053 $widget->{w} = $w; 3202 $widget->{w} = $w;
3054 $widget->{h} = $h; 3203 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h); 3204 $widget->emit (size_allocate => $w, $h);
3057 } 3205 }
3058 } 3206 }
3059 3207
3060 while ($self->{post_alloc_hook}) { 3208 while ($self->{post_alloc_hook}) {

Diff Legend

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