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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 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
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
127 } 161 }
128} 162}
129 163
130############################################################################# 164#############################################################################
131 165
… …
150 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
152 } 186 }
153 } 187 }
154 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
155 $self 191 $self
156} 192}
157 193
158sub destroy { 194sub destroy {
159 my ($self) = @_; 195 my ($self) = @_;
… …
224 $self->{y} = $y; 260 $self->{y} = $y;
225 $self->update; 261 $self->update;
226 } 262 }
227 263
228 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 266 }
235} 267}
236 268
237sub size_allocate { 269sub size_allocate {
238 # nothing to be done 270 # nothing to be done
239} 271}
240 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
241sub children { 280sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 281}
253 282
254sub set_max_size { 283sub set_max_size {
255 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
256 285
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 288}
260 289
261# return top left coordinates 290sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
264 292
265 $self->{parent} 293 $self->{tooltip} = $tooltip;
266 or Carp::confess "no parent widget in _topleft\n";#d#
267 294
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
269} 299}
270 300
271# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
272sub coord2local { 302sub coord2local {
273 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
274 304
275 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 306}
278 307
279# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
280sub coord2global { 309sub coord2global {
281 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
282 311
283 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 313}
286 314
287sub focus_in { 315sub focus_in {
288 my ($self) = @_; 316 my ($self) = @_;
289 317
… …
361 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
364 glEnd; 392 glEnd;
365 glPopMatrix; 393 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 } 395 }
368} 396}
369 397
370sub _draw { 398sub _draw {
371 my ($self) = @_; 399 my ($self) = @_;
… …
387 415
388sub set_parent { 416sub set_parent {
389 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
390 418
391 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
392} 424}
393 425
394sub check_size { 426sub check_size {
395 my ($self) = @_; 427 my ($self, $forced) = @_;
396 428
397 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
398 or return 1; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 431}
419 432
420sub update { 433sub update {
421 my ($self) = @_; 434 my ($self) = @_;
422 435
… …
437} 450}
438 451
439sub DESTROY { 452sub DESTROY {
440 my ($self) = @_; 453 my ($self) = @_;
441 454
455 delete $WIDGET{$self+0};
442 #$self->deactivate; 456 #$self->deactivate;
443} 457}
444 458
445############################################################################# 459#############################################################################
446 460
… …
455 my $class = shift; 469 my $class = shift;
456 470
457 # range [value, low, high, page] 471 # range [value, low, high, page]
458 472
459 $class->SUPER::new ( 473 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
462 @_ 476 @_
463 ) 477 )
464} 478}
465 479
466sub _draw { 480sub _draw {
467 my ($self) = @_; 481 my ($self) = @_;
468 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
470 489
471 glEnable GL_BLEND; 490 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
474 493
475 glBegin GL_QUADS; 494 glBegin GL_QUADS;
476 glVertex 0 , 0; 495 glVertex 0 , 0;
477 glVertex 0 , $h; 496 glVertex 0 , $h;
478 glVertex $w, $h; 497 glVertex $w, $h;
479 glVertex $w, 0; 498 glVertex $w, 0;
480 glEnd; 499 glEnd;
481 500
482 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
483} 503}
484 504
485############################################################################# 505#############################################################################
486 506
487package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
519 539
520 $self 540 $self
521} 541}
522 542
523sub add { 543sub add {
524 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
525 545
526 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
527 548
528 use sort 'stable'; 549 use sort 'stable';
529 550
530 $self->{children} = [ 551 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
533 ]; 554 ];
534 555
535 $child->check_size; 556 $self->check_size (1);
557 $self->update;
536} 558}
537 559
538sub children { 560sub children {
539 @{ $_[0]{children} } 561 @{ $_[0]{children} }
540} 562}
… …
559 581
560 for (@$children) { 582 for (@$children) {
561 delete $_->{parent}; 583 delete $_->{parent};
562 $_->hide; 584 $_->hide;
563 } 585 }
586
587 $self->check_size;
588 $self->update;
564} 589}
565 590
566sub find_widget { 591sub find_widget {
567 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
568 593
… …
643} 668}
644 669
645sub update { 670sub update {
646 my ($self) = @_; 671 my ($self) = @_;
647 672
648 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 674 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 675}
662 676
663sub size_allocate { 677sub size_allocate {
664 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
665 679
666 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
667 683
684sub _render {
685 $_[0]{children}[0]->draw;
686}
687
688sub render_child {
689 my ($self) = @_;
690
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT;
694
668 $self->render_chld; 695 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 };
669} 704}
670 705
671sub _draw { 706sub _draw {
672 my ($self) = @_; 707 my ($self) = @_;
673 708
674 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
675 710
676 my $tex = $self->{texture} 711 my $tex = $self->{texture}
677 or return; 712 or return;
678 713
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1;
683 717
684 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 719
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
688} 721}
689 722
690############################################################################# 723#############################################################################
691 724
692package CFClient::UI::ViewPort; 725package CFClient::UI::ViewPort;
693 726
694our @ISA = CFClient::UI::Window::; 727our @ISA = CFClient::UI::Window::;
695 728
696sub new { die }
697
698sub size_request { 729sub size_request {
699 my ($self) = @_; 730 my ($self) = @_;
700 731
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 734
704 @$self{qw(child_w child_h)} 735 @$self{qw(child_w child_h)}
705} 736}
706 737
707sub _draw { 738sub size_allocate {
708 my ($self) = @_; 739 my ($self, $w, $h) = @_;
709 740
710 $self->{children}[1]->draw; 741 $self->update;
711} 742}
712 743
744sub set_offset {
745 my ($self, $x, $y) = @_;
713 746
714############################################################################# 747 $self->{view_x} = int $x;
748 $self->{view_y} = int $y;
715 749
750 $self->update;
751}
752
753# hmm, this does not work for topleft of $self... but we should not ask for that
754sub coord2local {
755 my ($self, $x, $y) = @_;
756
757 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
758}
759
760sub coord2global {
761 my ($self, $x, $y) = @_;
762
763 $x = List::Util::min $self->{w}, $x - $self->{view_x};
764 $y = List::Util::min $self->{h}, $y - $self->{view_y};
765
766 $self->SUPER::coord2global ($x, $y)
767}
768
769sub find_widget {
770 my ($self, $x, $y) = @_;
771
772 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
773 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
774 ) {
775 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
776 } else {
777 $self->CFClient::UI::Base::find_widget ($x, $y)
778 }
779}
780
781sub _render {
782 my ($self) = @_;
783
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785
786 $self->SUPER::_render;
787}
788
789#############################################################################
790
716package CFClient::UI::Frame; 791package CFClient::UI::ScrolledWindow;
717 792
718our @ISA = CFClient::UI::Bin::; 793our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 794
722sub new { 795sub new {
723 my $class = shift; 796 my $class = shift;
724 797
798 my $self;
799
800 my $slider = new CFClient::UI::Slider
801 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
805 },
806 ;
807
725 my $self = $class->SUPER::new ( 808 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 809 vp => (new CFClient::UI::ViewPort),
727 border_bg => [1, 1, 1, 1], 810 slider => $slider,
728 border => 0.8,
729 @_ 811 @_,
730 ); 812 );
731 813
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider});
817
732 $self 818 $self
733} 819}
734 820
821#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll
823
824#############################################################################
825
826package CFClient::UI::Frame;
827
828our @ISA = CFClient::UI::Bin::;
829
830use CFClient::OpenGL;
831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 bg => undef,
837 @_,
838 )
839}
840
735sub _draw { 841sub _draw {
736 my ($self) = @_; 842 my ($self) = @_;
737 843
738 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
739 846
740 glEnable GL_BLEND; 847 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 850
745# glBegin GL_QUADS; 851 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 852 glVertex 0 , 0;
748# glVertex 0 , $h; 853 glVertex 0 , $h;
749# glVertex $w, $h; 854 glVertex $w, $h;
750# glVertex $w, 0; 855 glVertex $w, 0;
751# glEnd; 856 glEnd;
752 857
753
754 $self->child->draw;
755 glDisable GL_BLEND; 858 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
757} 862}
758 863
759############################################################################# 864#############################################################################
760 865
761package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
774 # TODO: user_x, user_y, overwrite moveto? 879 # TODO: user_x, user_y, overwrite moveto?
775 880
776 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
779 border => 0.8, 884 border => 0.6,
885 toplevel => 1,
780 can_events => 1, 886 can_events => 1,
781 @_ 887 @_
782 ); 888 );
783 889
784 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 891 align => 0,
786 valign => 1, 892 valign => 1,
787 text => $self->{title}, 893 text => $self->{title},
788 fontsize => 1; 894 fontsize => $self->{border};
789 895
790 $self 896 $self
791} 897}
792 898
793sub border { 899sub border {
… …
809 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
810 916
811 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
813 919
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
815 if $self->{title}; 921 if $self->{title};
816 922
817 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
818} 924}
819 925
820sub button_down { 926sub button_down {
821 my ($self, $ev, $x, $y) = @_; 927 my ($self, $ev, $x, $y) = @_;
822 928
929 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 930 my $border = $self->border;
824 931
825 if ($x < $self->{w} && $x >= $self->{w} - $border 932 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 933 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 934
935 if ($lr & $td) {
936 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 938 my ($bw, $bh) = ($self->{w}, $self->{h});
830 939
940 my $mx = $x < $border;
941 my $my = $y < $border;
942
831 $self->{motion} = sub { 943 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 944 my ($ev, $x, $y) = @_;
833 945
834 ($x, $y) = ($ev->{x}, $ev->{y}); 946 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy;
835 948
836 $self->{user_w} = $bw + $x - $ox; 949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 952 $self->check_size;
839 }; 953 };
840 954
841 } elsif ($x >= 0 && $x < $self->{w} 955 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 956 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 957 my ($bx, $by) = ($self->{x}, $self->{y});
846 958
847 $self->{motion} = sub { 959 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 960 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 983 my ($self) = @_;
872 984
873 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 987
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 990
881 my $border = $self->border; 991 my $border = $self->border;
882 992
883 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 998
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1000 my $bg = $tex[0];
890 1001
891 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1003 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1004 my $rep_y = $ch / $bg->{h};
894 1005
895 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
896 1007
897 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
901 1013
902 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1015
905 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1017
906 $self->child->draw; 1018 $self->child->draw;
907} 1019}
908 1020
909############################################################################# 1021#############################################################################
910 1022
… …
1134} 1246}
1135 1247
1136sub size_allocate { 1248sub size_allocate {
1137 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1138 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1139 my $children = $self->{children}; 1253 my $children = $self->{children};
1140 1254
1141 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1142 1256
1143 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1172 1286
1173############################################################################# 1287#############################################################################
1174 1288
1175package CFClient::UI::Label; 1289package CFClient::UI::Label;
1176 1290
1177our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1178 1292
1179use CFClient::OpenGL; 1293use CFClient::OpenGL;
1180 1294
1181sub new { 1295sub new {
1182 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1183 1297
1184 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1186 #font => default_font 1302 #font => default_font
1303 #text => initial text
1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1307 layout => (new CFClient::Layout),
1187 fontsize => 1, 1308 fontsize => 1,
1188 text => "",
1189 align => -1, 1309 align => -1,
1190 valign => -1, 1310 valign => -1,
1191 padding => 2, 1311 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1312 can_events => 0,
1194 %arg 1313 %arg
1195 ); 1314 );
1196 1315
1197 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1319 $self->{template} = $layout;
1201 } 1320 }
1202 1321
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1323 $self->set_markup (delete $self->{markup});
1324 } else {
1325 $self->set_text (delete $self->{text});
1326 }
1205 1327
1206 $self 1328 $self
1207} 1329}
1208 1330
1209sub escape { 1331sub escape($) {
1210 local $_ = $_[1]; 1332 local $_ = $_[0];
1211 1333
1212 s/&/&amp;/g; 1334 s/&/&amp;/g;
1213 s/>/&gt;/g; 1335 s/>/&gt;/g;
1214 s/</&lt;/g; 1336 s/</&lt;/g;
1215 1337
1216 $_[1] 1338 $_
1217} 1339}
1218 1340
1219sub update { 1341sub update {
1220 my ($self) = @_; 1342 my ($self) = @_;
1221 1343
1222 delete $self->{texture}; 1344 delete $self->{texture};
1223 $self->SUPER::update; 1345 $self->SUPER::update;
1224} 1346}
1225 1347
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1348sub set_text {
1233 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1234 1350
1235 return if $self->{text} eq "T$text"; 1351 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1352 $self->{text} = "T$text";
1237 1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1239 1356
1240 delete $self->{texture};
1241 $self->update; 1357 $self->update;
1242 $self->check_size; 1358 $self->check_size;
1243} 1359}
1244 1360
1245sub set_markup { 1361sub set_markup {
1246 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1247 1363
1248 return if $self->{text} eq "M$markup"; 1364 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1365 $self->{text} = "M$markup";
1250 1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1252 1371
1253 delete $self->{texture};
1254 $self->update; 1372 $self->update;
1255 $self->check_size; 1373 $self->check_size;
1256} 1374}
1257 1375
1258sub size_request { 1376sub size_request {
1259 my ($self) = @_; 1377 my ($self) = @_;
1260 1378
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1384
1265 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1266 1386
1267 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1409sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1410 my ($self, $fontsize) = @_;
1291 1411
1292 $self->{fontsize} = $fontsize; 1412 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1413 delete $self->{texture};
1414
1415 $self->update;
1294 $self->check_size; 1416 $self->check_size;
1295 $self->update;
1296} 1417}
1297 1418
1298sub _draw { 1419sub _draw {
1299 my ($self) = @_; 1420 my ($self) = @_;
1300 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1301 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1305 new_from_layout CFClient::Texture $self->{layout} 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1436 : ($self->{w} - $tex->{w}) * 0.5);
1437
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1440 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1306 }; 1443 };
1307 1444
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1447
1448 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1328 1454
1329 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1456}
1332 1457
1333############################################################################# 1458#############################################################################
1334 1459
1335package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1371 1496
1372 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1373} 1498}
1374 1499
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text { 1500sub set_text {
1394 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1395 1502
1396 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1504 $self->_set_text ($text);
1398 $self->update; 1505 $self->update;
1506 $self->check_size;
1507}
1508
1509sub get_text {
1510 $_[0]{text}
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 my ($w, $h) = $self->SUPER::size_request;
1517
1518 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1399} 1525}
1400 1526
1401sub key_down { 1527sub key_down {
1402 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1403 1529
… …
1405 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1407 1533
1408 my $text = $self->get_text; 1534 my $text = $self->get_text;
1409 1535
1410 if ($sym == 8) { 1536 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1549 $self->emit ('escape');
1424 } elsif ($uni) { 1550 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1552 }
1427 1553
1428 $self->_set_text ($text); 1554 $self->_set_text ($text);
1429 $self->update; 1555 $self->update;
1556 $self->check_size;
1430} 1557}
1431 1558
1432sub focus_in { 1559sub focus_in {
1433 my ($self) = @_; 1560 my ($self) = @_;
1434 1561
… …
1563 my $class = shift; 1690 my $class = shift;
1564 1691
1565 $class->SUPER::new ( 1692 $class->SUPER::new (
1566 padding => 4, 1693 padding => 4,
1567 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1570 can_hover => 1, 1696 can_hover => 1,
1571 align => 0, 1697 align => 0,
1572 valign => 0, 1698 valign => 0,
1573 can_events => 1, 1699 can_events => 1,
… …
1591 1717
1592 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1594 } 1720 }
1595 1721
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1601 1725
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1727
1604 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1729
1607 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1608} 1731}
1609 1732
1610############################################################################# 1733#############################################################################
… …
1624 1747
1625 $class->SUPER::new ( 1748 $class->SUPER::new (
1626 padding => 2, 1749 padding => 2,
1627 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 1754 state => 0,
1630 can_hover => 1, 1755 can_hover => 1,
1631 @_ 1756 @_
1632 ) 1757 )
1633} 1758}
… …
1657 1782
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1784
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1786
1662 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1663 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1792}
1673 1793
1674############################################################################# 1794#############################################################################
1675 1795
1676package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1720 1840
1721 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1722 } 1842 }
1723 1843
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1846
1729 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1848
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1733} 1850}
1734 1851
1735############################################################################# 1852#############################################################################
1736 1853
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1926 2043
1927sub new { 2044sub new {
1928 my $class = shift; 2045 my $class = shift;
1929 2046
1930 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1931 2048
1932 # TODO: 0-width page 2049 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2051 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1939 req_w => 20, 2058 req_w => $::WIDTH / 80,
1940 req_h => 20, 2059 req_h => $::WIDTH / 80,
1941 vertical => 0, 2060 vertical => 0,
1942 can_hover => 1, 2061 can_hover => 1,
1943 inner_pad => 5, 2062 inner_pad => .05,
1944 @_ 2063 @_
1945 ); 2064 );
1946 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1947 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
1948} 2093}
1949 2094
1950sub size_request { 2095sub size_request {
1951 my ($self) = @_; 2096 my ($self) = @_;
1952 2097
… …
1965 2110
1966sub mouse_motion { 2111sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
1968 2113
1969 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971 2132
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
1973 2134
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976 2136
1977 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2139
1983 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
1984 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
1985 } 2147 });
1986}
1987 2148
1988# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2150}
1995 2151
1996sub _draw { 2152sub _draw {
1997 my ($self) = @_; 2153 my ($self) = @_;
1998 2154
1999 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2000 2156
2001 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2002 2158
2003 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2005 2161
2006 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2164 }
2011 2165
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2168
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2171
2038 # draw background 2172 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2174
2041 # draw handle 2175 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 2177
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2046} 2179}
2047 2180
2048############################################################################# 2181#############################################################################
2049 2182
… …
2060 fontsize => 1, 2193 fontsize => 1,
2061 can_events => 0, 2194 can_events => 0,
2062 #font => default_font 2195 #font => default_font
2063 @_, 2196 @_,
2064 2197
2065 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2066 par => [], 2199 par => [],
2067 height => 0, 2200 height => 0,
2068 children => [ 2201 children => [
2069 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
2071 ], 2204 ],
2072 ); 2205 );
2073 2206
2074 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2208
2078 $self 2209 $self
2079} 2210}
2080 2211
2081sub set_fontsize { 2212sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
2090 2221
2091 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2092 2223
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2096 2227
2097 ($layout->size)[1] 2228 ($layout->size)[1]
2098} 2229}
2099 2230
2100sub reflow { 2231sub reflow {
… …
2138 2269
2139 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2140 2271
2141 delete $self->{texture}; 2272 delete $self->{texture};
2142 2273
2143 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2144 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2276 my $height = 0;
2146 2277
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2284
2154 delete $self->{texture}; 2285 delete $self->{texture};
2155 } 2286 }
2156 2287
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2160 2291
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 2294
2166 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2167 2296
… …
2176 2305
2177 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2307 my $h = $par->[0];
2179 2308
2180 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2181 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2182 2312
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2186 } 2315 }
2187 2316
2188 $y += $h; 2317 $y += $h;
2189 } 2318 }
2190 2319
2191 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
2193 }; 2321 };
2194 }); 2322 });
2195} 2323}
2196 2324
2197sub _draw { 2325sub _draw {
2198 my ($self) = @_; 2326 my ($self) = @_;
2199 2327
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2206 }
2207 2333
2208 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2209 2335
2210} 2336}
2211 2337
… …
2305 @_, 2431 @_,
2306 can_events => 0, 2432 can_events => 0,
2307 ) 2433 )
2308} 2434}
2309 2435
2310sub set_markup { 2436sub set_tooltip_from {
2311 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2312 2438
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8,
2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2446 );
2316} 2447}
2317 2448
2318sub size_request { 2449sub size_request {
2319 my ($self) = @_; 2450 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2451
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2453
2325 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2326} 2455}
… …
2332} 2461}
2333 2462
2334sub _draw { 2463sub _draw {
2335 my ($self) = @_; 2464 my ($self) = @_;
2336 2465
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2339 2467
2340 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2341 2469
2342 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2481 glVertex 0 , $h;
2354 glVertex $w, $h; 2482 glVertex $w, $h;
2355 glVertex $w, 0; 2483 glVertex $w, 0;
2356 glEnd; 2484 glEnd;
2357 2485
2358 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2362} 2488}
2363 2489
2364############################################################################# 2490#############################################################################
2365 2491
… …
2380 2506
2381sub size_request { 2507sub size_request {
2382 (32, 8) 2508 (32, 8)
2383} 2509}
2384 2510
2385sub draw { 2511sub _draw {
2386 my ($self) = @_; 2512 my ($self) = @_;
2387 2513
2514 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2516
2517 # TODO animation
2390 if ($tex) { 2518 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND; 2524 }
2525}
2526
2527#############################################################################
2528
2529package CFClient::UI::InventoryItem;
2530
2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676
2677#############################################################################
2678
2679package CFClient::UI::Menu;
2680
2681our @ISA = CFClient::UI::FancyFrame::;
2682
2683use CFClient::OpenGL;
2684
2685sub new {
2686 my $class = shift;
2687
2688 my $self = $class->SUPER::new (
2689 items => [],
2690 z => 100,
2691 @_,
2692 );
2693
2694 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2695
2696 for my $item (@{ $self->{items} }) {
2697 my ($widget, $cb) = @$item;
2698
2699 # handle various types of items, only text for now
2700 if (!ref $widget) {
2701 $widget = new CFClient::UI::Label
2702 can_hover => 1,
2703 can_events => 1,
2704 text => $widget;
2705 }
2706
2707 $self->{item}{$widget} = $item;
2708
2709 $self->{vbox}->add ($widget);
2710 }
2711
2712 $self
2713}
2714
2715# popup given the event (must be a mouse button down event currently)
2716sub popup {
2717 my ($self, $ev) = @_;
2718
2719 $self->emit ("popdown");
2720
2721 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self;
2723 $self->{button} = $ev->{button};
2724
2725 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727}
2728
2729sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_;
2731
2732 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER};
2735}
2736
2737sub button_up {
2738 my ($self, $ev, $x, $y) = @_;
2739
2740 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB;
2742 $self->hide;
2743
2744 $self->emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover};
2746 }
2747}
2748
2749#############################################################################
2750
2751package CFClient::UI::Statusbox;
2752
2753our @ISA = CFClient::UI::VBox::;
2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2399 } 2761 )
2762}
2763
2764sub reorder {
2765 my ($self) = @_;
2766 my $NOW = time;
2767
2768 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 }
2771
2772 my @widgets;
2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2779 my $count = 10 + 1;
2780 for my $item (@items) {
2781 last unless --$count;
2782
2783 push @widgets, $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2789 for ($short) {
2790 s/^\s+//;
2791 s/\s+/ /g;
2792 }
2793
2794 new CFClient::UI::Label
2795 markup => $short,
2796 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2802 can_events => 1,
2803 can_hover => 1
2804 };
2805 }
2806
2807 $self->clear;
2808 $self->SUPER::add (reverse @widgets);
2809}
2810
2811sub add {
2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2834 text => $text,
2835 timeout => $timeout,
2836 tooltip => $text,
2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2840 %arg,
2841 };
2842 }
2843
2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2400} 2855}
2401 2856
2402############################################################################# 2857#############################################################################
2403 2858
2404package CFClient::UI::Root; 2859package CFClient::UI::Root;
2405 2860
2406our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2407 2862
2408use CFClient::OpenGL; 2863use CFClient::OpenGL;
2409 2864
2410sub check_size { 2865sub new {
2411 my ($self) = @_; 2866 my $class = shift;
2412 2867
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2868 $class->SUPER::new (
2414} 2869 @_,
2415 2870 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2871}
2419 2872
2420sub configure { 2873sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2874 my ($self, $x, $y, $w, $h) = @_;
2422 2875
2423 $self->SUPER::configure ($x, $y, $w, $h); 2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2424 2879
2880sub check_size {
2881 my ($self) = @_;
2882
2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2885}
2886
2887sub size_request {
2888 my ($self) = @_;
2889
2890 ($self->{w}, $self->{h})
2891}
2892
2893sub size_allocate {
2894 my ($self, $w, $h) = @_;
2895
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2425 for my $child (@{$self->{children}}) { 2902 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2430 $child->configure ($X, $Y, $W,$H); 2914 $child->configure ($X, $Y, $W, $H);
2431 } 2915 }
2432} 2916}
2433 2917
2434sub _topleft { 2918sub coord2local {
2435 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2436 2920
2437 ($x, $y) 2921 ($x, $y)
2438} 2922}
2439 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2440sub update { 2930sub update {
2441 my ($self) = @_; 2931 my ($self) = @_;
2442 2932
2443 $self->check_size; 2933 $self->check_size;
2444 ::refresh (); 2934 $::WANT_REFRESH++;
2445} 2935}
2446 2936
2447sub add { 2937sub add {
2448 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2449 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2450 # integerize window positions 2943 # integerise window positions
2451 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2453 2947
2454 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2455} 2949}
2456 2950
2457sub on_refresh { 2951sub on_refresh {
2458 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2459 2953
2460 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2461} 2955}
2462 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2463sub draw { 2963sub draw {
2464 my ($self) = @_; 2964 my ($self) = @_;
2465 2965
2466 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2970
2971 if ($self->{check_size}) {
2972 my @queue = ([], []);
2973
2974 for (;;) {
2975 if ($self->{check_size}) {
2976 # heuristic: check containers last
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2978 for values %{delete $self->{check_size}}
2979 }
2980
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2982
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2984 ? @$widget{qw(user_w user_h)}
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990
2991 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h;
2993
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2995
2996 $widget->{parent}->check_size
2997 if $widget->{parent};
2998 }
2999 }
3000 }
3001
3002 while ($self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) {
3004 my ($widget, $w, $h) = @$_;
3005
3006 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0;
3008
3009 $widget->{w} = $w;
3010 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h);
3013 }
3014 }
3015
3016 while ($self->{post_alloc_hook}) {
3017 $_->()
3018 for values %{delete $self->{post_alloc_hook}};
2468 } 3019 }
2469 3020
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2483############################################################################# 3034#############################################################################
2484 3035
2485package CFClient::UI; 3036package CFClient::UI;
2486 3037
2487$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3040
24901 30411
2491 3042

Diff Legend

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