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.271 by root, Fri Jun 2 22:13:47 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 { 0 } 459sub invoke_mouse_motion { 0 }
445sub button_up { 0 } 460sub invoke_button_up { 0 }
446sub key_down { 0 } 461sub invoke_key_down { 0 }
447sub key_up { 0 } 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#
453 470
454 0 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
455} 487}
456 488
457sub find_widget { 489sub find_widget {
458 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
459 491
… …
469sub set_parent { 501sub set_parent {
470 my ($self, $parent) = @_; 502 my ($self, $parent) = @_;
471 503
472 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 505 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497} 506}
498 507
499sub realloc { 508sub realloc {
500 my ($self) = @_; 509 my ($self) = @_;
501 510
… …
534 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
535 544
536 # update screen rectangle 545 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 548
542 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 552
546 glPushMatrix; 553 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 555
551 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 558 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 560 glBegin GL_QUADS;
558 glVertex $x , $y; 561 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
562 glEnd; 565 glEnd;
563 glDisable GL_BLEND; 566 glDisable GL_BLEND;
564 } 567 }
565 568
566 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 570 glPushMatrix;
568 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 574 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
575 glEnd; 578 glEnd;
576 glPopMatrix; 579 glPopMatrix;
577 #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;
578 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
579} 585}
580 586
581sub _draw { 587sub _draw {
582 my ($self) = @_; 588 my ($self) = @_;
583 589
… …
585} 591}
586 592
587sub DESTROY { 593sub DESTROY {
588 my ($self) = @_; 594 my ($self) = @_;
589 595
596 return if CFClient::in_destruct;
597
590 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
591 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
592} 602}
593 603
594############################################################################# 604#############################################################################
595 605
596package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
621 631
622 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
624 634
625 glEnable GL_BLEND; 635 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 637 glColor_premultiply @$color;
628 638
629 glBegin GL_QUADS; 639 glBegin GL_QUADS;
630 glVertex 0 , 0; 640 glVertex 0 , 0;
631 glVertex 0 , $h; 641 glVertex 0 , $h;
632 glVertex $w, $h; 642 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
664 674
665sub new { 675sub new {
666 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
667 677
668 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
669 679
670 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
671 children => [], 681 children => [],
672 can_events => 0, 682 can_events => 0,
673 %arg, 683 %arg,
674 ); 684 );
685
675 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
676 688
677 $self 689 $self
678} 690}
679 691
680sub add { 692sub add {
… …
728 $x -= $self->{x}; 740 $x -= $self->{x};
729 $y -= $self->{y}; 741 $y -= $self->{y};
730 742
731 my $res; 743 my $res;
732 744
733 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
735 and return $res; 747 and return $res;
736 } 748 }
737 749
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
759} 771}
760 772
761sub add { 773sub add {
762 my ($self, $child) = @_; 774 my ($self, $child) = @_;
763 775
764 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
765
766 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
767} 778}
768 779
769sub remove { 780sub remove {
770 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
779 790
780sub size_request { 791sub size_request {
781 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
782} 793}
783 794
784sub size_allocate { 795sub invoke_size_allocate {
785 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
786 797
787 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
788} 801}
789 802
790############################################################################# 803#############################################################################
804
805# back-buffered drawing area
791 806
792package CFClient::UI::Window; 807package CFClient::UI::Window;
793 808
794our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
795 810
… …
806 821
807 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
808 $self->SUPER::update; 823 $self->SUPER::update;
809} 824}
810 825
811sub size_allocate { 826sub invoke_size_allocate {
812 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
813 828
814 $self->SUPER::size_allocate ($w, $h);
815 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
816} 832}
817 833
818sub _render { 834sub _render {
819 my ($self) = @_; 835 my ($self) = @_;
820 836
… …
847 my $tex = $self->{texture} 863 my $tex = $self->{texture}
848 or return; 864 or return;
849 865
850 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
853 869
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 871
856 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
857} 873}
… …
881 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
882 898
883 ($w, $h) 899 ($w, $h)
884} 900}
885 901
886sub size_allocate { 902sub invoke_size_allocate {
887 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
888 904
889 my $child = $self->child; 905 my $child = $self->child;
890 906
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893 909
894 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
895 $self->update; 911 $self->update;
912
913 1
896} 914}
897 915
898sub set_offset { 916sub set_offset {
899 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
900 918
… …
948package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
949 967
950our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
951 969
952sub new { 970sub new {
953 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
954 974
955 my $self; 975 my $self;
956 976
957 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
958 vertical => 1, 978 vertical => 1,
… …
963 ; 983 ;
964 984
965 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 987 slider => $slider,
968 @_, 988 %arg,
969 ); 989 );
970 990
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
974 993
975 $self 994 $self
976} 995}
977 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
978sub update { 1019sub update {
979 my ($self) = @_; 1020 my ($self) = @_;
980 1021
981 $self->SUPER::update; 1022 $self->SUPER::update;
982 1023
983 # todo: overwrite size_allocate of child 1024 $self->update_slider;
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986} 1025}
987 1026
988sub size_allocate { 1027sub invoke_size_allocate {
989 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
990 1029
1030 $self->update_slider;
1031
991 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
995} 1033}
996
997#TODO# update range on size_allocate depending on child
998# update viewport offset on scroll
999 1034
1000############################################################################# 1035#############################################################################
1001 1036
1002package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1003 1038
… …
1019 1054
1020 if ($self->{bg}) { 1055 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
1022 1057
1023 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
1026 1061
1027 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1063 glVertex 0 , 0;
1029 glVertex 0 , $h; 1064 glVertex 0 , $h;
1030 glVertex $w, $h; 1065 glVertex $w, $h;
… …
1054 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);
1055 1090
1056sub new { 1091sub new {
1057 my ($class, %arg) = @_; 1092 my ($class, %arg) = @_;
1058 1093
1059 my $title = delete $arg{title};
1060
1061 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1097 border => 0.6,
1065 can_events => 1, 1098 can_events => 1,
1066 min_w => 16, 1099 min_w => 64,
1067 min_h => 16, 1100 min_h => 32,
1068 %arg, 1101 %arg,
1069 ); 1102 );
1070 1103
1071 $self->{title} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1072 align => 0, 1105 align => 0,
1073 valign => 1, 1106 valign => 1,
1074 text => $title, 1107 text => $self->{title},
1075 fontsize => $self->{border} 1108 fontsize => $self->{border},
1076 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 }
1077 1119
1078 $self 1120 $self
1079} 1121}
1080 1122
1081sub add { 1123sub add {
1082 my ($self, @widgets) = @_; 1124 my ($self, @widgets) = @_;
1083 1125
1084 $self->SUPER::add (@widgets); 1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1129}
1087 1130
1088sub border { 1131sub border {
1089 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1090} 1133}
1091 1134
1092sub size_request { 1135sub size_request {
1093 my ($self) = @_; 1136 my ($self) = @_;
1094 1137
1095 $self->{title}->size_request 1138 $self->{title_widget}->size_request
1096 if $self->{title}; 1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
1097 1143
1098 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1099 1145
1100 ( 1146 (
1101 $w + $self->border * 2, 1147 $w + $self->border * 2,
1102 $h + $self->border * 2, 1148 $h + $self->border * 2,
1103 ) 1149 )
1104} 1150}
1105 1151
1106sub size_allocate { 1152sub invoke_size_allocate {
1107 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1108 1154
1109 if ($self->{title}) { 1155 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1156 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1157 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1113 } 1159 }
1114 1160
1115 my $border = $self->border; 1161 my $border = $self->border;
1116 1162
1117 $h -= List::Util::max 0, $border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1118 $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;
1119 1178
1120 $self->child->configure ($border, $border, $w, $h); 1179 1
1121} 1180}
1122 1181
1123sub button_down { 1182sub invoke_button_down {
1124 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1125 1184
1126 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1127 my $border = $self->border; 1186 my $border = $self->border;
1128 1187
… …
1144 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
1145 1204
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1207
1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1209 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1210 };
1152 1211
1153 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
1159 1218
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1220
1162 $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});
1163 }; 1224 };
1164 } else { 1225 } else {
1165 return 0; 1226 return 0;
1166 } 1227 }
1167 1228
1168 1 1229 1
1169} 1230}
1170 1231
1171sub button_up { 1232sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1173 1234
1174 !!delete $self->{motion} 1235 ! ! delete $self->{motion}
1175} 1236}
1176 1237
1177sub mouse_motion { 1238sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1179 1240
1180 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181 1242
1182 !!$self->{motion} 1243 ! ! $self->{motion}
1183} 1244}
1184 1245
1185sub _draw { 1246sub _draw {
1186 my ($self) = @_; 1247 my ($self) = @_;
1187 1248
… …
1213 1274
1214 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1215 1276
1216 $child->draw; 1277 $child->draw;
1217 1278
1218 if ($self->{title}) { 1279 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1280 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1221 } 1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1222} 1288}
1223 1289
1224############################################################################# 1290#############################################################################
1225 1291
1226package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1249 1315
1250 $child->set_parent ($self); 1316 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1252 1318
1253 $self->realloc; 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1254} 1326}
1255 1327
1256# 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?
1257sub clear { 1329sub clear {
1258 my ($self) = @_; 1330 my ($self) = @_;
… …
1299 (sum @$ws), 1371 (sum @$ws),
1300 (sum @$hs), 1372 (sum @$hs),
1301 ) 1373 )
1302} 1374}
1303 1375
1304sub size_allocate { 1376sub invoke_size_allocate {
1305 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1306 1378
1307 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1308 1380
1309 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
… …
1341 } 1413 }
1342 1414
1343 $y += $row_h; 1415 $y += $row_h;
1344 } 1416 }
1345 1417
1418 1
1346} 1419}
1347 1420
1348sub find_widget { 1421sub find_widget {
1349 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1350 1423
… …
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 ) 1462 )
1390} 1463}
1391 1464
1392sub size_allocate { 1465sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1394 1467
1395 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1396 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1397 1470
1398 my @req; 1471 my @req;
1399 1472
1400 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1401 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1402 } else { 1475 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1404 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1405 1478
1406 if ($req > $space) { 1479 if ($req > $space) {
1407 # ah well, not enough space 1480 # ah well, not enough space
1408 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1409 } else { 1482 } else {
1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1411 1484
1412 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1413 1486
1414 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1415 for 0 .. $#$children; 1488 for 0 .. $#children;
1416 } 1489 }
1417 } 1490 }
1418 1491
1419 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1420 1493
1421 my $pos = 0; 1494 my $pos = 0;
1422 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1423 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1424 $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));
1425 1498
1426 $pos += $alloc; 1499 $pos += $alloc;
1427 } 1500 }
1428 1501
1429 1 1502 1
… …
1519 1592
1520 delete $self->{texture}; 1593 delete $self->{texture};
1521 $self->SUPER::update; 1594 $self->SUPER::update;
1522} 1595}
1523 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1524sub set_text { 1604sub set_text {
1525 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1526 1606
1527 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1529 1609
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1532 1611
1612 delete $self->{size_req};
1533 $self->realloc; 1613 $self->realloc;
1534 $self->update; 1614 $self->update;
1535} 1615}
1536 1616
1537sub set_markup { 1617sub set_markup {
… …
1540 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1541 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1542 1622
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1624
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1547 1626
1627 delete $self->{size_req};
1548 $self->realloc; 1628 $self->realloc;
1549 $self->update; 1629 $self->update;
1550} 1630}
1551 1631
1552sub size_request { 1632sub size_request {
1553 my ($self) = @_; 1633 my ($self) = @_;
1554 1634
1635 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1641
1561 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1562 1643
1563 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1564 $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);
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1648
1567 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1568 1650
1569 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1571 } 1656 };
1572 1657
1573 ($w, $h) 1658 @{ $self->{size_req} }
1574} 1659}
1575 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1576sub size_allocate { 1665sub invoke_size_allocate {
1577 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1578 1667
1579 delete $self->{ox}; 1668 delete $self->{ox};
1580 1669
1581 delete $self->{texture} 1670 delete $self->{texture}
1582 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
1583} 1674}
1584 1675
1585sub set_fontsize { 1676sub set_fontsize {
1586 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1587 1678
1588 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1589 delete $self->{texture}; 1681 delete $self->{texture};
1590 1682
1591 $self->realloc; 1683 $self->realloc;
1592} 1684}
1593 1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1693}
1694
1594sub _draw { 1695sub _draw {
1595 my ($self) = @_; 1696 my ($self) = @_;
1596 1697
1597 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1598 1699
1599 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1601 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1602 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606 1707
1607 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1608 }; 1709 };
1609 1710
1610 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1613 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1614 1715
1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1618 }; 1719 };
1619 1720
1620 glEnable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1622 1723
1623 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1624 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else {
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 }
1629
1630 glDisable GL_TEXTURE_2D;
1631} 1725}
1632 1726
1633############################################################################# 1727#############################################################################
1634 1728
1635package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1649 can_hover => 1, 1743 can_hover => 1,
1650 can_focus => 1, 1744 can_focus => 1,
1651 valign => 0, 1745 valign => 0,
1652 can_events => 1, 1746 can_events => 1,
1653 #text => ... 1747 #text => ...
1748 #hidden => "*",
1654 @_ 1749 @_
1655 ) 1750 )
1656} 1751}
1657 1752
1658sub _set_text { 1753sub _set_text {
… …
1660 1755
1661 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1662 1757
1663 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1664 1759
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1761 $self->{text} = $text;
1669 1762
1670 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1672 1766
1673 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1674} 1771}
1675 1772
1676sub set_text { 1773sub set_text {
1677 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1678 1775
1679 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1777 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1778}
1684 1779
1685sub get_text { 1780sub get_text {
1686 $_[0]{text} 1781 $_[0]{text}
1687} 1782}
… …
1692 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1693 1788
1694 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1695} 1790}
1696 1791
1697sub key_down { 1792sub invoke_key_down {
1698 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1699 1794
1700 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1701 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1702 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1714 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1715 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1716 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1717 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1718 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1719 $self->_emit ('escape'); 1814 $self->emit ('escape');
1720 } elsif ($uni) { 1815 } elsif ($uni) {
1721 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else { 1817 } else {
1723 return 0; 1818 return 0;
1724 } 1819 }
… …
1728 $self->realloc; 1823 $self->realloc;
1729 1824
1730 1 1825 1
1731} 1826}
1732 1827
1733sub focus_in { 1828sub invoke_focus_in {
1734 my ($self) = @_; 1829 my ($self) = @_;
1735 1830
1736 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1737 1832
1738 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1739} 1834}
1740 1835
1741sub button_down { 1836sub invoke_button_down {
1742 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1743 1838
1744 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1745 1840
1746 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1747 1842
1748 # byte-index to char-index 1843 # byte-index to char-index
1749 my $text = $self->{text}; 1844 my $text = $self->{text};
1750 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1751 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1752 1847
1753 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1754 $self->update; 1849 $self->update;
1755 1850
1756 1 1851 1
1757} 1852}
1758 1853
1759sub mouse_motion { 1854sub invoke_mouse_motion {
1760 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1761# 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#
1762 1857
1763 0 1858 1
1764} 1859}
1765 1860
1766sub _draw { 1861sub _draw {
1767 my ($self) = @_; 1862 my ($self) = @_;
1768 1863
1769 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1770 1865
1771 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1774 } else { 1869 } else {
1775 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1776 } 1871 }
1777 1872
1778 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1876 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1809 1904
1810our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1811 1906
1812use CFClient::OpenGL; 1907use CFClient::OpenGL;
1813 1908
1814sub key_down { 1909sub invoke_key_down {
1815 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1816 1911
1817 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1818 1913
1819 if ($sym == 13) { 1914 if ($sym == 13) {
1820 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1821 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1822 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1824 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1825 $self->update; 1921 $self->update;
1826 1922
1827 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1828 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1829 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1845 } else { 1941 } else {
1846 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1847 } 1943 }
1848 1944
1849 } else { 1945 } else {
1850 return $self->SUPER::key_down ($ev) 1946 return $self->SUPER::invoke_key_down ($ev)
1851 } 1947 }
1852 1948
1853 1 1949 1
1854} 1950}
1855 1951
… …
1879 can_events => 1, 1975 can_events => 1,
1880 @_ 1976 @_
1881 ) 1977 )
1882} 1978}
1883 1979
1884sub activate { }
1885
1886sub button_up { 1980sub invoke_button_up {
1887 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1888 1982
1889 $self->emit ("activate") 1983 $self->emit ("activate")
1890 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1891 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
… …
1894} 1988}
1895 1989
1896sub _draw { 1990sub _draw {
1897 my ($self) = @_; 1991 my ($self) = @_;
1898 1992
1899 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1994
1905 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1908 1998
1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1910 2000
1911 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1912 2002
1913 $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
1914} 2040}
1915 2041
1916############################################################################# 2042#############################################################################
1917 2043
1918package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
… …
1945 my ($self) = @_; 2071 my ($self) = @_;
1946 2072
1947 (6) x 2 2073 (6) x 2
1948} 2074}
1949 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1950sub button_down { 2084sub invoke_button_down {
1951 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1952 2086
1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1955 $self->{state} = !$self->{state}; 2089 $self->toggle;
1956 $self->_emit (changed => $self->{state});
1957 } else { 2090 } else {
1958 return 0 2091 return 0
1959 } 2092 }
1960 2093
1961 1 2094 1
… …
1986package CFClient::UI::Image; 2119package CFClient::UI::Image;
1987 2120
1988our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1989 2122
1990use CFClient::OpenGL; 2123use CFClient::OpenGL;
1991use Carp qw/confess/;
1992 2124
1993our %loaded_images; 2125our %texture_cache;
1994 2126
1995sub new { 2127sub new {
1996 my $class = shift; 2128 my $class = shift;
1997 2129
1998 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1999 2134
2000 $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";
2001 2137
2002 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2003 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;
2004 2140
2005 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2006 2142
2007 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2008
2009 $self->{aspect} = $tex->{w} / $tex->{h};
2010 2144
2011 $self 2145 $self
2012} 2146}
2013 2147
2014sub size_request { 2148sub size_request {
2015 my ($self) = @_; 2149 my ($self) = @_;
2016 2150
2017 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
2018} 2152}
2019 2153
2020sub _draw { 2154sub _draw {
2021 my ($self) = @_; 2155 my ($self) = @_;
2022 2156
… …
2131 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2132 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2133 2267
2134 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2135 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);
2136 2273
2137 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2138 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;
2139 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2279
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
2158 2296
2159 if ($t3) { 2297 if ($t3) {
2160 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2161 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2162 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2163 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2164 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2165 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2166 glEnd; 2304 glEnd;
2167 } 2305 }
2168 2306
2169 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2257 $self->update; 2395 $self->update;
2258 2396
2259 $self 2397 $self
2260} 2398}
2261 2399
2262sub changed { }
2263
2264sub set_range { 2400sub set_range {
2265 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2266 2402
2267 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2268 2404
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2271} 2409}
2272 2410
2273sub set_value { 2411sub set_value {
2274 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2275 2413
… …
2286 if $unit; 2424 if $unit;
2287 2425
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289 2427
2290 if ($value != $old_value) { 2428 if ($value != $old_value) {
2291 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2292 $self->update; 2430 $self->update;
2293 } 2431 }
2294} 2432}
2295 2433
2296sub size_request { 2434sub size_request {
2297 my ($self) = @_; 2435 my ($self) = @_;
2298 2436
2299 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2300} 2438}
2301 2439
2302sub button_down { 2440sub invoke_button_down {
2303 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2304 2442
2305 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2306 2444
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308 2446
2309 $self->mouse_motion ($ev, $x, $y) 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2310} 2448}
2311 2449
2312sub mouse_motion { 2450sub invoke_mouse_motion {
2313 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2314 2452
2315 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317 2455
… …
2328} 2466}
2329 2467
2330sub update { 2468sub update {
2331 my ($self) = @_; 2469 my ($self) = @_;
2332 2470
2333 $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}) {
2334 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2335 2480
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2482 my $range = ($hi - $page - $lo) || 1e-100;
2338 2483
… …
2344 $value = ($value - $lo) / $range; 2489 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2490 $value = $value * $self->{scale} + $self->{offset};
2346 2491
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2493 $self->{knob_w} = $knob_w;
2349 }); 2494 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2495
2357 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2358 2497
2359 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2360 2499
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2423 2562
2424############################################################################# 2563#############################################################################
2425 2564
2426package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2427 2566
2428our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2429 2568
2430use CFClient::OpenGL; 2569use CFClient::OpenGL;
2431 2570
… …
2433 my $class = shift; 2572 my $class = shift;
2434 2573
2435 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2436 fontsize => 1, 2575 fontsize => 1,
2437 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2438 #font => default_font 2578 #font => default_font
2439 @_, 2579 @_,
2440 2580
2441 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2442 par => [], 2582 par => [],
2443 height => 0, 2583 height => 0,
2444 children => [ 2584 children => [
2445 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2446 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2457 2597
2458 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2459 $self->reflow; 2599 $self->reflow;
2460} 2600}
2461 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
2462sub size_allocate { 2611sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2464 2613
2465 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2466 2616
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $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});
2470 2621
2471 $self->reflow; 2622 $self->reflow;
2472}
2473 2623
2474sub text_size { 2624 local $self->{children} = [$empty, $slider];
2475 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2476 2630
2477 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2478 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $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});
2481 $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}}
2482 2644 );
2645
2483 $layout->size 2646 $layout
2484} 2647}
2485 2648
2486sub reflow { 2649sub reflow {
2487 my ($self) = @_; 2650 my ($self) = @_;
2488 2651
… …
2497 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2498} 2661}
2499 2662
2500sub clear { 2663sub clear {
2501 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2502 2668
2503 $self->{par} = []; 2669 $self->{par} = [];
2504 $self->{height} = 0; 2670 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506} 2672}
2507 2673
2508sub add_paragraph { 2674sub add_paragraph {
2509 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2510 2676
2511 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2512 my ($w, $h) = $self->text_size ($line); 2678
2513 $self->{height} += $h; 2679 $para = {
2514 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,
2515 } 2686 };
2516 2687
2517 $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;
2518} 2700}
2519 2701
2520sub update { 2702sub update {
2521 my ($self) = @_; 2703 my ($self) = @_;
2522 2704
… …
2524 2706
2525 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2526 2708
2527 delete $self->{texture}; 2709 delete $self->{texture};
2528 2710
2529 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 2713
2532 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2533 my $height = 0; 2715 my $height = 0;
2534 2716
2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2539 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2541 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2721
2545 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2546 } 2725 }
2547 2726
2548 $height += $_->[1]; 2727 $height += $para->{h};
2549 } 2728 }
2550 2729
2551 $self->{height} = $height; 2730 $self->{height} = $height;
2552 2731
2553 $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]);
2554 2733
2555 delete $self->{texture}; 2734 delete $self->{texture};
2556 } 2735 }
2557 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2561 2744
2562 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2563 2746
2564 my $y0 = $top; 2747 my $y0 = $top;
2565 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2566 2749
2567 my $y = 0; 2750 my $y = 0;
2568 2751
2569 my $layout = $self->{layout};
2570
2571 $layout->set_font ($self->{font}) if $self->{font};
2572
2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576
2577 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2578 my $h = $par->[1]; 2753 my $h = $para->{h};
2579 2754
2580 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2583 $layout->set_markup ($par->[4]);
2584 2756
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2586 2758
2587 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2588 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 }
2589 } 2773 }
2590 2774
2591 $y += $h; 2775 $y += $h;
2592 } 2776 }
2593
2594 glDisable GL_BLEND;
2595 }; 2777 };
2596 }); 2778 });
2597} 2779}
2598 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2599sub _draw { 2790sub _draw {
2600 my ($self) = @_; 2791 my ($self) = @_;
2601 2792
2602 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2605 $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});
2606 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2607 2798
2608 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2609
2610} 2800}
2611 2801
2612############################################################################# 2802#############################################################################
2613 2803
2614package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 2893 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 2894 . "visible $widget->{visible}";
2705 } 2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2706 2899
2707 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2708 markup => $tooltip, 2901 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 2903 fontsize => 0.8,
… …
2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2721 2914
2722 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2723} 2916}
2724 2917
2725sub size_allocate { 2918sub invoke_size_allocate {
2726 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2727 2920
2728 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2729} 2922}
2730 2923
2731sub visibility_change { 2924sub invoke_visibility_change {
2732 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2733 2926
2734 return unless $visible; 2927 return unless $visible;
2735 2928
2736 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2738 or return; 2931 or return;
2739 2932
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 2934
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 2936 if $x + $self->{w} > $self->{root}{w};
2744 2937
2745 $self->move_abs ($x, $y); 2938 $self->move_abs ($x, $y);
2746 }); 2939 });
2747} 2940}
2748 2941
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 3031
2839 if ($tex) { 3032 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2845 } 3038 }
2846} 3039}
2847 3040
2848sub DESTROY { 3041sub destroy {
2849 my ($self) = @_; 3042 my ($self) = @_;
2850 3043
2851 $self->{timer}->cancel 3044 $self->{timer}->cancel
2852 if $self->{timer}; 3045 if $self->{timer};
2853 3046
2854 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2855} 3048}
3049
3050#############################################################################
3051
3052package CFClient::UI::Buttonbar;
3053
3054our @ISA = CFClient::UI::HBox::;
3055
3056# TODO: should actualyl wrap buttons and other goodies.
2856 3057
2857############################################################################# 3058#############################################################################
2858 3059
2859package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2860 3061
… …
2872 ); 3073 );
2873 3074
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 3076
2876 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2878 3079
2879 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2880 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 {
2881 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2882 can_hover => 1, 3097 can_hover => 1,
2883 can_events => 1, 3098 can_events => 1,
2884 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2885 } 3102 }
2886 3103
2887 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2888 3105
2889 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2894 3111
2895# 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)
2896sub popup { 3113sub popup {
2897 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2898 3115
2899 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2900 3117
2901 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2902 $GRAB = $self; 3119 $GRAB = $self;
2903 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2904 3121
2905 $self->show; 3122 $self->show;
2906 $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);
2907} 3124}
2908 3125
2909sub mouse_motion { 3126sub invoke_mouse_motion {
2910 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2911 3128
2912 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2914 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2915 3132
2916 0 3133 0
2917} 3134}
2918 3135
2919sub button_up { 3136sub invoke_button_up {
2920 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2921 3138
2922 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2923 undef $GRAB; 3140 undef $GRAB;
2924 $self->hide; 3141 $self->hide;
2925 3142
2926 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2927 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
2928 } else { 3145 } else {
2929 return 0 3146 return 0
2930 } 3147 }
2931 3148
2932 1 3149 1
2933} 3150}
2934 3151
2935############################################################################# 3152#############################################################################
2936 3153
2937package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2938 3155
2939our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2940 3157
2941sub new { 3158sub new {
2942 my $class = shift; 3159 my $class = shift;
2943 3160
2944 $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 (
2945 fontsize => 0.8, 3340 fontsize => 0.8,
2946 @_, 3341 @_,
2947 ) 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
2948} 3349}
2949 3350
2950sub reorder { 3351sub reorder {
2951 my ($self) = @_; 3352 my ($self) = @_;
2952 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} };
2953 3359
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3362 }
2957 3363
… …
2960 my @items = sort { 3366 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2964 3370
3371 $self->{timer}->interval (1);
3372
2965 my $count = 10 + 1; 3373 my $count = 10 + 1;
2966 for my $item (@items) { 3374 for my $item (@items) {
2967 last unless --$count; 3375 last unless --$count;
2968 3376
2969 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3381 : $item->{text};
2974 3382
… …
2982 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3396 can_events => 1,
2989 can_hover => 1 3397 can_hover => 1
2990 }; 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;
2991 } 3411 }
2992 3412
2993 $self->clear; 3413 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2995} 3415}
… …
3000 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
3002 3422
3003 return unless $text; 3423 return unless $text;
3004 3424
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3426
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3428
3009 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
3011 $item->{count}++; 3431 $item->{count}++;
3012 } else { 3432 } else {
3013 $item->{count} = 1; 3433 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
3015 } 3435 }
3016 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
3018 delete $item->{label}; 3438 delete $item->{label};
3019 } else { 3439 } else {
3020 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
3021 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
3027 count => 1, 3447 count => 1,
3028 %arg, 3448 %arg,
3029 }; 3449 };
3030 } 3450 }
3031 3451
3452 $ROOT->on_refresh (reorder => sub {
3032 $self->reorder; 3453 $self->reorder;
3454 });
3033} 3455}
3034 3456
3035sub reconfigure { 3457sub reconfigure {
3036 my ($self) = @_; 3458 my ($self) = @_;
3037 3459
… …
3040 3462
3041 $self->reorder; 3463 $self->reorder;
3042 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
3043} 3465}
3044 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
3045############################################################################# 3475#############################################################################
3046 3476
3047package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3048 3478
3049our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3050 3480
3051sub new { 3481sub new {
3052 my $class = shift; 3482 my $class = shift;
3053 3483
3054 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3056 @_, 3486 @_,
3057 ); 3487 );
3058 3488
3059 $self 3489 $self
3060} 3490}
3061 3491
3062sub set_items { 3492sub set_items {
3063 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3064 3494
3065 $self->{scrolled}->clear; 3495 $self->clear;
3066 return unless $items; 3496 return unless $items;
3067 3497
3068 my @items = sort { 3498 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3071 } @$items; 3501 } values %$items;
3072 3502
3073 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3074 3504
3075 my $row = 0; 3505 my $row = 0;
3076 for my $item (@items) { 3506 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3078 3508
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3082 3512
3083 $row++; 3513 $row++;
3084 } 3514 }
3085} 3515}
3086 3516
3087############################################################################# 3517#############################################################################
3088 3518
3089package CFClient::UI::BindEditor; 3519package CFClient::UI::SpellList;
3090 3520
3091our @ISA = CFClient::UI::FancyFrame::; 3521our @ISA = CFClient::UI::Table::;
3092 3522
3093sub new { 3523sub new {
3094 my $class = shift; 3524 my $class = shift;
3095 3525
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3097 3532
3098 $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>";
3099 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");
3100 3545
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3546sub rebuild_spell_list {
3102 text => "start recording", 3547 my ($self) = @_;
3103 tooltip => "Start/Stops recording of actions." 3548
3104 ."All subsequent actions after the recording started will be captured." 3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3105 ."The actions are displayed after the record was stopped." 3550 $self->clear;
3106 ."To bind the action you have to click on the 'Bind' button", 3551
3107 on_activate => sub { 3552 return unless $::CONN;
3108 unless ($self->{recording}) { 3553
3109 $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);
3110 } else { 3581 } else {
3111 $self->stop; 3582 return 0;
3583 }
3584
3585 1
3112 } 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);
3113 }); 3614 }
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 }); 3615 });
3204} 3616}
3205 3617
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3213
3214 $self->clear_command_list;
3215 $self->{recording} = 0;
3216 $self->{rec_btn}->set_text ("start recording");
3217
3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
3236
3237sub update_binding_widgets {
3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell { 3618sub add_spell {
3303 my ($self, $spell) = @_; 3619 my ($self, $spell) = @_;
3620
3304 $self->{spells}->{$spell->{name}} = $spell; 3621 $self->{spell}->{$spell->{name}} = $spell;
3305 3622 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3623}
3334 3624
3335sub remove_spell { 3625sub remove_spell {
3336 my ($self, $spell) = @_; 3626 my ($self, $spell) = @_;
3627
3337 delete $self->{spells}->{$spell->{name}}; 3628 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3629 $self->rebuild_spell_list;
3339} 3630}
3340 3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3341############################################################################# 3639#############################################################################
3342 3640
3343package CFClient::UI::Root; 3641package CFClient::UI::Root;
3344 3642
3345our @ISA = CFClient::UI::Container::; 3643our @ISA = CFClient::UI::Container::;
3644
3645use List::Util qw(min max);
3346 3646
3347use CFClient::OpenGL; 3647use CFClient::OpenGL;
3348 3648
3349sub new { 3649sub new {
3350 my $class = shift; 3650 my $class = shift;
… …
3377 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3378 3678
3379 int $coord + 0.5 3679 int $coord + 0.5
3380} 3680}
3381 3681
3382sub size_allocate { 3682sub invoke_size_allocate {
3383 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3384 3684
3385 for my $child ($self->children) { 3685 for my $child ($self->children) {
3386 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)};
3387 3687
… …
3391 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3393 3693
3394 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3395 } 3695 }
3696
3697 1
3396} 3698}
3397 3699
3398sub coord2local { 3700sub coord2local {
3399 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3400 3702
… …
3485 3787
3486 delete $queue{$widget+0}; 3788 delete $queue{$widget+0};
3487 3789
3488 my ($w, $h) = $widget->size_request; 3790 my ($w, $h) = $widget->size_request;
3489 3791
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3792 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $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};
3492 3797
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3798 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3799 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3800
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3801 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3522 3827
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524 3829
3525 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3526 $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};
3527 3838
3528 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3529 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3530 3841
3531 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