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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->focus_out;
285 287
286 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
313} 315}
314 316
315sub move_abs { 317sub move_abs {
316 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
317 319
318 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
321 323
322 $self->update; 324 $self->update;
323} 325}
324 326
370sub size_allocate { 372sub size_allocate {
371 # nothing to be done 373 # nothing to be done
372} 374}
373 375
374sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
375} 382}
376 383
377sub set_max_size { 384sub set_max_size {
378 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
379 386
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
382} 391}
383 392
384sub set_tooltip { 393sub set_tooltip {
385 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
386 395
391 400
392 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
393 402
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 406 }
398} 407}
399 408
400# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
401sub coord2local { 410sub coord2local {
438 447
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 449 unless $FOCUS;
441} 450}
442 451
443sub mouse_motion { } 452sub mouse_motion { 0 }
444sub button_up { } 453sub button_up { 0 }
445sub key_down { } 454sub key_down { 0 }
446sub key_up { } 455sub key_up { 0 }
447 456
448sub button_down { 457sub button_down {
449 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
450 459
451 $self->focus_in; 460 $self->focus_in;
452}
453 461
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 464
460sub find_widget { 465sub find_widget {
461 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
462 467
463 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
525 530
526 $self->realloc; 531 $self->realloc;
527 $self->update; 532 $self->update;
528} 533}
529 534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
530sub draw { 539sub draw {
531 my ($self) = @_; 540 my ($self) = @_;
532 541
533 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 553
535 glPushMatrix; 554 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 556
540 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 559 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 561 glBegin GL_QUADS;
547 glVertex $x , $y; 562 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
551 glEnd; 566 glEnd;
552 glDisable GL_BLEND; 567 glDisable GL_BLEND;
553 } 568 }
554 569
555 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 571 glPushMatrix;
557 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 575 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
564 glEnd; 579 glEnd;
565 glPopMatrix; 580 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
568} 586}
569 587
570sub _draw { 588sub _draw {
571 my ($self) = @_; 589 my ($self) = @_;
572 590
575 593
576sub DESTROY { 594sub DESTROY {
577 my ($self) = @_; 595 my ($self) = @_;
578 596
579 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
580 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 601}
582 602
583############################################################################# 603#############################################################################
584 604
585package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
610 630
611 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
613 633
614 glEnable GL_BLEND; 634 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 636 glColor_premultiply @$color;
617 637
618 glBegin GL_QUADS; 638 glBegin GL_QUADS;
619 glVertex 0 , 0; 639 glVertex 0 , 0;
620 glVertex 0 , $h; 640 glVertex 0 , $h;
621 glVertex $w, $h; 641 glVertex $w, $h;
652our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
653 673
654sub new { 674sub new {
655 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
656 676
657 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
658 678
659 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
660 children => [], 680 children => [],
661 can_events => 0, 681 can_events => 0,
662 %arg, 682 %arg,
663 ); 683 );
684
664 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
665 687
666 $self 688 $self
667} 689}
668 690
669sub add { 691sub add {
717 $x -= $self->{x}; 739 $x -= $self->{x};
718 $y -= $self->{y}; 740 $y -= $self->{y};
719 741
720 my $res; 742 my $res;
721 743
722 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
724 and return $res; 746 and return $res;
725 } 747 }
726 748
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
748} 770}
749 771
750sub add { 772sub add {
751 my ($self, $child) = @_; 773 my ($self, $child) = @_;
752 774
753 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
756} 777}
757 778
758sub remove { 779sub remove {
759 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
776 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
777} 798}
778 799
779############################################################################# 800#############################################################################
780 801
802# back-buffered drawing area
803
781package CFClient::UI::Window; 804package CFClient::UI::Window;
782 805
783our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
784 807
785use CFClient::OpenGL; 808use CFClient::OpenGL;
803 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 827 $self->update;
805} 828}
806 829
807sub _render { 830sub _render {
831 my ($self) = @_;
832
808 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
809} 834}
810 835
811sub render_child { 836sub render_child {
812 my ($self) = @_; 837 my ($self) = @_;
813 838
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
817 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
818 $self->_render; 850 $self->_render;
819 }; 851 };
820} 852}
821 853
822sub _draw { 854sub _draw {
823 my ($self) = @_; 855 my ($self) = @_;
824 856
825 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
826 858
827 my $tex = $self->{texture} 859 my $tex = $self->{texture}
828 or return; 860 or return;
829 861
830 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
833 865
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 867
836 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
837} 869}
913} 945}
914 946
915sub _render { 947sub _render {
916 my ($self) = @_; 948 my ($self) = @_;
917 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 954
920 $self->SUPER::_render; 955 $self->SUPER::_render;
921} 956}
922 957
925package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
926 961
927our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
928 963
929sub new { 964sub new {
930 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
931 968
932 my $self; 969 my $self;
933 970
934 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
935 vertical => 1, 972 vertical => 1,
940 ; 977 ;
941 978
942 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 981 slider => $slider,
945 @_, 982 %arg,
946 ); 983 );
947 984
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
951 987
952 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
953} 995}
954 996
955sub update { 997sub update {
956 my ($self) = @_; 998 my ($self) = @_;
957 999
996 1038
997 if ($self->{bg}) { 1039 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
999 1041
1000 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1003 1045
1004 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1047 glVertex 0 , 0;
1006 glVertex 0 , $h; 1048 glVertex 0 , $h;
1007 glVertex $w, $h; 1049 glVertex $w, $h;
1029my @border = 1071my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1074
1033sub new { 1075sub new {
1034 my $class = shift; 1076 my ($class, %arg) = @_;
1035 1077
1036 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1081 border => 0.6,
1040 can_events => 1, 1082 can_events => 1,
1041 min_w => 16, 1083 min_w => 16,
1042 min_h => 16, 1084 min_h => 16,
1043 @_ 1085 %arg,
1044 ); 1086 );
1045 1087
1046 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1089 align => 0,
1048 valign => 1, 1090 valign => 1,
1049 text => $self->{title}, 1091 text => $self->{title},
1050 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1051 1094
1052 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1103}
1054 1104
1055sub border { 1105sub border {
1056 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1057} 1107}
1058 1108
1059sub size_request { 1109sub size_request {
1060 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1061 1114
1062 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1063 1116
1064 ( 1117 (
1065 $w + $self->border * 2, 1118 $w + $self->border * 2,
1068} 1121}
1069 1122
1070sub size_allocate { 1123sub size_allocate {
1071 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1072 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1073 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1075 1136
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1080} 1138}
1081 1139
1082sub button_down { 1140sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1084 1142
1103 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1104 1162
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1167 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1168 };
1111 1169
1112 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
1117 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1118 1176
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1178
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1123 } 1187 1
1124} 1188}
1125 1189
1126sub button_up { 1190sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1128 1192
1129 delete $self->{motion}; 1193 !!delete $self->{motion}
1130} 1194}
1131 1195
1132sub mouse_motion { 1196sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1134 1198
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1136} 1202}
1137 1203
1138sub _draw { 1204sub _draw {
1139 my ($self) = @_; 1205 my ($self) = @_;
1140 1206
1207 my $child = $self->{children}[0];
1208
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1211
1144 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1214
1147 my $border = $self->border; 1215 my $border = $self->border;
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1231 }
1164 1232
1165 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1166 1234
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1170} 1241}
1171 1242
1172############################################################################# 1243#############################################################################
1173 1244
1174package CFClient::UI::Table; 1245package CFClient::UI::Table;
1197 1268
1198 $child->set_parent ($self); 1269 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1200 1271
1201 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1202} 1279}
1203 1280
1204# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1282sub clear {
1206 my ($self) = @_; 1283 my ($self) = @_;
1467 1544
1468 delete $self->{texture}; 1545 delete $self->{texture};
1469 $self->SUPER::update; 1546 $self->SUPER::update;
1470} 1547}
1471 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1472sub set_text { 1556sub set_text {
1473 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1474 1558
1475 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1477 1561
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1480 1564
1565 delete $self->{size_req};
1481 $self->realloc; 1566 $self->realloc;
1482 $self->update; 1567 $self->update;
1483} 1568}
1484 1569
1485sub set_markup { 1570sub set_markup {
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1577
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1495 1580
1581 delete $self->{size_req};
1496 $self->realloc; 1582 $self->realloc;
1497 $self->update; 1583 $self->update;
1498} 1584}
1499 1585
1500sub size_request { 1586sub size_request {
1501 my ($self) = @_; 1587 my ($self) = @_;
1502 1588
1589 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1595
1509 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1510 1597
1511 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1601
1515 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1516 1603
1517 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1519 } 1609 };
1520 1610
1521 ($w, $h) 1611 @{ $self->{size_req} }
1522} 1612}
1523 1613
1524sub size_allocate { 1614sub size_allocate {
1525 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1526 1616
1617 delete $self->{ox};
1618
1527 delete $self->{texture} 1619 delete $self->{texture}
1528 ;#d# 1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1621}
1530 1622
1531sub set_fontsize { 1623sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1533 1625
1534 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1535 delete $self->{texture}; 1627 delete $self->{texture};
1536 1628
1537 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1538} 1638}
1539 1639
1540sub _draw { 1640sub _draw {
1541 my ($self) = @_; 1641 my ($self) = @_;
1542 1642
1548 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1652
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1554 1655
1656 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1558 1660
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1664 };
1565 1665
1566 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1568 1670
1569 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1572 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1574 } 1678 }
1575 1679
1576 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1577} 1681}
1578 1682
1595 can_hover => 1, 1699 can_hover => 1,
1596 can_focus => 1, 1700 can_focus => 1,
1597 valign => 0, 1701 valign => 0,
1598 can_events => 1, 1702 can_events => 1,
1599 #text => ... 1703 #text => ...
1704 #hidden => "*",
1600 @_ 1705 @_
1601 ) 1706 )
1602} 1707}
1603 1708
1604sub _set_text { 1709sub _set_text {
1606 1711
1607 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1608 1713
1609 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1610 1715
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1717 $self->{text} = $text;
1615 1718
1616 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1618 1722
1619 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1620} 1727}
1621 1728
1622sub set_text { 1729sub set_text {
1623 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1624 1731
1625 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1733 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1734}
1630 1735
1631sub get_text { 1736sub get_text {
1632 $_[0]{text} 1737 $_[0]{text}
1633} 1738}
1663 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1666 } elsif ($uni) { 1771 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1668 } 1775 }
1669 1776
1670 $self->_set_text ($text); 1777 $self->_set_text ($text);
1671 1778
1672 $self->realloc; 1779 $self->realloc;
1780
1781 1
1673} 1782}
1674 1783
1675sub focus_in { 1784sub focus_in {
1676 my ($self) = @_; 1785 my ($self) = @_;
1677 1786
1692 utf8::encode $text; 1801 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1694 1803
1695 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1696 $self->update; 1805 $self->update;
1806
1807 1
1697} 1808}
1698 1809
1699sub mouse_motion { 1810sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1702} 1815}
1703 1816
1704sub _draw { 1817sub _draw {
1705 my ($self) = @_; 1818 my ($self) = @_;
1706 1819
1707 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1708 1821
1709 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1712 } else { 1825 } else {
1713 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1714 } 1827 }
1715 1828
1716 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1832 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
1783 } else { 1896 } else {
1784 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1785 } 1898 }
1786 1899
1787 } else { 1900 } else {
1788 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1789 } 1904 1
1790
1791} 1905}
1792 1906
1793############################################################################# 1907#############################################################################
1794 1908
1795package CFClient::UI::Button; 1909package CFClient::UI::Button;
1824 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1825 1939
1826 $self->emit ("activate") 1940 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1829} 1945}
1830 1946
1831sub _draw { 1947sub _draw {
1832 my ($self) = @_; 1948 my ($self) = @_;
1833 1949
1834 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1951
1840 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1843 1955
1887 1999
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1892 } 2008 1
1893} 2009}
1894 2010
1895sub _draw { 2011sub _draw {
1896 my ($self) = @_; 2012 my ($self) = @_;
1897 2013
2064 2180
2065 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2067 2183
2068 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2189
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
2195sub set_range { 2312sub set_range {
2196 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2197 2314
2198 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2199 2316
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2202} 2321}
2203 2322
2204sub set_value { 2323sub set_value {
2205 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2206 2325
2235 2354
2236 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2237 2356
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2358
2240 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2241} 2360}
2242 2361
2243sub mouse_motion { 2362sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2245 2364
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2369
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2371
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2254 } 2377 1
2255} 2378}
2256 2379
2257sub update { 2380sub update {
2258 my ($self) = @_; 2381 my ($self) = @_;
2259 2382
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2262 2392
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2265 2395
2271 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2273 2403
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2276 }); 2406 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2407
2284 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2285 2409
2286 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2287 2411
2348sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2350 2474
2351############################################################################# 2475#############################################################################
2352 2476
2353package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2354 2478
2355our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2356 2480
2357use CFClient::OpenGL; 2481use CFClient::OpenGL;
2358 2482
2360 my $class = shift; 2484 my $class = shift;
2361 2485
2362 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2363 fontsize => 1, 2487 fontsize => 1,
2364 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2365 #font => default_font 2490 #font => default_font
2366 @_, 2491 @_,
2367 2492
2368 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2369 par => [], 2494 par => [],
2392 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2393 2518
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2523
2398 $self->reflow; 2524 $self->reflow;
2399} 2525}
2400 2526
2401sub text_size { 2527sub text_size {
2403 2529
2404 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2405 2531
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2409 2536
2410 $layout->size 2537 $layout->size
2411} 2538}
2412 2539
2451 2578
2452 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2453 2580
2454 delete $self->{texture}; 2581 delete $self->{texture};
2455 2582
2456 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2585
2459 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2587 my $height = 0;
2461 2588
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465 2592
2466 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2469 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h; 2600 $_->[1] = $h;
2473 } 2601 }
2476 } 2604 }
2477 2605
2478 $self->{height} = $height; 2606 $self->{height} = $height;
2479 2607
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2481 2609
2482 delete $self->{texture}; 2610 delete $self->{texture};
2483 } 2611 }
2484 2612
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2488 2616
2489 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2490 2618
2491 my $y0 = $top; 2619 my $y0 = $top;
2505 my $h = $par->[1]; 2633 my $h = $par->[1];
2506 2634
2507 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2511 2640
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2513 2642
2514 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
2526sub _draw { 2655sub _draw {
2527 my ($self) = @_; 2656 my ($self) = @_;
2528 2657
2529 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2534 2663
2535 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2536 2665
2537} 2666}
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2632 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2633 2765
2634 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2635 markup => $tooltip, 2767 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 2769 fontsize => 0.8,
2665 or return; 2797 or return;
2666 2798
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 2800
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2671 2803
2672 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2673 }); 2805 });
2674} 2806}
2675 2807
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 2897
2766 if ($tex) { 2898 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2772 } 2904 }
2773} 2905}
2774 2906
2775sub DESTROY { 2907sub destroy {
2776 my ($self) = @_; 2908 my ($self) = @_;
2777 2909
2778 $self->{timer}->cancel 2910 $self->{timer}->cancel
2779 if $self->{timer}; 2911 if $self->{timer};
2780 2912
2781 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2782} 2914}
2915
2916#############################################################################
2917
2918package CFClient::UI::Buttonbar;
2919
2920our @ISA = CFClient::UI::HBox::;
2921
2922# TODO: should actualyl wrap buttons and other goodies.
2783 2923
2784############################################################################# 2924#############################################################################
2785 2925
2786package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2787 2927
2799 ); 2939 );
2800 2940
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802 2942
2803 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2805 2945
2806 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2807 if (!ref $widget) { 2947 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2809 can_hover => 1, 2949 can_hover => 1,
2810 can_events => 1, 2950 can_events => 1,
2811 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2812 } 2953 }
2813 2954
2814 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2815 2956
2816 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
2837 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2838 2979
2839 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2842} 2985}
2843 2986
2844sub button_up { 2987sub button_up {
2845 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2846 2989
2848 undef $GRAB; 2991 undef $GRAB;
2849 $self->hide; 2992 $self->hide;
2850 2993
2851 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2853 } 3000 1
2854} 3001}
2855 3002
2856############################################################################# 3003#############################################################################
2857 3004
2858package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2859 3006
2860our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2861 3008
2862sub new { 3009sub new {
2863 my $class = shift; 3010 my $class = shift;
2864 3011
2865 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3177 fontsize => 0.8,
2867 @_, 3178 @_,
2868 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2869} 3186}
2870 3187
2871sub reorder { 3188sub reorder {
2872 my ($self) = @_; 3189 my ($self) = @_;
2873 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2874 3196
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3199 }
2878 3200
2881 my @items = sort { 3203 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2885 3207
3208 $self->{timer}->interval (1);
3209
2886 my $count = 10 + 1; 3210 my $count = 10 + 1;
2887 for my $item (@items) { 3211 for my $item (@items) {
2888 last unless --$count; 3212 last unless --$count;
2889 3213
2890 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3218 : $item->{text};
2895 3219
2903 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3233 can_events => 1,
2910 can_hover => 1 3234 can_hover => 1
2911 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2912 } 3248 }
2913 3249
2914 $self->clear; 3250 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2916} 3252}
2921 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2923 3259
2924 return unless $text; 3260 return unless $text;
2925 3261
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3263
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3265
2930 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2932 $item->{count}++; 3268 $item->{count}++;
2933 } else { 3269 } else {
2934 $item->{count} = 1; 3270 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2936 } 3272 }
2937 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2938 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2939 delete $item->{label}; 3275 delete $item->{label};
2940 } else { 3276 } else {
2941 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2942 id => ++$self->{id}, 3278 id => ++$self->{id},
2961 3297
2962 $self->reorder; 3298 $self->reorder;
2963 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2964} 3300}
2965 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2966############################################################################# 3310#############################################################################
2967 3311
2968package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
2969 3313
2970our @ISA = CFClient::UI::ScrolledWindow::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2971 3315
2972sub new { 3316sub new {
2973 my $class = shift; 3317 my $class = shift;
2974 3318
2975 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_, 3321 @_,
2978 ); 3322 );
2979 3323
2980 $self 3324 $self
2981} 3325}
2982 3326
2983sub set_items { 3327sub set_items {
2984 my ($self, $items) = @_; 3328 my ($self, $items) = @_;
2985 3329
2986 $self->{scrolled}->clear; 3330 $self->{child}->clear;
2987 return unless $items; 3331 return unless $items;
2988 3332
2989 my @items = sort { 3333 my @items = sort {
2990 ($a->{type} <=> $b->{type}) 3334 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name}) 3335 or ($a->{name} cmp $b->{name})
2995 3339
2996 my $row = 0; 3340 my $row = 0;
2997 for my $item (@items) { 3341 for my $item (@items) {
2998 CFClient::Item::update_widgets $item; 3342 CFClient::Item::update_widgets $item;
2999 3343
3000 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3344 $self->{child}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3345 $self->{child}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3346 $self->{child}->add (2, $row, $item->{weight_widget});
3003 3347
3004 $row++; 3348 $row++;
3005 } 3349 }
3006} 3350}
3007 3351
3105 $rec = $::CONN->stop_record if $::CONN; 3449 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3450 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3451 $self->set_command_list ($rec);
3108} 3452}
3109 3453
3110# if $commit is true, the binding will be set after the user entered a key combo 3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3111sub ask_for_bind { 3460sub ask_for_bind {
3112 my ($self, $commit) = @_; 3461 my ($self, $commit) = @_;
3113 3462
3114 CFClient::Binder::open_binding_dialog (sub { 3463 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3464 my ($mod, $sym) = @_;
3199 3548
3200############################################################################# 3549#############################################################################
3201 3550
3202package CFClient::UI::SpellList; 3551package CFClient::UI::SpellList;
3203 3552
3204our @ISA = CFClient::UI::FancyFrame::; 3553our @ISA = CFClient::UI::Table::;
3205 3554
3206sub new { 3555sub new {
3207 my $class = shift; 3556 my $class = shift;
3208 3557
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3558 my $self = $class->SUPER::new (
3210 3559 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3560 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3561 @_,
3213 3562 )
3214 $self;
3215} 3563}
3216 3564
3217# XXX: Do sorting? Argl... 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3218sub add_spell { 3650sub add_spell {
3219 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3220 $self->{spells}->{$spell->{name}} = $spell; 3653 $self->{spell}->{$spell->{name}} = $spell;
3221 3654 $self->rebuild_spell_list;
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249} 3655}
3250 3656
3251sub remove_spell { 3657sub remove_spell {
3252 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3659
3253 delete $self->{spells}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3254 $self->rebuild_spell_list; 3661 $self->rebuild_spell_list;
3255} 3662}
3256 3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3257############################################################################# 3671#############################################################################
3258 3672
3259package CFClient::UI::Root; 3673package CFClient::UI::Root;
3260 3674
3261our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3262 3678
3263use CFClient::OpenGL; 3679use CFClient::OpenGL;
3264 3680
3265sub new { 3681sub new {
3266 my $class = shift; 3682 my $class = shift;
3372 $_->() 3788 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3374 } 3790 }
3375 3791
3376 if ($self->{realloc}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3377 my @queue; 3794 my @queue;
3795 my $widget;
3378 3796
3797 outer:
3379 while () { 3798 while () {
3380 if ($self->{realloc}) { 3799 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3382 3802
3383 use sort 'stable'; 3803 $queue{$widget+0}++ and next; # duplicates are common
3384 3804
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3805 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3806 }
3387 } 3807 }
3388 3808
3809 while () {
3810 @queue or last outer;
3811
3389 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3813 and last;
3814
3815 pop @queue;
3816 }
3390 3817
3391 $widget->{visible} or last; # do not resize invisible widgets 3818 delete $queue{$widget+0};
3392 3819
3393 my ($w, $h) = $widget->size_request; 3820 my ($w, $h) = $widget->size_request;
3394 3821
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 3827
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 3828 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 3829 $h = $widget->{force_h} if exists $widget->{force_h};
3400 3830
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3404 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3405 3835
3406 $self->{size_alloc}{$widget+0} = $widget; 3836 $self->{size_alloc}{$widget+0} = $widget;
3407 3837
3408 if (my $parent = $widget->{parent}) { 3838 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3839 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3840 unless $queue{$parent+0};
3841
3411 $parent->{force_size_alloc} = 1; 3842 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3843 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3844 }
3414 } 3845 }
3415 3846
3431 3862
3432 $w = int $w + 0.5; 3863 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3864 $h = int $h + 0.5;
3434 3865
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3436 $widget->{w} = $w; 3870 $widget->{w} = $w;
3437 $widget->{h} = $h; 3871 $widget->{h} = $h;
3438 3872
3439 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3440 } 3874 }
3455 glLoadIdentity; 3889 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3892 glLoadIdentity;
3459 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3460 $self->_draw; 3901 $self->_draw;
3461} 3902}
3462 3903
3463############################################################################# 3904#############################################################################
3464 3905

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines