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.213 by root, Wed May 17 15:18:57 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
… …
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
694 737
695 $self->_render; 738 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 739 };
704} 740}
705 741
706sub _draw { 742sub _draw {
707 my ($self) = @_; 743 my ($self) = @_;
… …
711 my $tex = $self->{texture} 747 my $tex = $self->{texture}
712 or return; 748 or return;
713 749
714 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
717 753
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 755
720 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
721} 757}
… …
728 764
729sub size_request { 765sub size_request {
730 my ($self) = @_; 766 my ($self) = @_;
731 767
732 @$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)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 769
735 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
736} 771}
737 772
738sub size_allocate { 773sub size_allocate {
739 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
740 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
741 $self->update; 779 $self->update;
742} 780}
743 781
744sub set_offset { 782sub set_offset {
745 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
799 837
800 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
801 vertical => 1, 839 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 841 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
805 }, 843 },
806 ; 844 ;
807 845
808 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 847 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 848 slider => $slider,
811 @_, 849 @_,
812 ); 850 );
813 851
814 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 853 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
817 855
818 $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]);
819} 866}
820 867
821#TODO# update range on size_allocate depending on child 868#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 869# update viewport offset on scroll
823 870
… …
877 my $class = shift; 924 my $class = shift;
878 925
879 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
880 927
881 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
884 border => 0.6, 931 border => 0.6,
885 toplevel => 1, 932 is_toplevel => 1,
886 can_events => 1, 933 can_events => 1,
887 @_ 934 @_
888 ); 935 );
889 936
890 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 938 align => 0,
… …
1473 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1474 can_hover => 1, 1521 can_hover => 1,
1475 can_focus => 1, 1522 can_focus => 1,
1476 valign => 0, 1523 valign => 0,
1477 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1478 @_ 1526 @_
1479 ) 1527 )
1480} 1528}
1481 1529
1482sub _set_text { 1530sub _set_text {
… …
1492 $self->{text} = $text; 1540 $self->{text} = $text;
1493 1541
1494 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1496 1544
1497 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1498} 1546}
1499 1547
1500sub set_text { 1548sub set_text {
1501 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1502 1550
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1596 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1597 $self->_emit ('escape');
1550 } elsif ($uni) { 1598 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1600 }
1553 1601
1554 $self->_set_text ($text); 1602 $self->_set_text ($text);
… …
1641 if ($sym == 13) { 1689 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1647 $self->update; 1695 $self->update;
1648 1696
1649 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1699 can_events => 1, 1747 can_events => 1,
1700 @_ 1748 @_
1701 ) 1749 )
1702} 1750}
1703 1751
1752sub activate { }
1753
1704sub button_up { 1754sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1706 1756
1757 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1760}
1712 1761
1713sub _draw { 1762sub _draw {
1714 my ($self) = @_; 1763 my ($self) = @_;
1715 1764
… …
1767 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1768 1817
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1773 } 1822 }
1774} 1823}
1775 1824
1776sub _draw { 1825sub _draw {
1777 my ($self) = @_; 1826 my ($self) = @_;
… …
2052 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2104 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2105 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2060 vertical => 0, 2109 vertical => 0,
2061 can_hover => 1, 2110 can_hover => 1,
2062 inner_pad => .05, 2111 inner_pad => 0.02,
2063 @_ 2112 @_
2064 ); 2113 );
2065 2114
2066 $self->set_value ($self->{range}[0]); 2115 $self->set_value ($self->{range}[0]);
2067 $self->update; 2116 $self->update;
2068 2117
2069 $self 2118 $self
2070} 2119}
2071 2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2072sub set_value { 2129sub set_value {
2073 my ($self, $value) = @_; 2130 my ($self, $value) = @_;
2074 2131
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2133
2077 $hi = $lo + 1 if $hi <= $lo; 2134 $hi = $lo + 1 if $hi <= $lo;
2078 2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2079 $value = $lo if $value < $lo; 2138 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2139 $value = $hi - $page if $value > $hi - $page;
2081 2140
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2142 if $unit;
2084 2143
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2145
2089 if ($value != $old_value) { 2146 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2147 $self->_emit (changed => $value);
2091 $self->update; 2148 $self->update;
2092 } 2149 }
2093} 2150}
2094 2151
2095sub size_request { 2152sub size_request {
… …
2103 2160
2104sub button_down { 2161sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2106 2163
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2109} 2169}
2110 2170
2111sub mouse_motion { 2171sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2176
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2178
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2180
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2182 }
2123} 2183}
2124 2184
2125sub update { 2185sub update {
2126 my ($self) = @_; 2186 my ($self) = @_;
2127 2187
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2189 $self->set_value ($self->{range}[0]);
2130 2190
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2132 2193
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2195
2135 $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;
2136 2198
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2199 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2200 $value = $value * $self->{scale} + $self->{offset};
2139 2201
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2203 $self->{knob_w} = $knob_w;
2147 }); 2204 });
2148 2205
2149 $self->SUPER::update; 2206 $self->SUPER::update;
2150} 2207}
2151 2208
… …
2157 glScale $self->{w}, $self->{h}; 2214 glScale $self->{w}, $self->{h};
2158 2215
2159 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2160 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2161 2218
2219 glTranslate 1, 0, 0;
2162 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2163 glTranslate 0, 1, 0;
2164 } 2221 }
2165 2222
2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168 2225
… …
2175 # draw handle 2232 # draw handle
2176 $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);
2177 2234
2178 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2278
2181############################################################################# 2279#############################################################################
2182 2280
2183package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2184 2282
… …
2214 2312
2215 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2314 $self->reflow;
2217} 2315}
2218 2316
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2317sub size_allocate {
2239 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2240 2319
2241 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2242 2321
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2325
2247 $self->reflow; 2326 $self->reflow;
2248} 2327}
2249 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
2250sub add_paragraph { 2363sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2252 2365
2253 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2254 2367 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2258 2371
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2373}
2264 2374
2265sub update { 2375sub update {
2266 my ($self) = @_; 2376 my ($self) = @_;
2267 2377
… …
2270 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2271 2381
2272 delete $self->{texture}; 2382 delete $self->{texture};
2273 2383
2274 $ROOT->on_post_alloc ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2275 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2388 my $height = 0;
2277 2389
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2279 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 }
2280 2405
2281 $self->{height} = $height; 2406 $self->{height} = $height;
2282 2407
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2409
2285 delete $self->{texture}; 2410 delete $self->{texture};
2286 } 2411 }
2287 2412
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2291 2416
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2417 my $top = int $self->{children}[1]{range}[0];
2296 2418
2297 my $y0 = $top; 2419 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2420 my $y1 = $top + $H;
2299 2421
2300 my $y = 0; 2422 my $y = 0;
2301 2423
2302 my $layout = $self->{layout}; 2424 my $layout = $self->{layout};
2303 2425
2304 $layout->set_font ($self->{font}) if $self->{font}; 2426 $layout->set_font ($self->{font}) if $self->{font};
2305 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
2306 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2433 my $h = $par->[1];
2308 2434
2309 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2436 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2312 2439
2313 my ($W, $H) = $layout->size; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 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;
2315 } 2444 }
2316 2445
2317 $y += $h; 2446 $y += $h;
2318 } 2447 }
2319 2448
2320 glDisable GL_TEXTURE_2D; 2449 glDisable GL_BLEND;
2321 }; 2450 };
2322 }); 2451 });
2323} 2452}
2324 2453
2325sub _draw { 2454sub _draw {
2326 my ($self) = @_; 2455 my ($self) = @_;
2327 2456
2328 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2333 2462
2334 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2335 2464
2336} 2465}
… …
2405 2534
2406 # TODO: use animation 2535 # TODO: use animation
2407 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open"); 2539 $self->_emit ("open");
2411 } else { 2540 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close"); 2542 $self->_emit ("close");
2414 } 2543 }
2415 2544
2416 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2417} 2546}
2418 2547
2419############################################################################# 2548#############################################################################
2420 2549
2421package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2496use CFClient::OpenGL; 2625use CFClient::OpenGL;
2497 2626
2498sub new { 2627sub new {
2499 my $class = shift; 2628 my $class = shift;
2500 2629
2501 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2502 aspect => 1, 2631 aspect => 1,
2503 @_, 2632 @_,
2504 ) 2633 );
2634
2635 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self);
2637
2638 $self->{timer} = Event->timer (
2639 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2640 hard => 1,
2641 interval => $self->{animspeed},
2642 cb => sub {
2643 ++$widget->{frame};
2644 $widget->update;
2645 },
2646 );
2647 }
2648
2649 $self
2505} 2650}
2506 2651
2507sub size_request { 2652sub size_request {
2508 (32, 8) 2653 (32, 8)
2509} 2654}
2510 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2511sub _draw { 2664sub _draw {
2512 my ($self) = @_; 2665 my ($self) = @_;
2513 2666
2514 return unless $::CONN;#d# manage and cache textures differently 2667 return unless $::CONN;
2668
2669 my $face;
2670
2671 if ($self->{frame}) {
2672 my $anim = $::CONN->{anim}[$self->{anim}];
2673
2674 $face = $anim->[ $self->{frame} % @$anim ]
2675 if $anim && @$anim;
2676 }
2677
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2679
2517 # TODO animation
2518 if ($tex) { 2680 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2524 } 2686 }
2525} 2687}
2526 2688
2689sub DESTROY {
2690 my ($self) = @_;
2691
2692 $self->{timer}->cancel
2693 if $self->{timer};
2694
2695 $self->SUPER::DESTROY;
2696}
2697
2527############################################################################# 2698#############################################################################
2528 2699
2529package CFClient::UI::InventoryItem; 2700package CFClient::UI::InventoryItem;
2530 2701
2531our @ISA = CFClient::UI::HBox::; 2702our @ISA = CFClient::UI::HBox::;
… …
2534 my ($item) = @_; 2705 my ($item) = @_;
2535 2706
2536 my $desc = 2707 my $desc =
2537 $item->{nrof} < 2 2708 $item->{nrof} < 2
2538 ? $item->{name} 2709 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}"; 2710 : "$item->{nrof} × $item->{name_pl}";
2540 2711
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)"; 2713 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED 2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)"; 2715 and $desc .= " (applied)";
… …
2564 my $item = delete $args{item}; 2735 my $item = delete $args{item};
2565 2736
2566 my $desc = _item_to_desc ($item); 2737 my $desc = _item_to_desc ($item);
2567 2738
2568 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2569 can_hover => 1, 2740 can_hover => 1,
2570 can_events => 1, 2741 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\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>"),
2573 connect_button_down => sub { 2744 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2575 2746
2576 # 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 :(
2577 if ($ev->{button} == 1) { 2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag}; 2749 my $targ = $::CONN->{player}{tag};
2579 2750
2580 if ($item->{container} == $::CONN->{player}{tag}) { 2751 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT; 2752 $targ = $main::OPENCONT;
2582 } 2753 }
2583 2754
2584 $::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}");
2585 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2588 my @menu_items = ( 2761 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [ 2773 )
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ], 2774 ),
2597 ); 2775 );
2598 2776
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 } 2778 }
2601 2779
… …
2637 2815
2638sub new { 2816sub new {
2639 my $class = shift; 2817 my $class = shift;
2640 2818
2641 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2643 @_, 2821 @_,
2644 ); 2822 );
2645 2823
2646 $self 2824 $self
2647} 2825}
… …
2658 } @$items; 2836 } @$items;
2659 2837
2660 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2661 2839
2662 for my $item (@items) { 2840 for my $item (@items) {
2841 $item->{item} = $item;
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item (); 2843 $item->update_item ();
2665 } 2844 }
2666 2845
2846 my $i = 0;
2847 for (@items) {
2667 $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 }
2668 2852
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670} 2854}
2671 2855
2672sub size_request { 2856sub size_request {
… …
2714 2898
2715# 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)
2716sub popup { 2900sub popup {
2717 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2718 2902
2719 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2720 2904
2721 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2906 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2724 2908
… …
2739 2923
2740 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2925 undef $GRAB;
2742 $self->hide; 2926 $self->hide;
2743 2927
2744 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2746 } 2930 }
2747} 2931}
2748 2932
2749############################################################################# 2933#############################################################################
… …
2891} 3075}
2892 3076
2893sub size_allocate { 3077sub size_allocate {
2894 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2895 3079
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3080 for my $child ($self->children) {
2903 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)};
2904 3082
2905 $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
2906 if exists $child->{req_x}; 3084 if exists $child->{req_x};
… …
2935} 3113}
2936 3114
2937sub add { 3115sub add {
2938 my ($self, @children) = @_; 3116 my ($self, @children) = @_;
2939 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
2940 for my $child (@children) { 3124 for my $child (@children) {
2941 $child->{toplevel} = 1; 3125 $child->{is_toplevel} = 1;
2942 3126
2943 # integerise window positions 3127 # integerise window positions
2944 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
2946 } 3130 }
2947 3131
2948 $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 }
2949} 3145}
2950 3146
2951sub on_refresh { 3147sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2953 3149
… …
3006 $w = 0 if $w < 0; 3202 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3203 $h = 0 if $h < 0;
3008 3204
3009 $widget->{w} = $w; 3205 $widget->{w} = $w;
3010 $widget->{h} = $h; 3206 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h); 3207 $widget->emit (size_allocate => $w, $h);
3013 } 3208 }
3014 } 3209 }
3015 3210
3016 while ($self->{post_alloc_hook}) { 3211 while ($self->{post_alloc_hook}) {
… …
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
3024 3219
3025 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3221 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3224 glLoadIdentity;
3030 3225
3031 $self->_draw; 3226 $self->_draw;
3032} 3227}

Diff Legend

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