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.210 by root, Wed May 17 10:14:52 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 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 263 }
243} 264}
244 265
245sub size_allocate { 266sub size_allocate {
246 # nothing to be done 267 # nothing to be done
247} 268}
248 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
249sub children { 277sub 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} 278}
261 279
262sub set_max_size { 280sub set_max_size {
263 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
264 282
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 285}
268 286
269# return top left coordinates 287sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
272 289
273 $self->{parent} 290 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 291
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
277} 296}
278 297
279# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
280sub coord2local { 299sub coord2local {
281 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
282 301
283 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 303}
286 304
287# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
288sub coord2global { 306sub coord2global {
289 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
290 308
291 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 310}
294 311
295sub focus_in { 312sub focus_in {
296 my ($self) = @_; 313 my ($self) = @_;
297 314
… …
369 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
372 glEnd; 389 glEnd;
373 glPopMatrix; 390 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 392 }
376} 393}
377 394
378sub _draw { 395sub _draw {
379 my ($self) = @_; 396 my ($self) = @_;
… …
395 412
396sub set_parent { 413sub set_parent {
397 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
398 415
399 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
400} 421}
401 422
402sub check_size { 423sub check_size {
403 my ($self) = @_; 424 my ($self, $forced) = @_;
404 425
405 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
406 or return 1; 427 $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} 428}
427 429
428sub update { 430sub update {
429 my ($self) = @_; 431 my ($self) = @_;
430 432
… …
445} 447}
446 448
447sub DESTROY { 449sub DESTROY {
448 my ($self) = @_; 450 my ($self) = @_;
449 451
452 delete $WIDGET{$self+0};
450 #$self->deactivate; 453 #$self->deactivate;
451} 454}
452 455
453############################################################################# 456#############################################################################
454 457
… …
463 my $class = shift; 466 my $class = shift;
464 467
465 # range [value, low, high, page] 468 # range [value, low, high, page]
466 469
467 $class->SUPER::new ( 470 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
470 @_ 473 @_
471 ) 474 )
472} 475}
473 476
474sub _draw { 477sub _draw {
475 my ($self) = @_; 478 my ($self) = @_;
476 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
478 486
479 glEnable GL_BLEND; 487 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
482 490
483 glBegin GL_QUADS; 491 glBegin GL_QUADS;
484 glVertex 0 , 0; 492 glVertex 0 , 0;
485 glVertex 0 , $h; 493 glVertex 0 , $h;
486 glVertex $w, $h; 494 glVertex $w, $h;
487 glVertex $w, 0; 495 glVertex $w, 0;
488 glEnd; 496 glEnd;
489 497
490 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
491} 500}
492 501
493############################################################################# 502#############################################################################
494 503
495package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
527 536
528 $self 537 $self
529} 538}
530 539
531sub add { 540sub add {
532 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
533 542
534 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
535 545
536 use sort 'stable'; 546 use sort 'stable';
537 547
538 $self->{children} = [ 548 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
541 ]; 551 ];
542 552
543 $child->check_size; 553 $self->check_size (1);
554 $self->update;
544} 555}
545 556
546sub children { 557sub children {
547 @{ $_[0]{children} } 558 @{ $_[0]{children} }
548} 559}
… …
567 578
568 for (@$children) { 579 for (@$children) {
569 delete $_->{parent}; 580 delete $_->{parent};
570 $_->hide; 581 $_->hide;
571 } 582 }
583
584 $self->check_size;
585 $self->update;
572} 586}
573 587
574sub find_widget { 588sub find_widget {
575 my ($self, $x, $y) = @_; 589 my ($self, $x, $y) = @_;
576 590
… …
651} 665}
652 666
653sub update { 667sub update {
654 my ($self) = @_; 668 my ($self) = @_;
655 669
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 671 $self->SUPER::update;
658} 672}
659 673
660sub size_allocate { 674sub size_allocate {
661 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
662 676
663 $self->SUPER::size_allocate ($w, $h); 677 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 678 $self->update;
679}
680
681sub _render {
682 $_[0]{children}[0]->draw;
665} 683}
666 684
667sub render_child { 685sub render_child {
668 my ($self) = @_; 686 my ($self) = @_;
669 687
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 689 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 690 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 691
692 $self->_render;
674# glColorMask 1, 1, 1, 0; 693# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 694# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 696# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 697# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
688 707
689 my $tex = $self->{texture} 708 my $tex = $self->{texture}
690 or return; 709 or return;
691 710
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
697 714
698 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 716
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
702} 718}
703 719
704############################################################################# 720#############################################################################
705 721
706package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
707 723
708our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
709 725
710sub new { die }
711
712sub size_request { 726sub size_request {
713 my ($self) = @_; 727 my ($self) = @_;
714 728
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 729 @$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)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 731
718 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
719} 733}
720 734
721sub _draw { 735sub size_allocate {
722 my ($self) = @_; 736 my ($self, $w, $h) = @_;
723 737
724 $self->{children}[1]->draw; 738 $self->update;
725} 739}
726 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
727 743
728############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
729 746
747 $self->update;
748}
749
750# hmm, this does not work for topleft of $self... but we should not ask for that
751sub coord2local {
752 my ($self, $x, $y) = @_;
753
754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
764}
765
766sub find_widget {
767 my ($self, $x, $y) = @_;
768
769 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
770 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
771 ) {
772 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
773 } else {
774 $self->CFClient::UI::Base::find_widget ($x, $y)
775 }
776}
777
778sub _render {
779 my ($self) = @_;
780
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782
783 $self->SUPER::_render;
784}
785
786#############################################################################
787
730package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
731 789
732our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 791
736sub new { 792sub new {
737 my $class = shift; 793 my $class = shift;
738 794
795 my $self;
796
797 my $slider = new CFClient::UI::Slider
798 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
802 },
803 ;
804
739 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 807 slider => $slider,
742 border => 0.8,
743 @_ 808 @_,
744 ); 809 );
745 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
746 $self 815 $self
747} 816}
748 817
818#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll
820
821#############################################################################
822
823package CFClient::UI::Frame;
824
825our @ISA = CFClient::UI::Bin::;
826
827use CFClient::OpenGL;
828
829sub new {
830 my $class = shift;
831
832 $class->SUPER::new (
833 bg => undef,
834 @_,
835 )
836}
837
749sub _draw { 838sub _draw {
750 my ($self) = @_; 839 my ($self) = @_;
751 840
752 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
753 843
754 glEnable GL_BLEND; 844 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 847
759# glBegin GL_QUADS; 848 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 849 glVertex 0 , 0;
762# glVertex 0 , $h; 850 glVertex 0 , $h;
763# glVertex $w, $h; 851 glVertex $w, $h;
764# glVertex $w, 0; 852 glVertex $w, 0;
765# glEnd; 853 glEnd;
766 854
767
768 $self->child->draw;
769 glDisable GL_BLEND; 855 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
771} 859}
772 860
773############################################################################# 861#############################################################################
774 862
775package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
788 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
789 877
790 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
793 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
794 can_events => 1, 883 can_events => 1,
795 @_ 884 @_
796 ); 885 );
797 886
798 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 888 align => 0,
800 valign => 1, 889 valign => 1,
801 text => $self->{title}, 890 text => $self->{title},
802 fontsize => 1; 891 fontsize => $self->{border};
803 892
804 $self 893 $self
805} 894}
806 895
807sub border { 896sub border {
… …
823 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
824 913
825 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
827 916
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 918 if $self->{title};
830 919
831 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
832} 921}
833 922
834sub button_down { 923sub button_down {
835 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
836 925
926 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 927 my $border = $self->border;
838 928
839 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
844 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
845 $self->{motion} = sub { 940 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
847 942
848 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
849 945
850 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 949 $self->check_size;
853 }; 950 };
854 951
855 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
860 955
861 $self->{motion} = sub { 956 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
885 my ($self) = @_; 980 my ($self) = @_;
886 981
887 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
888 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
889 984
890 glEnable GL_BLEND;
891 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
892 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
894 987
895 my $border = $self->border; 988 my $border = $self->border;
896 989
897 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
898 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
902 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 997 my $bg = $tex[0];
904 998
905 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
908 1002
909 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
910 1004
911 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
915 1010
916 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND;
918 1012
919 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
920 $self->child->draw; 1015 $self->child->draw;
921} 1016}
922 1017
923############################################################################# 1018#############################################################################
924 1019
… …
1148} 1243}
1149 1244
1150sub size_allocate { 1245sub size_allocate {
1151 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1152 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1153 my $children = $self->{children}; 1250 my $children = $self->{children};
1154 1251
1155 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1156 1253
1157 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1186 1283
1187############################################################################# 1284#############################################################################
1188 1285
1189package CFClient::UI::Label; 1286package CFClient::UI::Label;
1190 1287
1191our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1192 1289
1193use CFClient::OpenGL; 1290use CFClient::OpenGL;
1194 1291
1195sub new { 1292sub new {
1196 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1197 1294
1198 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1199 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1200 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1201 fontsize => 1, 1303 fontsize => 1,
1202 text => "",
1203 align => -1, 1304 align => -1,
1204 valign => -1, 1305 valign => -1,
1205 padding => 2, 1306 padding => 2,
1206 layout => new CFClient::Layout,
1207 can_events => 0, 1307 can_events => 0,
1208 %arg 1308 %arg
1209 ); 1309 );
1210 1310
1211 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1212 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1213 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1214 $self->{template} = $layout; 1314 $self->{template} = $layout;
1215 } 1315 }
1216 1316
1217 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1219 1322
1220 $self 1323 $self
1221} 1324}
1222 1325
1223sub escape { 1326sub escape($) {
1224 local $_ = $_[1]; 1327 local $_ = $_[0];
1225 1328
1226 s/&/&amp;/g; 1329 s/&/&amp;/g;
1227 s/>/&gt;/g; 1330 s/>/&gt;/g;
1228 s/</&lt;/g; 1331 s/</&lt;/g;
1229 1332
1230 $_[1] 1333 $_
1231} 1334}
1232 1335
1233sub update { 1336sub update {
1234 my ($self) = @_; 1337 my ($self) = @_;
1235 1338
1236 delete $self->{texture}; 1339 delete $self->{texture};
1237 $self->SUPER::update; 1340 $self->SUPER::update;
1238} 1341}
1239 1342
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1246sub set_text { 1343sub set_text {
1247 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1248 1345
1249 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1251 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1252 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1253 1351
1254 delete $self->{texture};
1255 $self->update; 1352 $self->update;
1256 $self->check_size; 1353 $self->check_size;
1257} 1354}
1258 1355
1259sub set_markup { 1356sub set_markup {
1260 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1261 1358
1262 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1264 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1265 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1266 1366
1267 delete $self->{texture};
1268 $self->update; 1367 $self->update;
1269 $self->check_size; 1368 $self->check_size;
1270} 1369}
1271 1370
1272sub size_request { 1371sub size_request {
… …
1303sub set_fontsize { 1402sub set_fontsize {
1304 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1305 1404
1306 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1307 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1308 $self->check_size; 1409 $self->check_size;
1309 $self->update;
1310} 1410}
1311 1411
1312sub _draw { 1412sub _draw {
1313 my ($self) = @_; 1413 my ($self) = @_;
1314 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1315 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1316 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1317 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1318 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1422
1319 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1320 }; 1434 };
1321 1435
1322 glEnable GL_BLEND;
1323 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1324 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1325 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1326 1438
1439 if ($tex->{format} == GL_ALPHA) {
1327 glColor @{$self->{fg}}; 1440 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}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1342 1445
1343 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345} 1447}
1346 1448
1347############################################################################# 1449#############################################################################
1348 1450
1349package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1384 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1385 1487
1386 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1387} 1489}
1388 1490
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 { 1491sub set_text {
1408 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1409 1493
1410 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1411 $self->_set_text ($text); 1495 $self->_set_text ($text);
1412 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1413} 1516}
1414 1517
1415sub key_down { 1518sub key_down {
1416 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1417 1520
… …
1419 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1420 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1421 1524
1422 my $text = $self->get_text; 1525 my $text = $self->get_text;
1423 1526
1424 if ($sym == 8) { 1527 if ($uni == 8) {
1425 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1426 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1427 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1428 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1429 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1430 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1431 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1432 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1433 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1434 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1435 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1436 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1437 $self->emit ('escape'); 1540 $self->emit ('escape');
1438 } elsif ($uni) { 1541 } elsif ($uni) {
1439 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1440 } 1543 }
1441 1544
1442 $self->_set_text ($text); 1545 $self->_set_text ($text);
1443 $self->update; 1546 $self->update;
1547 $self->check_size;
1444} 1548}
1445 1549
1446sub focus_in { 1550sub focus_in {
1447 my ($self) = @_; 1551 my ($self) = @_;
1448 1552
… …
1577 my $class = shift; 1681 my $class = shift;
1578 1682
1579 $class->SUPER::new ( 1683 $class->SUPER::new (
1580 padding => 4, 1684 padding => 4,
1581 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1582 bg => [1, 1, 1, 0.2],
1583 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1584 can_hover => 1, 1687 can_hover => 1,
1585 align => 0, 1688 align => 0,
1586 valign => 0, 1689 valign => 0,
1587 can_events => 1, 1690 can_events => 1,
… …
1605 1708
1606 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1607 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1608 } 1711 }
1609 1712
1610 glEnable GL_BLEND;
1611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1612 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1615 1716
1616 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1617 1718
1618 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1619 glDisable GL_BLEND;
1620 1720
1621 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1622} 1722}
1623 1723
1624############################################################################# 1724#############################################################################
… …
1638 1738
1639 $class->SUPER::new ( 1739 $class->SUPER::new (
1640 padding => 2, 1740 padding => 2,
1641 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1642 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1643 state => 0, 1745 state => 0,
1644 can_hover => 1, 1746 can_hover => 1,
1645 @_ 1747 @_
1646 ) 1748 )
1647} 1749}
… …
1671 1773
1672 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1673 1775
1674 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1675 1777
1676 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1677 glEnable GL_TEXTURE_2D; 1780 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); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1683
1684 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1685 glDisable GL_BLEND;
1686} 1783}
1687 1784
1688############################################################################# 1785#############################################################################
1689 1786
1690package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1733 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1734 1831
1735 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1736 } 1833 }
1737 1834
1738 glEnable GL_BLEND;
1739 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 1837
1743 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1744 1839
1745 glDisable GL_BLEND;
1746 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1747} 1841}
1748 1842
1749############################################################################# 1843#############################################################################
1750 1844
… …
1939 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1940 2034
1941sub new { 2035sub new {
1942 my $class = shift; 2036 my $class = shift;
1943 2037
1944 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1945 2039
1946 # TODO: 0-width page 2040 # TODO: 0-width page
1947 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1948 # TODO: calculations are off 2042 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
1952 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1953 req_w => 20, 2049 req_w => $::WIDTH / 80,
1954 req_h => 20, 2050 req_h => $::WIDTH / 80,
1955 vertical => 0, 2051 vertical => 0,
1956 can_hover => 1, 2052 can_hover => 1,
1957 inner_pad => 5, 2053 inner_pad => .05,
1958 @_ 2054 @_
1959 ); 2055 );
1960 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1961 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
1962} 2084}
1963 2085
1964sub size_request { 2086sub size_request {
1965 my ($self) = @_; 2087 my ($self) = @_;
1966 2088
… …
1979 2101
1980sub mouse_motion { 2102sub mouse_motion {
1981 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1982 2104
1983 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
1984 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1985 2123
1986 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1987 2125
1988 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1989 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1990 2127
1991 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1992 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $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 2130
1997 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1998 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
1999 } 2138 });
2000}
2001 2139
2002# the inner_* stuff is for generating a padding for the slider handle, 2140 $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} 2141}
2009 2142
2010sub _draw { 2143sub _draw {
2011 my ($self) = @_; 2144 my ($self) = @_;
2012 2145
2013 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2014 2147
2015 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2016 2149
2017 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2018 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2019 2152
2020 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2021 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2022
2023 ($w, $h) = ($h, $w);
2024 } 2155 }
2025 2156
2026 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2027 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2028 2159
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; 2160 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2162
2052 # draw background 2163 # draw background
2053 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2054 2165
2055 # draw handle 2166 # draw handle
2056 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2057 2168
2058 glDisable GL_BLEND;
2059 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2060} 2170}
2061 2171
2062############################################################################# 2172#############################################################################
2063 2173
… …
2074 fontsize => 1, 2184 fontsize => 1,
2075 can_events => 0, 2185 can_events => 0,
2076 #font => default_font 2186 #font => default_font
2077 @_, 2187 @_,
2078 2188
2079 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2080 par => [], 2190 par => [],
2081 height => 0, 2191 height => 0,
2082 children => [ 2192 children => [
2083 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
2085 ], 2195 ],
2086 ); 2196 );
2087 2197
2088 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2199
2092 $self 2200 $self
2093} 2201}
2094 2202
2095sub set_fontsize { 2203sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2104 2212
2105 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2106 2214
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2110 2218
2111 ($layout->size)[1] 2219 ($layout->size)[1]
2112} 2220}
2113 2221
2114sub reflow { 2222sub reflow {
… …
2152 2260
2153 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2154 2262
2155 delete $self->{texture}; 2263 delete $self->{texture};
2156 2264
2157 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2158 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2159 my $height = 0; 2267 my $height = 0;
2160 2268
2161 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2162 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2275
2168 delete $self->{texture}; 2276 delete $self->{texture};
2169 } 2277 }
2170 2278
2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2174 2282
2175 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2177 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2178 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2179 2285
2180 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2181 2287
… …
2190 2296
2191 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2192 my $h = $par->[0]; 2298 my $h = $par->[0];
2193 2299
2194 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2195 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2196 2303
2197 glColor @{ $par->[1] };
2198 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2199 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2200 } 2306 }
2201 2307
2202 $y += $h; 2308 $y += $h;
2203 } 2309 }
2204 2310
2205 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2206 glDisable GL_BLEND;
2207 }; 2312 };
2208 }); 2313 });
2209} 2314}
2210 2315
2211sub _draw { 2316sub _draw {
2212 my ($self) = @_; 2317 my ($self) = @_;
2213 2318
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2223 }
2224 2324
2225 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2226 2326
2227} 2327}
2228 2328
… …
2322 @_, 2422 @_,
2323 can_events => 0, 2423 can_events => 0,
2324 ) 2424 )
2325} 2425}
2326 2426
2327sub set_markup { 2427sub set_tooltip_from {
2328 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2329 2429
2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2331 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2332 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2333} 2437}
2334 2438
2335sub size_request { 2439sub size_request {
2336 my ($self) = @_; 2440 my ($self) = @_;
2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339 2441
2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341 2443
2342 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2343} 2445}
… …
2349} 2451}
2350 2452
2351sub _draw { 2453sub _draw {
2352 my ($self) = @_; 2454 my ($self) = @_;
2353 2455
2354 glPushMatrix;
2355 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2356 2457
2357 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2358 2459
2359 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2370 glVertex 0 , $h; 2471 glVertex 0 , $h;
2371 glVertex $w, $h; 2472 glVertex $w, $h;
2372 glVertex $w, 0; 2473 glVertex $w, 0;
2373 glEnd; 2474 glEnd;
2374 2475
2375 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2376
2377 glTranslate 2, 2;
2378 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2379} 2478}
2380 2479
2381############################################################################# 2480#############################################################################
2382 2481
… …
2397 2496
2398sub size_request { 2497sub size_request {
2399 (32, 8) 2498 (32, 8)
2400} 2499}
2401 2500
2402sub draw { 2501sub _draw {
2403 my ($self) = @_; 2502 my ($self) = @_;
2404 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2506
2507 # TODO animation
2407 if ($tex) { 2508 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2415 glDisable GL_BLEND; 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub new {
2524 my $class = shift;
2525
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new (
2550 can_hover => 1,
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) {
2563 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ],
2572 );
2573
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 }
2576
2577 1
2578 },
2579 %args
2580 );
2581
2582 $self->add (new CFClient::UI::Face
2583 can_events => 0,
2584 face => $item->{face},
2585 anim => $item->{anim},
2586 animspeed => $item->{animspeed},
2587 );
2588
2589 $self->add (new CFClient::UI::Label
2590 can_events => 0,
2591 text => $desc,
2592 );
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_,
2609 );
2610
2611 $self
2612}
2613
2614sub set_items {
2615 my ($self, $items) = @_;
2616
2617 $self->{scrolled}->clear;
2618 return unless $items;
2619
2620 my @items = sort {
2621 ($a->{type} <=> $b->{type})
2622 or ($a->{name} cmp $b->{name})
2623 } @$items;
2624
2625 $self->{real_items} = \@items;
2626
2627 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2633 }
2634
2635 $self->{scrolled}->add (@items);
2636
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638}
2639
2640sub size_request {
2641 my ($self) = @_;
2642 ($self->{req_w}, $self->{req_h});
2643}
2644
2645#############################################################################
2646
2647package CFClient::UI::Menu;
2648
2649our @ISA = CFClient::UI::FancyFrame::;
2650
2651use CFClient::OpenGL;
2652
2653sub new {
2654 my $class = shift;
2655
2656 my $self = $class->SUPER::new (
2657 items => [],
2658 z => 100,
2659 @_,
2660 );
2661
2662 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2663
2664 for my $item (@{ $self->{items} }) {
2665 my ($widget, $cb) = @$item;
2666
2667 # handle various types of items, only text for now
2668 if (!ref $widget) {
2669 $widget = new CFClient::UI::Label
2670 can_hover => 1,
2671 can_events => 1,
2672 text => $widget;
2673 }
2674
2675 $self->{item}{$widget} = $item;
2676
2677 $self->{vbox}->add ($widget);
2678 }
2679
2680 $self
2681}
2682
2683# popup given the event (must be a mouse button down event currently)
2684sub popup {
2685 my ($self, $ev) = @_;
2686
2687 $self->emit ("popdown");
2688
2689 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self;
2691 $self->{button} = $ev->{button};
2692
2693 $self->show;
2694 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2695}
2696
2697sub mouse_motion {
2698 my ($self, $ev, $x, $y) = @_;
2699
2700 # TODO: should use vbox->find_widget or so
2701 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2702 $self->{hover} = $self->{item}{$HOVER};
2703}
2704
2705sub button_up {
2706 my ($self, $ev, $x, $y) = @_;
2707
2708 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB;
2710 $self->hide;
2711
2712 $self->emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover};
2714 }
2715}
2716
2717#############################################################################
2718
2719package CFClient::UI::Statusbox;
2720
2721our @ISA = CFClient::UI::VBox::;
2722
2723sub new {
2724 my $class = shift;
2725
2726 $class->SUPER::new (
2727 fontsize => 0.8,
2728 @_,
2416 } 2729 )
2730}
2731
2732sub reorder {
2733 my ($self) = @_;
2734 my $NOW = time;
2735
2736 while (my ($k, $v) = each %{ $self->{item} }) {
2737 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2738 }
2739
2740 my @widgets;
2741
2742 my @items = sort {
2743 $a->{pri} <=> $b->{pri}
2744 or $b->{id} <=> $a->{id}
2745 } values %{ $self->{item} };
2746
2747 my $count = 10 + 1;
2748 for my $item (@items) {
2749 last unless --$count;
2750
2751 push @widgets, $item->{label} ||= do {
2752 # TODO: doesn't handle markup well (read as: at all)
2753 my $short = $item->{count} > 1
2754 ? "<b>$item->{count} ×</b> $item->{text}"
2755 : $item->{text};
2756
2757 my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759 for ($short) {
2760 s/^\s+//;
2761 s/\s+/ /g;
2762 my $len = int 40 / $fontsize;
2763 substr $_, $len, length, "…" if $len < length;
2764 }
2765
2766 new CFClient::UI::Label
2767 markup => $short,
2768 tooltip => $item->{tooltip},
2769 tooltip_font => $::FONT_PROP,
2770 tooltip_width => 0.67,
2771 fontsize => $fontsize,
2772 fg => $item->{fg},
2773 can_events => 1,
2774 can_hover => 1
2775 };
2776 }
2777
2778 $self->clear;
2779 $self->SUPER::add (reverse @widgets);
2780}
2781
2782sub add {
2783 my ($self, $text, %arg) = @_;
2784
2785 $text =~ s/^\s+//;
2786 $text =~ s/\s+$//;
2787
2788 my $timeout = time + ((delete $arg{timeout}) || 60);
2789
2790 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2791
2792 if (my $item = $self->{item}{$group}) {
2793 if ($item->{text} eq $text) {
2794 $item->{count}++;
2795 } else {
2796 $item->{count} = 1;
2797 $item->{text} = $item->{tooltip} = $text;
2798 }
2799 $item->{id} = ++$self->{id};
2800 $item->{timeout} = $timeout;
2801 delete $item->{label};
2802 } else {
2803 $self->{item}{$group} = {
2804 id => ++$self->{id},
2805 text => $text,
2806 timeout => $timeout,
2807 tooltip => $text,
2808 fg => [0.8, 0.8, 0.8, 0.8],
2809 pri => 0,
2810 count => 1,
2811 %arg,
2812 };
2813 }
2814
2815 $self->reorder;
2417} 2816}
2418 2817
2419############################################################################# 2818#############################################################################
2420 2819
2421package CFClient::UI::Root; 2820package CFClient::UI::Root;
2422 2821
2423our @ISA = CFClient::UI::Container::; 2822our @ISA = CFClient::UI::Container::;
2424 2823
2425use CFClient::OpenGL; 2824use CFClient::OpenGL;
2426 2825
2427sub check_size { 2826sub new {
2428 my ($self) = @_; 2827 my $class = shift;
2429 2828
2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2829 $class->SUPER::new (
2431} 2830 @_,
2432 2831 )
2433sub size_request {
2434 ($::WIDTH, $::HEIGHT)
2435} 2832}
2436 2833
2437sub configure { 2834sub configure {
2438 my ($self, $x, $y, $w, $h) = @_; 2835 my ($self, $x, $y, $w, $h) = @_;
2439 2836
2440 $self->SUPER::configure ($x, $y, $w, $h); 2837 $self->{w} = $w;
2838 $self->{h} = $h;
2839}
2441 2840
2841sub check_size {
2842 my ($self) = @_;
2843
2844 $self->size_allocate ($self->{w}, $self->{h})
2845 if $self->{w};
2846}
2847
2848sub size_request {
2849 my ($self) = @_;
2850
2851 ($self->{w}, $self->{h})
2852}
2853
2854sub size_allocate {
2855 my ($self, $w, $h) = @_;
2856
2857 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2858 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2859
2860 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2861 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2862
2442 for my $child (@{$self->{children}}) { 2863 for my $child ($self->children) {
2443 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2864 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2444 2865
2866 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2867 if exists $child->{req_x};
2868
2869 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2870 if exists $child->{req_y};
2871
2445 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2872 $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; 2873 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2874
2447 $child->configure ($X, $Y, $W,$H); 2875 $child->configure ($X, $Y, $W, $H);
2448 } 2876 }
2449} 2877}
2450 2878
2451sub _topleft { 2879sub coord2local {
2452 my ($self, $x, $y) = @_; 2880 my ($self, $x, $y) = @_;
2453 2881
2454 ($x, $y) 2882 ($x, $y)
2455} 2883}
2456 2884
2885sub coord2global {
2886 my ($self, $x, $y) = @_;
2887
2888 ($x, $y)
2889}
2890
2457sub update { 2891sub update {
2458 my ($self) = @_; 2892 my ($self) = @_;
2459 2893
2460 $self->check_size; 2894 $self->check_size;
2461 ::refresh (); 2895 $::WANT_REFRESH++;
2462} 2896}
2463 2897
2464sub add { 2898sub add {
2465 my ($self, $child) = @_; 2899 my ($self, @children) = @_;
2466 2900
2901 for my $child (@children) {
2902 $child->{toplevel} = 1;
2903
2467 # integerize window positions 2904 # integerise window positions
2468 $child->{x} = int $child->{x}; 2905 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y}; 2906 $child->{y} = int $child->{y};
2907 }
2470 2908
2471 $self->SUPER::add ($child); 2909 $self->SUPER::add (@children);
2472} 2910}
2473 2911
2474sub on_refresh { 2912sub on_refresh {
2475 my ($self, $id, $cb) = @_; 2913 my ($self, $id, $cb) = @_;
2476 2914
2477 $self->{refresh_hook}{$id} = $cb; 2915 $self->{refresh_hook}{$id} = $cb;
2478} 2916}
2479 2917
2918sub on_post_alloc {
2919 my ($self, $id, $cb) = @_;
2920
2921 $self->{post_alloc_hook}{$id} = $cb;
2922}
2923
2480sub draw { 2924sub draw {
2481 my ($self) = @_; 2925 my ($self) = @_;
2482 2926
2483 while (my $rcb = delete $self->{refresh_hook}) { 2927 while ($self->{refresh_hook}) {
2484 $_->() for values %$rcb; 2928 $_->()
2929 for values %{delete $self->{refresh_hook}};
2930 }
2931
2932 if ($self->{check_size}) {
2933 my @queue = ([], []);
2934
2935 for (;;) {
2936 if ($self->{check_size}) {
2937 # heuristic: check containers last
2938 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2939 for values %{delete $self->{check_size}}
2940 }
2941
2942 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2943
2944 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2945 ? @$widget{qw(user_w user_h)}
2946 : $widget->size_request;
2947
2948 if (delete $widget->{force_alloc}
2949 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2950 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2951
2952 $widget->{req_w} = $w;
2953 $widget->{req_h} = $h;
2954
2955 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2956
2957 $widget->{parent}->check_size
2958 if $widget->{parent};
2959 }
2960 }
2961 }
2962
2963 while ($self->{size_alloc}) {
2964 for (values %{delete $self->{size_alloc}}) {
2965 my ($widget, $w, $h) = @$_;
2966
2967 $w = 0 if $w < 0;
2968 $h = 0 if $h < 0;
2969
2970 $widget->{w} = $w;
2971 $widget->{h} = $h;
2972 $widget->size_allocate ($w, $h);
2973 $widget->emit (size_allocate => $w, $h);
2974 }
2975 }
2976
2977 while ($self->{post_alloc_hook}) {
2978 $_->()
2979 for values %{delete $self->{post_alloc_hook}};
2485 } 2980 }
2486 2981
2487 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2982 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2983 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489 glClear GL_COLOR_BUFFER_BIT; 2984 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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