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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 } 185 }
159
160 $widget->reconfigure;
161 } 186 }
187
188 reconfigure_widgets;
162} 189}
163 190
164############################################################################# 191#############################################################################
165 192
166package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
179 can_events => 1, 206 can_events => 1,
180 @_ 207 @_
181 }, $class; 208 }, $class;
182 209
183 for (keys %$self) { 210 for (keys %$self) {
184 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
186 } 213 }
187 } 214 }
188 215
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
191 $self 225 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
192} 236}
193 237
194sub destroy { 238sub destroy {
195 my ($self) = @_; 239 my ($self) = @_;
196 240
… …
198 %$self = (); 242 %$self = ();
199} 243}
200 244
201sub show { 245sub show {
202 my ($self) = @_; 246 my ($self) = @_;
203
204 return if $self->{parent}; 247 return if $self->{parent};
205 248
206 $CFClient::UI::ROOT->add ($self); 249 $CFClient::UI::ROOT->add ($self);
207} 250}
208 251
209sub hide { 252sub show_centered {
210 my ($self) = @_; 253 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257
258 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub {
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
261 },
262 );
263}
264
265sub set_invisible {
266 my ($self) = @_;
267
268 return unless $self->{visible};
269
270 # broken show/hide model
271
272 delete $self->{root};
273 delete $self->{visible};
211 274
212 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
277
278 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self;
280
281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
284}
285
286sub hide {
287 my ($self) = @_;
288
289 $self->set_invisible;
214 290
215 $self->{parent}->remove ($self) 291 $self->{parent}->remove ($self)
216 if $self->{parent}; 292 if $self->{parent};
217} 293}
218 294
… …
288} 364}
289 365
290sub set_tooltip { 366sub set_tooltip {
291 my ($self, $tooltip) = @_; 367 my ($self, $tooltip) = @_;
292 368
369 $tooltip =~ s/^\s+//;
370 $tooltip =~ s/\s+$//;
371
372 return if $self->{tooltip} eq $tooltip;
373
293 $self->{tooltip} = $tooltip; 374 $self->{tooltip} = $tooltip;
294 375
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 377 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 378 CFClient::UI::check_tooltip;
… …
318 return if $FOCUS == $self; 399 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
320 401
321 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
322 403
323 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
324 405
325 $focus->update if $focus; 406 $focus->update if $focus;
326 $FOCUS->update; 407 $FOCUS->update;
327} 408}
328 409
… …
331 412
332 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
333 414
334 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
335 416
336 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
337 418
338 $focus->update if $focus; #? 419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS;
339} 423}
340 424
341sub mouse_motion { } 425sub mouse_motion { }
342sub button_up { } 426sub button_up { }
343sub key_down { } 427sub key_down { }
344sub key_up { } 428sub key_up { }
345 429
346sub button_down { 430sub button_down {
347 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
348 432
349 $self->focus_in; 433 $self->focus_in;
… …
383 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix; 468 glPushMatrix;
385 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 472 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
392 glEnd; 476 glEnd;
393 glPopMatrix; 477 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 479 }
396} 480}
… …
416sub set_parent { 500sub set_parent {
417 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
418 502
419 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
420 504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
421 # TODO: req_w _does_change after ->reconfigure 513 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 514 $self->check_size
423 unless exists $self->{req_w}; 515 unless exists $self->{req_w};
516
517 $self->show;
424} 518}
425 519
426sub check_size { 520sub check_size {
427 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
428 522
… …
441 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
442 536
443 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 538}
445 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
446sub emit { 546sub emit {
447 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
448 548
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
450} 555}
451 556
452sub DESTROY { 557sub DESTROY {
453 my ($self) = @_; 558 my ($self) = @_;
454 559
… …
567 delete $child->{parent}; 672 delete $child->{parent};
568 $child->hide; 673 $child->hide;
569 674
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 676
572 $self->check_size; 677 $self->check_size (1);
573 $self->update; 678 $self->update;
574} 679}
575 680
576sub clear { 681sub clear {
577 my ($self) = @_; 682 my ($self) = @_;
… …
717 822
718package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
719 824
720our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
721 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
722sub size_request { 837sub size_request {
723 my ($self) = @_; 838 my ($self) = @_;
724 839
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 841
728 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
729} 843}
730 844
731sub size_allocate { 845sub size_allocate {
732 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
733 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
734 $self->update; 852 $self->update;
735} 853}
736 854
737sub set_offset { 855sub set_offset {
738 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
789 my $class = shift; 907 my $class = shift;
790 908
791 my $self; 909 my $self;
792 910
793 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
794 vertical => 1, 912 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 914 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
798 }, 916 },
799 ; 917 ;
800 918
801 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 921 slider => $slider,
804 @_, 922 @_,
805 ); 923 );
806 924
807 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
810 928
811 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 949}
813 950
814#TODO# update range on size_allocate depending on child 951#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 952# update viewport offset on scroll
816 953
… …
870 my $class = shift; 1007 my $class = shift;
871 1008
872 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
873 1010
874 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1014 border => 0.6,
878 toplevel => 1, 1015 is_toplevel => 1,
879 can_events => 1, 1016 can_events => 1,
880 @_ 1017 @_
881 ); 1018 );
882 1019
883 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1021 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
938 1075
939 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
941 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
945 $self->check_size; 1084 $self->check_size;
946 }; 1085 };
947 1086
948 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
952 $self->{motion} = sub { 1091 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
954 1093
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
956 1095
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
958 $self->update; 1099 $self->update;
959 }; 1100 };
960 } 1101 }
961} 1102}
962 1103
… …
1024sub new { 1165sub new {
1025 my $class = shift; 1166 my $class = shift;
1026 1167
1027 $class->SUPER::new ( 1168 $class->SUPER::new (
1028 col_expand => [], 1169 col_expand => [],
1029 @_ 1170 @_,
1030 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1176}
1032 1177
1033sub add { 1178sub add {
1034 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1035 1180
1036 $child->set_parent ($self); 1181 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1038 1183
1039 $child->check_size; 1184 $self->check_size (1);
1040} 1185}
1041 1186
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1188sub clear {
1048 my ($self) = @_; 1189 my ($self) = @_;
1049 1190
1050 my @children = $self->children; 1191 my @children = $self->children;
1051 delete $self->{children}; 1192 delete $self->{children};
… …
1053 for (@children) { 1194 for (@children) {
1054 delete $_->{parent}; 1195 delete $_->{parent};
1055 $_->hide; 1196 $_->hide;
1056 } 1197 }
1057 1198
1199 $self->check_size (1);
1058 $self->update; 1200 $self->update;
1059} 1201}
1060 1202
1061sub get_wh { 1203sub get_wh {
1062 my ($self) = @_; 1204 my ($self) = @_;
… …
1094sub size_allocate { 1236sub size_allocate {
1095 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1096 1238
1097 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1098 1240
1099 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1101 1243
1102 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1466 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1467 can_hover => 1, 1609 can_hover => 1,
1468 can_focus => 1, 1610 can_focus => 1,
1469 valign => 0, 1611 valign => 0,
1470 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1471 @_ 1614 @_
1472 ) 1615 )
1473} 1616}
1474 1617
1475sub _set_text { 1618sub _set_text {
… …
1485 $self->{text} = $text; 1628 $self->{text} = $text;
1486 1629
1487 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1489 1632
1490 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1491} 1634}
1492 1635
1493sub set_text { 1636sub set_text {
1494 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1495 1638
… …
1507 my ($self) = @_; 1650 my ($self) = @_;
1508 1651
1509 my ($w, $h) = $self->SUPER::size_request; 1652 my ($w, $h) = $self->SUPER::size_request;
1510 1653
1511 ($w + 1, $h) # add 1 for cursor 1654 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1655}
1519 1656
1520sub key_down { 1657sub key_down {
1521 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1522 1659
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1678 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1679 $self->_emit ('escape');
1543 } elsif ($uni) { 1680 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1682 }
1546 1683
1547 $self->_set_text ($text); 1684 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1771 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1640 $self->update; 1777 $self->update;
1641 1778
1642 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1829 can_events => 1,
1693 @_ 1830 @_
1694 ) 1831 )
1695} 1832}
1696 1833
1834sub activate { }
1835
1697sub button_up { 1836sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1699 1838
1839 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1842}
1705 1843
1706sub _draw { 1844sub _draw {
1707 my ($self) = @_; 1845 my ($self) = @_;
1708 1846
… …
1760 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1761 1899
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1766 } 1904 }
1767} 1905}
1768 1906
1769sub _draw { 1907sub _draw {
1770 my ($self) = @_; 1908 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2185 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2186 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2187 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2189 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2190 req_h => $::WIDTH / 80,
2053 vertical => 0, 2191 vertical => 0,
2054 can_hover => 1, 2192 can_hover => 1,
2055 inner_pad => .05, 2193 inner_pad => 0.02,
2056 @_ 2194 @_
2057 ); 2195 );
2058 2196
2059 $self->set_value ($self->{range}[0]); 2197 $self->set_value ($self->{range}[0]);
2060 $self->update; 2198 $self->update;
2061 2199
2062 $self 2200 $self
2063} 2201}
2064 2202
2203sub set_range {
2204 my ($self, $range) = @_;
2205
2206 ($range, $self->{range}) = ($self->{range}, $range);
2207
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2210}
2211
2065sub set_value { 2212sub set_value {
2066 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2067 2214
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2215 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2216
2070 $hi = $lo + 1 if $hi <= $lo; 2217 $hi = $lo + 1 if $hi <= $lo;
2071 2218
2219 $page = $hi - $lo if $page > $hi - $lo;
2220
2072 $value = $lo if $value < $lo; 2221 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2222 $value = $hi - $page if $value > $hi - $page;
2074 2223
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2224 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2225 if $unit;
2077 2226
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2228
2082 if ($value != $old_value) { 2229 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2230 $self->_emit (changed => $value);
2084 $self->update; 2231 $self->update;
2085 } 2232 }
2086} 2233}
2087 2234
2088sub size_request { 2235sub size_request {
… …
2096 2243
2097sub button_down { 2244sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2099 2246
2100 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::button_down ($ev, $x, $y);
2248
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250
2101 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
2102} 2252}
2103 2253
2104sub mouse_motion { 2254sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2257 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2259
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2260 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2261
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2263
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2265 }
2116} 2266}
2117 2267
2118sub update { 2268sub update {
2119 my ($self) = @_; 2269 my ($self) = @_;
2120 2270
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2272 $self->set_value ($self->{range}[0]);
2123 2273
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
2125 2276
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2278
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2281
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2282 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2283 $value = $value * $self->{scale} + $self->{offset};
2132 2284
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2285 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2286 $self->{knob_w} = $knob_w;
2140 }); 2287 });
2141 2288
2142 $self->SUPER::update; 2289 $self->SUPER::update;
2143} 2290}
2144 2291
… …
2168 # draw handle 2315 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2316 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2317
2171 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
2172} 2319}
2320
2321#############################################################################
2322
2323package CFClient::UI::ValSlider;
2324
2325our @ISA = CFClient::UI::HBox::;
2326
2327sub new {
2328 my ($class, %arg) = @_;
2329
2330 my $range = delete $arg{range};
2331
2332 my $self = $class->SUPER::new (
2333 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2334 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2335 to_value => sub { shift },
2336 from_value => sub { shift },
2337 %arg,
2338 );
2339
2340 $self->{slider}->connect (changed => sub {
2341 my ($self, $value) = @_;
2342 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2343 $self->{parent}->emit (changed => $value);
2344 });
2345
2346# $self->{entry}->connect (changed => sub {
2347# my ($self, $value) = @_;
2348# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2349# $self->{parent}->emit (changed => $value);
2350# });
2351
2352 $self->add ($self->{slider}, $self->{entry});
2353
2354 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2355
2356 $self
2357}
2358
2359sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) }
2173 2361
2174############################################################################# 2362#############################################################################
2175 2363
2176package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
2177 2365
… …
2207 2395
2208 $self->{fontsize} = $fontsize; 2396 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2397 $self->reflow;
2210} 2398}
2211 2399
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2400sub size_allocate {
2232 my ($self, $w, $h) = @_; 2401 my ($self, $w, $h) = @_;
2233 2402
2234 $self->SUPER::size_allocate ($w, $h); 2403 $self->SUPER::size_allocate ($w, $h);
2235 2404
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2407 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2408
2240 $self->reflow; 2409 $self->reflow;
2241} 2410}
2242 2411
2412sub text_size {
2413 my ($self, $text, $indent) = @_;
2414
2415 my $layout = $self->{layout};
2416
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent);
2419 $layout->set_markup ($text);
2420
2421 $layout->size
2422}
2423
2424sub reflow {
2425 my ($self) = @_;
2426
2427 $self->{need_reflow}++;
2428 $self->update;
2429}
2430
2431sub set_offset {
2432 my ($self, $offset) = @_;
2433
2434 # todo: base offset on lines or so, not on pixels
2435 $self->{children}[1]->set_value ($offset);
2436}
2437
2438sub clear {
2439 my ($self) = @_;
2440
2441 $self->{par} = [];
2442 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444}
2445
2243sub add_paragraph { 2446sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2447 my ($self, $color, $text, $indent) = @_;
2245 2448
2246 #TODO: intelligently "reformat" paragraph 2449 for my $line (split /\n/, $text) {
2247 2450 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2451 $self->{height} += $h;
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2453 }
2251 2454
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2456}
2257 2457
2258sub update { 2458sub update {
2259 my ($self) = @_; 2459 my ($self) = @_;
2260 2460
… …
2263 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
2264 2464
2265 delete $self->{texture}; 2465 delete $self->{texture};
2266 2466
2267 $ROOT->on_post_alloc ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
2268 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2471 my $height = 0;
2270 2472
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2272 for @{$self->{par}}; 2477 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h;
2484 }
2485
2486 $height += $_->[1];
2487 }
2273 2488
2274 $self->{height} = $height; 2489 $self->{height} = $height;
2275 2490
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2492
2278 delete $self->{texture}; 2493 delete $self->{texture};
2279 } 2494 }
2280 2495
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2284 2499
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2500 my $top = int $self->{children}[1]{range}[0];
2289 2501
2290 my $y0 = $top; 2502 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2503 my $y1 = $top + $H;
2292 2504
2293 my $y = 0; 2505 my $y = 0;
2294 2506
2295 my $layout = $self->{layout}; 2507 my $layout = $self->{layout};
2296 2508
2297 $layout->set_font ($self->{font}) if $self->{font}; 2509 $layout->set_font ($self->{font}) if $self->{font};
2298 2510
2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2514
2299 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2516 my $h = $par->[1];
2301 2517
2302 if ($y0 < $y + $h && $y < $y1) { 2518 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2519 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2521 $layout->set_markup ($par->[4]);
2305 2522
2306 my ($W, $H) = $layout->size; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2524
2525 glRasterPos $par->[3], $y - $y0;
2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2527 }
2309 2528
2310 $y += $h; 2529 $y += $h;
2311 } 2530 }
2312 2531
2313 glDisable GL_TEXTURE_2D; 2532 glDisable GL_BLEND;
2314 }; 2533 };
2315 }); 2534 });
2316} 2535}
2317 2536
2318sub _draw { 2537sub _draw {
… …
2378 2597
2379sub new { 2598sub new {
2380 my $class = shift; 2599 my $class = shift;
2381 2600
2382 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2383 state => 0, 2602 state => 0,
2384 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2385 @_ 2604 @_
2386 ); 2605 );
2387 2606
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2607 $self
2394} 2608}
2395 2609
2396sub toggle_flopper { 2610sub toggle_flopper {
2397 my ($self) = @_; 2611 my ($self) = @_;
2398 2612
2399 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2614}
2411 2615
2412############################################################################# 2616#############################################################################
2413 2617
2414package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2489use CFClient::OpenGL; 2693use CFClient::OpenGL;
2490 2694
2491sub new { 2695sub new {
2492 my $class = shift; 2696 my $class = shift;
2493 2697
2494 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2495 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2496 @_, 2701 @_,
2497 ) 2702 );
2703
2704 if ($self->{anim} && $self->{animspeed}) {
2705 Scalar::Util::weaken (my $widget = $self);
2706
2707 $self->{timer} = Event->timer (
2708 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2709 hard => 1,
2710 interval => $self->{animspeed},
2711 cb => sub {
2712 ++$widget->{frame};
2713 $widget->update;
2714 },
2715 );
2716 }
2717
2718 $self
2498} 2719}
2499 2720
2500sub size_request { 2721sub size_request {
2501 (32, 8) 2722 (32, 8)
2502} 2723}
2503 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2504sub _draw { 2733sub _draw {
2505 my ($self) = @_; 2734 my ($self) = @_;
2506 2735
2507 return unless $::CONN;#d# manage and cache textures differently 2736 return unless $::CONN;
2737
2738 my $face;
2739
2740 if ($self->{frame}) {
2741 my $anim = $::CONN->{anim}[$self->{anim}];
2742
2743 $face = $anim->[ $self->{frame} % @$anim ]
2744 if $anim && @$anim;
2745 }
2746
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2748
2510 # TODO animation
2511 if ($tex) { 2749 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2517 } 2755 }
2518} 2756}
2519 2757
2758sub DESTROY {
2759 my ($self) = @_;
2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2765}
2766
2520############################################################################# 2767#############################################################################
2521 2768
2522package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2523 2770
2524our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551 2772
2552sub new { 2773sub new {
2553 my $class = shift; 2774 my $class = shift;
2554 2775
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2562 can_hover => 1, 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_, 2778 @_,
2637 ); 2779 );
2638 2780
2639 $self 2781 $self
2640} 2782}
… …
2650 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2651 } @$items; 2793 } @$items;
2652 2794
2653 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2654 2796
2797 my $row = 0;
2655 for my $item (@items) { 2798 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2799 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2800
2660 $self->{scrolled}->add (@items); 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2661 2804
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2663} 2807}
2664 2808
2665sub size_request { 2809sub size_request {
2666 my ($self) = @_; 2810 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2707 2851
2708# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2709sub popup { 2853sub popup {
2710 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2711 2855
2712 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2713 2857
2714 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2859 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2717 2861
… …
2732 2876
2733 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2878 undef $GRAB;
2735 $self->hide; 2879 $self->hide;
2736 2880
2737 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2739 } 2883 }
2740} 2884}
2741 2885
2742############################################################################# 2886#############################################################################
… …
2804sub add { 2948sub add {
2805 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2806 2950
2807 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2809 2955
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2957
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2959
… …
2857 3003
2858sub new { 3004sub new {
2859 my $class = shift; 3005 my $class = shift;
2860 3006
2861 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
2862 @_, 3009 @_,
2863 ) 3010 )
2864} 3011}
2865 3012
2866sub configure { 3013sub configure {
… …
2884} 3031}
2885 3032
2886sub size_allocate { 3033sub size_allocate {
2887 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
2888 3035
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3036 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3038
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x}; 3040 if exists $child->{req_x};
2900 3041
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y}; 3043 if exists $child->{req_y};
2903 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3050
2907 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2908 } 3052 }
… …
2928} 3072}
2929 3073
2930sub add { 3074sub add {
2931 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
2932 3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
2933 for my $child (@children) { 3083 for my $child (@children) {
2934 $child->{toplevel} = 1; 3084 $child->{is_toplevel} = 1;
2935 3085
2936 # integerise window positions 3086 # integerise window positions
2937 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
2939 } 3089 }
2940 3090
2941 $self->SUPER::add (@children); 3091 $self->SUPER::add (@children);
2942} 3092}
2943 3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
3104}
3105
2944sub on_refresh { 3106sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2946 3108
2947 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2948} 3110}
… …
2960 $_->() 3122 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2962 } 3124 }
2963 3125
2964 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
2965 my @queue = ([], []); 3127 my @queue;
2966 3128
2967 for (;;) { 3129 for (;;) {
2968 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
2969 # heuristic: check containers last 3131 #TODO use array-of-depth approach
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
2971 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
2972 } 3135 }
2973 3136
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
2975 3140
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2977 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
2978 : $widget->size_request; 3143 : $widget->size_request;
2979 3144
… …
2999 $w = 0 if $w < 0; 3164 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3165 $h = 0 if $h < 0;
3001 3166
3002 $widget->{w} = $w; 3167 $widget->{w} = $w;
3003 $widget->{h} = $h; 3168 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h); 3169 $widget->emit (size_allocate => $w, $h);
3006 } 3170 }
3007 } 3171 }
3008 3172
3009 while ($self->{post_alloc_hook}) { 3173 while ($self->{post_alloc_hook}) {
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3180 glClear GL_COLOR_BUFFER_BIT;
3017 3181
3018 glMatrixMode GL_PROJECTION; 3182 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3183 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3185 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3186 glLoadIdentity;
3023 3187
3024 $self->_draw; 3188 $self->_draw;
3025} 3189}

Diff Legend

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