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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $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.]+$/;
180 $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};
181 $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};
182 $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.]+$/;
183 $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};
184 $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};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
371sub size_allocate { 372sub size_allocate {
372 # nothing to be done 373 # nothing to be done
373} 374}
374 375
375sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
376} 382}
377 383
378sub set_max_size { 384sub set_max_size {
379 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
380 386
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
383} 391}
384 392
385sub set_tooltip { 393sub set_tooltip {
386 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
387 395
392 400
393 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
394 402
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 406 }
399} 407}
400 408
401# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
402sub coord2local { 410sub coord2local {
439 447
440 $::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
441 unless $FOCUS; 449 unless $FOCUS;
442} 450}
443 451
444sub mouse_motion { } 452sub mouse_motion { 0 }
445sub button_up { } 453sub button_up { 0 }
446sub key_down { } 454sub key_down { 0 }
447sub key_up { } 455sub key_up { 0 }
448 456
449sub button_down { 457sub button_down {
450 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
451 459
452 $self->focus_in; 460 $self->focus_in;
453}
454 461
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460 464
461sub find_widget { 465sub find_widget {
462 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
463 467
464 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
526 530
527 $self->realloc; 531 $self->realloc;
528 $self->update; 532 $self->update;
529} 533}
530 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
531sub draw { 539sub draw {
532 my ($self) = @_; 540 my ($self) = @_;
533 541
534 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);
535 553
536 glPushMatrix; 554 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw;
539 glPopMatrix;
540 556
541 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
542 my ($x, $y) = @$self{qw(x y)};
543
544 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
545 glEnable GL_BLEND; 559 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glBegin GL_QUADS; 561 glBegin GL_QUADS;
548 glVertex $x , $y; 562 glVertex 0 , 0;
549 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
550 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
551 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
552 glEnd; 566 glEnd;
553 glDisable GL_BLEND; 567 glDisable GL_BLEND;
554 } 568 }
555 569
556 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
557 glPushMatrix; 571 glPushMatrix;
558 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
560 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
561 glVertex 0 , 0; 575 glVertex 0 , 0;
562 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
563 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
564 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
565 glEnd; 579 glEnd;
566 glPopMatrix; 580 glPopMatrix;
567 #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;
568 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
569} 586}
570 587
571sub _draw { 588sub _draw {
572 my ($self) = @_; 589 my ($self) = @_;
573 590
576 593
577sub DESTROY { 594sub DESTROY {
578 my ($self) = @_; 595 my ($self) = @_;
579 596
580 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
581 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
582} 601}
583 602
584############################################################################# 603#############################################################################
585 604
586package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
611 630
612 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
613 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
614 633
615 glEnable GL_BLEND; 634 glEnable GL_BLEND;
616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617 glColor @$color; 636 glColor_premultiply @$color;
618 637
619 glBegin GL_QUADS; 638 glBegin GL_QUADS;
620 glVertex 0 , 0; 639 glVertex 0 , 0;
621 glVertex 0 , $h; 640 glVertex 0 , $h;
622 glVertex $w, $h; 641 glVertex $w, $h;
653our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
654 673
655sub new { 674sub new {
656 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
657 676
658 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
659 678
660 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
661 children => [], 680 children => [],
662 can_events => 0, 681 can_events => 0,
663 %arg, 682 %arg,
664 ); 683 );
684
665 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
666 687
667 $self 688 $self
668} 689}
669 690
670sub add { 691sub add {
718 $x -= $self->{x}; 739 $x -= $self->{x};
719 $y -= $self->{y}; 740 $y -= $self->{y};
720 741
721 my $res; 742 my $res;
722 743
723 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
725 and return $res; 746 and return $res;
726 } 747 }
727 748
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
749} 770}
750 771
751sub add { 772sub add {
752 my ($self, $child) = @_; 773 my ($self, $child) = @_;
753 774
754 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
755
756 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
757} 777}
758 778
759sub remove { 779sub remove {
760 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
777 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
778} 798}
779 799
780############################################################################# 800#############################################################################
781 801
802# back-buffered drawing area
803
782package CFClient::UI::Window; 804package CFClient::UI::Window;
783 805
784our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
785 807
786use CFClient::OpenGL; 808use CFClient::OpenGL;
804 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 827 $self->update;
806} 828}
807 829
808sub _render { 830sub _render {
831 my ($self) = @_;
832
809 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
810} 834}
811 835
812sub render_child { 836sub render_child {
813 my ($self) = @_; 837 my ($self) = @_;
814 838
815 $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 {
816 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
818 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
819 $self->_render; 850 $self->_render;
820 }; 851 };
821} 852}
822 853
823sub _draw { 854sub _draw {
824 my ($self) = @_; 855 my ($self) = @_;
825 856
826 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
827 858
828 my $tex = $self->{texture} 859 my $tex = $self->{texture}
829 or return; 860 or return;
830 861
831 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
833 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
834 865
835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
836 867
837 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
838} 869}
914} 945}
915 946
916sub _render { 947sub _render {
917 my ($self) = @_; 948 my ($self) = @_;
918 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
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 954
921 $self->SUPER::_render; 955 $self->SUPER::_render;
922} 956}
923 957
926package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
927 961
928our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
929 963
930sub new { 964sub new {
931 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
932 968
933 my $self; 969 my $self;
934 970
935 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
936 vertical => 1, 972 vertical => 1,
941 ; 977 ;
942 978
943 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
945 slider => $slider, 981 slider => $slider,
946 @_, 982 %arg,
947 ); 983 );
948 984
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
952 987
953 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
954} 995}
955 996
956sub update { 997sub update {
957 my ($self) = @_; 998 my ($self) = @_;
958 999
997 1038
998 if ($self->{bg}) { 1039 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1000 1041
1001 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1004 1045
1005 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1006 glVertex 0 , 0; 1047 glVertex 0 , 0;
1007 glVertex 0 , $h; 1048 glVertex 0 , $h;
1008 glVertex $w, $h; 1049 glVertex $w, $h;
1030my @border = 1071my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032 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);
1033 1074
1034sub new { 1075sub new {
1035 my $class = shift; 1076 my ($class, %arg) = @_;
1036 1077
1037 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1081 border => 0.6,
1041 can_events => 1, 1082 can_events => 1,
1042 min_w => 16, 1083 min_w => 16,
1043 min_h => 16, 1084 min_h => 16,
1044 @_ 1085 %arg,
1045 ); 1086 );
1046 1087
1047 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1048 align => 0, 1089 align => 0,
1049 valign => 1, 1090 valign => 1,
1050 text => $self->{title}, 1091 text => $self->{title},
1051 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 }
1052 1103
1053 $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};
1054} 1113}
1055 1114
1056sub border { 1115sub border {
1057 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1058} 1117}
1059 1118
1060sub size_request { 1119sub size_request {
1061 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};
1062 1127
1063 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1064 1129
1065 ( 1130 (
1066 $w + $self->border * 2, 1131 $w + $self->border * 2,
1069} 1134}
1070 1135
1071sub size_allocate { 1136sub size_allocate {
1072 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1073 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
1074 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1076 1149
1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078 if $self->{title};
1079
1080 $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};
1081} 1154}
1082 1155
1083sub button_down { 1156sub button_down {
1084 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1085 1158
1104 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1105 1178
1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109 $self->realloc; 1183 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111 }; 1184 };
1112 1185
1113 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1114 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
1118 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1119 1192
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1194
1122 $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});
1123 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1124 } 1203 1
1125} 1204}
1126 1205
1127sub button_up { 1206sub button_up {
1128 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1129 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1130 delete $self->{motion}; 1212 !!delete $self->{motion}
1131} 1213}
1132 1214
1133sub mouse_motion { 1215sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1135 1217
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1137} 1221}
1138 1222
1139sub _draw { 1223sub _draw {
1140 my ($self) = @_; 1224 my ($self) = @_;
1141 1225
1226 my $child = $self->{children}[0];
1227
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1230
1145 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1233
1148 my $border = $self->border; 1234 my $border = $self->border;
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1250 }
1165 1251
1166 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1167 1253
1168 $self->{title}->draw if $self->{title};
1169
1170 $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};
1171} 1265}
1172 1266
1173############################################################################# 1267#############################################################################
1174 1268
1175package CFClient::UI::Table; 1269package CFClient::UI::Table;
1198 1292
1199 $child->set_parent ($self); 1293 $child->set_parent ($self);
1200 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1201 1295
1202 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1203} 1303}
1204 1304
1205# 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?
1206sub clear { 1306sub clear {
1207 my ($self) = @_; 1307 my ($self) = @_;
1468 1568
1469 delete $self->{texture}; 1569 delete $self->{texture};
1470 $self->SUPER::update; 1570 $self->SUPER::update;
1471} 1571}
1472 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1473sub set_text { 1580sub set_text {
1474 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1475 1582
1476 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1478 1585
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1481 1588
1589 delete $self->{size_req};
1482 $self->realloc; 1590 $self->realloc;
1483 $self->update; 1591 $self->update;
1484} 1592}
1485 1593
1486sub set_markup { 1594sub set_markup {
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1601
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1496 1604
1605 delete $self->{size_req};
1497 $self->realloc; 1606 $self->realloc;
1498 $self->update; 1607 $self->update;
1499} 1608}
1500 1609
1501sub size_request { 1610sub size_request {
1502 my ($self) = @_; 1611 my ($self) = @_;
1503 1612
1613 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1619
1510 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1511 1621
1512 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1625
1516 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1517 1627
1518 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1520 } 1633 };
1521 1634
1522 ($w, $h) 1635 @{ $self->{size_req} }
1523} 1636}
1524 1637
1525sub size_allocate { 1638sub size_allocate {
1526 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1527 1640
1641 delete $self->{ox};
1642
1528 delete $self->{texture} 1643 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1530} 1645}
1531 1646
1532sub set_fontsize { 1647sub set_fontsize {
1534 1649
1535 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1536 delete $self->{texture}; 1651 delete $self->{texture};
1537 1652
1538 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1539} 1662}
1540 1663
1541sub _draw { 1664sub _draw {
1542 my ($self) = @_; 1665 my ($self) = @_;
1543 1666
1549 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1676
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1555 1679
1680 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1559 1684
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1565 }; 1688 };
1566 1689
1567 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1568 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};
1569 1694
1570 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1571 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1573 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1575 } 1702 }
1576 1703
1577 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1578} 1705}
1579 1706
1596 can_hover => 1, 1723 can_hover => 1,
1597 can_focus => 1, 1724 can_focus => 1,
1598 valign => 0, 1725 valign => 0,
1599 can_events => 1, 1726 can_events => 1,
1600 #text => ... 1727 #text => ...
1728 #hidden => "*",
1601 @_ 1729 @_
1602 ) 1730 )
1603} 1731}
1604 1732
1605sub _set_text { 1733sub _set_text {
1607 1735
1608 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1609 1737
1610 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1611 1739
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1741 $self->{text} = $text;
1616 1742
1617 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1619 1746
1620 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1621} 1751}
1622 1752
1623sub set_text { 1753sub set_text {
1624 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1625 1755
1626 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1627 $self->_set_text ($text); 1757 $self->_set_text ($text);
1628
1629 $self->realloc;
1630} 1758}
1631 1759
1632sub get_text { 1760sub get_text {
1633 $_[0]{text} 1761 $_[0]{text}
1634} 1762}
1664 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1667 } elsif ($uni) { 1795 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1669 } 1799 }
1670 1800
1671 $self->_set_text ($text); 1801 $self->_set_text ($text);
1672 1802
1673 $self->realloc; 1803 $self->realloc;
1804
1805 1
1674} 1806}
1675 1807
1676sub focus_in { 1808sub focus_in {
1677 my ($self) = @_; 1809 my ($self) = @_;
1678 1810
1693 utf8::encode $text; 1825 utf8::encode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1695 1827
1696 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1697 $self->update; 1829 $self->update;
1830
1831 1
1698} 1832}
1699 1833
1700sub mouse_motion { 1834sub mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1702# 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
1703} 1839}
1704 1840
1705sub _draw { 1841sub _draw {
1706 my ($self) = @_; 1842 my ($self) = @_;
1707 1843
1708 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1709 1845
1710 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1711 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1712 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1713 } else { 1849 } else {
1714 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1715 } 1851 }
1716 1852
1717 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1720 glVertex 0 , 0; 1856 glVertex 0 , 0;
1721 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1722 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1723 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
1784 } else { 1920 } else {
1785 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1786 } 1922 }
1787 1923
1788 } else { 1924 } else {
1789 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1790 } 1928 1
1791
1792} 1929}
1793 1930
1794############################################################################# 1931#############################################################################
1795 1932
1796package CFClient::UI::Button; 1933package CFClient::UI::Button;
1825 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1826 1963
1827 $self->emit ("activate") 1964 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1830} 1969}
1831 1970
1832sub _draw { 1971sub _draw {
1833 my ($self) = @_; 1972 my ($self) = @_;
1834 1973
1835 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1836
1837 if ($GRAB == $self) {
1838 $self->{fg} = $self->{active_fg};
1839 }
1840 1975
1841 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1843 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1844 1979
1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1846 1981
1847 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1848 1983
1849 $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
1850} 2023}
1851 2024
1852############################################################################# 2025#############################################################################
1853 2026
1854package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1888 2061
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1892 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1893 } 2070 1
1894} 2071}
1895 2072
1896sub _draw { 2073sub _draw {
1897 my ($self) = @_; 2074 my ($self) = @_;
1898 2075
2065 2242
2066 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2068 2245
2069 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2070 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;
2071 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073 2251
2074 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2075 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
2196sub set_range { 2374sub set_range {
2197 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2198 2376
2199 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2200 2378
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2203} 2383}
2204 2384
2205sub set_value { 2385sub set_value {
2206 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2207 2387
2236 2416
2237 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2238 2418
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2420
2241 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2242} 2422}
2243 2423
2244sub mouse_motion { 2424sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2246 2426
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2431
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2433
2254 $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
2255 } 2439 1
2256} 2440}
2257 2441
2258sub update { 2442sub update {
2259 my ($self) = @_; 2443 my ($self) = @_;
2260 2444
2261 $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}) {
2262 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2263 2454
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2266 2457
2272 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2274 2465
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2277 }); 2468 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2469
2285 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2286 2471
2287 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2288 2473
2349sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2351 2536
2352############################################################################# 2537#############################################################################
2353 2538
2354package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2355 2540
2356our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2357 2542
2358use CFClient::OpenGL; 2543use CFClient::OpenGL;
2359 2544
2361 my $class = shift; 2546 my $class = shift;
2362 2547
2363 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2364 fontsize => 1, 2549 fontsize => 1,
2365 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2366 #font => default_font 2552 #font => default_font
2367 @_, 2553 @_,
2368 2554
2369 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2370 par => [], 2556 par => [],
2393 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2394 2580
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $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});
2398 2585
2399 $self->reflow; 2586 $self->reflow;
2400} 2587}
2401 2588
2402sub text_size { 2589sub text_size {
2404 2591
2405 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2406 2593
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $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});
2409 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2410 2598
2411 $layout->size 2599 $layout->size
2412} 2600}
2413 2601
2452 2640
2453 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2454 2642
2455 delete $self->{texture}; 2643 delete $self->{texture};
2456 2644
2457 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2647
2460 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2649 my $height = 0;
2462 2650
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2654
2467 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2662 $_->[1] = $h;
2474 } 2663 }
2477 } 2666 }
2478 2667
2479 $self->{height} = $height; 2668 $self->{height} = $height;
2480 2669
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2482 2671
2483 delete $self->{texture}; 2672 delete $self->{texture};
2484 } 2673 }
2485 2674
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2489 2678
2490 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2491 2680
2492 my $y0 = $top; 2681 my $y0 = $top;
2506 my $h = $par->[1]; 2695 my $h = $par->[1];
2507 2696
2508 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2512 2702
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2704
2515 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
2527sub _draw { 2717sub _draw {
2528 my ($self) = @_; 2718 my ($self) = @_;
2529 2719
2530 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2533 $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});
2534 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2535 2725
2536 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2537 2727
2538} 2728}
2629 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2633 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2634 2827
2635 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2636 markup => $tooltip, 2829 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8, 2831 fontsize => 0.8,
2666 or return; 2859 or return;
2667 2860
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669 2862
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2672 2865
2673 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2674 }); 2867 });
2675} 2868}
2676 2869
2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2766 2959
2767 if ($tex) { 2960 if ($tex) {
2768 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2770 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2772 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2773 } 2966 }
2774} 2967}
2775 2968
2776sub DESTROY { 2969sub destroy {
2777 my ($self) = @_; 2970 my ($self) = @_;
2778 2971
2779 $self->{timer}->cancel 2972 $self->{timer}->cancel
2780 if $self->{timer}; 2973 if $self->{timer};
2781 2974
2782 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2783} 2976}
2977
2978#############################################################################
2979
2980package CFClient::UI::Buttonbar;
2981
2982our @ISA = CFClient::UI::HBox::;
2983
2984# TODO: should actualyl wrap buttons and other goodies.
2784 2985
2785############################################################################# 2986#############################################################################
2786 2987
2787package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2788 2989
2800 ); 3001 );
2801 3002
2802 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2803 3004
2804 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2805 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2806 3007
2807 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2808 if (!ref $widget) { 3009 if (!ref $widget) {
2809 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2810 can_hover => 1, 3011 can_hover => 1,
2811 can_events => 1, 3012 can_events => 1,
2812 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2813 } 3015 }
2814 3016
2815 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2816 3018
2817 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
2838 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2839 3041
2840 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2843} 3047}
2844 3048
2845sub button_up { 3049sub button_up {
2846 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2847 3051
2849 undef $GRAB; 3053 undef $GRAB;
2850 $self->hide; 3054 $self->hide;
2851 3055
2852 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2854 } 3062 1
2855} 3063}
2856 3064
2857############################################################################# 3065#############################################################################
2858 3066
2859package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2860 3068
2861our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2862 3070
2863sub new { 3071sub new {
2864 my $class = shift; 3072 my $class = shift;
2865 3073
2866 $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 (
2867 fontsize => 0.8, 3239 fontsize => 0.8,
2868 @_, 3240 @_,
2869 ) 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
2870} 3248}
2871 3249
2872sub reorder { 3250sub reorder {
2873 my ($self) = @_; 3251 my ($self) = @_;
2874 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} };
2875 3258
2876 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 } 3261 }
2879 3262
2882 my @items = sort { 3265 my @items = sort {
2883 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2886 3269
3270 $self->{timer}->interval (1);
3271
2887 my $count = 10 + 1; 3272 my $count = 10 + 1;
2888 for my $item (@items) { 3273 for my $item (@items) {
2889 last unless --$count; 3274 last unless --$count;
2890 3275
2891 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text}; 3280 : $item->{text};
2896 3281
2904 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2910 can_events => 1, 3295 can_events => 1,
2911 can_hover => 1 3296 can_hover => 1
2912 }; 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;
2913 } 3310 }
2914 3311
2915 $self->clear; 3312 $self->clear;
2916 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2917} 3314}
2922 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2924 3321
2925 return unless $text; 3322 return unless $text;
2926 3323
2927 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2928 3325
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930 3327
2931 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2933 $item->{count}++; 3330 $item->{count}++;
2934 } else { 3331 } else {
2935 $item->{count} = 1; 3332 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2937 } 3334 }
2938 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2939 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2940 delete $item->{label}; 3337 delete $item->{label};
2941 } else { 3338 } else {
2942 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2943 id => ++$self->{id}, 3340 id => ++$self->{id},
2962 3359
2963 $self->reorder; 3360 $self->reorder;
2964 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2965} 3362}
2966 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2967############################################################################# 3372#############################################################################
2968 3373
2969package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
2970 3375
2971our @ISA = CFClient::UI::ScrolledWindow::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2972 3377
2973sub new { 3378sub new {
2974 my $class = shift; 3379 my $class = shift;
2975 3380
2976 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_, 3383 @_,
2979 ); 3384 );
2980 3385
2981 $self 3386 $self
2982} 3387}
2983 3388
2984sub set_items { 3389sub set_items {
2985 my ($self, $items) = @_; 3390 my ($self, $items) = @_;
2986 3391
2987 $self->{scrolled}->clear; 3392 $self->{child}->clear;
2988 return unless $items; 3393 return unless $items;
2989 3394
2990 my @items = sort { 3395 my @items = sort {
2991 ($a->{type} <=> $b->{type}) 3396 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name}) 3397 or ($a->{name} cmp $b->{name})
2996 3401
2997 my $row = 0; 3402 my $row = 0;
2998 for my $item (@items) { 3403 for my $item (@items) {
2999 CFClient::Item::update_widgets $item; 3404 CFClient::Item::update_widgets $item;
3000 3405
3001 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3406 $self->{child}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3407 $self->{child}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3408 $self->{child}->add (2, $row, $item->{weight_widget});
3004 3409
3005 $row++; 3410 $row++;
3006 } 3411 }
3007} 3412}
3008 3413
3106 $rec = $::CONN->stop_record if $::CONN; 3511 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY'; 3512 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec); 3513 $self->set_command_list ($rec);
3109} 3514}
3110 3515
3111# 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
3112sub ask_for_bind { 3522sub ask_for_bind {
3113 my ($self, $commit) = @_; 3523 my ($self, $commit, $end_cb) = @_;
3114 3524
3115 CFClient::Binder::open_binding_dialog (sub { 3525 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_; 3526 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets; 3528 $self->update_binding_widgets;
3119 $self->commit if $commit; 3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3120 }); 3531 });
3121} 3532}
3122 3533
3123# $mod and $sym are the modifiers and key symbol 3534# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands) 3535# $cmds is a array ref of strings (the commands)
3142} 3553}
3143 3554
3144# this is a shortcut method that asks for a binding 3555# this is a shortcut method that asks for a binding
3145# and then just binds it. 3556# and then just binds it.
3146sub do_quick_binding { 3557sub do_quick_binding {
3147 my ($self, $cmds) = @_; 3558 my ($self, $cmds, $end_cb) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub { 3559 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 }); 3561 });
3151 $self->ask_for_bind (1); 3562 $self->ask_for_bind (1, $end_cb);
3152} 3563}
3153 3564
3154sub update_binding_widgets { 3565sub update_binding_widgets {
3155 my ($self) = @_; 3566 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding; 3567 my ($mod, $sym, $cmds) = $self->get_binding;
3200 3611
3201############################################################################# 3612#############################################################################
3202 3613
3203package CFClient::UI::SpellList; 3614package CFClient::UI::SpellList;
3204 3615
3205our @ISA = CFClient::UI::FancyFrame::; 3616our @ISA = CFClient::UI::Table::;
3206 3617
3207sub new { 3618sub new {
3208 my $class = shift; 3619 my $class = shift;
3209 3620
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3621 my $self = $class->SUPER::new (
3211 3622 binding => [],
3212 $self->add (new CFClient::UI::ScrolledWindow 3623 commands => [],
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3624 @_,
3214 3625 )
3215 $self;
3216} 3626}
3217 3627
3218# XXX: Do sorting? Argl... 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3219sub add_spell { 3713sub add_spell {
3220 my ($self, $spell) = @_; 3714 my ($self, $spell) = @_;
3715
3221 $self->{spells}->{$spell->{name}} = $spell; 3716 $self->{spell}->{$spell->{name}} = $spell;
3222 3717 $self->rebuild_spell_list;
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250} 3718}
3251 3719
3252sub remove_spell { 3720sub remove_spell {
3253 my ($self, $spell) = @_; 3721 my ($self, $spell) = @_;
3722
3254 delete $self->{spells}->{$spell->{name}}; 3723 delete $self->{spell}->{$spell->{name}};
3255 $self->rebuild_spell_list; 3724 $self->rebuild_spell_list;
3256} 3725}
3257 3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3258############################################################################# 3734#############################################################################
3259 3735
3260package CFClient::UI::Root; 3736package CFClient::UI::Root;
3261 3737
3262our @ISA = CFClient::UI::Container::; 3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3263 3741
3264use CFClient::OpenGL; 3742use CFClient::OpenGL;
3265 3743
3266sub new { 3744sub new {
3267 my $class = shift; 3745 my $class = shift;
3402 3880
3403 delete $queue{$widget+0}; 3881 delete $queue{$widget+0};
3404 3882
3405 my ($w, $h) = $widget->size_request; 3883 my ($w, $h) = $widget->size_request;
3406 3884
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3409 3890
3410 $w = $widget->{force_w} if exists $widget->{force_w}; 3891 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h}; 3892 $h = $widget->{force_h} if exists $widget->{force_h};
3412 3893
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3471 glLoadIdentity; 3952 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3955 glLoadIdentity;
3475 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3476 $self->_draw; 3964 $self->_draw;
3477} 3965}
3478 3966
3479############################################################################# 3967#############################################################################
3480 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines