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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 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
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
232 $self->{y} = $y; 260 $self->{y} = $y;
233 $self->update; 261 $self->update;
234 } 262 }
235 263
236 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 266 }
243} 267}
244 268
245sub size_allocate { 269sub size_allocate {
246 # nothing to be done 270 # nothing to be done
247} 271}
248 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
249sub children { 280sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 281}
261 282
262sub set_max_size { 283sub set_max_size {
263 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
264 285
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 288}
268 289
269# return top left coordinates 290sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
272 292
273 $self->{parent} 293 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 294
276 $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 }
277} 299}
278 300
279# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
280sub coord2local { 302sub coord2local {
281 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
282 304
283 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 306}
286 307
287# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
288sub coord2global { 309sub coord2global {
289 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
290 311
291 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 313}
294 314
295sub focus_in { 315sub focus_in {
296 my ($self) = @_; 316 my ($self) = @_;
297 317
… …
369 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
372 glEnd; 392 glEnd;
373 glPopMatrix; 393 glPopMatrix;
374 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;
375 } 395 }
376} 396}
377 397
378sub _draw { 398sub _draw {
379 my ($self) = @_; 399 my ($self) = @_;
… …
395 415
396sub set_parent { 416sub set_parent {
397 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
398 418
399 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};
400} 424}
401 425
402sub check_size { 426sub check_size {
403 my ($self) = @_; 427 my ($self, $forced) = @_;
404 428
405 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
406 or return 1; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 431}
427 432
428sub update { 433sub update {
429 my ($self) = @_; 434 my ($self) = @_;
430 435
… …
445} 450}
446 451
447sub DESTROY { 452sub DESTROY {
448 my ($self) = @_; 453 my ($self) = @_;
449 454
455 delete $WIDGET{$self+0};
450 #$self->deactivate; 456 #$self->deactivate;
451} 457}
452 458
453############################################################################# 459#############################################################################
454 460
… …
463 my $class = shift; 469 my $class = shift;
464 470
465 # range [value, low, high, page] 471 # range [value, low, high, page]
466 472
467 $class->SUPER::new ( 473 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
470 @_ 476 @_
471 ) 477 )
472} 478}
473 479
474sub _draw { 480sub _draw {
475 my ($self) = @_; 481 my ($self) = @_;
476 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
478 489
479 glEnable GL_BLEND; 490 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
482 493
483 glBegin GL_QUADS; 494 glBegin GL_QUADS;
484 glVertex 0 , 0; 495 glVertex 0 , 0;
485 glVertex 0 , $h; 496 glVertex 0 , $h;
486 glVertex $w, $h; 497 glVertex $w, $h;
487 glVertex $w, 0; 498 glVertex $w, 0;
488 glEnd; 499 glEnd;
489 500
490 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
491} 503}
492 504
493############################################################################# 505#############################################################################
494 506
495package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
527 539
528 $self 540 $self
529} 541}
530 542
531sub add { 543sub add {
532 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
533 545
534 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
535 548
536 use sort 'stable'; 549 use sort 'stable';
537 550
538 $self->{children} = [ 551 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
541 ]; 554 ];
542 555
543 $child->check_size; 556 $self->check_size (1);
557 $self->update;
544} 558}
545 559
546sub children { 560sub children {
547 @{ $_[0]{children} } 561 @{ $_[0]{children} }
548} 562}
… …
567 581
568 for (@$children) { 582 for (@$children) {
569 delete $_->{parent}; 583 delete $_->{parent};
570 $_->hide; 584 $_->hide;
571 } 585 }
586
587 $self->check_size;
588 $self->update;
572} 589}
573 590
574sub find_widget { 591sub find_widget {
575 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
576 593
… …
651} 668}
652 669
653sub update { 670sub update {
654 my ($self) = @_; 671 my ($self) = @_;
655 672
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 674 $self->SUPER::update;
658} 675}
659 676
660sub size_allocate { 677sub size_allocate {
661 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
662 679
663 $self->SUPER::size_allocate ($w, $h); 680 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 681 $self->update;
682}
683
684sub _render {
685 $_[0]{children}[0]->draw;
665} 686}
666 687
667sub render_child { 688sub render_child {
668 my ($self) = @_; 689 my ($self) = @_;
669 690
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 694
695 $self->_render;
674# glColorMask 1, 1, 1, 0; 696# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 697# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 699# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 700# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
688 710
689 my $tex = $self->{texture} 711 my $tex = $self->{texture}
690 or return; 712 or return;
691 713
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 716 glColor 0, 0, 0, 1;
697 717
698 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 719
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
702} 721}
703 722
704############################################################################# 723#############################################################################
705 724
706package CFClient::UI::ViewPort; 725package CFClient::UI::ViewPort;
707 726
708our @ISA = CFClient::UI::Window::; 727our @ISA = CFClient::UI::Window::;
709 728
710sub new { die }
711
712sub size_request { 729sub size_request {
713 my ($self) = @_; 730 my ($self) = @_;
714 731
715 @$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)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 734
718 @$self{qw(child_w child_h)} 735 @$self{qw(child_w child_h)}
719} 736}
720 737
721sub _draw { 738sub size_allocate {
722 my ($self) = @_; 739 my ($self, $w, $h) = @_;
723 740
724 $self->{children}[1]->draw; 741 $self->update;
725} 742}
726 743
744sub set_offset {
745 my ($self, $x, $y) = @_;
727 746
728############################################################################# 747 $self->{view_x} = int $x;
748 $self->{view_y} = int $y;
729 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
730package CFClient::UI::Frame; 791package CFClient::UI::ScrolledWindow;
731 792
732our @ISA = CFClient::UI::Bin::; 793our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 794
736sub new { 795sub new {
737 my $class = shift; 796 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 808 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 809 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 810 slider => $slider,
742 border => 0.8,
743 @_ 811 @_,
744 ); 812 );
745 813
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider});
817
746 $self 818 $self
747} 819}
748 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
749sub _draw { 841sub _draw {
750 my ($self) = @_; 842 my ($self) = @_;
751 843
752 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
753 846
754 glEnable GL_BLEND; 847 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 850
759# glBegin GL_QUADS; 851 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 852 glVertex 0 , 0;
762# glVertex 0 , $h; 853 glVertex 0 , $h;
763# glVertex $w, $h; 854 glVertex $w, $h;
764# glVertex $w, 0; 855 glVertex $w, 0;
765# glEnd; 856 glEnd;
766 857
767
768 $self->child->draw;
769 glDisable GL_BLEND; 858 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
771} 862}
772 863
773############################################################################# 864#############################################################################
774 865
775package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
788 # TODO: user_x, user_y, overwrite moveto? 879 # TODO: user_x, user_y, overwrite moveto?
789 880
790 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
793 border => 0.8, 884 border => 0.6,
885 toplevel => 1,
794 can_events => 1, 886 can_events => 1,
795 @_ 887 @_
796 ); 888 );
797 889
798 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 891 align => 0,
800 valign => 1, 892 valign => 1,
801 text => $self->{title}, 893 text => $self->{title},
802 fontsize => 1; 894 fontsize => $self->{border};
803 895
804 $self 896 $self
805} 897}
806 898
807sub border { 899sub border {
… …
823 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
824 916
825 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
827 919
828 $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)
829 if $self->{title}; 921 if $self->{title};
830 922
831 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
832} 924}
833 925
834sub button_down { 926sub button_down {
835 my ($self, $ev, $x, $y) = @_; 927 my ($self, $ev, $x, $y) = @_;
836 928
929 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 930 my $border = $self->border;
838 931
839 if ($x < $self->{w} && $x >= $self->{w} - $border 932 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 933 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 934
935 if ($lr & $td) {
936 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 938 my ($bw, $bh) = ($self->{w}, $self->{h});
844 939
940 my $mx = $x < $border;
941 my $my = $y < $border;
942
845 $self->{motion} = sub { 943 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 944 my ($ev, $x, $y) = @_;
847 945
848 ($x, $y) = ($ev->{x}, $ev->{y}); 946 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy;
849 948
850 $self->{user_w} = $bw + $x - $ox; 949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 952 $self->check_size;
853 }; 953 };
854 954
855 } elsif ($x >= 0 && $x < $self->{w} 955 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 956 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 957 my ($bx, $by) = ($self->{x}, $self->{y});
860 958
861 $self->{motion} = sub { 959 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 960 my ($ev, $x, $y) = @_;
… …
885 my ($self) = @_; 983 my ($self) = @_;
886 984
887 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
888 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
889 987
890 glEnable GL_BLEND;
891 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
892 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
894 990
895 my $border = $self->border; 991 my $border = $self->border;
896 992
897 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
898 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
902 998
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 1000 my $bg = $tex[0];
904 1001
905 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 1003 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 1004 my $rep_y = $ch / $bg->{h};
908 1005
909 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
910 1007
911 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
915 1013
916 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND;
918 1015
919 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1017
920 $self->child->draw; 1018 $self->child->draw;
921} 1019}
922 1020
923############################################################################# 1021#############################################################################
924 1022
… …
1148} 1246}
1149 1247
1150sub size_allocate { 1248sub size_allocate {
1151 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1152 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1153 my $children = $self->{children}; 1253 my $children = $self->{children};
1154 1254
1155 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1156 1256
1157 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1186 1286
1187############################################################################# 1287#############################################################################
1188 1288
1189package CFClient::UI::Label; 1289package CFClient::UI::Label;
1190 1290
1191our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1192 1292
1193use CFClient::OpenGL; 1293use CFClient::OpenGL;
1194 1294
1195sub new { 1295sub new {
1196 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1197 1297
1198 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1199 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1200 #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),
1201 fontsize => 1, 1308 fontsize => 1,
1202 text => "",
1203 align => -1, 1309 align => -1,
1204 valign => -1, 1310 valign => -1,
1205 padding => 2, 1311 padding => 2,
1206 layout => new CFClient::Layout,
1207 can_events => 0, 1312 can_events => 0,
1208 %arg 1313 %arg
1209 ); 1314 );
1210 1315
1211 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1212 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1213 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1214 $self->{template} = $layout; 1319 $self->{template} = $layout;
1215 } 1320 }
1216 1321
1217 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1218 $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 }
1219 1327
1220 $self 1328 $self
1221} 1329}
1222 1330
1223sub escape { 1331sub escape($) {
1224 local $_ = $_[1]; 1332 local $_ = $_[0];
1225 1333
1226 s/&/&amp;/g; 1334 s/&/&amp;/g;
1227 s/>/&gt;/g; 1335 s/>/&gt;/g;
1228 s/</&lt;/g; 1336 s/</&lt;/g;
1229 1337
1230 $_[1] 1338 $_
1231} 1339}
1232 1340
1233sub update { 1341sub update {
1234 my ($self) = @_; 1342 my ($self) = @_;
1235 1343
1236 delete $self->{texture}; 1344 delete $self->{texture};
1237 $self->SUPER::update; 1345 $self->SUPER::update;
1238} 1346}
1239 1347
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1246sub set_text { 1348sub set_text {
1247 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1248 1350
1249 return if $self->{text} eq "T$text"; 1351 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text"; 1352 $self->{text} = "T$text";
1251 1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1252 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1253 1356
1254 delete $self->{texture};
1255 $self->update; 1357 $self->update;
1256 $self->check_size; 1358 $self->check_size;
1257} 1359}
1258 1360
1259sub set_markup { 1361sub set_markup {
1260 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1261 1363
1262 return if $self->{text} eq "M$markup"; 1364 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup"; 1365 $self->{text} = "M$markup";
1264 1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1265 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1266 1371
1267 delete $self->{texture};
1268 $self->update; 1372 $self->update;
1269 $self->check_size; 1373 $self->check_size;
1270} 1374}
1271 1375
1272sub size_request { 1376sub size_request {
1273 my ($self) = @_; 1377 my ($self) = @_;
1274 1378
1275 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1276 $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});
1277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1278 1384
1279 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1280 1386
1281 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1303sub set_fontsize { 1409sub set_fontsize {
1304 my ($self, $fontsize) = @_; 1410 my ($self, $fontsize) = @_;
1305 1411
1306 $self->{fontsize} = $fontsize; 1412 $self->{fontsize} = $fontsize;
1307 delete $self->{texture}; 1413 delete $self->{texture};
1414
1415 $self->update;
1308 $self->check_size; 1416 $self->check_size;
1309 $self->update;
1310} 1417}
1311 1418
1312sub _draw { 1419sub _draw {
1313 my ($self) = @_; 1420 my ($self) = @_;
1314 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1315 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1316 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1317 $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});
1318 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1319 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
1320 }; 1443 };
1321 1444
1322 glEnable GL_BLEND;
1323 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1324 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1325 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1326 1447
1448 if ($tex->{format} == GL_ALPHA) {
1327 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1328
1329 $self->{ox} = int (
1330 $self->{align} < 0 ? $self->{padding}
1331 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1332 : ($self->{w} - $tex->{w}) * 0.5
1333 );
1334
1335 $self->{oy} = int (
1336 $self->{valign} < 0 ? $self->{padding}
1337 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1338 : ($self->{h} - $tex->{h}) * 0.5
1339 );
1340
1341 $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 }
1342 1454
1343 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345} 1456}
1346 1457
1347############################################################################# 1458#############################################################################
1348 1459
1349package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1384 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1385 1496
1386 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1387} 1498}
1388 1499
1389sub get_text {
1390 $_[0]{text}
1391}
1392
1393sub size_request {
1394 my ($self) = @_;
1395
1396 my ($w, $h) = $self->SUPER::size_request;
1397
1398 ($w + 1, $h) # add 1 for cursor
1399}
1400
1401sub size_allocate {
1402 my ($self, $w, $h) = @_;
1403
1404 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1405}
1406
1407sub set_text { 1500sub set_text {
1408 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1409 1502
1410 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1411 $self->_set_text ($text); 1504 $self->_set_text ($text);
1412 $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
1413} 1525}
1414 1526
1415sub key_down { 1527sub key_down {
1416 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1417 1529
… …
1419 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1420 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1421 1533
1422 my $text = $self->get_text; 1534 my $text = $self->get_text;
1423 1535
1424 if ($sym == 8) { 1536 if ($uni == 8) {
1425 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1426 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1427 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1428 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1429 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1430 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1431 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1432 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1433 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1434 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1435 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1436 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1437 $self->emit ('escape'); 1549 $self->emit ('escape');
1438 } elsif ($uni) { 1550 } elsif ($uni) {
1439 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1440 } 1552 }
1441 1553
1442 $self->_set_text ($text); 1554 $self->_set_text ($text);
1443 $self->update; 1555 $self->update;
1556 $self->check_size;
1444} 1557}
1445 1558
1446sub focus_in { 1559sub focus_in {
1447 my ($self) = @_; 1560 my ($self) = @_;
1448 1561
… …
1577 my $class = shift; 1690 my $class = shift;
1578 1691
1579 $class->SUPER::new ( 1692 $class->SUPER::new (
1580 padding => 4, 1693 padding => 4,
1581 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1582 bg => [1, 1, 1, 0.2],
1583 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1584 can_hover => 1, 1696 can_hover => 1,
1585 align => 0, 1697 align => 0,
1586 valign => 0, 1698 valign => 0,
1587 can_events => 1, 1699 can_events => 1,
… …
1605 1717
1606 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1607 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1608 } 1720 }
1609 1721
1610 glEnable GL_BLEND;
1611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1612 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1615 1725
1616 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1617 1727
1618 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1619 glDisable GL_BLEND;
1620 1729
1621 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1622} 1731}
1623 1732
1624############################################################################# 1733#############################################################################
… …
1638 1747
1639 $class->SUPER::new ( 1748 $class->SUPER::new (
1640 padding => 2, 1749 padding => 2,
1641 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1642 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],
1643 state => 0, 1754 state => 0,
1644 can_hover => 1, 1755 can_hover => 1,
1645 @_ 1756 @_
1646 ) 1757 )
1647} 1758}
… …
1671 1782
1672 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;
1673 1784
1674 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1675 1786
1676 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1677 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679
1680 my $tex = $self->{state} ? $tex[1] : $tex[0];
1681
1682 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1683
1684 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1685 glDisable GL_BLEND;
1686} 1792}
1687 1793
1688############################################################################# 1794#############################################################################
1689 1795
1690package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1733 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1734 1840
1735 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1736 } 1842 }
1737 1843
1738 glEnable GL_BLEND;
1739 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 1846
1743 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1744 1848
1745 glDisable GL_BLEND;
1746 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1747} 1850}
1748 1851
1749############################################################################# 1852#############################################################################
1750 1853
… …
1939 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1940 2043
1941sub new { 2044sub new {
1942 my $class = shift; 2045 my $class = shift;
1943 2046
1944 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1945 2048
1946 # TODO: 0-width page 2049 # TODO: 0-width page
1947 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1948 # TODO: calculations are off 2051 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1951 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],
1952 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1953 req_w => 20, 2058 req_w => $::WIDTH / 80,
1954 req_h => 20, 2059 req_h => $::WIDTH / 80,
1955 vertical => 0, 2060 vertical => 0,
1956 can_hover => 1, 2061 can_hover => 1,
1957 inner_pad => 5, 2062 inner_pad => .05,
1958 @_ 2063 @_
1959 ); 2064 );
1960 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1961 $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 }
1962} 2093}
1963 2094
1964sub size_request { 2095sub size_request {
1965 my ($self) = @_; 2096 my ($self) = @_;
1966 2097
… …
1979 2110
1980sub mouse_motion { 2111sub mouse_motion {
1981 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
1982 2113
1983 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
1984 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
1985 2132
1986 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
1987 2134
1988 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1989 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1990 2136
1991 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1992 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
1993 $x = $lo if $x < $lo;
1994 $x = $hi - $page if $x > $hi - $page;
1995 $self->{range}[0] = $x;
1996 2139
1997 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
1998 $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;
1999 } 2147 });
2000}
2001 2148
2002# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2003# so that the handle doesn't leave the texture. This calculation isn't 100%
2004# correct propably, but it does the job for now
2005sub _calc_inner_pad_px {
2006 my ($self, $w) = @_;
2007 ($w / 100) * $self->{inner_pad} # % to pixels
2008} 2150}
2009 2151
2010sub _draw { 2152sub _draw {
2011 my ($self) = @_; 2153 my ($self) = @_;
2012 2154
2013 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2014 2156
2015 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2016 2158
2017 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2018 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2019 2161
2162 glTranslate 1, 0, 0;
2020 glRotate 90, 0, 0, 1; 2163 glRotate 90, 0, 0, 1;
2021 glTranslate 0, -$self->{w}, 0;
2022
2023 ($w, $h) = ($h, $w);
2024 } 2164 }
2025 2165
2026 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2027 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2028 2168
2029 my ($value, $lo, $hi, $page) = @{$self->{range}};
2030
2031 $hi = $value + 1 if $lo == $hi;
2032
2033 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2034 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2035
2036 $page = int $page * $inner_w / ($hi - $lo);
2037 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2038
2039 $w -= $page;
2040 $page &= ~1;
2041 glTranslate $page * 0.5, 0, 0;
2042 $page ||= 2;
2043
2044 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2045 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2046
2047 glEnable GL_BLEND;
2048 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2049 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2171
2052 # draw background 2172 # draw background
2053 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2054 2174
2055 # draw handle 2175 # draw handle
2056 $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);
2057 2177
2058 glDisable GL_BLEND;
2059 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2060} 2179}
2061 2180
2062############################################################################# 2181#############################################################################
2063 2182
… …
2074 fontsize => 1, 2193 fontsize => 1,
2075 can_events => 0, 2194 can_events => 0,
2076 #font => default_font 2195 #font => default_font
2077 @_, 2196 @_,
2078 2197
2079 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2080 par => [], 2199 par => [],
2081 height => 0, 2200 height => 0,
2082 children => [ 2201 children => [
2083 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
2085 ], 2204 ],
2086 ); 2205 );
2087 2206
2088 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2208
2092 $self 2209 $self
2093} 2210}
2094 2211
2095sub set_fontsize { 2212sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
2104 2221
2105 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2106 2223
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2110 2227
2111 ($layout->size)[1] 2228 ($layout->size)[1]
2112} 2229}
2113 2230
2114sub reflow { 2231sub reflow {
… …
2152 2269
2153 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2154 2271
2155 delete $self->{texture}; 2272 delete $self->{texture};
2156 2273
2157 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2158 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2159 my $height = 0; 2276 my $height = 0;
2160 2277
2161 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2162 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2284
2168 delete $self->{texture}; 2285 delete $self->{texture};
2169 } 2286 }
2170 2287
2171 $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 {
2172 glClearColor 0, 0, 0, 0; 2289 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2174 2291
2175 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2177 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2178 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2179 2294
2180 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2181 2296
… …
2190 2305
2191 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2192 my $h = $par->[0]; 2307 my $h = $par->[0];
2193 2308
2194 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2195 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2196 2312
2197 glColor @{ $par->[1] };
2198 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2199 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);
2200 } 2315 }
2201 2316
2202 $y += $h; 2317 $y += $h;
2203 } 2318 }
2204 2319
2205 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2206 glDisable GL_BLEND;
2207 }; 2321 };
2208 }); 2322 });
2209} 2323}
2210 2324
2211sub _draw { 2325sub _draw {
2212 my ($self) = @_; 2326 my ($self) = @_;
2213 2327
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2220 $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});
2221 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2223 }
2224 2333
2225 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2226 2335
2227} 2336}
2228 2337
… …
2322 @_, 2431 @_,
2323 can_events => 0, 2432 can_events => 0,
2324 ) 2433 )
2325} 2434}
2326 2435
2327sub set_markup { 2436sub set_tooltip_from {
2328 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2329 2438
2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2331 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2332 $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 );
2333} 2447}
2334 2448
2335sub size_request { 2449sub size_request {
2336 my ($self) = @_; 2450 my ($self) = @_;
2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339 2451
2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341 2453
2342 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2343} 2455}
… …
2349} 2461}
2350 2462
2351sub _draw { 2463sub _draw {
2352 my ($self) = @_; 2464 my ($self) = @_;
2353 2465
2354 glPushMatrix;
2355 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2356 2467
2357 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2358 2469
2359 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2370 glVertex 0 , $h; 2481 glVertex 0 , $h;
2371 glVertex $w, $h; 2482 glVertex $w, $h;
2372 glVertex $w, 0; 2483 glVertex $w, 0;
2373 glEnd; 2484 glEnd;
2374 2485
2375 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2376
2377 glTranslate 2, 2;
2378 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2379} 2488}
2380 2489
2381############################################################################# 2490#############################################################################
2382 2491
… …
2397 2506
2398sub size_request { 2507sub size_request {
2399 (32, 8) 2508 (32, 8)
2400} 2509}
2401 2510
2402sub draw { 2511sub _draw {
2403 my ($self) = @_; 2512 my ($self) = @_;
2404 2513
2514 return unless $::CONN;#d# manage and cache textures differently
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2516
2517 # TODO animation
2407 if ($tex) { 2518 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2415 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 @_,
2416 } 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;
2417} 2855}
2418 2856
2419############################################################################# 2857#############################################################################
2420 2858
2421package CFClient::UI::Root; 2859package CFClient::UI::Root;
2422 2860
2423our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2424 2862
2425use CFClient::OpenGL; 2863use CFClient::OpenGL;
2426 2864
2427sub check_size { 2865sub new {
2428 my ($self) = @_; 2866 my $class = shift;
2429 2867
2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2868 $class->SUPER::new (
2431} 2869 @_,
2432 2870 )
2433sub size_request {
2434 ($::WIDTH, $::HEIGHT)
2435} 2871}
2436 2872
2437sub configure { 2873sub configure {
2438 my ($self, $x, $y, $w, $h) = @_; 2874 my ($self, $x, $y, $w, $h) = @_;
2439 2875
2440 $self->SUPER::configure ($x, $y, $w, $h); 2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2441 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
2442 for my $child (@{$self->{children}}) { 2902 for my $child ($self->children) {
2443 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)};
2444 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
2445 $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;
2446 $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
2447 $child->configure ($X, $Y, $W,$H); 2914 $child->configure ($X, $Y, $W, $H);
2448 } 2915 }
2449} 2916}
2450 2917
2451sub _topleft { 2918sub coord2local {
2452 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2453 2920
2454 ($x, $y) 2921 ($x, $y)
2455} 2922}
2456 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2457sub update { 2930sub update {
2458 my ($self) = @_; 2931 my ($self) = @_;
2459 2932
2460 $self->check_size; 2933 $self->check_size;
2461 ::refresh (); 2934 $::WANT_REFRESH++;
2462} 2935}
2463 2936
2464sub add { 2937sub add {
2465 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2466 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2467 # integerize window positions 2943 # integerise window positions
2468 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2470 2947
2471 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2472} 2949}
2473 2950
2474sub on_refresh { 2951sub on_refresh {
2475 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2476 2953
2477 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2478} 2955}
2479 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2480sub draw { 2963sub draw {
2481 my ($self) = @_; 2964 my ($self) = @_;
2482 2965
2483 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2484 $_->() 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}};
2485 } 3019 }
2486 3020
2487 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2500############################################################################# 3034#############################################################################
2501 3035
2502package CFClient::UI; 3036package CFClient::UI;
2503 3037
2504$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2506 3040
25071 30411
2508 3042

Diff Legend

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