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

Diff Legend

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