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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
122 133
123 for (@$vals) { 134 for (@$vals) {
124 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
125 $rem += $_ - $i; 136 $rem += $_ - $i;
126 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 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;
127 } 158 }
128} 159}
129 160
130############################################################################# 161#############################################################################
131 162
… …
150 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
152 } 183 }
153 } 184 }
154 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
155 $self 188 $self
156} 189}
157 190
158sub destroy { 191sub destroy {
159 my ($self) = @_; 192 my ($self) = @_;
… …
224 $self->{y} = $y; 257 $self->{y} = $y;
225 $self->update; 258 $self->update;
226 } 259 }
227 260
228 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 263 }
235} 264}
236 265
237sub size_allocate { 266sub size_allocate {
238 # nothing to be done 267 # nothing to be done
239} 268}
240 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
241sub set_max_size { 280sub set_max_size {
242 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
243 282
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 285}
247 286
248# return top left coordinates 287sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
251 289
252 $self->{parent} 290 $self->{tooltip} = $tooltip;
253 or Carp::confess "no parent widget in _topleft\n";#d#
254 291
255 $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 }
256} 296}
257 297
258# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
259sub coord2local { 299sub coord2local {
260 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
261 301
262 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 303}
265 304
266# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
267sub coord2global { 306sub coord2global {
268 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
269 308
270 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 310}
273 311
274sub focus_in { 312sub focus_in {
275 my ($self) = @_; 313 my ($self) = @_;
276 314
… …
348 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
349 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
350 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
351 glEnd; 389 glEnd;
352 glPopMatrix; 390 glPopMatrix;
353 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;
354 } 392 }
355} 393}
356 394
357sub _draw { 395sub _draw {
358 my ($self) = @_; 396 my ($self) = @_;
… …
374 412
375sub set_parent { 413sub set_parent {
376 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
377 415
378 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};
379} 421}
380 422
381sub check_size { 423sub check_size {
382 my ($self) = @_; 424 my ($self, $forced) = @_;
383 425
384 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
385 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405} 428}
406 429
407sub update { 430sub update {
408 my ($self) = @_; 431 my ($self) = @_;
409 432
… …
424} 447}
425 448
426sub DESTROY { 449sub DESTROY {
427 my ($self) = @_; 450 my ($self) = @_;
428 451
452 delete $WIDGET{$self+0};
429 #$self->deactivate; 453 #$self->deactivate;
430} 454}
431 455
432############################################################################# 456#############################################################################
433 457
… …
442 my $class = shift; 466 my $class = shift;
443 467
444 # range [value, low, high, page] 468 # range [value, low, high, page]
445 469
446 $class->SUPER::new ( 470 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
449 @_ 473 @_
450 ) 474 )
451} 475}
452 476
453sub _draw { 477sub _draw {
454 my ($self) = @_; 478 my ($self) = @_;
455 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
457 486
458 glEnable GL_BLEND; 487 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
461 490
462 glBegin GL_QUADS; 491 glBegin GL_QUADS;
463 glVertex 0 , 0; 492 glVertex 0 , 0;
464 glVertex 0 , $h; 493 glVertex 0 , $h;
465 glVertex $w, $h; 494 glVertex $w, $h;
466 glVertex $w, 0; 495 glVertex $w, 0;
467 glEnd; 496 glEnd;
468 497
469 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
470} 500}
471 501
472############################################################################# 502#############################################################################
473 503
474package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
506 536
507 $self 537 $self
508} 538}
509 539
510sub add { 540sub add {
511 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
512 542
513 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
514 545
515 use sort 'stable'; 546 use sort 'stable';
516 547
517 $self->{children} = [ 548 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
520 ]; 551 ];
521 552
522 $child->check_size; 553 $self->check_size (1);
554 $self->update;
555}
556
557sub children {
558 @{ $_[0]{children} }
523} 559}
524 560
525sub remove { 561sub remove {
526 my ($self, $child) = @_; 562 my ($self, $child) = @_;
527 563
… …
542 578
543 for (@$children) { 579 for (@$children) {
544 delete $_->{parent}; 580 delete $_->{parent};
545 $_->hide; 581 $_->hide;
546 } 582 }
583
584 $self->check_size;
585 $self->update;
547} 586}
548 587
549sub find_widget { 588sub find_widget {
550 my ($self, $x, $y) = @_; 589 my ($self, $x, $y) = @_;
551 590
… …
626} 665}
627 666
628sub update { 667sub update {
629 my ($self) = @_; 668 my ($self) = @_;
630 669
631 # we want to do this delayed... 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 671 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 672}
645 673
646sub size_allocate { 674sub size_allocate {
647 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
648 676
649 $self->child->configure (0, 0, $w, $h); 677 $self->SUPER::size_allocate ($w, $h);
678 $self->update;
679}
650 680
681sub _render {
682 $_[0]{children}[0]->draw;
683}
684
685sub render_child {
686 my ($self) = @_;
687
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT;
691
651 $self->render_chld; 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;
700 };
652} 701}
653 702
654sub _draw { 703sub _draw {
655 my ($self) = @_; 704 my ($self) = @_;
656 705
657 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
658 707
659 my $tex = $self->{texture} 708 my $tex = $self->{texture}
660 or return; 709 or return;
661 710
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1;
666 714
667 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 716
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
671} 718}
672 719
673############################################################################# 720#############################################################################
674 721
675package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
676 723
677our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
678 725
679sub new { die }
680
681sub size_request { 726sub size_request {
682 my ($self) = @_; 727 my ($self) = @_;
683 728
684 @$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)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 731
687 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
688} 733}
689 734
690sub _draw { 735sub size_allocate {
691 my ($self) = @_; 736 my ($self, $w, $h) = @_;
692 737
693 $self->{children}[1]->draw; 738 $self->update;
694} 739}
695 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
696 743
697############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
698 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
699package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
700 789
701our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
702
703use CFClient::OpenGL;
704 791
705sub new { 792sub new {
706 my $class = shift; 793 my $class = shift;
707 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
708 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
709 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
710 border_bg => [1, 1, 1, 1], 807 slider => $slider,
711 border => 0.8,
712 @_ 808 @_,
713 ); 809 );
714 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
715 $self 815 $self
716} 816}
717 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
718sub _draw { 838sub _draw {
719 my ($self) = @_; 839 my ($self) = @_;
720 840
721 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
722 843
723 glEnable GL_BLEND; 844 glEnable GL_BLEND;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 847
728# glBegin GL_QUADS; 848 glBegin GL_QUADS;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0; 849 glVertex 0 , 0;
731# glVertex 0 , $h; 850 glVertex 0 , $h;
732# glVertex $w, $h; 851 glVertex $w, $h;
733# glVertex $w, 0; 852 glVertex $w, 0;
734# glEnd; 853 glEnd;
735 854
736
737 $self->child->draw;
738 glDisable GL_BLEND; 855 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
740} 859}
741 860
742############################################################################# 861#############################################################################
743 862
744package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
757 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
758 877
759 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
762 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
763 can_events => 1, 883 can_events => 1,
764 @_ 884 @_
765 ); 885 );
766 886
767 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 888 align => 0,
769 valign => 1, 889 valign => 1,
770 text => $self->{title}, 890 text => $self->{title},
771 fontsize => 1; 891 fontsize => $self->{border};
772 892
773 $self 893 $self
774} 894}
775 895
776sub border { 896sub border {
… …
792 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
793 913
794 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
796 916
797 $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)
798 if $self->{title}; 918 if $self->{title};
799 919
800 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
801} 921}
802 922
803sub button_down { 923sub button_down {
804 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
805 925
926 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 927 my $border = $self->border;
807 928
808 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
813 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
814 $self->{motion} = sub { 940 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
816 942
817 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
818 945
819 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 949 $self->check_size;
822 }; 950 };
823 951
824 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
829 955
830 $self->{motion} = sub { 956 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
854 my ($self) = @_; 980 my ($self) = @_;
855 981
856 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 984
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 987
864 my $border = $self->border; 988 my $border = $self->border;
865 989
866 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 997 my $bg = $tex[0];
873 998
874 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
877 1002
878 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
879 1004
880 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
884 1010
885 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1012
888 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
889 $self->child->draw; 1015 $self->child->draw;
890} 1016}
891 1017
892############################################################################# 1018#############################################################################
893 1019
… …
915 $self->{children}[$y][$x] = $child; 1041 $self->{children}[$y][$x] = $child;
916 1042
917 $child->check_size; 1043 $child->check_size;
918} 1044}
919 1045
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
920# TODO: move to container class maybe? send childs a signal on removal? 1050# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1051sub clear {
922 my ($self) = @_; 1052 my ($self) = @_;
923 1053
924 my $children = delete $self->{children}; 1054 my @children = $self->children;
1055 delete $self->{children};
925 1056
926 for (grep $_, map @$_, grep $_, @$children) { 1057 for (@children) {
927 delete $_->{parent}; 1058 delete $_->{parent};
928 $_->hide; 1059 $_->hide;
929 } 1060 }
930 1061
931 $self->update; 1062 $self->update;
… …
1112} 1243}
1113 1244
1114sub size_allocate { 1245sub size_allocate {
1115 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1116 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1117 my $children = $self->{children}; 1250 my $children = $self->{children};
1118 1251
1119 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1120 1253
1121 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1150 1283
1151############################################################################# 1284#############################################################################
1152 1285
1153package CFClient::UI::Label; 1286package CFClient::UI::Label;
1154 1287
1155our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1156 1289
1157use CFClient::OpenGL; 1290use CFClient::OpenGL;
1158 1291
1159sub new { 1292sub new {
1160 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1161 1294
1162 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1164 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1165 fontsize => 1, 1303 fontsize => 1,
1166 text => "",
1167 align => -1, 1304 align => -1,
1168 valign => -1, 1305 valign => -1,
1169 padding => 2, 1306 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1307 can_events => 0,
1172 %arg 1308 %arg
1173 ); 1309 );
1174 1310
1175 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1314 $self->{template} = $layout;
1179 } 1315 }
1180 1316
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1182 $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 }
1183 1322
1184 $self 1323 $self
1185} 1324}
1186 1325
1187sub escape { 1326sub escape($) {
1188 local $_ = $_[1]; 1327 local $_ = $_[0];
1189 1328
1190 s/&/&amp;/g; 1329 s/&/&amp;/g;
1191 s/>/&gt;/g; 1330 s/>/&gt;/g;
1192 s/</&lt;/g; 1331 s/</&lt;/g;
1193 1332
1194 $_[1] 1333 $_
1334}
1335
1336sub update {
1337 my ($self) = @_;
1338
1339 delete $self->{texture};
1340 $self->SUPER::update;
1195} 1341}
1196 1342
1197sub set_text { 1343sub set_text {
1198 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1199 1345
1346 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text";
1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1201 1351
1202 delete $self->{texture}; 1352 $self->update;
1203 $self->check_size; 1353 $self->check_size;
1204 $self->update;
1205} 1354}
1206 1355
1207sub set_markup { 1356sub set_markup {
1208 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1209 1358
1359 return if $self->{text} eq "M$markup";
1360 $self->{text} = "M$markup";
1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1211 1366
1212 delete $self->{texture}; 1367 $self->update;
1213 $self->check_size; 1368 $self->check_size;
1214 $self->update;
1215} 1369}
1216 1370
1217sub size_request { 1371sub size_request {
1218 my ($self) = @_; 1372 my ($self) = @_;
1219 1373
… …
1248sub set_fontsize { 1402sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1250 1404
1251 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1253 $self->check_size; 1409 $self->check_size;
1254 $self->update;
1255} 1410}
1256 1411
1257sub _draw { 1412sub _draw {
1258 my ($self) = @_; 1413 my ($self) = @_;
1259 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1260 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1263 $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
1264 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
1265 }; 1434 };
1266 1435
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1438
1439 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $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 }
1287 1445
1288 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1447}
1291 1448
1292############################################################################# 1449#############################################################################
1293 1450
1294package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1329 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1330 1487
1331 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1332} 1489}
1333 1490
1334sub get_text {
1335 $_[0]{text}
1336}
1337
1338sub size_request {
1339 my ($self) = @_;
1340
1341 my ($w, $h) = $self->SUPER::size_request;
1342
1343 ($w + 1, $h) # add 1 for cursor
1344}
1345
1346sub size_allocate {
1347 my ($self, $w, $h) = @_;
1348
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350}
1351
1352sub set_text { 1491sub set_text {
1353 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1354 1493
1355 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1356 $self->_set_text ($text); 1495 $self->_set_text ($text);
1357 $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
1358} 1516}
1359 1517
1360sub key_down { 1518sub key_down {
1361 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1362 1520
… …
1364 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1366 1524
1367 my $text = $self->get_text; 1525 my $text = $self->get_text;
1368 1526
1369 if ($sym == 8) { 1527 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1540 $self->emit ('escape');
1383 } elsif ($uni) { 1541 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1543 }
1386 1544
1387 $self->_set_text ($text); 1545 $self->_set_text ($text);
1388 $self->update; 1546 $self->update;
1547 $self->check_size;
1389} 1548}
1390 1549
1391sub focus_in { 1550sub focus_in {
1392 my ($self) = @_; 1551 my ($self) = @_;
1393 1552
… …
1522 my $class = shift; 1681 my $class = shift;
1523 1682
1524 $class->SUPER::new ( 1683 $class->SUPER::new (
1525 padding => 4, 1684 padding => 4,
1526 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1529 can_hover => 1, 1687 can_hover => 1,
1530 align => 0, 1688 align => 0,
1531 valign => 0, 1689 valign => 0,
1532 can_events => 1, 1690 can_events => 1,
… …
1550 1708
1551 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1553 } 1711 }
1554 1712
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1560 1716
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1718
1563 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1720
1566 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1567} 1722}
1568 1723
1569############################################################################# 1724#############################################################################
… …
1583 1738
1584 $class->SUPER::new ( 1739 $class->SUPER::new (
1585 padding => 2, 1740 padding => 2,
1586 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1587 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],
1588 state => 0, 1745 state => 0,
1589 can_hover => 1, 1746 can_hover => 1,
1590 @_ 1747 @_
1591 ) 1748 )
1592} 1749}
… …
1616 1773
1617 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;
1618 1775
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1777
1621 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1622 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1783}
1632 1784
1633############################################################################# 1785#############################################################################
1634 1786
1635package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1679 1831
1680 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1681 } 1833 }
1682 1834
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1837
1688 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1839
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1692} 1841}
1693 1842
1694############################################################################# 1843#############################################################################
1695 1844
… …
1743} 1892}
1744 1893
1745sub set_max { 1894sub set_max {
1746 my ($self, $max) = @_; 1895 my ($self, $max) = @_;
1747 1896
1897 return if $self->{max_val} == $max;
1898
1748 $self->{max_val} = $max; 1899 $self->{max_val} = $max;
1900 $self->update;
1749} 1901}
1750 1902
1751sub set_value { 1903sub set_value {
1752 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1753 1905
1754 $self->set_max ($max) 1906 $self->set_max ($max)
1755 if defined $max; 1907 if defined $max;
1756 1908
1757 $max = $self->{max_val}; 1909 return if $self->{val} == $val;
1910
1758 $self->{val} = $val; 1911 $self->{val} = $val;
1759
1760 $self->update; 1912 $self->update;
1761} 1913}
1762 1914
1763sub _draw { 1915sub _draw {
1764 my ($self) = @_; 1916 my ($self) = @_;
… …
1847 1999
1848 $self->{value}->set_fontsize ($fsize); 2000 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 2001 $self->{max} ->set_fontsize ($fsize);
1850} 2002}
1851 2003
2004sub set_max {
2005 my ($self, $max) = @_;
2006
2007 $self->{gauge}->set_max ($max);
2008 $self->{max}->set_text ($max);
2009}
2010
1852sub set_value { 2011sub set_value {
1853 my ($self, $val, $max) = @_; 2012 my ($self, $val, $max) = @_;
1854 2013
1855 $self->set_max ($max) 2014 $self->set_max ($max)
1856 if defined $max; 2015 if defined $max;
1857 2016
1858 $self->{gauge}->set_value ($val, $max); 2017 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2018 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 2019}
1868 2020
1869############################################################################# 2021#############################################################################
1870 2022
1871package CFClient::UI::Slider; 2023package CFClient::UI::Slider;
… …
1881 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1882 2034
1883sub new { 2035sub new {
1884 my $class = shift; 2036 my $class = shift;
1885 2037
1886 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1887 2039
1888 # TODO: 0-width page 2040 # TODO: 0-width page
1889 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1890 # TODO: calculations are off 2042 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1893 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],
1894 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1895 req_w => 20, 2049 req_w => $::WIDTH / 80,
1896 req_h => 20, 2050 req_h => $::WIDTH / 80,
1897 vertical => 0, 2051 vertical => 0,
1898 can_hover => 1, 2052 can_hover => 1,
1899 inner_pad => 5, 2053 inner_pad => .05,
1900 @_ 2054 @_
1901 ); 2055 );
1902 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1903 $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 }
1904} 2084}
1905 2085
1906sub size_request { 2086sub size_request {
1907 my ($self) = @_; 2087 my ($self) = @_;
1908 2088
… …
1921 2101
1922sub mouse_motion { 2102sub mouse_motion {
1923 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1924 2104
1925 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
1926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1927 2123
1928 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1929 2125
1930 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1931 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1932 2127
1933 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1934 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1935 $x = $lo if $x < $lo;
1936 $x = $hi - $page if $x > $hi - $page;
1937 $self->{range}[0] = $x;
1938 2130
1939 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1940 $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;
1941 } 2138 });
1942}
1943 2139
1944# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1945# so that the handle doesn't leave the texture. This calculation isn't 100%
1946# correct propably, but it does the job for now
1947sub _calc_inner_pad_px {
1948 my ($self, $w) = @_;
1949 ($w / 100) * $self->{inner_pad} # % to pixels
1950} 2141}
1951 2142
1952sub _draw { 2143sub _draw {
1953 my ($self) = @_; 2144 my ($self) = @_;
1954 2145
1955 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
1956 2147
1957 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
1958 2149
1959 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
1960 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
1961 2152
1962 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
1963 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
1964
1965 ($w, $h) = ($h, $w);
1966 } 2155 }
1967 2156
1968 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1969 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1970 2159
1971 my ($value, $lo, $hi, $page) = @{$self->{range}};
1972
1973 $hi = $value + 1 if $lo == $hi;
1974
1975 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1976 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1977
1978 $page = int $page * $inner_w / ($hi - $lo);
1979 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1980
1981 $w -= $page;
1982 $page &= ~1;
1983 glTranslate $page * 0.5, 0, 0;
1984 $page ||= 2;
1985
1986 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988
1989 glEnable GL_BLEND;
1990 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
1992 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993 2162
1994 # draw background 2163 # draw background
1995 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1996 2165
1997 # draw handle 2166 # draw handle
1998 $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);
1999 2168
2000 glDisable GL_BLEND;
2001 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2002} 2170}
2003 2171
2004############################################################################# 2172#############################################################################
2005 2173
… …
2016 fontsize => 1, 2184 fontsize => 1,
2017 can_events => 0, 2185 can_events => 0,
2018 #font => default_font 2186 #font => default_font
2019 @_, 2187 @_,
2020 2188
2021 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2022 par => [], 2190 par => [],
2023 height => 0, 2191 height => 0,
2024 children => [ 2192 children => [
2025 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
2027 ], 2195 ],
2028 ); 2196 );
2029 2197
2030 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2199
2034 $self 2200 $self
2035} 2201}
2036 2202
2037sub set_fontsize { 2203sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2046 2212
2047 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2048 2214
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2052 2218
2053 ($layout->size)[1] 2219 ($layout->size)[1]
2054} 2220}
2055 2221
2056sub reflow { 2222sub reflow {
… …
2094 2260
2095 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2096 2262
2097 delete $self->{texture}; 2263 delete $self->{texture};
2098 2264
2099 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2100 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2101 my $height = 0; 2267 my $height = 0;
2102 2268
2103 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2104 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2275
2110 delete $self->{texture}; 2276 delete $self->{texture};
2111 } 2277 }
2112 2278
2113 $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 {
2114 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2116 2282
2117 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2285
2122 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2123 2287
… …
2132 2296
2133 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2134 my $h = $par->[0]; 2298 my $h = $par->[0];
2135 2299
2136 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2137 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2138 2303
2139 glColor @{ $par->[1] };
2140 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2141 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);
2142 } 2306 }
2143 2307
2144 $y += $h; 2308 $y += $h;
2145 } 2309 }
2146 2310
2147 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2148 glDisable GL_BLEND;
2149 }; 2312 };
2150 }); 2313 });
2151} 2314}
2152 2315
2153sub _draw { 2316sub _draw {
2154 my ($self) = @_; 2317 my ($self) = @_;
2155 2318
2156 if ($self->{texture}) {
2157 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2159 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2321 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2161 }
2162 2324
2163 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2164 2326
2165} 2327}
2166 2328
… …
2260 @_, 2422 @_,
2261 can_events => 0, 2423 can_events => 0,
2262 ) 2424 )
2263} 2425}
2264 2426
2265sub set_markup { 2427sub set_tooltip_from {
2266 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2267 2429
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2269 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2270 $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 );
2271} 2437}
2272 2438
2273sub size_request { 2439sub size_request {
2274 my ($self) = @_; 2440 my ($self) = @_;
2275
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277 2441
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279 2443
2280 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2281} 2445}
… …
2287} 2451}
2288 2452
2289sub _draw { 2453sub _draw {
2290 my ($self) = @_; 2454 my ($self) = @_;
2291 2455
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2294 2457
2295 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2296 2459
2297 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2308 glVertex 0 , $h; 2471 glVertex 0 , $h;
2309 glVertex $w, $h; 2472 glVertex $w, $h;
2310 glVertex $w, 0; 2473 glVertex $w, 0;
2311 glEnd; 2474 glEnd;
2312 2475
2313 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2314
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2317} 2478}
2318 2479
2319############################################################################# 2480#############################################################################
2320 2481
… …
2335 2496
2336sub size_request { 2497sub size_request {
2337 (32, 8) 2498 (32, 8)
2338} 2499}
2339 2500
2340sub draw { 2501sub _draw {
2341 my ($self) = @_; 2502 my ($self) = @_;
2342 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2506
2507 # TODO animation
2345 if ($tex) { 2508 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND; 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666
2667#############################################################################
2668
2669package CFClient::UI::Menu;
2670
2671our @ISA = CFClient::UI::FancyFrame::;
2672
2673use CFClient::OpenGL;
2674
2675sub new {
2676 my $class = shift;
2677
2678 my $self = $class->SUPER::new (
2679 items => [],
2680 z => 100,
2681 @_,
2682 );
2683
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685
2686 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item;
2688
2689 # handle various types of items, only text for now
2690 if (!ref $widget) {
2691 $widget = new CFClient::UI::Label
2692 can_hover => 1,
2693 can_events => 1,
2694 text => $widget;
2695 }
2696
2697 $self->{item}{$widget} = $item;
2698
2699 $self->{vbox}->add ($widget);
2700 }
2701
2702 $self
2703}
2704
2705# popup given the event (must be a mouse button down event currently)
2706sub popup {
2707 my ($self, $ev) = @_;
2708
2709 $self->emit ("popdown");
2710
2711 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self;
2713 $self->{button} = $ev->{button};
2714
2715 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717}
2718
2719sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_;
2721
2722 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER};
2725}
2726
2727sub button_up {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB;
2732 $self->hide;
2733
2734 $self->emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover};
2736 }
2737}
2738
2739#############################################################################
2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2354 } 2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2355} 2838}
2356 2839
2357############################################################################# 2840#############################################################################
2358 2841
2359package CFClient::UI::Root; 2842package CFClient::UI::Root;
2360 2843
2361our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2362 2845
2363use CFClient::OpenGL; 2846use CFClient::OpenGL;
2364 2847
2365sub check_size { 2848sub new {
2366 my ($self) = @_; 2849 my $class = shift;
2367 2850
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2369} 2852 @_,
2370 2853 )
2371sub size_request {
2372 ($::WIDTH, $::HEIGHT)
2373} 2854}
2374 2855
2375sub configure { 2856sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2377 2858
2378 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2379 2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868}
2869
2870sub size_request {
2871 my ($self) = @_;
2872
2873 ($self->{w}, $self->{h})
2874}
2875
2876sub size_allocate {
2877 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2380 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2385 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2386 } 2898 }
2387} 2899}
2388 2900
2389sub _topleft { 2901sub coord2local {
2390 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2391 2903
2392 ($x, $y) 2904 ($x, $y)
2393} 2905}
2394 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2395sub update { 2913sub update {
2396 my ($self) = @_; 2914 my ($self) = @_;
2397 2915
2398 $self->check_size; 2916 $self->check_size;
2399 ::refresh (); 2917 $::WANT_REFRESH++;
2400} 2918}
2401 2919
2402sub add { 2920sub add {
2403 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2404 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2405 # integerize window positions 2926 # integerise window positions
2406 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2408 2930
2409 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2410} 2932}
2411 2933
2412sub on_refresh { 2934sub on_refresh {
2413 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2414 2936
2415 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2416} 2938}
2417 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2418sub draw { 2946sub draw {
2419 my ($self) = @_; 2947 my ($self) = @_;
2420 2948
2421 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2422 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2423 } 3002 }
2424 3003
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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