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

Diff Legend

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