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.214 by root, Wed May 17 22:59:13 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) = @_;
… …
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 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;
214 248
215 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
216 if $self->{parent}; 250 if $self->{parent};
217} 251}
218 252
… …
318 return if $FOCUS == $self; 352 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
320 354
321 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
322 356
323 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
324 358
325 $focus->update if $focus; 359 $focus->update if $focus;
326 $FOCUS->update; 360 $FOCUS->update;
327} 361}
328 362
… …
331 365
332 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
333 367
334 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
335 369
336 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
337 371
338 $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;
339} 376}
340 377
341sub mouse_motion { } 378sub mouse_motion { }
342sub button_up { } 379sub button_up { }
343sub key_down { } 380sub key_down { }
344sub key_up { } 381sub key_up { }
345 382
346sub button_down { 383sub button_down {
347 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
348 385
349 $self->focus_in; 386 $self->focus_in;
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
420 457
421 # TODO: req_w _does_change after ->reconfigure 458 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 459 $self->check_size
423 unless exists $self->{req_w}; 460 unless exists $self->{req_w};
461
462 $self->show;
424} 463}
425 464
426sub check_size { 465sub check_size {
427 my ($self, $forced) = @_; 466 my ($self, $forced) = @_;
428 467
… …
441 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
442 481
443 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 483}
445 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
446sub emit { 491sub emit {
447 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
448 493
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
450} 496}
451 497
452sub DESTROY { 498sub DESTROY {
453 my ($self) = @_; 499 my ($self) = @_;
454 500
… …
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
694 740
695 $self->_render; 741 $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 }; 742 };
704} 743}
705 744
706sub _draw { 745sub _draw {
707 my ($self) = @_; 746 my ($self) = @_;
… …
711 my $tex = $self->{texture} 750 my $tex = $self->{texture}
712 or return; 751 or return;
713 752
714 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
717 756
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 758
720 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
721} 760}
… …
728 767
729sub size_request { 768sub size_request {
730 my ($self) = @_; 769 my ($self) = @_;
731 770
732 @$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)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 772
735 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
736} 774}
737 775
738sub size_allocate { 776sub size_allocate {
739 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
740 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
741 $self->update; 782 $self->update;
742} 783}
743 784
744sub set_offset { 785sub set_offset {
745 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
799 840
800 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
801 vertical => 1, 842 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 844 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
805 }, 846 },
806 ; 847 ;
807 848
808 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 851 slider => $slider,
811 @_, 852 @_,
812 ); 853 );
813 854
814 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 856 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
817 858
818 $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]);
819} 869}
820 870
821#TODO# update range on size_allocate depending on child 871#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 872# update viewport offset on scroll
823 873
… …
877 my $class = shift; 927 my $class = shift;
878 928
879 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
880 930
881 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
884 border => 0.6, 934 border => 0.6,
885 toplevel => 1, 935 is_toplevel => 1,
886 can_events => 1, 936 can_events => 1,
887 @_ 937 @_
888 ); 938 );
889 939
890 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 941 align => 0,
… …
1473 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1474 can_hover => 1, 1524 can_hover => 1,
1475 can_focus => 1, 1525 can_focus => 1,
1476 valign => 0, 1526 valign => 0,
1477 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1478 @_ 1529 @_
1479 ) 1530 )
1480} 1531}
1481 1532
1482sub _set_text { 1533sub _set_text {
… …
1492 $self->{text} = $text; 1543 $self->{text} = $text;
1493 1544
1494 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1496 1547
1497 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1498} 1549}
1499 1550
1500sub set_text { 1551sub set_text {
1501 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1502 1553
… …
1514 my ($self) = @_; 1565 my ($self) = @_;
1515 1566
1516 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1517 1568
1518 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1570}
1526 1571
1527sub key_down { 1572sub key_down {
1528 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1529 1574
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1593 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1594 $self->_emit ('escape');
1550 } elsif ($uni) { 1595 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1597 }
1553 1598
1554 $self->_set_text ($text); 1599 $self->_set_text ($text);
… …
1641 if ($sym == 13) { 1686 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1647 $self->update; 1692 $self->update;
1648 1693
1649 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1699 can_events => 1, 1744 can_events => 1,
1700 @_ 1745 @_
1701 ) 1746 )
1702} 1747}
1703 1748
1749sub activate { }
1750
1704sub button_up { 1751sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1706 1753
1754 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1757}
1712 1758
1713sub _draw { 1759sub _draw {
1714 my ($self) = @_; 1760 my ($self) = @_;
1715 1761
… …
1767 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1768 1814
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1773 } 1819 }
1774} 1820}
1775 1821
1776sub _draw { 1822sub _draw {
1777 my ($self) = @_; 1823 my ($self) = @_;
… …
2052 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2102 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2060 vertical => 0, 2106 vertical => 0,
2061 can_hover => 1, 2107 can_hover => 1,
2062 inner_pad => .05, 2108 inner_pad => 0.02,
2063 @_ 2109 @_
2064 ); 2110 );
2065 2111
2066 $self->set_value ($self->{range}[0]); 2112 $self->set_value ($self->{range}[0]);
2067 $self->update; 2113 $self->update;
2068 2114
2069 $self 2115 $self
2070} 2116}
2071 2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2072sub set_value { 2126sub set_value {
2073 my ($self, $value) = @_; 2127 my ($self, $value) = @_;
2074 2128
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2130
2077 $hi = $lo + 1 if $hi <= $lo; 2131 $hi = $lo + 1 if $hi <= $lo;
2078 2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2079 $value = $lo if $value < $lo; 2135 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2136 $value = $hi - $page if $value > $hi - $page;
2081 2137
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2139 if $unit;
2084 2140
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2142
2089 if ($value != $old_value) { 2143 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2144 $self->_emit (changed => $value);
2091 $self->update; 2145 $self->update;
2092 } 2146 }
2093} 2147}
2094 2148
2095sub size_request { 2149sub size_request {
… …
2103 2157
2104sub button_down { 2158sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2106 2160
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2109} 2166}
2110 2167
2111sub mouse_motion { 2168sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2173
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2175
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2177
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2179 }
2123} 2180}
2124 2181
2125sub update { 2182sub update {
2126 my ($self) = @_; 2183 my ($self) = @_;
2127 2184
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2130 2187
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2132 2190
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2192
2135 $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;
2136 2195
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2196 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2197 $value = $value * $self->{scale} + $self->{offset};
2139 2198
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; 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2200 $self->{knob_w} = $knob_w;
2147 }); 2201 });
2148 2202
2149 $self->SUPER::update; 2203 $self->SUPER::update;
2150} 2204}
2151 2205
… …
2175 # draw handle 2229 # draw handle
2176 $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);
2177 2231
2178 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2275
2181############################################################################# 2276#############################################################################
2182 2277
2183package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2184 2279
… …
2214 2309
2215 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2311 $self->reflow;
2217} 2312}
2218 2313
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 { 2314sub size_allocate {
2239 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2240 2316
2241 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2242 2318
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2322
2247 $self->reflow; 2323 $self->reflow;
2248} 2324}
2249 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
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
2250sub add_paragraph { 2360sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2252 2362
2253 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2254 2364 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2258 2368
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2370}
2264 2371
2265sub update { 2372sub update {
2266 my ($self) = @_; 2373 my ($self) = @_;
2267 2374
… …
2270 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2271 2378
2272 delete $self->{texture}; 2379 delete $self->{texture};
2273 2380
2274 $ROOT->on_post_alloc ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2275 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2385 my $height = 0;
2277 2386
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2279 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 }
2280 2402
2281 $self->{height} = $height; 2403 $self->{height} = $height;
2282 2404
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2406
2285 delete $self->{texture}; 2407 delete $self->{texture};
2286 } 2408 }
2287 2409
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2291 2413
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]; 2414 my $top = int $self->{children}[1]{range}[0];
2296 2415
2297 my $y0 = $top; 2416 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2299 2418
2300 my $y = 0; 2419 my $y = 0;
2301 2420
2302 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2303 2422
2304 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2305 2424
2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2428
2306 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2430 my $h = $par->[1];
2308 2431
2309 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2312 2436
2313 my ($W, $H) = $layout->size; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2438
2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2441 }
2316 2442
2317 $y += $h; 2443 $y += $h;
2318 } 2444 }
2319 2445
2320 glDisable GL_TEXTURE_2D; 2446 glDisable GL_BLEND;
2321 }; 2447 };
2322 }); 2448 });
2323} 2449}
2324 2450
2325sub _draw { 2451sub _draw {
2326 my ($self) = @_; 2452 my ($self) = @_;
2327 2453
2328 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2333 2459
2334 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2335 2461
2336} 2462}
… …
2405 2531
2406 # TODO: use animation 2532 # TODO: use animation
2407 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open"); 2536 $self->_emit ("open");
2411 } else { 2537 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close"); 2539 $self->_emit ("close");
2414 } 2540 }
2415 2541
2416 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2417} 2543}
2418 2544
2419############################################################################# 2545#############################################################################
2420 2546
2421package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2496use CFClient::OpenGL; 2622use CFClient::OpenGL;
2497 2623
2498sub new { 2624sub new {
2499 my $class = shift; 2625 my $class = shift;
2500 2626
2501 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2502 aspect => 1, 2628 aspect => 1,
2503 @_, 2629 @_,
2504 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2505} 2647}
2506 2648
2507sub size_request { 2649sub size_request {
2508 (32, 8) 2650 (32, 8)
2509} 2651}
2510 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2511sub _draw { 2661sub _draw {
2512 my ($self) = @_; 2662 my ($self) = @_;
2513 2663
2514 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2676
2517 # TODO animation
2518 if ($tex) { 2677 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2524 } 2683 }
2525} 2684}
2526 2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2693}
2694
2527############################################################################# 2695#############################################################################
2528 2696
2529package CFClient::UI::InventoryItem; 2697package CFClient::UI::InventoryItem;
2530 2698
2531our @ISA = CFClient::UI::HBox::; 2699our @ISA = CFClient::UI::HBox::;
… …
2534 my ($item) = @_; 2702 my ($item) = @_;
2535 2703
2536 my $desc = 2704 my $desc =
2537 $item->{nrof} < 2 2705 $item->{nrof} < 2
2538 ? $item->{name} 2706 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}"; 2707 : "$item->{nrof} × $item->{name_pl}";
2540 2708
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)"; 2710 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED 2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)"; 2712 and $desc .= " (applied)";
… …
2564 my $item = delete $args{item}; 2732 my $item = delete $args{item};
2565 2733
2566 my $desc = _item_to_desc ($item); 2734 my $desc = _item_to_desc ($item);
2567 2735
2568 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2569 can_hover => 1, 2737 can_hover => 1,
2570 can_events => 1, 2738 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\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>"),
2573 connect_button_down => sub { 2741 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2575 2743
2576 # 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 :(
2577 if ($ev->{button} == 1) { 2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag}; 2746 my $targ = $::CONN->{player}{tag};
2579 2747
2580 if ($item->{container} == $::CONN->{player}{tag}) { 2748 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT; 2749 $targ = $main::OPENCONT;
2582 } 2750 }
2583 2751
2584 $::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}");
2585 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2588 my @menu_items = ( 2758 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [ 2770 )
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ], 2771 ),
2597 ); 2772 );
2598 2773
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 } 2775 }
2601 2776
… …
2637 2812
2638sub new { 2813sub new {
2639 my $class = shift; 2814 my $class = shift;
2640 2815
2641 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2643 @_, 2818 @_,
2644 ); 2819 );
2645 2820
2646 $self 2821 $self
2647} 2822}
… …
2658 } @$items; 2833 } @$items;
2659 2834
2660 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2661 2836
2662 for my $item (@items) { 2837 for my $item (@items) {
2838 $item->{item} = $item;
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item (); 2840 $item->update_item ();
2665 } 2841 }
2666 2842
2843 my $i = 0;
2844 for (@items) {
2667 $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 }
2668 2849
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670} 2851}
2671 2852
2672sub size_request { 2853sub size_request {
… …
2714 2895
2715# 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)
2716sub popup { 2897sub popup {
2717 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2718 2899
2719 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2720 2901
2721 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2903 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2724 2905
… …
2739 2920
2740 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2922 undef $GRAB;
2742 $self->hide; 2923 $self->hide;
2743 2924
2744 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2746 } 2927 }
2747} 2928}
2748 2929
2749############################################################################# 2930#############################################################################
… …
2891} 3072}
2892 3073
2893sub size_allocate { 3074sub size_allocate {
2894 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
2895 3076
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) { 3077 for my $child ($self->children) {
2903 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)};
2904 3079
2905 $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
2906 if exists $child->{req_x}; 3081 if exists $child->{req_x};
… …
2935} 3110}
2936 3111
2937sub add { 3112sub add {
2938 my ($self, @children) = @_; 3113 my ($self, @children) = @_;
2939 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
2940 for my $child (@children) { 3121 for my $child (@children) {
2941 $child->{toplevel} = 1; 3122 $child->{is_toplevel} = 1;
2942 3123
2943 # integerise window positions 3124 # integerise window positions
2944 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
2946 } 3127 }
2947 3128
2948 $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 }
2949} 3142}
2950 3143
2951sub on_refresh { 3144sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2953 3146
… …
3006 $w = 0 if $w < 0; 3199 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3200 $h = 0 if $h < 0;
3008 3201
3009 $widget->{w} = $w; 3202 $widget->{w} = $w;
3010 $widget->{h} = $h; 3203 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h); 3204 $widget->emit (size_allocate => $w, $h);
3013 } 3205 }
3014 } 3206 }
3015 3207
3016 while ($self->{post_alloc_hook}) { 3208 while ($self->{post_alloc_hook}) {
… …
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
3024 3216
3025 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3218 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3221 glLoadIdentity;
3030 3222
3031 $self->_draw; 3223 $self->_draw;
3032} 3224}

Diff Legend

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