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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.209 by root, Wed May 17 00:26:55 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;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
674 }; 700 };
675} 701}
676 702
677sub _draw { 703sub _draw {
678 my ($self) = @_; 704 my ($self) = @_;
… …
680 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
681 707
682 my $tex = $self->{texture} 708 my $tex = $self->{texture}
683 or return; 709 or return;
684 710
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
690 714
691 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 716
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
695} 718}
696 719
697############################################################################# 720#############################################################################
698 721
699package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
700 723
701our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
702 725
703sub new { die }
704
705sub size_request { 726sub size_request {
706 my ($self) = @_; 727 my ($self) = @_;
707 728
708 @$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)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
710 731
711 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
712} 733}
713 734
714sub _draw { 735sub size_allocate {
715 my ($self) = @_; 736 my ($self, $w, $h) = @_;
716 737
717 $self->{children}[1]->draw; 738 $self->update;
718} 739}
719 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
720 743
721############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
722 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
723package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
724 789
725our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
726
727use CFClient::OpenGL;
728 791
729sub new { 792sub new {
730 my $class = shift; 793 my $class = shift;
731 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
732 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
734 border_bg => [1, 1, 1, 1], 807 slider => $slider,
735 border => 0.8,
736 @_ 808 @_,
737 ); 809 );
738 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
739 $self 815 $self
740} 816}
741 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
742sub _draw { 838sub _draw {
743 my ($self) = @_; 839 my ($self) = @_;
744 840
745 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
746 843
747 glEnable GL_BLEND; 844 glEnable GL_BLEND;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 847
752# glBegin GL_QUADS; 848 glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0; 849 glVertex 0 , 0;
755# glVertex 0 , $h; 850 glVertex 0 , $h;
756# glVertex $w, $h; 851 glVertex $w, $h;
757# glVertex $w, 0; 852 glVertex $w, 0;
758# glEnd; 853 glEnd;
759 854
760
761 $self->child->draw;
762 glDisable GL_BLEND; 855 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
764} 859}
765 860
766############################################################################# 861#############################################################################
767 862
768package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
781 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
782 877
783 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
786 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
787 can_events => 1, 883 can_events => 1,
788 @_ 884 @_
789 ); 885 );
790 886
791 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 888 align => 0,
793 valign => 1, 889 valign => 1,
794 text => $self->{title}, 890 text => $self->{title},
795 fontsize => 1; 891 fontsize => $self->{border};
796 892
797 $self 893 $self
798} 894}
799 895
800sub border { 896sub border {
… …
816 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
817 913
818 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
820 916
821 $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)
822 if $self->{title}; 918 if $self->{title};
823 919
824 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
825} 921}
826 922
827sub button_down { 923sub button_down {
828 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
829 925
926 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 927 my $border = $self->border;
831 928
832 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
837 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
838 $self->{motion} = sub { 940 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
840 942
841 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
842 945
843 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
845 $self->check_size; 949 $self->check_size;
846 }; 950 };
847 951
848 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
853 955
854 $self->{motion} = sub { 956 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
878 my ($self) = @_; 980 my ($self) = @_;
879 981
880 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 984
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 987
888 my $border = $self->border; 988 my $border = $self->border;
889 989
890 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
895 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
896 my $bg = $tex[0]; 997 my $bg = $tex[0];
897 998
898 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
901 1002
902 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
903 1004
904 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
908 1010
909 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1012
912 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
913 $self->child->draw; 1015 $self->child->draw;
914} 1016}
915 1017
916############################################################################# 1018#############################################################################
917 1019
… …
1141} 1243}
1142 1244
1143sub size_allocate { 1245sub size_allocate {
1144 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1145 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1146 my $children = $self->{children}; 1250 my $children = $self->{children};
1147 1251
1148 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1149 1253
1150 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1179 1283
1180############################################################################# 1284#############################################################################
1181 1285
1182package CFClient::UI::Label; 1286package CFClient::UI::Label;
1183 1287
1184our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1185 1289
1186use CFClient::OpenGL; 1290use CFClient::OpenGL;
1187 1291
1188sub new { 1292sub new {
1189 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1190 1294
1191 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1193 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1194 fontsize => 1, 1303 fontsize => 1,
1195 text => "",
1196 align => -1, 1304 align => -1,
1197 valign => -1, 1305 valign => -1,
1198 padding => 2, 1306 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1307 can_events => 0,
1201 %arg 1308 %arg
1202 ); 1309 );
1203 1310
1204 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1314 $self->{template} = $layout;
1208 } 1315 }
1209 1316
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1211 $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 }
1212 1322
1213 $self 1323 $self
1214} 1324}
1215 1325
1216sub escape { 1326sub escape($) {
1217 local $_ = $_[1]; 1327 local $_ = $_[0];
1218 1328
1219 s/&/&amp;/g; 1329 s/&/&amp;/g;
1220 s/>/&gt;/g; 1330 s/>/&gt;/g;
1221 s/</&lt;/g; 1331 s/</&lt;/g;
1222 1332
1223 $_[1] 1333 $_
1224} 1334}
1225 1335
1226sub update { 1336sub update {
1227 my ($self) = @_; 1337 my ($self) = @_;
1228 1338
1229 delete $self->{texture}; 1339 delete $self->{texture};
1230 $self->SUPER::update; 1340 $self->SUPER::update;
1231} 1341}
1232 1342
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1343sub set_text {
1240 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1241 1345
1242 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1244 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1246 1351
1247 delete $self->{texture};
1248 $self->update; 1352 $self->update;
1249 $self->check_size; 1353 $self->check_size;
1250} 1354}
1251 1355
1252sub set_markup { 1356sub set_markup {
1253 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1254 1358
1255 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1257 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1259 1366
1260 delete $self->{texture};
1261 $self->update; 1367 $self->update;
1262 $self->check_size; 1368 $self->check_size;
1263} 1369}
1264 1370
1265sub size_request { 1371sub size_request {
… …
1296sub set_fontsize { 1402sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1298 1404
1299 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1301 $self->check_size; 1409 $self->check_size;
1302 $self->update;
1303} 1410}
1304 1411
1305sub _draw { 1412sub _draw {
1306 my ($self) = @_; 1413 my ($self) = @_;
1307 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1308 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1311 $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
1312 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
1313 }; 1434 };
1314 1435
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1438
1439 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $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 }
1335 1445
1336 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1447}
1339 1448
1340############################################################################# 1449#############################################################################
1341 1450
1342package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1377 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1378 1487
1379 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1380} 1489}
1381 1490
1382sub get_text {
1383 $_[0]{text}
1384}
1385
1386sub size_request {
1387 my ($self) = @_;
1388
1389 my ($w, $h) = $self->SUPER::size_request;
1390
1391 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text { 1491sub set_text {
1401 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1402 1493
1403 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1404 $self->_set_text ($text); 1495 $self->_set_text ($text);
1405 $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
1406} 1516}
1407 1517
1408sub key_down { 1518sub key_down {
1409 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1410 1520
… …
1412 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1414 1524
1415 my $text = $self->get_text; 1525 my $text = $self->get_text;
1416 1526
1417 if ($sym == 8) { 1527 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1540 $self->emit ('escape');
1431 } elsif ($uni) { 1541 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1543 }
1434 1544
1435 $self->_set_text ($text); 1545 $self->_set_text ($text);
1436 $self->update; 1546 $self->update;
1547 $self->check_size;
1437} 1548}
1438 1549
1439sub focus_in { 1550sub focus_in {
1440 my ($self) = @_; 1551 my ($self) = @_;
1441 1552
… …
1570 my $class = shift; 1681 my $class = shift;
1571 1682
1572 $class->SUPER::new ( 1683 $class->SUPER::new (
1573 padding => 4, 1684 padding => 4,
1574 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1577 can_hover => 1, 1687 can_hover => 1,
1578 align => 0, 1688 align => 0,
1579 valign => 0, 1689 valign => 0,
1580 can_events => 1, 1690 can_events => 1,
… …
1598 1708
1599 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1601 } 1711 }
1602 1712
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1608 1716
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1718
1611 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1720
1614 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1615} 1722}
1616 1723
1617############################################################################# 1724#############################################################################
… …
1631 1738
1632 $class->SUPER::new ( 1739 $class->SUPER::new (
1633 padding => 2, 1740 padding => 2,
1634 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1635 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],
1636 state => 0, 1745 state => 0,
1637 can_hover => 1, 1746 can_hover => 1,
1638 @_ 1747 @_
1639 ) 1748 )
1640} 1749}
… …
1664 1773
1665 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;
1666 1775
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1777
1669 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1670 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1783}
1680 1784
1681############################################################################# 1785#############################################################################
1682 1786
1683package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1727 1831
1728 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1729 } 1833 }
1730 1834
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1837
1736 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1839
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1740} 1841}
1741 1842
1742############################################################################# 1843#############################################################################
1743 1844
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1933 2034
1934sub new { 2035sub new {
1935 my $class = shift; 2036 my $class = shift;
1936 2037
1937 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1938 2039
1939 # TODO: 0-width page 2040 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2042 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1944 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],
1945 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1946 req_w => 20, 2049 req_w => $::WIDTH / 80,
1947 req_h => 20, 2050 req_h => $::WIDTH / 80,
1948 vertical => 0, 2051 vertical => 0,
1949 can_hover => 1, 2052 can_hover => 1,
1950 inner_pad => 5, 2053 inner_pad => .05,
1951 @_ 2054 @_
1952 ); 2055 );
1953 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1954 $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 }
1955} 2084}
1956 2085
1957sub size_request { 2086sub size_request {
1958 my ($self) = @_; 2087 my ($self) = @_;
1959 2088
… …
1972 2101
1973sub mouse_motion { 2102sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1975 2104
1976 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
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1978 2123
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1980 2125
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1983 2127
1984 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2130
1990 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1991 $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;
1992 } 2138 });
1993}
1994 2139
1995# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001} 2141}
2002 2142
2003sub _draw { 2143sub _draw {
2004 my ($self) = @_; 2144 my ($self) = @_;
2005 2145
2006 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2007 2147
2008 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2009 2149
2010 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2012 2152
2013 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2155 }
2018 2156
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2159
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2162
2045 # draw background 2163 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2165
2048 # draw handle 2166 # draw handle
2049 $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);
2050 2168
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2053} 2170}
2054 2171
2055############################################################################# 2172#############################################################################
2056 2173
… …
2067 fontsize => 1, 2184 fontsize => 1,
2068 can_events => 0, 2185 can_events => 0,
2069 #font => default_font 2186 #font => default_font
2070 @_, 2187 @_,
2071 2188
2072 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2073 par => [], 2190 par => [],
2074 height => 0, 2191 height => 0,
2075 children => [ 2192 children => [
2076 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
2078 ], 2195 ],
2079 ); 2196 );
2080 2197
2081 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2199
2085 $self 2200 $self
2086} 2201}
2087 2202
2088sub set_fontsize { 2203sub set_fontsize {
… …
2096 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2097 2212
2098 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2099 2214
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2102 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2103 2218
2104 ($layout->size)[1] 2219 ($layout->size)[1]
2105} 2220}
2106 2221
2107sub reflow { 2222sub reflow {
… …
2145 2260
2146 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2147 2262
2148 delete $self->{texture}; 2263 delete $self->{texture};
2149 2264
2150 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2151 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2267 my $height = 0;
2153 2268
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2155 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2160 2275
2161 delete $self->{texture}; 2276 delete $self->{texture};
2162 } 2277 }
2163 2278
2164 $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 {
2165 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2167 2282
2168 glEnable GL_BLEND;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172 2285
2173 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2174 2287
… …
2183 2296
2184 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2298 my $h = $par->[0];
2186 2299
2187 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2188 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2189 2303
2190 glColor @{ $par->[1] };
2191 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2192 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);
2193 } 2306 }
2194 2307
2195 $y += $h; 2308 $y += $h;
2196 } 2309 }
2197 2310
2198 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND;
2200 }; 2312 };
2201 }); 2313 });
2202} 2314}
2203 2315
2204sub _draw { 2316sub _draw {
2205 my ($self) = @_; 2317 my ($self) = @_;
2206 2318
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2211 $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});
2212 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2213 }
2214 2324
2215 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2216 2326
2217} 2327}
2218 2328
… …
2312 @_, 2422 @_,
2313 can_events => 0, 2423 can_events => 0,
2314 ) 2424 )
2315} 2425}
2316 2426
2317sub set_markup { 2427sub set_tooltip_from {
2318 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2319 2429
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2321 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2322 $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 );
2323} 2437}
2324 2438
2325sub size_request { 2439sub size_request {
2326 my ($self) = @_; 2440 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2441
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2443
2332 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2333} 2445}
… …
2339} 2451}
2340 2452
2341sub _draw { 2453sub _draw {
2342 my ($self) = @_; 2454 my ($self) = @_;
2343 2455
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2346 2457
2347 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2348 2459
2349 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2471 glVertex 0 , $h;
2361 glVertex $w, $h; 2472 glVertex $w, $h;
2362 glVertex $w, 0; 2473 glVertex $w, 0;
2363 glEnd; 2474 glEnd;
2364 2475
2365 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2369} 2478}
2370 2479
2371############################################################################# 2480#############################################################################
2372 2481
… …
2387 2496
2388sub size_request { 2497sub size_request {
2389 (32, 8) 2498 (32, 8)
2390} 2499}
2391 2500
2392sub draw { 2501sub _draw {
2393 my ($self) = @_; 2502 my ($self) = @_;
2394 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396 2506
2507 # TODO animation
2397 if ($tex) { 2508 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 } 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 reorder {
2724 my ($self) = @_;
2725 my $NOW = time;
2726
2727 while (my ($k, $v) = each %{ $self->{item} }) {
2728 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2729 }
2730
2731 my @widgets;
2732
2733 my @items = sort {
2734 $a->{pri} <=> $b->{pri}
2735 or $b->{id} <=> $a->{id}
2736 } values %{ $self->{item} };
2737
2738 my $count = 10 + 1;
2739 for my $item (@items) {
2740 last unless --$count;
2741
2742 push @widgets, $item->{label} ||= do {
2743 # TODO: doesn't handle markup well (read as: at all)
2744 my $short = $item->{count} > 1
2745 ? "<b>$item->{count} ×</b> $item->{text}"
2746 : $item->{text};
2747
2748 for ($short) {
2749 s/^\s+//;
2750 s/\s+/ /g;
2751 my $len = int 40 / $item->{fontsize};
2752 substr $_, $len, length, "…" if $len < length;
2753 }
2754
2755 new CFClient::UI::Label
2756 markup => $short,
2757 tooltip => $item->{tooltip},
2758 tooltip_font => $::FONT_PROP,
2759 tooltip_width => 0.67,
2760 fontsize => $item->{fontsize},
2761 fg => $item->{fg},
2762 can_events => 1,
2763 can_hover => 1
2764 };
2765 }
2766
2767 $self->clear;
2768 $self->SUPER::add (reverse @widgets);
2769}
2770
2771sub add {
2772 my ($self, $text, %arg) = @_;
2773
2774 $text =~ s/^\s+//;
2775 $text =~ s/\s+$//;
2776
2777 my $timeout = time + ((delete $arg{timeout}) || 60);
2778
2779 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2780
2781 if (my $item = $self->{item}{$group}) {
2782 if ($item->{text} eq $text) {
2783 $item->{count}++;
2784 } else {
2785 $item->{count} = 1;
2786 $item->{text} = $item->{tooltip} = $text;
2787 }
2788 $item->{id} = ++$self->{id};
2789 $item->{timeout} = $timeout;
2790 delete $item->{label};
2791 } else {
2792 $self->{item}{$group} = {
2793 id => ++$self->{id},
2794 text => $text,
2795 timeout => $timeout,
2796 tooltip => $text,
2797 fontsize => 0.8,
2798 fg => [0.8, 0.8, 0.8, 0.8],
2799 pri => 0,
2800 count => 1,
2801 %arg,
2802 };
2803 }
2804
2805 $self->reorder;
2407} 2806}
2408 2807
2409############################################################################# 2808#############################################################################
2410 2809
2411package CFClient::UI::Root; 2810package CFClient::UI::Root;
2412 2811
2413our @ISA = CFClient::UI::Container::; 2812our @ISA = CFClient::UI::Container::;
2414 2813
2415use CFClient::OpenGL; 2814use CFClient::OpenGL;
2416 2815
2417sub check_size { 2816sub new {
2418 my ($self) = @_; 2817 my $class = shift;
2419 2818
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2819 $class->SUPER::new (
2421} 2820 @_,
2422 2821 )
2423sub size_request {
2424 ($::WIDTH, $::HEIGHT)
2425} 2822}
2426 2823
2427sub configure { 2824sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 2825 my ($self, $x, $y, $w, $h) = @_;
2429 2826
2430 $self->SUPER::configure ($x, $y, $w, $h); 2827 $self->{w} = $w;
2828 $self->{h} = $h;
2829}
2431 2830
2831sub check_size {
2832 my ($self) = @_;
2833
2834 $self->size_allocate ($self->{w}, $self->{h})
2835 if $self->{w};
2836}
2837
2838sub size_request {
2839 my ($self) = @_;
2840
2841 ($self->{w}, $self->{h})
2842}
2843
2844sub size_allocate {
2845 my ($self, $w, $h) = @_;
2846
2847 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2848 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2849
2850 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2851 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2852
2432 for my $child (@{$self->{children}}) { 2853 for my $child ($self->children) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2854 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434 2855
2856 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2857 if exists $child->{req_x};
2858
2859 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2860 if exists $child->{req_y};
2861
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2862 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2863 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2864
2437 $child->configure ($X, $Y, $W,$H); 2865 $child->configure ($X, $Y, $W, $H);
2438 } 2866 }
2439} 2867}
2440 2868
2441sub _topleft { 2869sub coord2local {
2442 my ($self, $x, $y) = @_; 2870 my ($self, $x, $y) = @_;
2443 2871
2444 ($x, $y) 2872 ($x, $y)
2445} 2873}
2446 2874
2875sub coord2global {
2876 my ($self, $x, $y) = @_;
2877
2878 ($x, $y)
2879}
2880
2447sub update { 2881sub update {
2448 my ($self) = @_; 2882 my ($self) = @_;
2449 2883
2450 $self->check_size; 2884 $self->check_size;
2451 ::refresh (); 2885 $::WANT_REFRESH++;
2452} 2886}
2453 2887
2454sub add { 2888sub add {
2455 my ($self, $child) = @_; 2889 my ($self, @children) = @_;
2456 2890
2891 for my $child (@children) {
2892 $child->{toplevel} = 1;
2893
2457 # integerize window positions 2894 # integerise window positions
2458 $child->{x} = int $child->{x}; 2895 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 2896 $child->{y} = int $child->{y};
2897 }
2460 2898
2461 $self->SUPER::add ($child); 2899 $self->SUPER::add (@children);
2462} 2900}
2463 2901
2464sub on_refresh { 2902sub on_refresh {
2465 my ($self, $id, $cb) = @_; 2903 my ($self, $id, $cb) = @_;
2466 2904
2467 $self->{refresh_hook}{$id} = $cb; 2905 $self->{refresh_hook}{$id} = $cb;
2468} 2906}
2469 2907
2908sub on_post_alloc {
2909 my ($self, $id, $cb) = @_;
2910
2911 $self->{post_alloc_hook}{$id} = $cb;
2912}
2913
2470sub draw { 2914sub draw {
2471 my ($self) = @_; 2915 my ($self) = @_;
2472 2916
2473 while (my $rcb = delete $self->{refresh_hook}) { 2917 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 2918 $_->()
2919 for values %{delete $self->{refresh_hook}};
2920 }
2921
2922 if ($self->{check_size}) {
2923 my @queue = ([], []);
2924
2925 for (;;) {
2926 if ($self->{check_size}) {
2927 # heuristic: check containers last
2928 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2929 for values %{delete $self->{check_size}}
2930 }
2931
2932 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2933
2934 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2935 ? @$widget{qw(user_w user_h)}
2936 : $widget->size_request;
2937
2938 if (delete $widget->{force_alloc}
2939 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2940 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2941
2942 $widget->{req_w} = $w;
2943 $widget->{req_h} = $h;
2944
2945 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2946
2947 $widget->{parent}->check_size
2948 if $widget->{parent};
2949 }
2950 }
2951 }
2952
2953 while ($self->{size_alloc}) {
2954 for (values %{delete $self->{size_alloc}}) {
2955 my ($widget, $w, $h) = @$_;
2956
2957 $w = 0 if $w < 0;
2958 $h = 0 if $h < 0;
2959
2960 $widget->{w} = $w;
2961 $widget->{h} = $h;
2962 $widget->size_allocate ($w, $h);
2963 $widget->emit (size_allocate => $w, $h);
2964 }
2965 }
2966
2967 while ($self->{post_alloc_hook}) {
2968 $_->()
2969 for values %{delete $self->{post_alloc_hook}};
2475 } 2970 }
2476 2971
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2972 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2973 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 2974 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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