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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 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 }
… …
122 133
123 for (@$vals) { 134 for (@$vals) {
124 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
125 $rem += $_ - $i; 136 $rem += $_ - $i;
126 $_ = $i; 137 $_ = $i;
138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
127 } 169 }
128} 170}
129 171
130############################################################################# 172#############################################################################
131 173
… …
150 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
152 } 194 }
153 } 195 }
154 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
155 $self 199 $self
156} 200}
157 201
158sub destroy { 202sub destroy {
159 my ($self) = @_; 203 my ($self) = @_;
… …
162 %$self = (); 206 %$self = ();
163} 207}
164 208
165sub show { 209sub show {
166 my ($self) = @_; 210 my ($self) = @_;
167
168 return if $self->{parent}; 211 return if $self->{parent};
169 212
170 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
171} 214}
172 215
… …
224 $self->{y} = $y; 267 $self->{y} = $y;
225 $self->update; 268 $self->update;
226 } 269 }
227 270
228 if ($self->{w} != $w || $self->{h} != $h) { 271 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 272 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 273 }
235} 274}
236 275
237sub size_allocate { 276sub size_allocate {
238 # nothing to be done 277 # nothing to be done
239} 278}
240 279
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children {
288}
289
241sub set_max_size { 290sub set_max_size {
242 my ($self, $w, $h) = @_; 291 my ($self, $w, $h) = @_;
243 292
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 294 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 295}
247 296
248# return top left coordinates 297sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 298 my ($self, $tooltip) = @_;
251 299
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 300 $self->{tooltip} = $tooltip;
301
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip;
305 }
253} 306}
254 307
255# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
256sub coord2local { 309sub coord2local {
257 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
258 311
259 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 313}
262 314
263# translate local coordinates to global coordinate system 315# translate local coordinates to global coordinate system
264sub coord2global { 316sub coord2global {
265 my ($self, $x, $y) = @_; 317 my ($self, $x, $y) = @_;
266 318
267 my ($X, $Y) = $self->_topleft; 319 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 320}
270 321
271sub focus_in { 322sub focus_in {
272 my ($self) = @_; 323 my ($self) = @_;
273 324
… …
345 glVertex $self->{w}, 0; 396 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 397 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 398 glVertex 0 , $self->{h};
348 glEnd; 399 glEnd;
349 glPopMatrix; 400 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 402 }
352} 403}
353 404
354sub _draw { 405sub _draw {
355 my ($self) = @_; 406 my ($self) = @_;
… …
371 422
372sub set_parent { 423sub set_parent {
373 my ($self, $parent) = @_; 424 my ($self, $parent) = @_;
374 425
375 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
376} 433}
377 434
378sub check_size { 435sub check_size {
379 my ($self) = @_; 436 my ($self, $forced) = @_;
380 437
381 $self->{parent} 438 $self->{force_alloc} = 1 if $forced;
382 or return 1; 439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 440}
403 441
404sub update { 442sub update {
405 my ($self) = @_; 443 my ($self) = @_;
406 444
… …
421} 459}
422 460
423sub DESTROY { 461sub DESTROY {
424 my ($self) = @_; 462 my ($self) = @_;
425 463
464 delete $WIDGET{$self+0};
426 #$self->deactivate; 465 #$self->deactivate;
427} 466}
428 467
429############################################################################# 468#############################################################################
430 469
… …
439 my $class = shift; 478 my $class = shift;
440 479
441 # range [value, low, high, page] 480 # range [value, low, high, page]
442 481
443 $class->SUPER::new ( 482 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
446 @_ 485 @_
447 ) 486 )
448} 487}
449 488
450sub _draw { 489sub _draw {
451 my ($self) = @_; 490 my ($self) = @_;
452 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
454 498
455 glEnable GL_BLEND; 499 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
458 502
459 glBegin GL_QUADS; 503 glBegin GL_QUADS;
460 glVertex 0 , 0; 504 glVertex 0 , 0;
461 glVertex 0 , $h; 505 glVertex 0 , $h;
462 glVertex $w, $h; 506 glVertex $w, $h;
463 glVertex $w, 0; 507 glVertex $w, 0;
464 glEnd; 508 glEnd;
465 509
466 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
467} 512}
468 513
469############################################################################# 514#############################################################################
470 515
471package CFClient::UI::Empty; 516package CFClient::UI::Empty;
… …
492sub new { 537sub new {
493 my ($class, %arg) = @_; 538 my ($class, %arg) = @_;
494 539
495 my $children = delete $arg{children} || []; 540 my $children = delete $arg{children} || [];
496 541
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 542 my $self = $class->SUPER::new (
543 children => [],
544 can_events => 0,
545 %arg,
546 );
498 $self->add ($_) for @$children; 547 $self->add ($_) for @$children;
499 548
500 $self 549 $self
501} 550}
502 551
503sub add { 552sub add {
504 my ($self, $child) = @_; 553 my ($self, @widgets) = @_;
505 554
506 $child->set_parent ($self); 555 $_->set_parent ($self)
556 for @widgets;
507 557
508 use sort 'stable'; 558 use sort 'stable';
509 559
510 $self->{children} = [ 560 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 561 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 562 @{$self->{children}}, @widgets
513 ]; 563 ];
514 564
515 $child->check_size; 565 $self->check_size (1);
566 $self->update;
567}
568
569sub children {
570 @{ $_[0]{children} }
516} 571}
517 572
518sub remove { 573sub remove {
519 my ($self, $child) = @_; 574 my ($self, $child) = @_;
520 575
… …
535 590
536 for (@$children) { 591 for (@$children) {
537 delete $_->{parent}; 592 delete $_->{parent};
538 $_->hide; 593 $_->hide;
539 } 594 }
595
596 $self->check_size;
597 $self->update;
540} 598}
541 599
542sub find_widget { 600sub find_widget {
543 my ($self, $x, $y) = @_; 601 my ($self, $x, $y) = @_;
544 602
… …
619} 677}
620 678
621sub update { 679sub update {
622 my ($self) = @_; 680 my ($self) = @_;
623 681
624 # we want to do this delayed... 682 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 683 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 684}
638 685
639sub size_allocate { 686sub size_allocate {
640 my ($self, $w, $h) = @_; 687 my ($self, $w, $h) = @_;
641 688
642 $self->child->configure (0, 0, $w, $h); 689 $self->SUPER::size_allocate ($w, $h);
690 $self->update;
691}
643 692
693sub _render {
694 $_[0]{children}[0]->draw;
695}
696
697sub render_child {
698 my ($self) = @_;
699
700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT;
703
644 $self->render_chld; 704 $self->_render;
705 };
645} 706}
646 707
647sub _draw { 708sub _draw {
648 my ($self) = @_; 709 my ($self) = @_;
649 710
650 my ($w, $h) = ($self->w, $self->h); 711 my ($w, $h) = ($self->w, $self->h);
651 712
652 my $tex = $self->{texture} 713 my $tex = $self->{texture}
653 or return; 714 or return;
654 715
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
718 glColor 1, 1, 1, 1;
659 719
660 $tex->draw_quad (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 721
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
664} 723}
665 724
666############################################################################# 725#############################################################################
667 726
668package CFClient::UI::ViewPort; 727package CFClient::UI::ViewPort;
669 728
670our @ISA = CFClient::UI::Window::; 729our @ISA = CFClient::UI::Window::;
671 730
672sub new { die }
673
674sub size_request { 731sub size_request {
675 my ($self) = @_; 732 my ($self) = @_;
676 733
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 736
680 @$self{qw(child_w child_h)} 737 @$self{qw(child_w child_h)}
681} 738}
682 739
683sub _draw { 740sub size_allocate {
684 my ($self) = @_; 741 my ($self, $w, $h) = @_;
685 742
686 $self->{children}[1]->draw; 743 $self->update;
687} 744}
688 745
746sub set_offset {
747 my ($self, $x, $y) = @_;
748
749 $self->{view_x} = int $x;
750 $self->{view_y} = int $y;
751
752 $self->update;
753}
754
755# hmm, this does not work for topleft of $self... but we should not ask for that
756sub coord2local {
757 my ($self, $x, $y) = @_;
758
759 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
760}
761
762sub coord2global {
763 my ($self, $x, $y) = @_;
764
765 $x = List::Util::min $self->{w}, $x - $self->{view_x};
766 $y = List::Util::min $self->{h}, $y - $self->{view_y};
767
768 $self->SUPER::coord2global ($x, $y)
769}
770
771sub find_widget {
772 my ($self, $x, $y) = @_;
773
774 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
775 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
776 ) {
777 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
778 } else {
779 $self->CFClient::UI::Base::find_widget ($x, $y)
780 }
781}
782
783sub _render {
784 my ($self) = @_;
785
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787
788 $self->SUPER::_render;
789}
689 790
690############################################################################# 791#############################################################################
691 792
692package CFClient::UI::Frame; 793package CFClient::UI::ScrolledWindow;
693 794
694our @ISA = CFClient::UI::Bin::; 795our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697 796
698sub new { 797sub new {
699 my $class = shift; 798 my $class = shift;
700 799
800 my $self;
801
802 my $slider = new CFClient::UI::Slider
803 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
807 },
808 ;
809
701 my $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 811 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 812 slider => $slider,
704 border => 0.8,
705 @_ 813 @_,
706 ); 814 );
707 815
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider});
819
708 $self 820 $self
709} 821}
710 822
823#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll
825
826#############################################################################
827
828package CFClient::UI::Frame;
829
830our @ISA = CFClient::UI::Bin::;
831
832use CFClient::OpenGL;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 bg => undef,
839 @_,
840 )
841}
842
711sub _draw { 843sub _draw {
712 my ($self) = @_; 844 my ($self) = @_;
713 845
714 my ($w, $h) = ($self->{w}, $self->{h}); 846 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)};
715 848
716 glEnable GL_BLEND; 849 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D; 851 glColor @{ $self->{bg} };
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 852
721# glBegin GL_QUADS; 853 glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0; 854 glVertex 0 , 0;
724# glVertex 0 , $h; 855 glVertex 0 , $h;
725# glVertex $w, $h; 856 glVertex $w, $h;
726# glVertex $w, 0; 857 glVertex $w, 0;
727# glEnd; 858 glEnd;
728 859
729
730 $self->child->draw;
731 glDisable GL_BLEND; 860 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 861 }
862
863 $self->SUPER::_draw;
733} 864}
734 865
735############################################################################# 866#############################################################################
736 867
737package CFClient::UI::FancyFrame; 868package CFClient::UI::FancyFrame;
… …
750 # TODO: user_x, user_y, overwrite moveto? 881 # TODO: user_x, user_y, overwrite moveto?
751 882
752 my $self = $class->SUPER::new ( 883 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 884 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 885 border_bg => [1, 1, 1, 1],
755 border => 0.8, 886 border => 0.6,
887 toplevel => 1,
756 can_events => 0, 888 can_events => 1,
757 @_ 889 @_
758 ); 890 );
759 891
760 $self->{title} &&= new CFClient::UI::Label 892 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 893 align => 0,
762 valign => 1, 894 valign => 1,
763 text => $self->{title}, 895 text => $self->{title},
764 fontsize => 1; 896 fontsize => $self->{border};
765 897
766 $self 898 $self
767} 899}
768 900
769sub border { 901sub border {
… …
785 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
786 918
787 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
789 921
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
791 if $self->{title}; 923 if $self->{title};
792 924
793 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
794} 926}
795 927
796sub button_down { 928sub button_down {
797 my ($self, $ev, $x, $y) = @_; 929 my ($self, $ev, $x, $y) = @_;
798 930
931 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 932 my $border = $self->border;
800 933
801 if ($x < $self->{w} && $x >= $self->{w} - $border 934 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 935 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 936
937 if ($lr & $td) {
938 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 939 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 940 my ($bw, $bh) = ($self->{w}, $self->{h});
806 941
942 my $mx = $x < $border;
943 my $my = $y < $border;
944
807 $self->{motion} = sub { 945 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
809 947
810 ($x, $y) = ($ev->{x}, $ev->{y}); 948 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy;
811 950
812 $self->{user_w} = $bw + $x - $ox; 951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 954 $self->check_size;
815 }; 955 };
816 956
817 } elsif ($x >= 0 && $x < $self->{w} 957 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 958 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 959 my ($bx, $by) = ($self->{x}, $self->{y});
822 960
823 $self->{motion} = sub { 961 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 962 my ($ev, $x, $y) = @_;
… …
847 my ($self) = @_; 985 my ($self) = @_;
848 986
849 my ($w, $h ) = ($self->{w}, $self->{h}); 987 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851 989
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 992
857 my $border = $self->border; 993 my $border = $self->border;
858 994
859 glColor @{ $self->{border_bg} }; 995 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 996 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864 1000
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 1002 my $bg = $tex[0];
866 1003
867 # TODO: repeat texture not scale 1004 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1005 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 1006 my $rep_y = $ch / $bg->{h};
870 1007
871 glColor @{ $self->{bg} }; 1008 glColor @{ $self->{bg} };
872 1009
873 $bg->{s} = $rep_x; 1010 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 1011 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 1012 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 }
877 1015
878 glDisable GL_TEXTURE_2D; 1016 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1017
881 $self->{title}->draw if $self->{title}; 1018 $self->{title}->draw if $self->{title};
1019
882 $self->child->draw; 1020 $self->child->draw;
883} 1021}
884 1022
885############################################################################# 1023#############################################################################
886 1024
… …
908 $self->{children}[$y][$x] = $child; 1046 $self->{children}[$y][$x] = $child;
909 1047
910 $child->check_size; 1048 $child->check_size;
911} 1049}
912 1050
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
913# TODO: move to container class maybe? send childs a signal on removal? 1055# TODO: move to container class maybe? send childs a signal on removal?
914sub clear { 1056sub clear {
915 my ($self) = @_; 1057 my ($self) = @_;
916 1058
917 my $children = delete $self->{children}; 1059 my @children = $self->children;
1060 delete $self->{children};
918 1061
919 for (grep $_, map @$_, grep $_, @$children) { 1062 for (@children) {
920 delete $_->{parent}; 1063 delete $_->{parent};
921 $_->hide; 1064 $_->hide;
922 } 1065 }
923 1066
924 $self->update; 1067 $self->update;
… …
1105} 1248}
1106 1249
1107sub size_allocate { 1250sub size_allocate {
1108 my ($self, $w, $h) = @_; 1251 my ($self, $w, $h) = @_;
1109 1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1110 my $children = $self->{children}; 1255 my $children = $self->{children};
1111 1256
1112 my @h = map $_->{req_h}, @$children; 1257 my @h = map $_->{req_h}, @$children;
1113 1258
1114 my $req_h = List::Util::sum @h; 1259 my $req_h = List::Util::sum @h;
… …
1143 1288
1144############################################################################# 1289#############################################################################
1145 1290
1146package CFClient::UI::Label; 1291package CFClient::UI::Label;
1147 1292
1148our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1149 1294
1150use CFClient::OpenGL; 1295use CFClient::OpenGL;
1151 1296
1152sub new { 1297sub new {
1153 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1154 1299
1155 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1157 #font => default_font 1304 #font => default_font
1305 #text => initial text
1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1309 layout => (new CFClient::Layout),
1158 fontsize => 1, 1310 fontsize => 1,
1159 text => "",
1160 align => -1, 1311 align => -1,
1161 valign => -1, 1312 valign => -1,
1162 padding => 2, 1313 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1314 can_events => 0,
1165 %arg 1315 %arg
1166 ); 1316 );
1167 1317
1168 if (exists $self->{template}) { 1318 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1319 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1320 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1321 $self->{template} = $layout;
1172 } 1322 }
1173 1323
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1324 if (exists $self->{markup}) {
1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1325 $self->set_markup (delete $self->{markup});
1326 } else {
1327 $self->set_text (delete $self->{text});
1328 }
1176 1329
1177 $self 1330 $self
1178} 1331}
1179 1332
1180sub escape { 1333sub escape($) {
1181 local $_ = $_[1]; 1334 local $_ = $_[0];
1182 1335
1183 s/&/&amp;/g; 1336 s/&/&amp;/g;
1184 s/>/&gt;/g; 1337 s/>/&gt;/g;
1185 s/</&lt;/g; 1338 s/</&lt;/g;
1186 1339
1187 $_[1] 1340 $_
1341}
1342
1343sub update {
1344 my ($self) = @_;
1345
1346 delete $self->{texture};
1347 $self->SUPER::update;
1188} 1348}
1189 1349
1190sub set_text { 1350sub set_text {
1191 my ($self, $text) = @_; 1351 my ($self, $text) = @_;
1192 1352
1353 return if $self->{text} eq "T$text";
1354 $self->{text} = "T$text";
1355
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1193 $self->{layout}->set_text ($text); 1357 $self->{layout}->set_text ($text);
1194 1358
1195 delete $self->{texture}; 1359 $self->update;
1196 $self->check_size; 1360 $self->check_size;
1197 $self->update;
1198} 1361}
1199 1362
1200sub set_markup { 1363sub set_markup {
1201 my ($self, $markup) = @_; 1364 my ($self, $markup) = @_;
1202 1365
1366 return if $self->{text} eq "M$markup";
1367 $self->{text} = "M$markup";
1368
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1203 $self->{layout}->set_markup ($markup); 1372 $self->{layout}->set_markup ($markup);
1204 1373
1205 delete $self->{texture}; 1374 $self->update;
1206 $self->check_size; 1375 $self->check_size;
1207 $self->update;
1208} 1376}
1209 1377
1210sub size_request { 1378sub size_request {
1211 my ($self) = @_; 1379 my ($self) = @_;
1212 1380
1213 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1); 1382 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216 1386
1217 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1218 1388
1219 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
… …
1241sub set_fontsize { 1411sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1412 my ($self, $fontsize) = @_;
1243 1413
1244 $self->{fontsize} = $fontsize; 1414 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1415 delete $self->{texture};
1416
1417 $self->update;
1246 $self->check_size; 1418 $self->check_size;
1247 $self->update;
1248} 1419}
1249 1420
1250sub _draw { 1421sub _draw {
1251 my ($self) = @_; 1422 my ($self) = @_;
1252 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1253 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1427 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1429 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433
1257 new_from_layout CFClient::Texture $self->{layout} 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1435
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1438 : ($self->{w} - $tex->{w}) * 0.5);
1439
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1442 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1258 }; 1445 };
1259 1446
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1449
1450 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy}); 1452 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1453 } else {
1454 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1455 }
1280 1456
1281 glDisable GL_TEXTURE_2D; 1457 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1458}
1284 1459
1285############################################################################# 1460#############################################################################
1286 1461
1287package CFClient::UI::EntryBase; 1462package CFClient::UI::EntryBase;
… …
1322 $self->{layout}->set_text ("$text "); 1497 $self->{layout}->set_text ("$text ");
1323 1498
1324 $self->emit (changed => $self->{text}); 1499 $self->emit (changed => $self->{text});
1325} 1500}
1326 1501
1327sub get_text {
1328 $_[0]{text}
1329}
1330
1331sub size_request {
1332 my ($self) = @_;
1333
1334 my ($w, $h) = $self->SUPER::size_request;
1335
1336 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text { 1502sub set_text {
1346 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1347 1504
1348 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1349 $self->_set_text ($text); 1506 $self->_set_text ($text);
1350 $self->update; 1507 $self->update;
1508 $self->check_size;
1509}
1510
1511sub get_text {
1512 $_[0]{text}
1513}
1514
1515sub size_request {
1516 my ($self) = @_;
1517
1518 my ($w, $h) = $self->SUPER::size_request;
1519
1520 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1351} 1527}
1352 1528
1353sub key_down { 1529sub key_down {
1354 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1355 1531
… …
1357 my $sym = $ev->{sym}; 1533 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1534 my $uni = $ev->{unicode};
1359 1535
1360 my $text = $self->get_text; 1536 my $text = $self->get_text;
1361 1537
1362 if ($sym == 8) { 1538 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1539 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1540 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1541 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1542 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1543 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1544 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1545 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1546 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1547 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1548 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1549 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1550 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1551 $self->emit ('escape');
1376 } elsif ($uni) { 1552 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1378 } 1554 }
1379 1555
1380 $self->_set_text ($text); 1556 $self->_set_text ($text);
1381 $self->update; 1557 $self->update;
1558 $self->check_size;
1382} 1559}
1383 1560
1384sub focus_in { 1561sub focus_in {
1385 my ($self) = @_; 1562 my ($self) = @_;
1386 1563
… …
1462 my ($self, $ev) = @_; 1639 my ($self, $ev) = @_;
1463 1640
1464 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1465 1642
1466 if ($sym == 13) { 1643 if ($sym == 13) {
1644 unshift @{$self->{history}},
1645 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1648 $self->emit (activate => $txt);
1468 $self->update; 1649 $self->update;
1650
1651 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text;
1654 }
1655 if (@{$self->{history} || []} > 0) {
1656 $self->{history_pointer}++;
1657 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1658 $self->{history_pointer} = @{$self->{history} || []} - 1;
1659 }
1660 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1661 }
1662
1663 } elsif ($sym == CFClient::SDLK_DOWN) {
1664 $self->{history_pointer}--;
1665 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1666
1667 if ($self->{history_pointer} >= 0) {
1668 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1669 } else {
1670 $self->set_text ($self->{history_saveback});
1671 }
1469 1672
1470 } else { 1673 } else {
1471 $self->SUPER::key_down ($ev); 1674 $self->SUPER::key_down ($ev);
1472 } 1675 }
1473 1676
… …
1489 my $class = shift; 1692 my $class = shift;
1490 1693
1491 $class->SUPER::new ( 1694 $class->SUPER::new (
1492 padding => 4, 1695 padding => 4,
1493 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1496 can_hover => 1, 1698 can_hover => 1,
1497 align => 0, 1699 align => 0,
1498 valign => 0, 1700 valign => 0,
1499 can_events => 1, 1701 can_events => 1,
… …
1517 1719
1518 if ($GRAB == $self) { 1720 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1721 $self->{fg} = $self->{active_fg};
1520 } 1722 }
1521 1723
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1724 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1726 glColor 0, 0, 0, 1;
1527 1727
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1728 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1729
1530 glDisable GL_TEXTURE_2D; 1730 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1731
1533 $self->SUPER::_draw; 1732 $self->SUPER::_draw;
1534} 1733}
1535 1734
1536############################################################################# 1735#############################################################################
… …
1550 1749
1551 $class->SUPER::new ( 1750 $class->SUPER::new (
1552 padding => 2, 1751 padding => 2,
1553 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1554 active_fg => [1, 1, 0], 1753 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5],
1555 state => 0, 1756 state => 0,
1556 can_hover => 1, 1757 can_hover => 1,
1557 @_ 1758 @_
1558 ) 1759 )
1559} 1760}
… …
1583 1784
1584 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1585 1786
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1788
1588 glEnable GL_BLEND; 1789 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790
1589 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1792 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1793 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1794}
1599 1795
1600############################################################################# 1796#############################################################################
1601 1797
1602package CFClient::UI::Image; 1798package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1841 glTranslate 0, -$self->{w}, 0;
1646 1842
1647 ($w, $h) = ($h, $w); 1843 ($w, $h) = ($h, $w);
1648 } 1844 }
1649 1845
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1848
1655 $tex->draw_quad (0, 0, $w, $h); 1849 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1850
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1851 glDisable GL_TEXTURE_2D;
1659} 1852}
1660 1853
1661############################################################################# 1854#############################################################################
1662 1855
… …
1710} 1903}
1711 1904
1712sub set_max { 1905sub set_max {
1713 my ($self, $max) = @_; 1906 my ($self, $max) = @_;
1714 1907
1908 return if $self->{max_val} == $max;
1909
1715 $self->{max_val} = $max; 1910 $self->{max_val} = $max;
1911 $self->update;
1716} 1912}
1717 1913
1718sub set_value { 1914sub set_value {
1719 my ($self, $val, $max) = @_; 1915 my ($self, $val, $max) = @_;
1720 1916
1721 $self->set_max ($max) 1917 $self->set_max ($max)
1722 if defined $max; 1918 if defined $max;
1723 1919
1724 $max = $self->{max_val}; 1920 return if $self->{val} == $val;
1921
1725 $self->{val} = $val; 1922 $self->{val} = $val;
1726
1727 $self->update; 1923 $self->update;
1728} 1924}
1729 1925
1730sub _draw { 1926sub _draw {
1731 my ($self) = @_; 1927 my ($self) = @_;
… …
1794 1990
1795sub new { 1991sub new {
1796 my ($class, %arg) = @_; 1992 my ($class, %arg) = @_;
1797 1993
1798 my $self = $class->SUPER::new ( 1994 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1995 tooltip => $arg{type},
1800 can_hover => 1, 1996 can_hover => 1,
1997 can_events => 1,
1801 %arg, 1998 %arg,
1802 ); 1999 );
1803 2000
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2001 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2002 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 2010
1814 $self->{value}->set_fontsize ($fsize); 2011 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 2012 $self->{max} ->set_fontsize ($fsize);
1816} 2013}
1817 2014
2015sub set_max {
2016 my ($self, $max) = @_;
2017
2018 $self->{gauge}->set_max ($max);
2019 $self->{max}->set_text ($max);
2020}
2021
1818sub set_value { 2022sub set_value {
1819 my ($self, $val, $max) = @_; 2023 my ($self, $val, $max) = @_;
1820 2024
1821 $self->set_max ($max) 2025 $self->set_max ($max)
1822 if defined $max; 2026 if defined $max;
1823 2027
1824 $self->{gauge}->set_value ($val, $max); 2028 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 2029 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 2030}
1834 2031
1835############################################################################# 2032#############################################################################
1836 2033
1837package CFClient::UI::Slider; 2034package CFClient::UI::Slider;
… …
1847 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
1848 2045
1849sub new { 2046sub new {
1850 my $class = shift; 2047 my $class = shift;
1851 2048
1852 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
1853 2050
1854 # TODO: 0-width page 2051 # TODO: 0-width page
1855 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
1856 # TODO: calculations are off 2053 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 2056 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5],
1860 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
1861 req_w => 20, 2060 req_w => $::WIDTH / 80,
1862 req_h => 20, 2061 req_h => $::WIDTH / 80,
1863 vertical => 0, 2062 vertical => 0,
1864 can_hover => 1, 2063 can_hover => 1,
1865 inner_pad => 5, 2064 inner_pad => 0.02,
1866 @_ 2065 @_
1867 ); 2066 );
1868 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
1869 $self 2071 $self
2072}
2073
2074sub set_value {
2075 my ($self, $value) = @_;
2076
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078
2079 $hi = $lo + 1 if $hi <= $lo;
2080
2081 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi;
2083
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit;
2086
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090
2091 if ($value != $old_value) {
2092 $self->emit (changed => $value);
2093 $self->update;
2094 }
1870} 2095}
1871 2096
1872sub size_request { 2097sub size_request {
1873 my ($self) = @_; 2098 my ($self) = @_;
1874 2099
… …
1887 2112
1888sub mouse_motion { 2113sub mouse_motion {
1889 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1890 2115
1891 if ($GRAB == $self) { 2116 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118
2119 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2122
2123 $self->set_value ($x * ($hi - $lo) + $lo);
2124 }
2125}
2126
2127sub update {
2128 my ($self) = @_;
2129
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]);
2132
1892 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
1893 2134
1894 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
1895 2136
1896 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1897 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1898 2138
1899 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1900 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $value = $self->{scale} * ($value - $lo);
1901 $x = $lo if $x < $lo;
1902 $x = $hi - $page if $x > $hi - $page;
1903 $self->{range}[0] = $x;
1904 2141
1905 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
1906 $self->update; 2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value;
2148 $self->{knob_w} = $page;
1907 } 2149 });
1908}
1909 2150
1910# the inner_* stuff is for generating a padding for the slider handle, 2151 $self->SUPER::update;
1911# so that the handle doesn't leave the texture. This calculation isn't 100%
1912# correct propably, but it does the job for now
1913sub _calc_inner_pad_px {
1914 my ($self, $w) = @_;
1915 ($w / 100) * $self->{inner_pad} # % to pixels
1916} 2152}
1917 2153
1918sub _draw { 2154sub _draw {
1919 my ($self) = @_; 2155 my ($self) = @_;
1920 2156
1921 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
1922 2158
1923 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
1924 2160
1925 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
1926 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
1927 2163
2164 glTranslate 1, 0, 0;
1928 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
1929 glTranslate 0, -$self->{w}, 0;
1930
1931 ($w, $h) = ($h, $w);
1932 } 2166 }
1933 2167
1934 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1935 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1936 2170
1937 my ($value, $lo, $hi, $page) = @{$self->{range}};
1938
1939 $hi = $value + 1 if $lo == $hi;
1940
1941 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1942 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1943
1944 $page = int $page * $inner_w / ($hi - $lo);
1945 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1946
1947 $w -= $page;
1948 $page &= ~1;
1949 glTranslate $page * 0.5, 0, 0;
1950 $page ||= 2;
1951
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2171 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2173
1960 # draw background 2174 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1962 2176
1963 # draw handle 2177 # draw handle
1964 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1965 2179
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
1968} 2181}
1969 2182
1970############################################################################# 2183#############################################################################
1971 2184
… …
1982 fontsize => 1, 2195 fontsize => 1,
1983 can_events => 0, 2196 can_events => 0,
1984 #font => default_font 2197 #font => default_font
1985 @_, 2198 @_,
1986 2199
1987 layout => (new CFClient::Layout), 2200 layout => (new CFClient::Layout 1),
1988 par => [], 2201 par => [],
1989 height => 0, 2202 height => 0,
1990 children => [ 2203 children => [
1991 (new CFClient::UI::Empty expand => 1), 2204 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2205 (new CFClient::UI::Slider vertical => 1),
1993 ], 2206 ],
1994 ); 2207 );
1995 2208
1996 $self->{children}[1]->connect (changed => sub { 2209 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2210
2000 $self 2211 $self
2001} 2212}
2002 2213
2003sub set_fontsize { 2214sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2215 my ($self, $fontsize) = @_;
2005 2216
2006 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2218 $self->reflow;
2008}
2009
2010sub text_height {
2011 my ($self, $text) = @_;
2012
2013 my $layout = $self->{layout};
2014
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w});
2017 $layout->set_text ($text);
2018
2019 ($layout->size)[1]
2020}
2021
2022sub reflow {
2023 my ($self) = @_;
2024
2025 $self->{need_reflow}++;
2026 $self->update;
2027} 2219}
2028 2220
2029sub size_allocate { 2221sub size_allocate {
2030 my ($self, $w, $h) = @_; 2222 my ($self, $w, $h) = @_;
2031 2223
… …
2036 $self->{layout}->set_width ($self->{children}[0]{w}); 2228 $self->{layout}->set_width ($self->{children}[0]{w});
2037 2229
2038 $self->reflow; 2230 $self->reflow;
2039} 2231}
2040 2232
2233sub text_height {
2234 my ($self, $text, $indent) = @_;
2235
2236 my $layout = $self->{layout};
2237
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text);
2241
2242 ($layout->size)[1]
2243}
2244
2245sub reflow {
2246 my ($self) = @_;
2247
2248 $self->{need_reflow}++;
2249 $self->update;
2250}
2251
2041sub add_paragraph { 2252sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
2043 2254
2044 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
2045 2256
2257 for my $line (split /\n/, $text) {
2046 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
2047
2048 $self->{height} += $height; 2259 $self->{height} += $height;
2049
2050 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
2051 2262
2052 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2053 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
2054} 2265}
2055 2266
… …
2060 2271
2061 return unless $self->{h} > 0; 2272 return unless $self->{h} > 0;
2062 2273
2063 delete $self->{texture}; 2274 delete $self->{texture};
2064 2275
2065 $ROOT->on_refresh ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
2066 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2278 my $height = 0;
2068 2279
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2070 for @{$self->{par}}; 2281 for @{$self->{par}};
2071 2282
2072 $self->{height} = $height; 2283 $self->{height} = $height;
2073 2284
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2286 $self->{children}[1]->update;
2075 2287
2076 delete $self->{texture}; 2288 delete $self->{texture};
2077 } 2289 }
2078 2290
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2080 glClearColor 0, 0, 0, 1; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2293 glClear GL_COLOR_BUFFER_BIT;
2082
2083 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087 2294
2088 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2089 2296
2090 my $y0 = $top; 2297 my $y0 = $top;
2091 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
… …
2094 2301
2095 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2096 2303
2097 $layout->set_font ($self->{font}) if $self->{font}; 2304 $layout->set_font ($self->{font}) if $self->{font};
2098 2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2099 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2310 my $h = $par->[0];
2101 2311
2102 if ($y0 < $y + $h && $y < $y1) { 2312 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] });
2314 $layout->set_width ($self->{w} - $par->[2]);
2103 $layout->set_text ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2104 2316
2105 glColor @{ $par->[1] }; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2318
2107 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2319 glRasterPos $par->[2], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2108 } 2321 }
2109 2322
2110 $y += $h; 2323 $y += $h;
2111 } 2324 }
2112 2325
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2326 glDisable GL_BLEND;
2115 }; 2327 };
2116 }); 2328 });
2117} 2329}
2118 2330
2119sub _draw { 2331sub _draw {
2120 my ($self) = @_; 2332 my ($self) = @_;
2121 2333
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2336 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2337 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2127 }
2128 2339
2129 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2130 2341
2131} 2342}
2132 2343
… …
2226 @_, 2437 @_,
2227 can_events => 0, 2438 can_events => 0,
2228 ) 2439 )
2229} 2440}
2230 2441
2231sub set_markup { 2442sub set_tooltip_from {
2232 my ($self, $text) = @_; 2443 my ($self, $widget) = @_;
2233 2444
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2445 $self->add (new CFClient::UI::Label
2235 $self->{label}->set_markup ($text); 2446 markup => $widget->{tooltip},
2236 $self->add ($self->{label}); 2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8,
2449 fg => [0, 0, 0, 1],
2450 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP),
2452 );
2237} 2453}
2238 2454
2239sub size_request { 2455sub size_request {
2240 my ($self) = @_; 2456 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2457
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2458 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2459
2246 ($w + 4, $h + 4) 2460 ($w + 4, $h + 4)
2247} 2461}
… …
2253} 2467}
2254 2468
2255sub _draw { 2469sub _draw {
2256 my ($self) = @_; 2470 my ($self) = @_;
2257 2471
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2472 glTranslate 0.375, 0.375;
2260 2473
2261 my ($w, $h) = @$self{qw(w h)}; 2474 my ($w, $h) = @$self{qw(w h)};
2262 2475
2263 glColor 1, 0.8, 0.4; 2476 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2487 glVertex 0 , $h;
2275 glVertex $w, $h; 2488 glVertex $w, $h;
2276 glVertex $w, 0; 2489 glVertex $w, 0;
2277 glEnd; 2490 glEnd;
2278 2491
2279 glPopMatrix; 2492 glTranslate 2 - 0.375, 2 - 0.375;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2493 $self->SUPER::_draw;
2283} 2494}
2284 2495
2285############################################################################# 2496#############################################################################
2286 2497
… …
2291use CFClient::OpenGL; 2502use CFClient::OpenGL;
2292 2503
2293sub new { 2504sub new {
2294 my $class = shift; 2505 my $class = shift;
2295 2506
2296 $class->SUPER::new ( 2507 my $self = $class->SUPER::new (
2297 aspect => 1, 2508 aspect => 1,
2298 @_, 2509 @_,
2299 ) 2510 );
2511
2512 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self);
2514
2515 $self->{timer} = Event->timer (
2516 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2517 hard => 1,
2518 interval => $self->{animspeed},
2519 cb => sub {
2520 ++$widget->{frame};
2521 $widget->update;
2522 },
2523 );
2524 }
2525
2526 $self
2300} 2527}
2301 2528
2302sub size_request { 2529sub size_request {
2303 (32, 8) 2530 (32, 8)
2304} 2531}
2305 2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2306sub draw { 2541sub _draw {
2307 my ($self) = @_; 2542 my ($self) = @_;
2308 2543
2544 return unless $::CONN;#d# manage and cache textures differently
2545
2546 my $face;
2547
2548 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}];
2550
2551 $face = $anim->[ $self->{frame} % @$anim ]
2552 if $anim && @$anim;
2553 }
2554
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2310 2556
2311 if ($tex) { 2557 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2558 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1; 2560 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 } 2563 }
2564}
2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2321} 2573}
2322 2574
2323############################################################################# 2575#############################################################################
2324 2576
2577package CFClient::UI::InventoryItem;
2578
2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729
2730#############################################################################
2731
2732package CFClient::UI::Menu;
2733
2734our @ISA = CFClient::UI::FancyFrame::;
2735
2736use CFClient::OpenGL;
2737
2738sub new {
2739 my $class = shift;
2740
2741 my $self = $class->SUPER::new (
2742 items => [],
2743 z => 100,
2744 @_,
2745 );
2746
2747 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2748
2749 for my $item (@{ $self->{items} }) {
2750 my ($widget, $cb) = @$item;
2751
2752 # handle various types of items, only text for now
2753 if (!ref $widget) {
2754 $widget = new CFClient::UI::Label
2755 can_hover => 1,
2756 can_events => 1,
2757 text => $widget;
2758 }
2759
2760 $self->{item}{$widget} = $item;
2761
2762 $self->{vbox}->add ($widget);
2763 }
2764
2765 $self
2766}
2767
2768# popup given the event (must be a mouse button down event currently)
2769sub popup {
2770 my ($self, $ev) = @_;
2771
2772 $self->emit ("popdown");
2773
2774 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self;
2776 $self->{button} = $ev->{button};
2777
2778 $self->show;
2779 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780}
2781
2782sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_;
2784
2785 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER};
2788}
2789
2790sub button_up {
2791 my ($self, $ev, $x, $y) = @_;
2792
2793 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB;
2795 $self->hide;
2796
2797 $self->emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover};
2799 }
2800}
2801
2802#############################################################################
2803
2804package CFClient::UI::Statusbox;
2805
2806our @ISA = CFClient::UI::VBox::;
2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2817sub reorder {
2818 my ($self) = @_;
2819 my $NOW = time;
2820
2821 while (my ($k, $v) = each %{ $self->{item} }) {
2822 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2823 }
2824
2825 my @widgets;
2826
2827 my @items = sort {
2828 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} };
2831
2832 my $count = 10 + 1;
2833 for my $item (@items) {
2834 last unless --$count;
2835
2836 push @widgets, $item->{label} ||= do {
2837 # TODO: doesn't handle markup well (read as: at all)
2838 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text};
2841
2842 for ($short) {
2843 s/^\s+//;
2844 s/\s+/ /g;
2845 }
2846
2847 new CFClient::UI::Label
2848 markup => $short,
2849 tooltip => $item->{tooltip},
2850 tooltip_font => $::FONT_PROP,
2851 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg},
2855 can_events => 1,
2856 can_hover => 1
2857 };
2858 }
2859
2860 $self->clear;
2861 $self->SUPER::add (reverse @widgets);
2862}
2863
2864sub add {
2865 my ($self, $text, %arg) = @_;
2866
2867 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//;
2869
2870 my $timeout = time + ((delete $arg{timeout}) || 60);
2871
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873
2874 if (my $item = $self->{item}{$group}) {
2875 if ($item->{text} eq $text) {
2876 $item->{count}++;
2877 } else {
2878 $item->{count} = 1;
2879 $item->{text} = $item->{tooltip} = $text;
2880 }
2881 $item->{id} = ++$self->{id};
2882 $item->{timeout} = $timeout;
2883 delete $item->{label};
2884 } else {
2885 $self->{item}{$group} = {
2886 id => ++$self->{id},
2887 text => $text,
2888 timeout => $timeout,
2889 tooltip => $text,
2890 fg => [0.8, 0.8, 0.8, 0.8],
2891 pri => 0,
2892 count => 1,
2893 %arg,
2894 };
2895 }
2896
2897 $self->reorder;
2898}
2899
2900sub reconfigure {
2901 my ($self) = @_;
2902
2903 delete $_->{label}
2904 for values %{ $self->{item} || {} };
2905
2906 $self->reorder;
2907 $self->SUPER::reconfigure;
2908}
2909
2910#############################################################################
2911
2325package CFClient::UI::Root; 2912package CFClient::UI::Root;
2326 2913
2327our @ISA = CFClient::UI::Container::; 2914our @ISA = CFClient::UI::Container::;
2328 2915
2329use CFClient::OpenGL; 2916use CFClient::OpenGL;
2330 2917
2331sub check_size { 2918sub new {
2332 my ($self) = @_; 2919 my $class = shift;
2333 2920
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2921 $class->SUPER::new (
2335} 2922 @_,
2336 2923 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2924}
2340 2925
2341sub configure { 2926sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2927 my ($self, $x, $y, $w, $h) = @_;
2343 2928
2344 $self->SUPER::configure ($x, $y, $w, $h); 2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2345 2932
2933sub check_size {
2934 my ($self) = @_;
2935
2936 $self->size_allocate ($self->{w}, $self->{h})
2937 if $self->{w};
2938}
2939
2940sub size_request {
2941 my ($self) = @_;
2942
2943 ($self->{w}, $self->{h})
2944}
2945
2946sub size_allocate {
2947 my ($self, $w, $h) = @_;
2948
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2346 for my $child (@{$self->{children}}) { 2955 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 2957
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x};
2960
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962 if exists $child->{req_y};
2963
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966
2351 $child->configure ($X, $Y, $W,$H); 2967 $child->configure ($X, $Y, $W, $H);
2352 } 2968 }
2353} 2969}
2354 2970
2355sub _topleft { 2971sub coord2local {
2356 my ($self, $x, $y) = @_; 2972 my ($self, $x, $y) = @_;
2357 2973
2358 ($x, $y) 2974 ($x, $y)
2359} 2975}
2360 2976
2977sub coord2global {
2978 my ($self, $x, $y) = @_;
2979
2980 ($x, $y)
2981}
2982
2361sub update { 2983sub update {
2362 my ($self) = @_; 2984 my ($self) = @_;
2363 2985
2364 $self->check_size; 2986 $self->check_size;
2365 ::refresh (); 2987 $::WANT_REFRESH++;
2366} 2988}
2367 2989
2368sub add { 2990sub add {
2369 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2370 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2371 # integerize window positions 2996 # integerise window positions
2372 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2374 3000
2375 $self->SUPER::add ($child); 3001 $self->SUPER::add (@children);
3002
3003 while (@children) {
3004 my $w = pop @children;
3005 push @children, $w->children;
3006 $w->{visible} = 1;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 }
2376} 3020}
2377 3021
2378sub on_refresh { 3022sub on_refresh {
2379 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2380 3024
2381 $self->{refresh_hook}{$id} = $cb; 3025 $self->{refresh_hook}{$id} = $cb;
2382} 3026}
2383 3027
3028sub on_post_alloc {
3029 my ($self, $id, $cb) = @_;
3030
3031 $self->{post_alloc_hook}{$id} = $cb;
3032}
3033
2384sub draw { 3034sub draw {
2385 my ($self) = @_; 3035 my ($self) = @_;
2386 3036
2387 while (my $rcb = delete $self->{refresh_hook}) { 3037 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 3038 $_->()
3039 for values %{delete $self->{refresh_hook}};
3040 }
3041
3042 if ($self->{check_size}) {
3043 my @queue = ([], []);
3044
3045 for (;;) {
3046 if ($self->{check_size}) {
3047 # heuristic: check containers last
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3049 for values %{delete $self->{check_size}}
3050 }
3051
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3053
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3055 ? @$widget{qw(user_w user_h)}
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061
3062 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h;
3064
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3066
3067 $widget->{parent}->check_size
3068 if $widget->{parent};
3069 }
3070 }
3071 }
3072
3073 while ($self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) {
3075 my ($widget, $w, $h) = @$_;
3076
3077 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0;
3079
3080 $widget->{w} = $w;
3081 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h);
3083 $widget->emit (size_allocate => $w, $h);
3084 }
3085 }
3086
3087 while ($self->{post_alloc_hook}) {
3088 $_->()
3089 for values %{delete $self->{post_alloc_hook}};
2389 } 3090 }
2390 3091
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3092 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2394 3095
2395 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2396 glLoadIdentity; 3097 glLoadIdentity;
2397 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2398 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2399 glLoadIdentity; 3100 glLoadIdentity;
2400 3101
2401 $self->_draw; 3102 $self->_draw;
2402} 3103}
… …
2404############################################################################# 3105#############################################################################
2405 3106
2406package CFClient::UI; 3107package CFClient::UI;
2407 3108
2408$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2410 3111
24111 31121
2412 3113

Diff Legend

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