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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 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 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
152sub rescale_widgets { 170sub rescale_widgets {
153 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
154 172
155 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $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};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
165 } 188 }
166 } 189 }
167 190
168 reconfigure_widgets; 191 reconfigure_widgets;
169} 192}
… …
178 201
179sub new { 202sub new {
180 my $class = shift; 203 my $class = shift;
181 204
182 my $self = bless { 205 my $self = bless {
183 x => 0, 206 x => "center",
184 y => 0, 207 y => "center",
185 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
186 can_events => 1, 211 can_events => 1,
187 @_ 212 @_
188 }, $class; 213 }, $class;
189 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
190 for (keys %$self) { 217 for (keys %$self) {
191 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
193 } 220 }
194 } 221 }
195 222
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
197 234
198 $self 235 $self
199} 236}
200 237
201sub destroy { 238sub destroy {
… …
205 %$self = (); 242 %$self = ();
206} 243}
207 244
208sub show { 245sub show {
209 my ($self) = @_; 246 my ($self) = @_;
247
210 return if $self->{parent}; 248 return if $self->{parent};
211 249
212 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
213} 251}
214 252
215sub show_centered { 253sub set_visible {
216 my ($self) = @_; 254 my ($self) = @_;
255
217 return if $self->{parent}; 256 return if $self->{visible};
218 257
219 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
220 260
221 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 262
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
224 }, 264
225 ); 265 $_->set_visible for $self->children;
226} 266}
227 267
228sub set_invisible { 268sub set_invisible {
229 my ($self) = @_; 269 my ($self) = @_;
230 270
231 # broken show/hide model 271 return unless $self->{visible};
232 272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
233 delete $self->{visible}; 276 delete $self->{visible};
234 277
235 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
237 280
238 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
240 283
241 $self->focus_out; 284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
242} 304}
243 305
244sub hide { 306sub hide {
245 my ($self) = @_; 307 my ($self) = @_;
246 308
… …
248 310
249 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
250 if $self->{parent}; 312 if $self->{parent};
251} 313}
252 314
253sub move { 315sub move_abs {
254 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
255 317
256 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
259 321
260 $self->update; 322 $self->update;
261} 323}
262 324
263sub set_size { 325sub set_size {
264 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
265 327
266 $self->{user_w} = $w; 328 $self->{force_w} = $w;
267 $self->{user_h} = $h; 329 $self->{force_h} = $h;
268 330
269 $self->check_size; 331 $self->realloc;
270} 332}
271 333
272sub size_request { 334sub size_request {
273 require Carp; 335 require Carp;
274 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
276 338
277sub configure { 339sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
279 341
280 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
283 347
284 # use alignment to adjust x, y 348 # use alignment to adjust x, y
285 349
286 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 352 }
291 353
292 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 355 $self->{x} = $x;
294 $self->{y} = $y; 356 $self->{y} = $y;
295 $self->update; 357 $self->update;
296 } 358 }
297 359
298 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
300 } 367 }
301} 368}
302 369
303sub size_allocate { 370sub size_allocate {
304 # nothing to be done 371 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 372}
313 373
314sub children { 374sub children {
315} 375}
316 376
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
399 529
400sub draw { 530sub draw {
401 my ($self) = @_; 531 my ($self) = @_;
402 532
403 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
420 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
421 glEnd; 551 glEnd;
422 glDisable GL_BLEND; 552 glDisable GL_BLEND;
423 } 553 }
424 554
425 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 556 glPushMatrix;
427 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
441 my ($self) = @_; 571 my ($self) = @_;
442 572
443 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
444} 574}
445 575
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 576sub DESTROY {
504 my ($self) = @_; 577 my ($self) = @_;
505 578
506 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
507 #$self->deactivate; 580 #$self->deactivate;
… …
563 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
565} 638}
566 639
567sub size_request { 640sub size_request {
568 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
569} 644}
570 645
571sub draw { } 646sub draw { }
572 647
573############################################################################# 648#############################################################################
… …
602 $self->{children} = [ 677 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
605 ]; 680 ];
606 681
607 $self->check_size (1); 682 $self->realloc;
608 $self->update;
609} 683}
610 684
611sub children { 685sub children {
612 @{ $_[0]{children} } 686 @{ $_[0]{children} }
613} 687}
… …
618 delete $child->{parent}; 692 delete $child->{parent};
619 $child->hide; 693 $child->hide;
620 694
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 696
623 $self->check_size; 697 $self->realloc;
624 $self->update;
625} 698}
626 699
627sub clear { 700sub clear {
628 my ($self) = @_; 701 my ($self) = @_;
629 702
… …
633 for (@$children) { 706 for (@$children) {
634 delete $_->{parent}; 707 delete $_->{parent};
635 $_->hide; 708 $_->hide;
636 } 709 }
637 710
638 $self->check_size; 711 $self->realloc;
639 $self->update;
640} 712}
641 713
642sub find_widget { 714sub find_widget {
643 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
644 716
… …
781} 853}
782 854
783sub size_request { 855sub size_request {
784 my ($self) = @_; 856 my ($self) = @_;
785 857
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 859
788 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
789} 864}
790 865
791sub size_allocate { 866sub size_allocate {
792 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
793 868
869 my $child = $self->child;
870
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 873
797 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
798 $self->update; 875 $self->update;
799} 876}
800 877
… …
853 my $class = shift; 930 my $class = shift;
854 931
855 my $self; 932 my $self;
856 933
857 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
858 vertical => 1, 935 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 937 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 938 $self->{vp}->set_offset (0, $_[1]);
862 }, 939 },
863 ; 940 ;
864 941
865 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
874 951
875 $self 952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 963}
877 964
878sub size_allocate { 965sub size_allocate {
879 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
880 967
… …
933 1020
934our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
935 1022
936use CFClient::OpenGL; 1023use CFClient::OpenGL;
937 1024
938my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1032
942sub new { 1033sub new {
943 my $class = shift; 1034 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1035
947 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1039 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
953 @_ 1043 @_
954 ); 1044 );
955 1045
956 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
957 align => 0, 1047 align => 0,
… …
1010 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1011 1101
1012 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1014 1104
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size;
1019 }; 1110 };
1020 1111
1021 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1116 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1027 1118
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1120
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update;
1032 }; 1122 };
1033 } 1123 }
1034} 1124}
1035 1125
1036sub button_up { 1126sub button_up {
… …
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1146
1057 my $border = $self->border; 1147 my $border = $self->border;
1058 1148
1059 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1154
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1067 1157
1068 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1163 }
1079 1164
1080 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1081 1166
… …
1101 col_expand => [], 1186 col_expand => [],
1102 @_, 1187 @_,
1103 ) 1188 )
1104} 1189}
1105 1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
1106sub add { 1195sub add {
1107 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1108 1197
1109 $child->set_parent ($self); 1198 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1111 1200
1112 $child->check_size; 1201 $self->realloc;
1113} 1202}
1114 1203
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1205sub clear {
1121 my ($self) = @_; 1206 my ($self) = @_;
1122 1207
1123 my @children = $self->children; 1208 my @children = $self->children;
1124 delete $self->{children}; 1209 delete $self->{children};
… …
1126 for (@children) { 1211 for (@children) {
1127 delete $_->{parent}; 1212 delete $_->{parent};
1128 $_->hide; 1213 $_->hide;
1129 } 1214 }
1130 1215
1131 $self->update; 1216 $self->realloc;
1132} 1217}
1133 1218
1134sub get_wh { 1219sub get_wh {
1135 my ($self) = @_; 1220 my ($self) = @_;
1136 1221
… …
1167sub size_allocate { 1252sub size_allocate {
1168 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1169 1254
1170 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1171 1256
1172 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1174 1259
1175 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1317 }
1233} 1318}
1234 1319
1235############################################################################# 1320#############################################################################
1236 1321
1237package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1323
1241our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1242 1325
1243sub size_request { 1326sub size_request {
1244 my ($self) = @_; 1327 my ($self) = @_;
1245 1328
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1247 1330 ? (
1248 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1333 )
1251 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1252} 1338}
1253 1339
1254sub size_allocate { 1340sub size_allocate {
1255 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1256 1342
1257 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1344 my $children = $self->{children};
1260 1345
1261 my @h = map $_->{req_w}, @$children; 1346 my @req;
1262 1347
1263 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1264 1349 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1364 }
1279 } 1365 }
1280 1366
1281 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1282 1368
1283 my $y = 0; 1369 my $pos = 0;
1284 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1373
1289 $y += $h; 1374 $pos += $alloc;
1290 } 1375 }
1291 1376
1292 1 1377 1
1293} 1378}
1294 1379
1295############################################################################# 1380#############################################################################
1296 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1297package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1298 1398
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1302 1400
1303sub size_request { 1401sub new {
1304 my ($self) = @_; 1402 my $class = shift;
1305 1403
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1307 1405 vertical => 1,
1308 ( 1406 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1407 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1408}
1352 1409
1353############################################################################# 1410#############################################################################
1354 1411
1355package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1429 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1374 fontsize => 1, 1431 fontsize => 1,
1375 align => -1, 1432 align => -1,
1376 valign => -1, 1433 valign => -1,
1377 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1378 can_events => 0, 1436 can_events => 0,
1379 %arg 1437 %arg
1380 ); 1438 );
1381 1439
1382 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1418 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1419 1477
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1422 1480
1481 $self->realloc;
1423 $self->update; 1482 $self->update;
1424 $self->check_size;
1425} 1483}
1426 1484
1427sub set_markup { 1485sub set_markup {
1428 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1429 1487
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1492
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1437 1495
1496 $self->realloc;
1438 $self->update; 1497 $self->update;
1439 $self->check_size;
1440} 1498}
1441 1499
1442sub size_request { 1500sub size_request {
1443 my ($self) = @_; 1501 my ($self) = @_;
1444 1502
… …
1458 1516
1459 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1461 } 1519 }
1462 1520
1463 ( 1521 ($w, $h)
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1522}
1468 1523
1469sub size_allocate { 1524sub size_allocate {
1470 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1471 1526
… …
1476 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1477 1532
1478 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1534 delete $self->{texture};
1480 1535
1481 $self->update; 1536 $self->realloc;
1482 $self->check_size;
1483} 1537}
1484 1538
1485sub _draw { 1539sub _draw {
1486 my ($self) = @_; 1540 my ($self) = @_;
1487 1541
… …
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1551
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499 1553
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1503 1557
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1507 1561
1508 $tex 1562 $tex
1509 }; 1563 };
1510 1564
… …
1567sub set_text { 1621sub set_text {
1568 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1569 1623
1570 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1625 $self->_set_text ($text);
1572 $self->update; 1626
1573 $self->check_size; 1627 $self->realloc;
1574} 1628}
1575 1629
1576sub get_text { 1630sub get_text {
1577 $_[0]{text} 1631 $_[0]{text}
1578} 1632}
… …
1611 } elsif ($uni) { 1665 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1613 } 1667 }
1614 1668
1615 $self->_set_text ($text); 1669 $self->_set_text ($text);
1616 $self->update; 1670
1617 $self->check_size; 1671 $self->realloc;
1618} 1672}
1619 1673
1620sub focus_in { 1674sub focus_in {
1621 my ($self) = @_; 1675 my ($self) = @_;
1622 1676
… …
1749 1803
1750sub new { 1804sub new {
1751 my $class = shift; 1805 my $class = shift;
1752 1806
1753 $class->SUPER::new ( 1807 $class->SUPER::new (
1754 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1755 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1757 can_hover => 1, 1812 can_hover => 1,
1758 align => 0, 1813 align => 0,
1759 valign => 0, 1814 valign => 0,
… …
1806 1861
1807sub new { 1862sub new {
1808 my $class = shift; 1863 my $class = shift;
1809 1864
1810 $class->SUPER::new ( 1865 $class->SUPER::new (
1811 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1812 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 1872 state => 0,
… …
1820} 1876}
1821 1877
1822sub size_request { 1878sub size_request {
1823 my ($self) = @_; 1879 my ($self) = @_;
1824 1880
1825 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1826} 1882}
1827 1883
1828sub button_down { 1884sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1830 1886
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1835 } 1891 }
1836} 1892}
1837 1893
1838sub _draw { 1894sub _draw {
1839 my ($self) = @_; 1895 my ($self) = @_;
1840 1896
1841 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1842 1898
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 1900
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 1904
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 1906
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 1908
… …
2115 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2122 vertical => 0, 2180 vertical => 0,
2123 can_hover => 1, 2181 can_hover => 1,
2124 inner_pad => 0.02, 2182 inner_pad => 0.02,
2125 @_ 2183 @_
2126 ); 2184 );
… …
2129 $self->update; 2187 $self->update;
2130 2188
2131 $self 2189 $self
2132} 2190}
2133 2191
2192sub changed { }
2193
2134sub set_range { 2194sub set_range {
2135 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2136 2196
2137 $self->{range} = $range; 2197 ($range, $self->{range}) = ($self->{range}, $range);
2138 2198
2139 $self->update; 2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2140} 2201}
2141 2202
2142sub set_value { 2203sub set_value {
2143 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2144 2205
… …
2163} 2224}
2164 2225
2165sub size_request { 2226sub size_request {
2166 my ($self) = @_; 2227 my ($self) = @_;
2167 2228
2168 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2230}
2173 2231
2174sub button_down { 2232sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2176 2234
… …
2527 2585
2528sub new { 2586sub new {
2529 my $class = shift; 2587 my $class = shift;
2530 2588
2531 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2532 state => 0, 2590 state => 0,
2533 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2534 @_ 2592 @_
2535 ); 2593 );
2536 2594
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2595 $self
2543} 2596}
2544 2597
2545sub toggle_flopper { 2598sub toggle_flopper {
2546 my ($self) = @_; 2599 my ($self) = @_;
2547 2600
2548 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2602}
2560 2603
2561############################################################################# 2604#############################################################################
2562 2605
2563package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2576} 2619}
2577 2620
2578sub set_tooltip_from { 2621sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2580 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2581 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2636 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2638 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2650
2599sub size_allocate { 2651sub size_allocate {
2600 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2601 2653
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2603} 2673}
2604 2674
2605sub _draw { 2675sub _draw {
2606 my ($self) = @_; 2676 my ($self) = @_;
2607 2677
… …
2624 glVertex $w, $h; 2694 glVertex $w, $h;
2625 glVertex $w, 0; 2695 glVertex $w, 0;
2626 glEnd; 2696 glEnd;
2627 2697
2628 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2629 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2630} 2701}
2631 2702
2632############################################################################# 2703#############################################################################
2633 2704
… …
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749 2820
2750 $row++; 2821 $row++;
2751 } 2822 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759} 2823}
2760 2824
2761############################################################################# 2825#############################################################################
2762 2826
2763package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2805 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self; 2870 $GRAB = $self;
2807 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2808 2872
2809 $self->show; 2873 $self->show;
2810 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2811} 2875}
2812 2876
2813sub mouse_motion { 2877sub mouse_motion {
2814 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2815 2879
… …
2949use CFClient::OpenGL; 3013use CFClient::OpenGL;
2950 3014
2951sub new { 3015sub new {
2952 my $class = shift; 3016 my $class = shift;
2953 3017
2954 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2955 @_, 3020 @_,
2956 ) 3021 );
2957}
2958 3022
2959sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2960 my ($self, $x, $y, $w, $h) = @_;
2961 3024
2962 $self->{w} = $w; 3025 $self
2963 $self->{h} = $h;
2964}
2965
2966sub check_size {
2967 my ($self) = @_;
2968
2969 $self->size_allocate ($self->{w}, $self->{h})
2970 if $self->{w};
2971} 3026}
2972 3027
2973sub size_request { 3028sub size_request {
2974 my ($self) = @_; 3029 my ($self) = @_;
2975 3030
2976 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2977} 3046}
2978 3047
2979sub size_allocate { 3048sub size_allocate {
2980 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2981 3050
2982 for my $child ($self->children) { 3051 for my $child ($self->children) {
2983 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2984 3053
2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2986 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2987 3056
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2989 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 3059
2994 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2995 } 3061 }
2996} 3062}
2997 3063
… …
3008} 3074}
3009 3075
3010sub update { 3076sub update {
3011 my ($self) = @_; 3077 my ($self) = @_;
3012 3078
3013 $self->check_size;
3014 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3015} 3080}
3016 3081
3017sub add { 3082sub add {
3018 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3019 3084
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3028 3086 for @children;
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033 3087
3034 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3035} 3089}
3036 3090
3037sub remove { 3091sub remove {
3038 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3039 3093
3040 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3041 3098
3042 while (@children) { 3099 while (@children) {
3043 my $w = pop @children; 3100 my $w = pop @children;
3044 push @children, $w->children; 3101 push @children, $w->children;
3045 $w->set_invisible; 3102 $w->set_invisible;
… …
3064 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3065 $_->() 3122 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3067 } 3124 }
3068 3125
3069 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3070 my @queue = ([], []); 3127 my @queue;
3071 3128
3072 for (;;) { 3129 while () {
3073 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3074 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3076 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3077 } 3137 }
3078 3138
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
3080 3140
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
3082 ? @$widget{qw(user_w user_h)} 3142
3083 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3084 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3085 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088
3089 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3091 3155
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3093 3157
3094 $widget->{parent}->check_size
3095 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3096 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3097 } 3167 }
3098 } 3168 }
3099 3169
3100 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3102 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3103 3178
3104 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3106 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3107 $widget->{w} = $w; 3186 $widget->{w} = $w;
3108 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3109 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3110 } 3191 }
3111 } 3192 }
3112 3193
3113 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3114 $_->() 3195 $_->()
3115 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3116 } 3197 }
3198
3117 3199
3118 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3121 3203

Diff Legend

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