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.303 by elmex, Tue Jun 13 10:28:38 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};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1051 1103
1052 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1113}
1054 1114
1055sub border { 1115sub border {
1056 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1057} 1117}
1058 1118
1059sub size_request { 1119sub size_request {
1060 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1061 1127
1062 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1063 1129
1064 ( 1130 (
1065 $w + $self->border * 2, 1131 $w + $self->border * 2,
1068} 1134}
1069 1135
1070sub size_allocate { 1136sub size_allocate {
1071 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1072 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1073 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1075 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1080} 1154}
1081 1155
1082sub button_down { 1156sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1084 1158
1103 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1104 1178
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1183 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1184 };
1111 1185
1112 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
1117 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1118 1192
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1194
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1123 } 1203 1
1124} 1204}
1125 1205
1126sub button_up { 1206sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1128 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1129 delete $self->{motion}; 1212 !!delete $self->{motion}
1130} 1213}
1131 1214
1132sub mouse_motion { 1215sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1134 1217
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1136} 1221}
1137 1222
1138sub _draw { 1223sub _draw {
1139 my ($self) = @_; 1224 my ($self) = @_;
1140 1225
1226 my $child = $self->{children}[0];
1227
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1230
1144 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1233
1147 my $border = $self->border; 1234 my $border = $self->border;
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1250 }
1164 1251
1165 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1166 1253
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1170} 1265}
1171 1266
1172############################################################################# 1267#############################################################################
1173 1268
1174package CFClient::UI::Table; 1269package CFClient::UI::Table;
1197 1292
1198 $child->set_parent ($self); 1293 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1200 1295
1201 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1202} 1303}
1203 1304
1204# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1306sub clear {
1206 my ($self) = @_; 1307 my ($self) = @_;
1467 1568
1468 delete $self->{texture}; 1569 delete $self->{texture};
1469 $self->SUPER::update; 1570 $self->SUPER::update;
1470} 1571}
1471 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1472sub set_text { 1580sub set_text {
1473 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1474 1582
1475 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1477 1585
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1480 1588
1589 delete $self->{size_req};
1481 $self->realloc; 1590 $self->realloc;
1482 $self->update; 1591 $self->update;
1483} 1592}
1484 1593
1485sub set_markup { 1594sub set_markup {
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1601
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1495 1604
1605 delete $self->{size_req};
1496 $self->realloc; 1606 $self->realloc;
1497 $self->update; 1607 $self->update;
1498} 1608}
1499 1609
1500sub size_request { 1610sub size_request {
1501 my ($self) = @_; 1611 my ($self) = @_;
1502 1612
1613 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1619
1509 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1510 1621
1511 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1625
1515 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1516 1627
1517 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1519 } 1633 };
1520 1634
1521 ($w, $h) 1635 @{ $self->{size_req} }
1522} 1636}
1523 1637
1524sub size_allocate { 1638sub size_allocate {
1525 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1526 1640
1641 delete $self->{ox};
1642
1527 delete $self->{texture} 1643 delete $self->{texture}
1528 ;#d# 1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1645}
1530 1646
1531sub set_fontsize { 1647sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1533 1649
1534 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1535 delete $self->{texture}; 1651 delete $self->{texture};
1536 1652
1537 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1538} 1662}
1539 1663
1540sub _draw { 1664sub _draw {
1541 my ($self) = @_; 1665 my ($self) = @_;
1542 1666
1548 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1676
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1554 1679
1680 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1558 1684
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1688 };
1565 1689
1566 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1568 1694
1569 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1572 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1574 } 1702 }
1575 1703
1576 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1577} 1705}
1578 1706
1595 can_hover => 1, 1723 can_hover => 1,
1596 can_focus => 1, 1724 can_focus => 1,
1597 valign => 0, 1725 valign => 0,
1598 can_events => 1, 1726 can_events => 1,
1599 #text => ... 1727 #text => ...
1728 #hidden => "*",
1600 @_ 1729 @_
1601 ) 1730 )
1602} 1731}
1603 1732
1604sub _set_text { 1733sub _set_text {
1606 1735
1607 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1608 1737
1609 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1610 1739
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1741 $self->{text} = $text;
1615 1742
1616 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1618 1746
1619 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1620} 1751}
1621 1752
1622sub set_text { 1753sub set_text {
1623 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1624 1755
1625 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1757 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1758}
1630 1759
1631sub get_text { 1760sub get_text {
1632 $_[0]{text} 1761 $_[0]{text}
1633} 1762}
1663 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1666 } elsif ($uni) { 1795 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1668 } 1799 }
1669 1800
1670 $self->_set_text ($text); 1801 $self->_set_text ($text);
1671 1802
1672 $self->realloc; 1803 $self->realloc;
1804
1805 1
1673} 1806}
1674 1807
1675sub focus_in { 1808sub focus_in {
1676 my ($self) = @_; 1809 my ($self) = @_;
1677 1810
1692 utf8::encode $text; 1825 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1694 1827
1695 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1696 $self->update; 1829 $self->update;
1830
1831 1
1697} 1832}
1698 1833
1699sub mouse_motion { 1834sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1702} 1839}
1703 1840
1704sub _draw { 1841sub _draw {
1705 my ($self) = @_; 1842 my ($self) = @_;
1706 1843
1707 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1708 1845
1709 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1712 } else { 1849 } else {
1713 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1714 } 1851 }
1715 1852
1716 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1856 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
1783 } else { 1920 } else {
1784 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1785 } 1922 }
1786 1923
1787 } else { 1924 } else {
1788 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1789 } 1928 1
1790
1791} 1929}
1792 1930
1793############################################################################# 1931#############################################################################
1794 1932
1795package CFClient::UI::Button; 1933package CFClient::UI::Button;
1824 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1825 1963
1826 $self->emit ("activate") 1964 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1829} 1969}
1830 1970
1831sub _draw { 1971sub _draw {
1832 my ($self) = @_; 1972 my ($self) = @_;
1833 1973
1834 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1975
1840 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1843 1979
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 1981
1846 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1847 1983
1848 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1985}
1986
1987#############################################################################
1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
1849} 2023}
1850 2024
1851############################################################################# 2025#############################################################################
1852 2026
1853package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1887 2061
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1892 } 2070 1
1893} 2071}
1894 2072
1895sub _draw { 2073sub _draw {
1896 my ($self) = @_; 2074 my ($self) = @_;
1897 2075
2064 2242
2065 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2067 2245
2068 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2251
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
2195sub set_range { 2374sub set_range {
2196 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2197 2376
2198 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2199 2378
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2202} 2383}
2203 2384
2204sub set_value { 2385sub set_value {
2205 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2206 2387
2235 2416
2236 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2237 2418
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2420
2240 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2241} 2422}
2242 2423
2243sub mouse_motion { 2424sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2245 2426
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2431
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2433
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2254 } 2439 1
2255} 2440}
2256 2441
2257sub update { 2442sub update {
2258 my ($self) = @_; 2443 my ($self) = @_;
2259 2444
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2262 2454
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2265 2457
2271 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2273 2465
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2276 }); 2468 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2469
2284 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2285 2471
2286 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2287 2473
2348sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2350 2536
2351############################################################################# 2537#############################################################################
2352 2538
2353package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2354 2540
2355our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2356 2542
2357use CFClient::OpenGL; 2543use CFClient::OpenGL;
2358 2544
2360 my $class = shift; 2546 my $class = shift;
2361 2547
2362 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2363 fontsize => 1, 2549 fontsize => 1,
2364 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2365 #font => default_font 2552 #font => default_font
2366 @_, 2553 @_,
2367 2554
2368 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2369 par => [], 2556 par => [],
2392 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2393 2580
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2585
2398 $self->reflow; 2586 $self->reflow;
2399} 2587}
2400 2588
2401sub text_size { 2589sub text_size {
2403 2591
2404 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2405 2593
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2409 2598
2410 $layout->size 2599 $layout->size
2411} 2600}
2412 2601
2451 2640
2452 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2453 2642
2454 delete $self->{texture}; 2643 delete $self->{texture};
2455 2644
2456 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2647
2459 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2649 my $height = 0;
2461 2650
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465 2654
2466 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2469 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h; 2662 $_->[1] = $h;
2473 } 2663 }
2476 } 2666 }
2477 2667
2478 $self->{height} = $height; 2668 $self->{height} = $height;
2479 2669
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2481 2671
2482 delete $self->{texture}; 2672 delete $self->{texture};
2483 } 2673 }
2484 2674
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2488 2678
2489 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2490 2680
2491 my $y0 = $top; 2681 my $y0 = $top;
2505 my $h = $par->[1]; 2695 my $h = $par->[1];
2506 2696
2507 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2511 2702
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2513 2704
2514 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
2526sub _draw { 2717sub _draw {
2527 my ($self) = @_; 2718 my ($self) = @_;
2528 2719
2529 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2534 2725
2535 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2536 2727
2537} 2728}
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2632 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2633 2827
2634 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2635 markup => $tooltip, 2829 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 2831 fontsize => 0.8,
2665 or return; 2859 or return;
2666 2860
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 2862
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2671 2865
2672 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2673 }); 2867 });
2674} 2868}
2675 2869
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 2959
2766 if ($tex) { 2960 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2772 } 2966 }
2773} 2967}
2774 2968
2775sub DESTROY { 2969sub destroy {
2776 my ($self) = @_; 2970 my ($self) = @_;
2777 2971
2778 $self->{timer}->cancel 2972 $self->{timer}->cancel
2779 if $self->{timer}; 2973 if $self->{timer};
2780 2974
2781 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2782} 2976}
2977
2978#############################################################################
2979
2980package CFClient::UI::Buttonbar;
2981
2982our @ISA = CFClient::UI::HBox::;
2983
2984# TODO: should actualyl wrap buttons and other goodies.
2783 2985
2784############################################################################# 2986#############################################################################
2785 2987
2786package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2787 2989
2799 ); 3001 );
2800 3002
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802 3004
2803 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2805 3007
2806 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2807 if (!ref $widget) { 3009 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2809 can_hover => 1, 3011 can_hover => 1,
2810 can_events => 1, 3012 can_events => 1,
2811 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2812 } 3015 }
2813 3016
2814 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2815 3018
2816 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
2837 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2838 3041
2839 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2842} 3047}
2843 3048
2844sub button_up { 3049sub button_up {
2845 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2846 3051
2848 undef $GRAB; 3053 undef $GRAB;
2849 $self->hide; 3054 $self->hide;
2850 3055
2851 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2853 } 3062 1
2854} 3063}
2855 3064
2856############################################################################# 3065#############################################################################
2857 3066
2858package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2859 3068
2860our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2861 3070
2862sub new { 3071sub new {
2863 my $class = shift; 3072 my $class = shift;
2864 3073
2865 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3239 fontsize => 0.8,
2867 @_, 3240 @_,
2868 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2869} 3248}
2870 3249
2871sub reorder { 3250sub reorder {
2872 my ($self) = @_; 3251 my ($self) = @_;
2873 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2874 3258
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3261 }
2878 3262
2881 my @items = sort { 3265 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2885 3269
3270 $self->{timer}->interval (1);
3271
2886 my $count = 10 + 1; 3272 my $count = 10 + 1;
2887 for my $item (@items) { 3273 for my $item (@items) {
2888 last unless --$count; 3274 last unless --$count;
2889 3275
2890 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3280 : $item->{text};
2895 3281
2903 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3295 can_events => 1,
2910 can_hover => 1 3296 can_hover => 1
2911 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2912 } 3310 }
2913 3311
2914 $self->clear; 3312 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2916} 3314}
2921 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2923 3321
2924 return unless $text; 3322 return unless $text;
2925 3323
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3325
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3327
2930 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2932 $item->{count}++; 3330 $item->{count}++;
2933 } else { 3331 } else {
2934 $item->{count} = 1; 3332 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2936 } 3334 }
2937 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2938 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2939 delete $item->{label}; 3337 delete $item->{label};
2940 } else { 3338 } else {
2941 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2942 id => ++$self->{id}, 3340 id => ++$self->{id},
2961 3359
2962 $self->reorder; 3360 $self->reorder;
2963 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2964} 3362}
2965 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2966############################################################################# 3372#############################################################################
2967 3373
2968package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
2969 3375
2970our @ISA = CFClient::UI::ScrolledWindow::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2971 3377
2972sub new { 3378sub new {
2973 my $class = shift; 3379 my $class = shift;
2974 3380
2975 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_, 3383 @_,
2978 ); 3384 );
2979 3385
2980 $self 3386 $self
2981} 3387}
2982 3388
2983sub set_items { 3389sub set_items {
2984 my ($self, $items) = @_; 3390 my ($self, $items) = @_;
2985 3391
2986 $self->{scrolled}->clear; 3392 $self->{child}->clear;
2987 return unless $items; 3393 return unless $items;
2988 3394
2989 my @items = sort { 3395 my @items = sort {
2990 ($a->{type} <=> $b->{type}) 3396 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name}) 3397 or ($a->{name} cmp $b->{name})
2995 3401
2996 my $row = 0; 3402 my $row = 0;
2997 for my $item (@items) { 3403 for my $item (@items) {
2998 CFClient::Item::update_widgets $item; 3404 CFClient::Item::update_widgets $item;
2999 3405
3000 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3406 $self->{child}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3407 $self->{child}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3408 $self->{child}->add (2, $row, $item->{weight_widget});
3003 3409
3004 $row++; 3410 $row++;
3005 } 3411 }
3006} 3412}
3007 3413
3105 $rec = $::CONN->stop_record if $::CONN; 3511 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3512 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3513 $self->set_command_list ($rec);
3108} 3514}
3109 3515
3110# if $commit is true, the binding will be set after the user entered a key combo 3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3111sub ask_for_bind { 3522sub ask_for_bind {
3112 my ($self, $commit) = @_; 3523 my ($self, $commit) = @_;
3113 3524
3114 CFClient::Binder::open_binding_dialog (sub { 3525 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3526 my ($mod, $sym) = @_;
3199 3610
3200############################################################################# 3611#############################################################################
3201 3612
3202package CFClient::UI::SpellList; 3613package CFClient::UI::SpellList;
3203 3614
3204our @ISA = CFClient::UI::FancyFrame::; 3615our @ISA = CFClient::UI::Table::;
3205 3616
3206sub new { 3617sub new {
3207 my $class = shift; 3618 my $class = shift;
3208 3619
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3620 my $self = $class->SUPER::new (
3210 3621 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3622 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3623 @_,
3213 3624 )
3214 $self;
3215} 3625}
3216 3626
3217# XXX: Do sorting? Argl... 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3218sub add_spell { 3712sub add_spell {
3219 my ($self, $spell) = @_; 3713 my ($self, $spell) = @_;
3714
3220 $self->{spells}->{$spell->{name}} = $spell; 3715 $self->{spell}->{$spell->{name}} = $spell;
3221 3716 $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} 3717}
3250 3718
3251sub remove_spell { 3719sub remove_spell {
3252 my ($self, $spell) = @_; 3720 my ($self, $spell) = @_;
3721
3253 delete $self->{spells}->{$spell->{name}}; 3722 delete $self->{spell}->{$spell->{name}};
3254 $self->rebuild_spell_list; 3723 $self->rebuild_spell_list;
3255} 3724}
3256 3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3257############################################################################# 3733#############################################################################
3258 3734
3259package CFClient::UI::Root; 3735package CFClient::UI::Root;
3260 3736
3261our @ISA = CFClient::UI::Container::; 3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3262 3740
3263use CFClient::OpenGL; 3741use CFClient::OpenGL;
3264 3742
3265sub new { 3743sub new {
3266 my $class = shift; 3744 my $class = shift;
3372 $_->() 3850 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3374 } 3852 }
3375 3853
3376 if ($self->{realloc}) { 3854 if ($self->{realloc}) {
3855 my %queue;
3377 my @queue; 3856 my @queue;
3857 my $widget;
3378 3858
3859 outer:
3379 while () { 3860 while () {
3380 if ($self->{realloc}) { 3861 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3862 for $widget (values %$realloc) {
3863 $widget->{visible} or next; # do not resize invisible widgets
3382 3864
3383 use sort 'stable'; 3865 $queue{$widget+0}++ and next; # duplicates are common
3384 3866
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3867 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3868 }
3387 } 3869 }
3388 3870
3871 while () {
3872 @queue or last outer;
3873
3389 my $widget = pop @queue || last; 3874 $widget = pop @{ $queue[-1] || [] }
3875 and last;
3876
3877 pop @queue;
3878 }
3390 3879
3391 $widget->{visible} or last; # do not resize invisible widgets 3880 delete $queue{$widget+0};
3392 3881
3393 my ($w, $h) = $widget->size_request; 3882 my ($w, $h) = $widget->size_request;
3394 3883
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 3889
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 3890 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 3891 $h = $widget->{force_h} if exists $widget->{force_h};
3400 3892
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3404 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3405 3897
3406 $self->{size_alloc}{$widget+0} = $widget; 3898 $self->{size_alloc}{$widget+0} = $widget;
3407 3899
3408 if (my $parent = $widget->{parent}) { 3900 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3901 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3902 unless $queue{$parent+0};
3903
3411 $parent->{force_size_alloc} = 1; 3904 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3905 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3906 }
3414 } 3907 }
3415 3908
3431 3924
3432 $w = int $w + 0.5; 3925 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3926 $h = int $h + 0.5;
3434 3927
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3436 $widget->{w} = $w; 3932 $widget->{w} = $w;
3437 $widget->{h} = $h; 3933 $widget->{h} = $h;
3438 3934
3439 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3440 } 3936 }
3455 glLoadIdentity; 3951 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3954 glLoadIdentity;
3459 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3460 $self->_draw; 3963 $self->_draw;
3461} 3964}
3462 3965
3463############################################################################# 3966#############################################################################
3464 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines