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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
… …
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
158 }
159}
160
119############################################################################# 161#############################################################################
120 162
121package CFClient::UI::Base; 163package CFClient::UI::Base;
122 164
123use strict; 165use strict;
… …
126 168
127sub new { 169sub new {
128 my $class = shift; 170 my $class = shift;
129 171
130 my $self = bless { 172 my $self = bless {
131 x => 0, 173 x => 0,
132 y => 0, 174 y => 0,
133 z => 0, 175 z => 0,
134 can_events => 1, 176 can_events => 1,
135 @_ 177 @_
136 }, $class; 178 }, $class;
137 179
138 for (keys %$self) { 180 for (keys %$self) {
139 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
141 } 183 }
142 } 184 }
143 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
144 $self 188 $self
145} 189}
146 190
147sub destroy { 191sub destroy {
148 my ($self) = @_; 192 my ($self) = @_;
… …
160} 204}
161 205
162sub hide { 206sub hide {
163 my ($self) = @_; 207 my ($self) = @_;
164 208
165 return unless $self->{parent}; 209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
166 211
167 $self->{parent}->remove ($self); 212 $self->{parent}->remove ($self)
213 if $self->{parent};
168} 214}
169 215
170sub move { 216sub move {
171 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
172 218
… …
211 $self->{y} = $y; 257 $self->{y} = $y;
212 $self->update; 258 $self->update;
213 } 259 }
214 260
215 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 263 }
222} 264}
223 265
224sub size_allocate { 266sub size_allocate {
225 # nothing to be done 267 # nothing to be done
226} 268}
227 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
228sub set_max_size { 280sub set_max_size {
229 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
230 282
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 285}
241 286
242# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
243sub coord2local { 288sub coord2local {
244 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
245 290
246 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 292}
249 293
250# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
251sub coord2global { 295sub coord2global {
252 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
253 297
254 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 299}
257 300
258sub focus_in { 301sub focus_in {
259 my ($self) = @_; 302 my ($self) = @_;
260 303
… …
332 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
333 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
334 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
335 glEnd; 378 glEnd;
336 glPopMatrix; 379 glPopMatrix;
337 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338 } 381 }
339} 382}
340 383
341sub _draw { 384sub _draw {
342 my ($self) = @_; 385 my ($self) = @_;
… …
358 401
359sub set_parent { 402sub set_parent {
360 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
361 404
362 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
363} 410}
364 411
365sub check_size { 412sub check_size {
366 my ($self) = @_; 413 my ($self, $forced) = @_;
367 414
368 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
369 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389} 417}
390 418
391sub update { 419sub update {
392 my ($self) = @_; 420 my ($self) = @_;
393 421
… …
402} 430}
403 431
404sub emit { 432sub emit {
405 my ($self, $signal, @args) = @_; 433 my ($self, $signal, @args) = @_;
406 434
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 436}
411 437
412sub DESTROY { 438sub DESTROY {
413 my ($self) = @_; 439 my ($self) = @_;
414 440
441 delete $WIDGET{$self+0};
415 #$self->deactivate; 442 #$self->deactivate;
416} 443}
417 444
418############################################################################# 445#############################################################################
419 446
… …
481sub new { 508sub new {
482 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
483 510
484 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
485 512
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
487 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
488 519
489 $self 520 $self
490} 521}
491 522
492sub add { 523sub add {
493 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
494 525
495 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
496 528
497 use sort 'stable'; 529 use sort 'stable';
498 530
499 $self->{children} = [ 531 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
502 ]; 534 ];
503 535
504 $child->check_size; 536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
505} 542}
506 543
507sub remove { 544sub remove {
508 my ($self, $child) = @_; 545 my ($self, $child) = @_;
509 546
510 delete $child->{parent}; 547 delete $child->{parent};
548 $child->hide;
511 549
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 551
514 $self->check_size; 552 $self->check_size;
515 $self->update; 553 $self->update;
516} 554}
517 555
518sub clear { 556sub clear {
519 my ($self) = @_; 557 my ($self) = @_;
520 558
521 delete $_->{parent} 559 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
566
567 $self->check_size;
568 $self->update;
525} 569}
526 570
527sub find_widget { 571sub find_widget {
528 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
529 573
… …
604} 648}
605 649
606sub update { 650sub update {
607 my ($self) = @_; 651 my ($self) = @_;
608 652
609 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 654 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 655}
623 656
624sub size_allocate { 657sub size_allocate {
625 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
626 659
627 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
628 663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
629 $self->render_chld; 675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
630} 684}
631 685
632sub _draw { 686sub _draw {
633 my ($self) = @_; 687 my ($self) = @_;
634 688
635 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
636 690
637 my $tex = $self->{texture} 691 my $tex = $self->{texture}
638 or return; 692 or return;
639 693
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
644 697
645 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 699
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
649} 701}
650 702
651############################################################################# 703#############################################################################
652 704
653package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
654 706
655our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
656 708
657sub new { die }
658
659sub size_request { 709sub size_request {
660 my ($self) = @_; 710 my ($self) = @_;
661 711
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 714
665 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
666} 716}
667 717
668sub _draw { 718sub size_allocate {
669 my ($self) = @_; 719 my ($self, $w, $h) = @_;
670 720
671 $self->{children}[1]->draw; 721 $self->update;
672} 722}
673 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
674 726
675############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
676 729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
759}
760
761sub _render {
762 my ($self) = @_;
763
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765
766 $self->SUPER::_render;
767}
768
769#############################################################################
770
677package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
678 772
679our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
680
681use CFClient::OpenGL;
682 774
683sub new { 775sub new {
684 my $class = shift; 776 my $class = shift;
685 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
686 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
688 border_bg => [1, 1, 1, 1], 790 slider => $slider,
689 border => 0.8,
690 @_ 791 @_,
691 ); 792 );
692 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
693 $self 798 $self
694} 799}
695 800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
696sub _draw { 821sub _draw {
697 my ($self) = @_; 822 my ($self) = @_;
698 823
699 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
700 826
701 glEnable GL_BLEND; 827 glEnable GL_BLEND;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 830
706# glBegin GL_QUADS; 831 glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0; 832 glVertex 0 , 0;
709# glVertex 0 , $h; 833 glVertex 0 , $h;
710# glVertex $w, $h; 834 glVertex $w, $h;
711# glVertex $w, 0; 835 glVertex $w, 0;
712# glEnd; 836 glEnd;
713 837
714
715 $self->child->draw;
716 glDisable GL_BLEND; 838 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
718} 842}
719 843
720############################################################################# 844#############################################################################
721 845
722package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
733 my $class = shift; 857 my $class = shift;
734 858
735 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
736 860
737 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
740 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
741 can_events => 1, 866 can_events => 1,
742 @_ 867 @_
743 ); 868 );
744 869
745 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 871 align => 0,
747 valign => 1, 872 valign => 1,
748 text => $self->{title}, 873 text => $self->{title},
749 fontsize => 1; 874 fontsize => $self->{border};
750 875
751 $self 876 $self
752} 877}
753 878
754sub border { 879sub border {
… …
770 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
771 896
772 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
774 899
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
776 if $self->{title}; 901 if $self->{title};
777 902
778 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
779} 904}
780 905
781sub button_down { 906sub button_down {
782 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
783 908
909 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 910 my $border = $self->border;
785 911
786 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
791 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
792 $self->{motion} = sub { 923 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
794 925
795 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
796 928
797 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 932 $self->check_size;
800 }; 933 };
801 934
802 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
807 938
808 $self->{motion} = sub { 939 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
832 my ($self) = @_; 963 my ($self) = @_;
833 964
834 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 967
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 970
842 my $border = $self->border; 971 my $border = $self->border;
843 972
844 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 980 my $bg = $tex[0];
851 981
852 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
855 985
856 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
857 987
858 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
862 993
863 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 995
866 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
867 $self->child->draw; 998 $self->child->draw;
868} 999}
869 1000
870############################################################################# 1001#############################################################################
871 1002
… …
893 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
894 1025
895 $child->check_size; 1026 $child->check_size;
896} 1027}
897 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
898# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1034sub clear {
900 my ($self) = @_; 1035 my ($self) = @_;
901 1036
1037 my @children = $self->children;
902 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
903 $self->update; 1045 $self->update;
904} 1046}
905 1047
906sub get_wh { 1048sub get_wh {
907 my ($self) = @_; 1049 my ($self) = @_;
… …
1084} 1226}
1085 1227
1086sub size_allocate { 1228sub size_allocate {
1087 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1088 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1089 my $children = $self->{children}; 1233 my $children = $self->{children};
1090 1234
1091 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1092 1236
1093 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1130 1274
1131sub new { 1275sub new {
1132 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1133 1277
1134 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1136 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1137 fontsize => 1, 1284 fontsize => 1,
1138 text => "",
1139 align => -1, 1285 align => -1,
1140 valign => -1, 1286 valign => -1,
1141 padding => 2, 1287 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1288 can_events => 0,
1144 %arg 1289 %arg
1145 ); 1290 );
1146 1291
1147 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1295 $self->{template} = $layout;
1151 } 1296 }
1152 1297
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1155 1303
1156 $self 1304 $self
1157} 1305}
1158 1306
1159sub escape { 1307sub escape {
… …
1164 s/</&lt;/g; 1312 s/</&lt;/g;
1165 1313
1166 $_[1] 1314 $_[1]
1167} 1315}
1168 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1169sub set_text { 1324sub set_text {
1170 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1171 1326
1327 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1173 1332
1174 delete $self->{texture}; 1333 $self->update;
1175 $self->check_size; 1334 $self->check_size;
1176 $self->update;
1177} 1335}
1178 1336
1179sub set_markup { 1337sub set_markup {
1180 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1181 1339
1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1183 1347
1184 delete $self->{texture}; 1348 $self->update;
1185 $self->check_size; 1349 $self->check_size;
1186 $self->update;
1187} 1350}
1188 1351
1189sub size_request { 1352sub size_request {
1190 my ($self) = @_; 1353 my ($self) = @_;
1191 1354
… …
1220sub set_fontsize { 1383sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1222 1385
1223 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1225 $self->check_size; 1390 $self->check_size;
1226 $self->update;
1227} 1391}
1228 1392
1229sub _draw { 1393sub _draw {
1230 my ($self) = @_; 1394 my ($self) = @_;
1231 1395
1232 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1236 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5);
1407
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5);
1411
1412 $tex
1237 }; 1413 };
1238 1414
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1417
1418 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1259 1424
1260 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1426}
1263 1427
1264############################################################################# 1428#############################################################################
1265 1429
1266package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1271 1435
1272sub new { 1436sub new {
1273 my $class = shift; 1437 my $class = shift;
1274 1438
1275 $class->SUPER::new ( 1439 $class->SUPER::new (
1276 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1280 can_hover => 1, 1444 can_hover => 1,
1281 can_focus => 1, 1445 can_focus => 1,
1282 valign => 0, 1446 valign => 0,
1283 can_events => 1, 1447 can_events => 1,
1284 @_ 1448 @_
1285 ) 1449 )
1286} 1450}
1287 1451
… …
1301 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1302 1466
1303 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1304} 1468}
1305 1469
1306sub get_text {
1307 $_[0]{text}
1308}
1309
1310sub size_request {
1311 my ($self) = @_;
1312
1313 my ($w, $h) = $self->SUPER::size_request;
1314
1315 ($w + 1, $h) # add 1 for cursor
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text { 1470sub set_text {
1325 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1326 1472
1327 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1328 $self->_set_text ($text); 1474 $self->_set_text ($text);
1329 $self->update; 1475 $self->update;
1476 $self->check_size;
1477}
1478
1479sub get_text {
1480 $_[0]{text}
1481}
1482
1483sub size_request {
1484 my ($self) = @_;
1485
1486 my ($w, $h) = $self->SUPER::size_request;
1487
1488 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1330} 1495}
1331 1496
1332sub key_down { 1497sub key_down {
1333 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1334 1499
… …
1336 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1338 1503
1339 my $text = $self->get_text; 1504 my $text = $self->get_text;
1340 1505
1341 if ($sym == 8) { 1506 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1519 $self->emit ('escape');
1355 } elsif ($uni) { 1520 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1522 }
1358 1523
1359 $self->_set_text ($text); 1524 $self->_set_text ($text);
1360 $self->update; 1525 $self->update;
1526 $self->check_size;
1361} 1527}
1362 1528
1363sub focus_in { 1529sub focus_in {
1364 my ($self) = @_; 1530 my ($self) = @_;
1365 1531
… …
1441 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1442 1608
1443 my $sym = $ev->{sym}; 1609 my $sym = $ev->{sym};
1444 1610
1445 if ($sym == 13) { 1611 if ($sym == 13) {
1612 unshift @{$self->{history}},
1613 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1447 $self->update; 1617 $self->update;
1618
1619 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text;
1622 }
1623 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++;
1625 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1626 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 }
1630
1631 } elsif ($sym == CFClient::SDLK_DOWN) {
1632 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634
1635 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else {
1638 $self->set_text ($self->{history_saveback});
1639 }
1448 1640
1449 } else { 1641 } else {
1450 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1451 } 1643 }
1452 1644
… …
1466 1658
1467sub new { 1659sub new {
1468 my $class = shift; 1660 my $class = shift;
1469 1661
1470 $class->SUPER::new ( 1662 $class->SUPER::new (
1471 padding => 4, 1663 padding => 4,
1472 fg => [1, 1, 1], 1664 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1665 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1666 active_fg => [0, 0, 1],
1475 can_hover => 1, 1667 can_hover => 1,
1476 align => 0, 1668 align => 0,
1477 valign => 0, 1669 valign => 0,
1478 can_events => 1, 1670 can_events => 1,
1479 @_ 1671 @_
1480 ) 1672 )
1481} 1673}
1482 1674
… …
1496 1688
1497 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1499 } 1691 }
1500 1692
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1506 1696
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1698
1509 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1700
1512 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1513} 1702}
1514 1703
1515############################################################################# 1704#############################################################################
… …
1562 1751
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1753
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1755
1567 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1568 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1761}
1578 1762
1579############################################################################# 1763#############################################################################
1580 1764
1581package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1625 1809
1626 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1627 } 1811 }
1628 1812
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1815
1634 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1817
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1638} 1819}
1639 1820
1640############################################################################# 1821#############################################################################
1641 1822
… …
1689} 1870}
1690 1871
1691sub set_max { 1872sub set_max {
1692 my ($self, $max) = @_; 1873 my ($self, $max) = @_;
1693 1874
1875 return if $self->{max_val} == $max;
1876
1694 $self->{max_val} = $max; 1877 $self->{max_val} = $max;
1878 $self->update;
1695} 1879}
1696 1880
1697sub set_value { 1881sub set_value {
1698 my ($self, $val, $max) = @_; 1882 my ($self, $val, $max) = @_;
1699 1883
1700 $self->set_max ($max) 1884 $self->set_max ($max)
1701 if defined $max; 1885 if defined $max;
1702 1886
1703 $max = $self->{max_val}; 1887 return if $self->{val} == $val;
1888
1704 $self->{val} = $val; 1889 $self->{val} = $val;
1705
1706 $self->update; 1890 $self->update;
1707} 1891}
1708 1892
1709sub _draw { 1893sub _draw {
1710 my ($self) = @_; 1894 my ($self) = @_;
… …
1773 1957
1774sub new { 1958sub new {
1775 my ($class, %arg) = @_; 1959 my ($class, %arg) = @_;
1776 1960
1777 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1962 tooltip => $arg{type},
1963 can_hover => 1,
1779 can_events => 1, 1964 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1965 %arg,
1782 ); 1966 );
1783 1967
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1968 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1969 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1977
1794 $self->{value}->set_fontsize ($fsize); 1978 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1979 $self->{max} ->set_fontsize ($fsize);
1796} 1980}
1797 1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1798sub set_value { 1989sub set_value {
1799 my ($self, $val, $max) = @_; 1990 my ($self, $val, $max) = @_;
1800 1991
1801 $self->set_max ($max) 1992 $self->set_max ($max)
1802 if defined $max; 1993 if defined $max;
1803 1994
1804 $self->{gauge}->set_value ($val, $max); 1995 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1996 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 1997}
1814 1998
1815############################################################################# 1999#############################################################################
1816 2000
1817package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
1828 2012
1829sub new { 2013sub new {
1830 my $class = shift; 2014 my $class = shift;
1831 2015
1832 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
1833 2017
1834 # TODO: 0-width page 2018 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2020 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1841 req_w => 20, 2025 req_w => $::WIDTH / 80,
1842 req_h => 20, 2026 req_h => $::WIDTH / 80,
1843 vertical => 0, 2027 vertical => 0,
1844 can_hover => 1, 2028 can_hover => 1,
1845 inner_pad => 5, 2029 inner_pad => .05,
1846 @_ 2030 @_
1847 ); 2031 );
1848 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
1849 $self 2036 $self
2037}
2038
2039sub set_value {
2040 my ($self, $value) = @_;
2041
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043
2044 $hi = $lo + 1 if $hi <= $lo;
2045
2046 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi;
2048
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit;
2051
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055
2056 if ($value != $old_value) {
2057 $self->emit (changed => $value);
2058 $self->update;
2059 }
1850} 2060}
1851 2061
1852sub size_request { 2062sub size_request {
1853 my ($self) = @_; 2063 my ($self) = @_;
1854 2064
… …
1867 2077
1868sub mouse_motion { 2078sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
1870 2080
1871 if ($GRAB == $self) { 2081 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083
2084 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2087
2088 $self->set_value ($x * ($hi - $lo) + $lo);
2089 }
2090}
2091
2092sub update {
2093 my ($self) = @_;
2094
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]);
2097
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
1873 2099
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
1875 2101
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1877 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1878 2103
1879 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
1881 $x = $lo if $x < $lo;
1882 $x = $hi - $page if $x > $hi - $page;
1883 $self->{range}[0] = $x;
1884 2106
1885 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
1886 $self->update; 2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value;
2113 $self->{knob_w} = $page;
1887 } 2114 });
1888}
1889 2115
1890# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
1891# so that the handle doesn't leave the texture. This calculation isn't 100%
1892# correct propably, but it does the job for now
1893sub _calc_inner_pad_px {
1894 my ($self, $w) = @_;
1895 ($w / 100) * $self->{inner_pad} # % to pixels
1896} 2117}
1897 2118
1898sub _draw { 2119sub _draw {
1899 my ($self) = @_; 2120 my ($self) = @_;
1900 2121
1901 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
1902 2123
1903 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
1904 2125
1905 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
1907 2128
1908 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2131 }
1913 2132
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2135
1917 my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919 $hi = $value + 1 if $lo == $hi;
1920
1921 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924 $page = int $page * $inner_w / ($hi - $lo);
1925 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927 $w -= $page;
1928 $page &= ~1;
1929 glTranslate $page * 0.5, 0, 0;
1930 $page ||= 2;
1931
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2138
1940 # draw background 2139 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2141
1943 # draw handle 2142 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1945 2144
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
1948} 2146}
1949 2147
1950############################################################################# 2148#############################################################################
1951 2149
… …
1957 2155
1958sub new { 2156sub new {
1959 my $class = shift; 2157 my $class = shift;
1960 2158
1961 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
1962 fontsize => 1, 2160 fontsize => 1,
2161 can_events => 0,
1963 #font => default_font 2162 #font => default_font
1964 @_, 2163 @_,
1965 2164
1966 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
1967 par => [], 2166 par => [],
1968 height => 0, 2167 height => 0,
1969 children => [ 2168 children => [
1970 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
1972 ], 2171 ],
1973 ); 2172 );
1974 2173
1975 $self->{children}[1]->connect (changed => sub { 2174 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2175
1979 $self 2176 $self
1980} 2177}
1981 2178
1982sub set_fontsize { 2179sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2187 my ($self, $text) = @_;
1991 2188
1992 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
1993 2190
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2192 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2193 $layout->set_markup ($text);
1997 2194
1998 ($layout->size)[1] 2195 ($layout->size)[1]
1999} 2196}
2000 2197
2001sub reflow { 2198sub reflow {
… …
2039 2236
2040 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
2041 2238
2042 delete $self->{texture}; 2239 delete $self->{texture};
2043 2240
2044 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
2045 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2243 my $height = 0;
2047 2244
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
2049 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2251
2055 delete $self->{texture}; 2252 delete $self->{texture};
2056 } 2253 }
2057 2254
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2256 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
2061 2258
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2261
2067 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
2068 2263
… …
2077 2272
2078 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2274 my $h = $par->[0];
2080 2275
2081 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
2082 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
2083 2279
2084 glColor @{ $par->[1] };
2085 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087 } 2282 }
2088 2283
2089 $y += $h; 2284 $y += $h;
2090 } 2285 }
2091 2286
2092 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND;
2094 }; 2288 };
2095 }); 2289 });
2096} 2290}
2097 2291
2098sub _draw { 2292sub _draw {
2099 my ($self) = @_; 2293 my ($self) = @_;
2100 2294
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2297 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2106 }
2107 2300
2108 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
2109 2302
2110} 2303}
2111 2304
… …
2159 2352
2160sub new { 2353sub new {
2161 my $class = shift; 2354 my $class = shift;
2162 2355
2163 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
2164 state => 0, 2357 state => 0,
2165 connect_activate => \&toggle_flopper, 2358 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2359 @_
2168 ); 2360 );
2169 2361
2170 if ($self->{state}) { 2362 if ($self->{state}) {
2171 $self->{state} = 0; 2363 $self->{state} = 0;
… …
2206 @_, 2398 @_,
2207 can_events => 0, 2399 can_events => 0,
2208 ) 2400 )
2209} 2401}
2210 2402
2211sub set_markup { 2403sub set_tooltip_from {
2212 my ($self, $text) = @_; 2404 my ($self, $widget) = @_;
2213 2405
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2406 $self->add (new CFClient::UI::Label
2215 $self->{label}->set_markup ($text); 2407 markup => $widget->{tooltip},
2216 $self->add ($self->{label}); 2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8,
2410 fg => [0, 0, 0, 1],
2411 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 );
2217} 2413}
2218 2414
2219sub size_request { 2415sub size_request {
2220 my ($self) = @_; 2416 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2417
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2419
2226 ($w + 4, $h + 4) 2420 ($w + 4, $h + 4)
2227} 2421}
… …
2233} 2427}
2234 2428
2235sub _draw { 2429sub _draw {
2236 my ($self) = @_; 2430 my ($self) = @_;
2237 2431
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2432 glTranslate 0.375, 0.375;
2240 2433
2241 my ($w, $h) = @$self{qw(w h)}; 2434 my ($w, $h) = @$self{qw(w h)};
2242 2435
2243 glColor 1, 0.8, 0.4; 2436 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2447 glVertex 0 , $h;
2255 glVertex $w, $h; 2448 glVertex $w, $h;
2256 glVertex $w, 0; 2449 glVertex $w, 0;
2257 glEnd; 2450 glEnd;
2258 2451
2259 glPopMatrix; 2452 glTranslate 2 - 0.375, 2 - 0.375;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2453 $self->SUPER::_draw;
2263} 2454}
2264 2455
2265############################################################################# 2456#############################################################################
2266 2457
… …
2281 2472
2282sub size_request { 2473sub size_request {
2283 (32, 8) 2474 (32, 8)
2284} 2475}
2285 2476
2286sub draw { 2477sub _draw {
2287 my ($self) = @_; 2478 my ($self) = @_;
2288 2479
2480 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2482
2483 # TODO animation
2291 if ($tex) { 2484 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2490 }
2491}
2492
2493#############################################################################
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619}
2620
2621#############################################################################
2622
2623package CFClient::UI::Menu;
2624
2625our @ISA = CFClient::UI::FancyFrame::;
2626
2627use CFClient::OpenGL;
2628
2629sub new {
2630 my $class = shift;
2631
2632 my $self = $class->SUPER::new (
2633 items => [],
2634 z => 100,
2635 @_,
2636 );
2637
2638 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2639
2640 for my $item (@{ $self->{items} }) {
2641 my ($widget, $cb) = @$item;
2642
2643 # handle various types of items, only text for now
2644 if (!ref $widget) {
2645 $widget = new CFClient::UI::Label
2646 can_hover => 1,
2647 can_events => 1,
2648 text => $widget;
2649 }
2650
2651 $self->{item}{$widget} = $item;
2652
2653 $self->{vbox}->add ($widget);
2654 }
2655
2656 $self
2657}
2658
2659# popup given the event (must be a mouse button down event currently)
2660sub popup {
2661 my ($self, $ev) = @_;
2662
2663 $self->emit ("popdown");
2664
2665 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self;
2667 $self->{button} = $ev->{button};
2668
2669 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671}
2672
2673sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_;
2675
2676 # TODO: should use vbox->find_widget or so
2677 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2678 $self->{hover} = $self->{item}{$HOVER};
2679}
2680
2681sub button_up {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB;
2686 $self->hide;
2687
2688 $self->emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover};
2690 }
2691}
2692
2693#############################################################################
2694
2695package CFClient::UI::Statusbox;
2696
2697our @ISA = CFClient::UI::VBox::;
2698
2699sub reorder {
2700 my ($self) = @_;
2701 my $NOW = time;
2702
2703 while (my ($k, $v) = each %{ $self->{item} }) {
2704 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2705 }
2706
2707 my @widgets;
2708
2709 my @items = sort {
2710 $a->{pri} <=> $b->{pri}
2711 or $b->{id} <=> $a->{id}
2712 } values %{ $self->{item} };
2713
2714 my $count = 10 + 1;
2715 for my $item (@items) {
2716 last unless --$count;
2717
2718 push @widgets, $item->{label} ||= do {
2719 # TODO: doesn't handle markup well (read as: at all)
2720 my $short = $item->{count} > 1
2721 ? "<b>$item->{count} ×</b> $item->{text}"
2722 : $item->{text};
2723
2724 for ($short) {
2725 s/^\s+//;
2726 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 }
2730
2731 new CFClient::UI::Label
2732 markup => $short,
2733 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize},
2737 fg => $item->{fg},
2738 can_events => 1,
2739 can_hover => 1
2740 };
2741 }
2742
2743 $self->clear;
2744 $self->SUPER::add (reverse @widgets);
2745}
2746
2747sub add {
2748 my ($self, $text, %arg) = @_;
2749
2750 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//;
2752
2753 my $timeout = time + ((delete $arg{timeout}) || 60);
2754
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756
2757 if (my $item = $self->{item}{$group}) {
2758 if ($item->{text} eq $text) {
2759 $item->{count}++;
2760 } else {
2761 $item->{count} = 1;
2762 $item->{text} = $item->{tooltip} = $text;
2763 }
2764 $item->{id} = ++$self->{id};
2765 $item->{timeout} = $timeout;
2766 delete $item->{label};
2767 } else {
2768 $self->{item}{$group} = {
2769 id => ++$self->{id},
2770 text => $text,
2771 timeout => $timeout,
2772 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0,
2776 count => 1,
2777 %arg,
2778 };
2779 }
2780
2781 $self->reorder;
2301} 2782}
2302 2783
2303############################################################################# 2784#############################################################################
2304 2785
2305package CFClient::UI::Root; 2786package CFClient::UI::Root;
2306 2787
2307our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
2308 2789
2309use CFClient::OpenGL; 2790use CFClient::OpenGL;
2310 2791
2311sub check_size { 2792sub new {
2312 my ($self) = @_; 2793 my $class = shift;
2313 2794
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2795 $class->SUPER::new (
2315} 2796 @_,
2316 2797 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2798}
2320 2799
2321sub configure { 2800sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2801 my ($self, $x, $y, $w, $h) = @_;
2323 2802
2324 $self->SUPER::configure ($x, $y, $w, $h); 2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2325 2806
2807sub check_size {
2808 my ($self) = @_;
2809
2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816
2817 ($self->{w}, $self->{h})
2818}
2819
2820sub size_allocate {
2821 my ($self, $w, $h) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2326 for my $child (@{$self->{children}}) { 2829 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2831
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x};
2834
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836 if exists $child->{req_y};
2837
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840
2331 $child->configure ($X, $Y, $W,$H); 2841 $child->configure ($X, $Y, $W, $H);
2332 } 2842 }
2333} 2843}
2334 2844
2335sub _topleft { 2845sub coord2local {
2336 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2337 2847
2338 ($x, $y) 2848 ($x, $y)
2339} 2849}
2340 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2341sub update { 2857sub update {
2342 my ($self) = @_; 2858 my ($self) = @_;
2343 2859
2344 $self->check_size; 2860 $self->check_size;
2345 ::refresh (); 2861 $::WANT_REFRESH++;
2346} 2862}
2347 2863
2348sub add { 2864sub add {
2349 my ($self, $child) = @_; 2865 my ($self, @children) = @_;
2350 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2351 # integerize window positions 2870 # integerise window positions
2352 $child->{x} = int $child->{x}; 2871 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 2872 $child->{y} = int $child->{y};
2873 }
2354 2874
2355 $self->SUPER::add ($child); 2875 $self->SUPER::add (@children);
2356} 2876}
2357 2877
2358sub on_refresh { 2878sub on_refresh {
2359 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2360 2880
2361 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2362} 2882}
2363 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2364sub draw { 2890sub draw {
2365 my ($self) = @_; 2891 my ($self) = @_;
2366 2892
2367 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 2894 $_->()
2895 for values %{delete $self->{refresh_hook}};
2896 }
2897
2898 if ($self->{check_size}) {
2899 my @queue = ([], []);
2900
2901 for (;;) {
2902 if ($self->{check_size}) {
2903 # heuristic: check containers last
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2905 for values %{delete $self->{check_size}}
2906 }
2907
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2909
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h;
2920
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2922
2923 $widget->{parent}->check_size
2924 if $widget->{parent};
2925 }
2926 }
2927 }
2928
2929 while ($self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) {
2931 my ($widget, $w, $h) = @$_;
2932
2933 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0;
2935
2936 $widget->{w} = $w;
2937 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h);
2940 }
2941 }
2942
2943 while ($self->{post_alloc_hook}) {
2944 $_->()
2945 for values %{delete $self->{post_alloc_hook}};
2369 } 2946 }
2370 2947
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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