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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus); 430 $self->update;
424 431
425 $focus->update if $focus; 432 0
426 $FOCUS->update;
427} 433}
428 434
429sub focus_out { 435sub invoke_focus_out {
430 my ($self) = @_; 436 my ($self) = @_;
431 437
432 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
433 439
434 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
435 441
436 $self->_emit (focus_out => $focus); 442 $self->update;
437 443
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 445 unless $FOCUS;
442}
443 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
466
467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
… …
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 502}
496 503
497sub realloc { 504sub realloc {
498 my ($self) = @_; 505 my ($self) = @_;
499 506
… …
529sub draw { 536sub draw {
530 my ($self) = @_; 537 my ($self) = @_;
531 538
532 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
533 540
541 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
536 544
537 return if $draw_x + $self->{w} < 0; 545 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 548
542 glPushMatrix; 549 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 551
547 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 554 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 556 glBegin GL_QUADS;
554 glVertex $x , $y; 557 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
558 glEnd; 561 glEnd;
559 glDisable GL_BLEND; 562 glDisable GL_BLEND;
560 } 563 }
561 564
562 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 566 glPushMatrix;
564 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 570 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
571 glEnd; 574 glEnd;
572 glPopMatrix; 575 glPopMatrix;
573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
575} 581}
576 582
577sub _draw { 583sub _draw {
578 my ($self) = @_; 584 my ($self) = @_;
579 585
… …
582 588
583sub DESTROY { 589sub DESTROY {
584 my ($self) = @_; 590 my ($self) = @_;
585 591
586 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
587 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
588} 596}
589 597
590############################################################################# 598#############################################################################
591 599
592package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
617 625
618 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
620 628
621 glEnable GL_BLEND; 629 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 631 glColor_premultiply @$color;
624 632
625 glBegin GL_QUADS; 633 glBegin GL_QUADS;
626 glVertex 0 , 0; 634 glVertex 0 , 0;
627 glVertex 0 , $h; 635 glVertex 0 , $h;
628 glVertex $w, $h; 636 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
660 668
661sub new { 669sub new {
662 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
663 671
664 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
665 673
666 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
667 children => [], 675 children => [],
668 can_events => 0, 676 can_events => 0,
669 %arg, 677 %arg,
670 ); 678 );
679
671 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
672 682
673 $self 683 $self
674} 684}
675 685
676sub add { 686sub add {
… …
724 $x -= $self->{x}; 734 $x -= $self->{x};
725 $y -= $self->{y}; 735 $y -= $self->{y};
726 736
727 my $res; 737 my $res;
728 738
729 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
731 and return $res; 741 and return $res;
732 } 742 }
733 743
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
755} 765}
756 766
757sub add { 767sub add {
758 my ($self, $child) = @_; 768 my ($self, $child) = @_;
759 769
760 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
761
762 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
763} 772}
764 773
765sub remove { 774sub remove {
766 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
775 784
776sub size_request { 785sub size_request {
777 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
778} 787}
779 788
780sub size_allocate { 789sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
782 791
783 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
784} 795}
785 796
786############################################################################# 797#############################################################################
798
799# back-buffered drawing area
787 800
788package CFClient::UI::Window; 801package CFClient::UI::Window;
789 802
790our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
791 804
… …
802 815
803 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
804 $self->SUPER::update; 817 $self->SUPER::update;
805} 818}
806 819
807sub size_allocate { 820sub invoke_size_allocate {
808 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
809 822
810 $self->SUPER::size_allocate ($w, $h);
811 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
812} 826}
813 827
814sub _render { 828sub _render {
815 my ($self) = @_; 829 my ($self) = @_;
816 830
… …
843 my $tex = $self->{texture} 857 my $tex = $self->{texture}
844 or return; 858 or return;
845 859
846 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
849 863
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 865
852 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
853} 867}
… …
877 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
878 892
879 ($w, $h) 893 ($w, $h)
880} 894}
881 895
882sub size_allocate { 896sub invoke_size_allocate {
883 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
884 898
885 my $child = $self->child; 899 my $child = $self->child;
886 900
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889 903
890 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
891 $self->update; 905 $self->update;
906
907 1
892} 908}
893 909
894sub set_offset { 910sub set_offset {
895 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
896 912
… …
944package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
945 961
946our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
947 963
948sub new { 964sub new {
949 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
950 968
951 my $self; 969 my $self;
952 970
953 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
954 vertical => 1, 972 vertical => 1,
… …
959 ; 977 ;
960 978
961 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 981 slider => $slider,
964 @_, 982 %arg,
965 ); 983 );
966 984
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
970 987
971 $self 988 $self
972} 989}
973 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
974sub update { 1005sub update {
975 my ($self) = @_; 1006 my ($self) = @_;
976 1007
977 $self->SUPER::update; 1008 $self->SUPER::update;
978 1009
979 # todo: overwrite size_allocate of child 1010 $self->update_slider;
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982} 1011}
983 1012
984sub size_allocate { 1013sub invoke_size_allocate {
985 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
986 1015
1016 $self->update_slider;
1017
987 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991} 1019}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995 1020
996############################################################################# 1021#############################################################################
997 1022
998package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
999 1024
… …
1015 1040
1016 if ($self->{bg}) { 1041 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1018 1043
1019 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1022 1047
1023 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1049 glVertex 0 , 0;
1025 glVertex 0 , $h; 1050 glVertex 0 , $h;
1026 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1048my @border = 1073my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051 1076
1052sub new { 1077sub new {
1053 my $class = shift; 1078 my ($class, %arg) = @_;
1054 1079
1055 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1083 border => 0.6,
1059 can_events => 1, 1084 can_events => 1,
1060 min_w => 16, 1085 min_w => 16,
1061 min_h => 16, 1086 min_h => 16,
1062 @_ 1087 %arg,
1063 ); 1088 );
1064 1089
1065 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1066 align => 0, 1091 align => 0,
1067 valign => 1, 1092 valign => 1,
1068 text => $self->{title}, 1093 text => $self->{title},
1069 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1070 1105
1071 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1072} 1115}
1073 1116
1074sub border { 1117sub border {
1075 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1076} 1119}
1077 1120
1078sub size_request { 1121sub size_request {
1079 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1080 1129
1081 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1082 1131
1083 ( 1132 (
1084 $w + $self->border * 2, 1133 $w + $self->border * 2,
1085 $h + $self->border * 2, 1134 $h + $self->border * 2,
1086 ) 1135 )
1087} 1136}
1088 1137
1089sub size_allocate { 1138sub invoke_size_allocate {
1090 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1091 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
1092 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1094 1151
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1099}
1100 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1101sub button_down { 1168sub invoke_button_down {
1102 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1103 1170
1104 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1105 my $border = $self->border; 1172 my $border = $self->border;
1106 1173
… …
1122 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1123 1190
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1195 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1196 };
1130 1197
1131 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1137 1204
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1206
1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1141 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1142 } 1215 1
1143} 1216}
1144 1217
1145sub button_up { 1218sub invoke_button_up {
1146 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1147 1220
1148 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1149} 1222}
1150 1223
1151sub mouse_motion { 1224sub invoke_mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1153 1226
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1155} 1230}
1156 1231
1157sub _draw { 1232sub _draw {
1158 my ($self) = @_; 1233 my ($self) = @_;
1159 1234
1235 my $child = $self->{children}[0];
1236
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1239
1163 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1242
1166 my $border = $self->border; 1243 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1259 }
1183 1260
1184 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1185 1262
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1189} 1274}
1190 1275
1191############################################################################# 1276#############################################################################
1192 1277
1193package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1216 1301
1217 $child->set_parent ($self); 1302 $child->set_parent ($self);
1218 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1219 1304
1220 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1221} 1312}
1222 1313
1223# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1224sub clear { 1315sub clear {
1225 my ($self) = @_; 1316 my ($self) = @_;
… …
1266 (sum @$ws), 1357 (sum @$ws),
1267 (sum @$hs), 1358 (sum @$hs),
1268 ) 1359 )
1269} 1360}
1270 1361
1271sub size_allocate { 1362sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1273 1364
1274 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1275 1366
1276 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1308 } 1399 }
1309 1400
1310 $y += $row_h; 1401 $y += $row_h;
1311 } 1402 }
1312 1403
1404 1
1313} 1405}
1314 1406
1315sub find_widget { 1407sub find_widget {
1316 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1317 1409
… …
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 ) 1448 )
1357} 1449}
1358 1450
1359sub size_allocate { 1451sub invoke_size_allocate {
1360 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1361 1453
1362 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1363 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1364 1456
1365 my @req; 1457 my @req;
1366 1458
1367 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1368 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1369 } else { 1461 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1371 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1372 1464
1373 if ($req > $space) { 1465 if ($req > $space) {
1374 # ah well, not enough space 1466 # ah well, not enough space
1375 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1376 } else { 1468 } else {
1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1378 1470
1379 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1380 1472
1381 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1382 for 0 .. $#$children; 1474 for 0 .. $#children;
1383 } 1475 }
1384 } 1476 }
1385 1477
1386 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1387 1479
1388 my $pos = 0; 1480 my $pos = 0;
1389 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1390 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1392 1484
1393 $pos += $alloc; 1485 $pos += $alloc;
1394 } 1486 }
1395 1487
1396 1 1488 1
… …
1486 1578
1487 delete $self->{texture}; 1579 delete $self->{texture};
1488 $self->SUPER::update; 1580 $self->SUPER::update;
1489} 1581}
1490 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1491sub set_text { 1590sub set_text {
1492 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1493 1592
1494 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1496 1595
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1499 1598
1599 delete $self->{size_req};
1500 $self->realloc; 1600 $self->realloc;
1501 $self->update; 1601 $self->update;
1502} 1602}
1503 1603
1504sub set_markup { 1604sub set_markup {
… …
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1611
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1513 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1514 1614
1615 delete $self->{size_req};
1515 $self->realloc; 1616 $self->realloc;
1516 $self->update; 1617 $self->update;
1517} 1618}
1518 1619
1519sub size_request { 1620sub size_request {
1520 my ($self) = @_; 1621 my ($self) = @_;
1521 1622
1623 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1629
1528 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1529 1631
1530 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1635
1534 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1535 1637
1536 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1538 } 1643 };
1539 1644
1540 ($w, $h) 1645 @{ $self->{size_req} }
1541} 1646}
1542 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1543sub size_allocate { 1652sub invoke_size_allocate {
1544 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1654
1655 delete $self->{ox};
1545 1656
1546 delete $self->{texture} 1657 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1548} 1661}
1549 1662
1550sub set_fontsize { 1663sub set_fontsize {
1551 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1552 1665
1553 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1554 delete $self->{texture}; 1668 delete $self->{texture};
1555 1669
1556 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1557} 1679}
1558 1680
1559sub _draw { 1681sub _draw {
1560 my ($self) = @_; 1682 my ($self) = @_;
1561 1683
… …
1567 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1693
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1573 1696
1697 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1577 1701
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1705 };
1584 1706
1585 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1587 1711
1588 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1591 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1593 } 1719 }
1594 1720
1595 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1596} 1722}
1597 1723
… …
1614 can_hover => 1, 1740 can_hover => 1,
1615 can_focus => 1, 1741 can_focus => 1,
1616 valign => 0, 1742 valign => 0,
1617 can_events => 1, 1743 can_events => 1,
1618 #text => ... 1744 #text => ...
1745 #hidden => "*",
1619 @_ 1746 @_
1620 ) 1747 )
1621} 1748}
1622 1749
1623sub _set_text { 1750sub _set_text {
… …
1625 1752
1626 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1627 1754
1628 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1629 1756
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1758 $self->{text} = $text;
1634 1759
1635 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1637 1763
1638 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1639} 1768}
1640 1769
1641sub set_text { 1770sub set_text {
1642 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1643 1772
1644 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1774 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1775}
1649 1776
1650sub get_text { 1777sub get_text {
1651 $_[0]{text} 1778 $_[0]{text}
1652} 1779}
… …
1657 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1658 1785
1659 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1660} 1787}
1661 1788
1662sub key_down { 1789sub invoke_key_down {
1663 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1664 1791
1665 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1666 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1667 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1679 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1680 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1681 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1682 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1811 $self->emit ('escape');
1685 } elsif ($uni) { 1812 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1687 } 1816 }
1688 1817
1689 $self->_set_text ($text); 1818 $self->_set_text ($text);
1690 1819
1691 $self->realloc; 1820 $self->realloc;
1692}
1693 1821
1822 1
1823}
1824
1694sub focus_in { 1825sub invoke_focus_in {
1695 my ($self) = @_; 1826 my ($self) = @_;
1696 1827
1697 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1698 1829
1699 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1700} 1831}
1701 1832
1702sub button_down { 1833sub invoke_button_down {
1703 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1704 1835
1705 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1706 1837
1707 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1708 1839
1709 # byte-index to char-index 1840 # byte-index to char-index
1710 my $text = $self->{text}; 1841 my $text = $self->{text};
1711 utf8::encode $text; 1842 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1713 1844
1714 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1715 $self->update; 1846 $self->update;
1847
1848 1
1716} 1849}
1717 1850
1718sub mouse_motion { 1851sub invoke_mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1720# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1721} 1856}
1722 1857
1723sub _draw { 1858sub _draw {
1724 my ($self) = @_; 1859 my ($self) = @_;
1725 1860
1726 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1727 1862
1728 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1731 } else { 1866 } else {
1732 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1733 } 1868 }
1734 1869
1735 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1873 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1766 1901
1767our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1768 1903
1769use CFClient::OpenGL; 1904use CFClient::OpenGL;
1770 1905
1771sub key_down { 1906sub invoke_key_down {
1772 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1773 1908
1774 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1775 1910
1776 if ($sym == 13) { 1911 if ($sym == 13) {
1777 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1778 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1779 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1781 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1782 $self->update; 1918 $self->update;
1783 1919
1784 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1802 } else { 1938 } else {
1803 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1804 } 1940 }
1805 1941
1806 } else { 1942 } else {
1807 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1808 } 1946 1
1809
1810} 1947}
1811 1948
1812############################################################################# 1949#############################################################################
1813 1950
1814package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1835 can_events => 1, 1972 can_events => 1,
1836 @_ 1973 @_
1837 ) 1974 )
1838} 1975}
1839 1976
1840sub activate { }
1841
1842sub button_up { 1977sub invoke_button_up {
1843 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1844 1979
1845 $self->emit ("activate") 1980 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1848} 1985}
1849 1986
1850sub _draw { 1987sub _draw {
1851 my ($self) = @_; 1988 my ($self) = @_;
1852 1989
1853 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1991
1859 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1862 1995
1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1864 1997
1865 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1866 1999
1867 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1868} 2037}
1869 2038
1870############################################################################# 2039#############################################################################
1871 2040
1872package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1899 my ($self) = @_; 2068 my ($self) = @_;
1900 2069
1901 (6) x 2 2070 (6) x 2
1902} 2071}
1903 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1904sub button_down { 2081sub invoke_button_down {
1905 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1906 2083
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 2086 $self->toggle;
1910 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1911 } 2091 1
1912} 2092}
1913 2093
1914sub _draw { 2094sub _draw {
1915 my ($self) = @_; 2095 my ($self) = @_;
1916 2096
… …
1936package CFClient::UI::Image; 2116package CFClient::UI::Image;
1937 2117
1938our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1939 2119
1940use CFClient::OpenGL; 2120use CFClient::OpenGL;
1941use Carp qw/confess/;
1942 2121
1943our %loaded_images; 2122our %texture_cache;
1944 2123
1945sub new { 2124sub new {
1946 my $class = shift; 2125 my $class = shift;
1947 2126
1948 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1949 2131
1950 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1951 2134
1952 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1953 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1954 2137
1955 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1956 2139
1957 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1958
1959 $self->{aspect} = $tex->{w} / $tex->{h};
1960 2141
1961 $self 2142 $self
1962} 2143}
1963 2144
1964sub size_request { 2145sub size_request {
1965 my ($self) = @_; 2146 my ($self) = @_;
1966 2147
1967 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1968} 2149}
1969 2150
1970sub _draw { 2151sub _draw {
1971 my ($self) = @_; 2152 my ($self) = @_;
1972 2153
… …
2081 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2082 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2083 2264
2084 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2086 2270
2087 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2276
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2108 2293
2109 if ($t3) { 2294 if ($t3) {
2110 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2111 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2112 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2113 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2114 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2115 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2116 glEnd; 2301 glEnd;
2117 } 2302 }
2118 2303
2119 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2207 $self->update; 2392 $self->update;
2208 2393
2209 $self 2394 $self
2210} 2395}
2211 2396
2212sub changed { }
2213
2214sub set_range { 2397sub set_range {
2215 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2216 2399
2217 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2218 2401
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2221} 2406}
2222 2407
2223sub set_value { 2408sub set_value {
2224 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2225 2410
… …
2236 if $unit; 2421 if $unit;
2237 2422
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239 2424
2240 if ($value != $old_value) { 2425 if ($value != $old_value) {
2241 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2242 $self->update; 2427 $self->update;
2243 } 2428 }
2244} 2429}
2245 2430
2246sub size_request { 2431sub size_request {
2247 my ($self) = @_; 2432 my ($self) = @_;
2248 2433
2249 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2250} 2435}
2251 2436
2252sub button_down { 2437sub invoke_button_down {
2253 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2254 2439
2255 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2256 2441
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2443
2259 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2260} 2445}
2261 2446
2262sub mouse_motion { 2447sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2264 2449
2265 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267 2452
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2454
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2456
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2273 } 2462 1
2274} 2463}
2275 2464
2276sub update { 2465sub update {
2277 my ($self) = @_; 2466 my ($self) = @_;
2278 2467
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2281 2477
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2284 2480
… …
2290 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2292 2488
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2295 }); 2491 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2492
2303 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2304 2494
2305 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2306 2496
… …
2367sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2369 2559
2370############################################################################# 2560#############################################################################
2371 2561
2372package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2373 2563
2374our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2375 2565
2376use CFClient::OpenGL; 2566use CFClient::OpenGL;
2377 2567
… …
2379 my $class = shift; 2569 my $class = shift;
2380 2570
2381 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2382 fontsize => 1, 2572 fontsize => 1,
2383 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2384 #font => default_font 2575 #font => default_font
2385 @_, 2576 @_,
2386 2577
2387 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2388 par => [], 2579 par => [],
… …
2403 2594
2404 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2405 $self->reflow; 2596 $self->reflow;
2406} 2597}
2407 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2408sub size_allocate { 2608sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2410 2610
2411 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2412 2613
2413 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416 2618
2417 $self->reflow; 2619 $self->reflow;
2418}
2419 2620
2420sub text_size { 2621 local $self->{children} = [$empty, $slider];
2421 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2422 2627
2423 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2424 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2428 2641 );
2642
2429 $layout->size 2643 $layout
2430} 2644}
2431 2645
2432sub reflow { 2646sub reflow {
2433 my ($self) = @_; 2647 my ($self) = @_;
2434 2648
… …
2443 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2444} 2658}
2445 2659
2446sub clear { 2660sub clear {
2447 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2448 2665
2449 $self->{par} = []; 2666 $self->{par} = [];
2450 $self->{height} = 0; 2667 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452} 2669}
2453 2670
2454sub add_paragraph { 2671sub add_paragraph {
2455 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2456 2673
2457 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2458 my ($w, $h) = $self->text_size ($line); 2675
2459 $self->{height} += $h; 2676 $para = {
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2461 } 2683 };
2462 2684
2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2464} 2697}
2465 2698
2466sub update { 2699sub update {
2467 my ($self) = @_; 2700 my ($self) = @_;
2468 2701
… …
2470 2703
2471 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2472 2705
2473 delete $self->{texture}; 2706 delete $self->{texture};
2474 2707
2475 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477 2710
2478 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2479 my $height = 0; 2712 my $height = 0;
2480 2713
2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2485 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2487 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3]; 2718
2491 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2492 } 2722 }
2493 2723
2494 $height += $_->[1]; 2724 $height += $para->{h};
2495 } 2725 }
2496 2726
2497 $self->{height} = $height; 2727 $self->{height} = $height;
2498 2728
2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2500 2730
2501 delete $self->{texture}; 2731 delete $self->{texture};
2502 } 2732 }
2503 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2507 2741
2508 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2509 2743
2510 my $y0 = $top; 2744 my $y0 = $top;
2511 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2512 2746
2513 my $y = 0; 2747 my $y = 0;
2514
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518 2748
2519 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522 2752
2523 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2524 my $h = $par->[1]; 2754 my $h = $para->{h};
2525 2755
2526 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] }); 2757
2528 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2529 $layout->set_markup ($par->[4]);
2530 2759
2531 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2532 2761
2533 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2535 } 2780 }
2536 2781
2537 $y += $h; 2782 $y += $h;
2538 } 2783 }
2539 2784
2540 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2541 }; 2786 };
2542 }); 2787 });
2543} 2788}
2544 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2545sub _draw { 2799sub _draw {
2546 my ($self) = @_; 2800 my ($self) = @_;
2547 2801
2548 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2553 2807
2554 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2555
2556} 2809}
2557 2810
2558############################################################################# 2811#############################################################################
2559 2812
2560package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2647 $tooltip .= "\n\n" . (ref $widget) . "\n" 2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n" 2902 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}"; 2903 . "visible $widget->{visible}";
2651 } 2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2652 2908
2653 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2654 markup => $tooltip, 2910 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8, 2912 fontsize => 0.8,
… …
2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667 2923
2668 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2669} 2925}
2670 2926
2671sub size_allocate { 2927sub invoke_size_allocate {
2672 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2673 2929
2674 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675} 2931}
2676 2932
2677sub visibility_change { 2933sub invoke_visibility_change {
2678 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2679 2935
2680 return unless $visible; 2936 return unless $visible;
2681 2937
2682 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2684 or return; 2940 or return;
2685 2941
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687 2943
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2690 2946
2691 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2692 }); 2948 });
2693} 2949}
2694 2950
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 3040
2785 if ($tex) { 3041 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2791 } 3047 }
2792} 3048}
2793 3049
2794sub DESTROY { 3050sub destroy {
2795 my ($self) = @_; 3051 my ($self) = @_;
2796 3052
2797 $self->{timer}->cancel 3053 $self->{timer}->cancel
2798 if $self->{timer}; 3054 if $self->{timer};
2799 3055
2800 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2801} 3057}
3058
3059#############################################################################
3060
3061package CFClient::UI::Buttonbar;
3062
3063our @ISA = CFClient::UI::HBox::;
3064
3065# TODO: should actualyl wrap buttons and other goodies.
2802 3066
2803############################################################################# 3067#############################################################################
2804 3068
2805package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2806 3070
… …
2818 ); 3082 );
2819 3083
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 3085
2822 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2824 3088
2825 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2826 if (!ref $widget) { 3090 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2828 can_hover => 1, 3092 can_hover => 1,
2829 can_events => 1, 3093 can_events => 1,
2830 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2831 } 3096 }
2832 3097
2833 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2834 3099
2835 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2840 3105
2841# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2842sub popup { 3107sub popup {
2843 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2844 3109
2845 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2846 3111
2847 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3113 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2850 3115
2851 $self->show; 3116 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3118}
2854 3119
2855sub mouse_motion { 3120sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2857 3122
2858 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3126
3127 0
3128}
3129
2863sub button_up { 3130sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2865 3132
2866 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3134 undef $GRAB;
2868 $self->hide; 3135 $self->hide;
2869 3136
2870 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2872 } 3143 1
2873} 3144}
2874 3145
2875############################################################################# 3146#############################################################################
2876 3147
2877package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2878 3149
2879our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2880 3151
2881sub new { 3152sub new {
2882 my $class = shift; 3153 my $class = shift;
2883 3154
2884 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3334 fontsize => 0.8,
2886 @_, 3335 @_,
2887 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2888} 3343}
2889 3344
2890sub reorder { 3345sub reorder {
2891 my ($self) = @_; 3346 my ($self) = @_;
2892 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2893 3353
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3356 }
2897 3357
… …
2900 my @items = sort { 3360 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2904 3364
3365 $self->{timer}->interval (1);
3366
2905 my $count = 10 + 1; 3367 my $count = 10 + 1;
2906 for my $item (@items) { 3368 for my $item (@items) {
2907 last unless --$count; 3369 last unless --$count;
2908 3370
2909 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3375 : $item->{text};
2914 3376
… …
2922 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3390 can_events => 1,
2929 can_hover => 1 3391 can_hover => 1
2930 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2931 } 3405 }
2932 3406
2933 $self->clear; 3407 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2935} 3409}
… …
2940 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2942 3416
2943 return unless $text; 3417 return unless $text;
2944 3418
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3420
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3422
2949 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2951 $item->{count}++; 3425 $item->{count}++;
2952 } else { 3426 } else {
2953 $item->{count} = 1; 3427 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2955 } 3429 }
2956 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2957 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2958 delete $item->{label}; 3432 delete $item->{label};
2959 } else { 3433 } else {
2960 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2961 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
2967 count => 1, 3441 count => 1,
2968 %arg, 3442 %arg,
2969 }; 3443 };
2970 } 3444 }
2971 3445
3446 $ROOT->on_refresh (reorder => sub {
2972 $self->reorder; 3447 $self->reorder;
3448 });
2973} 3449}
2974 3450
2975sub reconfigure { 3451sub reconfigure {
2976 my ($self) = @_; 3452 my ($self) = @_;
2977 3453
… …
2980 3456
2981 $self->reorder; 3457 $self->reorder;
2982 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2983} 3459}
2984 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
2985############################################################################# 3469#############################################################################
2986 3470
2987package CFClient::UI::Inventory; 3471package CFClient::UI::Inventory;
2988 3472
2989our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
2990 3474
2991sub new { 3475sub new {
2992 my $class = shift; 3476 my $class = shift;
2993 3477
2994 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3479 col_expand => [0, 1, 0],
2996 @_, 3480 @_,
2997 ); 3481 );
2998 3482
2999 $self 3483 $self
3000} 3484}
3001 3485
3002sub set_items { 3486sub set_items {
3003 my ($self, $items) = @_; 3487 my ($self, $items) = @_;
3004 3488
3005 $self->{scrolled}->clear; 3489 $self->clear;
3006 return unless $items; 3490 return unless $items;
3007 3491
3008 my @items = sort { 3492 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3493 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3494 or ($a->{name} cmp $b->{name})
3011 } @$items; 3495 } values %$items;
3012 3496
3013 $self->{real_items} = \@items; 3497 $self->{real_items} = \@items;
3014 3498
3015 my $row = 0; 3499 my $row = 0;
3016 for my $item (@items) { 3500 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3501 CFClient::Item::update_widgets $item;
3018 3502
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3503 $self->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3504 $self->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3505 $self->add (2, $row, $item->{weight_widget});
3022 3506
3023 $row++; 3507 $row++;
3024 } 3508 }
3025} 3509}
3026 3510
3027############################################################################# 3511#############################################################################
3028 3512
3029package CFClient::UI::BindEditor; 3513package CFClient::UI::SpellList;
3030 3514
3031our @ISA = CFClient::UI::FancyFrame::; 3515our @ISA = CFClient::UI::Table::;
3032 3516
3033sub new { 3517sub new {
3034 my $class = shift; 3518 my $class = shift;
3035 3519
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3037 3526
3038 $self->add (my $vb = new CFClient::UI::VBox); 3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3039 3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3040 3539
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3540sub rebuild_spell_list {
3042 text => "start recording", 3541 my ($self) = @_;
3043 tooltip => "Start/Stops recording of actions." 3542
3044 ."All subsequent actions after the recording started will be captured." 3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3045 ."The actions are displayed after the record was stopped." 3544 $self->clear;
3046 ."To bind the action you have to click on the 'Bind' button", 3545
3047 on_activate => sub { 3546 return unless $::CONN;
3048 unless ($self->{recording}) { 3547
3049 $self->start; 3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3050 } else { 3575 } else {
3051 $self->stop; 3576 return 0;
3577 }
3578
3579 1
3052 } 3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3053 }); 3608 }
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 }); 3609 });
3139} 3610}
3140 3611
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell { 3612sub add_spell {
3238 my ($self, $spell) = @_; 3613 my ($self, $spell) = @_;
3614
3239 $self->{spells}->{$spell->{name}} = $spell; 3615 $self->{spell}->{$spell->{name}} = $spell;
3240 3616 $self->rebuild_spell_list;
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268} 3617}
3269 3618
3270sub remove_spell { 3619sub remove_spell {
3271 my ($self, $spell) = @_; 3620 my ($self, $spell) = @_;
3621
3272 delete $self->{spells}->{$spell->{name}}; 3622 delete $self->{spell}->{$spell->{name}};
3273 $self->rebuild_spell_list; 3623 $self->rebuild_spell_list;
3274} 3624}
3275 3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3276############################################################################# 3633#############################################################################
3277 3634
3278package CFClient::UI::Root; 3635package CFClient::UI::Root;
3279 3636
3280our @ISA = CFClient::UI::Container::; 3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3281 3640
3282use CFClient::OpenGL; 3641use CFClient::OpenGL;
3283 3642
3284sub new { 3643sub new {
3285 my $class = shift; 3644 my $class = shift;
… …
3312 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3313 3672
3314 int $coord + 0.5 3673 int $coord + 0.5
3315} 3674}
3316 3675
3317sub size_allocate { 3676sub invoke_size_allocate {
3318 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
3319 3678
3320 for my $child ($self->children) { 3679 for my $child ($self->children) {
3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3322 3681
… …
3326 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3328 3687
3329 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3330 } 3689 }
3690
3691 1
3331} 3692}
3332 3693
3333sub coord2local { 3694sub coord2local {
3334 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3335 3696
… …
3420 3781
3421 delete $queue{$widget+0}; 3782 delete $queue{$widget+0};
3422 3783
3423 my ($w, $h) = $widget->size_request; 3784 my ($w, $h) = $widget->size_request;
3424 3785
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3791
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3792 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3793 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3794
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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